isomorfeus-preact 10.6.50 → 10.6.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0fa7c66f356b385202783c17b48c36b7a2a1f0166d55e7a6677eda1d2c97cea
-  data.tar.gz: 815a7e94a14c9c819b02bee5a2ebd0da884de6ec014329afd794947431e4eea3
+  metadata.gz: dffa4d4b7dbec570b2548b38a5a842fca2def84c6601138157240035a49c767f
+  data.tar.gz: f469ef96052690c6c34c5538904907450883b841a176d7d2db908fa89af53f78
 SHA512:
-  metadata.gz: 25376a26dce8fc8e591102e67ab44db2e91afbbf7ab922dabba90e0a8e1aeb3e02fd49554efbfd12c6cf72930ea0d3bf24cb92090971b5430f2fde76c32f1edc
-  data.tar.gz: 90934bacbb7efbb70eb36bc9dba402f3436d1d70cc00a76ecf6969ce81d738c031dc059eb79f4706ad429a68a9a5ff1289225e37955d7988f278300578ae2678
+  metadata.gz: 8b8f47cace24c504437d92ec69862edfde48f9fa85696dad8c7f893de1d9fa92776f2fae775f51e8f4889b92fcb1902ce0b5d4e7f321f614c7be840eb56e4419
+  data.tar.gz: ad68c421f1f11598b9dc3b731a271969367f9460985c1e006f0659cf1c8d4d9b9a9f8cbcfb711f1f4f2e6593e3d7a5d23badb9c42d965dffcc7684815c651b66

data/lib/browser/history.rb

@@ -7,6 +7,7 @@ module Browser
     alias_native :go
 
     native_reader :length
+    alias :size :length
 
     def push_state(state, title = '', url = `null`)
       `#@native.pushState(#{state.to_n}, #{title}, #{url})`

data/lib/isomorfeus/preact/imports.rb

@@ -15,8 +15,9 @@ module Isomorfeus
         if Dir.exist?(Isomorfeus.app_root)
           if File.exist?(File.join(Isomorfeus.app_root, 'isomorfeus_loader.rb'))
             Isomorfeus.add_common_ruby_import('isomorfeus_loader')
-            Isomorfeus.add_ssr_ruby_import('isomorfeus/top_level_ssr')
-            Isomorfeus.add_ssr_ruby_import('isomorfeus/ssr')
+            Isomorfeus.add_ssr_ruby_import('isomorfeus/preact/ssr/top_level')
+            Isomorfeus.add_ssr_ruby_import('isomorfeus/preact/ssr/render_core')
+            Isomorfeus.add_ssr_ruby_import('isomorfeus/preact/ssr/history')
           end
         end
       end

data/lib/isomorfeus/preact/ssr/history.rb

@@ -0,0 +1,23 @@
+module Browser
+  class History
+    def back; end
+    def forward; end
+    def go(a); end
+
+    def length
+      0
+    end
+    alias :size :length
+
+    def push_state(state, title = '', url = nil); end
+    def replace_state(state, title = '', url = nil); end
+    def scroll_restoration; end
+    def scroll_restoration=(s); end
+
+    def state
+      {}
+    end
+  end
+end
+
+Isomorfeus.browser_history = Browser::History.new

data/lib/isomorfeus/preact/ssr/render_core.rb

@@ -0,0 +1,103 @@
+module Isomorfeus
+  module SSR
+    %x{
+      self.first_pass = function(component_name, props) {
+        if (global.HasTransport) {
+          let $$1;
+          global.Opal.send(global.Opal.Isomorfeus.Transport.$promise_connect(global.IsomorfeusSessionId), 'then', [], ($$1 = function(){
+            self.async_render_pass(component_name, props);
+          }, $$1.$$s = this, $$1.$$arity = 0, $$1))
+        } else {
+          self.async_render_pass(component_name, props);
+        };
+      }
+
+      self.async_render_pass = function(component_name, props) {
+        if (global.RenderPass < global.MaxPasses) {
+          self.render_pass(component_name, props);
+          if (global.Exception) {
+            self.finish_render();
+            return;
+          }
+          setTimeout(self.check_and_render, 1, component_name, props);
+        } else { self.finish_render(); }
+      }
+
+      self.render_pass = function(component_name, props) {
+        const oper = global.Opal.Preact;
+        oper.render_buffer = [];
+        oper.active_components = [];
+        oper.active_redux_components = [];
+        global.NeedAnotherPass = false;
+        try {
+          global.RenderPass++;
+          global.RenderedTree = global.Opal.Isomorfeus.TopLevel.$render_component_to_string(component_name, props);
+        } catch (e) {
+          global.RenderedTree = 'exception';
+          global.Exception = e;
+        }
+      }
+
+      self.check_and_render = function(component_name, props) {
+        if (self.still_busy()) {
+          global.NeedAnotherPass = true;
+          setTimeout(self.check_and_render, 1, component_name, props);
+        } else if (global.NeedAnotherPass) {
+          global.NeedAnotherPass = false;
+          self.async_render_pass(component_name, props);
+        } else { self.finish_render(); }
+      }
+
+      self.finish_render = function() {
+        global.Rendering = false;
+        if (global.HasTransport) { self.$disconnect_transport(); }
+      }
+
+      self.still_busy = function() {
+        if (global.Opal.Isomorfeus?.Transport?.["$busy?"]?.()) { return true; }
+        let nfp = global.Opal.Isomorfeus.store["$recently_dispatched?"]();
+        return (nfp == global.Opal.nil) ? false : nfp;
+      }
+
+      self.get_exception = function() {
+        if (global.Exception) { return { message: global.Exception.message, stack: global.Exception.stack }; }
+        else { return null; }
+      }
+
+      self.get_result = function() {
+        const opi = global.Opal.Isomorfeus;
+        let application_state = opi.store.native.getState();
+        let ssr_styles = global?.NanoCSSInstance?.raw;
+        return [global.RenderedTree, application_state, ssr_styles, opi['$ssr_response_status'](), global.RenderPass, self.get_exception()];
+      }
+
+      self.mount_component = function(session_id, env, locale, location, transport_ws_url, component_name, props, max_passes) {
+        const opi = global.Opal.Isomorfeus;
+        global.RenderPass = 0;
+        global.Rendering = true;
+        global.MaxPasses = max_passes;
+        global.IsomorfeusSessionId = session_id;
+        global.RenderedTree = null;
+        global.Exception = false;
+        global.HasTransport = (typeof opi.Transport !== 'undefined');
+        if (global.HasTransport) { opi.TopLevel["$transport_ws_url="](transport_ws_url); }
+        opi['$env='](env);
+        if (typeof opi["$current_locale="] === 'function') { opi["$current_locale="](locale); }
+        opi['$force_init!']();
+        opi['$ssr_response_status='](200);
+        opi.TopLevel['$ssr_route_path='](location);
+
+        self.first_pass(component_name, props);
+      }
+    }
+
+    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/preact_view_helper.rb

@@ -23,21 +23,14 @@ module Isomorfeus
       render_result = "<div data-iso-env=\"#{Isomorfeus.env}\" data-iso-root=\"#{component_name}\" data-iso-props='#{Oj.dump(props, mode: :strict)}'"
       if !skip_ssr && (Isomorfeus.server_side_rendering || use_ssr)
         thread_id_asset = "#{Thread.current.object_id}#{asset_key}"
-        if Isomorfeus.development?
-          begin
+        begin
+          if Isomorfeus.development?
             init_speednode_context(asset_key, thread_id_asset)
-          rescue Exception => e
-            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)
+          elsif !Isomorfeus.ssr_contexts.key?(thread_id_asset)
             init_speednode_context(asset_key, thread_id_asset)
           end
+        rescue Exception => e
+          Isomorfeus.raise_error(message: "Server Side Rendering: Failed creating context for #{asset_key}. Error: #{e.message}", stack: e.backtrace)
         end
 
         ctx = Isomorfeus.ssr_contexts[thread_id_asset]
@@ -51,76 +44,28 @@ module Isomorfeus
         # build javascript for rendering first pass
         # it will initialize buffers to guard against leaks, maybe caused by previous exceptions
         javascript = <<~JAVASCRIPT
-        return Opal.Isomorfeus.SSR.first_pass('#{Thread.current[:isomorfeus_session_id]}', '#{Isomorfeus.env}', '#{props[:locale]}', '#{props[:location]}', '#{transport_ws_url}', '#{component_name}', #{Oj.dump(props, mode: :strict)})
+        return Opal.Isomorfeus.SSR.mount_component('#{Thread.current[:isomorfeus_session_id]}', '#{Isomorfeus.env}', '#{props[:locale]}', '#{props[:location]}', '#{transport_ws_url}', '#{component_name}', #{Oj.dump(props, mode: :strict)}, #{max_passes})
         JAVASCRIPT
 
-        finished = false
-        # execute first render pass
         begin
-          pass += 1
-          has_transport, need_further_pass, exception = ctx.exec(javascript)
-          Isomorfeus.raise_error(message: "Server Side Rendering: #{exception['message']}", stack: exception['stack']) if exception
+          ctx.exec(javascript)
         rescue Exception => e
           Isomorfeus.raise_error(error: e)
         end
 
-        if has_transport
-          sleep 0.001 # give node a chance connecting to ruby by allowing other ruby threads to run
-          # wait for first pass to finish
-          first_pass_finished, need_further_pass, exception = ctx.eval_script(key: :first_pass_check)
-          Isomorfeus.raise_error(message: "Server Side Rendering: #{exception['message']}", stack: exception['stack']) if exception
-          unless first_pass_finished
-            start_time = Time.now
-            while !first_pass_finished
-              # break if (Time.now - start_time) > 10
-              sleep 0.005
-              first_pass_finished, need_further_pass, exception = ctx.eval_script(key: :first_pass_check)
-              Isomorfeus.raise_error(message: "Server Side Rendering: #{exception['message']}", stack: exception['stack']) if exception
-            end
-          end
-
-          # wait for transport to settle
-          still_busy = ctx.eval_script(key: :still_busy)
-          if still_busy
-            start_time = Time.now
-            while still_busy
-              break if (Time.now - start_time) > 5
-              sleep 0.005
-              still_busy = ctx.eval_script(key: :still_busy)
-            end
-          end
-        end
-
-        if !need_further_pass
-          rendered_tree, application_state, @ssr_styles, @ssr_response_status, exception = ctx.eval_script(key: :first_pass_result)
-          Isomorfeus.raise_error(message: "Server Side Rendering: #{exception['message']}", stack: exception['stack']) if exception
-        else
+        sleep 0.001 # give other threads that would respond to a request from node/SSR a chance to run
+        rendering = ctx.eval_script(key: :rendering)
+        if rendering
           start_time = Time.now
-          javascript = <<~JAVASCRIPT
-          return Opal.Isomorfeus.SSR.further_pass('#{component_name}', #{Oj.dump(props, mode: :strict)})
-          JAVASCRIPT
-          while need_further_pass
-            # execute further render passes
-            pass += 1
-            rendered_tree, application_state, @ssr_styles, @ssr_response_status, need_further_pass, exception = ctx.exec(javascript)
-            Isomorfeus.raise_error(message: "Server Side Rendering: #{exception['message']}", stack: exception['stack']) if exception
-            if need_further_pass
-              sleep 0.001 # give other threads a chance
-              # break if (Time.now - start_time) > 5
-              still_busy = ctx.eval_script(key: :still_busy)
-              while still_busy
-                # break if (Time.now - start_time) > 5
-                sleep 0.005
-                still_busy = ctx.eval_script(key: :still_busy)
-              end
-              break if pass >= max_passes
-            else
-              break
-            end
+          while rendering
+            break if (Time.now - start_time) > 10
+            sleep 0.005
+            rendering = ctx.eval_script(key: :rendering)
           end
         end
 
-        ctx.eval_script(key: :transport_disconnect) if has_transport
+        rendered_tree, application_state, @ssr_styles, @ssr_response_status, passes, exception = ctx.eval_script(key: :get_result)
+        Isomorfeus.raise_error(message: "Server Side Rendering: #{exception['message']}", stack: exception['stack']) if exception
 
         render_result << " data-iso-hydrated='true'" if rendered_tree
         if Isomorfeus.respond_to?(:current_user) && Isomorfeus.current_user && !Isomorfeus.current_user.anonymous?
@@ -137,7 +82,7 @@ module Isomorfeus
       render_result << '</div>'
       if Isomorfeus.server_side_rendering && !skip_ssr
         render_result = "<script type='application/javascript'>\nServerSideRenderingStateJSON = #{Oj.dump(application_state, mode: :strict)}\n</script>\n" << render_result
-        puts "PreactViewHelper Server Side Rendering rendered #{pass} passes and took ~#{((Time.now - ssr_start_time)*1000).to_i}ms" if Isomorfeus.development?
+        puts "PreactViewHelper Server Side Rendering rendered #{passes} passes and took ~#{((Time.now - ssr_start_time)*1000).to_i}ms" if Isomorfeus.development?
       end
       render_result
     end
@@ -172,10 +117,8 @@ module Isomorfeus
         asset_manager.transition(asset_key, asset)
         Isomorfeus.ssr_contexts[thread_id_asset] = ExecJS.permissive_compile(asset.bundle)
         ctx = Isomorfeus.ssr_contexts[thread_id_asset]
-        ctx.add_script(key: :first_pass_check, source: 'Opal.Isomorfeus.SSR.first_pass_check()')
-        ctx.add_script(key: :first_pass_result, source: 'Opal.Isomorfeus.SSR.first_pass_result()')
-        ctx.add_script(key: :still_busy, source: 'Opal.Isomorfeus.SSR.still_busy()')
-        ctx.add_script(key: :transport_disconnect, source: 'global.Opal.Isomorfeus.SSR.$disconnect_transport()')
+        ctx.add_script(key: :get_result, source: 'Opal.Isomorfeus.SSR.get_result()')
+        ctx.add_script(key: :rendering, source: 'global.Rendering')
       end
     end
 

data/lib/isomorfeus_preact/lucid_app/native_component_constructor.rb

@@ -8,6 +8,7 @@ module LucidApp::NativeComponentConstructor
       base.css_styles = null;
       base.css_theme = null;
       base.preload_block = null;
+      base.preload_did_mount_proc = null;
       base.while_loading_block = null;
 
       base.preact_component = class extends Opal.global.Preact.Component {

data/lib/isomorfeus_preact/lucid_component/api.rb

@@ -11,12 +11,15 @@ module LucidComponent::Api
 
       # preloading
       def preload(&block)
-        `base.preload_block = block`
-        component_did_mount do
-          unless self.state.preloaded
-            @_preload_promise.then { self.state.preloaded = true } if @_preload_promise
+        pdm_proc = proc do
+          if !self.state.preloaded && @_preload_promise
+            @_preload_promise.then { self.state.preloaded = true }
           end
         end
+        %x{
+          base.preload_block = block;
+          base.preload_did_mount_proc = pdm_proc;
+        }
       end
 
       def while_loading(option = nil, &block)

data/lib/preact/component/callbacks.rb

@@ -23,23 +23,16 @@ module Preact::Component::Callbacks
           let fun = function() {
             const oper = Opal.Preact;
             oper.register_active_component(this);
-            try {
-              #{`this.__ruby_instance`.instance_exec(&block)};
-            } catch (e) { console.error(e.message === Opal.nil ? 'error at' : e.message, e.stack); }
+            try { #{`this.__ruby_instance`.instance_exec(&block)}; }
+            catch (e) { console.error(e.message === Opal.nil ? 'error at' : e.message, e.stack); }
+            if (self.preload_did_mount_proc) { #{`this.__ruby_instance`.instance_exec { self.class.JS[:preload_did_mount_proc].call } } }
             oper.unregister_active_component(this);
           }
           if (self.lucid_preact_component) {
-            let proto = self.lucid_preact_component.prototype;
-            if (proto.componentDidMount) {
-              proto.componentDidMountTwo = proto.componentDidMount;
-              proto.componentDidMountOne = fun;
-              fun = function() {
-                this.componentDidMountOne();
-                this.componentDidMountTwo();
-              }
-            }
-            proto.componentDidMount = fun;
-          } else { self.preact_component.prototype.componentDidMount = fun; }
+            self.lucid_preact_component.prototype.componentDidMount = fun;
+          } else {
+            self.preact_component.prototype.componentDidMount = fun;
+          }
         }
       end
 

data/lib/preact/version.rb

@@ -1,3 +1,3 @@
 module Preact
-  VERSION = '10.6.50'
+  VERSION = '10.6.51'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-preact
 version: !ruby/object:Gem::Version
-  version: 10.6.50
+  version: 10.6.51
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -229,13 +229,14 @@ files:
 - lib/isomorfeus/preact/imports.rb
 - lib/isomorfeus/preact/memcached_component_cache.rb
 - lib/isomorfeus/preact/redis_component_cache.rb
+- lib/isomorfeus/preact/ssr/history.rb
+- lib/isomorfeus/preact/ssr/render_core.rb
+- lib/isomorfeus/preact/ssr/top_level.rb
 - lib/isomorfeus/preact/thread_local_component_cache.rb
 - lib/isomorfeus/preact_view_helper.rb
 - lib/isomorfeus/props/validate_hash_proxy.rb
 - lib/isomorfeus/props/validator.rb
-- lib/isomorfeus/ssr.rb
 - lib/isomorfeus/top_level.rb
-- lib/isomorfeus/top_level_ssr.rb
 - lib/isomorfeus_preact/lucid_app/api.rb
 - lib/isomorfeus_preact/lucid_app/base.rb
 - lib/isomorfeus_preact/lucid_app/mixin.rb

data/lib/isomorfeus/ssr.rb

@@ -1,107 +0,0 @@
-module Isomorfeus
-  module SSR
-    %x{
-      self.first_pass = function(session_id, env, locale, location, transport_ws_url, component_name, props) {
-        const oper = global.Opal.Preact;
-        const opi = global.Opal.Isomorfeus;
-        oper.render_buffer = [];
-        oper.active_components = [];
-        oper.active_redux_components = [];
-        global.FirstPassFinished = false;
-        global.NeedFurtherPass = false;
-        global.RenderedTree = '';
-        global.Exception = false;
-        global.IsomorfeusSessionId = session_id;
-        global.HasTransport = (typeof opi.Transport !== 'undefined');
-        opi['$env='](env);
-        if (typeof opi["$current_locale="] === 'function') { opi["$current_locale="](locale); }
-        opi['$force_init!']();
-        opi['$ssr_response_status='](200);
-        opi.TopLevel['$ssr_route_path='](location);
-        if (global.HasTransport) {
-          opi.TopLevel["$transport_ws_url="](transport_ws_url);
-          let $$1;
-          global.Opal.send(opi.Transport.$promise_connect(global.IsomorfeusSessionId), 'then', [], ($$1 = function(){
-            try {
-              global.RenderedTree = opi.TopLevel.$render_component_to_string(component_name, props);
-              global.NeedFurtherPass = self.still_busy();
-              global.FirstPassFinished = true;
-            } catch (e) {
-              global.Exception = e;
-              global.FirstPassFinished = true;
-              global.NeedFurtherPass = false;
-            }
-          }, $$1.$$s = this, $$1.$$arity = 0, $$1))
-          global.NeedFurtherPass = true;
-        } else {
-          try {
-            global.RenderedTree = opi.TopLevel.$render_component_to_string(component_name, props);
-            global.NeedFurtherPass = self.store_busy();
-          } catch (e) {
-            global.Exception = e;
-            global.FirstPassFinished = true;
-            global.NeedFurtherPass = false;
-          }
-        };
-        return [global.HasTransport, global.NeedFurtherPass, self.get_exception()];
-      }
-
-      self.first_pass_check = function() {
-        return [global.FirstPassFinished, global.NeedFurtherPass, self.get_exception()];
-      }
-
-      self.first_pass_result = function() {
-        const opi = global.Opal.Isomorfeus;
-        let application_state = opi.store.native.getState();
-        let ssr_styles = global?.NanoCSSInstance?.raw;
-        return [global.RenderedTree, application_state, ssr_styles, opi['$ssr_response_status'](), self.get_exception()];
-      }
-
-      self.further_pass = function(component_name, props) {
-        const oper = global.Opal.Preact;
-        const opi = global.Opal.Isomorfeus;
-        oper.render_buffer = [];
-        oper.active_components = [];
-        oper.active_redux_components = [];
-        global.NeedFurtherPass = false;
-        global.Exception = false;
-        let application_state = null;
-        let rendered_tree = null;
-        let ssr_styles = null;
-        try {
-          rendered_tree = opi.TopLevel.$render_component_to_string(component_name, props);
-          application_state = opi.store.native.getState();
-          ssr_styles = global?.NanoCSSInstance?.raw;
-          global.NeedFurtherPass = self.still_busy();
-        } catch (e) {
-          global.Exception = e;
-        }
-        return [rendered_tree, application_state, ssr_styles, opi['$ssr_response_status'](), global.NeedFurtherPass, self.get_exception()];
-      }
-
-      self.get_exception = function() {
-        if (global.Exception) { return { message: global.Exception.message, stack: global.Exception.stack }; }
-        return 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