opal-drb 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b15bcbd00eb42ad9a6e0bbd97eff77a0cf839d67
-  data.tar.gz: 1e1c07dddf6707a8f1aee7d102b90a091918a027
+SHA256:
+  metadata.gz: e4bf2949ad3c3cad7b882abb2b3f59b7d867ab2a4653b774742e47b292a21c60
+  data.tar.gz: 658007bd8f1d9766569b48b7b62e5bdb2b5851870dc3f1acb56d2c4145975610
 SHA512:
-  metadata.gz: fbae91fd2584a7d00a86b888ef1066e66cd170108d5ef10cdeb3ff87cb37f6bf40a2a38927e57bfb023cfe34a7162cc64cdf395b5ddc058c88f7cb7dca0b1eac
-  data.tar.gz: faffca7fce4a793ea4a1109cf1dadb582d5332345113f5612917c12d14e0653fd4afbd4a754258fdefb38b51a15d2d05545862dfcab775ff361d3912a216252a
+  metadata.gz: 57b4e20deac64183bacc23d3f5bc304d881306ff75af2b44215dff42cf66c35c034e2921734673d4991becf2ef37d17b4861c3639a2d72f93e51da27448f1cde
+  data.tar.gz: 2293ad912ac41784870eb35d8823c10f06d84b3d940a908605b481a9196d18ed21f672c48ef98d486291551116fc920db3dbddb12d16e220c8090a7042e6adee

data/example/Gemfile

@@ -4,7 +4,7 @@ gem 'sinatra'
 gem 'sinatra-contrib'
 gem 'thin'
 
-gem 'opal', github: 'youchan/opal', branch: 'marshal-dump-bignum'
+gem 'opal'
 gem 'opal-sprockets', github: 'opal/opal-sprockets'
 gem 'drb-websocket'
 

data/example/Gemfile.lock

@@ -1,87 +1,93 @@
 GIT
-  remote: https://github.com/opal/opal-sprockets.git
-  revision: a063dffd884b495ed0c54b4c3b0b1cacc4abb322
+  remote: git://github.com/opal/opal-sprockets.git
+  revision: 8a8faeb1cfbc51cfa2e71ddb6cf219bd4a14f333
   specs:
-    opal-sprockets (0.4.1.0.11.0.rc1.3.1.beta2)
-      opal (~> 0.11.0.rc1)
+    opal-sprockets (0.4.2.0.11.0.3.1)
+      opal (~> 0.11.0)
       sprockets (~> 3.1)
       tilt (>= 1.4)
 
-GIT
-  remote: https://github.com/youchan/opal.git
-  revision: 1a5a59b66a0469c73c18e90c66591a7a66421de5
-  branch: marshal-dump-bignum
-  specs:
-    opal (0.11.0.rc1)
-      ast (>= 2.3.0)
-      hike (~> 1.2)
-      parser (= 2.3.3.1)
-      sourcemap (~> 0.1.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.3.0)
-    backports (3.8.0)
-    concurrent-ruby (1.0.5)
-    daemons (1.2.4)
-    drb-websocket (0.2.0)
+    activesupport (5.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    ast (2.4.0)
+    backports (3.11.4)
+    concurrent-ruby (1.1.3)
+    daemons (1.2.6)
+    drb-websocket (0.4.0)
       faye-websocket
       rack
       thin
-    eventmachine (1.2.5)
+    eventmachine (1.2.7)
     faye-websocket (0.10.7)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
-    ffi (1.9.18)
+    ffi (1.9.25)
     hike (1.2.3)
-    multi_json (1.12.1)
-    mustermann (1.0.0)
+    i18n (1.1.1)
+      concurrent-ruby (~> 1.0)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    mustermann (1.0.3)
+    opal (0.11.4)
+      ast (>= 2.3.0)
+      hike (~> 1.2)
+      parser (= 2.3.3.1)
+      sourcemap (~> 0.1.0)
     parser (2.3.3.1)
       ast (~> 2.2)
-    rack (2.0.3)
-    rack-protection (2.0.0)
+    rack (2.0.6)
+    rack-protection (2.0.4)
       rack
-    rake (12.0.0)
-    rb-fsevent (0.10.2)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    sass (3.5.1)
+    sass (3.7.2)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sinatra (2.0.0)
+    sinatra (2.0.4)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.0)
+      rack-protection (= 2.0.4)
       tilt (~> 2.0)
-    sinatra-contrib (2.0.0)
-      backports (>= 2.0)
+    sinatra-contrib (2.0.4)
+      activesupport (>= 4.0.0)
+      backports (>= 2.8.2)
       multi_json
       mustermann (~> 1.0)
-      rack-protection (= 2.0.0)
-      sinatra (= 2.0.0)
+      rack-protection (= 2.0.4)
+      sinatra (= 2.0.4)
       tilt (>= 1.3, < 3)
     sourcemap (0.1.1)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
+    thread_safe (0.3.6)
     tilt (2.0.8)
-    websocket-driver (0.6.5)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   drb-websocket
-  opal!
+  opal
   opal-sprockets!
   rake
   sass
@@ -90,4 +96,4 @@ DEPENDENCIES
   thin
 
 BUNDLED WITH
-   1.15.3
+   1.17.1

data/example/config.ru

@@ -16,10 +16,6 @@ app = Rack::Builder.app do
   map '/assets' do
     run Server::OPAL.sprockets
   end
-
-  map '/__OPAL_SOURCE_MAPS__' do
-    run Opal::SourceMapServer.new(Server::OPAL.sprockets, '/__OPAL_SOURCE_MAPS__')
-  end
 end
 
 require_relative './drb_server'

data/lib/opal/drb/version.rb

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

data/lib/opal/drb/websocket.rb

@@ -27,23 +27,51 @@ class WebSocket
   def initialize(url)
     super `new WebSocket(url)`
     `self.native.binaryType = 'arraybuffer'`
+    @listeners = {}
   end
 
-  def onmessage
-    add_event_listener('message') {|event| yield MessageEvent.new(event) if self.open? }
+  def onmessage(&block)
+    listener = Proc.new {|event| yield MessageEvent.new(event) if self.open? }
+    @listeners[block] = [:message, listener]
+    add_event_listener('message', &listener)
   end
 
-  def onopen
-    add_event_listener('open') {|event| yield MessageEvent.new(event) if self.open? }
+  def onopen(&block)
+    listener = Proc.new {|event| yield Native(event) }
+    @listeners[block] = [:open, listener]
+    add_event_listener('open', &listener)
+  end
+
+  def onclose(&block)
+    listener = Proc.new {|event| yield Native(event) }
+    @listeners[block] = [:close, listener]
+    add_event_listener('close', &listener)
+  end
+
+  def off handler
+    remove_event_listener(*@listeners[handler])
+  end
+
+  def connecting?
+    `#@native.readyState === 0`
   end
 
   def open?
-    `self.native.readyState == 1`
+    `#@native.readyState === 1`
+  end
+
+  def closing?
+    `#@native.readyState === 2`
+  end
+
+  def closed?
+    `#@native.readyState === 3`
   end
 
   alias_native :close
   alias_native :send
   alias_native :add_event_listener, :addEventListener
+  alias_native :remove_event_listener, :removeEventListener
 
   class MessageEvent
     include Native
@@ -56,6 +84,18 @@ end
 
 module DRb
   module WebSocket
+    class SocketPool
+      def initialize
+        @sockets = {}
+        @proxy = ENV['HTTP_PROXY']
+      end
+
+      def open(uri)
+        @sockets[uri] ||= ::WebSocket.new(uri)
+      end
+
+      alias_method :[], :open
+    end
     class StrStream
       def initialize(str='')
         @buf = str
@@ -80,11 +120,12 @@ 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, config)
+      ClientSide.new(uri, @pool[uri], config)
     end
 
     def self.open_server(uri, config)
@@ -111,10 +152,16 @@ module DRb
       def accept
         ws = ::WebSocket.new(@uri)
         ws.onmessage do |event|
-          stream = StrStream.new(event.data.to_s)
+          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
-          ws.send(`new Uint8Array(#{server_side.reply.bytes.each_slice(2).map(&:first)}).buffer`)
+
+          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`)
         end
       end
     end
@@ -127,6 +174,7 @@ module DRb
         @config = config
         @msg = DRbMessage.new(@config)
         @req_stream = stream
+        @sender_id = SecureRandom.uuid
       end
 
       def close
@@ -156,19 +204,21 @@ module DRb
     end
 
     class ClientSide
-      def initialize(uri, config)
+      def initialize(uri, ws, config)
         @uri = uri
+        @ws = ws
         @res = nil
         @config = config
         @msg = DRbMessage.new(@config)
-        @proxy = ENV['HTTP_PROXY']
+        @sender_id = SecureRandom.uuid
       end
 
-      def close
+      def alive?
+        !!@ws && @ws.open?
       end
 
-      def alive?
-        false
+      def close
+        @ws = nil
       end
 
       def send_request(ref, msg_id, *arg, &b)
@@ -178,28 +228,40 @@ module DRb
       end
 
       def recv_reply(reply_stream)
-        @ws.close
         @msg.recv_reply(reply_stream)
       end
 
       def send(uri, data)
         promise = Promise.new
-        @ws = ::WebSocket.new(uri)
-        @ws.onmessage do |event|
+        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
+
           reply_stream = StrStream.new
-          reply_stream.write(event.data.to_s)
+          reply_stream.write(message.to_s)
 
           if @config[:load_limit] < reply_stream.buf.size
             raise TypeError, 'too large packet'
           end
 
           promise.resolve reply_stream
-
-          @ws.close
+          @ws.off(event_handler)
         end
+        @ws.onmessage(&event_handler)
+        byte_data = @sender_id.bytes.each_slice(2).map(&:first)
+        byte_data += data.bytes.each_slice(2).map(&:first)
 
-        @ws.onopen do
-          @ws.send(`new Uint8Array(#{data.bytes.each_slice(2).map(&:first)}).buffer`)
+        if @ws.connecting?
+          @ws.onopen do
+            @ws.send(`new Uint8Array(#{byte_data}).buffer`)
+          end
+        else
+          @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.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2018-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A dRuby implementation for Opal