rakie 0.0.7 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d49cbaec5f721e084610be70c71ec27438c1fc45433eea9d54b9b72ac89f6b38
-  data.tar.gz: 49466ddeb64dee351f28453c185f392a37aeb4129abc14430911cd9651ca739d
+  metadata.gz: 00b8c6d360d53843cc4a28aa5e80bb8f94f1e53998bf3b12a5046460cd44bbd0
+  data.tar.gz: 237700881bef3c7d7036c76ab206e54f46b48b795631d20241bfeeca8ed382a4
 SHA512:
-  metadata.gz: 4e66c1558d9f29d382f6a6996241562eed1ea56710bc1b81dcdbec8063db4141d45f7c65a1f395199aadbd693807cd957606e61d8d2423175ba1f5e30711a36a
-  data.tar.gz: 34e7343b3c0c1f63dedec91f0eef352d24fae53f025fb158080d4418f0d0ce526ce96de8dd2d9229e1ac7588f7d252669aa7f9d666446ac5559210e30e13aa01
+  metadata.gz: b485134bc665bfbccf116fe0978d6e7689cd334585c5d511f485dcbf2820c7cfd131e224c9b238024ea6e575ec76dffbde6aab9ea21bddfdd6a1a6cfb416a54d
+  data.tar.gz: 4a76980dc7f5229dc428facbb72ee8c719b4d6e815b2418135731f1d87658ccec4bef90e3989dfab2cbd5d1626689b9a96f793d2f394a1ef0c3e84c9267783ea

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)
@@ -104,15 +107,20 @@ module Rakie
     end
 
     def on_detach(io)
+      if io.closed?
+        return
+      end
+
       begin
         io.close
 
-        if @delegate
-          @delegate.on_close(self)
-        end
-
       rescue
         Log.debug("Channel is already closed")
+        return
+      end
+
+      if @delegate
+        @delegate.on_close(self)
       end
 
       Log.debug("Channel close ok")
@@ -141,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, 7]
+  VERSION = [0, 0, 12]
 
   def self.version_s
     VERSION.join('.')

data/lib/rakie/websocket.rb

@@ -21,58 +21,78 @@ module Rakie
       @client_side = true
     end
 
+    # @param [String] data
     def on_recv(channel, data)
-      # Log.debug("Rakie::HTTPServer 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}")
+        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 = "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 = "ping"
+          if message.op_code == WebsocketMessage::OP_PING
+            response.fin = true
+            response.op_code = WebsocketMessage::OP_PONG
+            response.payload = "Rakie::Websocket: op pong"
 
-        elsif @delegate
-          @delegate.on_message(self, message.payload)
-          return len
+          elsif message.op_code == WebsocketMessage::OP_PONG
+            response.fin = true
+            response.op_code = WebsocketMessage::OP_PING
+            response.payload = "Rakie::Websocket: op ping"
 
-        else
-          response.fin = true
-          response.op_code = WebsocketMessage::OP_TEXT
-          response.payload = "Rakie!"
-        end
-        
-        response_data = response.to_s
+          elsif message.op_code == WebsocketMessage::OP_CLOSE
+            channel.close
+
+            Log.debug("Rakie::Websocket: op close")
+            return 0
+
+          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::CONTINUE
+          break
+
+        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 len
+        data = data[len .. -1]
       end
 
-      return len
+      return total_parsed
     end
 
     def on_send(channel)
@@ -109,9 +129,9 @@ module Rakie
       end
 
       send_message = ws_message.to_s
-      @send_messages << send_message
+      @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
@@ -135,4 +155,4 @@ module Rakie
       @channel.write(send_message) # Response data
     end
   end
-end
+end

data/lib/rakie/websocket_server.rb

@@ -5,7 +5,7 @@ module Rakie
       @delegate = delegate
 
       if http_server == nil
-        http_server = HttpServer.new(host, port)
+        http_server = HttpServer.new(host: host, port: port)
       end
 
       @host = http_server.host
@@ -26,7 +26,6 @@ module Rakie
 
       if @delegate
         @delegate.on_connect(ws_client)
-        return
       end
 
       @clients[channel] = ws_client
@@ -52,8 +51,10 @@ module Rakie
       client = @clients[channel]
 
       if client
-        client.on_recv(channel, data)
+        return client.on_recv(channel, data)
       end
+
+      return data.length
     end
 
     def on_send(channel)
@@ -70,6 +71,8 @@ module Rakie
       if client
         client.on_close(channel)
       end
+
+      @clients.delete(channel)
     end
 
     def send(message, is_binary=false); end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rakie
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.12
 platform: ruby
 authors:
 - Jakit Liang
@@ -52,7 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Rakie!