isomorfeus-preact 10.6.41 → 10.6.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5dcd6f47b6c1ee434ae284faa284963185a2e112ff2d31af183b3d14a1a7bbc
-  data.tar.gz: 8317315227778cd9a5ef6f5228eee20676ca87b27e850536ecac4a475b91631d
+  metadata.gz: 3363983634e71069a60fa277a03d0394993690dcf7cab706fb8a28fc22367072
+  data.tar.gz: d8a9855c74eb31e3de87dba1c5bd5c5362a6f2cda93d7bbcb42e8b1ceec6d7ea
 SHA512:
-  metadata.gz: 6dd8b2248f31ccbc1fbdf96a4bdeb9bfac4e402f482e5bbc96380af80f462a66f666459ed48fc3060a489dfe6dfc18da56e337b1553c9cf9bf99d58da8ff2bc8
-  data.tar.gz: d1f318b2e409084902e83beeb5c2803c676a079ed381df72d0db97f7ab056865bfdfce4d7ebd5d734d782068701df6152f81c895ab59c12acb3f3fd7b8d3ef9b
+  metadata.gz: 8a2e5544a14afdb95e1ca54a679285fffffacb9d25b8c8ab7971acd70d71221fde8b4c28733ee0aa4ca8900226653db6273de1d1d14552214a7c8458e6f51b88
+  data.tar.gz: 2cf4331a001fce697899ebaacb409a50a8d1873efad53f52ebf4612cac50f02f8616eac13b9ab62518417f78503c7077750f8fc5a361ff53e3c4d36a865f4bce

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 : ''
@@ -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,10 +183,10 @@ 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()')
+        ctx.add_script(key: :transport_disconnect, source: 'global.Opal.Isomorfeus.SSR.$disconnect_transport()')
       end
     end
 

data/lib/isomorfeus/ssr.rb

@@ -70,6 +70,25 @@ 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;
+      }
     }
+
+    def self.disconnect_transport
+      Isomorfeus::Transport::RequestAgent.agents.each do |agent_id, agent|
+        agent.promise.reject() unless agent.promise.realized?
+        Isomorfeus::Transport::RequestAgent.del!(agent_id)
+      end
+      Isomorfeus::Transport.instance_variable_set(:@requests_in_progress, { requests: {}, agent_ids: {} })
+      Isomorfeus::Transport.disconnect
+    end
   end
 end

data/lib/isomorfeus/top_level_ssr.rb

@@ -1,3 +1,9 @@
+module Preact
+  def self.render_to_string(native_preact_element)
+    `Opal.global.Preact.renderToString(native_preact_element)`
+  end
+end
+
 module Isomorfeus
   class TopLevel
     class << self

data/lib/preact/version.rb

@@ -1,3 +1,3 @@
 module Preact
-  VERSION = '10.6.41'
+  VERSION = '10.6.45'
 end

data/lib/preact.rb

@@ -294,11 +294,7 @@ module Preact
     end
   end
 
-  if on_ssr?
-    def self.render_to_string(native_preact_element)
-      `Opal.global.Preact.renderToString(native_preact_element)`
-    end
-  end
+  # render_to_string is in top_level_ssr.rb
 
   def self.unmount_component_at_node(element_or_query)
     if `(typeof element_or_query === 'string')` || (`(typeof element_or_query.$class === 'function')` && element_or_query.class == String)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-preact
 version: !ruby/object:Gem::Version
-  version: 10.6.41
+  version: 10.6.45
 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