svelte-on-rails 20.0.16 → 20.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ea741277dc8214fd9edcfdf9ebe8f22a21d80eb4023e23b1114f484c5cd012d
-  data.tar.gz: 36841e7cbafafd290835b13fe91a265b97f69a7ce04f4d3c46e32abbb8e440e2
+  metadata.gz: 9144e74eeecc65734e45f39390210c62b8192b4c8fd057aef5903a84637d97e3
+  data.tar.gz: 4bc9d6d33e6cb7983c1c1b4e2f2c8a0c40e1065ed333ad79aecbea2e385d84e1
 SHA512:
-  metadata.gz: '08ca11e82eca49895e9802c3fb331db0935fab58f279e170cd3d8dd53c3d1ad2818df90b797c6b53013ad3a4c691544b998c79a41b17518bea867f21298e3b8d'
-  data.tar.gz: 30fd85219c61dd47eef56240659c35255f9f34ec284d522da75dce163150cc65070b8867ca42f971ad37bfab361a5d0471e76700a2db0dd81445718cc4807932
+  metadata.gz: fe98253869d4730560c194113043e04f4e8ae29abb62a1fcc6140498fb164bb0b3ee9aaddfaf539145eee955a2e99fdf808ffa8c83de7bb3a527ae333cf70008
+  data.tar.gz: 86ec27e42e9730ae51b3d41b4955a05113eac218074c3e2b3d55333d0aacf603f5772e1a1c373a750da6d77b7b930a58c8701443878ffe4b1dee1e3e5deaa2b2

data/lib/svelte_on_rails/railtie.rb

@@ -17,31 +17,18 @@ module SvelteOnRails
     initializer "svelte-on-rails.initialize_ssr_client" do |app|
       app.config.after_initialize do
 
-        # if SvelteOnRails::SsrServer.start_ssr_server?
-        # if defined?(Puma::Server)
+        if defined?(Rake) && Rake.respond_to?(:application) && Rake.application.top_level_tasks.any?
+          puts "[Skipping svelte-on-rails because of top level task: #{Rake.application.top_level_tasks.join(', ')}]"
+          $stdout.flush
+        else
+          SvelteOnRails::Lib::Utils.secure_debug_log("Initializing SSR client")
+          SvelteOnRails::SsrServer.instance
+          SvelteOnRails::Lib::Utils.secure_debug_log("Initializing SSR client finished")
+        end
 
-        # if defined?(Rake) && Rake.respond_to?(:application) && Rake.application.top_level_tasks.any?
-        #   puts "Rake top level tasks!"
-        # else
-          #
-          # SvelteOnRails::Lib::Utils.secure_debug_log("Initializing SSR client")
-          # SvelteOnRails::SsrServer.instance
-          # SvelteOnRails::Lib::Utils.secure_debug_log("Initializing SSR client finished")
-        #end
-
-        # end
-        # else
-        #   SvelteOnRails::Lib::Utils.secure_debug_log("Skipping SSR client (not a web server boot)")
-        # end
       end
     end
 
-    # initializer "svelte-on-rails.initialize_ssr_client" do
-    #   SvelteOnRails::Lib::Utils.secure_debug_log("calling Initializing SSR client")
-    #   SvelteOnRails::SsrServer.instance
-    #   SvelteOnRails::Lib::Utils.secure_debug_log("Initializing SSR client finished")
-    # end
-
     initializer 'svelte_on_rails.active_record_extensions' do
       ActiveSupport.on_load(:active_record) do
 

data/lib/svelte_on_rails/ssr_server.rb

@@ -32,22 +32,25 @@ module SvelteOnRails
       @node_bin = SvelteOnRails::Configuration.instance.node_bin_path
       @ssr_server_bin_path = SvelteOnRails::Configuration.instance.ssr_server_bin_path
 
-        if @use_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
+      File.delete(restart_marker_file) if File.exist?(restart_marker_file)
 
-          SvelteOnRails::Lib::Utils.secure_debug_log("SOR using svelte-ssr-server called, now starting node-server...")
+      if @use_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
 
-          start_node_server!
-          # end
-          at_exit do
-            kill_my_server
-          end
-        else
-          SvelteOnRails::Lib::Utils.secure_debug_log("SSR Server NOT used => @use_ssr_server #{@use_ssr_server}")
-          SvelteOnRails::Lib::Utils.secure_debug_log("SSR Server NOT used => @use_ssr_server #{defined?(Rails::Server)}")
+        SvelteOnRails::Lib::Utils.secure_debug_log("SOR using svelte-ssr-server called, now starting node-server...")
+
+        start_node_server!
+        # end
+        at_exit do
+          kill_my_server
+          File.delete(restart_marker_file) if File.exist?(restart_marker_file)
         end
+      else
+        SvelteOnRails::Lib::Utils.secure_debug_log("SSR Server NOT used => @use_ssr_server #{@use_ssr_server}")
+        SvelteOnRails::Lib::Utils.secure_debug_log("SSR Server NOT used => @use_ssr_server #{defined?(Rails::Server)}")
+      end
 
     end
 
@@ -72,7 +75,9 @@ module SvelteOnRails
         response = socket.read
         socket.close
       rescue => e
-        Thread.new { restart_my_server }
+        # Thread.new do
+        restart_my_server('Restart-after-failure')
+        # end
         if e.is_a?(Errno::ECONNREFUSED)
           SvelteOnRails::Lib::Utils.error_log(
             :ssr_server_unreachable,
@@ -178,7 +183,7 @@ module SvelteOnRails
 
       start = Time.now
       cmd = [
-        "SVELTE_SSR_SERVER_STARTED_BY=r#{started_by}",
+        "SVELTE_SSR_SERVER_STARTED_BY=#{started_by}",
         @node_bin,
         @ssr_server_bin_path,
         @socket_path
@@ -249,19 +254,22 @@ module SvelteOnRails
 
     end
 
-    def restart_my_server
-      return unless @server_restarted_time > 1.minutes.ago
+    def restart_my_server(tag = nil)
+
+      marker = restart_marker_file
+      return if File.exist?(marker) && File.mtime(marker) > 1.minute.ago
 
-      msg = "Restarting SSR server"
+      FileUtils.mkdir_p(marker.dirname)
+      File.open(marker, "a") { |f| f.puts(Time.now.utc.iso8601) }
+      count = File.read(marker).lines.count
+
+      msg = "Restarting SSR server (#{tag})"
       Rails.logger.error(msg)
       SvelteOnRails::Lib::Utils.secure_debug_log("[ERROR] #{msg}")
 
-      @server_restarted_count ||= 0
-      @server_restarted_count += 1
       kill_my_server
       begin
-        start_node_server!("Restart-after-failure-#{@server_restarted_count}")
-        @server_restarted_time = Time.now
+        start_node_server!("#{tag.gsub(' ','-')+'-' if tag}#{count}")
       rescue
       end
     end
@@ -284,6 +292,10 @@ module SvelteOnRails
 
     private
 
+    def restart_marker_file
+      Rails.root.join("tmp", "ssr_server_last_restart")
+    end
+
     def default_ssr_url
       "unix://#{socket_path}"
     end
@@ -388,24 +400,23 @@ module SvelteOnRails
     def ssr_server_ppid_file
       Rails.root.join("tmp", "pids", 'svelte_on_rails.ppid')
     end
+
     def socket_path(ppid: Process.ppid)
-      app_sock = Rails.root.join("tmp/sockets/#{@socket_namespace}-#{ppid}.sock").to_s
+      app_sock = Rails.root.join("tmp/sockets/#{@socket_namespace}-#{ppid}.sock")
       FileUtils.mkdir_p(File.dirname(app_sock))
 
-      return app_sock if app_sock.length < 104
+      return app_sock if app_sock.to_s.length < 104
 
       # Fallback: socket paths > 104 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 = "#{dir}/#{@socket_namespace}-#{ppid}.sock"
+      fallback = Pathname.new("#{dir}/#{@socket_namespace}-#{ppid}.sock")
       start_server_log(nil, "sockets longer than 104 chars are risky, fallback to: #{fallback}")
       fallback
     end
 
-
-
   end
 
   class SsrError < StandardError; end

data/lib/tasks/svelte_on_rails_tasks.rake

@@ -13,6 +13,8 @@ namespace :svelte_on_rails do
     server_helpers = SvelteOnRails::SsrServerHelpers.new
     socket_path = server_helpers.socket_path(ppid: ppid)
 
+    rails_env_warning(socket_path)
+
     puts '=' * 80
     puts "Svelte on Rails SSR Server"
     puts "Rails env: #{Rails.env.upcase}"
@@ -30,6 +32,8 @@ namespace :svelte_on_rails do
     else
       puts label('Process.ppid') + ppid.to_s
       puts label('Socket') + socket_path.to_s
+      puts 'Command for check the server instance:'
+      puts "  • curl --unix-socket #{socket_path} http://localhost"
     end
     puts
     puts '=' * 80
@@ -40,16 +44,49 @@ namespace :svelte_on_rails do
       puts "  • #{line}"
     end
     puts
-    puts 'Command for check the server instance:'
-    puts "  • curl --unix-socket #{socket_path} http://localhost"
 
   end
 
+  def rails_env_warning(socket_path)
+    envs = guessed_rails_envs(socket_path.dirname)
+    if envs == [Rails.env]
+      # All good
+    elsif envs.include?(Rails.env)
+      puts '*' * 80
+      puts "INFO: Based on the socket paths #{socket_path.dirname},"
+      puts "this Rails app may run in #{envs.to_s.join(' or ')}."
+      puts "You are running as #{Rails.env} (Rails.env) which may be right."
+      puts '*' * 80
+      puts
+    else
+      puts '*' * 80
+      puts "WARNING: You are running as #{Rails.env} (Rails.env)"
+      puts "But the rails app seems to run in #{envs.to_s.join(' or ')}"
+      puts '*' * 80
+      puts
+    end
+  end
+
   def label(msg)
     l = msg.length
     "  #{msg}:"[0..20] + (msg.length > 22 ? ':' : '') + ' ' * (20 - l)
   end
 
+  def guessed_rails_envs(dir)
+    envs_dir = Rails.root.join('config', 'environments')
+    return [] unless File.directory?(envs_dir) && File.directory?(dir)
+
+    possible_envs = Dir.children(envs_dir)
+                       .select { |f| f.end_with?('.rb') }
+                       .map { |f| File.basename(f, '.rb') }
+
+    entries = Dir.children(dir)
+
+    possible_envs.select do |env|
+      entries.any? { |entry| entry.include?("-#{env}-") }
+    end
+  end
+
 end
 
 Rake::Task["assets:precompile"].enhance ["svelte_on_rails:precompile"]

metadata

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