@eclaw/openclaw-channel 1.0.7 → 1.0.9

package/dist/config.js

@@ -30,5 +30,6 @@ export function resolveAccount(cfg, accountId) {
         apiBase: (account?.apiBase ?? 'https://eclawbot.com').replace(/\/$/, ''),
         entityId: account?.entityId ?? 0,
         botName: account?.botName,
+        webhookUrl: account?.webhookUrl,
     };
 }

package/dist/gateway.d.ts

@@ -1,7 +1,7 @@
 /**
  * Gateway lifecycle: start an E-Claw account.
  *
- * 1. Initialize HTTP client with channel API credentials
+ * 1. Resolve credentials from ctx.account or disk
  * 2. Start a local HTTP server to receive webhook callbacks
  * 3. Register callback URL with E-Claw backend
  * 4. Auto-bind entity if not already bound

package/dist/gateway.js

@@ -1,13 +1,45 @@
 import { createServer } from 'node:http';
 import { randomBytes } from 'node:crypto';
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { homedir } from 'node:os';
 import { resolveAccount } from './config.js';
 import { EClawClient } from './client.js';
 import { setClient } from './outbound.js';
 import { createWebhookHandler } from './webhook-handler.js';
+/**
+ * Resolve account from ctx.
+ *
+ * OpenClaw may pass a pre-resolved account object in ctx.account,
+ * or an empty config. Fall back to reading openclaw.json from disk.
+ */
+function resolveAccountFromCtx(ctx) {
+    // Preferred: OpenClaw passes the resolved account in ctx.account
+    if (ctx.account?.apiKey) {
+        return {
+            enabled: ctx.account.enabled ?? true,
+            apiKey: ctx.account.apiKey,
+            apiSecret: ctx.account.apiSecret,
+            apiBase: (ctx.account.apiBase ?? 'https://eclawbot.com').replace(/\/$/, ''),
+            entityId: ctx.account.entityId ?? 0,
+            botName: ctx.account.botName,
+            webhookUrl: ctx.account.webhookUrl,
+        };
+    }
+    // Fallback: read config from disk (OpenClaw passes empty config object)
+    const configPath = process.env.OPENCLAW_CONFIG_PATH
+        || join(homedir(), '.openclaw', 'openclaw.json');
+    let fullConfig = {};
+    try {
+        fullConfig = JSON.parse(readFileSync(configPath, 'utf8'));
+    }
+    catch { /* ignore */ }
+    return resolveAccount(fullConfig, ctx.accountId ?? ctx.account?.accountId);
+}
 /**
  * Gateway lifecycle: start an E-Claw account.
  *
- * 1. Initialize HTTP client with channel API credentials
+ * 1. Resolve credentials from ctx.account or disk
  * 2. Start a local HTTP server to receive webhook callbacks
  * 3. Register callback URL with E-Claw backend
  * 4. Auto-bind entity if not already bound
@@ -15,12 +47,8 @@ import { createWebhookHandler } from './webhook-handler.js';
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export async function startAccount(ctx) {
-    const { accountId, config } = ctx;
-    console.log(`[E-Claw] startAccount called, accountId=${accountId}, config keys=${Object.keys(config || {}).join(',')}`);
-    console.log(`[E-Claw] config.channels.eclaw=`, JSON.stringify(config?.channels?.eclaw ?? null));
-    console.log(`[E-Claw] config.accounts=`, JSON.stringify(config?.accounts ?? null));
-    const account = resolveAccount(config, accountId);
-    console.log(`[E-Claw] resolved account: enabled=${account.enabled}, apiKey=${account.apiKey ? 'SET' : 'MISSING'}`);
+    const accountId = ctx.accountId ?? ctx.account?.accountId ?? 'default';
+    const account = resolveAccountFromCtx(ctx);
     if (!account.enabled || !account.apiKey) {
         console.log(`[E-Claw] Account ${accountId} disabled or missing credentials, skipping`);
         return;
@@ -30,12 +58,15 @@ export async function startAccount(ctx) {
     setClient(accountId, client);
     // Generate per-session callback token
     const callbackToken = randomBytes(32).toString('hex');
-    // Determine webhook configuration
+    // Webhook URL: account config > env var > warn
     const webhookPort = parseInt(process.env.ECLAW_WEBHOOK_PORT || '0') || 0;
-    const publicUrl = process.env.ECLAW_WEBHOOK_URL;
+    const publicUrl = account.webhookUrl?.replace(/\/$/, '')
+        || process.env.ECLAW_WEBHOOK_URL?.replace(/\/$/, '');
     if (!publicUrl) {
-        console.warn('[E-Claw] ECLAW_WEBHOOK_URL not set. Set this to your public-facing URL ' +
-            'so E-Claw can send messages to this plugin. Example: https://my-openclaw.example.com');
+        console.warn('[E-Claw] Webhook URL not configured. ' +
+            'Run "openclaw configure" and enter your OpenClaw public URL, ' +
+            'or set ECLAW_WEBHOOK_URL env var. ' +
+            'Example: https://your-openclaw-domain.com');
     }
     // Create webhook handler
     const handler = createWebhookHandler(callbackToken, accountId);
@@ -84,11 +115,9 @@ export async function startAccount(ctx) {
                 }
                 else {
                     console.log(`[E-Claw] Entity ${account.entityId} already bound`);
-                    // For already-bound entities, we need to get the botSecret
-                    // The bind endpoint returns existing credentials for channel-bound entities
                     const bindData = await client.bindEntity(account.entityId, account.botName);
                     console.log(`[E-Claw] Retrieved credentials for entity ${account.entityId}`);
-                    void bindData; // credentials stored in client
+                    void bindData;
                 }
                 console.log(`[E-Claw] Account ${accountId} ready!`);
             }

package/dist/onboarding.js

@@ -47,6 +47,11 @@ export const eclawOnboardingAdapter = {
             placeholder: 'My Bot',
             initialValue: resolved.botName ?? '',
         });
+        const webhookUrl = await prompter.text({
+            message: 'Webhook URL (your OpenClaw public URL, e.g. https://openclaw.example.com)',
+            placeholder: 'https://your-openclaw-domain.com',
+            initialValue: resolved.webhookUrl ?? '',
+        });
         const nextCfg = {
             ...cfg,
             channels: {
@@ -60,6 +65,7 @@ export const eclawOnboardingAdapter = {
                             apiBase: resolved.apiBase || 'https://eclawbot.com',
                             entityId: Number(entityIdStr),
                             botName: String(botName).trim() || undefined,
+                            webhookUrl: String(webhookUrl).trim() || undefined,
                             enabled: true,
                         },
                     },

package/dist/types.d.ts

@@ -6,6 +6,7 @@ export interface EClawAccountConfig {
     apiBase: string;
     entityId: number;
     botName?: string;
+    webhookUrl?: string;
 }
 /** Inbound message from E-Claw callback webhook */
 export interface EClawInboundMessage {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclaw/openclaw-channel",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "E-Claw channel plugin for OpenClaw — AI chat platform for live wallpaper entities",
   "type": "module",
   "main": "./dist/index.js",