svelte-on-rails 22.0.0 → 22.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db268172e0c7fb21bb226eb2eac853e27767c280fa041df092a032d88966f422
-  data.tar.gz: 83d59cb6b5276b9ee770032de5604c5dc864a97b64b9d8c84b984f777db172ff
+  metadata.gz: aa3d5f2065ff0479bab2682150d4980b00857afdecce8cfc3481b8c5d2e585e2
+  data.tar.gz: 48d60f4f2952ca7fd5a53b8520f566b50abe3e343cf4dc5b67bda57a2dc87a49
 SHA512:
-  metadata.gz: d684b002aacb4cfdcadbd230fa2c9fd5c800e48722f35f6c455ad6575a583fd66a458d76b5a360238fa0c76d5144d44da7710b09ef217897983926332439b525
-  data.tar.gz: 64241657ce80a4543b0c838d40f09d200236827f22babd6b93b79c09f5b4b84c435dbcb92caed42ebe7a2b7a0c6d979b5f9933348fabfde4030dc0717beef7c1
+  metadata.gz: 0a5dc7749c883e2a9d1ede071e8dcda6ea16e476ff31f9a5f2030c98f2d8515ee478cc4450eff5e79a510cd9dec4bc888570fc02b82a41a40761d75e68623474
+  data.tar.gz: f3feac157c245d8d5f6a916c3ee14b3444200cd4952626b101fbbe58e6213dd0095b68b0a2f553039382cb06ba86dfa864eb08943e12a016482bd8e78ffc9132

data/lib/svelte_on_rails/lib/utils.rb

@@ -155,6 +155,10 @@ module SvelteOnRails
 
       # Log for debugging purposes
       def self.secure_debug_log(line)
+
+        puts "[SOR] #{line}"
+        $stdout.flush
+
         # base = Rails.root.join('tmp')
 
         # FileUtils.mkdir_p(base) unless File.directory?(base)

data/lib/svelte_on_rails/ssr_server.rb

@@ -74,23 +74,20 @@ module SvelteOnRails
         response = socket.read
         socket.close
       rescue => e
-        # Thread.new do
+
         restart_my_server('Restart-after-failure')
-        # end
-        if e.is_a?(Errno::ECONNREFUSED)
-          SvelteOnRails::Lib::Utils.error_log(
-            :ssr_server_unreachable,
-            "Render #{component[:file_basename]}.svelte",
-            [
-              "The SSR Server is not reachable.\nYou may need to restart your app.",
-              "#{e}",
-              SvelteOnRails::Lib::Utils.backtrace_until_sor(e).join("\n")
-            ]
-          )
-          return { success: false, ssr_server_unreachable: true }
-        else
-          raise e
-        end
+
+        SvelteOnRails::Lib::Utils.error_log(
+          :ssr_server_unreachable,
+          "Render #{component[:file_basename]}.svelte",
+          [
+            "The SSR Server is not reachable.\nYou may need to restart your app.",
+            "#{e}",
+            SvelteOnRails::Lib::Utils.backtrace_until_sor(e).join("\n")
+          ]
+        )
+        return { success: false, ssr_server_unreachable: true }
+
       end
 
       shorten_logfile
@@ -171,9 +168,12 @@ module SvelteOnRails
       end
     end
 
-    def start_node_server!(started_by = "rails-boot-#{Rails.env}-#{Process.ppid}")
+    def start_node_server!(
+      started_by = "rails-boot-#{Rails.env}-#{Process.ppid}",
+      restart_after_failure: false
+    )
 
-      SvelteOnRails::Lib::Utils.secure_debug_log("SOR start_node_server! called")
+      SvelteOnRails::Lib::Utils.secure_debug_log("SOR start_node_server! called") if restart_after_failure
 
       # notice ppid
       FileUtils.mkdir_p(@helpers.ssr_server_ppid_file.dirname)
@@ -222,7 +222,10 @@ module SvelteOnRails
     def restart_my_server(tag = nil)
 
       marker = restart_marker_file
-      return if File.exist?(marker) && File.mtime(marker) > 1.minute.ago
+      if File.exist?(marker) && File.mtime(marker) > 10.seconds.ago
+        SvelteOnRails::Lib::Utils.secure_debug_log("[ERROR] Prevented Server Restart because server was restarted too recently: #{marker}")
+        return
+      end
 
       FileUtils.mkdir_p(marker.dirname)
       File.open(marker, "a") { |f| f.puts(Time.now.utc.iso8601) }
@@ -234,7 +237,7 @@ module SvelteOnRails
 
       @helpers.shutdown
       begin
-        start_node_server!("#{tag.gsub(' ','-')+'-' if tag}#{count}")
+        start_node_server!("#{tag.gsub(' ', '-') + '-' if tag}#{count}", restart_after_failure: true)
       rescue
       end
     end

metadata

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