rakie 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e8894b95a11cbe14455b61e0df6fbbd6e9e8ded9e6a723ca2a36e9d6d05256d
-  data.tar.gz: 52d125bf806aacbde166336054a14ddbbc7f2bf5dab097a5050c5339e94e3a86
+  metadata.gz: 196e26c710b29918f06ee04e5303caf7f08a1ab989cd6614e36cb469dd3e24b3
+  data.tar.gz: 15d0459b668f44c3fe8e9b323a24f8f1c19c647e29ec7a7cd9477615063a6961
 SHA512:
-  metadata.gz: 047cf559ae5bd1a4bb90f1ad04c83f9635d2d0368606612917a8a78d1799138167666d768ebd62c84998153a478281c3adc24bcc3071af8146190649e31c3141
-  data.tar.gz: c2c07ca6562b9631521e4482653a7af948f8f39c20a001f2220dea1a0dfca808473b0b9ffe53b76976aa1962e81a1a1ce2bd1216377ee737acb367a27109c7c7
+  metadata.gz: 8f1ac0ed83237b1c57c3c1a58d4b9415602804d92d035ac89238435927efa7f8eb7c29166f0e174bb91bf92b47d63ec47a159c6b8a427b2a280509908acb06cb
+  data.tar.gz: 6ebde9c958b93c395b88c30c6ac53eb8418eeb8c9571043d66364b508df148d97456a5b10948993b4b42422324618f1568632287e2e0cf3468d37e53a1b2799a

data/lib/rakie/version.rb

@@ -1,5 +1,5 @@
 module Rakie
-  VERSION = [0, 0, 9]
+  VERSION = [0, 0, 10]
 
   def self.version_s
     VERSION.join('.')

data/lib/rakie/websocket.rb

@@ -21,64 +21,75 @@ module Rakie
       @client_side = true
     end
 
+    # @param [String] data
     def on_recv(channel, data)
       Log.debug("Rakie::Websocket recv: #{data}")
 
-      # @type [WebsocketMessage] request
-      message = @recv_message
+      total_parsed = 0
 
-      if message.parse_status == ParseStatus::COMPLETE
-        message = WebsocketMessage.new
-        @recv_message = message
-      end
+      while data.length > 0
+        # @type [WebsocketMessage] request
+        message = @recv_message
 
-      len = message.parse(data)
+        if message.parse_status == ParseStatus::COMPLETE
+          message = WebsocketMessage.new
+          @recv_message = message
+        end
 
-      Log.debug("Rakie::Websocket receive message: #{message.to_s} parse with #{len}")
+        len = message.parse(data)
+        total_parsed += len
 
-      if message.parse_status == ParseStatus::COMPLETE
-        response = WebsocketMessage.new
+        Log.debug("Rakie::Websocket receive message: #{message.to_s} parse with #{len}")
 
-        if message.op_code == WebsocketMessage::OP_PING
-          response.fin = true
-          response.op_code = WebsocketMessage::OP_PONG
-          response.payload = "Rakie::Websocket: op pong"
+        if message.parse_status == ParseStatus::COMPLETE
+          response = WebsocketMessage.new
 
-        elsif message.op_code == WebsocketMessage::OP_PONG
-          response.fin = true
-          response.op_code = WebsocketMessage::OP_PING
-          response.payload = "Rakie::Websocket: op ping"
+          if message.op_code == WebsocketMessage::OP_PING
+            response.fin = true
+            response.op_code = WebsocketMessage::OP_PONG
+            response.payload = "Rakie::Websocket: op pong"
 
-        elsif message.op_code == WebsocketMessage::OP_CLOSE
-          channel.close
+          elsif message.op_code == WebsocketMessage::OP_PONG
+            response.fin = true
+            response.op_code = WebsocketMessage::OP_PING
+            response.payload = "Rakie::Websocket: op ping"
 
-          Log.debug("Rakie::Websocket: op close")
-          return 0
+          elsif message.op_code == WebsocketMessage::OP_CLOSE
+            channel.close
 
-        elsif @delegate
-          @delegate.on_message(self, message.payload)
-          return len
+            Log.debug("Rakie::Websocket: op close")
+            return 0
 
-        else
-          response.fin = true
-          response.op_code = WebsocketMessage::OP_TEXT
-          response.payload = "Rakie!"
-        end
-        
-        response_data = response.to_s
+          elsif @delegate
+            @delegate.on_message(self, message.payload)
+
+          else
+            response.fin = true
+            response.op_code = WebsocketMessage::OP_TEXT
+            response.payload = "Rakie!"
+          end
+          
+          response_data = response.to_s
 
-        Log.debug("Rakie::Websocket response: #{response_data}")
+          Log.debug("Rakie::Websocket response: #{response_data}")
 
-        channel.write(response_data) # Response data
+          channel.write(response_data) # Response data
 
-      elsif message.parse_status == ParseStatus::ERROR
-        channel.close
+        elsif message.parse_status == ParseStatus::ERROR
+          channel.close
+
+          Log.debug("Rakie::Websocket: Illegal message")
+          return 0
+        end
+
+        if len >= data.length
+          break
+        end
 
-        Log.debug("Rakie::Websocket: Illegal message")
-        return 0
+        data = data[len .. -1]
       end
 
-      return len
+      return total_parsed
     end
 
     def on_send(channel)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rakie
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Jakit Liang