isomorfeus-transport 23.6.0.rc3 → 23.6.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fb29b2a57a30431960848b37227abb8f031836908dfd2f2e90039a7aff8be22
-  data.tar.gz: a8911affe98af8b1546df6a25dd1156845485bd1236c2682af04fa1b2d98acb0
+  metadata.gz: 71c4133dbd6db3a7ec68fd33734724492990159ac0930baec3de275f5690a3ef
+  data.tar.gz: 4a7136266a220ebf889e0b51ad201adc5df1e5fbf79322ccc10281e3752cb7bf
 SHA512:
-  metadata.gz: 5f85cdf6a4c04573c0b4e1aca212379f83d7ac035a94d2ebfedce483c207c73e6a6a860e2410ec73d80e4172f6f31cbadb9845c72eb2de8dfbd222c9bd8f2f22
-  data.tar.gz: 72cc495665d26d6c07591ba79113e7a388f66ff8852e8e85b56069f7e40b62c89598a437334d4508cbbb85e5a9530a867c9657c827301cf6e7667a4c47583ad6
+  metadata.gz: 6a9de85ee25d6581ddc4380f5305288e07dbb7db7df37ff1d0c85ea15826cbb6b7bde3ace5037cd44893d94b76258c60b7491aacdd24b9c1a09cd4a34dabbbd6
+  data.tar.gz: e05b34fd3c4a762b5287801f946a5fcff29360a7d8b130c88fdba3ac0752d7396c8f771786bcab27ad39f021d83307ea70a5301a5ae24f285b4588def56f66d9

data/lib/isomorfeus/core_ext/hash_ext.rb

@@ -1,77 +1,77 @@
-class Hash
-  def deep_freeze
-    each_value do |value|
-      value.deep_freeze if value.is_a?(Hash)
-    end
-    self
-  end
-
-  if RUBY_ENGINE == 'opal'
-    def self.recursive_new(obj)
-      %x{
-        var key, val;
-        for (var key in obj) {
-          val = obj[key];
-          if (val !== null && typeof val === "object" && !val.$$is_array && !val.$$is_hash && !Array.isArray(val)) {
-            obj[key] = #{Hash.recursive_new(`val`)};
-          }
-        }
-        return Opal.hash(obj);
-      }
-    end
-  end
-
-  # originally taken from: https://github.com/rails/rails/blob/main/activesupport/lib/active_support/core_ext/object/deep_dup.rb
-  # Returns a deep copy of hash.
-  #
-  #   hash = { a: { b: 'b' } }
-  #   dup  = hash.deep_dup
-  #   dup[:a][:c] = 'c'
-  #
-  #   hash[:a][:c] # => nil
-  #   dup[:a][:c]  # => "c"
-  def deep_dup
-    hash = dup
-    each_pair do |key, value|
-      if ::String === key || ::Symbol === key
-        hash[key] = value.deep_dup
-      else
-        hash.delete(key)
-        hash[key.deep_dup] = value.deep_dup
-      end
-    end
-    hash
-  end
-
-  # originally taken from: https://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
-  # Returns a new hash with +self+ and +other_hash+ merged recursively.
-  #
-  #   h1 = { a: true, b: { c: [1, 2, 3] } }
-  #   h2 = { a: false, b: { x: [3, 4, 5] } }
-  #
-  #   h1.deep_merge(h2) # => { a: false, b: { c: [1, 2, 3], x: [3, 4, 5] } }
-  #
-  # Like with Hash#merge in the standard library, a block can be provided
-  # to merge values:
-  #
-  #   h1 = { a: 100, b: 200, c: { c1: 100 } }
-  #   h2 = { b: 250, c: { c1: 200 } }
-  #   h1.deep_merge(h2) { |key, this_val, other_val| this_val + other_val }
-  #   # => { a: 100, b: 450, c: { c1: 300 } }
-  def deep_merge(other_hash, &block)
-    dup.deep_merge!(other_hash, &block)
-  end
-
-  # Same as +deep_merge+, but modifies +self+.
-  def deep_merge!(other_hash, &block)
-    merge!(other_hash) do |key, this_val, other_val|
-      if this_val.is_a?(Hash) && other_val.is_a?(Hash)
-        this_val.deep_merge(other_val, &block)
-      elsif block_given?
-        block.call(key, this_val, other_val)
-      else
-        other_val
-      end
-    end
-  end
-end
+class Hash
+  def deep_freeze
+    each_value do |value|
+      value.deep_freeze if value.is_a?(Hash)
+    end
+    self
+  end
+
+  if RUBY_ENGINE == 'opal'
+    def self.recursive_new(obj)
+      %x{
+        var key, val;
+        for (var key in obj) {
+          val = obj[key];
+          if (val !== null && typeof val === "object" && !val.$$is_array && !val.$$is_hash && !Array.isArray(val)) {
+            obj[key] = #{Hash.recursive_new(`val`)};
+          }
+        }
+        return Opal.hash(obj);
+      }
+    end
+  end
+
+  # originally taken from: https://github.com/rails/rails/blob/main/activesupport/lib/active_support/core_ext/object/deep_dup.rb
+  # Returns a deep copy of hash.
+  #
+  #   hash = { a: { b: 'b' } }
+  #   dup  = hash.deep_dup
+  #   dup[:a][:c] = 'c'
+  #
+  #   hash[:a][:c] # => nil
+  #   dup[:a][:c]  # => "c"
+  def deep_dup
+    hash = dup
+    each_pair do |key, value|
+      if ::String === key || ::Symbol === key
+        hash[key] = value.deep_dup
+      else
+        hash.delete(key)
+        hash[key.deep_dup] = value.deep_dup
+      end
+    end
+    hash
+  end
+
+  # originally taken from: https://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
+  # Returns a new hash with +self+ and +other_hash+ merged recursively.
+  #
+  #   h1 = { a: true, b: { c: [1, 2, 3] } }
+  #   h2 = { a: false, b: { x: [3, 4, 5] } }
+  #
+  #   h1.deep_merge(h2) # => { a: false, b: { c: [1, 2, 3], x: [3, 4, 5] } }
+  #
+  # Like with Hash#merge in the standard library, a block can be provided
+  # to merge values:
+  #
+  #   h1 = { a: 100, b: 200, c: { c1: 100 } }
+  #   h2 = { b: 250, c: { c1: 200 } }
+  #   h1.deep_merge(h2) { |key, this_val, other_val| this_val + other_val }
+  #   # => { a: 100, b: 450, c: { c1: 300 } }
+  def deep_merge(other_hash, &block)
+    dup.deep_merge!(other_hash, &block)
+  end
+
+  # Same as +deep_merge+, but modifies +self+.
+  def deep_merge!(other_hash, &block)
+    merge!(other_hash) do |key, this_val, other_val|
+      if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+        this_val.deep_merge(other_val, &block)
+      elsif block_given?
+        block.call(key, this_val, other_val)
+      else
+        other_val
+      end
+    end
+  end
+end

data/lib/isomorfeus/core_ext/kernel.rb

@@ -1,24 +1,12 @@
 module Kernel
-  def promise(&block)
-    p = Promise.new
-
+  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
-
-    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
 
@@ -33,13 +21,6 @@ module Kernel
     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

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.rc3'
+    VERSION = '23.6.0.rc5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-transport
 version: !ruby/object:Gem::Version
-  version: 23.6.0.rc3
+  version: 23.6.0.rc5
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-18 00:00:00.000000000 Z
+date: 2023-06-22 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.rc3
+        version: 23.6.0.rc5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.6.0.rc3
+        version: 23.6.0.rc5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement