rakie 0.0.5 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 754086391c9ec9e2eb623d8d6a1ead9ca9188d49fb0c391b26c4a9e36db88236
-  data.tar.gz: 6ac34e0868c8bc1748e7f572266b4223a91f676d9d7c11b22fa5a7e10586713c
+  metadata.gz: 196e26c710b29918f06ee04e5303caf7f08a1ab989cd6614e36cb469dd3e24b3
+  data.tar.gz: 15d0459b668f44c3fe8e9b323a24f8f1c19c647e29ec7a7cd9477615063a6961
 SHA512:
-  metadata.gz: 839acbd5155b745948a6144a37480b770e50f01ff4daf29146e39c8fb2e36cf0f434f10313577d3f7b1efcfd039317b036d9c87f96d6c57d09a25c9da6ba5e10
-  data.tar.gz: a844de019fa10103c96e7cc7ab4f7e78ffb2cd5a7c23b28be6483c35fbb7a5cfd1b51f4a1996fa053fa33e03d701af52682c0af306d92b3f2c2c98878aa7c4c6
+  metadata.gz: 8f1ac0ed83237b1c57c3c1a58d4b9415602804d92d035ac89238435927efa7f8eb7c29166f0e174bb91bf92b47d63ec47a159c6b8a427b2a280509908acb06cb
+  data.tar.gz: 6ebde9c958b93c395b88c30c6ac53eb8418eeb8c9571043d66364b508df148d97456a5b10948993b4b42422324618f1568632287e2e0cf3468d37e53a1b2799a

data/lib/rakie/channel.rb

@@ -20,7 +20,10 @@ module Rakie
         end
 
       rescue IO::EAGAINWaitReadable
-        Log.debug("Channel read finished")
+        Log.debug("Channel read pending")
+
+      rescue IO::EWOULDBLOCKWaitReadable
+        Log.debug("Channel read pending")
 
       rescue Exception => e
         # Process the last message on exception
@@ -67,19 +70,27 @@ module Rakie
 
     def on_write(io)
       len = 0
+      offset = 0
 
       begin
         while @write_buffer.length > 0
           len = io.write_nonblock(@write_buffer)
+          offset += len
           @write_buffer = @write_buffer[len .. -1]
         end
 
         Log.debug("Channel write finished")
 
       rescue IO::EAGAINWaitWritable
-        self.handle_write(len)
+        self.handle_write(offset)
 
-        Log.debug("Channel write continue")
+        Log.debug("Channel write pending")
+        return Event::HANDLE_CONTINUED
+
+      rescue IO::EWOULDBLOCKWaitWritable
+        self.handle_write(offset)
+
+        Log.debug("Channel write pending")
         return Event::HANDLE_CONTINUED
 
       rescue
@@ -87,21 +98,26 @@ module Rakie
         return Event::HANDLE_FAILED
       end
 
-      self.handle_write(len)
+      self.handle_write(offset)
 
       return Event::HANDLE_FINISHED
     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")

data/lib/rakie/http_server.rb

@@ -13,10 +13,13 @@ module Rakie
       end
     end
 
-    attr_reader :channel, :opt
+    attr_reader :channel, :opt, :host, :port
 
-    def initialize(delegate=nil)
-      @channel = TCPServerChannel.new('127.0.0.1', 10086, self)
+    def initialize(host: '127.0.0.1', port: 10086, delegate: nil)
+      @host = host
+      @port = port
+
+      @channel = TCPServerChannel.new(host, port, self)
 
       # @type [Hash{Channel=>Session}]
       @sessions = {}
@@ -123,5 +126,9 @@ module Rakie
         end
       end
     end
+
+    def on_close(channel)
+      @sessions.delete(channel)
+    end
   end
 end

data/lib/rakie/version.rb

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

data/lib/rakie/websocket.rb

@@ -21,58 +21,75 @@ 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: #{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}")
+        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 = "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::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,6 +126,7 @@ module Rakie
       end
 
       send_message = ws_message.to_s
+      @send_messages << ws_message
 
       Log.debug("Rakie::Websocket send: #{send_message}")
 
@@ -134,4 +152,4 @@ module Rakie
       @channel.write(send_message) # Response data
     end
   end
-end
+end

data/lib/rakie/websocket_server.rb

@@ -1,13 +1,16 @@
 module Rakie
   class WebsocketServer < Websocket
     # @param [Rakie::HttpServer] http_server
-    def initialize(delegate=nil, http_server=nil)
+    def initialize(host: '127.0.0.1', port: 10086, delegate: nil, http_server: nil)
       @delegate = delegate
 
       if http_server == nil
-        http_server = HttpServer.new('127.0.0.1', 10086, self)
+        http_server = HttpServer.new(host: host, port: port)
       end
 
+      @host = http_server.host
+      @port = http_server.port
+
       http_server.opt[:websocket_delegate] = self
       @channel = http_server.channel
 
@@ -23,7 +26,6 @@ module Rakie
 
       if @delegate
         @delegate.on_connect(ws_client)
-        return
       end
 
       @clients[channel] = ws_client
@@ -49,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)
@@ -67,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.5
+  version: 0.0.10
 platform: ruby
 authors:
 - Jakit Liang
@@ -43,9 +43,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="