svelte-on-rails 23.1.2 → 23.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1ab30669578fe29fb245c12c41a0b3b25d14771ee678ea57b369fd0fdd3c9bd
-  data.tar.gz: 13abe226046b6277b1c25f088fd0ed1997e4e57d5ae3f758575b55561c5f9372
+  metadata.gz: ac0e9d24da89f85409888acbf8e7c915740f6dc4dcfc1368625330f2e0958d7a
+  data.tar.gz: 8cdbe72fe092b13f1f187b380d42fdca1b04ed079f21bc46b78c9acf746f303b
 SHA512:
-  metadata.gz: 1f0276d33017984819175f07c6203858a98ce736039988cbed471be00f537e5b9827428776c2df29f5594a028cad5e5399c24c0b50e6493cb81e00cf2dd7f657
-  data.tar.gz: 32a6d6da4edbfb741946453ebc4d2cef3de16d0bea30a4749ab394bf0eae647c53eae64d8acd4f649fdb9ffc789e4fc0c2ab85526b382892fc7bc9c75d0d8015
+  metadata.gz: 482cd3dbcacee1ef69d0b7379e78196e76eaa0df72b27cc85346baac4eeeb31e2af1e320a73dd250359a53f4c967439aa9c32be6b37276fae89ea16083a5d6e6
+  data.tar.gz: 827890a5ce59ed3dc47c33747b12ae28f4467270ed22533461630bcf19a898ce65cc62267357f0a131397ae4681c0cf1eb2865886098210d7afc00b1b68d995c

data/lib/svelte_on_rails/ssr_client.rb

@@ -586,7 +586,8 @@ module SvelteOnRails
 
     def scan_processes
       stdout, = Open3.capture3("ps aux | grep svelte | grep -v grep")
-      regex = %r{(/\S*#{Regexp.escape(@socket_namespace)}-([0-9]+-[0-9]+)\.sock)\b}
+      startup_id_pattern = '([0-9]+(?:-[0-9]+)?)'
+      regex = %r{(/\S*#{Regexp.escape(@socket_namespace)}-#{startup_id_pattern}\.sock)\b}
 
       stdout.each_line.filter_map do |line|
         m = line.match(regex) or next
@@ -597,7 +598,8 @@ module SvelteOnRails
 
     def scan_sockets
       dirs = [Rails.root.join("tmp/sockets").to_s, "/tmp"]
-      regex = /#{Regexp.escape(@socket_namespace)}-([0-9]+-[0-9]+)\.sock\z/
+      startup_id_pattern = '([0-9]+(?:-[0-9]+)?)'
+      regex = /#{Regexp.escape(@socket_namespace)}-#{startup_id_pattern}\.sock\z/
 
       dirs.flat_map { |d| Dir.glob(File.join(d, "#{@socket_namespace}-*.sock")) }
           .filter_map { |path| (m = path.match(regex)) && { path: path, startup_id: m[1] } }

data/lib/tasks/ssr_client_tasks.rake

@@ -1,7 +1,7 @@
 namespace :svelte_on_rails do
 
   desc "Check svelte-on-rails setup and SSR server status"
-  task :check do
+  task check: :environment do
 
     @line_width = 130
 
@@ -10,6 +10,25 @@ namespace :svelte_on_rails do
     cs = get_from_ssr_client(:status)
     exit(1) unless cs
     client_status = JSON.parse(cs).symbolize_keys
+
+    # Environment validation
+
+    if client_status[:env].to_s != Rails.env.to_s
+      puts
+      puts '*' * @line_width
+      puts 'ERROR: Environment mismatch between this rake task and the running Rails process.'
+      puts
+      puts "  Rake task Rails.env      : «#{Rails.env}»"
+      puts "  Running Rails process env: «#{client_status[:env]}»"
+      puts
+      puts 'Run the check task with the same environment as the running server.'
+      puts
+      puts '*' * @line_width
+      exit(1)
+    end
+
+    # SSR Client INFO
+
     configs = SvelteOnRails::Configuration.instance
     socket_path = client_status[:socket_path]
 
@@ -75,6 +94,8 @@ namespace :svelte_on_rails do
         redis_entries = SvelteOnRails::Cache.redis_entries(silent: true)
         total_bytes = redis_entries.sum { |e| e[:bytes] }
         puts "  #{human_bytes(total_bytes)} for #{redis_entries.size} Redis #{'key'.pluralize(redis_entries.size)}"
+        puts "  Redis namespace: #{SvelteOnRails::Configuration.instance.redis_namespace}*"
+
       end
     end
     puts

metadata

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