svelte-on-rails 22.5.0 → 22.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9c8ad89cdeda90311d9f2f60e3620d4bd87a8e148f40b6b9226136af7400ce3
-  data.tar.gz: cbc53e92bb4e44e97f0cd2076957618ddd8867d974490062d6ba9217930f134c
+  metadata.gz: 1bcf2e7619271bc0d415deb797d15d3d7625640171fa02485fedded0bb526ac6
+  data.tar.gz: b7c3acb70f336fb7c9ff4b203474ed584c9ba280e7a080b959d50dc73e82e9e4
 SHA512:
-  metadata.gz: ff1bf4f5970164c5d185a3de9ea78506b16b8036dc04a8008ae020b20e6837cea4738f6d42af79aea11b563d048a4ed0c20e6d41abaddd61ff927cc6b72177ed
-  data.tar.gz: 13af465c198de0b3e918d30f68f0874f408e4d7b96e89c9467bdf3d193a4136bcc03684af5d2091e7670723529a089faa94c106eb743df49d9eeadcd28d24647
+  metadata.gz: 4df7c21e84b8f1805b0e76fc11dccd5a890fc589399f7945763974f53038b6b595e3a5e834be13857ad0f1da0e20f718df0400cf3965ece7849265fe000c6e80
+  data.tar.gz: a7ad01afc86a956759a79d710806d162f10d7dc400fb0ab2801dd01ae5335d52976c292fb15a2c95bc18fd85dcdd0dd88ad158533c7228572f2121b479e0379d

data/lib/svelte_on_rails/ssr_client.rb

@@ -11,13 +11,16 @@ module SvelteOnRails
                 :socket_path,
                 :ssr_server_bin_path,
                 :node_bin,
-                :initialized_by
+                :initialized_by,
+                :render_success_count,
+                :render_failure_count,
+                :error_log
 
     # methods
 
     def self.instance(caller: nil)
 
-        @instance ||= new(caller: caller)
+      @instance ||= new(caller: caller)
       @instance
     end
 
@@ -30,11 +33,10 @@ module SvelteOnRails
         f.puts("[#{Time.now.utc.iso8601(3)} ppid:#{Process.ppid} pid:#{Process.pid}]   >>>  Logfile deleted on initializing SsrClient, called by #{caller}  <<<")
       end
 
-
       @socket_namespace = [
         "svelte",
-        Rails.application.class.module_parent_name[0..30],
-        short_env
+        Rails.application.class.module_parent_name[0..15],
+        SsrClientControlChannel.short_env
       ].join("-")
       @socket_path = socket_path_fresh
 
@@ -44,6 +46,10 @@ module SvelteOnRails
       @ssr_server_bin_path = SvelteOnRails::Configuration.instance.ssr_server_bin_path
       @started = Time.now
 
+      @render_success_count = 0
+      @render_failure_count = 0
+      @error_log = []
+
       File.delete(restart_marker_file) if File.exist?(restart_marker_file)
 
       SvelteOnRails::SsrClientControlChannel.install_control_listener
@@ -85,6 +91,9 @@ module SvelteOnRails
         socket.close
       rescue => e
 
+        write_error_log(e)
+        @render_failure_count += 1
+
         restart_my_server('Restart-after-failure')
 
         SvelteOnRails::Lib::Utils.error_log(
@@ -104,6 +113,7 @@ module SvelteOnRails
 
       raw_response = parse_body_json(response)
       if raw_response['status'] == 'SUCCESS'
+        @render_success_count += 1
         htm = raw_response['html'].to_s
                                   .gsub('<!--[-->', '')
                                   .gsub('<!--]-->', '')
@@ -124,6 +134,10 @@ module SvelteOnRails
                else
                  ''
                end
+
+        write_error_log("Render #{component[:file_basename]}.svelte")
+        @render_failure_count += 1
+
         utils = SvelteOnRails::Lib::Utils
         utils.error_log(
           :render_failed,
@@ -140,6 +154,12 @@ module SvelteOnRails
 
     end
 
+    def write_error_log(msg)
+      timestamp = Time.now.strftime('%Y-%m-%d %H:%M:%S.%3N')
+      @error_log << "[#{timestamp}] #{msg}"
+      @error_log.shift while @error_log.size > 50
+    end
+
     def parse_body_json(response_string)
       return {} unless response_string.to_s.present?
 
@@ -386,17 +406,15 @@ module SvelteOnRails
     def socket_path_fresh
       ppid = Process.ppid
       app_sock = Rails.root.join("tmp/sockets/#{@socket_namespace}-#{ppid}.sock")
-      FileUtils.mkdir_p(File.dirname(app_sock))
-
-      return app_sock if app_sock.to_s.length < 104
+      if app_sock.to_s.length <= 103
+        FileUtils.mkdir_p(File.dirname(app_sock))
+        return app_sock
+      end
 
-      # Fallback: socket paths > 104 chars are unreliable on macOS/BSD
+      # Fallback: socket paths > 103 chars are unreliable on macOS/BSD
       FileUtils.rm_f(app_sock) if File.exist?(app_sock)
-      dir = File.expand_path("/tmp/svelte")
-      FileUtils.mkdir_p(dir)
-      FileUtils.chmod(0777, dir)
-      fallback = Pathname.new("#{dir}/#{@socket_namespace}-#{ppid}.sock")
-      SvelteOnRails::Lib::Utils.ssr_server_log("sockets longer than 104 chars are risky, fallback to: #{fallback}")
+      fallback = Pathname.new("/tmp/#{@socket_namespace}-#{ppid}.sock")
+      SvelteOnRails::Lib::Utils.ssr_server_log("sockets longer than 103 chars are risky, fallback to: #{fallback}")
       fallback
     end
 
@@ -437,7 +455,7 @@ module SvelteOnRails
     end
 
     def scan_sockets
-      dirs = [Rails.root.join("tmp/sockets").to_s, "/tmp/svelte"]
+      dirs = [Rails.root.join("tmp/sockets").to_s, "/tmp"]
       regex = /#{Regexp.escape(@socket_namespace)}-(\d+)\.sock\z/
 
       dirs.flat_map { |d| Dir.glob(File.join(d, "#{@socket_namespace}-*.sock")) }
@@ -446,38 +464,21 @@ module SvelteOnRails
 
     # END node process management
 
-    def short_env
-
-      name = Rails.env.to_s
-
-      short = {
-        "development" => "dev",
-        "production" => "prod",
-        "staging" => "stage",
-      }[name]
-
-      return name unless short
-      return name if Rails.root.join("config", "environments", "#{short}.rb").exist?
-      short
-    end
-
   end
 
   class SsrClientControlChannel
 
-    SOCKET_FILENAME = "svelte-ctl.sock"
-
     # Full path of the control socket.
     # Sits next to the SSR socket in tmp/sockets, or in the /tmp/svelte
-    # fallback directory when Rails.root pushes total length over 104 chars.
+    # fallback directory when Rails.root pushes total length over 103 chars.
     def self.socket_path
-      primary = Rails.root.join("tmp", "sockets", SOCKET_FILENAME)
-      return primary if primary.to_s.length < 104
+      primary = Rails.root.join("tmp", "sockets", "svelte-ctl-#{short_env}.sock")
+      if primary.to_s.length <= 103
+        FileUtils.mkdir_p(File.dirname(primary))
+        return primary
+      end
 
-      fallback_dir = Pathname.new('/tmp/svelte')
-      FileUtils.mkdir_p(fallback_dir)
-      FileUtils.chmod(0777, fallback_dir)
-      fallback_dir.join(SOCKET_FILENAME)
+      Pathname.new("/tmp/svelte-#{short_env}-ctl-#{Digest::XXH64.hexdigest(Rails.root.to_s)}.sock")
     end
 
     # enable communication by rake task for admin purposes
@@ -506,7 +507,10 @@ module SvelteOnRails
                            socket_path: client_instance.socket_path,
                            initialized_by: client_instance.initialized_by,
                            ping: client_instance.ping?,
-                           start_node_server_command: client_instance.start_node_server_command
+                           start_node_server_command: client_instance.start_node_server_command,
+                           render_success_count: client_instance.render_success_count,
+                           render_failure_count: client_instance.render_failure_count,
+                           error_log: client_instance.error_log
                          }
                        when :stop
                          begin
@@ -544,6 +548,21 @@ module SvelteOnRails
       )
 
     end
+
+    def self.short_env
+
+      name = Rails.env.to_s
+
+      short = {
+        "development" => "dev",
+        "production" => "prod",
+        "staging" => "stage",
+      }[name]
+
+      return name unless short
+      return name if Rails.root.join("config", "environments", "#{short}.rb").exist?
+      short
+    end
   end
 
   class SsrError < StandardError; end

data/lib/tasks/ssr_client_tasks.rake

@@ -19,14 +19,15 @@ namespace :svelte_on_rails do
     puts "INFO FROM THE SSR CLIENT (Rails-side):"
     puts
     puts "  Rails env            : #{client_status[:env]}"
-    puts "  Uptime               : #{client_status[:uptime].round(0)}sec"
     puts "  Initialized by       : #{client_status[:initialized_by]}"
-    puts "  Socket (Node)        : #{socket_path} (#{File.socket?(socket_path) ? 'Present/OK' : 'NOT FOUND!'})"
-    puts "  Ping to Node         : #{client_status[:ping] ? 'SUCCESS' : 'FAILED'}"
-    puts '  Node bin             : ' + configs.node_bin_path.to_s
+    puts "  Uptime               : #{client_status[:uptime].round(0)} sec"
     puts '  Node version         : ' + configs.node_version_test
-    puts '  SSR Server bin       : ' + configs.ssr_server_bin_path.to_s
+    puts '  Node bin             : ' + configs.node_bin_path.to_s
     puts '  NPM package version  : ' + configs.npm_package_version_test.to_s
+    puts '  SSR Server bin       : ' + configs.ssr_server_bin_path.to_s
+    puts "  Socket (SsrServer)   : #{socket_path} (#{File.socket?(socket_path) ? 'Present/OK' : 'NOT FOUND!'})"
+    puts "  Ping to SsrServer    : #{client_status[:ping] ? 'SUCCESS' : 'FAILED'}"
+    puts "  SSR renders          : #{client_status[:render_success_count]} succeeded, #{client_status[:render_failure_count]} failed"
     puts
 
     # NODE SERVER STATUS
@@ -54,6 +55,13 @@ namespace :svelte_on_rails do
     puts
     puts 'ADDITIONAL INFO:'
     puts
+    if client_status[:error_log] == []
+      puts 'No error logs on the client side (Ruby).'
+    else
+      puts "#{client_status[:error_log].length} Errors (Limited to 50):"
+      puts "  #{client_status[:error_log].reverse.join("\n  ")}"
+    end
+    puts
     puts 'How was the node bin path determined:'
     configs.instance_variable_get(:@node_bin_path_log).each_with_index do |line, index|
       puts "  #{index + 1} #{line}"

metadata

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