drb-websocket 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e85bc4e5a760ce0a2db683ff1e2ce1c8e669b7a
-  data.tar.gz: '04272481701b4ccec845f66876ca8899f27a90eb'
+  metadata.gz: c4af96ea554d51d5d2e744d6d49380487d5e3633
+  data.tar.gz: f1f445f420f670f8b6de1b42e39aab2e8c0b5343
 SHA512:
-  metadata.gz: 00c8520e27a1c60c12a58a07dff4d3012a0a28413b18c0de269ca0c63800d3537aa9e8e9ce052467e63c831e7e820a28baa04aa9c42a7cf095df9b30426c685a
-  data.tar.gz: 9f0b53eb4678cf698d5c57c3bb316fade1148300e379fc1182c72c1fd72839e63f901261a6793425bc50f834bc4d0ece0bd607eb11d04eeec072ce38979fb866
+  metadata.gz: 9c14f3b8ff719ccf7c57f364f9f04732ff066a9130f0cee2e0679bbb7c14fb99b35d0ca2f9643e6fc6dbc28af06110ce1a9b33ac7fb21cd0ac25198f6e68af2a
+  data.tar.gz: 991489d663cffde1db4cc133e2364fafa65b7897cafb9ef0c3ceb7a5a9926db8b673726b78cd2a4fc676531a54a86ced87ee62324fe2206dc0c8fcb809f7a693

data/README.md

@@ -5,12 +5,22 @@ A druby protocol of WebSocket
 
 This is experimental implementation of druby protocol with WebSocket.
 
+Installation
+=====
+
+    gem install drb-websocket
+
 How to run
 =====
 
+    cd example
+    bundle install
+
 run server
-    ruby -I . server.rb
+
+    bundle exec ruby -I. server.rb
 
 run client
-    ruby -I . client.rb
+
+    bundle exec ruby -I. client.rb
 

data/lib/drb/websocket/rack_app.rb

@@ -0,0 +1,55 @@
+module DRb
+  module WebSocket
+    class RackApp
+      def initialize(app)
+        @app = app
+      end
+
+      @servers = {}
+      @ws = {}
+
+      def self.server(key)
+        @servers[key]
+      end
+
+      def self.ws
+        @ws
+      end
+
+      def self.close(key)
+        if @ws.has_key?(key)
+          @ws[key].close
+          @ws.delete(key)
+        end
+      end
+
+      def self.register(key, server)
+        @servers[key] = server
+      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
+
+          ws.on :message do |event|
+            res = RackApp.server(key).on_message(event.data)
+            ws.send res.bytes
+          end
+
+          ws.on :close do |event|
+            RackApp.close(key)
+            ws = nil
+          end
+
+          # Return async Rack response
+          ws.rack_response
+        else
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/drb/websocket/server.rb

@@ -1,4 +1,5 @@
 require 'drb/drb'
+require_relative './rack_app'
 require 'drb/websocket'
 require 'thread'
 require 'rack'
@@ -46,12 +47,16 @@ module DRb
         @uri = uri
         @config = config
         @queue = Thread::Queue.new
-        setup_websock(uri)
+
+        Faye::WebSocket.load_adapter('thin')
+
+        u = URI.parse(uri)
+        RackApp.register("#{u.host}:#{u.port}", self)
       end
 
       def close
-        @ws.close if @ws
-        @ws = nil
+        u = URI.parse(@uri)
+        RackApp.close("#{u.host}:#{u.port}")
       end
 
       def push(callback)
@@ -63,40 +68,9 @@ module DRb
         ServerSide.new(client, @config, uri)
       end
 
-      def setup_websock(uri)
-        Faye::WebSocket.load_adapter('thin')
-        thin = Rack::Handler.get('thin')
-
-        u = URI.parse(uri)
-
-        app = lambda do |env|
-          if Faye::WebSocket.websocket?(env)
-            ws = Faye::WebSocket.new(env)
-
-            ws.on :message do |event|
-              callback = Callback.new(self)
-              @queue.push(callback)
-              res = callback.recv_mesg(event.data.pack('C*'))
-              ws.send res.bytes
-            end
-
-            ws.on :close do |event|
-              ws = nil
-            end
-
-            @ws = ws
-
-            # Return async Rack response
-            ws.rack_response
-          else
-            # Normal HTTP request
-            [400, {}, []]
-          end
-        end
-
-        Thread.new do
-          thin.run(app, Host: u.host, Port: u.port)
-        end.run
+      def on_message(data)
+        callback = Callback.new(self)
+        callback.recv_mesg(data.pack('C*'))
       end
     end
 

data/lib/drb/websocket/version.rb

@@ -1,5 +1,5 @@
 module Drb
   module Websocket
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drb-websocket
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-08-24 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/rack_app.rb
 - lib/drb/websocket/server.rb
 - lib/drb/websocket/version.rb
 homepage: https://github.com/youchan/drb-websocket