isomorfeus-preact 10.6.42 → 10.6.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71f0e2e4c50dfd7a41114cd679fcef0288f3003b774e0cf78c73f99f130a5960
-  data.tar.gz: 31c4fed1aaa9bc3d239ca97fe78b8d6355220c1213bf9c9e9aa0442075b2e5f0
+  metadata.gz: c6aa16242ab93d05f360dd9c8b3455dd2e4b4084835116cd8973356edde20d4c
+  data.tar.gz: b230de356c9524d886f9cbfed54edc39c5531d7531b205301358c19acb800809
 SHA512:
-  metadata.gz: 4ad75f6d1bcee7758a87bfa9a5e8ea27ee87d1fbd7848b1c2d70365445ec05b27ece212da80019b3d493ebd2f2c474bed51c91fb20e4bdf26cfd32c2e21fb2af
-  data.tar.gz: e001b19a26bf518fd86562ad5542a472ac382b6d9779817564e87e256a7e7a19ac657c2947d9603b06ccf97f85d21bd31e61c3cade9dd05109dc5f6bc21112c5
+  metadata.gz: f0c8247ff444a7f045eb80e6a6d575f957869f87b559df2dba16520ebfe92e2a46d15aee505e9dd908fd4ce061139ff8285a9a9cef7afb6cb75f43d2fd728f50
+  data.tar.gz: acd073c0cb7c199228efa51ed17c1b11612f20670a4cea63b2c382bce7bf1dfef37d43180332de482907b6778fb15cf2d347a5f4a5aa15cdb94e90b02d913635

data/lib/isomorfeus/preact/config.rb

@@ -17,10 +17,7 @@ module Isomorfeus
       end
 
       def force_init!
-        unless Isomorfeus.initial_state_fetched
-          Isomorfeus.initial_state_fetched = true
-          Redux::Store.preloaded_state = Isomorfeus.store.get_state
-        end
+        @initialized = true
         Isomorfeus.force_init_store!
         execute_init_classes
       end
@@ -38,17 +35,6 @@ module Isomorfeus
         self.send("#{key}=", value)
       end
 
-      # only used for SSR
-      def cached_component_classes
-        @cached_component_classes ||= {}
-      end
-
-      # only used for SSR
-      def cached_component_class(class_name)
-        return cached_component_classes[class_name] if cached_component_classes.key?(class_name)
-        cached_component_classes[class_name] = "::#{class_name}".constantize
-      end
-
       def execute_init_classes
         client_init_class_names.each do |constant|
           constant.constantize.send(:init)

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 : ''
@@ -54,7 +58,7 @@ module Isomorfeus
         # execute first render pass
         begin
           pass += 1
-          has_transport, has_store, need_further_pass, exception = ctx.exec(javascript)
+          has_transport, need_further_pass, exception = ctx.exec(javascript)
           Isomorfeus.raise_error(message: "Server Side Rendering: #{exception['message']}", stack: exception['stack']) if exception
         rescue Exception => e
           Isomorfeus.raise_error(error: e)
@@ -91,14 +95,10 @@ module Isomorfeus
           Isomorfeus.raise_error(message: "Server Side Rendering: #{exception['message']}", stack: exception['stack']) if exception
         else
           start_time = Time.now
-          script_key = if has_transport && has_store
+          script_key = if has_transport
                          :still_busy
-                       elsif has_transport
-                         :transport_busy
-                       elsif has_store
-                         :store_busy
                        else
-                         nil
+                         :store_busy
                        end
           while need_further_pass
             # execute further render passes
@@ -110,11 +110,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 +179,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 == global.Opal.nil) ? false : nfp;')
-        ctx.add_script(key: :store_busy, source: 'let nfp = global.Opal.Isomorfeus.store["$recently_dispatched?"](); (nfp == global.Opal.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

@@ -11,7 +11,6 @@ module Isomorfeus
         global.Exception = false;
         global.IsomorfeusSessionId = session_id;
         global.HasTransport = (typeof global.Opal.Isomorfeus.Transport !== 'undefined') && (api_ws_path !== '');
-        global.HasStore = typeof global.Opal.Isomorfeus.store !== 'undefined';
         global.Opal.Isomorfeus['$env='](env);
         if (typeof global.Opal.Isomorfeus["$current_locale="] === 'function') { global.Opal.Isomorfeus["$current_locale="](locale); }
         global.Opal.Isomorfeus['$force_init!']();
@@ -22,8 +21,7 @@ module Isomorfeus
           global.Opal.send(global.Opal.Isomorfeus.Transport.$promise_connect(global.IsomorfeusSessionId), 'then', [], ($$1 = function(){
             try {
               global.RenderedTree = global.Opal.Isomorfeus.TopLevel.$render_component_to_string(component_name, props);
-              let nfp = global.Opal.Isomorfeus.Transport["$busy?"]() || global.Opal.Isomorfeus.store['$recently_dispatched?']();
-              global.NeedFurtherPass = (nfp == nil) ? false : nfp;
+              global.NeedFurtherPass = self.still_busy();
               global.FirstPassFinished = true;
             } catch (e) {
               global.Exception = e;
@@ -33,16 +31,13 @@ module Isomorfeus
         } else {
           try {
             global.RenderedTree = global.Opal.Isomorfeus.TopLevel.$render_component_to_string(component_name, props);
-            if (global.HasStore) {
-              let nfp = global.Opal.Isomorfeus.store['$recently_dispatched?']();
-              global.NeedFurtherPass = (nfp == nil) ? false : nfp;
-            }
+            global.NeedFurtherPass = self.store_busy();
           } catch (e) {
             global.Exception = e;
             global.NeedFurtherPass = false;
           }
         };
-        return [global.HasTransport, global.HasStore, global.NeedFurtherPass, global.Exception ? { message: global.Exception.message, stack: global.Exception.stack } : false];
+        return [global.HasTransport, global.NeedFurtherPass, global.Exception ? { message: global.Exception.message, stack: global.Exception.stack } : false];
       }
 
       self.first_pass_result = function() {
@@ -66,10 +61,28 @@ module Isomorfeus
         }
         let application_state = global.Opal.Isomorfeus.store.native.getState();
         if (typeof global.NanoCSSInstance !== 'undefined') { ssr_styles = global.NanoCSSInstance.raw }
-        let nfp = (global.HasTransport && global.Opal.Isomorfeus.Transport["$busy?"]()) || (global.HasStore && global.Opal.Isomorfeus.store["$recently_dispatched?"]());
-        global.NeedFurtherPass = (nfp == nil) ? false : nfp;
+        global.NeedFurtherPass = ((global.HasTransport && global.Opal.Isomorfeus.Transport["$busy?"]()) || self.store_busy());
         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
@@ -15,9 +21,18 @@ module Isomorfeus
             component = component_name;
           }
         }
-        component = Isomorfeus.cached_component_class(component_name) unless component
+        component = cached_component_class(component_name) unless component
         Preact.render_to_string(Preact.create_element(component, `Opal.Hash.$new(props)`))
       end
+
+      def cached_component_classes
+        @cached_component_classes ||= {}
+      end
+
+      def cached_component_class(class_name)
+        return cached_component_classes[class_name] if cached_component_classes.key?(class_name)
+        cached_component_classes[class_name] = "::#{class_name}".constantize
+      end
     end
   end
 end

data/lib/preact/version.rb

@@ -1,3 +1,3 @@
 module Preact
-  VERSION = '10.6.42'
+  VERSION = '10.6.46'
 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.42
+  version: 10.6.46
 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