drb-websocket 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fe7890accdf437f9175be51a811147a0284968e7
-  data.tar.gz: c584b7b51179842a460f9dc1f5c28fbdc94793aa
+SHA256:
+  metadata.gz: c2b32ebe2bfd968d7c059fe793877dc8d991c40cd783aa3e09747e74cdfebb6b
+  data.tar.gz: ab794959933f89028c7b31b75e61a0dfd7444f268a5de262b8d4e8f8e2ad2e6e
 SHA512:
-  metadata.gz: 7ae6b7b7cb4255a8a610a7059910a190d0870a2a4839239db4ccf39322776434f587db5c02b526757a6f1d57b9f1e845ae4874c01bda24db7269ab80d0d8292d
-  data.tar.gz: f34974a952a74ec4cf4c5fcc9ae3b9ae24b1e965d57a7be96237e971dd19e64fed2e019b966e9d8e9c9b27b10ea4104836e8555e2250968c7e5345dc650499a3
+  metadata.gz: 36cdc524946deb717b49c50183a48c87f8efe2857986b6d0a9f6ced795d3380853258a68e9d86b95fef6c0dd31e11512b13ce5329b4b9b559681ff4dd456bba1
+  data.tar.gz: 8fe1f109859622d83654b8fe9981c0cc7585bd7b0b05e033afcb615063d52ae67b16a5e4368081e1cbbd05a2dc955d67c6ff590366bf1a1471430419a8699982

data/Gemfile.lock

@@ -1,27 +1,51 @@
+PATH
+  remote: .
+  specs:
+    drb-websocket (0.4.0)
+      faye-websocket
+      rack
+      thin
+
 GEM
   remote: https://rubygems.org/
   specs:
-    daemons (1.2.4)
-    eventmachine (1.2.3)
+    daemons (1.2.6)
+    diff-lcs (1.3)
+    eventmachine (1.2.5)
     faye-websocket (0.10.7)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
-    rack (2.0.3)
+    rack (2.0.4)
+    rake (10.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
     thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    websocket-driver (0.6.5)
+    websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  faye-websocket
-  rack
-  thin
+  bundler (~> 1.14)
+  drb-websocket!
+  rake (~> 10.0)
+  rspec (~> 3.0)
 
 BUNDLED WITH
-   1.14.6
+   1.16.1

data/lib/drb/websocket.rb

@@ -31,5 +31,7 @@ module DRb
   DRbProtocol.add_protocol(WebSocket)
 end
 
+require 'drb/websocket/ws_client'
 require 'drb/websocket/client'
+require 'drb/websocket/callback_server'
 require 'drb/websocket/server'

data/lib/drb/websocket/callback_server.rb

@@ -0,0 +1,74 @@
+module DRb
+  module WebSocket
+    class CallbackServer
+      attr_reader :uri
+
+      def initialize(uri, config)
+        @uri = uri
+        @config = config
+        @wsclient = WSClient.new(uri)
+        @queue = Thread::Queue.new
+
+        @wsclient.on(:message) do |event|
+          message = event.data
+          sender_id = message.shift(36).pack('C*')
+          @queue << [sender_id, message.pack('C*')]
+        end
+      end
+
+      def close
+        @wsclient.close
+        @wsclient = nil
+      end
+
+      def accept
+        (sender_id, message) = @queue.pop
+        ServerSide.new(@wsclient, sender_id, message, @config, @uri)
+      end
+
+      class ServerSide
+        attr_reader :uri
+
+        def initialize(wsclient, sender_id, message, config, uri)
+          @message = message
+          @sender_id = sender_id
+          @wsclient = wsclient
+          @uri = uri
+          @config = config
+          @msg = DRbMessage.new(@config)
+        end
+
+        def close
+          @wsclient = nil
+        end
+
+        def alive?
+          !!@wsclient
+        end
+
+        def recv_request
+          begin
+            @req_stream = StrStream.new(@message)
+            @msg.recv_request(@req_stream)
+          rescue
+            close
+            raise $!
+          end
+        end
+
+        def send_reply(succ, result)
+          begin
+            return unless alive?
+            stream = StrStream.new
+            @msg.send_reply(stream, succ, result)
+            @wsclient.send((@sender_id + stream.buf).bytes)
+          rescue
+            puts $!.full_message
+            close
+            raise $!
+          end
+        end
+      end
+    end
+  end
+end

data/lib/drb/websocket/client.rb

@@ -16,21 +16,25 @@ module DRb
         raise(DRbBadURI, 'can\'t parse uri: ' + uri)
       end
 
-      handler = RackApp.handler(uri)
-      callback_handler = handler || StandaloneCallbackHandler.new(uri, config)
-      ClientSide.new(uri, config, callback_handler)
+      handler = RackApp.handler(uri) || Handler.new(uri, config)
+      ClientSide.new(uri, config, handler)
     end
 
     class CallbackHandler
       def initialize(uri)
         @uri = uri
         @queue = Thread::Queue.new
+        @sender_id = SecureRandom.uuid
       end
 
       def on_message(data)
-        sio = StrStream.new
-        sio.write(data.pack('C*'))
-        @queue.push sio
+        sender_id = data.shift(36).pack('C*')
+
+        if sender_id == @sender_id
+          sio = StrStream.new
+          sio.write(data.pack('C*'))
+          @queue.push sio
+        end
       end
 
       def on_session_start(ws)
@@ -41,51 +45,44 @@ module DRb
         @queue.pop
       end
 
-      def send(url, data)
-        @ws.send(data.bytes)
+      def send(uri, data)
+        @ws.send((@sender_id + data).bytes)
       end
     end
 
-    class StandaloneCallbackHandler
+    class Handler
       def initialize(uri, config)
         @uri = uri
         @config = config
         @queue = Thread::Queue.new
+        @sender_id = SecureRandom.uuid
       end
 
-      def stream
-        @queue.pop
-      end
-
-      def fiber=(fiber)
-        @fiber = fiber
+      def stream(&block)
+        @queue.pop(&block)
       end
 
       def send(uri, data)
-        it = URI.parse(uri)
-        path = [(it.path=='' ? '/' : it.path), it.query].compact.join('?')
+        @wsclient = WSClient.new(uri)
+        @wsclient.on(:message) do |event|
+          message = event.data
+          sender_id = message.shift(36).pack('C*')
 
-        Thread.new do
-          EM.run do
-            ws = Faye::WebSocket::Client.new(uri + path)
+          next if sender_id != @sender_id
 
-            ws.on :message do |event|
-              sio = StrStream.new
-              sio.write(event.data.pack('C*'))
-              @queue.push sio
+          sio = StrStream.new
+          sio.write(message.pack('C*'))
+          @queue.push sio
 
-              if @config[:load_limit] < sio.buf.size
-                raise TypeError, 'too large packet'
-              end
-
-              ws.close
+          if @config[:load_limit] < sio.buf.size
+            raise TypeError, 'too large packet'
+          end
 
-              EM.stop
-              @fiber.resume
-            end
+          @wsclient.close
+        end
 
-            ws.send(data.bytes)
-          end
+        @wsclient.on(:open) do
+          @wsclient.send((@sender_id + data).bytes)
         end
       end
     end
@@ -98,7 +95,6 @@ module DRb
         @msg = DRbMessage.new(config)
         @proxy = ENV['HTTP_PROXY']
         @handler = handler
-        @queue = Thread::Queue.new
       end
 
       def close
@@ -115,10 +111,9 @@ module DRb
       end
 
       def recv_reply
-        @reply_stream = @handler.stream
-
+        reply_stream = @handler.stream
         begin
-          @msg.recv_reply(@reply_stream)
+          @msg.recv_reply(reply_stream)
         rescue
           close
           raise $!

data/lib/drb/websocket/server.rb

@@ -11,26 +11,11 @@ module DRb
         raise(DRbBadScheme, uri) unless uri =~ /^ws:/
         raise(DRbBadURI, 'can\'t parse uri: ' + uri)
       end
-      Server.new(uri, config)
-    end
-
-    class Messages
-      def initialize
-        @request_message = Thread::Queue.new
-        @reply_message = Thread::Queue.new
-      end
-
-      def recv_message(message)
-        @request_message.push message
-        @reply_message.pop
-      end
-
-      def request_message
-        @request_message.pop
-      end
 
-      def reply(body)
-        @reply_message.push(body)
+      if $4 == 'callback'
+        CallbackServer.new(uri, config)
+      else
+        Server.new(uri, config)
       end
     end
 
@@ -41,7 +26,6 @@ module DRb
         @uri = uri
         @config = config
         @queue = Thread::Queue.new
-
         Faye::WebSocket.load_adapter('thin')
 
         u = URI.parse(uri)
@@ -57,47 +41,68 @@ module DRb
       end
 
       def close
-        @ws.close
-        @ws = nil
       end
 
       def accept
-        messages = @queue.pop
-        ServerSide.new(messages, @config, uri)
+        ws = @queue.pop
+        ServerSide.new(ws, @config, uri)
       end
 
       def on_message(data)
       end
 
       def on_session_start(ws)
-        @ws = ws
-        messages = Messages.new
-        @ws.on(:message) do |event|
-          Thread.new do
-            res = messages.recv_message(event.data.pack('C*'))
-            @ws.send(res.bytes)
-          end.run
-        end
-        @queue.push(messages)
+        @queue.push(ws)
+      end
+    end
+
+    class Messages
+      def initialize
+        @request_message = Thread::Queue.new
+        @reply_message = Thread::Queue.new
+      end
+
+      def recv_message(message)
+        @request_message.push message
+        @reply_message.pop
+      end
+
+      def request_message
+        @request_message.pop
+      end
+
+      def reply(body)
+        @reply_message.push(body)
       end
     end
 
     class ServerSide
       attr_reader :uri
 
-      def initialize(messages, config, uri)
+      def initialize(ws, config, uri)
         @uri = uri
-        @messages = messages
         @config = config
         @msg = DRbMessage.new(@config)
+        @ws = ws
+
+        @messages = Messages.new
+        @ws.on(:message) do |event|
+          message = event.data
+          sender_id = message.shift(36)
+          EM.defer do
+            res = @messages.recv_message(message.pack('C*'))
+            @ws.send(sender_id + res.bytes)
+          end
+        end
       end
 
       def close
-        @messages = nil
+        @ws.close
+        @ws = nil
       end
 
       def alive?
-        !!@messages
+        !!@ws
       end
 
       def recv_request

data/lib/drb/websocket/version.rb

@@ -1,5 +1,5 @@
 module Drb
   module Websocket
-    VERSION = "0.3.2"
+    VERSION = "0.4.0"
   end
 end

data/lib/drb/websocket/ws_client.rb

@@ -0,0 +1,63 @@
+
+module DRb
+  module WebSocket
+    class WSClient
+      attr_reader :uri
+
+      def initialize(uri)
+        @uri = uri
+        WSClient.start
+
+        @handlers = { open: [], message: [] }
+        @ws = Faye::WebSocket::Client.new(uri)
+
+        EM.defer do
+          @ws.on :open do |event|
+            @handlers[:open].each do |proc|
+              proc.call event
+            end
+          end
+
+          @ws.on :message do |event|
+            @handlers[:message].each do |proc|
+              proc.call event
+            end
+          end
+        end
+      end
+
+      def on(event, &block)
+        @handlers[event] << block
+      end
+
+      def send(data)
+        @ws.send(data)
+      end
+
+      def close
+        @ws.close
+        @ws = nil
+      end
+
+      def self.start
+        if @thread
+          return
+        end
+
+        @thread = Thread.new do
+          EM.run
+        end
+      end
+
+      def self.thread
+        @thread
+      end
+
+      def self.stop
+        EM.stop
+        @thread.join
+        @thread = nil
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drb-websocket
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-15 00:00:00.000000000 Z
+date: 2018-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -115,10 +115,12 @@ files:
 - examples/client.rb
 - examples/server.rb
 - lib/drb/websocket.rb
+- lib/drb/websocket/callback_server.rb
 - lib/drb/websocket/client.rb
 - lib/drb/websocket/rack_app.rb
 - lib/drb/websocket/server.rb
 - lib/drb/websocket/version.rb
+- lib/drb/websocket/ws_client.rb
 homepage: https://github.com/youchan/drb-websocket
 licenses: []
 metadata: {}
@@ -138,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A druby protocol of WebSocket.