isomorfeus-transport 1.0.0.delta10 → 1.0.0.delta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed706a7d3a6e989f81f3a9b6cf323f541e859386253c25ddde04a7cdb0730833
-  data.tar.gz: c11e5f191fd9370a8ca4b52b4e39d38667cfeffa9ddaa5eceee10d87c37c75d2
+  metadata.gz: f637a7069fc7b858050852ba8f7cd080a4cf7d4159ea2e9fc4d8a9cb494ff1b1
+  data.tar.gz: a2ae36795c32e9cd07120506fee28efdcc454fee98d81d666f717cfea29503d7
 SHA512:
-  metadata.gz: 959a440dca5596a3b7cf12370e11e4503c7c9a0dab61b492d4e352b0132117def173145bade30a4f6c3c73a4b8e7a57c9a0cdebbdba5514beefc1c11249fb893
-  data.tar.gz: cfe2b33058e68434b4e1e2993ba1f5950e32b45810dc550ae00e24b6fd88ab705e314a066826bea0d9a915f8c560f355ccd4c43a21320be81a8319294df7cfbc
+  metadata.gz: e98bb7ab2ba2ce0323e625344f2af8ade9c3a1429dd7cc0b5657b3aed6f52f39bde20a9a930b955343eceb0f1407f8e4838196fec7500b489fad5ffad0cd1550
+  data.tar.gz: '039b561818a90dc85a0f2accf58b0b007d322441a102c88b7ea17120eb726fd36c4fc1fe2e0f8393c2e9badfa2e7823fbda9f4de97afdf37efe2ce886a81c6db'

data/lib/isomorfeus/transport/config.rb

@@ -2,7 +2,12 @@ module Isomorfeus
   # available settings
 
   if RUBY_ENGINE == 'opal'
+    def self.add_transport_init_class_name(init_class_name)
+      transport_init_class_names << init_class_name
+    end
+
     add_client_option(:api_websocket_path)
+    add_client_option(:transport_init_class_names, [])
   else
     class << self
       attr_accessor :api_websocket_path

data/lib/isomorfeus/transport/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Transport
-    VERSION = '1.0.0.delta10'
+    VERSION = '1.0.0.delta11'
   end
 end

data/lib/isomorfeus/transport/websocket.rb

@@ -37,6 +37,10 @@ module Isomorfeus
           @native_websocket.JS[:onmessage] = `function(event) { block.$call(event); }`
         end
 
+        def on_open(&block)
+          @native_websocket.JS[:onopen] = `function(event) { block.$call(event); }`
+        end
+
         def send(data)
           case ready_state
           when OPEN then @native_websocket.JS.send(data)

data/lib/isomorfeus/transport.rb

@@ -8,14 +8,19 @@ module Isomorfeus
           `setTimeout(#{block.to_n}, ms)`
         end
 
-        def init!
+        def init
           @requests_in_progress = { requests: {}, agent_ids: {} }
           @socket = nil
-          connect if Isomorfeus.on_browser?
+          promise_connect if Isomorfeus.on_browser?
+          true
         end
 
-        def connect
-          return if @socket && @socket.ready_state < 2
+        def promise_connect
+          promise = Promise.new
+          if @socket && @socket.ready_state < 2
+            promise.resolve(true)
+            return promise
+          end
           if Isomorfeus.on_browser?
             window_protocol = `window.location.protocol`
             ws_protocol = window_protocol == 'https:' ? 'wss:' : 'ws:'
@@ -34,7 +39,19 @@ module Isomorfeus
             json_hash = `Opal.Hash.$new(JSON.parse(event.data))`
             Isomorfeus::Transport::ClientProcessor.process(json_hash)
           end
-          true
+          @socket.on_open do |event|
+            init_promises = []
+            Isomorfeus.transport_init_class_names.each do |constant|
+              result = constant.constantize.send(:init)
+              init_promises << result if result.class == Promise
+            end
+            if init_promises.size > 0
+              Promise.when(*init_promises).then { promise.resolve(true) }
+            else
+              promise.resolve(true)
+            end
+          end
+          promise
         end
 
         def disconnect
@@ -44,8 +61,15 @@ module Isomorfeus
 
         def promise_send_path(*path, &block)
           request = {}
-          path.inject(request) do |memo, key|
-            memo[key] = {}
+          inject_path = path[0...-1]
+          last_inject_path_el = inject_path.last
+          last_path_el = path.last
+          inject_path.inject(request) do |memo, key|
+            if key == last_inject_path_el
+              memo[key] = last_path_el
+            else
+              memo[key] = {}
+            end
           end
           Isomorfeus::Transport.promise_send_request(request, &block)
         end

data/lib/isomorfeus-transport.rb

@@ -1,6 +1,7 @@
 require 'opal'
 require 'opal-autoloader'
 require 'opal-activesupport'
+require 'isomorfeus-react'
 if RUBY_ENGINE == 'opal'
   require 'json'
   require 'isomorfeus/config'
@@ -14,7 +15,7 @@ if RUBY_ENGINE == 'opal'
   require 'lucid_channel/mixin'
   require 'lucid_channel/base'
   Opal::Autoloader.add_load_path('channels')
-  Isomorfeus::Transport.init!
+  Isomorfeus.add_client_init_class_name('Isomorfeus::Transport')
 else
   require 'base64'
   require 'digest'

data/lib/lucid_handler/mixin.rb

@@ -6,7 +6,7 @@ module LucidHandler
       base.instance_exec do
         def on_request(&block)
           define_method :process_request do |*args|
-            block.call(*args)
+            instance_exec(*args, &block)
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-transport
 version: !ruby/object:Gem::Version
-  version: 1.0.0.delta10
+  version: 1.0.0.delta11
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-10 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.9
+        version: 4.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.9
+        version: 4.0.11
 - !ruby/object:Gem::Dependency
   name: isomorfeus-react
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 16.9.0
+        version: 16.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 16.9.0
+        version: 16.9.2
 - !ruby/object:Gem::Dependency
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement