aicq-chat-plugin 3.4.1 → 3.5.3

package/index.js

@@ -65,6 +65,7 @@ async function ensureInitialized() {
   runtime.dataDir = DATA_DIR;
   runtime.serverUrl = SERVER_URL;
   runtime.handleGateway = handleGatewayMethod;
+  runtime.ensureInitialized = ensureInitialized;
 
   // Periodic cleanup
   setInterval(() => _db.cleanup(), 3600000);

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "kind": "channel",
   "id": "aicq-chat",
   "name": "AICQ Encrypted Chat",
-  "version": "3.4.1",
+  "version": "3.5.3",
   "description": "End-to-end encrypted chat channel via AICQ protocol — in-process Channel plugin using OpenClaw Channel SDK",
   "entry": "index.js",
   "activation": {
@@ -49,6 +49,14 @@
               "open",
               "disabled"
             ]
+          },
+          "allowFrom": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "default": [],
+            "description": "允许发消息的好友 ID 列表（dmPolicy 为 allowlist 时生效）"
           }
         },
         "required": [
@@ -71,6 +79,10 @@
         "dmPolicy": {
           "label": "DM Policy",
           "help": "Who can send direct messages: allowlist (friends only), open, or disabled"
+        },
+        "allowFrom": {
+          "label": "Allow From",
+          "help": "Friend IDs allowed to send DMs (used when dmPolicy is allowlist)"
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aicq-chat-plugin",
-  "version": "3.4.1",
+  "version": "3.5.3",
   "description": "AICQ End-to-end Encrypted Chat Channel Plugin for OpenClaw — In-process Channel SDK architecture with friend management, group chat, file transfer, and AI agent communication",
   "type": "module",
   "main": "index.js",

package/src/channel.js

@@ -32,6 +32,37 @@ export const runtime = {
   _initialized: false,
 };
 
+// ── Template variable resolver ───────────────────────────────────────
+// OpenClaw stores accountId as-is (e.g. "{{agent.id}}") in config.
+// Plugins must resolve template variables at runtime.
+//
+// The default agent ID in OpenClaw is "main" (DEFAULT_AGENT_ID).
+// When cfg.agents.list is empty/undefined (no explicit agent config),
+// the implicit default agent "main" is used.
+
+const OPENCLAW_DEFAULT_AGENT_ID = "main";
+
+function resolveTemplateVar(cfg, value) {
+  if (typeof value !== "string") return value;
+  const match = value.match(/^\{\{(\w[\w.]*)\}\}$/);
+  if (!match) return value;
+
+  const tmplPath = match[1]; // e.g. "agent.id"
+  if (tmplPath === "agent.id") {
+    // Strategy: look for explicit agents in config first
+    const agents = cfg.agents?.list;
+    if (Array.isArray(agents) && agents.length > 0) {
+      // Use the default=true agent, or the first one
+      const defaultAgent = agents.find((a) => a.default) || agents[0];
+      if (defaultAgent?.id) return defaultAgent.id;
+    }
+    // Fallback: OpenClaw's implicit default agent ID
+    return OPENCLAW_DEFAULT_AGENT_ID;
+  }
+
+  return value; // unknown template — return as-is
+}
+
 // ── Resolved account type ────────────────────────────────────────────
 // This is the object returned by resolveAccount() and consumed by
 // security / pairing / outbound adapters.
@@ -43,21 +74,30 @@ export const runtime = {
  */
 function resolveAccount(cfg, accountId) {
   const section = (cfg.channels || {})["aicq-chat"] || {};
-  const resolvedAccountId = accountId || section.accountId || null;
+  const rawAccountId = accountId || section.accountId || null;
 
-  if (!resolvedAccountId) {
+  if (!rawAccountId) {
     throw new Error(
       "aicq-chat: accountId is required (set channels.aicq-chat.accountId)"
     );
   }
 
+  // Resolve template variables like {{agent.id}}
+  const resolvedAccountId = resolveTemplateVar(cfg, rawAccountId);
+
+  // Resolve allowFrom entries (may contain {{agent.id}} or friend IDs)
+  const rawAllowFrom = section.allowFrom || [];
+  const resolvedAllowFrom = Array.isArray(rawAllowFrom)
+    ? rawAllowFrom.map((entry) => resolveTemplateVar(cfg, entry))
+    : rawAllowFrom;
+
   return {
     accountId: resolvedAccountId,
     serverUrl: section.serverUrl || "https://aicq.online",
     autoAcceptFriends: section.autoAcceptFriends ?? true,
     enabled: section.enabled ?? true,
     dmPolicy: section.dmPolicy || "allowlist",
-    allowFrom: section.allowFrom ?? [],
+    allowFrom: resolvedAllowFrom,
   };
 }
 
@@ -184,18 +224,197 @@ const _plugin = createChatChannelPlugin({
   },
 });
 
+// ── Gateway adapter: startAccount / stopAccount ───────────────────────
+// OpenClaw calls startAccount when the channel is activated (on startup
+// or when re-enabled).  This is where we initialise the runtime, connect
+// to the AICQ signalling server, and wire up inbound message delivery
+// via the channelRuntime helpers.
+
+_plugin.gateway = {
+  /**
+   * Start the channel account — connect to the AICQ server and begin
+   * listening for inbound messages.
+   */
+  async startAccount(ctx) {
+    const { cfg, accountId, account, setStatus, log } = ctx;
+
+    const logger = log || console;
+    logger.info?.(`[AICQ Channel] startAccount called for ${accountId}`) || console.log(`[AICQ Channel] startAccount called for ${accountId}`);
+
+    // Ensure the runtime (DB, identity, transport) is initialised.
+    // The runtime is populated by registerFull() in index.js, but startAccount
+    // may be called before any gateway method is invoked, so we must ensure
+    // initialization here too.
+    if (!runtime._initialized && typeof runtime.ensureInitialized === "function") {
+      try {
+        await runtime.ensureInitialized();
+        logger.info?.("[AICQ Channel] Runtime initialized via startAccount") || console.log("[AICQ Channel] Runtime initialized via startAccount");
+      } catch (e) {
+        console.error("[AICQ Channel] Runtime initialization failed:", e.message);
+        setStatus({
+          accountId,
+          enabled: true,
+          configured: true,
+          running: false,
+          lastError: `Initialization failed: ${e.message}`,
+        });
+        return;
+      }
+    }
+
+    // Resolve the agent ID: prefer the resolved accountId from
+    // resolveAccount (which already handles {{agent.id}}), then
+    // fall back to the OpenClaw default agent ID.
+    const agents = cfg.agents?.list;
+    const agentId = account?.accountId || accountId || OPENCLAW_DEFAULT_AGENT_ID;
+
+    // Ensure we have an identity in the plugin DB
+    if (runtime.identity) {
+      const existing = runtime.identity.listAgents();
+      if (existing.length === 0) {
+        const agentName = (Array.isArray(agents) && agents.length > 0 && agents[0]?.name)
+          ? agents[0].name
+          : "AICQ Agent";
+        runtime.identity.createAgent(agentId, agentName);
+        console.log(`[AICQ Channel] Created agent identity: ${agentId}`);
+      }
+    }
+
+    // Connect to the AICQ server
+    if (runtime.serverClient) {
+      try {
+        await runtime.serverClient.ensureAuth(agentId);
+        console.log(`[AICQ Channel] Authenticated as ${agentId}`);
+
+        // Connect WebSocket for real-time messages
+        // ServerClient.start() does ensureAuth + connectWS
+        if (typeof runtime.serverClient.start === "function") {
+          await runtime.serverClient.start(agentId);
+          console.log("[AICQ Channel] WebSocket connected");
+        } else if (typeof runtime.serverClient.connectWS === "function") {
+          runtime.serverClient.connectWS();
+          console.log("[AICQ Channel] WebSocket connecting");
+        }
+
+        // Sync friends and groups from server
+        if (runtime.handleGateway) {
+          try {
+            await runtime.handleGateway("aicq.friends.list", {});
+            await runtime.handleGateway("aicq.groups.list", {});
+          } catch (e) {
+            console.warn("[AICQ Channel] Initial sync failed:", e.message);
+          }
+        }
+      } catch (e) {
+        console.error("[AICQ Channel] Failed to connect:", e.message);
+      }
+    }
+
+    // Wire up inbound message handling via channelRuntime if available
+    if (ctx.channelRuntime) {
+      const { reply, routing } = ctx.channelRuntime;
+      if (reply && routing) {
+        console.log("[AICQ Channel] channelRuntime available — AI dispatch enabled");
+
+        // Register inbound message handler on the serverClient
+        if (runtime.serverClient && typeof runtime.serverClient.onMessage === "function") {
+          runtime.serverClient.onMessage(async (msg) => {
+            try {
+              const resolvedAgentId = agentId;
+              const routeResult = await routing.resolveAgentRoute({
+                channelId: "aicq-chat",
+                accountId,
+                fromId: msg.from || msg.sender_id,
+                chatType: msg.isGroup ? "group" : "dm",
+              });
+
+              if (routeResult?.agentId) {
+                await reply.dispatchReplyWithBufferedBlockDispatcher({
+                  ctx: {
+                    channelId: "aicq-chat",
+                    accountId,
+                    fromId: msg.from || msg.sender_id,
+                    text: msg.content || msg.text || "",
+                    chatType: msg.isGroup ? "group" : "dm",
+                  },
+                  cfg,
+                  dispatcherOptions: {
+                    deliver: async (payload) => {
+                      // Send AI reply back through AICQ
+                      if (runtime.chat && payload.text) {
+                        await runtime.chat.sendMessage(
+                          resolvedAgentId,
+                          msg.from || msg.sender_id,
+                          payload.text,
+                          { isGroup: !!msg.isGroup }
+                        );
+                      }
+                    },
+                  },
+                });
+              }
+            } catch (e) {
+              console.error("[AICQ Channel] Inbound message handling error:", e.message);
+            }
+          });
+        }
+      }
+    } else {
+      console.log("[AICQ Channel] channelRuntime not available — running in standalone mode");
+    }
+
+    // Update health status
+    setStatus({
+      accountId,
+      enabled: true,
+      configured: true,
+      running: true,
+      lastStartAt: Date.now(),
+      lastError: null,
+    });
+
+    console.log(`[AICQ Channel] Account ${accountId} started successfully`);
+  },
+
+  /**
+   * Stop the channel account — disconnect and clean up.
+   */
+  async stopAccount(ctx) {
+    const { accountId } = ctx;
+    console.log(`[AICQ Channel] stopAccount called for ${accountId}`);
+
+    if (runtime.serverClient) {
+      try {
+        if (typeof runtime.serverClient.stop === "function") {
+          runtime.serverClient.stop();
+        } else if (typeof runtime.serverClient.disconnect === "function") {
+          runtime.serverClient.disconnect();
+        }
+        console.log("[AICQ Channel] WebSocket disconnected");
+      } catch (e) {
+        console.warn("[AICQ Channel] Disconnect error:", e.message);
+      }
+    }
+  },
+};
+
 // ── Add config helpers (required by OpenClaw channel loader) ──────────
 // createChatChannelPlugin does not auto-attach config helpers,
 // but the OpenClaw loader requires plugin.config.listAccountIds
 // and plugin.config.resolveAccount for channel registration.
+
+// resolveTemplateVar is defined at the top of this file.
+
 _plugin.config = {
   /**
    * List all account IDs configured for this channel.
+   * Resolves template variables like {{agent.id}}.
    */
   listAccountIds(cfg) {
     const section = (cfg.channels || {})["aicq-chat"] || {};
     if (section.accountId) {
-      return [section.accountId];
+      const resolved = resolveTemplateVar(cfg, section.accountId);
+      return [resolved];
     }
     return [];
   },
@@ -210,6 +429,18 @@ _plugin.config = {
    */
   inspectAccount,
 
+  /**
+   * Default account ID for this channel.
+   * Resolves {{agent.id}} to the actual agent ID.
+   */
+  defaultAccountId(cfg) {
+    const section = (cfg.channels || {})["aicq-chat"] || {};
+    if (section.accountId) {
+      return resolveTemplateVar(cfg, section.accountId);
+    }
+    return OPENCLAW_DEFAULT_AGENT_ID;
+  },
+
   /**
    * Check if the channel is configured.
    */
@@ -234,8 +465,9 @@ _plugin.config = {
    */
   describeAccount(cfg, accountId) {
     const section = (cfg.channels || {})["aicq-chat"] || {};
+    const rawId = accountId || section.accountId || null;
     return {
-      accountId: accountId || section.accountId || null,
+      accountId: rawId ? resolveTemplateVar(cfg, rawId) : null,
       label: "AICQ Encrypted Chat",
       enabled: section.enabled !== false,
     };