minestat 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2824d765e8d40dd3a1087567b27a9a04c9df93427b344c8e47346a0a778f5be
-  data.tar.gz: 5974801cb768bc9a67cd789a0296b569c1f9b14442d7124135c3ddbd8d41886b
+  metadata.gz: 289592d2813eb1246b9a3033ce10a219513bf0c9cb792951051bdf6f97b20598
+  data.tar.gz: beee739e9c19250fb6663e9561e065dfbcbae817442afe07ca3a21911e5f975a
 SHA512:
-  metadata.gz: fc7bb79f048f5d280405638d416cb74ef8e0da6873074bd6e1b70c8176c913fc5fa59ffb92aaa3673f972225851b533964402cfc76160d1d5caec4bf207c43a2
-  data.tar.gz: 885fb2073958d8a95f121ed7a45e230987520dd0878744650bfe6ec45082a75a1e5dc9d512e76aff6dad965b3a36e493a76e9e5e6bd085bde14d2dd562eb33e6
+  metadata.gz: ad094493fac2c5b788c7ed86bdcc1e5296715d410cfe435491101fa56aae2bda6cd81644a88ce8caf183e6ae13072e559a073a4a4b42f9a51b0dfe261a46b378
+  data.tar.gz: a757852cab9404fe9937a9a4f9fb7bac2effccd3317173d2abf0bc200a87dea5a6576e382c878be9d15f31b2489298197fafa6f5c1b4eaa1aff75d90f6ab6c16

data/lib/minestat.rb

@@ -1,5 +1,5 @@
 # minestat.rb - A Minecraft server status checker
-# Copyright (C) 2014-2021 Lloyd Dilley
+# Copyright (C) 2014-2022 Lloyd Dilley
 # http://www.dilley.me/
 #
 # This program is free software; you can redistribute it and/or modify
@@ -24,7 +24,7 @@ require 'timeout'
 # Provides a ruby interface for polling Minecraft server status.
 class MineStat
   # MineStat version
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
   # Number of values expected from server
   NUM_FIELDS = 6
   # Number of values expected from a 1.8b/1.3 server
@@ -33,8 +33,17 @@ class MineStat
   MAX_VARINT_SIZE = 5
   # Default TCP port
   DEFAULT_PORT = 25565
-  # Default TCP timeout in seconds
+  # Bedrock/Pocket Edition default UDP port
+  DEFAULT_BEDROCK_PORT = 19132
+  # Default TCP/UDP timeout in seconds
   DEFAULT_TIMEOUT = 5
+  # Bedrock/Pocket Edition packet offset in bytes (1 + 8 + 8 + 16 + 2)
+  # Unconnected pong (0x1C) = 1 byte
+  # Timestamp as a long = 8 bytes
+  # Server GUID as a long = 8 bytes
+  # Magic number = 16 bytes
+  # String ID length = 2 bytes
+  BEDROCK_PACKET_OFFSET = 35
 
   ##
   # Stores constants that represent the results of a server ping
@@ -64,25 +73,28 @@ class MineStat
     EXTENDED = 2
     # Server versions 1.7 to latest
     JSON = 3
+    # Bedrock/Pocket Edition
+    BEDROCK = 4
   end
 
   ##
   # Instantiate an instance of MineStat and poll the specified server for information
   def initialize(address, port = DEFAULT_PORT, timeout = DEFAULT_TIMEOUT, request_type = Request::NONE)
-    @address = address # address of server
-    @port = port       # TCP port of server
-    @online            # online or offline?
-    @version           # server version
-    @motd              # message of the day
-    @stripped_motd     # message of the day without formatting
-    @current_players   # current number of players online
-    @max_players       # maximum player capacity
-    @protocol          # protocol level
-    @json_data         # JSON data for 1.7 queries
-    @latency           # ping time to server in milliseconds
-    @timeout = timeout # TCP timeout
-    @server            # server socket
-    @request_type      # SLP protocol version
+    @address = address    # address of server
+    @port = port          # TCP/UDP port of server
+    @online               # online or offline?
+    @version              # server version
+    @mode = "Unspecified" # 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
+    @max_players          # maximum player capacity
+    @protocol             # protocol level
+    @json_data            # JSON data for 1.7 queries
+    @latency              # ping time to server in milliseconds
+    @timeout = timeout    # TCP/UDP timeout
+    @server               # server socket
+    @request_type         # Protocol version
 
     case request_type
       when Request::BETA
@@ -93,13 +105,14 @@ class MineStat
         retval = extended_legacy_request()
       when Request::JSON
         retval = json_request()
+      when Request::BEDROCK
+        retval = bedrock_request()
       else
-        # Attempt various SLP ping requests in a particular order. If the request
-        # succeeds or the connection fails, there is no reason to continue with
-        # subsequent requests. Attempts should continue in the event of a timeout
+        # Attempt various SLP ping requests in a particular order. If the
+        # connection fails, there is no reason to continue with subsequent
+        # requests. Attempts should continue in the event of a timeout
         # however since it may be due to an issue during the handshake.
         # Note: Newer server versions may still respond to older SLP requests.
-        # For example, 1.13.2 responds to 1.4/1.5 queries, but not 1.6 queries.
         # SLP 1.4/1.5
         retval = legacy_request()
         # SLP 1.8b/1.3
@@ -114,6 +127,10 @@ class MineStat
         unless retval == Retval::CONNFAIL
           retval = json_request()
         end
+        # Bedrock
+        unless retval == Retval::CONNFAIL
+          retval = bedrock_request()
+        end
     end
     @online = false unless retval == Retval::SUCCESS
   end
@@ -133,6 +150,7 @@ class MineStat
         end
       end
     end
+    @stripped_motd = @stripped_motd.force_encoding('UTF-8')
     @stripped_motd = @stripped_motd.gsub(/§./, "")
   end
 
@@ -140,8 +158,15 @@ class MineStat
   # Establishes a connection to the Minecraft server
   def connect()
     begin
-      start_time = Time.now
-      @server = TCPSocket.new(@address, @port)
+      if @request_type == Request::BEDROCK || @request_type == "Bedrock/Pocket Edition"
+        @port = DEFAULT_BEDROCK_PORT if @port == DEFAULT_PORT && @request_type == Request::NONE
+        start_time = Time.now
+        @server = UDPSocket.new
+        @server.connect(@address, @port)
+      else
+        start_time = Time.now
+        @server = TCPSocket.new(@address, @port)
+      end
       @latency = ((Time.now - start_time) * 1000).round
     rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
       return Retval::CONNFAIL
@@ -156,15 +181,27 @@ class MineStat
   def parse_data(delimiter, is_beta = false)
     data = nil
     begin
-      if @server.read(1).unpack('C').first == 0xFF # kick packet (255)
-        len = @server.read(2).unpack('n').first
-        data = @server.read(len * 2).force_encoding('UTF-16BE').encode('UTF-8')
-        @server.close
-      else
-        @server.close
-        return Retval::UNKNOWN
+      if @request_type == "Bedrock/Pocket Edition"
+        if @server.recv(1, Socket::MSG_PEEK).unpack('C').first == 0x1C # unconnected pong packet
+          server_id_len = @server.recv(BEDROCK_PACKET_OFFSET, Socket::MSG_PEEK)[-2..-1].unpack('n').first
+          data = @server.recv(BEDROCK_PACKET_OFFSET + server_id_len)[BEDROCK_PACKET_OFFSET..-1]
+          @server.close
+        else
+          @server.close
+          return Retval::UNKNOWN
+        end
+      else # SLP
+        if @server.read(1).unpack('C').first == 0xFF # kick packet (255)
+          len = @server.read(2).unpack('n').first
+          data = @server.read(len * 2).force_encoding('UTF-16BE').encode('UTF-8')
+          @server.close
+        else
+          @server.close
+          return Retval::UNKNOWN
+        end
       end
-    rescue => exception
+    rescue
+    #rescue => exception
       #$stderr.puts exception
       return Retval::UNKNOWN
     end
@@ -185,7 +222,20 @@ class MineStat
       else
         return Retval::UNKNOWN
       end
-    else
+    elsif @request_type == "Bedrock/Pocket Edition"
+      if server_info != nil
+        @protocol = server_info[2].to_i
+        @version = "#{server_info[3]} #{server_info[7]} (#{server_info[0]})"
+        @mode = server_info[8]
+        @motd = server_info[1]
+        strip_motd
+        @current_players = server_info[4].to_i
+        @max_players = server_info[5].to_i
+        @online = true
+      else
+        return Retval::UNKNOWN
+      end
+    else # SLP
       if server_info != nil && server_info.length >= NUM_FIELDS
         # server_info[0] contains the section symbol and 1
         @protocol = server_info[1].to_i # contains the protocol version (51 for 1.9 or 78 for 1.6.4 for example)
@@ -424,6 +474,57 @@ class MineStat
     return vint
   end
 
+  ##
+  # Bedrock/Pocket Edition servers communicate as follows for an unconnected ping request:
+  # 1. Client sends:
+  #   1a. \x01 (unconnected ping packet containing the fields specified below)
+  #   1b. current time as a long
+  #   1c. magic number
+  #   1d. client GUID as a long
+  # 2. Server responds with:
+  #   2a. \x1c (unconnected pong packet containing the follow fields)
+  #   2b. current time as a long
+  #   2c. server GUID as a long
+  #   2d. 16-bit magic number
+  #   2e. server ID as a string
+  # The fields from the pong response, in order, are:
+  # * edition
+  # * MotD line 1
+  # * protocol version
+  # * version name
+  # * current player count
+  # * maximum player count
+  # * unique server ID
+  # * MotD line 2
+  # * game mode as a string
+  # * game mode as a numeric
+  # * IPv4 port number
+  # * IPv6 port number
+  def bedrock_request()
+    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
+        payload = "\x01".force_encoding('ASCII-8BIT')                       # unconnected ping
+        payload += [Time.now.to_i].pack('L!<').force_encoding('ASCII-8BIT') # current time as a long
+        payload += "\x00\xFF\xFF\x00\xFE\xFE\xFE\xFE\xFD\xFD\xFD\xFD\x12\x34\x56\x78".force_encoding('ASCII-8BIT') # magic number
+        payload += [2].pack('L!<').force_encoding('ASCII-8BIT')             # client GUID as a long
+        @server.write(payload)
+        @server.flush
+        retval = parse_data("\x3B") # semicolon
+      end
+    rescue Timeout::Error
+      return Retval::TIMEOUT
+    rescue => exception
+      $stderr.puts exception
+      return Retval::UNKNOWN
+    end
+    return retval
+  end
+
   # Returns the Minecraft server IP
   attr_reader :address
 
@@ -436,12 +537,15 @@ class MineStat
   # Returns the Minecraft version that the server is running
   attr_reader :version
 
-  # Returns the full version of the MOTD
+  # Returns the game mode (Bedrock/Pocket Edition only)
+  attr_reader :mode
+
+  # Returns the full version of the MotD
   #
-  # If you just want the MOTD text, use stripped_motd
+  # If you just want the MotD text, use stripped_motd
   attr_reader :motd
 
-  # Returns just the plain text contained within the MOTD
+  # Returns just the plain text contained within the MotD
   attr_reader :stripped_motd
 
   # Returns the current player count

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minestat
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Lloyd Dilley
-- Stepan Melnikov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2022-05-01 00:00:00.000000000 Z
 dependencies: []
 description: MineStat polls Minecraft server data such as version, motd, current players,
   and max players.
@@ -39,7 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Minecraft server status checker