collavre_openclaw 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09c2c291bce3fdf441d7c93dacf44883ca47804db6abb38d78b3ea70a412deaf'
-  data.tar.gz: 8bd10b6c57adedb5e655b23688088a1be0d8c2e97dca6300ef7470b1a28c8c33
+  metadata.gz: bd95c0741d901e7dd551d64362a7cce7d0b0f7f9b4a87a3469990ccc1479e340
+  data.tar.gz: 7db937c777a492b23e19037e83bf3dd4245a46ff8333e9de6c6e9e55e2960f81
 SHA512:
-  metadata.gz: ba347bb7844c93e96b5601f728267df346ba28b78458d77e0ea8a8f83ceb77fc83127ddad0dd164704f8bad95701df1838ac636e8c59aaa356bab07c63e5d58d
-  data.tar.gz: 90b4555d3b69f2f0489dff54e6f326b4ee57404989e1ef7068a2b91d8761541ddf42be7154ed6e0a7b8e5f536d6408441b3412997731c3868c603fb3e25a7122
+  metadata.gz: 701cfb138ae6d0f25da60fcea13e56970647490ec32ab24cb6ec26e06c93ea250f9af1efed0fc9ddc7790b4f8d703e5ca7b2c8730902720e1a0e2d061216c6f9
+  data.tar.gz: 53315260ffb37347b9289080de544e65b19b207943d8784a341eeda0d042175e80753d3a43bf70f42b0ec087ba919827ed7fc50338dbf5d68d63a6daafd40039

data/app/services/collavre_openclaw/openclaw_adapter.rb

@@ -571,8 +571,16 @@ module CollavreOpenclaw
 
       host = options[:host]
       host ||= Rails.application.config.action_controller.default_url_options&.dig(:host)
-      host ||= ENV["APP_HOST"]
-      host ||= ENV["RAILS_HOST"]
+      # When the engine is mounted without core Collavre (gemspec has no `collavre`
+      # dependency), `IntegrationSettings` is undefined — fall back to the ENV
+      # path the previous code used so standalone deployments still resolve a host.
+      if defined?(Collavre::IntegrationSettings)
+        host ||= Collavre::IntegrationSettings.fetch(:app_host)
+        host ||= Collavre::IntegrationSettings.fetch(:rails_host)
+      else
+        host ||= ENV["APP_HOST"]
+        host ||= ENV["RAILS_HOST"]
+      end
 
       result = { host: host }
       result[:protocol] = options[:protocol] || "https"

data/config/initializers/integration_settings.rb

@@ -0,0 +1,13 @@
+# Register collavre_openclaw integration setting keys with the central registry.
+# Registered eagerly because `CollavreOpenclaw::Configuration#initialize` reads
+# them at boot via `Collavre::IntegrationSettings.fetch`.
+if defined?(Collavre::IntegrationSettings::Registry)
+  registry = Collavre::IntegrationSettings::Registry.instance
+  registry.register(:openclaw_open_timeout,        category: "openclaw", sensitive: false, requires_restart: true)
+  registry.register(:openclaw_max_retries,         category: "openclaw", sensitive: false, requires_restart: true)
+  registry.register(:openclaw_ws_idle_timeout,     category: "openclaw", sensitive: false, requires_restart: true)
+  registry.register(:openclaw_ws_reconnect_max,    category: "openclaw", sensitive: false, requires_restart: true)
+  registry.register(:openclaw_ws_reconnect_base,   category: "openclaw", sensitive: false, requires_restart: true)
+  registry.register(:openclaw_ws_connect_timeout,  category: "openclaw", sensitive: false, requires_restart: true)
+  registry.register(:openclaw_transport,           category: "openclaw", sensitive: false, requires_restart: true)
+end

data/lib/collavre_openclaw/configuration.rb

@@ -26,18 +26,18 @@ module CollavreOpenclaw
     attr_accessor :transport
 
     def initialize
-      @open_timeout = ENV.fetch("OPENCLAW_OPEN_TIMEOUT", 10).to_i
+      @open_timeout            = fetch_int(:openclaw_open_timeout, 10)
       @read_timeout = begin
         Collavre::SystemSetting.llm_request_timeout_seconds
       rescue StandardError
         1800
       end
-      @max_retries = ENV.fetch("OPENCLAW_MAX_RETRIES", 2).to_i
-      @ws_idle_timeout = ENV.fetch("OPENCLAW_WS_IDLE_TIMEOUT", 1800).to_i     # 30 minutes
-      @ws_reconnect_max = ENV.fetch("OPENCLAW_WS_RECONNECT_MAX", 10).to_i
-      @ws_reconnect_base_delay = ENV.fetch("OPENCLAW_WS_RECONNECT_BASE", 1).to_f
-      @ws_connect_timeout = ENV.fetch("OPENCLAW_WS_CONNECT_TIMEOUT", 10).to_i
-      @transport = ENV.fetch("OPENCLAW_TRANSPORT", "auto")
+      @max_retries             = fetch_int(:openclaw_max_retries, 2)
+      @ws_idle_timeout         = fetch_int(:openclaw_ws_idle_timeout, 1800)  # 30 minutes
+      @ws_reconnect_max        = fetch_int(:openclaw_ws_reconnect_max, 10)
+      @ws_reconnect_base_delay = fetch_float(:openclaw_ws_reconnect_base, 1)
+      @ws_connect_timeout      = fetch_int(:openclaw_ws_connect_timeout, 10)
+      @transport               = fetch_string(:openclaw_transport, "auto")
     end
 
     # Legacy accessor for backward compatibility
@@ -48,5 +48,30 @@ module CollavreOpenclaw
     def request_timeout=(value)
       @read_timeout = value
     end
+
+    private
+
+    def fetch_raw(key)
+      if defined?(Collavre::IntegrationSettings)
+        Collavre::IntegrationSettings.fetch(key)
+      else
+        ENV[key.to_s.upcase]
+      end
+    end
+
+    def fetch_string(key, default)
+      raw = fetch_raw(key)
+      raw.presence || default
+    end
+
+    def fetch_int(key, default)
+      raw = fetch_raw(key)
+      raw.present? ? raw.to_i : default
+    end
+
+    def fetch_float(key, default)
+      raw = fetch_raw(key)
+      raw.present? ? raw.to_f : default
+    end
   end
 end

data/lib/collavre_openclaw/engine.rb

@@ -33,6 +33,18 @@ module CollavreOpenclaw
       end
     end
 
+    # Register host keys consumed by `OpenclawAdapter#default_url_options` so
+    # the umbrella app's `integration_settings_app.rb` initializer is not
+    # required for ENV fallback to work. `register` is idempotent — the
+    # umbrella app may re-register without conflict.
+    initializer "collavre_openclaw.integration_settings_registry", before: :load_config_initializers do
+      if defined?(Collavre::IntegrationSettings::Registry)
+        registry = Collavre::IntegrationSettings::Registry.instance
+        registry.register(:app_host,   category: "mail", sensitive: false, requires_restart: false)
+        registry.register(:rails_host, category: "mail", sensitive: false, requires_restart: false)
+      end
+    end
+
     initializer "collavre_openclaw.migrations" do |app|
       unless app.root.to_s.match?(root.to_s)
         config.paths["db/migrate"].expanded.each do |expanded_path|

data/lib/collavre_openclaw/version.rb

@@ -1,3 +1,3 @@
 module CollavreOpenclaw
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collavre_openclaw
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Collavre
@@ -88,6 +88,7 @@ files:
 - app/services/collavre_openclaw/proactive_message_handler.rb
 - app/services/collavre_openclaw/websocket_client.rb
 - config/initializers/ai_client_extension.rb
+- config/initializers/integration_settings.rb
 - config/locales/en.yml
 - config/locales/ko.yml
 - config/routes.rb