opal-drb 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4bf2949ad3c3cad7b882abb2b3f59b7d867ab2a4653b774742e47b292a21c60
-  data.tar.gz: 658007bd8f1d9766569b48b7b62e5bdb2b5851870dc3f1acb56d2c4145975610
+  metadata.gz: 31f25d589721b4fd2c8e0369f9670d3582f09bc05ed356a9981d592584a255d7
+  data.tar.gz: 3b8019bd1301893dff9835b1c0b97c498923a02b76d157b96ef6eeba46bfe1da
 SHA512:
-  metadata.gz: 57b4e20deac64183bacc23d3f5bc304d881306ff75af2b44215dff42cf66c35c034e2921734673d4991becf2ef37d17b4861c3639a2d72f93e51da27448f1cde
-  data.tar.gz: 2293ad912ac41784870eb35d8823c10f06d84b3d940a908605b481a9196d18ed21f672c48ef98d486291551116fc920db3dbddb12d16e220c8090a7042e6adee
+  metadata.gz: f0a15f23039a6c46d313ea3b0a3a96473956d2b072b87619195d53d7b8fb5bf2348ed54c04863a358ac306b5124ca7a918e958f61fd07ae3fb90e93d8e858bea
+  data.tar.gz: 0262cde7ac7f3681fd067bc72e630692393d305aca8d246045a66470f7ae78c9b926f4509f8e7ee70d8910dd95c807af9051aa0bf103a4eb8be737b81e68f85a

data/example/Gemfile

@@ -5,7 +5,7 @@ gem 'sinatra-contrib'
 gem 'thin'
 
 gem 'opal'
-gem 'opal-sprockets', github: 'opal/opal-sprockets'
+gem 'opal-sprockets'
 gem 'drb-websocket'
 
 gem 'rake'

data/example/Gemfile.lock

@@ -1,12 +1,3 @@
-GIT
-  remote: git://github.com/opal/opal-sprockets.git
-  revision: 8a8faeb1cfbc51cfa2e71ddb6cf219bd4a14f333
-  specs:
-    opal-sprockets (0.4.2.0.11.0.3.1)
-      opal (~> 0.11.0)
-      sprockets (~> 3.1)
-      tilt (>= 1.4)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -39,6 +30,10 @@ GEM
       hike (~> 1.2)
       parser (= 2.3.3.1)
       sourcemap (~> 0.1.0)
+    opal-sprockets (0.4.2.0.11.0.3.1)
+      opal (~> 0.11.0)
+      sprockets (~> 3.1)
+      tilt (>= 1.4)
     parser (2.3.3.1)
       ast (~> 2.2)
     rack (2.0.6)
@@ -88,7 +83,7 @@ PLATFORMS
 DEPENDENCIES
   drb-websocket
   opal
-  opal-sprockets!
+  opal-sprockets
   rake
   sass
   sinatra

data/example/app/application.rb

@@ -2,13 +2,25 @@ require 'opal'
 require 'native'
 require 'opal/drb'
 
-puts ">>>>>>>> Example"
+obj = DRb::DRbObject.new_with_uri "ws://127.0.0.1:1234"
+DRb.start_service("ws://127.0.0.1:1234/callback")
 
-remote = DRb::DRbObject.new_with_uri "ws://127.0.0.1:1234"
+def interval(interval, &func)
+  %x(
+    setInterval(func, interval);
+  )
+end
+
+obj.test.then do |res|
+  puts res
+end
+
+obj.add_callback do |text|
+  puts text
+end
 
-promise = remote.get
-promise.then do |obj|
-  obj.test.then do |res|
-    puts res
-  end
+i = 0
+interval(1000) do
+  obj.notify("notification #{i}")
+  i += 1
 end

data/example/drb_server.rb

@@ -2,15 +2,23 @@ require 'drb/drb'
 require 'drb/websocket/server'
 
 class SampleObject
+  def initialize
+    @callbacks = []
+  end
+
   def test
     "ACK!"
   end
-end
 
-class SampleFactory
-  def self.get
-    DRbObject.new(SampleObject.new)
+  def notify(text)
+    @callbacks.each do |callback|
+      callback.call(text)
+    end
+  end
+
+  def add_callback(&callback)
+    @callbacks << callback
   end
 end
 
-DRb.start_service("ws://127.0.0.1:1234", SampleFactory)
+DRb.start_service("ws://127.0.0.1:1234", SampleObject.new)

data/example/server.rb

@@ -6,7 +6,7 @@ if development?
 end
 
 class Server < Sinatra::Base
-  OPAL = Opal::Server.new do |server|
+  OPAL = Opal::Sprockets::Server.new do |server|
     server.append_path 'app'
     server.append_path 'assets'
     server.append_path '../lib'

data/lib/opal/drb/drb_object.rb

@@ -44,13 +44,14 @@ module DRb
       @ref
     end
 
-    undef :to_s
-    undef :to_a if respond_to?(:to_a)
-
     def self.id2ref
       @id2ref ||= {}
     end
 
+    def inspect
+      @ref && @ref.inspect
+    end
+
     def respond_to?(msg_id, priv=false)
       case msg_id
       when :_dump
@@ -58,7 +59,7 @@ module DRb
       when :marshal_dump
         false
       else
-        method_missing(:respond_to?, msg_id, priv)
+        false
       end
     end
 

data/lib/opal/drb/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module DRb
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/lib/opal/drb/websocket.rb

@@ -85,17 +85,33 @@ end
 module DRb
   module WebSocket
     class SocketPool
-      def initialize
-        @sockets = {}
-        @proxy = ENV['HTTP_PROXY']
+      attr_reader :uri, :ws
+
+      def initialize(uri, ws)
+        @uri = uri
+        @ws = ws
       end
 
-      def open(uri)
-        @sockets[uri] ||= ::WebSocket.new(uri)
+      def self.open(uri)
+        @sockets ||= {}
+        @sockets[uri] ||= new_connection(uri)
       end
 
-      alias_method :[], :open
+      def self.new_connection(uri)
+        ws = ::WebSocket.new(uri)
+
+        ws.onclose do
+          @sockets[uri] = new_connection(uri)
+        end
+
+        self.new(uri, ws)
+      end
+
+      def [](uri)
+        @sockets[uri].ws
+      end
     end
+
     class StrStream
       def initialize(str='')
         @buf = str
@@ -120,12 +136,11 @@ module DRb
     end
 
     def self.open(uri, config)
-      @pool ||= SocketPool.new
       unless uri =~ /^ws:\/\/(.*?):(\d+)(\/(.*))?$/
         raise(DRbBadScheme, uri) unless uri =~ /^ws:/
         raise(DRbBadURI, 'can\'t parse uri:' + uri)
       end
-      ClientSide.new(uri, @pool[uri], config)
+      ClientSide.new(uri, config)
     end
 
     def self.open_server(uri, config)
@@ -143,27 +158,39 @@ module DRb
       def initialize(uri, config)
         @uri = "#{uri}/#{SecureRandom.uuid}"
         @config = config
+        reconnect
       end
 
       def close
         @ws.close
       end
 
-      def accept
-        ws = ::WebSocket.new(@uri)
-        ws.onmessage do |event|
+      def reconnect
+        @ws.close if @ws
+
+        @ws = ::WebSocket.new(@uri)
+
+        @ws.onclose do |event|
+          reconnect
+        end
+
+        @ws.onmessage do |event|
           message_data = event.data.to_s
           sender_id = message_data.slice(0, 36)
           message = message_data.slice(36, message_data.length - 36)
           stream = StrStream.new(message)
           server_side = ServerSide.new(stream, @config, uri)
-          yield server_side
+          @accepter.call server_side
 
           send_data = sender_id.bytes.each_slice(2).map(&:first)
           send_data += server_side.reply.bytes.each_slice(2).map(&:first)
-          ws.send(`new Uint8Array(#{send_data}).buffer`)
+          @ws.send(`new Uint8Array(#{send_data}).buffer`)
         end
       end
+
+      def accept(&block)
+        @accepter = block
+      end
     end
 
     class ServerSide
@@ -204,9 +231,9 @@ module DRb
     end
 
     class ClientSide
-      def initialize(uri, ws, config)
+      def initialize(uri, config)
         @uri = uri
-        @ws = ws
+        @pool =  SocketPool.open(uri)
         @res = nil
         @config = config
         @msg = DRbMessage.new(@config)
@@ -214,11 +241,10 @@ module DRb
       end
 
       def alive?
-        !!@ws && @ws.open?
+        !!@pool.ws && @pool.ws.open?
       end
 
       def close
-        @ws = nil
       end
 
       def send_request(ref, msg_id, *arg, &b)
@@ -250,18 +276,18 @@ module DRb
           end
 
           promise.resolve reply_stream
-          @ws.off(event_handler)
+          @pool.ws.off(event_handler)
         end
-        @ws.onmessage(&event_handler)
+        @pool.ws.onmessage(&event_handler)
         byte_data = @sender_id.bytes.each_slice(2).map(&:first)
         byte_data += data.bytes.each_slice(2).map(&:first)
 
-        if @ws.connecting?
-          @ws.onopen do
-            @ws.send(`new Uint8Array(#{byte_data}).buffer`)
+        if @pool.ws.connecting?
+          @pool.ws.onopen do
+            @pool.ws.send(`new Uint8Array(#{byte_data}).buffer`)
           end
         else
-          @ws.send(`new Uint8Array(#{byte_data}).buffer`)
+          @pool.ws.send(`new Uint8Array(#{byte_data}).buffer`)
         end
 
         promise

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-drb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-11 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal