opal-drb 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31f25d589721b4fd2c8e0369f9670d3582f09bc05ed356a9981d592584a255d7
-  data.tar.gz: 3b8019bd1301893dff9835b1c0b97c498923a02b76d157b96ef6eeba46bfe1da
+  metadata.gz: 54baa5953deb2f759b8ddeabe50f9e0d7f3e2e7c69fbb446b208ed59514f11c1
+  data.tar.gz: 87cb35cfb700ade0d9fb180def4811628494a4eb9fc32ee40f7f30e29e39d247
 SHA512:
-  metadata.gz: f0a15f23039a6c46d313ea3b0a3a96473956d2b072b87619195d53d7b8fb5bf2348ed54c04863a358ac306b5124ca7a918e958f61fd07ae3fb90e93d8e858bea
-  data.tar.gz: 0262cde7ac7f3681fd067bc72e630692393d305aca8d246045a66470f7ae78c9b926f4509f8e7ee70d8910dd95c807af9051aa0bf103a4eb8be737b81e68f85a
+  metadata.gz: dcadd165c9f20a2c80ede70c7d3b95bbed9799730aa1be91f9d9b3d3123375abe4650c002d6415f4d19a17a39a6eadd3009f3c55a8d07f2d087c0f7f1cbeefa7
+  data.tar.gz: 2e518ce27d32546f4593fb9ba0ef3da705748df6d6f1766494d54822ab248e8e5b80b4029be522309005054cd5361441f7e35568d35ae943a3c6b0f4d669fb44

data/lib/opal/drb/drb_conn.rb

@@ -39,7 +39,7 @@ module DRb
 
     def send_message(ref, msg_id, arg, b, &callback)
       @protocol.send_request(ref, msg_id, arg, b).then do |stream|
-        yield @protocol.recv_reply stream
+        callback.call(@protocol.recv_reply(stream))
       end
     end
 

data/lib/opal/drb/version.rb

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

data/lib/opal/drb/websocket.rb

@@ -90,6 +90,14 @@ module DRb
       def initialize(uri, ws)
         @uri = uri
         @ws = ws
+        @handlers = {}
+
+        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)
+          @handlers.delete(sender_id).call(message)
+        end
       end
 
       def self.open(uri)
@@ -107,6 +115,21 @@ module DRb
         self.new(uri, ws)
       end
 
+      def send(data, &block)
+        sender_id = SecureRandom.uuid
+        @handlers[sender_id] = block
+        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`)
+          end
+        else
+          @ws.send(`new Uint8Array(#{byte_data}).buffer`)
+        end
+      end
+
       def [](uri)
         @sockets[uri].ws
       end
@@ -201,7 +224,6 @@ module DRb
         @config = config
         @msg = DRbMessage.new(@config)
         @req_stream = stream
-        @sender_id = SecureRandom.uuid
       end
 
       def close
@@ -237,7 +259,6 @@ module DRb
         @res = nil
         @config = config
         @msg = DRbMessage.new(@config)
-        @sender_id = SecureRandom.uuid
       end
 
       def alive?
@@ -259,15 +280,7 @@ module DRb
 
       def send(uri, data)
         promise = Promise.new
-        event_handler = Proc.new do |event|
-          message_data = event.data.to_s
-          sender_id = message_data.slice(0, 36)
-          message = message_data.slice(36, message_data.length - 36)
-
-          unless sender_id == @sender_id
-            next
-          end
-
+        @pool.send(data) do |message|
           reply_stream = StrStream.new
           reply_stream.write(message.to_s)
 
@@ -276,20 +289,7 @@ module DRb
           end
 
           promise.resolve reply_stream
-          @pool.ws.off(event_handler)
         end
-        @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 @pool.ws.connecting?
-          @pool.ws.onopen do
-            @pool.ws.send(`new Uint8Array(#{byte_data}).buffer`)
-          end
-        else
-          @pool.ws.send(`new Uint8Array(#{byte_data}).buffer`)
-        end
-
         promise
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-drb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -119,8 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A dRuby implementation for Opal