isomorfeus-preact 10.6.40 → 10.6.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48b042cd2e0345a4ebdec7b8991b500d027098042f77bfb66ed73d5d92f4f82b
-  data.tar.gz: aab88a16f927559d005bdf8ac4c1bb79416a0aa82f1f404c3b7b49777d52307d
+  metadata.gz: f82e19631cd8c955b035dec4b355db1f787bb2e16f11e34fd23b4aedc0e68229
+  data.tar.gz: 58db551e7d0d0c8254e506762833ac6fdf303335a7db5aeef55a091e92876c4e
 SHA512:
-  metadata.gz: 2d5aca2872e195df87e5449ab0e25efa3f40034395a31906b6d2a746f60109937663126149669b648e07d62d7ec11a4546fe5def9df0758699b01a7133d04e26
-  data.tar.gz: 329f125f6eea1bbb551070919a0b19af80f5e87c16b40c5397f84f47ee876bc9d4e36ee1a17256cd8a7a4c7dbfb634ad47758fe036c4bfe00432571e6c6e8c1d
+  metadata.gz: 7adb8071b41c381fcbc3ee4aa9f89e90ed1749c8fc518f7b35868c3de6291009465a7c09f745cb18affe7303a23fb3873b4c7e9551fcb3b1a8401c812ab6f7e9
+  data.tar.gz: ff1f52873da1efdbbbd9d6387d05f3683d3d99aea8ad00246e6bc803ea96862023c9ef2ebd879c165d5d326ad3efe707362b62dcc0b651a5581897df6ef4b643

data/lib/isomorfeus/preact_view_helper.rb

@@ -27,7 +27,12 @@ module Isomorfeus
           begin
             init_speednode_context(asset_key, thread_id_asset)
           rescue Exception => e
-            Isomorfeus.raise_error(message: "Server Side Rendering: Failed creating context for #{asset_key}. Error: #{e.message}", stack: e.backtrace)
+            if e.message.include?('@hash[:js][:js][:raw]') # asset bundling did not yet finish
+              sleep 2
+              return mount_component(component_name, props, asset_key, skip_ssr: skip_ssr, use_ssr: use_ssr, max_passes: max_passes)
+            else
+              Isomorfeus.raise_error(message: "Server Side Rendering: Failed creating context for #{asset_key}. Error: #{e.message}", stack: e.backtrace)
+            end
           end
         else
           unless Isomorfeus.ssr_contexts.key?(thread_id_asset)
@@ -37,8 +42,7 @@ module Isomorfeus
 
         ctx = Isomorfeus.ssr_contexts[thread_id_asset]
         pass = 0
-        # if location_host and scheme are given and if Transport is loaded, connect and then render,
-        # otherwise do not render because only one pass is required
+        # if location_host and scheme are given and if Transport is loaded, connect and then render
         ws_scheme = props[:location_scheme] == 'https:' ? 'wss:' : 'ws:'
         location_host = props[:location_host] ? props[:location_host] : 'localhost'
         api_ws_path = Isomorfeus.respond_to?(:api_websocket_path) ? Isomorfeus.api_websocket_path : ''
@@ -92,7 +96,7 @@ module Isomorfeus
         else
           start_time = Time.now
           script_key = if has_transport && has_store
-                         :sill_busy
+                         :still_busy
                        elsif has_transport
                          :transport_busy
                        elsif has_store
@@ -110,11 +114,11 @@ module Isomorfeus
             Isomorfeus.raise_error(message: "Server Side Rendering: #{exception['message']}", stack: exception['stack']) if exception
             if need_further_pass && script_key
               break if (Time.now - start_time) > 5
-              need_further_pass = ctx.eval_script(key: script_key)
-              while need_further_pass
-                break if (Time.now - start_time) > 4
-                sleep 0.01
-                need_further_pass = ctx.eval_script(key: script_key)
+              still_busy = ctx.eval_script(key: script_key)
+              while still_busy
+                break if (Time.now - start_time) > 5
+                sleep 0.005
+                still_busy = ctx.eval_script(key: script_key)
               end
               break if pass >= max_passes
             else
@@ -179,8 +183,8 @@ module Isomorfeus
         ctx.exec(ssr_mod)
         ctx.add_script(key: :first_pass_check, source: '[global.FirstPassFinished, global.NeedFurtherPass, global.Exception ? { message: global.Exception.message, stack: global.Exception.stack } : false ]')
         ctx.add_script(key: :first_pass_result, source: 'Opal.Isomorfeus.SSR.first_pass_result()')
-        ctx.add_script(key: :still_busy, source: 'let nfp = global.Opal.Isomorfeus.Transport["$busy?"]() || global.Opal.Isomorfeus.store["$recently_dispatched?"](); (nfp == nil) ? false : nfp;')
-        ctx.add_script(key: :store_busy, source: 'let nfp = global.Opal.Isomorfeus.store["$recently_dispatched?"](); (nfp == nil) ? false : nfp;')
+        ctx.add_script(key: :still_busy, source: 'Opal.Isomorfeus.SSR.still_busy()')
+        ctx.add_script(key: :store_busy, source: 'Opal.Isomorfeus.SSR.store_busy()')
         ctx.add_script(key: :transport_busy, source: 'global.Opal.Isomorfeus.Transport["$busy?"]()')
         ctx.add_script(key: :transport_disconnect, source: 'global.Opal.Isomorfeus.Transport.$disconnect()')
       end

data/lib/isomorfeus/ssr.rb

@@ -70,6 +70,16 @@ module Isomorfeus
         global.NeedFurtherPass = (nfp == nil) ? false : nfp;
         return [rendered_tree, application_state, ssr_styles, global.Opal.Isomorfeus['$ssr_response_status'](), global.NeedFurtherPass, global.Exception ? { message: global.Exception.message, stack: global.Exception.stack } : false];
       }
+
+      self.still_busy = function(){
+        if (global.Opal.Isomorfeus.Transport["$busy?"]()) { return true; }
+        return self.store_busy();
+      }
+
+      self.store_busy = function() {
+        let nfp = global.Opal.Isomorfeus.store["$recently_dispatched?"]();
+        return (nfp == global.Opal.nil) ? false : nfp;
+      }
     }
   end
 end

data/lib/preact/version.rb

@@ -1,3 +1,3 @@
 module Preact
-  VERSION = '10.6.40'
+  VERSION = '10.6.44'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-preact
 version: !ruby/object:Gem::Version
-  version: 10.6.40
+  version: 10.6.44
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-20 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.16
+        version: 0.14.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.16
+        version: 0.14.17
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
@@ -476,7 +476,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Preact Components for Isomorfeus.