svelte-on-rails 22.0.2 → 22.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa3d5f2065ff0479bab2682150d4980b00857afdecce8cfc3481b8c5d2e585e2
-  data.tar.gz: 48d60f4f2952ca7fd5a53b8520f566b50abe3e343cf4dc5b67bda57a2dc87a49
+  metadata.gz: 7f30afd891885bd5b9d03aacb948116be1d32838d08c9d29589b5d3d68d31317
+  data.tar.gz: cbd63f36144fac966013a5b6d9e1bcfca9070a56c8367eaff8ff2033ab628ff2
 SHA512:
-  metadata.gz: 0a5dc7749c883e2a9d1ede071e8dcda6ea16e476ff31f9a5f2030c98f2d8515ee478cc4450eff5e79a510cd9dec4bc888570fc02b82a41a40761d75e68623474
-  data.tar.gz: f3feac157c245d8d5f6a916c3ee14b3444200cd4952626b101fbbe58e6213dd0095b68b0a2f553039382cb06ba86dfa864eb08943e12a016482bd8e78ffc9132
+  metadata.gz: acfe1cb4a3c02e70f979097867ab426b46b98025c88326831d41c229a41b9e468d2a8a76ae4cb9c35be9e3ba3ed3ff750e3edb2f80d52587de207ffafc62c085
+  data.tar.gz: 1c5aa90cbc05f1eeef827957035a894eb721ec957223a9230fce24ae0db48ce2c500ad8d19b901a5836431fa70127d7925b01ffa88344c243eb614711c31b7f5

data/lib/svelte_on_rails/lib/utils.rb

@@ -153,25 +153,20 @@ module SvelteOnRails
         trace[0..last_match_index]
       end
 
-      # Log for debugging purposes
-      def self.secure_debug_log(line)
+      def self.ssr_server_logfile
+          Rails.root.join("log", "svelte-ssr-server.log")
+      end
 
-        puts "[SOR] #{line}"
+      def self.ssr_server_log(msg)
+        File.open(ssr_server_logfile, 'a') do |f|
+          f.sync = true
+          f.puts("[#{Time.now.utc.iso8601(3)} ppid:#{Process.ppid} pid:#{Process.pid}] #{msg}")
+        end
+        puts "[SOR] #{msg}"
         $stdout.flush
+      end
 
-        # base = Rails.root.join('tmp')
-
-        # FileUtils.mkdir_p(base) unless File.directory?(base)
-        # path = File.join(base.to_s, 'svelte-on-rails.log')
 
-        # File.open(path, 'a') do |f|
-        #   f.sync = true
-        #   f.puts("[#{Time.now.utc.iso8601(3)}] [pid=#{Process.pid}] #{line}")
-        # end
-      rescue => e
-        # Last resort: write the failure itself to stderr; never raise.
-        warn "[SOR] sor_debug_log failed: #{e.class}: #{e.message}"
-      end
     end
   end
 end

data/lib/svelte_on_rails/railtie.rb

@@ -18,12 +18,10 @@ module SvelteOnRails
       app.config.after_initialize do
 
         if defined?(Rake) && Rake.respond_to?(:application) && Rake.application.top_level_tasks.any?
-          puts "[Skipping svelte-on-rails SSR-Server because of top level task: #{Rake.application.top_level_tasks.join(', ')}]"
+          SvelteOnRails::Lib::Utils.ssr_server_log("Skipping svelte-on-rails SSR-Server because of top level task: #{Rake.application.top_level_tasks.join(', ')}")
           $stdout.flush
         elsif SvelteOnRails::Configuration.instance.configs[:ssr]
-          SvelteOnRails::Lib::Utils.secure_debug_log("Initializing SSR client")
           SvelteOnRails::SsrServer.instance
-          SvelteOnRails::Lib::Utils.secure_debug_log("Initializing SSR client finished")
         end
 
       end

data/lib/svelte_on_rails/ssr_server.rb

@@ -15,13 +15,12 @@ module SvelteOnRails
     # methods
 
     def self.instance
-      SvelteOnRails::Lib::Utils.secure_debug_log("SOR Server instance called")
       @instance ||= new
     end
 
     def initialize
 
-      SvelteOnRails::Lib::Utils.secure_debug_log("SOR Server initialize called")
+      SvelteOnRails::Lib::Utils.ssr_server_logfile.delete if SvelteOnRails::Lib::Utils.ssr_server_logfile.exist?
 
       @helpers = SsrServerHelpers.new
 
@@ -34,21 +33,16 @@ module SvelteOnRails
       File.delete(restart_marker_file) if File.exist?(restart_marker_file)
 
       if @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
           @helpers.shutdown
           File.delete(restart_marker_file) if File.exist?(restart_marker_file)
         end
       else
-        SvelteOnRails::Lib::Utils.secure_debug_log("SSR Server NOT used => @ssr_server #{@ssr_server}")
-        SvelteOnRails::Lib::Utils.secure_debug_log("SSR Server NOT used => @ssr_server #{defined?(Rails::Server)}")
+        SvelteOnRails::Lib::Utils.ssr_server_log("SSR Server NOT used => @ssr_server #{@ssr_server}")
+        SvelteOnRails::Lib::Utils.ssr_server_log("SSR Server NOT used => @ssr_server #{defined?(Rails::Server)}")
       end
 
     end
@@ -173,7 +167,7 @@ module SvelteOnRails
       restart_after_failure: false
     )
 
-      SvelteOnRails::Lib::Utils.secure_debug_log("SOR start_node_server! called") if restart_after_failure
+      SvelteOnRails::Lib::Utils.ssr_server_log("SOR start_node_server! called") if restart_after_failure
 
       # notice ppid
       FileUtils.mkdir_p(@helpers.ssr_server_ppid_file.dirname)
@@ -193,28 +187,28 @@ module SvelteOnRails
           status: status
         }
       end
-      @helpers.start_server_log(start, "Node Version: #{Configuration.instance.node_version_test}, package version: #{Configuration.instance.npm_package_version_test}")
-      @helpers.start_server_log(start, "Start running Svelte-SSR-Server... (#{started_by})")
+      SvelteOnRails::Lib::Utils.ssr_server_log("Node Version: #{Configuration.instance.node_version_test}, package version: #{Configuration.instance.npm_package_version_test}")
+      SvelteOnRails::Lib::Utils.ssr_server_log("Start running Svelte-SSR-Server... (#{started_by})")
 
       until node_server_pid do
         sleep 0.12
-        @helpers.start_server_log(start, "Waiting for node server process-id")
+        SvelteOnRails::Lib::Utils.ssr_server_log("Waiting for node server process-id")
         start_server_timeout!(start)
       end
 
       until File.exist?(socket_path) do
         sleep 0.1
-        @helpers.start_server_log(start, "Waiting for socket to be created")
+        SvelteOnRails::Lib::Utils.ssr_server_log("Waiting for socket to be created")
         start_server_timeout!(start)
       end
-      @helpers.start_server_log(start, "Socket created: #{socket_path}")
+      SvelteOnRails::Lib::Utils.ssr_server_log("Socket created: #{socket_path}")
 
       until ping? do
-        @helpers.start_server_log(start, "Waiting for successful server-response")
+        SvelteOnRails::Lib::Utils.ssr_server_log("Waiting for successful server-response")
         start_server_timeout!(start)
         sleep 0.1
       end
-      @helpers.start_server_log(start, "Server responded successfully")
+      SvelteOnRails::Lib::Utils.ssr_server_log("Server responded successfully")
 
       @helpers.cleanup_leftover_processes
     end
@@ -223,7 +217,7 @@ module SvelteOnRails
 
       marker = restart_marker_file
       if File.exist?(marker) && File.mtime(marker) > 10.seconds.ago
-        SvelteOnRails::Lib::Utils.secure_debug_log("[ERROR] Prevented Server Restart because server was restarted too recently: #{marker}")
+        SvelteOnRails::Lib::Utils.ssr_server_log("[ERROR] Prevented Server Restart because server was restarted too recently: #{marker}")
         return
       end
 
@@ -233,7 +227,7 @@ module SvelteOnRails
 
       msg = "Restarting SSR server (#{tag})"
       Rails.logger.error(msg)
-      SvelteOnRails::Lib::Utils.secure_debug_log("[ERROR] #{msg}")
+      SvelteOnRails::Lib::Utils.ssr_server_log("[ERROR] #{msg}")
 
       @helpers.shutdown
       begin
@@ -365,7 +359,7 @@ module SvelteOnRails
       FileUtils.mkdir_p(dir)
       FileUtils.chmod(0777, dir)
       fallback = Pathname.new("#{dir}/#{@socket_namespace}-#{ppid}.sock")
-      start_server_log(nil, "sockets longer than 104 chars are risky, fallback to: #{fallback}")
+      SvelteOnRails::Lib::Utils.ssr_server_log("sockets longer than 104 chars are risky, fallback to: #{fallback}")
       fallback
     end
 
@@ -405,13 +399,6 @@ module SvelteOnRails
       File.delete(ssr_server_ppid_file) if File.exist?(ssr_server_ppid_file)
     end
 
-    def start_server_log(start_time, msg)
-      line = start_time ? "[SOR] #{msg} (#{((Time.now - start_time) * 1000).round(1)}ms)" : "[SOR] #{msg}"
-      puts line
-      $stdout.flush
-      SvelteOnRails::Lib::Utils.secure_debug_log(line)
-    end
-
     private
 
     # Cluster mode: a primary + N workers share one socket path.
@@ -423,7 +410,7 @@ module SvelteOnRails
         Process.kill("SIGINT", p.pid) rescue Errno::ESRCH || Errno::EPERM
       end
 
-      start_server_log(nil, "Killed #{processes.length} #{label} process#{'es' if processes.length != 1}")
+      SvelteOnRails::Lib::Utils.ssr_server_log("Killed #{processes.length} #{label} process#{'es' if processes.length != 1}")
     end
 
     def delete_sockets(socket_paths, label:)
@@ -435,7 +422,7 @@ module SvelteOnRails
         # raced with primary's own cleanup — fine
       end
 
-      start_server_log(nil, "Deleted #{socket_paths.size} #{label} socket#{'s' if socket_paths.size != 1}")
+      SvelteOnRails::Lib::Utils.ssr_server_log("Deleted #{socket_paths.size} #{label} socket#{'s' if socket_paths.size != 1}")
     end
 
     # All running SSR processes matching our namespace (any ppid).

metadata

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