drb-websocket 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '09245285a4bf2d658f2557a741ed7181382ce7a3'
-  data.tar.gz: 152a31071adcade6e234522d0030bb16c0896060
+  metadata.gz: 89726ee2059536ad9626423ad6414b9e1ce71861
+  data.tar.gz: af8a405c335b1c845fb0bae3d4976a63a8b368f9
 SHA512:
-  metadata.gz: 3fd1c8e41edf0584f091b3d5f3f8bd47b9ab75c62a815558273f79b734c1731747491115227e951e08452cbb18432ebd11f652f50cfc713cc050939cc04f7f0f
-  data.tar.gz: 9f4049e8f560f5a45101c80998b81eccce9d30f88d7b3ef4acbb3f5db1691455cf2bf683cdda86ee93108df6b3d61c4b1b4d001e8e975f358f84c731c04283bb
+  metadata.gz: 21a810716e7ea6cada26e4e98a3b08d2bc20c2148a1d719b5f9e07b474f627e5876b4dce28861eb08ee833b9f79ee6156ab5060a197e00b79ff6e9fcb5763a17
+  data.tar.gz: dc78d12a2a03a992a9c25a147f1bf2a7d894ff3c78be3cd85865d4c0f435743504c52998b5105fb62025850447f3c1cc462a8a88599deb168d9ab199d52f5030

data/lib/drb/websocket.rb

@@ -30,20 +30,54 @@ module DRb
     end
 
     def self.open(uri, config)
-      unless uri =~ /^ws:\/\/(.*?):(\d+)(\?(.*))?$/
+      unless uri =~ /^ws:\/\/(.*?):(\d+)(\/(.*))?$/
         raise(DRbBadScheme, uri) unless uri =~ /^ws:/
-        raise(DRbBadURI, 'can\'t parse uri:' + uri)
+        raise(DRbBadURI, 'can\'t parse uri: ' + uri)
+      end
+
+      path = $4
+
+      callback_handler = nil
+      if path == 'callback'
+        callback_handler = CallbackHandler.new(uri)
+        RackApp.register(uri, callback_handler)
+      elsif path != nil
+        raise(DRbBadURI, 'can\'t parse uri: ' + uri)
+      end
+
+      ClientSide.new(uri, config, callback_handler)
+    end
+
+    class CallbackHandler
+      def initialize(uri)
+        @uri = uri
+        @queue = Thread::Queue.new
+      end
+
+      def on_message(data)
+        sio = StrStream.new
+        sio.write(data.pack('C*'))
+        @queue.push sio
+        nil
+      end
+
+      def pop
+        @queue.pop
+      end
+
+      def send(data)
+        RackApp.sockets[@uri].send(data.bytes)
       end
-      ClientSide.new(uri, config)
     end
 
     class ClientSide
-      def initialize(uri, config)
+      def initialize(uri, config, handler)
         @uri = uri
         @res = nil
         @config = config
         @msg = DRbMessage.new(config)
         @proxy = ENV['HTTP_PROXY']
+        @handler = handler
       end
 
       def close
@@ -56,15 +90,25 @@ module DRb
       def send_request(ref, msg_id, *arg, &b)
         stream = StrStream.new
         @msg.send_request(stream, ref, msg_id, *arg, &b)
-        @reply_stream = StrStream.new
-        post(@uri, stream.buf)
+        if @handler
+          @handler.send(stream.buf)
+        else
+          send(@uri, stream.buf)
+        end
       end
 
       def recv_reply
-        @msg.recv_reply(@reply_stream)
+        @reply_stream = @handler.pop if @handler
+        begin
+          @msg.recv_reply(@reply_stream)
+        rescue
+          close
+          raise $!
+        end
       end
 
-      def post(uri, data)
+      def send(uri, data)
+        @reply_stream = StrStream.new
         it = URI.parse(uri)
         path = [(it.path=='' ? '/' : it.path), it.query].compact.join('?')
 

data/lib/drb/websocket/rack_app.rb

@@ -6,42 +6,44 @@ module DRb
         RackApp.config.use_rack = true
       end
 
-      @servers = {}
-      @ws = {}
+      @handlers = {}
+      @sockets = {}
 
-      def self.server(key)
-        @servers[key]
+      def self.handler(key)
+        @handlers[key]
       end
 
-      def self.ws
-        @ws
+      def self.sockets
+        @sockets
       end
 
       def self.close(key)
-        if @ws.has_key?(key)
-          @ws[key].close
-          @ws.delete(key)
+        if @sockets.has_key?(key)
+          @sockets[key].close
+          @sockets.delete(key)
         end
       end
 
-      def self.register(key, server)
-        @servers[key] = server
+      def self.register(key, handler)
+        @handlers[key] = handler
       end
 
       def call(env)
         if Faye::WebSocket.websocket?(env)
           ws = Faye::WebSocket.new(env)
           req = Rack::Request.new(env)
-          key = "#{req.host}:#{req.port}"
-          RackApp.ws[key] = ws
+          uri = "ws://#{req.host}:#{req.port}#{req.path == '/' ? nil : req.path}"
+          RackApp.sockets[uri] = ws
 
           ws.on :message do |event|
-            res = RackApp.server(key).on_message(event.data)
-            ws.send res.bytes
+            Thread.new do
+              res = RackApp.handler(uri).on_message(event.data)
+              ws.send(res.bytes) if res
+            end.run
           end
 
           ws.on :close do |event|
-            RackApp.close(key)
+            RackApp.close(uri)
             ws = nil
           end
 
@@ -59,7 +61,7 @@ module DRb
       end
 
       class Config
-        attr_reader :standalone
+        attr_reader :standalone, :callback_url
 
         def initialize
           @standalone = true
@@ -68,6 +70,10 @@ module DRb
         def use_rack=(flag)
           @standalone = !flag
         end
+
+        def callback_url=(url)
+          @callback_url = url
+        end
       end
     end
   end

data/lib/drb/websocket/server.rb

@@ -10,9 +10,9 @@ module DRb
   module WebSocket
 
     def self.open_server(uri, config)
-      unless uri =~ /^ws:\/\/(.*?):(\d+)(\?(.*))?$/
+      unless uri =~ /^ws:\/\/(.*?):(\d+)(\/(.*))?$/
         raise(DRbBadScheme, uri) unless uri =~ /^ws:/
-        raise(DRbBadURI, 'can\'t parse uri:' + uri)
+        raise(DRbBadURI, 'can\'t parse uri: ' + uri)
       end
       Server.new(uri, config)
     end
@@ -51,7 +51,7 @@ module DRb
         Faye::WebSocket.load_adapter('thin')
 
         u = URI.parse(uri)
-        RackApp.register("#{u.host}:#{u.port}", self)
+        RackApp.register(uri, self)
 
         if RackApp.config.standalone
           Thread.new do

data/lib/drb/websocket/version.rb

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

metadata

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