minestat 2.2.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1aae005889c4dfd2940d4fe464195aceb82380a03437603bbfc984a036a79b91
-  data.tar.gz: bb333f2e25d3dd899b26e357bfeffffa8411055832f5c6b36eee850c6912314f
+  metadata.gz: 0edcad23af3b5a770f9711cf137a82e060e74cbd50d53a50bad64f86a94e2dcb
+  data.tar.gz: cce9bd821aea062f9cc84fa68750b4a6ea1f9028bd68bd11c075ae721e6a0dee
 SHA512:
-  metadata.gz: 98d83d61c188baffac40427684cc7e93d1e77db3a4acf1e58c55e6f0cba39d2e48a57b7ae53562aa0041c47ca60fdd6abb360e0caae820e30b13e7164b1819ae
-  data.tar.gz: 8ccb0e3159c32175ec677b37dc15960532bedf2bb238ea185f7f01c4ee02e4a3245d166889abaa36bbf1f6e152f0ee477dbb4bd72022093b6b09c50847174a52
+  metadata.gz: 06a145da313fe0700857906b36c51a7a2a5b2d12f95b40090a04bedc7c261aad39319805ebf2c4c7b13840162cbffe556c1e23753c055ea49321c7ff87b1cbc1
+  data.tar.gz: 8d86892695c1cd890d08b4934a4dc769482a7ee815d8cbf98c5dd63c770064d535a7f8a29ef958c07a92bc2eb8d9a275f0a9b3a39b0b0c726e2440dbde0c122a

data/lib/minestat.rb

@@ -1,5 +1,5 @@
 # minestat.rb - A Minecraft server status checker
-# Copyright (C) 2014-2022 Lloyd Dilley
+# Copyright (C) 2014-2023 Lloyd Dilley
 # http://www.dilley.me/
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,6 +18,7 @@
 
 require 'base64'
 require 'json'
+require 'resolv'
 require 'socket'
 require 'timeout'
 
@@ -25,7 +26,7 @@ require 'timeout'
 # Provides a ruby interface for polling Minecraft server status.
 class MineStat
   # MineStat version
-  VERSION = "2.2.3"
+  VERSION = "2.3.0"
   # Number of values expected from server
   NUM_FIELDS = 6
   # Number of values expected from a 1.8b/1.3 server
@@ -85,7 +86,7 @@ class MineStat
     @port = port          # TCP/UDP port of server
     @online               # online or offline?
     @version              # server version
-    @mode = "Unspecified" # game mode (Bedrock/Pocket Edition only)
+    @mode                 # game mode (Bedrock/Pocket Edition only)
     @motd                 # message of the day
     @stripped_motd        # message of the day without formatting
     @current_players      # current number of players online
@@ -102,7 +103,25 @@ class MineStat
     @try_all = false      # try all protocols?
 
     @try_all = true if request_type == Request::NONE
+    resolve_srv(address, port)
+    set_connection_status(attempt_protocols())
+  end
+
+  # Attempts to resolve SRV records
+  def resolve_srv(address, port)
+    begin
+      resolver = Resolv::DNS.new
+      res = resolver.getresource("_minecraft._tcp.#{@address}", Resolv::DNS::Resource::IN::SRV)
+      @address = res.target.to_s # SRV target
+      @port = res.port.to_i      # SRV port
+    rescue => exception          # primarily catch Resolv::ResolvError and revert if unable to resolve SRV record(s)
+      @address = address
+      @port = port
+    end
+  end
 
+  # Attempts the use of various protocols
+  def attempt_protocols()
     case request_type
       when Request::BETA
         retval = beta_request()
@@ -135,16 +154,16 @@ class MineStat
           retval = json_request()
         end
         # Bedrock/Pocket Edition
-        unless @online || retval == Retval::SUCCESS || retval == Retval::CONNFAIL
+        unless @online || retval == Retval::SUCCESS
           retval = bedrock_request()
         end
     end
-    set_connection_status(retval) unless @online
+    return retval
   end
 
   # Sets connection status
   def set_connection_status(retval)
-    @connection_status = "Success" if retval == Retval::SUCCESS
+    @connection_status = "Success" if @online || retval == Retval::SUCCESS
     @connection_status = "Fail" if retval == Retval::CONNFAIL
     @connection_status = "Timeout" if retval == Retval::TIMEOUT
     @connection_status = "Unknown" if retval == Retval::UNKNOWN
@@ -186,7 +205,7 @@ class MineStat
     rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
       return Retval::CONNFAIL
     rescue => exception
-      $stderr.puts exception
+      #$stderr.puts exception
       return Retval::UNKNOWN
     end
     return Retval::SUCCESS
@@ -537,6 +556,7 @@ class MineStat
     retval = nil
     begin
       Timeout::timeout(@timeout) do
+        @request_type = "Bedrock/Pocket Edition"
         retval = connect()
         return retval unless retval == Retval::SUCCESS
         # Perform handshake and acquire data
@@ -555,7 +575,6 @@ class MineStat
       return Retval::UNKNOWN
     end
     if retval == Retval::SUCCESS
-      @request_type = "Bedrock/Pocket Edition"
       set_connection_status(retval)
     end
     return retval

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minestat
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.0
 platform: ruby
 authors:
 - Lloyd Dilley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-30 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies: []
 description: MineStat polls Minecraft server data such as version, motd, current players,
   and max players.