svelte-on-rails 23.0.0 → 23.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3940962e167ef99d7a0d4c96d0d55efb4beed16497825830840c668bfa06b46d
-  data.tar.gz: 26a6cc1b3e604da9877eea62a2f8a9fd48dcba6dffcde1b988f6d65fe6b8261c
+  metadata.gz: 3c733c4ddc2d785a0534720152724d64f8e61a6334b4ba76c0f6f1cbac1fe7da
+  data.tar.gz: faa9b3a2ccd3c5deef64a31f65a0e6d5d3b5d5687ce7836b9f20f7b83175decd
 SHA512:
-  metadata.gz: fe829b60ff8c1fb774a7c426b10f2b4736016a4e0b022daf47d76751a6f0ec27e4f46cac9960315c0c57bf3f1e35236b210184bd4bd1dea9193d314b10b04c73
-  data.tar.gz: 97e54fe0b02be5a342861e47f52d5eacb9442060af0e98b3ae152c52d3f66f708e7b7874aae4467bd7672c4f19f1ed39841bfb6c847375241bd5e1e03a4fa56f
+  metadata.gz: b42c8269255b5958b294501ba7d655576dad6e83d99d9e2b2e28618fa063eed83a41dfa8b91a1b3384bfa6c4a4ae3935deb2184e303b50dc2070a835b5718ce5
+  data.tar.gz: e07230f03d3d7b430045fb76505d15c8d197a1dadf74655edac1c44592c032e3f4456b2e5adc0138ea45c99da1fc3e5bb70705e60141fc6e4f56ac22931b5863

data/lib/svelte_on_rails/ssr_client.rb

@@ -23,9 +23,11 @@ module SvelteOnRails
 
       @initialized_by = caller
 
-      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}  <<<")
+      if ssr_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}  <<<")
+        end
       end
 
       @socket_namespace = [
@@ -43,11 +45,11 @@ module SvelteOnRails
 
       File.delete(restart_marker_file) if File.exist?(restart_marker_file)
 
-      SvelteOnRails::SsrClientControlChannel.install_control_listener
+      SvelteOnRails::SsrClientControlChannel.install_control_listener if ssr_startup_leader?
 
       if @ssr_server
 
-        start_node_server!
+        start_node_server! if ssr_startup_leader?
 
         at_exit do
           shutdown(caller: 'at_exit')
@@ -183,58 +185,49 @@ module SvelteOnRails
       restart_after_failure: false
     )
 
-      # when multiple workers defined: ensure only the first start the node instance
-      if ssr_socket_exists?
-        SvelteOnRails::Lib::Utils.ssr_server_log("SOR start_node_server! => Exit because socket-file already exists", ssr_logfile_only: !restart_after_failure)
-        return
-      end
-      with_ssr_client_flock do
-        if ssr_socket_exists?
-          SvelteOnRails::Lib::Utils.ssr_server_log("SOR start_node_server! => Exit because concurrency process detected by flock-file", ssr_logfile_only: !restart_after_failure)
-          return
-        end
+      return if ping?
 
-        SvelteOnRails::Lib::Utils.ssr_server_log("SOR start_node_server! called", ssr_logfile_only: !restart_after_failure)
-
-        start = Time.now
-
-        @node_server_output = {}
-        Thread.new do
-          stdout, stderr, status = Open3.capture3(
-            start_node_server_command(started_by),
-            chdir: Rails.root
-          )
-          @node_server_output = {
-            stdout: stdout,
-            stderr: stderr,
-            status: status
-          }
-        end
-        SvelteOnRails::Lib::Utils.ssr_server_log("Node Version: #{Configuration.instance.node_version_test}, package version: #{Configuration.instance.npm_package_version_test}")
-        SvelteOnRails::Lib::Utils.ssr_server_log("Start running Svelte-SSR-Server... (#{started_by})")
+      SvelteOnRails::Lib::Utils.ssr_server_log("SOR start_node_server! called", ssr_logfile_only: !restart_after_failure)
 
-        until node_server_pid do
-          sleep 0.12
-          SvelteOnRails::Lib::Utils.ssr_server_log("Waiting for node server process-id")
-          start_server_timeout!(start)
-        end
+      start = Time.now
 
-        until File.socket?(socket_path) do
-          sleep 0.1
-          SvelteOnRails::Lib::Utils.ssr_server_log("Waiting for socket to be created")
-          start_server_timeout!(start)
-        end
-        SvelteOnRails::Lib::Utils.ssr_server_log("Socket created: #{socket_path}")
+      @node_server_output = {}
+      Thread.new do
+        stdout, stderr, status = Open3.capture3(
+          start_node_server_command(started_by),
+          chdir: Rails.root
+        )
+        @node_server_output = {
+          stdout: stdout,
+          stderr: stderr,
+          status: status
+        }
+      end
+      SvelteOnRails::Lib::Utils.ssr_server_log("Node Version: #{Configuration.instance.node_version_test}, package version: #{Configuration.instance.npm_package_version_test}")
+      SvelteOnRails::Lib::Utils.ssr_server_log("Start running Svelte-SSR-Server... (#{started_by})")
 
-        until ping? do
-          SvelteOnRails::Lib::Utils.ssr_server_log("Waiting for successful server-response")
-          start_server_timeout!(start)
-          sleep 0.1
-        end
-        SvelteOnRails::Lib::Utils.ssr_server_log("Server responded successfully")
+      until node_server_pid do
+        sleep 0.12
+        SvelteOnRails::Lib::Utils.ssr_server_log("Waiting for node server process-id")
+        start_server_timeout!(start)
+      end
+
+      until File.socket?(socket_path) do
+        sleep 0.1
+        SvelteOnRails::Lib::Utils.ssr_server_log("Waiting for socket to be created")
+        start_server_timeout!(start)
+      end
+      SvelteOnRails::Lib::Utils.ssr_server_log("Socket created: #{socket_path}")
 
-        cleanup_leftover_processes
+      until ping? do
+        SvelteOnRails::Lib::Utils.ssr_server_log("Waiting for successful server-response")
+        start_server_timeout!(start)
+        sleep 0.1
       end
+      SvelteOnRails::Lib::Utils.ssr_server_log("Server responded successfully")
+
+      cleanup_leftover_processes
+
       cleanup_flock_file_later
     end
 
@@ -326,21 +319,35 @@ module SvelteOnRails
 
     private
 
-    def ssr_socket_exists?
-      File.socket?(socket_path)
-    end
+    def ssr_startup_leader?
+      return @ssr_startup_leader unless @ssr_startup_leader.nil?
+
+      FileUtils.mkdir_p(File.dirname(flock_file))
+
+      @ssr_startup_flock_file = File.open(flock_file, File::RDWR | File::CREAT, 0o644)
+
+      if @ssr_startup_flock_file.flock(File::LOCK_EX | File::LOCK_NB)
+        SvelteOnRails::Lib::Utils.ssr_server_log(
+          "SSR startup leader elected: pid=#{Process.pid}, ppid=#{Process.ppid}",
+          ssr_logfile_only: true
+        )
+        @ssr_startup_leader = true
+      else
+        @ssr_startup_flock_file.close
+        @ssr_startup_flock_file = nil
 
-    def with_ssr_client_flock
-      File.open(flock_file, File::RDWR | File::CREAT, 0o644) do |file|
-        file.flock(File::LOCK_EX)
-        yield
-      ensure
-        file.flock(File::LOCK_UN) if file
+        SvelteOnRails::Lib::Utils.ssr_server_log(
+          "SSR startup leader already exists; skipping Node startup in pid=#{Process.pid}, ppid=#{Process.ppid}",
+          ssr_logfile_only: true
+        )
+        @ssr_startup_leader = false
       end
+
+      @ssr_startup_leader
     end
 
     def flock_file
-      File.join(File.dirname(socket_path), "ssr-client-flock")
+      Rails.root.join('tmp', 'sockets', "svelte-ssr-#{Process.ppid}.flock")
     end
 
     def cleanup_flock_file_later

metadata

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