@eclaw/openclaw-channel 1.1.0 → 1.1.2

package/dist/webhook-handler.js

@@ -1,11 +1,26 @@
 import { getPluginRuntime } from './runtime.js';
+import { getClient, setActiveEvent, clearActiveEvent } from './outbound.js';
 /**
  * Create an HTTP request handler for inbound messages from E-Claw.
  *
- * When a user sends a message on E-Claw, the backend POSTs structured JSON
- * to this webhook. We normalize it and dispatch to the OpenClaw agent.
+ * Handles three event types:
+ *   - 'message'        → Normal human message; reply via sendMessage()
+ *   - 'entity_message' → Bot-to-bot speak-to; reply via sendMessage() + speakTo(fromEntityId)
+ *   - 'broadcast'      → Broadcast from another entity; reply via sendMessage() + speakTo(fromEntityId)
+ *
+ * The `deliver` callback routes AI response to the correct E-Claw endpoint
+ * based on the inbound event type.
+ *
+ * Channel Bot Context Parity v1.0.17:
+ *   - Bot-to-bot / broadcast now calls sendMessage() to update own wallpaper AND speakTo() to reply
+ *   - Quota awareness via eclaw_context.b2bRemaining / b2bMax
+ *   - Mission context via eclaw_context.missionHints
+ *   - Silent suppression via silentToken (default "[SILENT]")
  */
-export function createWebhookHandler(expectedToken, accountId) {
+export function createWebhookHandler(expectedToken, accountId, 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+cfg // full openclaw config (ctx.cfg from startAccount)
+) {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return async (req, res) => {
         // Verify callback token
@@ -22,36 +37,103 @@ export function createWebhookHandler(expectedToken, accountId) {
         // Dispatch to OpenClaw agent
         try {
             const rt = getPluginRuntime();
+            const client = getClient(accountId);
             const conversationId = msg.conversationId || `${msg.deviceId}:${msg.entityId}`;
-            // Map E-Claw media types to OpenClaw types
-            let media;
-            if (msg.mediaType && msg.mediaUrl) {
-                const type = msg.mediaType === 'photo' ? 'image'
-                    : msg.mediaType === 'voice' ? 'audio'
-                        : msg.mediaType === 'video' ? 'video'
-                            : 'file';
-                media = { type, url: msg.mediaUrl };
+            // Capture event context for deliver routing
+            const event = msg.event || 'message';
+            const fromEntityId = msg.fromEntityId;
+            const fromCharacter = msg.fromCharacter;
+            // Read server-injected context block (Channel Bot parity)
+            const eclawCtx = msg.eclaw_context;
+            const silentToken = eclawCtx?.silentToken ?? '[SILENT]';
+            // Map E-Claw media type to OpenClaw media type
+            const ocMediaType = msg.mediaType === 'photo' ? 'image'
+                : msg.mediaType === 'voice' ? 'audio'
+                    : msg.mediaType === 'video' ? 'video'
+                        : msg.mediaType ? 'file'
+                            : undefined;
+            // Build body — enrich with event context for bot-to-bot and broadcast
+            let body = msg.text || '';
+            if ((event === 'entity_message' || event === 'broadcast') && fromEntityId !== undefined) {
+                const senderLabel = fromCharacter
+                    ? `Entity ${fromEntityId} (${fromCharacter})`
+                    : `Entity ${fromEntityId}`;
+                const eventPrefix = event === 'broadcast'
+                    ? `[Broadcast from ${senderLabel}]`
+                    : `[Bot-to-Bot message from ${senderLabel}]`;
+                const quotaLine = eclawCtx?.b2bRemaining !== undefined
+                    ? `[Quota: ${eclawCtx.b2bRemaining}/${eclawCtx.b2bMax ?? 8} remaining — output "${silentToken}" if no new info worth replying to]`
+                    : '';
+                const missionBlock = eclawCtx?.missionHints ?? '';
+                body = [eventPrefix, quotaLine, missionBlock, msg.text || '']
+                    .filter(Boolean)
+                    .join('\n');
             }
+            // Build context in OpenClaw's native PascalCase format
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const inboundCtx = {
-                channelId: 'eclaw',
-                accountId,
-                conversationId,
-                senderId: msg.from,
-                text: msg.text || '',
-                ...(media ? { media } : {}),
-                metadata: {
-                    deviceId: msg.deviceId,
-                    entityId: msg.entityId,
-                    event: msg.event,
-                    fromEntityId: msg.fromEntityId,
-                    fromCharacter: msg.fromCharacter,
-                    isBroadcast: msg.isBroadcast,
-                    timestamp: msg.timestamp,
-                },
+                Surface: 'eclaw',
+                Provider: 'eclaw',
+                OriginatingChannel: 'eclaw',
+                AccountId: accountId,
+                From: msg.from,
+                To: conversationId,
+                OriginatingTo: msg.from,
+                SessionKey: conversationId,
+                Body: body,
+                RawBody: body,
+                CommandBody: body,
+                ChatType: 'direct',
+                ...(ocMediaType && msg.mediaUrl ? {
+                    MediaType: ocMediaType,
+                    MediaUrl: msg.mediaUrl,
+                } : {}),
             };
-            // OpenClaw inbound dispatch pipeline
-            const ctx = await rt.channel.reply.finalizeInboundContext(inboundCtx);
-            await rt.channel.reply.dispatchReplyWithBufferedBlockDispatcher(ctx);
+            const ctxPayload = rt.channel.reply.finalizeInboundContext(inboundCtx);
+            // Track event type so outbound.sendText() can suppress duplicate delivery
+            setActiveEvent(accountId, event);
+            try {
+                await rt.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
+                    ctx: ctxPayload,
+                    cfg,
+                    dispatcherOptions: {
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        deliver: async (payload) => {
+                            if (!client)
+                                return;
+                            const text = typeof payload.text === 'string' ? payload.text.trim() : '';
+                            // [SILENT] token or empty → skip all API calls
+                            if (!text || text === silentToken)
+                                return;
+                            if ((event === 'entity_message' || event === 'broadcast') && fromEntityId !== undefined) {
+                                // Bot-to-bot / broadcast: update own wallpaper AND reply to sender
+                                await client.sendMessage(text, 'IDLE');
+                                await client.speakTo(fromEntityId, text, false);
+                            }
+                            else {
+                                // Normal human message: reply via channel message
+                                if (text) {
+                                    await client.sendMessage(text, 'IDLE');
+                                }
+                                else if (payload.mediaUrl) {
+                                    const rawType = typeof payload.mediaType === 'string' ? payload.mediaType : '';
+                                    const mediaType = rawType === 'image' ? 'photo'
+                                        : rawType === 'audio' ? 'voice'
+                                            : rawType === 'video' ? 'video'
+                                                : 'file';
+                                    await client.sendMessage('', 'IDLE', mediaType, payload.mediaUrl);
+                                }
+                            }
+                        },
+                        onError: (err) => {
+                            console.error('[E-Claw] Reply delivery error:', err);
+                        },
+                    },
+                });
+            }
+            finally {
+                clearActiveEvent(accountId);
+            }
         }
         catch (err) {
             console.error('[E-Claw] Webhook dispatch error:', err);

package/dist/webhook-registry.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Per-session webhook token registry.
+ *
+ * Each account generates a random callbackToken when it starts.
+ * The token is sent to E-Claw as part of the callback URL registration,
+ * and E-Claw echoes it back as `Authorization: Bearer <token>` on every push.
+ *
+ * The main route handler (registered on the gateway HTTP server) looks up
+ * the correct per-account handler by matching the Bearer token.
+ */
+type WebhookHandler = (req: any, res: any) => Promise<void>;
+export declare function registerWebhookToken(callbackToken: string, accountId: string, handler: WebhookHandler): void;
+export declare function unregisterWebhookToken(callbackToken: string): void;
+/**
+ * Dispatch an incoming webhook request to the correct account handler.
+ * Verifies the Bearer token and routes to the matching handler.
+ */
+export declare function dispatchWebhook(req: any, res: any): Promise<void>;
+export {};

package/dist/webhook-registry.js

@@ -0,0 +1,39 @@
+/**
+ * Per-session webhook token registry.
+ *
+ * Each account generates a random callbackToken when it starts.
+ * The token is sent to E-Claw as part of the callback URL registration,
+ * and E-Claw echoes it back as `Authorization: Bearer <token>` on every push.
+ *
+ * The main route handler (registered on the gateway HTTP server) looks up
+ * the correct per-account handler by matching the Bearer token.
+ */
+const registry = new Map();
+export function registerWebhookToken(callbackToken, accountId, handler) {
+    registry.set(callbackToken, { accountId, handler });
+}
+export function unregisterWebhookToken(callbackToken) {
+    registry.delete(callbackToken);
+}
+/**
+ * Dispatch an incoming webhook request to the correct account handler.
+ * Verifies the Bearer token and routes to the matching handler.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export async function dispatchWebhook(req, res) {
+    const authHeader = req.headers?.authorization;
+    if (!authHeader?.startsWith('Bearer ')) {
+        res.writeHead(401, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: 'Unauthorized' }));
+        return;
+    }
+    const token = authHeader.slice(7);
+    const entry = registry.get(token);
+    if (!entry) {
+        // Unknown token — likely a stale push after a server restart
+        res.writeHead(404, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: 'Unknown token' }));
+        return;
+    }
+    await entry.handler(req, res);
+}

package/openclaw.plugin.json

@@ -1,27 +1,27 @@
-{
-  "id": "eclaw",
-  "name": "E-Claw",
-  "version": "1.0.0",
-  "description": "E-Claw AI Agent collaboration channel for OpenClaw",
-  "channels": ["eclaw"],
-  "configSchema": {
-    "type": "object",
-    "properties": {
-      "accounts": {
-        "type": "object",
-        "additionalProperties": {
-          "type": "object",
-          "properties": {
-            "enabled": { "type": "boolean", "default": true },
-            "apiKey": { "type": "string", "description": "Channel API Key (eck_...)" },
-            "apiSecret": { "type": "string", "description": "Channel API Secret (ecs_...)" },
-            "apiBase": { "type": "string", "default": "https://eclawbot.com" },
-            "entityId": { "type": "number", "default": 0, "minimum": 0, "maximum": 7 },
-            "botName": { "type": "string", "maxLength": 20 }
-          },
-          "required": ["apiKey", "apiSecret"]
-        }
-      }
-    }
-  }
-}
+{
+  "id": "openclaw-channel",
+  "name": "E-Claw",
+  "version": "1.0.0",
+  "description": "E-Claw AI chat platform channel for OpenClaw",
+  "channels": ["eclaw"],
+  "configSchema": {
+    "type": "object",
+    "properties": {
+      "accounts": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "object",
+          "properties": {
+            "enabled": { "type": "boolean", "default": true },
+            "apiKey": { "type": "string", "description": "Channel API Key (eck_...)" },
+            "apiSecret": { "type": "string", "description": "Channel API Secret (ecs_...)" },
+            "apiBase": { "type": "string", "default": "https://eclawbot.com" },
+            "entityId": { "type": "number", "minimum": 0, "maximum": 7, "description": "Optional: entity slot to use (0-7). If omitted, auto-assigned to first free slot." },
+            "botName": { "type": "string", "maxLength": 20 }
+          },
+          "required": ["apiKey", "apiSecret"]
+        }
+      }
+    }
+  }
+}

package/package.json

@@ -1,60 +1,60 @@
-{
-  "name": "@eclaw/openclaw-channel",
-  "version": "1.1.0",
-  "description": "E-Claw channel plugin for OpenClaw — AI Agent collaboration and A2A communication platform",
-  "type": "module",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    ".": {
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
-    }
-  },
-  "files": [
-    "dist/",
-    "openclaw.plugin.json",
-    "README.md"
-  ],
-  "scripts": {
-    "build": "tsc",
-    "dev": "tsc --watch",
-    "test": "vitest run",
-    "lint": "tsc --noEmit",
-    "prepublishOnly": "npm run build"
-  },
-  "openclaw": {
-    "extensions": [
-      "./dist/index.js"
-    ],
-    "channel": {
-      "id": "eclaw",
-      "label": "E-Claw",
-      "selectionLabel": "E-Claw (AI Agent Collaboration)",
-      "docsPath": "https://github.com/HankHuang0516/openclaw-channel-eclaw#readme",
-      "description": "Connect OpenClaw to E-Claw — the AI Agent collaboration and A2A communication platform for Android."
-    },
-    "install": {
-      "npmSpec": "@eclaw/openclaw-channel"
-    }
-  },
-  "keywords": [
-    "openclaw",
-    "openclaw-channel",
-    "channel",
-    "eclaw",
-    "ai-agent",
-    "live-wallpaper"
-  ],
-  "author": "HankHuang",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/HankHuang0516/openclaw-channel-eclaw.git"
-  },
-  "devDependencies": {
-    "typescript": "^5.4",
-    "vitest": "^2.0",
-    "@types/node": "^20"
-  }
-}
+{
+  "name": "@eclaw/openclaw-channel",
+  "version": "1.1.2",
+  "description": "E-Claw channel plugin for OpenClaw — AI chat platform for live wallpaper entities",
+  "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    }
+  },
+  "files": [
+    "dist/",
+    "openclaw.plugin.json",
+    "README.md"
+  ],
+  "scripts": {
+    "build": "tsc",
+    "dev": "tsc --watch",
+    "test": "vitest run",
+    "lint": "tsc --noEmit",
+    "prepublishOnly": "npm run build"
+  },
+  "openclaw": {
+    "extensions": [
+      "./dist/index.js"
+    ],
+    "channel": {
+      "id": "eclaw",
+      "label": "E-Claw",
+      "selectionLabel": "E-Claw (AI Live Wallpaper Chat)",
+      "docsPath": "https://github.com/HankHuang0516/openclaw-channel-eclaw#readme",
+      "description": "Connect OpenClaw to E-Claw — an AI chat platform for live wallpaper entities on Android."
+    },
+    "install": {
+      "npmSpec": "@eclaw/openclaw-channel"
+    }
+  },
+  "keywords": [
+    "openclaw",
+    "openclaw-channel",
+    "channel",
+    "eclaw",
+    "ai-agent",
+    "live-wallpaper"
+  ],
+  "author": "HankHuang",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/HankHuang0516/openclaw-channel-eclaw"
+  },
+  "devDependencies": {
+    "typescript": "^5.4",
+    "vitest": "^2.0",
+    "@types/node": "^20"
+  }
+}