svelte-on-rails 22.5.6 → 23.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab6d571ef0c95edbc34868a44322a5fd65ce530ec4bf9d25abae20bb3f07cb6d
-  data.tar.gz: 875903772b806d6be74e66057cfb75c14d12e127a7024ab240be4d8e9b52f8c6
+  metadata.gz: 3940962e167ef99d7a0d4c96d0d55efb4beed16497825830840c668bfa06b46d
+  data.tar.gz: 26a6cc1b3e604da9877eea62a2f8a9fd48dcba6dffcde1b988f6d65fe6b8261c
 SHA512:
-  metadata.gz: 0bf76f5cc03cd13af95609c0a3e5d1ae7c5d6e9b899cad7f0fea2da9636a12cd8e015bf6e8f7fb5475d55a82f33ad3362123ee57c81e30b9cbecfb2f669586e5
-  data.tar.gz: 585f3cefa671842756b103dbafded674e47c217db31954044e42731dbe1648a293210b0b156ef8de842a74c24891a929c871121fd3d3da9e1d4b06d9032b0312
+  metadata.gz: fe829b60ff8c1fb774a7c426b10f2b4736016a4e0b022daf47d76751a6f0ec27e4f46cac9960315c0c57bf3f1e35236b210184bd4bd1dea9193d314b10b04c73
+  data.tar.gz: 97e54fe0b02be5a342861e47f52d5eacb9442060af0e98b3ae152c52d3f66f708e7b7874aae4467bd7672c4f19f1ed39841bfb6c847375241bd5e1e03a4fa56f

data/lib/svelte-on-rails.rb

@@ -16,7 +16,6 @@ require "svelte_on_rails/lib/view_helper_support"
 require "svelte_on_rails/lib/to_svelte_schema"
 require "svelte_on_rails/lib/to_svelte_values"
 require "svelte_on_rails/lib/to_svelte_support"
-require "svelte_on_rails/lib/to_svelte_translations"
 require "svelte_on_rails/lib/cache_warmer"
 require "svelte_on_rails/lib/boot_context"
 

data/lib/svelte_on_rails/active_record_extensions.rb

@@ -13,13 +13,11 @@ module SvelteOnRails
 
         tsv = SvelteOnRails::Lib::ToSvelteValues
         tsl = SvelteOnRails::Lib::ToSvelteSchema.instance
-        tnl = SvelteOnRails::Lib::ToSvelteTranslations.instance
 
         values = tsv.extract_values(self, attributes, associations)
         models, schema = tsl.extract_schema(self.class, attributes, associations, cache_key)
-        translations = tnl.all_cached_translations(I18n.locale, :to_svelte_props, models, self.class)
 
-        values.merge(schema).merge(translations)
+        values.merge(schema)
       end
 
     end
@@ -36,12 +34,10 @@ module SvelteOnRails
         cache_key = (I18n.locale.to_s + self.name + attributes.to_s + associations.to_s).hash
 
         tsl = SvelteOnRails::Lib::ToSvelteSchema.instance
-        tnl = SvelteOnRails::Lib::ToSvelteTranslations.instance
 
         models, schema = tsl.extract_schema(self, attributes, associations, cache_key)
-        translations = tnl.all_cached_translations(I18n.locale, :to_svelte_props, models, self)
 
-        schema.merge(translations)
+        schema
 
       end
     end
@@ -58,14 +54,12 @@ module SvelteOnRails
 
         cl = SvelteOnRails::Lib::ToSvelteValues
         tsl = SvelteOnRails::Lib::ToSvelteSchema.instance
-        tnl = SvelteOnRails::Lib::ToSvelteTranslations.instance
 
         data = cl.extract_values(self, attributes, associations)
 
         models, schema = tsl.extract_schema(self.klass, attributes, associations, cache_key)
-        translations = tnl.all_cached_translations(I18n.locale, :to_svelte_props, models, self.klass)
 
-        { 'data' => data }.merge(schema).merge(translations)
+        { 'data' => data }.merge(schema)
       end
     end
 

data/lib/svelte_on_rails/configuration.rb

@@ -223,8 +223,6 @@ module SvelteOnRails
         extra_component_paths: { optional: :array },
         skip_ssr_header: { optional: :string },
         cache_warmer: { optional: :boolean },
-        to_svelte_props: { optional: :hash },
-        global_props: { optional: :hash },
 
         ssr: { options_required: [:auto, true, false] },
         watch_changes: { options_optional: [true, false] },

data/lib/svelte_on_rails/installer/npm.rb

@@ -37,7 +37,7 @@ module SvelteOnRails
 
           puts cmd
 
-          if stderr.present?
+          unless status.success?
             raise "ERROR #{cmd} => #{stderr}"
           end
 

data/lib/svelte_on_rails/lib/view_helper_support.rb

@@ -140,9 +140,6 @@ module SvelteOnRails
           }
         )
 
-        tnl = SvelteOnRails::Lib::ToSvelteTranslations.instance
-        _tnl = tnl.cached_translations(I18n.locale, :to_svelte_props, nil)
-        svelte_props[:_translations] = _tnl if _tnl
         svelte_props[:test] = 'hello'
 
         ht_opts[:class] = "svelte-component #{ht_opts[:class]}"

data/lib/svelte_on_rails/ssr_client.rb

@@ -13,8 +13,6 @@ module SvelteOnRails
                 :node_bin,
                 :initialized_by
 
-    # methods
-
     def self.instance(caller: nil)
 
       @instance ||= new(caller: caller)
@@ -54,6 +52,7 @@ module SvelteOnRails
         at_exit do
           shutdown(caller: 'at_exit')
           File.delete(restart_marker_file) if File.exist?(restart_marker_file)
+          FileUtils.remove(flock_file) if File.exist?(flock_file)
         end
       else
         SvelteOnRails::Lib::Utils.ssr_server_log("SSR Server NOT used => @ssr_server #{@ssr_server}")
@@ -184,46 +183,59 @@ module SvelteOnRails
       restart_after_failure: false
     )
 
-      SvelteOnRails::Lib::Utils.ssr_server_log("SOR start_node_server! called", ssr_logfile_only: !restart_after_failure)
+      # 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
 
-      start = Time.now
+        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})")
 
-      @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 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 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}")
 
-      until File.exist?(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}")
+        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 ping? do
-        SvelteOnRails::Lib::Utils.ssr_server_log("Waiting for successful server-response")
-        start_server_timeout!(start)
-        sleep 0.1
+        cleanup_leftover_processes
       end
-      SvelteOnRails::Lib::Utils.ssr_server_log("Server responded successfully")
-
-      cleanup_leftover_processes
+      cleanup_flock_file_later
     end
 
     def restart_my_server(tag = nil)
@@ -314,6 +326,37 @@ module SvelteOnRails
 
     private
 
+    def ssr_socket_exists?
+      File.socket?(socket_path)
+    end
+
+    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
+      end
+    end
+
+    def flock_file
+      File.join(File.dirname(socket_path), "ssr-client-flock")
+    end
+
+    def cleanup_flock_file_later
+      path = flock_file
+
+      Thread.new do
+        sleep 3
+        FileUtils.rm_f(path)
+      rescue => e
+        SvelteOnRails::Lib::Utils.ssr_server_log(
+          "Could not remove flock file #{path}: #{e.class}: #{e.message}",
+          ssr_logfile_only: true
+        )
+      end
+    end
+
     def restart_marker_file
       Rails.root.join("tmp", "ssr_server_last_restart")
     end
@@ -464,6 +507,8 @@ module SvelteOnRails
 
     # enable communication by rake task for admin purposes
     def self.install_control_listener
+      return if @installed
+      @installed = true
 
       path = socket_path.to_s
       FileUtils.mkdir_p(File.dirname(path))
@@ -476,7 +521,7 @@ module SvelteOnRails
         loop do
           client = server.accept
           begin
-            request = client.gets&.strip.to_sym
+            request = client.gets&.strip&.to_sym
             client_instance = SsrClient.instance(caller: 'rake task (manual)')
 
             response = case request

data/templates/config_base/config/svelte_on_rails.yml

@@ -69,24 +69,6 @@ turbo_stream:
   # html-id of any element that must exist for being able to receive actions (turbo streams can only work this way)
   channel: 'public'
 
-to_svelte_props:
-  translations:
-    helpers:
-      submit:
-        - create
-        - update
-        - submit
-# Theese keys must match with the keys in config/locales.
-# If set, the key _translations will be added by the to_svelte helper to the props
-
-global_props:
-  translations:
-    any:
-      - translations
-# Theese keys must match with the keys in config/locales.
-# If set, the key _translations will be added by the svelte view helper to the props of any component
-
-
 action_cable:
   # if you want to use it
   channel: "svelte_on_rails_channel"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svelte-on-rails
 version: !ruby/object:Gem::Version
-  version: 22.5.6
+  version: 23.0.0
 platform: ruby
 authors:
 - Christian Sedlmair
@@ -92,7 +92,6 @@ files:
 - lib/svelte_on_rails/lib/metrics.rb
 - lib/svelte_on_rails/lib/to_svelte_schema.rb
 - lib/svelte_on_rails/lib/to_svelte_support.rb
-- lib/svelte_on_rails/lib/to_svelte_translations.rb
 - lib/svelte_on_rails/lib/to_svelte_values.rb
 - lib/svelte_on_rails/lib/utils.rb
 - lib/svelte_on_rails/lib/view_helper_support.rb

data/lib/svelte_on_rails/lib/to_svelte_translations.rb

@@ -1,97 +0,0 @@
-module SvelteOnRails
-  module Lib
-    class ToSvelteTranslations
-      def self.instance
-        @instance ||= new
-        if SvelteOnRails::Configuration.instance.watch_changes?
-          @cached_translations = {}
-          @all_cached_translations = {}
-        end
-        @instance
-      end
-
-      def initialize
-        @config = SvelteOnRails::Configuration.instance
-        @cached_translations = {}
-        @all_cached_translations = {}
-      end
-
-      def all_cached_translations(language_key, config_key, models, own_model)
-        k = "#{language_key}-#{config_key}-#{models}".hash
-        @all_cached_translations[k] ||=
-          models.each_with_object({}) do |model, memo|
-            k = own_model == model ? "_translations" : "_#{model.name.underscore}_translations"
-            memo[k] = cached_translations(language_key, config_key, model)
-          end
-      end
-
-      def cached_translations(language_key, config_key, model)
-        k = "#{language_key}-#{config_key}-#{model.class.name}".hash
-        @cached_translations[k] ||= begin
-                                      config = @config.configs[config_key]
-                                      if config
-                                        source = config[:translations]
-                                        if source
-                                          calc(source, language_key, model)
-                                        end
-                                      end
-                                    end
-      end
-
-      private
-
-      def calc(source, lang, model)
-        # Transform model for interpolation (human name)
-        interpolation_kwargs = model && {
-          model: model.model_name.human(locale: lang)
-        }
-
-        translate_at = lambda do |full_path|
-          i18n_key = full_path.join('.')
-          if interpolation_kwargs
-          I18n.t(i18n_key, **interpolation_kwargs, locale: lang)
-          else
-            I18n.t(i18n_key, locale: lang)
-            end
-        end
-
-        set_nested = lambda do |memo, segments, value|
-          current = memo
-          segments[0..-2].each do |segment|
-            current[segment] ||= {}
-            current = current[segment]
-          end
-          current[segments.last] = value
-        end
-
-        walk = lambda do |node, path|
-          case node
-          when Hash
-            node.each_with_object({}) do |(key, value), memo|
-              key_str = key.to_s
-              memo[key_str] = walk.call(value, path + [key_str])
-            end
-          when Array
-            node.each_with_object({}) do |entry, memo|
-              unless entry.is_a?(String) || entry.is_a?(Symbol)
-                raise ArgumentError, "Invalid translation selector at #{path.join('.')}: array entries must be String/Symbol keys"
-              end
-
-              segments = entry.to_s.split('.').reject(&:empty?)
-              if segments.empty?
-                raise ArgumentError, "Invalid translation selector at #{path.join('.')}: empty key path"
-              end
-
-              translated = translate_at.call(path + segments)
-              set_nested.call(memo, segments, translated)
-            end
-          else
-            raise ArgumentError, "Invalid translations config at #{path.join('.')}: only Hash and Array are allowed (old value-based syntax is not supported)"
-          end
-        end
-
-        walk.call(source, [])
-      end
-    end
-  end
-end