isomorfeus-transport 1.0.0.zeta11 → 1.0.0.zeta12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dd43b6af7e9c4592787be224ebcf05ede88f7169098cd773aa2ad2c5f314a1d
-  data.tar.gz: 4902ffccbc569314da2b83dbeee8422b3cad7d8a62ca94de6fdeb4c0d069f110
+  metadata.gz: 429764404614628b8b9f1c62d36a496b57e173dc5c67720f4ba8a07fdac182d8
+  data.tar.gz: 8d125f4501ea5ebbbe32112a77e8a6163907e9fd252e9dbf29f4599fc81e3613
 SHA512:
-  metadata.gz: 7f6570f7548f423cd6782e8bc3ea9574dc4fb0e63e0e7051a0c50f896aeba297bea40bfe2c3d448c30814235b8c4e66a5bf612e3d909d60c2320910e074fdf8f
-  data.tar.gz: c7be8c4efbb79221f4215a3734d40fd731710fdec8579ad3cad18db593cf2eef2eccc673c60697666afd50cb825c8b57b6517b91e0e2db2d8aa068525e0efc3a
+  metadata.gz: 3ef22091cda95389354afd86d0131cb6395bc5d8207f8b310131063c2b2be4d29ea3bf224d702e4c32b9abba981646821ae45dcf98998a2f7ce9525ee27e2da3
+  data.tar.gz: 16395e5e7b942a3317cdacb114f03d97269d2f695dcc1d8b35fadf98acd309bc39e1afdff5551eecd93a43effb22537966d5ebe5fff288e617c08e62b0fc11e6

data/README.md

@@ -32,14 +32,16 @@ Server only:
 
 ## Authentication
 
-For authentication in isomorfeus there is a class `Anonymous`, so whenever no user is logged in, the anonymous user is passed on to operations or data loads. In my opinion it is more true than no user (nil), because in fact there probably is a user, just the user is unknown. The Anonymous user has a default policy that denies everything, the user will respond to .authorized?(whatever) always with false by default.
+For authentication in isomorfeus there is a class `Anonymous`, so whenever no user is logged in, the anonymous user is passed on to operations
+or data loads. In my opinion it is more true than no user (nil), because in fact there probably is a user, just the user is unknown.
+The Anonymous user has a default policy that denies everything, the user will respond to .authorized?(whatever) always with false by default.
 Of  course, the developer can add a Policy easily, to allow certain operations or data loads, or whatever or everything:
 ```ruby
-class MyAnonymousPolicy < LucidPolicy::Base
- policy_for Anonymous
+class AnonymousPolicy < LucidPolicy::Base
  allow all
 end
 ```
+For more information about policy see [the policy docs](https://github.com/isomorfeus/isomorfeus-project/blob/master/ruby/isomorfeus-policy/README.md).
 
 A class representing a user should be a LucidNode and include LucidAuthentication::Mixin:
 ```ruby

data/lib/isomorfeus-transport.rb

@@ -50,7 +50,7 @@ else
   Opal.append_path(__dir__.untaint) unless Opal.paths.include?(__dir__.untaint)
 
   %w[channels handlers server].each do |dir|
-    path =  File.expand_path(File.join('isomorfeus', dir))
+    path =  File.expand_path(File.join('app', dir))
     if Dir.exist?(path)
       Isomorfeus.zeitwerk.push_dir(path)
     end

data/lib/isomorfeus/transport.rb

@@ -5,12 +5,13 @@ module Isomorfeus
         attr_accessor :socket
 
         def delay(ms = 1000, &block)
-          `setTimeout(#{block.to_n}, ms)`
+          `setTimeout(#{block.to_n}, #{ms})`
         end
 
         def init
           @requests_in_progress = { requests: {}, agent_ids: {} }
           @socket = nil
+          @initialized = false
           promise_connect if Isomorfeus.on_browser?
           true
         end
@@ -31,7 +32,7 @@ module Isomorfeus
           @socket = Isomorfeus::Transport::Websocket.new(ws_url)
           @socket.on_error do
             @socket.close
-            delay do
+            delay 1000 do
               Isomorfeus::Transport.promise_connect
             end
           end
@@ -40,15 +41,22 @@ module Isomorfeus
             Isomorfeus::Transport::ClientProcessor.process(json_hash)
           end
           @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
+            if @initialized
+              requests_in_progress[:requests].each_key do |request|
+                agent = get_agent_for_request_in_progress(request)
+                promise_send_request(request) if agent && !agent.sent
+              end
               promise.resolve(true)
+            else
+              @initialized = true
+              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) }
+              end
             end
           end
           promise
@@ -75,10 +83,12 @@ module Isomorfeus
         end
 
         def promise_send_request(request, &block)
-          if request_in_progress?(request)
-            agent = get_agent_for_request_in_progress(request)
-          else
-            agent = Isomorfeus::Transport::RequestAgent.new(request)
+          agent = if request_in_progress?(request)
+                    get_agent_for_request_in_progress(request)
+                  else
+                    Isomorfeus::Transport::RequestAgent.new(request)
+                  end
+          unless agent.sent
             if block_given?
               agent.promise.then do |response|
                 block.call(response)
@@ -86,10 +96,18 @@ module Isomorfeus
             end
             register_request_in_progress(request, agent.id)
             raise 'No socket!' unless @socket
-            @socket.send(`JSON.stringify(#{{request: { agent_ids: { agent.id => request }}}.to_n})`)
-            delay(Isomorfeus.on_ssr? ? 8000 : 20000) do
-              unless agent.promise.realized?
-                agent.promise.reject({agent_response: { error: 'Request timeout!' }, full_response: {}})
+            begin
+              @socket.send(`JSON.stringify(#{{request: { agent_ids: { agent.id => request }}}.to_n})`)
+              agent.sent = true
+              delay(Isomorfeus.on_ssr? ? 8000 : 20000) do
+                unless agent.promise.realized?
+                  agent.promise.reject({agent_response: { error: 'Request timeout!' }, full_response: {}})
+                end
+              end
+            rescue
+              @socket.close
+              delay 5000 do
+                Isomorfeus::Transport.promise_connect
               end
             end
           end

data/lib/isomorfeus/transport/request_agent.rb

@@ -17,6 +17,7 @@ module Isomorfeus
       attr_accessor :result
       attr_accessor :response
       attr_accessor :full_response
+      attr_accessor :sent
       attr_reader :id
       attr_reader :promise
       attr_reader :request
@@ -26,7 +27,8 @@ module Isomorfeus
         self.class.agents[@id] = self
         @promise = Promise.new
         @request = request
+        @sent = false
       end
     end
   end
-end
+end

data/lib/isomorfeus/transport/server_processor.rb

@@ -24,9 +24,7 @@ module Isomorfeus
                   response_agent.error = { error: { handler_class_name => 'No such handler!'}}
                 end
               rescue Exception => e
-                response_agent.error = if Isomorfeus.production? then { error: { handler_class_name => 'No such handler!'}}
-                                       else { response: { error: "#{handler_class_name}: #{e.message}\n#{e.backtrace.join("\n")}" }}
-                                       end
+                response_agent.error = { response: { error: "#{handler_class_name}: #{e.message}\n#{e.backtrace.join("\n")}" }}
               end
             end
           end
@@ -52,9 +50,7 @@ module Isomorfeus
           rescue Exception => e
             response_agent = OpenStruct.new
             response_agent_array << response_agent
-            response_agent.result = if Isomorfeus.production? then { response: { error: 'No such thing!' }}
-                                    else { response: { error: "Isomorfeus::Transport::ServerProcessor: #{e.message}\n#{e.backtrace.join("\n")}" }}
-                                    end
+            response_agent.result = { response: { error: "Isomorfeus::Transport::ServerProcessor: #{e.message}\n#{e.backtrace.join("\n")}" }}
           end
         elsif request.key?('subscribe') && request['subscribe'].key?('agent_ids')
           begin
@@ -75,9 +71,7 @@ module Isomorfeus
               response_agent.error = { error: "No such thing!"}
             end
           rescue Exception => e
-            response_agent.error = if Isomorfeus.production? then { error: 'No such thing!' }
-                                   else { error: "Isomorfeus::Transport::ServerProcessor: #{e.message}\n#{e.backtrace.join("\n")}" }
-                                   end
+            response_agent.error = { error: "Isomorfeus::Transport::ServerProcessor: #{e.message}\n#{e.backtrace.join("\n")}" }
           end
         elsif request.key?('unsubscribe') && request['unsubscribe'].key?('agent_ids')
           begin
@@ -98,10 +92,10 @@ module Isomorfeus
               response_agent.error = { error: 'No such thing!'}
             end
           rescue Exception => e
-            response_agent.error = if Isomorfeus.production? then { error: 'No such thing!' }
-                                   else { error: "Isomorfeus::Transport::ServerProcessor: #{e.message}\n#{e.backtrace.join("\n")}" }
-                                   end
+            response_agent.error = { error: "Isomorfeus::Transport::ServerProcessor: #{e.message}\n#{e.backtrace.join("\n")}" }
           end
+        else
+          response_agent.error = { error: "No such thing!" }
         end
       end
     end

data/lib/isomorfeus/transport/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Transport
-    VERSION = '1.0.0.zeta11'
+    VERSION = '1.0.0.zeta12'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-transport
 version: !ruby/object:Gem::Version
-  version: 1.0.0.zeta11
+  version: 1.0.0.zeta12
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-27 00:00:00.000000000 Z
+date: 2020-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,42 +72,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.16
+        version: 4.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.16
+        version: 4.0.17
 - !ruby/object:Gem::Dependency
   name: isomorfeus-react
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 16.12.6
+        version: 16.12.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 16.12.6
+        version: 16.12.9
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta11
+        version: 1.0.0.zeta12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta11
+        version: 1.0.0.zeta12
 - !ruby/object:Gem::Dependency
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta11
+        version: 1.0.0.zeta12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta11
+        version: 1.0.0.zeta12
 - !ruby/object:Gem::Dependency
   name: opal-webpack-loader
   requirement: !ruby/object:Gem::Requirement