collavre_openclaw 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cefe1bfe3e0bc5a5d810a0aea5543e468a6539ec26aa48515a1617340a1ea6b
-  data.tar.gz: 4c48629590b7b95ada9771d18c42bce1db9ea97a3532bc081e0ec3fc80115d16
+  metadata.gz: ffa08c6ff97565abd9d9f0c468b5abce5aaa03df463fd529d9fd5f3f08a7aa6d
+  data.tar.gz: 4bb98ed84ea98fb1067f97c9ae9eea9f9b49365357fecf000fb102a70dd09586
 SHA512:
-  metadata.gz: ab7224c85ec72ea2d7bed38257136495a0e6fc8b74a33c558373bd822bba5b1be92c594bbdbdb22a67836afc02a6e350bcd9923b31767a454d5af279424473de
-  data.tar.gz: 0d8adb020df29a332597afbe9964b19e77cb35d79744487c935fe759e6aa75593812f9a245d9c1b462ec0f7e19a1f90d6027f7ddde0997509952b543c915942d
+  metadata.gz: e1fe26478d449c92f136e39142c1fde6db0261c171df1e45bd3e7a2e815065d09c00199c0dbdb93b88e39763da9a13a0909e7bb7f66da5c153acd003f653c990
+  data.tar.gz: 74f7c89b22522e2a43f097d064d5e17785ff91fc042a9db39c3350b142c1a059fe5fade168dd77b62b09c458a5fcc359f68d85d28422fb46f90e69a48b91336d

data/app/services/collavre_openclaw/openclaw_adapter.rb

@@ -24,6 +24,12 @@ module CollavreOpenclaw
         return nil
       end
 
+      unless @user&.llm_api_key.present?
+        Rails.logger.error("[CollavreOpenclaw] No API key configured for user #{@user&.id} (may be a decryption failure)")
+        yield "Error: OpenClaw API key not configured or decryption failed. Please re-enter the API key in AI agent settings." if block_given?
+        return nil
+      end
+
       response_content = +""
 
       begin
@@ -297,12 +303,24 @@ module CollavreOpenclaw
 
           req.body = payload.to_json
 
-          req.options.on_data = proc do |chunk, _size, _env|
-            buffer << chunk
-            process_sse_buffer(buffer, &block)
+          req.options.on_data = proc do |chunk, _size, env|
+            # Only process streaming data for successful responses
+            if env&.status.nil? || (env.status >= 200 && env.status < 300)
+              buffer << chunk
+              process_sse_buffer(buffer, &block)
+            else
+              buffer << chunk
+            end
           end
         end
 
+        # Check HTTP status and raise meaningful errors
+        unless response.status >= 200 && response.status < 300
+          error_body = buffer.presence || response.body
+          error_message = parse_error_message(response.status, error_body)
+          raise error_message
+        end
+
         # Process any remaining data in buffer
         process_sse_buffer(buffer, final: true, &block)
 
@@ -331,6 +349,31 @@ module CollavreOpenclaw
       end
     end
 
+    def parse_error_message(status, body)
+      detail = ""
+      begin
+        json = JSON.parse(body, symbolize_names: true) if body.present?
+        detail = json[:error] || json[:message] || json.to_s if json
+      rescue JSON::ParserError
+        detail = body.to_s.truncate(200)
+      end
+
+      case status
+      when 401
+        "Authentication failed (HTTP 401). Check your API key. #{detail}"
+      when 403
+        "Access forbidden (HTTP 403). #{detail}"
+      when 404
+        "Gateway endpoint not found (HTTP 404). Check your Gateway URL."
+      when 429
+        "Rate limited (HTTP 429). #{detail}"
+      when 500..599
+        "Gateway server error (HTTP #{status}). #{detail}"
+      else
+        "HTTP #{status}: #{detail}"
+      end
+    end
+
     def handle_json_response(body, &block)
       json = JSON.parse(body, symbolize_names: true)
       content = json.dig(:choices, 0, :message, :content)

data/db/migrate/20260202120143_remove_description_from_openclaw_accounts.rb

@@ -0,0 +1,5 @@
+class RemoveDescriptionFromOpenclawAccounts < ActiveRecord::Migration[8.1]
+  def change
+    remove_column :openclaw_accounts, :description, :text
+  end
+end

data/db/migrate/20260202120254_remove_agent_provisioned_at_from_openclaw_accounts.rb

@@ -0,0 +1,5 @@
+class RemoveAgentProvisionedAtFromOpenclawAccounts < ActiveRecord::Migration[8.1]
+  def change
+    remove_column :openclaw_accounts, :agent_provisioned_at, :datetime
+  end
+end

data/db/migrate/20260202130000_remove_agent_id_from_openclaw_accounts.rb

@@ -0,0 +1,5 @@
+class RemoveAgentIdFromOpenclawAccounts < ActiveRecord::Migration[7.2]
+  def change
+    remove_column :openclaw_accounts, :agent_id, :string
+  end
+end

data/db/migrate/20260202140000_rename_api_token_to_api_key_in_openclaw_accounts.rb

@@ -0,0 +1,5 @@
+class RenameApiTokenToApiKeyInOpenclawAccounts < ActiveRecord::Migration[7.2]
+  def change
+    rename_column :openclaw_accounts, :api_token, :api_key
+  end
+end

data/db/migrate/20260202150001_migrate_pending_callbacks_to_user.rb

@@ -0,0 +1,52 @@
+class MigratePendingCallbacksToUser < ActiveRecord::Migration[7.2]
+  def up
+    # Add user_id column
+    add_column :openclaw_pending_callbacks, :user_id, :integer
+
+    # Migrate existing data
+    execute <<-SQL
+      UPDATE openclaw_pending_callbacks
+      SET user_id = (
+        SELECT user_id FROM openclaw_accounts
+        WHERE openclaw_accounts.id = openclaw_pending_callbacks.openclaw_account_id
+      )
+    SQL
+
+    # Remove old foreign key and column
+    remove_foreign_key :openclaw_pending_callbacks, :openclaw_accounts
+    remove_index :openclaw_pending_callbacks, :openclaw_account_id
+    remove_column :openclaw_pending_callbacks, :openclaw_account_id
+
+    # Add new foreign key
+    add_foreign_key :openclaw_pending_callbacks, :users
+    add_index :openclaw_pending_callbacks, :user_id
+
+    # Make user_id not null (after data migration)
+    change_column_null :openclaw_pending_callbacks, :user_id, false
+  end
+
+  def down
+    # Add back openclaw_account_id
+    add_column :openclaw_pending_callbacks, :openclaw_account_id, :integer
+
+    # Migrate data back (if openclaw_accounts still exists)
+    execute <<-SQL
+      UPDATE openclaw_pending_callbacks
+      SET openclaw_account_id = (
+        SELECT id FROM openclaw_accounts
+        WHERE openclaw_accounts.user_id = openclaw_pending_callbacks.user_id
+        LIMIT 1
+      )
+    SQL
+
+    # Remove user foreign key
+    remove_foreign_key :openclaw_pending_callbacks, :users
+    remove_index :openclaw_pending_callbacks, :user_id
+    remove_column :openclaw_pending_callbacks, :user_id
+
+    # Add back original foreign key
+    add_foreign_key :openclaw_pending_callbacks, :openclaw_accounts
+    add_index :openclaw_pending_callbacks, :openclaw_account_id
+    change_column_null :openclaw_pending_callbacks, :openclaw_account_id, false
+  end
+end

data/db/migrate/20260202150002_drop_openclaw_accounts.rb

@@ -0,0 +1,18 @@
+class DropOpenclawAccounts < ActiveRecord::Migration[7.2]
+  def up
+    drop_table :openclaw_accounts
+  end
+
+  def down
+    create_table :openclaw_accounts do |t|
+      t.integer :user_id, null: false
+      t.string :gateway_url, null: false
+      t.string :api_key
+      t.string :channel_id
+
+      t.timestamps
+    end
+
+    add_index :openclaw_accounts, :user_id, unique: true
+  end
+end

data/lib/collavre_openclaw/version.rb

@@ -1,3 +1,3 @@
 module CollavreOpenclaw
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collavre_openclaw
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Collavre
@@ -63,6 +63,12 @@ files:
 - db/migrate/20260201000001_create_pending_callbacks.rb
 - db/migrate/20260202000001_remove_webhook_secret_from_openclaw_accounts.rb
 - db/migrate/20260202074949_add_agent_id_to_openclaw_accounts.rb
+- db/migrate/20260202120143_remove_description_from_openclaw_accounts.rb
+- db/migrate/20260202120254_remove_agent_provisioned_at_from_openclaw_accounts.rb
+- db/migrate/20260202130000_remove_agent_id_from_openclaw_accounts.rb
+- db/migrate/20260202140000_rename_api_token_to_api_key_in_openclaw_accounts.rb
+- db/migrate/20260202150001_migrate_pending_callbacks_to_user.rb
+- db/migrate/20260202150002_drop_openclaw_accounts.rb
 - lib/collavre_openclaw.rb
 - lib/collavre_openclaw/configuration.rb
 - lib/collavre_openclaw/engine.rb