drb-websocket 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5f989e53a1e77689135c986a7e50e88d7624df6
-  data.tar.gz: d1b5c5e1ff6c7a835652e8ce69abf98337eb6a2b
+  metadata.gz: fe7890accdf437f9175be51a811147a0284968e7
+  data.tar.gz: c584b7b51179842a460f9dc1f5c28fbdc94793aa
 SHA512:
-  metadata.gz: 7dfee7db6bd60abfa61a095a75b2a9c8546ccd4b1cf28d0e4fb01fe75ad9b62a341e534d5c44eb5ad51d39f82616f3fe5bd38e37d163c4561ad6b76805f8b8e0
-  data.tar.gz: d71444cee9c8b450555d8bbaac5342e3efbafc5bc63e2cd1093466ff24b55fd9de8d05cc3d3a378a36a1ec313ca9d4312e96075c8298dbe830678697fdc1f59a
+  metadata.gz: 7ae6b7b7cb4255a8a610a7059910a190d0870a2a4839239db4ccf39322776434f587db5c02b526757a6f1d57b9f1e845ae4874c01bda24db7269ab80d0d8292d
+  data.tar.gz: f34974a952a74ec4cf4c5fcc9ae3b9ae24b1e965d57a7be96237e971dd19e64fed2e019b966e9d8e9c9b27b10ea4104836e8555e2250968c7e5345dc650499a3

data/lib/drb/websocket.rb

@@ -1,8 +1,6 @@
 require "drb/websocket/version"
 require 'drb/drb'
-require 'uri'
-require 'eventmachine'
-require 'faye/websocket'
+require 'drb/websocket/rack_app'
 
 module DRb
   module WebSocket
@@ -28,116 +26,10 @@ module DRb
     def self.uri_option(uri, config)
       return uri, nil
     end
-
-    def self.open(uri, config)
-      unless uri =~ /^ws:\/\/(.*?):(\d+)(\/(.*))?$/
-        raise(DRbBadScheme, uri) unless uri =~ /^ws:/
-        raise(DRbBadURI, 'can\'t parse uri: ' + uri)
-      end
-
-      path, uuid = $4.split('/')
-
-      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
-
-    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
-      end
-
-      def on_session_start(ws)
-        @ws = ws
-      end
-
-      def stream
-        @queue.pop
-      end
-
-      def send(url, data)
-        @ws.send(data.bytes)
-      end
-    end
-
-    class ClientSide
-      def initialize(uri, config, handler)
-        @uri = uri
-        @res = nil
-        @config = config
-        @msg = DRbMessage.new(config)
-        @proxy = ENV['HTTP_PROXY']
-        @handler = handler
-        @queue = Thread::Queue.new
-      end
-
-      def close
-      end
-
-      def alive?
-        false
-      end
-
-      def send_request(ref, msg_id, *arg, &b)
-        stream = StrStream.new
-        @msg.send_request(stream, ref, msg_id, *arg, &b)
-        if @handler
-          @handler.send(@uri, stream.buf)
-        else
-          send(@uri, stream.buf)
-        end
-      end
-
-      def recv_reply
-        Thread.start do
-          @reply_stream = @handler.stream if @handler
-
-          begin
-            @msg.recv_reply(@reply_stream)
-          rescue
-            close
-            raise $!
-          end
-        end
-      end
-
-      def send(uri, data)
-        @reply_stream = StrStream.new
-        it = URI.parse(uri)
-        path = [(it.path=='' ? '/' : it.path), it.query].compact.join('?')
-
-        EM.run do
-          ws = Faye::WebSocket::Client.new(uri + path)
-
-          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
-
-            ws.close
-
-            EM.stop
-          end
-
-          ws.send(data.bytes)
-        end
-      end
-    end
   end
 
   DRbProtocol.add_protocol(WebSocket)
 end
+
+require 'drb/websocket/client'
+require 'drb/websocket/server'

data/lib/drb/websocket/client.rb

@@ -0,0 +1,130 @@
+require 'uri'
+require 'eventmachine'
+require 'faye/websocket'
+
+module DRb
+  module WebSocket
+    def self.open(uri, config)
+      unless uri =~ /^ws:\/\/(.*?):(\d+)(\/(.*))?$/
+        raise(DRbBadScheme, uri) unless uri =~ /^ws:/
+        raise(DRbBadURI, 'can\'t parse uri: ' + uri)
+      end
+
+      path, uuid = $4.split('/') if $4
+
+      unless path.nil? || path == 'callback'
+        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)
+    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
+      end
+
+      def on_session_start(ws)
+        @ws = ws
+      end
+
+      def stream
+        @queue.pop
+      end
+
+      def send(url, data)
+        @ws.send(data.bytes)
+      end
+    end
+
+    class StandaloneCallbackHandler
+      def initialize(uri, config)
+        @uri = uri
+        @config = config
+        @queue = Thread::Queue.new
+      end
+
+      def stream
+        @queue.pop
+      end
+
+      def fiber=(fiber)
+        @fiber = fiber
+      end
+
+      def send(uri, data)
+        it = URI.parse(uri)
+        path = [(it.path=='' ? '/' : it.path), it.query].compact.join('?')
+
+        Thread.new do
+          EM.run do
+            ws = Faye::WebSocket::Client.new(uri + path)
+
+            ws.on :message do |event|
+              sio = StrStream.new
+              sio.write(event.data.pack('C*'))
+              @queue.push sio
+
+              if @config[:load_limit] < sio.buf.size
+                raise TypeError, 'too large packet'
+              end
+
+              ws.close
+
+              EM.stop
+              @fiber.resume
+            end
+
+            ws.send(data.bytes)
+          end
+        end
+      end
+    end
+
+    class ClientSide
+      def initialize(uri, config, handler)
+        @uri = uri
+        @res = nil
+        @config = config
+        @msg = DRbMessage.new(config)
+        @proxy = ENV['HTTP_PROXY']
+        @handler = handler
+        @queue = Thread::Queue.new
+      end
+
+      def close
+      end
+
+      def alive?
+        false
+      end
+
+      def send_request(ref, msg_id, *arg, &b)
+        stream = StrStream.new
+        @msg.send_request(stream, ref, msg_id, *arg, &b)
+        @handler.send(@uri, stream.buf)
+      end
+
+      def recv_reply
+        @reply_stream = @handler.stream
+
+        begin
+          @msg.recv_reply(@reply_stream)
+        rescue
+          close
+          raise $!
+        end
+      end
+    end
+  end
+end
+

data/lib/drb/websocket/server.rb

@@ -1,6 +1,3 @@
-require 'drb/drb'
-require_relative './rack_app'
-require 'drb/websocket'
 require 'thread'
 require 'rack'
 require 'thin'
@@ -17,27 +14,24 @@ module DRb
       Server.new(uri, config)
     end
 
-    class Callback
-      def initialize(drb)
-        @drb = drb
-        @queue = Thread::Queue.new
+    class Messages
+      def initialize
+        @request_message = Thread::Queue.new
+        @reply_message = Thread::Queue.new
       end
 
-      def recv_mesg(msg)
-        @msg = msg
-        @drb.push(self)
-        @queue.pop
+      def recv_message(message)
+        @request_message.push message
+        @reply_message.pop
       end
 
-      def message
-        @msg
+      def request_message
+        @request_message.pop
       end
 
       def reply(body)
-        @queue.push(body)
+        @reply_message.push(body)
       end
-
-      def close; end
     end
 
     class Server
@@ -63,49 +57,52 @@ module DRb
       end
 
       def close
-        RackApp.close(@uri)
-      end
-
-      def push(callback)
-        @queue.push(callback)
+        @ws.close
+        @ws = nil
       end
 
       def accept
-        callback = @queue.pop
-        ServerSide.new(callback, @config, uri)
+        messages = @queue.pop
+        ServerSide.new(messages, @config, uri)
       end
 
       def on_message(data)
-        callback = Callback.new(self)
-        res = callback.recv_mesg(data.pack('C*'))
-        @ws.send(res.bytes)
       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)
       end
     end
 
     class ServerSide
       attr_reader :uri
 
-      def initialize(callback, config, uri)
+      def initialize(messages, config, uri)
         @uri = uri
-        @callback = callback
+        @messages = messages
         @config = config
         @msg = DRbMessage.new(@config)
-        @req_stream = StrStream.new(@callback.message)
       end
 
       def close
-        @callback.close if @callback
-        @callback = nil
+        @messages = nil
       end
 
-      def alive?; false; end
+      def alive?
+        !!@messages
+      end
 
       def recv_request
         begin
+          @req_stream = StrStream.new(@messages.request_message)
           @msg.recv_request(@req_stream)
         rescue
           close
@@ -115,10 +112,10 @@ module DRb
 
       def send_reply(succ, result)
         begin
-          return unless @callback
+          return unless alive?
           stream = StrStream.new
           @msg.send_reply(stream, succ, result)
-          @callback.reply(stream.buf)
+          @messages.reply(stream.buf)
         rescue
           close
           raise $!

data/lib/drb/websocket/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drb-websocket
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2017-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -115,6 +115,7 @@ files:
 - examples/client.rb
 - examples/server.rb
 - lib/drb/websocket.rb
+- lib/drb/websocket/client.rb
 - lib/drb/websocket/rack_app.rb
 - lib/drb/websocket/server.rb
 - lib/drb/websocket/version.rb
@@ -137,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A druby protocol of WebSocket.