svelte-on-rails 23.0.2 → 23.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c733c4ddc2d785a0534720152724d64f8e61a6334b4ba76c0f6f1cbac1fe7da
-  data.tar.gz: faa9b3a2ccd3c5deef64a31f65a0e6d5d3b5d5687ce7836b9f20f7b83175decd
+  metadata.gz: 26d47863e0d0203a1e3eb22d690621ec1710f24b2f6e6808af0bebb159e8c658
+  data.tar.gz: bda202fb4a438357d2d50d74caf97cb1aa9bc8b4408b7adb758dd9b2c3e50476
 SHA512:
-  metadata.gz: b42c8269255b5958b294501ba7d655576dad6e83d99d9e2b2e28618fa063eed83a41dfa8b91a1b3384bfa6c4a4ae3935deb2184e303b50dc2070a835b5718ce5
-  data.tar.gz: e07230f03d3d7b430045fb76505d15c8d197a1dadf74655edac1c44592c032e3f4456b2e5adc0138ea45c99da1fc3e5bb70705e60141fc6e4f56ac22931b5863
+  metadata.gz: 44513e768c709b976ec016a2381a95565b6d933da6a9fe4d81fcc534e2e35ec5a4a6a76cb1fae659b0eb54531468a9e8c940cb3648f8465b120b6eca780b4a37
+  data.tar.gz: d4c83202c7c4137c715fa54cd1ca6f80a7be1be2bc71291a6a6e15b66fd47e36d642752a94e98e26d1b2ce49eb6a890822c8f01bb2568488dbe631bb502eb8fa

data/lib/svelte-on-rails.rb

@@ -35,6 +35,10 @@ require 'generators/showcase_generator'
 require 'digest/xxhash'
 require 'benchmark'
 
+# for rake tasks
+
+require 'svelte_on_rails/cache'
+
 module SvelteOnRails
   class << self
     def configuration

data/lib/svelte_on_rails/cache.rb

@@ -0,0 +1,56 @@
+module SvelteOnRails
+  module Cache
+    module_function
+
+    def redis_entries(silent: false)
+      conf = SvelteOnRails::Configuration.instance
+      redis = conf.redis_instance
+      namespace = conf.redis_namespace
+
+      unless redis
+        warn "svelte_on_rails:show_cache — no redis_instance configured, nothing to show."
+        return []
+      end
+
+      pattern = "#{namespace}*"
+
+      puts "Scanning Redis for keys matching «#{pattern}» ..." unless silent
+
+      entries = [] # [{ key:, bytes:, ttl:, type: }]
+      cursor = "0"
+
+      loop do
+        cursor, keys = redis.scan(cursor, match: pattern)
+
+        if keys.any?
+          # Pipeline MEMORY USAGE / TTL / TYPE for the whole batch.
+          results = redis.pipelined do |p|
+            keys.each do |k|
+              p.call(["MEMORY", "USAGE", k])
+              p.ttl(k)
+              p.type(k)
+            end
+          end
+
+          keys.each_with_index do |k, i|
+            bytes = results[i * 3]
+            ttl = results[i * 3 + 1]
+            type = results[i * 3 + 2]
+            entries << { key: k, bytes: bytes.to_i, ttl: ttl.to_i, type: type }
+          end
+        end
+
+        break if cursor == "0"
+      rescue => e
+        warn "svelte_on_rails:show_cache — error during scan: #{e.class}: #{e.message}"
+        break
+      end
+
+      if entries.empty?
+        puts "No keys found under «#{pattern}»."
+        return []
+      end
+      entries
+    end
+  end
+end

data/lib/svelte_on_rails/configuration.rb

@@ -314,8 +314,8 @@ module SvelteOnRails
 
         # npm package version
 
-        if Gem::Version.new(version) < Gem::Version.new('15.0.0')
-          raise "[Svelte-on-Rails] NPM-Package @csedl/svelte-on-rails: At least version 15.0.0 is required, but found: «#{sor}»"
+        if Gem::Version.new(version) < Gem::Version.new('15.2.0')
+          raise "[Svelte-on-Rails] NPM-Package @csedl/svelte-on-rails: At least version 15.2.0 is required, but found: «#{sor}»"
         end
 
         # check version

data/lib/svelte_on_rails/ssr_client.rb

@@ -23,7 +23,7 @@ module SvelteOnRails
 
       @initialized_by = caller
 
-      if ssr_startup_leader?
+      if startup_leader?
         File.open(SvelteOnRails::Lib::Utils.ssr_server_logfile, 'w') do |f|
           f.sync = true
           f.puts("[#{Time.now.utc.iso8601(3)} ppid:#{Process.ppid} pid:#{Process.pid}]   >>>  Logfile deleted on initializing SsrClient, called by #{caller}  <<<")
@@ -45,11 +45,11 @@ module SvelteOnRails
 
       File.delete(restart_marker_file) if File.exist?(restart_marker_file)
 
-      SvelteOnRails::SsrClientControlChannel.install_control_listener if ssr_startup_leader?
+      SvelteOnRails::SsrClientControlChannel.install_control_listener if startup_leader?
 
       if @ssr_server
 
-        start_node_server! if ssr_startup_leader?
+        start_node_server! if startup_leader?
 
         at_exit do
           shutdown(caller: 'at_exit')
@@ -319,35 +319,34 @@ module SvelteOnRails
 
     private
 
-    def ssr_startup_leader?
-      return @ssr_startup_leader unless @ssr_startup_leader.nil?
+    def startup_leader?
+      return @startup_leader unless @startup_leader.nil?
 
       FileUtils.mkdir_p(File.dirname(flock_file))
 
-      @ssr_startup_flock_file = File.open(flock_file, File::RDWR | File::CREAT, 0o644)
+      flock = File.open(flock_file, File::RDWR | File::CREAT, 0o644)
 
-      if @ssr_startup_flock_file.flock(File::LOCK_EX | File::LOCK_NB)
+      if flock.flock(File::LOCK_EX | File::LOCK_NB)
         SvelteOnRails::Lib::Utils.ssr_server_log(
-          "SSR startup leader elected: pid=#{Process.pid}, ppid=#{Process.ppid}",
+          "Startup leader process elected: pid=#{Process.pid}, ppid=#{Process.ppid}",
           ssr_logfile_only: true
         )
-        @ssr_startup_leader = true
+        @startup_leader = true
       else
-        @ssr_startup_flock_file.close
-        @ssr_startup_flock_file = nil
+        flock.close
 
         SvelteOnRails::Lib::Utils.ssr_server_log(
-          "SSR startup leader already exists; skipping Node startup in pid=#{Process.pid}, ppid=#{Process.ppid}",
+          "Startup leader already exists; skipping Node startup in pid=#{Process.pid}, ppid=#{Process.ppid}",
           ssr_logfile_only: true
         )
-        @ssr_startup_leader = false
+        @startup_leader = false
       end
 
-      @ssr_startup_leader
+      @startup_leader
     end
 
     def flock_file
-      Rails.root.join('tmp', 'sockets', "svelte-ssr-#{Process.ppid}.flock")
+      Rails.root.join('tmp', 'sockets', "sor-startup-leader-#{Process.ppid}.flock")
     end
 
     def cleanup_flock_file_later

data/lib/tasks/cache_tasks.rake

@@ -52,7 +52,7 @@ namespace :svelte_on_rails do
     desc "Show all svelte-on-rails Redis keys with their memory footprint (scoped to redis_namespace). Env: LIMIT=n, SORT=size|key, PATTERN=extra-glob"
     task show: :environment do
 
-      _entries = entries
+      _entries = SvelteOnRails::Cache.redis_entries
 
       _entries.sort_by! { |e| -e[:bytes] }
 
@@ -104,58 +104,6 @@ namespace :svelte_on_rails do
       end
 
     end
-
-
-    def entries
-      conf = SvelteOnRails::Configuration.instance
-      redis = conf.redis_instance
-      namespace = conf.redis_namespace
-
-      unless redis
-        warn "svelte_on_rails:show_cache — no redis_instance configured, nothing to show."
-        return []
-      end
-
-      pattern = "#{namespace}*"
-
-      puts "Scanning Redis for keys matching «#{pattern}» ..."
-
-      entries = [] # [{ key:, bytes:, ttl:, type: }]
-      cursor = "0"
-
-      loop do
-        cursor, keys = redis.scan(cursor, match: pattern)
-
-        if keys.any?
-          # Pipeline MEMORY USAGE / TTL / TYPE for the whole batch.
-          results = redis.pipelined do |p|
-            keys.each do |k|
-              p.call(["MEMORY", "USAGE", k])
-              p.ttl(k)
-              p.type(k)
-            end
-          end
-
-          keys.each_with_index do |k, i|
-            bytes = results[i * 3]
-            ttl = results[i * 3 + 1]
-            type = results[i * 3 + 2]
-            entries << { key: k, bytes: bytes.to_i, ttl: ttl.to_i, type: type }
-          end
-        end
-
-        break if cursor == "0"
-      rescue => e
-        warn "svelte_on_rails:show_cache — error during scan: #{e.class}: #{e.message}"
-        break
-      end
-
-      if entries.empty?
-        puts "No keys found under «#{pattern}»."
-        return []
-      end
-      entries
-    end
   end
 end
 

data/lib/tasks/ssr_client_tasks.rake

@@ -13,6 +13,8 @@ namespace :svelte_on_rails do
     configs = SvelteOnRails::Configuration.instance
     socket_path = client_status[:socket_path]
 
+    puts client_status.to_s
+
     puts
     puts '=' * @line_width
     puts
@@ -50,6 +52,38 @@ namespace :svelte_on_rails do
       puts
     end
 
+    # MEMORY USAGE
+
+    puts '=' * @line_width
+    puts
+    puts 'MEMORY USAGE:'
+    puts
+    if !curl_installed
+      puts '  ERROR: curl is not installed on this machine, unable to check memory usage for node server.'
+    else
+      curl_cmd2 = "curl --unix-socket #{socket_path} http://localhost/health"
+      stdout, stderr, status = Open3.capture3(curl_cmd2)
+      pids = JSON.parse(stdout)['pids']
+
+      if pids.empty?
+        puts '  Node workers memory: no node worker PIDs found'
+      else
+        ps_cmd = "ps -o rss= -p #{pids.join(',')}"
+        ps_stdout, ps_stderr, ps_status = Open3.capture3(ps_cmd)
+        total_kb = ps_stdout.each_line.sum { |line| line.to_i }
+
+        puts "  #{human_bytes(total_kb*1024)} for #{pids.size} node #{'worker'.pluralize(pids.size)}"
+
+        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)}"
+      end
+    end
+    puts
+
+
+    # ADDITIONAL INFO
+
     puts '=' * @line_width
     puts
     puts 'ADDITIONAL INFO:'

data/templates/config_base/vite-ssr.config.ts

@@ -25,6 +25,9 @@ function getSvelteEntries(): string[] {
 const entries = getSvelteEntries()
 
 export default defineConfig({
+
+    publicDir: false,
+
     plugins: [
         svelte({
             compilerOptions: {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svelte-on-rails
 version: !ruby/object:Gem::Version
-  version: 23.0.2
+  version: 23.1.0
 platform: ruby
 authors:
 - Christian Sedlmair
@@ -75,6 +75,7 @@ files:
 - lib/svelte-on-rails.rb
 - lib/svelte_on_rails/action_cable.rb
 - lib/svelte_on_rails/active_record_extensions.rb
+- lib/svelte_on_rails/cache.rb
 - lib/svelte_on_rails/configuration.rb
 - lib/svelte_on_rails/installer/gem_utils.rb
 - lib/svelte_on_rails/installer/haml.rb