svelte-on-rails 20.0.11 → 20.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1933166e0e04a1ba7c49d791ca57da204d128466c2f40644612501e1dcf52b99
-  data.tar.gz: 2a8766bb7053cd9b0ae2fe6c9348eb78bcbd552f8b1abdab8f8786d1978b1b38
+  metadata.gz: 8854562cdc1c8ecf4ee68da99a569020983037658f8e5027b485d13269198863
+  data.tar.gz: 6471ea8193fc85aa4aab7fac55152b8ca83721fdc40296b6ce388e617149b366
 SHA512:
-  metadata.gz: b899358f7b5f37647ff5f9fc8308831141d08c6e530b587dd11b92ed99d4bdf4b47fae99a302dca3a36118bf6684468e6377a394bc87571f503d4f980e6d3aec
-  data.tar.gz: ae788c0e8fb9185526d41473c51aa496904baf644c7fdb3823ba2a6c3e2a294b5c0c217aec4ceee890e85fe15ee4f9c7336d68ba5f2545a4bdd2b3570e45a5bc
+  metadata.gz: 772c5e798dd44aef9a17da6bdaa1678157988d73885bab0ecb0754193086f8cd640692ed6444d1b9e1f39510a7e844f367afdd4edbbce5f9b87687ac0689d400
+  data.tar.gz: f414382164d6d05e689a08a726129dbb44dadaa91505cdc638c4d1cdac134d27275bec34c5189e2ab123b150f69ef8d9cc395abc384999b29fc53a88db7daf76

data/lib/svelte_on_rails/configuration.rb

@@ -138,6 +138,10 @@ module SvelteOnRails
       @node_bin_path ||= resolve_node_bin_path
     end
 
+    def ssr_server_bin_path
+      Rails.root.join(Pathname('node_modules/@csedl/svelte-on-rails/bin/svelte-ssr-server.js'))
+    end
+
     def initialize_request_metrics(request_uuid)
       return if request_uuid == @request_metrics[:request_uuid]
 

data/lib/svelte_on_rails/railtie.rb

@@ -11,28 +11,23 @@ module SvelteOnRails
       SvelteOnRails::Configuration.instance
     end
 
-
-
-
     # Spawn the Node SSR child process only when we're really about to serve
     # HTTP. `after_initialize` runs at the end of boot, so Puma/Unicorn/etc.
     # are already loaded and the detection in `start_ssr_server?` is reliable.
-    # initializer "svelte-on-rails.initialize_ssr_client" do |app|
-    #   app.config.after_initialize do
-    #
-    #     #if SvelteOnRails::SsrServer.start_ssr_server?
-    #       SvelteOnRails::Lib::Utils.secure_debug_log("Initializing SSR client")
-    #       SvelteOnRails::SsrServer.instance
-    #       SvelteOnRails::Lib::Utils.secure_debug_log("Initializing SSR client finished")
-    #     # else
-    #     #   SvelteOnRails::Lib::Utils.secure_debug_log("Skipping SSR client (not a web server boot)")
-    #     # end
-    #   end
-    # end
-
-
-
-
+    initializer "svelte-on-rails.initialize_ssr_client" do |app|
+      app.config.after_initialize do
+
+        # if SvelteOnRails::SsrServer.start_ssr_server?
+        if defined?(Puma::Server)
+          SvelteOnRails::Lib::Utils.secure_debug_log("Initializing SSR client")
+          SvelteOnRails::SsrServer.instance
+          SvelteOnRails::Lib::Utils.secure_debug_log("Initializing SSR client finished")
+        end
+        # else
+        #   SvelteOnRails::Lib::Utils.secure_debug_log("Skipping SSR client (not a web server boot)")
+        # end
+      end
+    end
 
     # initializer "svelte-on-rails.initialize_ssr_client" do
     #   SvelteOnRails::Lib::Utils.secure_debug_log("calling Initializing SSR client")
@@ -40,14 +35,6 @@ module SvelteOnRails
     #   SvelteOnRails::Lib::Utils.secure_debug_log("Initializing SSR client finished")
     # end
 
-
-
-
-
-
-
-
-
     initializer 'svelte_on_rails.active_record_extensions' do
       ActiveSupport.on_load(:active_record) do
 

data/lib/svelte_on_rails/ssr_server.rb

@@ -6,58 +6,48 @@ module SvelteOnRails
 
     include Singleton
 
-    attr_reader :socket_namespace,
-                :logfile_path,
+    attr_reader :logfile_path,
                 :logfile_max_lines,
                 :socket_path,
                 :ssr_server_bin_path,
-                :node_bin,
-                :ssr_server_ppid_file
+                :node_bin
 
     # methods
 
-    def self.instance(dry_run_ppid: nil)
+    def self.instance
       SvelteOnRails::Lib::Utils.secure_debug_log("SOR Server instance called")
-      @instance ||= new(dry_run_ppid: dry_run_ppid)
+      @instance ||= new
     end
 
-    def initialize(dry_run_ppid: nil)
+    def initialize
 
       SvelteOnRails::Lib::Utils.secure_debug_log("SOR Server initialize called")
 
-      @socket_namespace = [
-        "svelte-ssr",
-        Rails.application.class.module_parent_name[0..30],
-        Rails.env,
-      ].join("-")
-      @dry_run_ppid = dry_run_ppid if dry_run_ppid
+      @helpers = SsrServerHelpers.new
 
       @logfile_path = Rails.root.join("log/svelte-ssr-server-#{Rails.env}.log")
       @logfile_max_lines = build_logfile_max_lines
-      @socket_path = build_socket_path
+      @socket_path = @helpers.socket_path
       @use_ssr_server = SvelteOnRails::Configuration.instance.configs[:use_ssr_server]
       @node_bin = SvelteOnRails::Configuration.instance.node_bin_path
-      @ssr_server_bin_path = Rails.root.join(Pathname('node_modules/@csedl/svelte-on-rails/bin/svelte-ssr-server.js'))
-      @ssr_server_ppid_file = Rails.root.join("tmp", "pids", 'svelte_on_rails.ppid')
+      @ssr_server_bin_path = SvelteOnRails::Configuration.instance.ssr_server_bin_path
 
-      return if @dry_run_ppid
-
-      if @use_ssr_server
-        # if !defined?(Rails::Server)
-        #   SvelteOnRails::Lib::Utils.secure_debug_log("Rails Server is not yet defined, SSR Server cannot be started because of initializing too early")
-        # else
+        if @use_ssr_server
+          # if !defined?(Rails::Server)
+          #   SvelteOnRails::Lib::Utils.secure_debug_log("Rails Server is not yet defined, SSR Server cannot be started because of initializing too early")
+          # else
 
           SvelteOnRails::Lib::Utils.secure_debug_log("SOR using svelte-ssr-server called, now starting node-server...")
 
           start_node_server!
-          #end
-        at_exit do
-          kill_my_server
+          # end
+          at_exit do
+            kill_my_server
+          end
+        else
+          SvelteOnRails::Lib::Utils.secure_debug_log("SSR Server NOT used => @use_ssr_server #{@use_ssr_server}")
+          SvelteOnRails::Lib::Utils.secure_debug_log("SSR Server NOT used => @use_ssr_server #{defined?(Rails::Server)}")
         end
-      else
-        SvelteOnRails::Lib::Utils.secure_debug_log("SSR Server NOT used => @use_ssr_server #{@use_ssr_server}")
-        SvelteOnRails::Lib::Utils.secure_debug_log("SSR Server NOT used => @use_ssr_server #{defined?(Rails::Server)}")
-      end
 
     end
 
@@ -183,10 +173,8 @@ module SvelteOnRails
       SvelteOnRails::Lib::Utils.secure_debug_log("SOR start_node_server! called")
 
       # notice ppid
-      unless @dry_run_ppid
-        FileUtils.mkdir_p(@ssr_server_ppid_file.dirname)
-        File.write(@ssr_server_ppid_file, Process.ppid.to_s)
-      end
+      FileUtils.mkdir_p(@helpers.ssr_server_ppid_file.dirname)
+      File.write(@helpers.ssr_server_ppid_file, Process.ppid.to_s)
 
       start = Time.now
       cmd = [
@@ -256,7 +244,7 @@ module SvelteOnRails
 
     def kill_my_server
       Process.kill("SIGINT", (node_server_pid || 0)) if node_server_pid
-      File.delete(@ssr_server_ppid_file)
+      File.delete(@helpers.ssr_server_ppid_file)
     rescue
 
     end
@@ -372,8 +360,31 @@ module SvelteOnRails
       end
     end
 
-    def build_socket_path
-      app_sock = Rails.root.join("tmp/sockets/#{@socket_namespace}-#{@dry_run_ppid || Process.ppid}.sock").to_s
+  end
+
+  class SsrServerHelpers
+
+    # theese helpers are used from the :check rake task
+    # For that reason they are within a separate class
+
+    attr_reader :socket_namespace,
+                :socket_path
+
+    def initialize
+
+      @socket_namespace = [
+        "svelte-ssr",
+        Rails.application.class.module_parent_name[0..30],
+        Rails.env,
+      ].join("-")
+
+    end
+
+    def ssr_server_ppid_file
+      Rails.root.join("tmp", "pids", 'svelte_on_rails.ppid')
+    end
+    def socket_path(ppid: Process.ppid)
+      app_sock = Rails.root.join("tmp/sockets/#{@socket_namespace}-#{ppid}.sock").to_s
       FileUtils.mkdir_p(File.dirname(app_sock))
 
       return app_sock if app_sock.length < 104
@@ -383,11 +394,13 @@ module SvelteOnRails
       dir = File.expand_path("/tmp/svelte")
       FileUtils.mkdir_p(dir)
       FileUtils.chmod(0777, dir)
-      fallback = "#{dir}/#{@socket_namespace}-#{@dry_run_ppid || Process.ppid}.sock"
+      fallback = "#{dir}/#{@socket_namespace}-#{ppid}.sock"
       start_server_log(nil, "sockets longer than 104 chars are risky, fallback to: #{fallback}")
       fallback
     end
 
+
+
   end
 
   class SsrError < StandardError; end

data/lib/tasks/svelte_on_rails_tasks.rake

@@ -10,26 +10,25 @@ namespace :svelte_on_rails do
     configs = SvelteOnRails::Configuration.instance
     ppid_file = Rails.root.join("tmp", "pids", 'svelte_on_rails.ppid')
     ppid = (ppid_file.exist? ? File.read(ppid_file).chomp : nil)
-    server = SvelteOnRails::SsrServer.instance(dry_run_ppid: ppid)
-    socket_path = server.socket_path
+    server_helpers = SvelteOnRails::SsrServerHelpers.new
+    socket_path = server_helpers.socket_path(ppid: ppid)
 
     puts '=' * 80
     puts "Svelte on Rails SSR Server"
     puts '=' * 80
     puts
     puts 'Node'
-    puts label('Node bin') + server.node_bin
+    puts label('Node bin') + configs.node_bin_path.to_s
     puts label('Node version') + configs.node_version_test
-    puts label('SSR Server bin') + server.ssr_server_bin_path.to_s
+    puts label('SSR Server bin') + configs.ssr_server_bin_path.to_s
     puts label('SSR Server version') + configs.npm_package_version_test.to_s
     puts
     puts 'Rails instance'
-    if !server.ssr_server_ppid_file.exist?
-      puts label('Process.ppid') + "#{server.ssr_server_ppid_file} not found, rails seems not to run"
+    if !server_helpers.ssr_server_ppid_file.exist?
+      puts label('Process.ppid') + "#{server_helpers.ssr_server_ppid_file} not found, rails seems not to run or the SsrServer is not initialized yet."
     else
-      puts label('Process.ppid') + ppid
-      puts label('Socket') + socket_path
-      puts label('Server uptime')
+      puts label('Process.ppid') + ppid.to_s
+      puts label('Socket') + socket_path.to_s
     end
     puts
     puts '=' * 80

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svelte-on-rails
 version: !ruby/object:Gem::Version
-  version: 20.0.11
+  version: 20.0.12
 platform: ruby
 authors:
 - Christian Sedlmair