@yanhaidao/wecom 2.3.2 → 2.3.4

package/src/monitor.active.test.ts

@@ -28,7 +28,7 @@ function createMockRequest(bodyObj: any): IncomingMessage {
     const socket = new Socket();
     const req = new IncomingMessage(socket);
     req.method = "POST";
-    req.url = "/wecom?timestamp=123&nonce=456&signature=789";
+    req.url = "/plugins/wecom/bot/default?timestamp=123&nonce=456&signature=789";
     req.push(JSON.stringify(bodyObj));
     req.push(null);
     return req;
@@ -140,7 +140,7 @@ describe("Monitor Active Features", () => {
             } as any,
             runtime: { log: () => { } },
             core: mockCore,
-            path: "/wecom"
+            path: "/plugins/wecom/bot/default"
         });
     });
 

package/src/monitor.integration.test.ts

@@ -21,7 +21,7 @@ function createMockRequest(bodyObj: any, query: URLSearchParams): IncomingMessag
     const socket = new Socket();
     const req = new IncomingMessage(socket);
     req.method = "POST";
-    req.url = `/wecom?${query.toString()}`;
+    req.url = `/plugins/wecom/bot/default?${query.toString()}`;
     req.push(JSON.stringify(bodyObj));
     req.push(null);
     return req;
@@ -108,7 +108,7 @@ describe("Monitor Integration: Inbound Image", () => {
             config: {} as any,
             runtime: { log: console.log, error: console.error },
             core: mockCore as any,
-            path: "/wecom"
+            path: "/plugins/wecom/bot/default"
         });
     });
 
@@ -198,6 +198,8 @@ describe("Monitor Integration: Inbound Image", () => {
         // Expect Context Injection
         expect(ctx.MediaPath).toBe("/tmp/saved-image.jpg");
         expect(ctx.MediaType).toBe("image/jpeg");
+        expect(ctx.Surface).toBe("wecom");
+        expect(ctx.OriginatingChannel).toBe("wecom");
 
         expect(undiciFetch).toHaveBeenCalledWith(
             imageUrl,

package/src/monitor.ts

@@ -220,16 +220,24 @@ type RouteFailureReason =
   | "wecom_identity_mismatch"
   | "wecom_matrix_path_required";
 
-function isLegacyWecomPath(path: string): boolean {
-  return path === WEBHOOK_PATHS.BOT || path === WEBHOOK_PATHS.BOT_ALT || path === WEBHOOK_PATHS.AGENT;
+function isNonMatrixWecomBasePath(path: string): boolean {
+  return (
+    path === WEBHOOK_PATHS.BOT ||
+    path === WEBHOOK_PATHS.BOT_ALT ||
+    path === WEBHOOK_PATHS.AGENT ||
+    path === WEBHOOK_PATHS.BOT_PLUGIN ||
+    path === WEBHOOK_PATHS.AGENT_PLUGIN
+  );
 }
 
 function hasMatrixExplicitRoutesRegistered(): boolean {
   for (const key of webhookTargets.keys()) {
     if (key.startsWith(`${WEBHOOK_PATHS.BOT_ALT}/`)) return true;
+    if (key.startsWith(`${WEBHOOK_PATHS.BOT_PLUGIN}/`)) return true;
   }
   for (const key of agentTargets.keys()) {
     if (key.startsWith(`${WEBHOOK_PATHS.AGENT}/`)) return true;
+    if (key.startsWith(`${WEBHOOK_PATHS.AGENT_PLUGIN}/`)) return true;
   }
   return false;
 }
@@ -1549,7 +1557,11 @@ async function startAgentForStream(params: {
     SenderName: userid,
     SenderId: userid,
     Provider: "wecom",
-    Surface: "webchat",
+    // Keep Surface aligned with OriginatingChannel for Bot-mode delivery.
+    // If Surface is "webchat", core dispatch treats this as cross-channel
+    // and routes replies via routeReply -> wecom outbound (Agent API),
+    // bypassing the Bot stream deliver path.
+    Surface: "wecom",
     MessageSid: msg.msgid,
     CommandAuthorized: commandAuthorized,
     OriginatingChannel: "wecom",
@@ -2110,7 +2122,7 @@ export function registerAgentWebhookTarget(target: AgentWebhookTarget): () => vo
  * 
  * 处理来自企业微信的所有 Webhook 请求。
  * 职责：
- * 1. 路由分发：按 Matrix/Legacy 路径分流 Bot 与 Agent 回调。
+ * 1. 路由分发：优先按 `/plugins/wecom/{bot|agent}/{accountId}` 分流，并兼容历史 `/wecom/*` 路径。
  * 2. 安全校验：验证企业微信签名 (Signature)。
  * 3. 消息解密：处理企业微信的加密包。
  * 4. 响应处理：
@@ -2134,7 +2146,7 @@ export async function handleWecomWebhookRequest(req: IncomingMessage, res: Serve
     `[wecom] inbound(http): reqId=${reqId} path=${path} method=${req.method ?? "UNKNOWN"} remote=${remote} ua=${ua ? `"${ua}"` : "N/A"} contentLength=${cl || "N/A"} query={timestamp:${hasTimestamp},nonce:${hasNonce},echostr:${hasEchostr},msg_signature:${hasMsgSig},signature:${hasSignature}}`,
   );
 
-  if (hasMatrixExplicitRoutesRegistered() && isLegacyWecomPath(path)) {
+  if (hasMatrixExplicitRoutesRegistered() && isNonMatrixWecomBasePath(path)) {
     logRouteFailure({
       reqId,
       path,
@@ -2145,14 +2157,19 @@ export async function handleWecomWebhookRequest(req: IncomingMessage, res: Serve
     writeRouteFailure(
       res,
       "wecom_matrix_path_required",
-      "Matrix mode requires explicit account path. Use /wecom/bot/{accountId} or /wecom/agent/{accountId}.",
+      "Matrix mode requires explicit account path. Use /plugins/wecom/bot/{accountId} or /plugins/wecom/agent/{accountId}.",
     );
     return true;
   }
 
-  const isAgentPath = path === WEBHOOK_PATHS.AGENT || path.startsWith(`${WEBHOOK_PATHS.AGENT}/`);
-  if (isAgentPath) {
-    const targets = agentTargets.get(path) ?? [];
+  const isAgentPathCandidate =
+    path === WEBHOOK_PATHS.AGENT ||
+    path === WEBHOOK_PATHS.AGENT_PLUGIN ||
+    path.startsWith(`${WEBHOOK_PATHS.AGENT}/`) ||
+    path.startsWith(`${WEBHOOK_PATHS.AGENT_PLUGIN}/`);
+  const matchedAgentTargets = agentTargets.get(path) ?? [];
+  if (matchedAgentTargets.length > 0 || isAgentPathCandidate) {
+    const targets = matchedAgentTargets;
     if (targets.length > 0) {
       const query = resolveQueryParams(req);
       const timestamp = query.get("timestamp") ?? "";
@@ -2328,7 +2345,7 @@ export async function handleWecomWebhookRequest(req: IncomingMessage, res: Serve
     return true;
   }
 
-  // Bot 模式路由: /wecom, /wecom/bot
+  // Bot 模式路由: /plugins/wecom/bot（推荐）以及 /wecom、/wecom/bot（兼容）
   const targets = webhookTargets.get(path);
   if (!targets || targets.length === 0) return false;
 

package/src/monitor.webhook.test.ts

@@ -369,7 +369,7 @@ describe("handleWecomWebhookRequest", () => {
     }
   });
 
-  it("routes matrix bot callback by explicit account path", async () => {
+  it("routes bot callback by explicit plugin account path", async () => {
     const token = "MATRIX-TOKEN";
     const encodingAESKey = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFG";
 
@@ -390,7 +390,7 @@ describe("handleWecomWebhookRequest", () => {
       config: { channels: { wecom: { accounts: {} } } } as OpenClawConfig,
       runtime: {},
       core: {} as any,
-      path: "/wecom/bot/acct-a",
+      path: "/plugins/wecom/bot/acct-a",
     });
     const unregisterB = registerWecomWebhookTarget({
       account: {
@@ -409,12 +409,12 @@ describe("handleWecomWebhookRequest", () => {
       config: { channels: { wecom: { accounts: {} } } } as OpenClawConfig,
       runtime: {},
       core: {} as any,
-      path: "/wecom/bot/acct-b",
+      path: "/plugins/wecom/bot/acct-b",
     });
 
     try {
       const timestamp = "1700000999";
-      const nonce = "nonce-matrix";
+      const nonce = "nonce-plugin-account";
       const plain = JSON.stringify({
         msgid: "MATRIX-MSG-1",
         aibotid: "BOT_B",
@@ -422,13 +422,94 @@ describe("handleWecomWebhookRequest", () => {
         from: { userid: "USERID_B" },
         response_url: "RESPONSEURL",
         msgtype: "text",
-        text: { content: "hello matrix" },
+        text: { content: "hello plugin account path" },
       });
       const encrypt = encryptWecomPlaintext({ encodingAESKey, receiveId: "", plaintext: plain });
       const msg_signature = computeWecomMsgSignature({ token, timestamp, nonce, encrypt });
       const req = createMockRequest({
         method: "POST",
-        url: `/wecom/bot/acct-b?msg_signature=${encodeURIComponent(msg_signature)}&timestamp=${encodeURIComponent(timestamp)}&nonce=${encodeURIComponent(nonce)}`,
+        url: `/plugins/wecom/bot/acct-b?msg_signature=${encodeURIComponent(msg_signature)}&timestamp=${encodeURIComponent(timestamp)}&nonce=${encodeURIComponent(nonce)}`,
+        body: { encrypt },
+      });
+      const res = createMockResponse();
+      const handled = await handleWecomWebhookRequest(req, res);
+      expect(handled).toBe(true);
+      expect(res._getStatusCode()).toBe(200);
+
+      const json = JSON.parse(res._getData()) as any;
+      const replyPlain = decryptWecomEncrypted({
+        encodingAESKey,
+        receiveId: "",
+        encrypt: json.encrypt,
+      });
+      const reply = JSON.parse(replyPlain) as any;
+      expect(reply.stream?.content).toBe("B处理中");
+    } finally {
+      unregisterA();
+      unregisterB();
+    }
+  });
+
+  it("routes bot callback by explicit plugin namespace path", async () => {
+    const token = "MATRIX-TOKEN-PLUGIN";
+    const encodingAESKey = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFG";
+
+    const unregisterA = registerWecomWebhookTarget({
+      account: {
+        accountId: "acct-a",
+        enabled: true,
+        configured: true,
+        token,
+        encodingAESKey,
+        receiveId: "",
+        config: {
+          token,
+          encodingAESKey,
+          streamPlaceholderContent: "A处理中",
+        } as any,
+      } as any,
+      config: { channels: { wecom: { accounts: {} } } } as OpenClawConfig,
+      runtime: {},
+      core: {} as any,
+      path: "/plugins/wecom/bot/acct-a",
+    });
+    const unregisterB = registerWecomWebhookTarget({
+      account: {
+        accountId: "acct-b",
+        enabled: true,
+        configured: true,
+        token,
+        encodingAESKey,
+        receiveId: "",
+        config: {
+          token,
+          encodingAESKey,
+          streamPlaceholderContent: "B处理中",
+        } as any,
+      } as any,
+      config: { channels: { wecom: { accounts: {} } } } as OpenClawConfig,
+      runtime: {},
+      core: {} as any,
+      path: "/plugins/wecom/bot/acct-b",
+    });
+
+    try {
+      const timestamp = "1700001000";
+      const nonce = "nonce-matrix-plugin";
+      const plain = JSON.stringify({
+        msgid: "MATRIX-MSG-PLUGIN-1",
+        aibotid: "BOT_B",
+        chattype: "single",
+        from: { userid: "USERID_B_PLUGIN" },
+        response_url: "RESPONSEURL",
+        msgtype: "text",
+        text: { content: "hello matrix plugin path" },
+      });
+      const encrypt = encryptWecomPlaintext({ encodingAESKey, receiveId: "", plaintext: plain });
+      const msg_signature = computeWecomMsgSignature({ token, timestamp, nonce, encrypt });
+      const req = createMockRequest({
+        method: "POST",
+        url: `/plugins/wecom/bot/acct-b?msg_signature=${encodeURIComponent(msg_signature)}&timestamp=${encodeURIComponent(timestamp)}&nonce=${encodeURIComponent(nonce)}`,
         body: { encrypt },
       });
       const res = createMockResponse();
@@ -501,7 +582,7 @@ describe("handleWecomWebhookRequest", () => {
     }
   });
 
-  it("rejects legacy bot path when matrix explicit routes are registered", async () => {
+  it("rejects legacy paths and accountless plugin paths", async () => {
     const token = "MATRIX-TOKEN-3";
     const encodingAESKey = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFG";
     const unregister = registerWecomWebhookTarget({
@@ -517,7 +598,7 @@ describe("handleWecomWebhookRequest", () => {
       config: { channels: { wecom: { accounts: { "acct-a": { bot: {} } } } } } as OpenClawConfig,
       runtime: {},
       core: {} as any,
-      path: "/wecom/bot/acct-a",
+      path: "/plugins/wecom/bot/acct-a",
     });
     try {
       const req = createMockRequest({
@@ -531,6 +612,18 @@ describe("handleWecomWebhookRequest", () => {
       expect(JSON.parse(res._getData())).toMatchObject({
         error: "wecom_matrix_path_required",
       });
+
+      const pluginReq = createMockRequest({
+        method: "GET",
+        url: "/plugins/wecom/bot?timestamp=t&nonce=n&msg_signature=s&echostr=e",
+      });
+      const pluginRes = createMockResponse();
+      const pluginHandled = await handleWecomWebhookRequest(pluginReq, pluginRes);
+      expect(pluginHandled).toBe(true);
+      expect(pluginRes._getStatusCode()).toBe(401);
+      expect(JSON.parse(pluginRes._getData())).toMatchObject({
+        error: "wecom_matrix_path_required",
+      });
     } finally {
       unregister();
     }
@@ -557,7 +650,7 @@ describe("handleWecomWebhookRequest", () => {
       },
       config: { channels: { wecom: { accounts: {} } } } as OpenClawConfig,
       runtime: {},
-      path: "/wecom/agent",
+      path: "/plugins/wecom/agent/default",
     } as any);
     const unregisterB = registerAgentWebhookTarget({
       agent: {
@@ -573,13 +666,13 @@ describe("handleWecomWebhookRequest", () => {
       },
       config: { channels: { wecom: { accounts: {} } } } as OpenClawConfig,
       runtime: {},
-      path: "/wecom/agent",
+      path: "/plugins/wecom/agent/default",
     } as any);
 
     try {
       const req = createMockRequest({
         method: "GET",
-        url: `/wecom/agent?msg_signature=${encodeURIComponent(signature)}&timestamp=${encodeURIComponent(timestamp)}&nonce=${encodeURIComponent(nonce)}&echostr=${encodeURIComponent(echostr)}`,
+        url: `/plugins/wecom/agent/default?msg_signature=${encodeURIComponent(signature)}&timestamp=${encodeURIComponent(timestamp)}&nonce=${encodeURIComponent(nonce)}&echostr=${encodeURIComponent(echostr)}`,
       });
       const res = createMockResponse();
       const handled = await handleWecomWebhookRequest(req, res);