mc_protocol_e 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12a5fce4d3a72883ec0948e9cc202e986375a864b1f2ca25c29b76a2237578f1
-  data.tar.gz: 5cdbefee2d30107edbcac9aaf7b7bd585cfbff4a4a9fce4dcafc6d3a08c573c7
+  metadata.gz: 6f1eb81025fec386b36239f57a0271e0261937f7e69d25de0765be4a409672b0
+  data.tar.gz: dca38db8e93cb622a50574d6785be2fc82b1973b4d4ba44a978195eb70e2744b
 SHA512:
-  metadata.gz: 24fbeb78bfd0ba1171ddf0072a42bf442ef4aecf545dff40025b740d587a2b0a2e24facf8992ff651349c81d4ed4e05ac5e81fc8f190d99500d8c5937dabbcf9
-  data.tar.gz: 6b062be54b0dfa861e31560c5c324cb59006edfee99f58d42b873f1f939298f698757231eea02b50f12dec5d0e4ccdfe440ccb7ea9d6366163b14ac2956ad32b
+  metadata.gz: 01c3e7fb163f167afd923518aafd6bb8b0f71292ad50b582e84dcffc9088801820c66ea7a5c6dc1f2c7e36f19220e2b7530423e42b41e633d9475c7df854834c
+  data.tar.gz: c31e38139f275da1f834be0b213dd746200d022bf4ec1fa308133bcb9ef39e91b372581102b83f157208d742410a00e4ce756de8c8fe01adc5ff6f39ae96f94f

data/lib/mc_protocol_e/frame_1e/response.rb

@@ -7,19 +7,20 @@ module McProtocolE
     # This class shows a responce of MC protocol.
     class Response
 
-      class TimeoutError < Timeout::Error; end
+      class ReadTimeoutError < Timeout::Error; end
+      class InvalidResponseError < StandardError; end
 
       DEFAULT_READ_TIMEOUT = 3
       MAX_RECV_LEN = 1024 * 1024
       SUCCEED_CODE = 0
 
-      attr_reader :data
+      attr_reader :code, :data
 
       # Constructor.
       # @param [String] raw_res binary string of response
       def initialize(raw_res)
         @sub_header = raw_res[0]
-        @code = raw_res[1].unpack1("C")
+        @code = raw_res[1]&.unpack1("C")
         @data = raw_res[2..-1] || ""
       end
 
@@ -27,12 +28,16 @@ module McProtocolE
       # @param [IO] socket TCP socket
       # @param [Integer] read_timeout read timeout second
       # @return [Responce] received a response
+      # @raise [ReadTimeoutError] occurred timeout when response read
+      # @raise [InvalidResponseError] when response is invalid mc protocol format
       def self.recv(socket, read_timeout = DEFAULT_READ_TIMEOUT)
         selected = IO.select([socket], nil, nil, read_timeout)
-        raise TimeoutError unless selected
+        raise ReadTimeoutError unless selected
 
         raw_res = socket.recv(MAX_RECV_LEN)
-        new(raw_res)
+        res = new(raw_res)
+        raise InvalidResponseError if res.code.nil?
+        res
       end
 
       # Returns true if a command succeed.
@@ -45,10 +50,6 @@ module McProtocolE
         !succeed?
       end
 
-      private
-
-      attr_reader :code
-
     end
   end
 end

data/lib/mc_protocol_e/frame_3e/response.rb

@@ -7,7 +7,8 @@ module McProtocolE
     # This class shows a responce of MC protocol.
     class Response
 
-      class TimeoutError < Timeout::Error; end
+      class ReadTimeoutError < Timeout::Error; end
+      class InvalidResponseError < StandardError; end
 
       DEFAULT_READ_TIMEOUT = 3
       SUB_HEADER = "\xD0\x00".b
@@ -22,7 +23,7 @@ module McProtocolE
         @sub_header = raw_res[0..1]
         @access_route = raw_res[2..6]
         @response_len = raw_res[7..8]
-        @code = raw_res[9..10].unpack1("v")
+        @code = raw_res[9..10]&.unpack1("v")
         @data = raw_res[11..-1] || ""
       end
 
@@ -30,12 +31,16 @@ module McProtocolE
       # @param [IO] socket TCP socket
       # @param [Integer] read_timeout read timeout second
       # @return [Responce] received a response
+      # @raise [ReadTimeoutError] occurred timeout when response read
+      # @raise [InvalidResponseError] when response is invalid mc protocol format
       def self.recv(socket, read_timeout = DEFAULT_READ_TIMEOUT)
         selected = IO.select([socket], nil, nil, read_timeout)
-        raise TimeoutError unless selected
+        raise ReadTimeoutError unless selected
 
         raw_res = socket.recv(MAX_RECV_LEN)
-        new(raw_res)
+        res = new(raw_res)
+        raise InvalidResponseError if res.code.nil?
+        res
       end
 
       # Returns true if a command succeed.

data/lib/mc_protocol_e/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module McProtocolE
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mc_protocol_e
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - commis1059
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-02 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler