Add SRV support

Closes #34, #119

Author: xPaw

README.md

@@ -24,6 +24,9 @@ Query allows to request a full list of servers' plugins and players, however thi
 ## RCON
 It is possible to send console commands to a Minecraft server remotely using the [Source RCON protocol](https://developer.valvesoftware.com/wiki/Source_RCON_Protocol). Use [PHP Source Query](https://github.com/xPaw/PHP-Source-Query-Class) library for your RCON needs.
 
+## SRV DNS record
+This library automatically tries to resolve SRV records. If you do not wish to do so, pass `false` as the fourth param in the constructor (after timeout param).
+
 ## Example
 ```php
 <?php
@@ -80,8 +83,5 @@ If the server has query enabled (`enable-query`), then you can use `MinecraftQue
 ?>
 ```
 
-Please note that this library does not resolve SRV records, you will need to do that yourself.
-Take a look at [this issue](https://github.com/xPaw/PHP-Minecraft-Query/issues/34) for an example script.
-
 ## License
 [MIT](LICENSE)

src/MinecraftPing.php

@@ -31,12 +31,17 @@ class MinecraftPing
 	private $ServerPort;
 	private $Timeout;
 
-	public function __construct( $Address, $Port = 25565, $Timeout = 2 )
+	public function __construct( $Address, $Port = 25565, $Timeout = 2, $ResolveSRV = true )
 	{
 		$this->ServerAddress = $Address;
 		$this->ServerPort = (int)$Port;
 		$this->Timeout = (int)$Timeout;
 
+		if( $ResolveSRV )
+		{
+			$this->ResolveSRV();
+		}
+
 		$this->Connect( );
 	}
 
@@ -210,4 +215,29 @@ private function ReadVarInt( )
 
 		return $i;
 	}
+
+	private function ResolveSRV()
+	{
+		if( ip2long( $this->ServerAddress ) !== false )
+		{
+			return;
+		}
+
+		$Record = dns_get_record( '_minecraft._tcp.' . $this->ServerAddress, DNS_SRV );
+
+		if( empty( $Record ) )
+		{
+			return;
+		}
+
+		if( isset( $Record[ 0 ][ 'target' ] ) )
+		{
+			$this->ServerAddress = $Record[ 0 ][ 'target' ];
+		}
+
+		if( isset( $Record[ 0 ][ 'port' ] ) )
+		{
+			$this->ServerPort = $Record[ 0 ][ 'port' ];
+		}
+	}
 }

src/MinecraftQuery.php

@@ -18,13 +18,18 @@ class MinecraftQuery
 	private $Players;
 	private $Info;
 
-	public function Connect( $Ip, $Port = 25565, $Timeout = 3 )
+	public function Connect( $Ip, $Port = 25565, $Timeout = 3, $ResolveSRV = true )
 	{
 		if( !is_int( $Timeout ) || $Timeout < 0 )
 		{
 			throw new \InvalidArgumentException( 'Timeout must be an integer.' );
 		}
 
+		if( $ResolveSRV )
+		{
+			$this->ResolveSRV( $Ip, $Port );
+		}
+
 		$this->Socket = @FSockOpen( 'udp://' . $Ip, (int)$Port, $ErrNo, $ErrStr, $Timeout );
 
 		if( $ErrNo || $this->Socket === false )
@@ -190,4 +195,24 @@ private function WriteData( $Command, $Append = "" )
 
 		return SubStr( $Data, 5 );
 	}
+
+	private function ResolveSRV( &$Address, &$Port )
+	{
+		if( ip2long( $Address ) !== false )
+		{
+			return;
+		}
+
+		$Record = dns_get_record( '_minecraft._tcp.' . $Address, DNS_SRV );
+
+		if( empty( $Record ) )
+		{
+			return;
+		}
+
+		if( isset( $Record[ 0 ][ 'target' ] ) )
+		{
+			$Address = $Record[ 0 ][ 'target' ];
+		}
+	}
 }