drb-websocket 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89726ee2059536ad9626423ad6414b9e1ce71861
-  data.tar.gz: af8a405c335b1c845fb0bae3d4976a63a8b368f9
+  metadata.gz: f5f989e53a1e77689135c986a7e50e88d7624df6
+  data.tar.gz: d1b5c5e1ff6c7a835652e8ce69abf98337eb6a2b
 SHA512:
-  metadata.gz: 21a810716e7ea6cada26e4e98a3b08d2bc20c2148a1d719b5f9e07b474f627e5876b4dce28861eb08ee833b9f79ee6156ab5060a197e00b79ff6e9fcb5763a17
-  data.tar.gz: dc78d12a2a03a992a9c25a147f1bf2a7d894ff3c78be3cd85865d4c0f435743504c52998b5105fb62025850447f3c1cc462a8a88599deb168d9ab199d52f5030
+  metadata.gz: 7dfee7db6bd60abfa61a095a75b2a9c8546ccd4b1cf28d0e4fb01fe75ad9b62a341e534d5c44eb5ad51d39f82616f3fe5bd38e37d163c4561ad6b76805f8b8e0
+  data.tar.gz: d71444cee9c8b450555d8bbaac5342e3efbafc5bc63e2cd1093466ff24b55fd9de8d05cc3d3a378a36a1ec313ca9d4312e96075c8298dbe830678697fdc1f59a

data/lib/drb/websocket.rb

@@ -35,16 +35,14 @@ module DRb
         raise(DRbBadURI, 'can\'t parse uri: ' + uri)
       end
 
-      path = $4
+      path, uuid = $4.split('/')
 
-      callback_handler = nil
-      if path == 'callback'
-        callback_handler = CallbackHandler.new(uri)
-        RackApp.register(uri, callback_handler)
-      elsif path != nil
+      unless path.nil? || path == 'callback'
         raise(DRbBadURI, 'can\'t parse uri: ' + uri)
       end
 
+      handler = RackApp.handler(uri)
+      callback_handler = handler if CallbackHandler === handler
       ClientSide.new(uri, config, callback_handler)
     end
 
@@ -58,15 +56,18 @@ module DRb
         sio = StrStream.new
         sio.write(data.pack('C*'))
         @queue.push sio
-        nil
       end
 
-      def pop
+      def on_session_start(ws)
+        @ws = ws
+      end
+
+      def stream
         @queue.pop
       end
 
-      def send(data)
-        RackApp.sockets[@uri].send(data.bytes)
+      def send(url, data)
+        @ws.send(data.bytes)
       end
     end
 
@@ -78,6 +79,7 @@ module DRb
         @msg = DRbMessage.new(config)
         @proxy = ENV['HTTP_PROXY']
         @handler = handler
+        @queue = Thread::Queue.new
       end
 
       def close
@@ -91,19 +93,22 @@ module DRb
         stream = StrStream.new
         @msg.send_request(stream, ref, msg_id, *arg, &b)
         if @handler
-          @handler.send(stream.buf)
+          @handler.send(@uri, stream.buf)
         else
           send(@uri, stream.buf)
         end
       end
 
       def recv_reply
-        @reply_stream = @handler.pop if @handler
-        begin
-          @msg.recv_reply(@reply_stream)
-        rescue
-          close
-          raise $!
+        Thread.start do
+          @reply_stream = @handler.stream if @handler
+
+          begin
+            @msg.recv_reply(@reply_stream)
+          rescue
+            close
+            raise $!
+          end
         end
       end
 
@@ -113,23 +118,22 @@ module DRb
         path = [(it.path=='' ? '/' : it.path), it.query].compact.join('?')
 
         EM.run do
-          sio = StrStream.new
-          @ws = Faye::WebSocket::Client.new(uri + path)
+          ws = Faye::WebSocket::Client.new(uri + path)
 
-          @ws.on :message do |event|
+          ws.on :message do |event|
+            sio = StrStream.new
             sio.write(event.data.pack('C*'))
 
             if @config[:load_limit] < sio.buf.size
               raise TypeError, 'too large packet'
             end
 
-            @reply_stream = sio
-            @ws.close
+            ws.close
 
             EM.stop
           end
 
-          @ws.send(data.bytes)
+          ws.send(data.bytes)
         end
       end
     end

data/lib/drb/websocket/rack_app.rb

@@ -7,20 +7,14 @@ module DRb
       end
 
       @handlers = {}
-      @sockets = {}
 
       def self.handler(key)
         @handlers[key]
       end
 
-      def self.sockets
-        @sockets
-      end
-
       def self.close(key)
-        if @sockets.has_key?(key)
-          @sockets[key].close
-          @sockets.delete(key)
+        if @handlers.has_key?(key)
+          @handlers.delete(key)
         end
       end
 
@@ -33,17 +27,18 @@ module DRb
           ws = Faye::WebSocket.new(env)
           req = Rack::Request.new(env)
           uri = "ws://#{req.host}:#{req.port}#{req.path == '/' ? nil : req.path}"
-          RackApp.sockets[uri] = ws
+
+          handler = req.path.start_with?('/callback') ? RackApp.register(uri, CallbackHandler.new(uri)) : RackApp.handler(uri)
+          handler.on_session_start(ws)
 
           ws.on :message do |event|
-            Thread.new do
-              res = RackApp.handler(uri).on_message(event.data)
-              ws.send(res.bytes) if res
-            end.run
+            handler.on_message(event.data)
           end
 
           ws.on :close do |event|
-            RackApp.close(uri)
+            if CallbackHandler === handler
+              RackApp.close(uri)
+            end
             ws = nil
           end
 

data/lib/drb/websocket/server.rb

@@ -63,8 +63,7 @@ module DRb
       end
 
       def close
-        u = URI.parse(@uri)
-        RackApp.close("#{u.host}:#{u.port}")
+        RackApp.close(@uri)
       end
 
       def push(callback)
@@ -72,13 +71,18 @@ module DRb
       end
 
       def accept
-        client = @queue.pop
-        ServerSide.new(client, @config, uri)
+        callback = @queue.pop
+        ServerSide.new(callback, @config, uri)
       end
 
       def on_message(data)
         callback = Callback.new(self)
-        callback.recv_mesg(data.pack('C*'))
+        res = callback.recv_mesg(data.pack('C*'))
+        @ws.send(res.bytes)
+      end
+
+      def on_session_start(ws)
+        @ws = ws
       end
     end
 

data/lib/drb/websocket/version.rb

@@ -1,5 +1,5 @@
 module Drb
   module Websocket
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drb-websocket
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket