Added support for SRV lookups

Author: TuxCoding

app/Console/Commands/Ping.php

@@ -5,46 +5,20 @@
 use Illuminate\Console\Command;
 use xPaw\MinecraftPing;
 use xPaw\MinecraftPingException;
+use \App\Server;
 
 class Ping extends Command {
 
-    const DEFAULT_MINECRAFT_PORT = 25565;
-
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature = 'app:ping {address?}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
     protected $description = 'Ping all server instances from the database';
 
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct() {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
     public function handle() {
         $this->info("Pinging server instances");
 
         $address = $this->argument("address");
         if ($address) {
             $this->info("Pinging server: " . $address);
-            $server = \App\Server::where("address", '=', $address)->first();
+            $server = Server::where("address", '=', $address)->first();
             if ($server) {
                 $this->pingServer($server);
             } else {
@@ -54,7 +28,7 @@ public function handle() {
             return;
         }
 
-        $servers = \App\Server::all();
+        $servers = Server::orderBy("updated_at", "asc")->paginate(15464);
         $bar = $this->output->createProgressBar($servers->count());
 
         /* @var $server \App\Server */
@@ -69,12 +43,18 @@ public function handle() {
         $this->output->writeln("");
     }
 
-    function pingServer($server) {
+    function pingServer(Server $server) {
         try {
             //the minecraft ping packets from existing libraries doesn't seem to be fast enough
-            $server->ping = self::pingDomain($server->address);
+            $address = $server->address;
+            $ip = $address;
+            $port = Server::DEFAULT_PORT;
 
-            $ping = new MinecraftPing($server->address, self::DEFAULT_MINECRAFT_PORT, 1);
+            $this->Get_Minecraft_IP($address, $ip, $port);
+
+            $server->ping = self::pingDomain($ip, $port);
+
+            $ping = new MinecraftPing($ip, $port, 1);
             $result = $ping->Query();
 
             $this->parsePingData($server, $result);
@@ -83,9 +63,8 @@ function pingServer($server) {
             $this->error($server->address . " " . $exception->getMessage());
 
             //Reset the these data online if the server was online before
-            if ($server->online) {
+            if ($server->online || is_null($server->online)) {
                 $server->online = 0;
-                $server->players = 0;
                 $server->save();
             }
         } finally {
@@ -102,10 +81,10 @@ function pingServer($server) {
      * motd
      * favicon
      *
-     * @param \App\Server $server
+     * @param Server $server
      * @param array $data
      */
-    function parsePingData($server, $data) {
+    function parsePingData(Server $server, array $data) {
         $motd = $data['description'];
         if (is_array($motd)) {
             $motd = \MinecraftJsonColors::convertToLegacy($motd);
@@ -166,10 +145,10 @@ public static function createJavaUuid($striped) {
         return implode('-', $components);
     }
 
-    function pingDomain($domain) {
+    function pingDomain($domain, $port) {
         //https://stackoverflow.com/questions/9841635/how-to-ping-a-server-port-with-php
         $starttime = microtime(true);
-        $file = fsockopen($domain, self::DEFAULT_MINECRAFT_PORT, $errno, $errstr, 1);
+        $file = fsockopen($domain, $port, $errno, $errstr, 1);
         $stoptime = microtime(true);
         $status = 0;
 
@@ -199,6 +178,39 @@ function saveIcon($hostname, $favicon) {
         }
     }
 
+    //extracted from https://github.com/xPaw/PHP-Minecraft-Query/issues/34
+    function Get_Minecraft_IP($addr, &$ip, &$port) {
+        if (ip2long($addr) !== FALSE) {
+            //server address is an ip
+            return $ip = $addr;
+        }
+
+        $port = Server::DEFAULT_PORT;
+
+        $result = dns_get_record('_minecraft._tcp.' . $addr, DNS_SRV);
+        $this->info(count($result));
+
+        if (count($result) > 0) {
+            if (array_key_exists('target', $result[0])) {
+                $addr = $result[0]['target'];
+            }
+
+            if (array_key_exists('port', $result[0])) {
+                $port = $result[0]['port'];
+            }
+
+            $this->info("Found SRV-Record");
+        }
+
+        $result = dns_get_record($addr, DNS_A);
+
+        if (count($result) > 0 && array_key_exists('ip', $result[0])) {
+            $ip = $result[0]['ip'];
+            $this->info("Found A-Record");
+        } else {
+            $ip = $addr;
+        }
+    }
 //    /**
 //     * needs enabled-qurey=true
 //     *

app/Console/Kernel.php

@@ -15,6 +15,8 @@ class Kernel extends ConsoleKernel {
     protected $commands = [
 //         Commands\Inspire::class,
         Commands\Ping::class,
+//        Commands\NameResolve::class,
+//        Commands\NameHistory::class,
     ];
 
     /**
@@ -26,7 +28,7 @@ class Kernel extends ConsoleKernel {
     protected function schedule(Schedule $schedule) {
         // $schedule->command('inspire')
         //          ->hourly();
-        $schedule->command('app:ping')->hourly()->sendOutputTo(storage_path() . '/logs/ping.log', true);
+        $schedule->command('app:ping')->everyThirtyMinutes()->sendOutputTo(storage_path() . '/logs/ping.log', true);
 
 //        $schedule->command('queue:work --daemon')->everyMinute()->withoutOverlapping();
     }

app/Player.php

@@ -22,6 +22,8 @@
  */
 class Player extends Model {
 
+    const VALID_USERNAME = "/^\w{2,16}$/";
+
     /**
      * The database table used by the model.
      *

app/Server.php

@@ -36,6 +36,8 @@
  */
 class Server extends Model {
 
+    const DEFAULT_PORT = 25565;
+
     use SoftDeletes;
 
     /**