opal-drb 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c71959cd30828a5ce4f4e195aa305cc6b39d0ee8
-  data.tar.gz: b92b60c638453174af654dfefa2a56a5f0e76971
+  metadata.gz: b15bcbd00eb42ad9a6e0bbd97eff77a0cf839d67
+  data.tar.gz: 1e1c07dddf6707a8f1aee7d102b90a091918a027
 SHA512:
-  metadata.gz: 6f0ddc332aba0a9625f3c2dd9ecfa625489c014f89eb3d79f8cef1256be277efe29cd43c1f89df6fffeaa557f8691891384001a9a5cabc3ec1bcb2e7eabda03e
-  data.tar.gz: a368f158fb6aec43bdf87ccd1bad0bf58c7b975d4825f24ba7b103b2f5330843a1260760c85e5579871f3a278ab8ee7594e6a4c5b18fbf7571f3012339cb71d6
+  metadata.gz: fbae91fd2584a7d00a86b888ef1066e66cd170108d5ef10cdeb3ff87cb37f6bf40a2a38927e57bfb023cfe34a7162cc64cdf395b5ddc058c88f7cb7dca0b1eac
+  data.tar.gz: faffca7fce4a793ea4a1109cf1dadb582d5332345113f5612917c12d14e0653fd4afbd4a754258fdefb38b51a15d2d05545862dfcab775ff361d3912a216252a

data/lib/opal/drb/drb_server.rb

@@ -1,15 +1,17 @@
 module DRb
   class DRbServer
-    attr_reader :uri
-
     def initialize(uri)
-      @uri = uri
-      @protocol = DRbProtocol.open_server(@uri)
+      @protocol = DRbProtocol.open_server(uri)
       run
     end
 
+    def uri
+      @protocol.uri
+    end
+
     def run
       @protocol.accept do |client|
+        run
         begin
           succ = false
           invoke_method = InvokeMethod.new(self, client)

data/lib/opal/drb/version.rb

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

data/lib/opal/drb/websocket.rb

@@ -1,5 +1,6 @@
 require 'native'
 require 'promise'
+require 'securerandom'
 
 class ArrayBuffer
   include Native
@@ -29,11 +30,15 @@ class WebSocket
   end
 
   def onmessage
-    add_event_listener('message') {|event| yield MessageEvent.new(event) }
+    add_event_listener('message') {|event| yield MessageEvent.new(event) if self.open? }
   end
 
   def onopen
-    add_event_listener('open') {|event| yield MessageEvent.new(event) }
+    add_event_listener('open') {|event| yield MessageEvent.new(event) if self.open? }
+  end
+
+  def open?
+    `self.native.readyState == 1`
   end
 
   alias_native :close
@@ -87,6 +92,7 @@ module DRb
         raise(DRbBadScheme, uri) unless uri =~ /^ws:/
         raise(DRbBadURI, 'can\'t parse uri:' + uri)
       end
+
       Server.new(uri, config)
     end
 
@@ -94,17 +100,16 @@ module DRb
       attr_reader :uri
 
       def initialize(uri, config)
-        @uri = uri
+        @uri = "#{uri}/#{SecureRandom.uuid}"
         @config = config
       end
 
       def close
-        u = URI.parse(@uri)
-        RackApp.close("#{u.host}:#{u.port}")
+        @ws.close
       end
 
       def accept
-        ws = ::WebSocket.new(uri)
+        ws = ::WebSocket.new(@uri)
         ws.onmessage do |event|
           stream = StrStream.new(event.data.to_s)
           server_side = ServerSide.new(stream, @config, uri)
@@ -189,11 +194,14 @@ module DRb
           end
 
           promise.resolve reply_stream
+
+          @ws.close
         end
 
         @ws.onopen do
           @ws.send(`new Uint8Array(#{data.bytes.each_slice(2).map(&:first)}).buffer`)
         end
+
         promise
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-drb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal