rakie 0.0.9 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e8894b95a11cbe14455b61e0df6fbbd6e9e8ded9e6a723ca2a36e9d6d05256d
-  data.tar.gz: 52d125bf806aacbde166336054a14ddbbc7f2bf5dab097a5050c5339e94e3a86
+  metadata.gz: 23af26094d9055fb8b5fab629f98da38db5d8c131839ba9bc895985bf8c7fee1
+  data.tar.gz: ae7faaa4fb5169c9c94734dc19120e3c0048fbefccfca9910cf42dfe92ce0986
 SHA512:
-  metadata.gz: 047cf559ae5bd1a4bb90f1ad04c83f9635d2d0368606612917a8a78d1799138167666d768ebd62c84998153a478281c3adc24bcc3071af8146190649e31c3141
-  data.tar.gz: c2c07ca6562b9631521e4482653a7af948f8f39c20a001f2220dea1a0dfca808473b0b9ffe53b76976aa1962e81a1a1ce2bd1216377ee737acb367a27109c7c7
+  metadata.gz: db445b01be6bc431e9763727063ebc2d2af4dbd034e49fa88cd7cd75c308accebbb6396de5fa922f591ae3b1c415b20ffbaf57d99cfd5249135fc0e77d454730
+  data.tar.gz: 894d32ec5f179daefc28a377391cff7bd72321d73fa974f95227c07908d498009504fa0e1a24171e70b3daaa4bfc5f9e2df8f020e307a134b94876805ba7b50a

data/lib/rakie/channel.rb

@@ -56,6 +56,7 @@ module Rakie
       while len > 0
         if len < task
           @write_task[0] = task - len
+          return
         end
 
         len -= task
@@ -65,6 +66,8 @@ module Rakie
           @delegate.on_send(self)
            Log.debug("Channel handle on_send")
         end
+
+        task = @write_task[0]
       end
     end
 
@@ -79,7 +82,7 @@ module Rakie
           @write_buffer = @write_buffer[len .. -1]
         end
 
-        Log.debug("Channel write finished")
+        Log.debug("Channel write #{len} bytes finished")
 
       rescue IO::EAGAINWaitWritable
         self.handle_write(offset)
@@ -146,6 +149,8 @@ module Rakie
       @write_buffer << data
       @write_task << data.length
 
+      Log.debug("write buffer append size: #{data.length}")
+
       Event.modify(@io, self, (Event::READ_EVENT | Event::WRITE_EVENT))
 
       return 0

data/lib/rakie/version.rb

@@ -1,5 +1,5 @@
 module Rakie
-  VERSION = [0, 0, 9]
+  VERSION = [0, 0, 13]
 
   def self.version_s
     VERSION.join('.')
@@ -8,4 +8,4 @@ module Rakie
   def self.full_version_s
     "#{NAME} v#{self.version_s}"
   end
-end
+end

data/lib/rakie/websocket.rb

@@ -21,64 +21,78 @@ module Rakie
       @client_side = true
     end
 
+    # @param [String] data
     def on_recv(channel, data)
-      Log.debug("Rakie::Websocket recv: #{data}")
+      Log.debug("Rakie::Websocket recv len: #{data.length}")
 
-      # @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.payload} 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::CONTINUE
+          break
 
-      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)
@@ -117,7 +131,7 @@ module Rakie
       send_message = ws_message.to_s
       @send_messages << ws_message
 
-      Log.debug("Rakie::Websocket send: #{send_message}")
+      Log.debug("Rakie::Websocket send: #{send_message} with #{send_message.length}")
 
       @channel.write(send_message) # Response data
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rakie
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.13
 platform: ruby
 authors:
 - Jakit Liang
@@ -45,7 +45,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: 2.4.9
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="