svelte-on-rails 22.5.2 → 22.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e508b30c7a40e2274cacc0a291fe40b54ad33b13bcb2e1fc7851db51102392d8
-  data.tar.gz: 6baa52304e5f6269e38557015f9ae3d1d24447904bea9749afeff23099d97529
+  metadata.gz: 1a6a1c4758093d4ee7080494a52d0a3709728dc830b7f0c261841363100ea593
+  data.tar.gz: 18d316a0a47d9c780d3169acd3edc525f4a097864302182b1398173ffd26aba7
 SHA512:
-  metadata.gz: e059fb08261304ce5941788ebb9261f0919044e730a38f6c381e756c5707dc838b6376dd75f0edd7216b8bf420a710fc67927b05c19fbfff9a3e66cc226bd449
-  data.tar.gz: 76c5ca5ebb681524b04be2d87e88d477db6af12537a382a230cb423042ec36da722e484c7536646f87f065a2bff1ca13f1f976cec8f030b3e6037fd20c2d42ea
+  metadata.gz: af06be9fb96620f83701d90eb2745dc551329f25b1fceedf55e02f42150361f4d491b0ae5fb1279639761449a08dbab73861711c6776178d294bc84343f012c9
+  data.tar.gz: c8c362043c2872cb7b4bf8b89de643daca6accfca5d5d7937ed726f3f49dea6babe3b5501c43a9c497be5eb843b4195832b0cf1a97e3e856d9e836605a3feda6

data/lib/svelte_on_rails/ssr_client.rb

@@ -11,10 +11,7 @@ module SvelteOnRails
                 :socket_path,
                 :ssr_server_bin_path,
                 :node_bin,
-                :initialized_by,
-                :render_success_count,
-                :render_failure_count,
-                :error_log
+                :initialized_by
 
     # methods
 
@@ -36,7 +33,7 @@ module SvelteOnRails
       @socket_namespace = [
         "svelte",
         Rails.application.class.module_parent_name[0..15],
-        SsrClientControlChannel.short_env
+        Rails.env
       ].join("-")
       @socket_path = socket_path_fresh
 
@@ -46,10 +43,6 @@ 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
@@ -91,9 +84,6 @@ 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(
@@ -113,7 +103,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('<!--]-->', '')
@@ -135,9 +125,6 @@ module SvelteOnRails
                  ''
                end
 
-        write_error_log("Render #{component[:file_basename]}.svelte")
-        @render_failure_count += 1
-
         utils = SvelteOnRails::Lib::Utils
         utils.error_log(
           :render_failed,
@@ -154,12 +141,6 @@ 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?
 
@@ -472,13 +453,13 @@ module SvelteOnRails
     # Sits next to the SSR socket in tmp/sockets, or in the /tmp/svelte
     # fallback directory when Rails.root pushes total length over 103 chars.
     def self.socket_path
-      primary = Rails.root.join("tmp", "sockets", "svelte-ctl-#{short_env}.sock")
+      primary = Rails.root.join("tmp", "sockets", "svelte-ctl-#{Rails.env}.sock")
       if primary.to_s.length <= 103
         FileUtils.mkdir_p(File.dirname(primary))
         return primary
       end
 
-      Pathname.new("/tmp/svelte-#{short_env}-ctl-#{Digest::XXH64.hexdigest(Rails.root.to_s)}.sock")
+      Pathname.new("/tmp/svelte-#{Rails.env}-ctl-#{Digest::XXH64.hexdigest(Rails.root.to_s)}.sock")
     end
 
     # enable communication by rake task for admin purposes
@@ -507,10 +488,7 @@ 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,
-                           render_success_count: client_instance.render_success_count,
-                           render_failure_count: client_instance.render_failure_count,
-                           error_log: client_instance.error_log
+                           start_node_server_command: client_instance.start_node_server_command
                          }
                        when :stop
                          begin
@@ -549,20 +527,6 @@ 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

@@ -27,7 +27,6 @@ namespace :svelte_on_rails do
     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
@@ -55,13 +54,6 @@ 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}"
@@ -78,7 +70,7 @@ namespace :svelte_on_rails do
 
   namespace :ssr_client do
 
-    desc 'For development: to simulate when a client did not start on deploy (Then, on the first request of a svelte component - if not cached! - it must start)'
+    desc 'For development(and only ONE WORKER! for multiple puma workers it doesnt work!): to simulate when a client did not start on deploy (Then, on the first request of a svelte component - if not cached! - it must start)'
     task :stop do
       r = get_from_ssr_client(:stop)
       if r['success']

metadata

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