@gloablehive/ipad-wechat-plugin 2.1.0 → 2.2.0

package/dist/index.js

@@ -24,12 +24,15 @@ import { ipadWeChatPlugin, handleInboundMessage, getCacheManagerReady, getCacheM
 import { getIPadClient } from "./src/client-pool.js";
 /** Read OpenClaw main config from disk so standalone server has full cfg */
 let _cfgCache = null;
+let _cfgCacheTs = 0;
+const CFG_CACHE_TTL_MS = 30_000; // re-read config every 30s to pick up binding changes
 function loadOpenClawConfig() {
-    if (_cfgCache)
+    if (_cfgCache && (Date.now() - _cfgCacheTs) < CFG_CACHE_TTL_MS)
         return _cfgCache;
     try {
         const p = join(homedir(), ".openclaw", "openclaw.json");
         _cfgCache = JSON.parse(readFileSync(p, "utf-8"));
+        _cfgCacheTs = Date.now();
         return _cfgCache;
     }
     catch (err) {
@@ -37,6 +40,24 @@ function loadOpenClawConfig() {
         return null;
     }
 }
+/**
+ * Resolve agentId from config bindings for a given channel/accountId.
+ * Falls back to "main" if no binding matches.
+ */
+function resolveAgentFromBindings(cfg, channel, accountId) {
+    const bindings = cfg?.bindings ?? [];
+    // Try specific match first (channel + accountId)
+    if (accountId) {
+        const specific = bindings.find((b) => b.match?.channel === channel && b.match?.accountId === accountId);
+        if (specific?.agentId)
+            return specific.agentId;
+    }
+    // Then try channel-only match
+    const channelOnly = bindings.find((b) => b.match?.channel === channel && !b.match?.accountId);
+    if (channelOnly?.agentId)
+        return channelOnly.agentId;
+    return "main";
+}
 // ── Gateway WebSocket dispatch ──
 const GATEWAY_PORT = parseInt(process.env.OPENCLAW_GATEWAY_PORT || "18789", 10);
 let _gwReqId = 0;
@@ -446,10 +467,12 @@ export default defineChannelPluginEntry({
                         const isChatroom = !!msg.roomId;
                         const peerId = isChatroom ? msg.roomId : (msg.fromUser || msg.toUser || "");
                         const peerKind = isChatroom ? "group" : "direct";
-                        let sessionKey = `agent:main:ipad-wechat:${peerKind}:${peerId}`;
+                        const resolvedAgent = resolveAgentFromBindings(cfg, "ipad-wechat");
+                        console.log(`[iPad WeChat] Resolved agent: ${resolvedAgent} (from bindings)`);
+                        let sessionKey = `agent:${resolvedAgent}:ipad-wechat:${peerKind}:${peerId}`;
                         try {
                             const route = buildChannelOutboundSessionRoute({
-                                cfg, agentId: "main", channel: "ipad-wechat",
+                                cfg, agentId: resolvedAgent, channel: "ipad-wechat",
                                 peer: { kind: peerKind, id: peerId },
                                 chatType: peerKind,
                                 from: msg.toUser || "", to: msg.fromUser || "",

package/index.ts

@@ -27,11 +27,14 @@ import type { WebhookPayload } from "./src/client.js";
 
 /** Read OpenClaw main config from disk so standalone server has full cfg */
 let _cfgCache: any = null;
+let _cfgCacheTs = 0;
+const CFG_CACHE_TTL_MS = 30_000; // re-read config every 30s to pick up binding changes
 function loadOpenClawConfig(): any {
-  if (_cfgCache) return _cfgCache;
+  if (_cfgCache && (Date.now() - _cfgCacheTs) < CFG_CACHE_TTL_MS) return _cfgCache;
   try {
     const p = join(homedir(), ".openclaw", "openclaw.json");
     _cfgCache = JSON.parse(readFileSync(p, "utf-8"));
+    _cfgCacheTs = Date.now();
     return _cfgCache;
   } catch (err) {
     console.error("[iPad WeChat] Failed to load openclaw.json:", err);
@@ -39,6 +42,27 @@ function loadOpenClawConfig(): any {
   }
 }
 
+/**
+ * Resolve agentId from config bindings for a given channel/accountId.
+ * Falls back to "main" if no binding matches.
+ */
+function resolveAgentFromBindings(cfg: any, channel: string, accountId?: string): string {
+  const bindings: any[] = cfg?.bindings ?? [];
+  // Try specific match first (channel + accountId)
+  if (accountId) {
+    const specific = bindings.find(
+      (b: any) => b.match?.channel === channel && b.match?.accountId === accountId
+    );
+    if (specific?.agentId) return specific.agentId;
+  }
+  // Then try channel-only match
+  const channelOnly = bindings.find(
+    (b: any) => b.match?.channel === channel && !b.match?.accountId
+  );
+  if (channelOnly?.agentId) return channelOnly.agentId;
+  return "main";
+}
+
 // ── Gateway WebSocket dispatch ──
 const GATEWAY_PORT = parseInt(process.env.OPENCLAW_GATEWAY_PORT || "18789", 10);
 let _gwReqId = 0;
@@ -463,10 +487,13 @@ export default defineChannelPluginEntry({
             const peerId = isChatroom ? (msg as any).roomId : (msg.fromUser || msg.toUser || "");
             const peerKind = isChatroom ? "group" : "direct";
 
-            let sessionKey = `agent:main:ipad-wechat:${peerKind}:${peerId}`;
+            const resolvedAgent = resolveAgentFromBindings(cfg, "ipad-wechat");
+            console.log(`[iPad WeChat] Resolved agent: ${resolvedAgent} (from bindings)`);
+
+            let sessionKey = `agent:${resolvedAgent}:ipad-wechat:${peerKind}:${peerId}`;
             try {
               const route = buildChannelOutboundSessionRoute({
-                cfg, agentId: "main", channel: "ipad-wechat",
+                cfg, agentId: resolvedAgent, channel: "ipad-wechat",
                 peer: { kind: peerKind as any, id: peerId },
                 chatType: peerKind as any,
                 from: msg.toUser || "", to: msg.fromUser || "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gloablehive/ipad-wechat-plugin",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "type": "module",
   "description": "OpenClaw channel plugin for iPad WeChat protocol - enables sending/receiving WeChat messages through JuHeBot API",
   "main": "index.ts",