isomorfeus-transport 23.6.0.rc4 → 23.7.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d5a337a47da0a199bc987865edf18f97858288f7dfe7901b6bad0dbc40d3f1e
-  data.tar.gz: c564283dff2e184318a3617c290cb15675a42d56689069b01555667a62b1ce6a
+  metadata.gz: db7817935d4449c68e69431b5888c0538a76464b04dd25e76fb1e4038a394e92
+  data.tar.gz: 201ab5ad672a7f9520ce89bf4fd5ed125fcc4030b9d1b177e02d500310573d1d
 SHA512:
-  metadata.gz: 1ca77316e1285cfe7c9fbc409ca31e0fd0879610398e9ce3e37594c63ea02df2e9835eb78945f2a18538d7cbc574e5b7d113ca25894d99e1103356b340410d4d
-  data.tar.gz: 903c65c56b7f4d621ed12edbc35094333a0cbdcf12d3843cf388e1802065534837331ad52aa03c60ff19295bfbb19620159e19a043c02bf53a5dcc67ad063be0
+  metadata.gz: 83ea745d6c0748a3d617143c42f0e6ae6b23b6a9519d696bcad80653b3f0c9815436d946b79f2b379e930862d6b69f421e75533bb72c5eda1b4e4d2509483d56
+  data.tar.gz: dc7026235f3ee1f18f7a1afced028b7888ba82fdf6e6b3d6f8c399ee0ee8475201c4cd4aa34720fb2c0c2d16330da55fb1be5a0467abf8991b07b818f8181ea8

data/lib/isomorfeus/core_ext/kernel.rb

@@ -1,56 +1,37 @@
-module Kernel
-  def promise(&block)
-    p = Promise.new
-
-    begin
-      result = block.call
-      return p.resolve(result) if result
-    rescue => e
-      return p.reject(e)
-    end
-
-    pr = proc do
-      begin
-        res = block.call
-        res ? p.resolve(res) : after(10, &pr)
-      rescue => e
-        p.reject(e)
-      end
-    end
-
-    after(10, &pr)
-    p
-  end
-
-  if RUBY_ENGINE == 'opal'
-    def on_browser?; true; end
-    def on_desktop?; false; end
-    def on_mobile?; false; end
-    def on_tablet?; false; end
-    def on_tv?; false; end
-    def on_server?; false; end
-
-    def after(time_ms, &block)
-      `setTimeout(#{block.to_n}, time_ms)`
-    end
-
-    # TODO remove before release
-    %x{
-      Opal.s = function() {
-        return Opal.Isomorfeus.store.$get_state().$to_n();
-      }
-    }
-  else
-    def on_browser?; false; end
-    def on_desktop?; false; end
-    def on_mobile?;  false; end
-    def on_tablet?;  false; end
-    def on_tv?;      false; end
-    def on_server?;  true;  end
-
-    def after(time_ms, &block)
-      sleep time_ms/1000
-      block.call
-    end
-  end
-end
+module Kernel
+  def promise(p = Promise.new, &block)
+    begin
+      result = block.call
+      return p.resolve(result) if result
+      after(10) { promise(p, &block) }
+    rescue => e
+      return p.reject(e)
+    end
+    p
+  end
+
+  if RUBY_ENGINE == 'opal'
+    def on_browser?; true; end
+    def on_desktop?; false; end
+    def on_mobile?; false; end
+    def on_tablet?; false; end
+    def on_tv?; false; end
+    def on_server?; false; end
+
+    def after(time_ms, &block)
+      `setTimeout(#{block.to_n}, time_ms)`
+    end
+  else
+    def on_browser?; false; end
+    def on_desktop?; false; end
+    def on_mobile?;  false; end
+    def on_tablet?;  false; end
+    def on_tv?;      false; end
+    def on_server?;  true;  end
+
+    def after(time_ms, &block)
+      sleep time_ms/1000
+      block.call
+    end
+  end
+end

data/lib/isomorfeus/transport/server_processor.rb

@@ -22,7 +22,7 @@ module Isomorfeus
                   response_agent.error = { error: { handler_class_name => 'No such handler!'}}
                 end
               rescue Exception => e
-                response_agent.error = { response: { error: "#{handler_class_name}: #{e.message}\n#{e.backtrace.join("\n")}" }}
+                response_agent.error = { error: { handler_class_name => "#{e.message}\n#{e.backtrace.join("\n")}" }}
               end
             end
           end

data/lib/isomorfeus/transport/server_socket_processor.rb

@@ -34,20 +34,22 @@ module Isomorfeus
         end
         Thread.current[:isomorfeus_user] = user
         request_hash = Oj.load(data, mode: :strict)
-        unless request_hash.key?(:iso_ping)
+        unless request_hash.key?("iso_ping")
           handler_instance_cache = {}
           response_agent_array = []
           Thread.current[:isomorfeus_pub_sub_client] = client
           process_request(request_hash, handler_instance_cache, response_agent_array)
-          handler_instance_cache.each_value do |handler|
-            handler.resolve if handler.resolving?
-          end
+          # handler_instance_cache.each_value do |handler|
+          #   handler.resolve if handler.resolving?
+          # end
           result = {}
           response_agent_array.each do |response_agent|
             result.deep_merge!(response_agent.result)
           end
           client.write Oj.dump(result, mode: :strict) unless result.empty?
         end
+      rescue => e
+        STDERR.puts "#{e.message}#{e.backtrace&.join("\n")}"
       ensure
         Thread.current[:isomorfeus_user] = nil
         Thread.current[:isomorfeus_pub_sub_client] = nil

data/lib/isomorfeus/transport/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Transport
-    VERSION = '23.6.0.rc4'
+    VERSION = '23.7.0.rc1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-transport
 version: !ruby/object:Gem::Version
-  version: 23.6.0.rc4
+  version: 23.7.0.rc1
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-19 00:00:00.000000000 Z
+date: 2023-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -190,14 +190,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.6.0.rc4
+        version: 23.7.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.6.0.rc4
+        version: 23.7.0.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement