svelte-on-rails 22.4.1 → 22.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61a1a506e531e729e27433251f92fae2e24e73916f9004fafd75efb52b1a073e
-  data.tar.gz: d0cad407740e263bfc0f7b1dd58468734b4e4ddc00623257191c847144ddd1d1
+  metadata.gz: 1b8bd4010aba17f12d8f78b7066f4aaf4ea60673302bd4f9473211ee9fe9fb5a
+  data.tar.gz: c20bb9f2639d4633f9716d7e417a2be1776d08341fe08362323466786c9d9f19
 SHA512:
-  metadata.gz: 7d4404822d86e3e1eb612a937e2bf65883067e462779d5c4d469f6f456d87c97ad126d0ea9b2844ba4526880b82d44eeb12b1d40b988bb8c9dab3d9189ab219f
-  data.tar.gz: e86f2bb86f30a21165ed9422b7ef23eca36317ce1aedcc0e433792760cd3b7c6b10dc9d9bdd9c4ddc55f726fab5dd1c3f0d97f4817b93c75c14464ce1b8b38c3
+  metadata.gz: 58104ed4039aa24c2465782c200927ac4d32420c456dc2d48cac3de852d0de7c3fa791345a505f1a37dac694e57d7f10a9920b2f090c25dd55d57954c7e3575f
+  data.tar.gz: 2675e7072ebca48162cc744b59378c72f9c9ab52948c559087c2049631b89062dd1da8b820e3eed389ba7abb74e72d7cd8704d8dd0a065766eb5c12adb70f536

data/lib/svelte_on_rails/lib/utils.rb

@@ -171,11 +171,12 @@ module SvelteOnRails
           Rails.root.join("log", "svelte-ssr-server.log")
       end
 
-      def self.ssr_server_log(msg)
+      def self.ssr_server_log(msg, ssr_logfile_only: false)
         File.open(ssr_server_logfile, 'a') do |f|
           f.sync = true
           f.puts("[#{Time.now.utc.iso8601(3)} ppid:#{Process.ppid} pid:#{Process.pid}] #{msg}")
         end
+        return if ssr_logfile_only
         puts "[SOR] #{msg}"
         $stdout.flush
       end

data/lib/svelte_on_rails/ssr_client.rb

@@ -408,6 +408,7 @@ module SvelteOnRails
 
       processes.group_by(&:socket_path).values.flat_map { |g| g.sort_by(&:pid) }.each do |p|
         Process.kill("SIGINT", p.pid) rescue Errno::ESRCH || Errno::EPERM
+        SvelteOnRails::Lib::Utils.ssr_server_log("  Killed #{label} unix-pid: #{p.pid}, rails-ppid: #{p.ppid}, socket-path: #{p.socket_path}")
       end
 
       SvelteOnRails::Lib::Utils.ssr_server_log("Killed #{processes.length} #{label} process#{'es' if processes.length != 1}")

data/lib/tasks/svelte_on_rails_tasks.rake

@@ -13,6 +13,21 @@ namespace :svelte_on_rails do
     ppid = (ppid_file.exist? ? File.read(ppid_file).chomp : nil)
     server_helpers = SvelteOnRails::SsrServerHelpers.new
     socket_path = server_helpers.socket_path(ppid: ppid)
+
+    unless File.socket?(socket_path)
+      puts "*" * 80
+      puts "ERROR: socket_path does not exist or is not a socket: #{socket_path}"
+      puts "Do you have set RAILS_ENV correctly?"
+      puts "*" * 80
+    end
+
+    unless ppid_file.exist?
+      puts "*" * 80
+      puts "ERROR: PPID File does not exist: #{ppid_file}"
+      puts "Is the app running?"
+      puts "*" * 80
+    end
+
     curl_installed = system('which curl > /dev/null 2>&1')
     if curl_installed
       curl_cmd = "curl --unix-socket #{socket_path} http://localhost"
@@ -20,12 +35,10 @@ namespace :svelte_on_rails do
       srv_details = (JSON.parse(stdout) rescue {})
     end
 
-    env_check = rails_env_check(socket_path)
-
     puts
     puts '=' * line_width
     puts "Svelte on Rails SSR Server Status:"
-    puts "  Rails env: #{Rails.env.upcase}"
+    puts "  Rails env: #{Rails.env}"
     if srv_details['uptime']
       puts "  Uptime: #{srv_details['uptime'].round(0)}sec"
     else
@@ -40,14 +53,8 @@ namespace :svelte_on_rails do
     puts label('SSR Server version') + configs.npm_package_version_test.to_s
     puts
     puts 'Rails instance'
-    if !server_helpers.ssr_server_ppid_file.exist?
-      puts label('Process.ppid') + "#{server_helpers.ssr_server_ppid_file} not found, rails seems not to run or the SsrServer is not initialized yet."
-    elsif env_check == :clearly_correct
-      puts label('Process.ppid') + ppid.to_s
-      puts label('Socket') + socket_path.to_s
-    else
-      puts 'Rails env could not be determinated, compared to the socket path, so, no socket path could be determined.'
-    end
+    puts label('Process.ppid') + ppid.to_s
+    puts label('Socket') + socket_path.to_s
     puts
     puts '=' * line_width
     puts
@@ -67,72 +74,28 @@ namespace :svelte_on_rails do
       puts "  • kill #{srv_details['pid']}" if srv_details['pid']
     end
     puts
-    if env_check == :clearly_correct
-      puts '=' * line_width
-      puts
-      puts 'NODE INSTANCE INFO:'
-      puts '  (output of the above mentioned curl command)'
-      puts
-      puts '-' * line_width
-      if curl_installed
-        stdout, stderr, status = Open3.capture3(curl_cmd)
-        if status.success?
-          puts stdout
-        else
-          puts "curl exited with status #{status.exitstatus}"
-          puts stderr unless stderr.to_s.strip.empty?
-        end
+
+    puts '=' * line_width
+    puts
+    puts 'NODE INSTANCE INFO:'
+    puts '  (output of the above mentioned curl command)'
+    puts
+    puts '-' * line_width
+    if curl_installed
+      stdout, stderr, status = Open3.capture3(curl_cmd)
+      if status.success?
+        puts stdout
       else
-        puts "curl is not installed on this machine, skipping execution."
+        puts "curl exited with status #{status.exitstatus}"
+        puts stderr unless stderr.to_s.strip.empty?
       end
-      puts
-      puts '=' * line_width
-      puts
-    end
-
-  end
-
-  def rails_env_check(socket_path)
-
-    line_width = 100
-
-    envs = guessed_rails_envs(socket_path.dirname)
-
-    if envs == [Rails.env]
-
-      :clearly_correct
-
-    elsif envs.empty?
-
-      puts
-      puts '*' * line_width
-      puts "WARNING: This Rails app seems not to run."
-      puts '*' * line_width
-      puts
-      :possible_correct
-
-    elsif envs.include?(Rails.env)
-
-      puts
-      puts '*' * line_width
-      puts "INFO: Based on the socket paths #{socket_path.dirname},"
-      puts "this Rails app may run in #{envs.join(' or ')}."
-      puts "You are running as #{Rails.env} (Rails.env) which may be right."
-      puts '*' * line_width
-      puts
-      :possible_correct
-
     else
-
-      puts
-      puts '*' * line_width
-      puts "WARNING: You are running as #{Rails.env} (Rails.env)"
-      puts "But the rails app seems to run in #{envs.join(' or ')}"
-      puts '*' * line_width
-      puts
-      :possible_wrong
-
+      puts "curl is not installed on this machine, skipping execution."
     end
+    puts
+    puts '=' * line_width
+    puts
+
   end
 
   def label(msg)
@@ -140,21 +103,6 @@ namespace :svelte_on_rails do
     "  #{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: 22.4.1
+  version: 22.4.3
 platform: ruby
 authors:
 - Christian Sedlmair