ppxans-harness 2.4.0 → 3.2.0

package/src/channels/index.js

@@ -1,110 +1,111 @@
-// src/channels/index.js - 通道管理器 (注册表, config 驱动, 可更换)
-// 每个通道 = Channel 子类 (connect/send/disconnect); 新增通道类型 → 注册进 channelTypes 即可, 不改 manager
-// 使用方: new ChannelManager(agent, config.channels) → await start()
-import { HttpChannel } from "./http.js";
-import { FeishuChannel } from "./feishu.js";
-import { WechatWebhookChannel } from "./wechat.js";
-import { LogChannel } from "./log.js";
-
-// 内置通道类型注册表: name -> 通道类 (构造函数签名: (agent, configObj))
-export const BUILTIN_CHANNEL_TYPES = {
-  http: HttpChannel,
-  feishu: FeishuChannel,
-  wechat: WechatWebhookChannel,
-  log: LogChannel,
-};
-
-// 启停策略: http 默认开, 其余默认关 (config.channels.<name>.enabled)
-function isEnabled(name, cfg) {
-  if (name === "http") return cfg.enabled !== false;
-  return !!cfg.enabled;
-}
-
-export class ChannelManager {
-  constructor(agent, config = {}, channelTypes = null) {
-    this.agent = agent;
-    this.config = config || {};              // config.channels
-    this.channelTypes = channelTypes || BUILTIN_CHANNEL_TYPES; // 可注入自定义类型 (更换通道实现)
-    this.channels = [];
-    this.httpServer = null;
-  }
-
-  // 按注册表顺序启动所有启用的通道 (单个失败不影响其他)
-  // 流程: 全部 connect → 若 HTTP 通道在跑, 给 webhook 型通道挂载路由
-  async start() {
-    const started = [];
-    for (const [name, Ctor] of Object.entries(this.channelTypes)) {
-      const cfg = { ...(this.config[name] || {}) };
-      if (!isEnabled(name, cfg)) continue;
-      try {
-        const ch = new Ctor(this.agent, cfg);
-        await ch.connect();
-        this.channels.push(ch);
-        if (ch.server) this.httpServer = ch.server;
-        started.push(name);
-      } catch (e) {
-        console.warn(`[channels] ${name} 通道启动失败: ${e.message}`);
-      }
-    }
-    // webhook 型通道挂到 HTTP server (若已启动); 传 http 通道实例供 registerWebhook 路由分发
-    if (this.httpServer) {
-      const httpCh = this.get("http") || null;
-      for (const ch of this.channels) {
-        if (ch.name !== "http" && typeof ch.mount === "function") {
-          try { ch.mount(this.httpServer, httpCh); } catch (e) { console.warn(`[channels] ${ch.name} webhook 挂载失败: ${e.message}`); }
-        }
-      }
-    }
-    return started;
-  }
-
-  // 按 name 取已启动通道 (无则 null)
-  get(name) {
-    return this.channels.find((c) => c.name === name) || null;
-  }
-
-  // 列出所有可配置通道的状态 (含未启用的), 供 CLI/UI 展示
-  list() {
-    return Object.entries(this.channelTypes).map(([name, Ctor]) => {
-      const cfg = this.config[name] || {};
-      return { name, enabled: isEnabled(name, cfg), connected: !!this.get(name) };
-    });
-  }
-
-  // 连通性测试: 用独立实例验证某通道配置 (不干扰已启动的通道)
-  async test(name) {
-    const Ctor = this.channelTypes[name];
-    if (!Ctor) return { ok: false, detail: `未知通道类型: ${name}` };
-    const cfg = { ...(this.config[name] || {}) };
-    try {
-      const ch = new Ctor(this.agent, cfg);
-      const r = typeof ch.test === "function" ? await ch.test() : await ch.connect();
-      return typeof r === "object" && r !== null ? r : { ok: true, detail: String(r) };
-    } catch (e) {
-      return { ok: false, detail: e.message };
-    }
-  }
-
-  // 广播到所有已启动通道 (主动提醒/系统消息投递入口)
-  async broadcast(text, { to = "*" } = {}) {
-    const out = [];
-    for (const c of this.channels) {
-      try { out.push(await c.send(to, text)); } catch (e) { console.warn(`[channels] ${c.name} 发送失败: ${e.message}`); }
-    }
-    return out;
-  }
-
-  async stop() {
-    for (const c of this.channels) {
-      try { await c.disconnect?.(); } catch {}
-    }
-    this.channels = [];
-    this.httpServer = null;
-  }
-}
-
-export { Channel } from "./base.js";
-export { HttpChannel } from "./http.js";
-export { FeishuChannel } from "./feishu.js";
-export { WechatWebhookChannel } from "./wechat.js";
-export { LogChannel } from "./log.js";
+// src/channels/index.js - 通道管理器 (注册表, config 驱动, 可更换)
+// 每个通道 = Channel 子类 (connect/send/disconnect); 新增通道类型 → 注册进 channelTypes 即可, 不改 manager
+// 使用方: new ChannelManager(agent, config.channels) → await start()
+import { HttpChannel } from "./http.js";
+import { FeishuChannel } from "./feishu.js";
+import { WechatWebhookChannel } from "./wechat.js";
+import { LogChannel } from "./log.js";
+import { debug } from "../utils/logger.js";
+
+// 内置通道类型注册表: name -> 通道类 (构造函数签名: (agent, configObj))
+export const BUILTIN_CHANNEL_TYPES = {
+  http: HttpChannel,
+  feishu: FeishuChannel,
+  wechat: WechatWebhookChannel,
+  log: LogChannel,
+};
+
+// 启停策略: http 默认开, 其余默认关 (config.channels.<name>.enabled)
+function isEnabled(name, cfg) {
+  if (name === "http") return cfg.enabled !== false;
+  return !!cfg.enabled;
+}
+
+export class ChannelManager {
+  constructor(agent, config = {}, channelTypes = null) {
+    this.agent = agent;
+    this.config = config || {};              // config.channels
+    this.channelTypes = channelTypes || BUILTIN_CHANNEL_TYPES; // 可注入自定义类型 (更换通道实现)
+    this.channels = [];
+    this.httpServer = null;
+  }
+
+  // 按注册表顺序启动所有启用的通道 (单个失败不影响其他)
+  // 流程: 全部 connect → 若 HTTP 通道在跑, 给 webhook 型通道挂载路由
+  async start() {
+    const started = [];
+    for (const [name, Ctor] of Object.entries(this.channelTypes)) {
+      const cfg = { ...(this.config[name] || {}) };
+      if (!isEnabled(name, cfg)) continue;
+      try {
+        const ch = new Ctor(this.agent, cfg);
+        await ch.connect();
+        this.channels.push(ch);
+        if (ch.server) this.httpServer = ch.server;
+        started.push(name);
+      } catch (e) {
+        console.warn(`[channels] ${name} 通道启动失败: ${e.message}`);
+      }
+    }
+    // webhook 型通道挂到 HTTP server (若已启动); 传 http 通道实例供 registerWebhook 路由分发
+    if (this.httpServer) {
+      const httpCh = this.get("http") || null;
+      for (const ch of this.channels) {
+        if (ch.name !== "http" && typeof ch.mount === "function") {
+          try { ch.mount(this.httpServer, httpCh); } catch (e) { console.warn(`[channels] ${ch.name} webhook 挂载失败: ${e.message}`); }
+        }
+      }
+    }
+    return started;
+  }
+
+  // 按 name 取已启动通道 (无则 null)
+  get(name) {
+    return this.channels.find((c) => c.name === name) || null;
+  }
+
+  // 列出所有可配置通道的状态 (含未启用的), 供 CLI/UI 展示
+  list() {
+    return Object.entries(this.channelTypes).map(([name, Ctor]) => {
+      const cfg = this.config[name] || {};
+      return { name, enabled: isEnabled(name, cfg), connected: !!this.get(name) };
+    });
+  }
+
+  // 连通性测试: 用独立实例验证某通道配置 (不干扰已启动的通道)
+  async test(name) {
+    const Ctor = this.channelTypes[name];
+    if (!Ctor) return { ok: false, detail: `未知通道类型: ${name}` };
+    const cfg = { ...(this.config[name] || {}) };
+    try {
+      const ch = new Ctor(this.agent, cfg);
+      const r = typeof ch.test === "function" ? await ch.test() : await ch.connect();
+      return typeof r === "object" && r !== null ? r : { ok: true, detail: String(r) };
+    } catch (e) {
+      return { ok: false, detail: e.message };
+    }
+  }
+
+  // 广播到所有已启动通道 (主动提醒/系统消息投递入口)
+  async broadcast(text, { to = "*" } = {}) {
+    const out = [];
+    for (const c of this.channels) {
+      try { out.push(await c.send(to, text)); } catch (e) { console.warn(`[channels] ${c.name} 发送失败: ${e.message}`); }
+    }
+    return out;
+  }
+
+  async stop() {
+    for (const c of this.channels) {
+      try { await c.disconnect?.(); } catch (e) { debug(`[channels/index] 已忽略异常: ${e && e.message ? e.message : e}`); }
+    }
+    this.channels = [];
+    this.httpServer = null;
+  }
+}
+
+export { Channel } from "./base.js";
+export { HttpChannel } from "./http.js";
+export { FeishuChannel } from "./feishu.js";
+export { WechatWebhookChannel } from "./wechat.js";
+export { LogChannel } from "./log.js";

package/src/channels/log.js

@@ -1,29 +1,29 @@
-// src/channels/log.js - 日志通道 (dummy): 无网络依赖, 把消息打印到 stdout
-// 用途: 主动提醒/消息先落到本地日志验证契约, 再接真实通道 (webhook/IM) 时只需"换一个 adapter"
-import { Channel } from "./base.js";
-
-export class LogChannel extends Channel {
-  constructor(agent, { target = "console" } = {}) {
-    super("log", agent);
-    this.target = target; // 预留: "console" | 未来文件/远程日志
-  }
-
-  async connect() {
-    this.connected = true;
-    return this;
-  }
-
-  async send(to, text) {
-    const prefix = to && to !== "*" ? `[log:${to}]` : "[log]";
-    console.log(`${prefix} ${String(text)}`);
-    return text;
-  }
-
-  async test() {
-    return { ok: true, detail: "日志通道无需网络, 总是可用" };
-  }
-
-  async disconnect() {
-    this.connected = false;
-  }
-}
+// src/channels/log.js - 日志通道 (dummy): 无网络依赖, 把消息打印到 stdout
+// 用途: 主动提醒/消息先落到本地日志验证契约, 再接真实通道 (webhook/IM) 时只需"换一个 adapter"
+import { Channel } from "./base.js";
+
+export class LogChannel extends Channel {
+  constructor(agent, { target = "console" } = {}) {
+    super("log", agent);
+    this.target = target; // 预留: "console" | 未来文件/远程日志
+  }
+
+  async connect() {
+    this.connected = true;
+    return this;
+  }
+
+  async send(to, text) {
+    const prefix = to && to !== "*" ? `[log:${to}]` : "[log]";
+    console.log(`${prefix} ${String(text)}`);
+    return text;
+  }
+
+  async test() {
+    return { ok: true, detail: "日志通道无需网络, 总是可用" };
+  }
+
+  async disconnect() {
+    this.connected = false;
+  }
+}

package/src/channels/wechat-crypto.js

@@ -1,74 +1,73 @@
-// src/channels/wechat-crypto.js - 微信消息加解密 (企业微信/公众号) 零依赖
-// 参考官方 WXBizMsgCrypt: AES-256-CBC + PKCS7 填充 + SHA1 签名校验
-// 用 Node 原生 crypto, 无任何 npm 依赖。真实联调需企微/公众号凭据 (token + encodingAESKey)。
-import crypto from "node:crypto";
-
-// 43 字符 encodingAESKey → 32 字节 AES key (base64, 补 '=' 凑满 32 字节)
-function keyOf(encodingAESKey) {
-  return Buffer.from(String(encodingAESKey) + "=", "base64");
-}
-
-// SHA1 签名校验: sort([token, timestamp, nonce, encrypt]).join("") 的 sha1 与 signature 比对
-export function verifySignature(token, timestamp, nonce, encrypt, signature) {
-  const arr = [String(token), String(timestamp), String(nonce), String(encrypt)].sort();
-  const sha1 = crypto.createHash("sha1").update(arr.join(""), "utf8").digest("hex");
-  return sha1 === String(signature);
-}
-
-// 生成签名 (加密回包时用, 与 verifySignature 同一算法)
-export function generateSignature(token, timestamp, nonce, encrypt) {
-  const arr = [String(token), String(timestamp), String(nonce), String(encrypt)].sort();
-  return crypto.createHash("sha1").update(arr.join(""), "utf8").digest("hex");
-}
-
-// 解密 <Encrypt> → { msg, receiveId } (receiveId 通常为 corpId)
-export function decryptMsg(encodingAESKey, encryptedXml) {
-  const m = String(encryptedXml).match(/<Encrypt><!\[CDATA\[([\s\S]*?)\]\]><\/Encrypt>/);
-  const enc = m ? m[1] : "";
-  if (!enc) throw new Error("消息体无 <Encrypt>");
-  const key = keyOf(encodingAESKey);
-  const iv = key.slice(0, 16);
-  const decipher = crypto.createDecipheriv("aes-256-cbc", key, iv);
-  decipher.setAutoPadding(false);
-  const dec = Buffer.concat([decipher.update(enc, "base64"), decipher.final()]);
-  // PKCS7 去填充
-  const pad = dec[dec.length - 1];
-  const plain = dec.slice(0, dec.length - pad);
-  // 明文格式: random(16) + msgLen(4, 大端) + msg + receiveId
-  const msgLen = plain.readUInt32BE(16);
-  const msg = plain.slice(20, 20 + msgLen).toString("utf8");
-  const receiveId = plain.slice(20 + msgLen).toString("utf8");
-  return { msg, receiveId };
-}
-
-// 加密回复 → 返回 <Encrypt> 里的 base64 密文 (供拼回复 XML)
-export function encryptMsg(encodingAESKey, msg, receiveId = "") {
-  const key = keyOf(encodingAESKey);
-  const iv = key.slice(0, 16);
-  const msgBuf = Buffer.from(String(msg), "utf8");
-  const idBuf = Buffer.from(String(receiveId), "utf8");
-  const lenBuf = Buffer.alloc(4);
-  lenBuf.writeUInt32BE(msgBuf.length, 0);
-  const plain = Buffer.concat([crypto.randomBytes(16), lenBuf, msgBuf, idBuf]);
-  // PKCS7 填充到 32 字节倍数
-  const padLen = 32 - (plain.length % 32);
-  const padded = Buffer.concat([plain, Buffer.alloc(padLen, padLen)]);
-  const cipher = crypto.createCipheriv("aes-256-cbc", key, iv);
-  cipher.setAutoPadding(false);
-  return Buffer.concat([cipher.update(padded), cipher.final()]).toString("base64");
-}
-
-// 加密被动回复: 生成企业微信加密模式回包 XML (含 MsgSignature/TimeStamp/Nonce)
-// replyXml = 明文回复 XML, receiveId = corpId (解密时拿到的)
-export function encryptReplyXml({ encodingAESKey, token, replyXml, receiveId = "", timestamp = null, nonce = null }) {
-  const enc = encryptMsg(encodingAESKey, replyXml, receiveId);
-  const ts = String(timestamp ?? Math.floor(Date.now() / 1000));
-  const nc = nonce ?? Math.random().toString(36).slice(2, 12);
-  const sig = generateSignature(token, ts, nc, enc);
-  return `<xml>
-  <Encrypt><![CDATA[${enc}]]></Encrypt>
-  <MsgSignature><![CDATA[${sig}]]></MsgSignature>
-  <TimeStamp>${ts}</TimeStamp>
-  <Nonce><![CDATA[${nc}]]></Nonce>
-</xml>`;
-}
+// src/channels/wechat-crypto.js - 微信消息加解密 (企业微信/公众号) 零依赖
+// 参考官方 WXBizMsgCrypt: AES-256-CBC + PKCS7 填充 + SHA1 签名校验
+// 用 Node 原生 crypto, 无任何 npm 依赖。真实联调需企微/公众号凭据 (token + encodingAESKey)。
+import crypto from "node:crypto";
+
+// 43 字符 encodingAESKey → 32 字节 AES key (base64, 补 '=' 凑满 32 字节)
+function keyOf(encodingAESKey) {
+  return Buffer.from(String(encodingAESKey) + "=", "base64");
+}
+
+// SHA1 签名: sort([token, timestamp, nonce, encrypt]).join("") 的 sha1 (验签与回包签名同一算法)
+// 2026-09-18 重构: 原 verifySignature / generateSignature 各抄一份算法, 现统一由本函数产出
+export function generateSignature(token, timestamp, nonce, encrypt) {
+  const arr = [String(token), String(timestamp), String(nonce), String(encrypt)].sort();
+  return crypto.createHash("sha1").update(arr.join(""), "utf8").digest("hex");
+}
+
+// 签名校验 (与 generateSignature 同算法)
+export function verifySignature(token, timestamp, nonce, encrypt, signature) {
+  return generateSignature(token, timestamp, nonce, encrypt) === String(signature);
+}
+
+// 解密 <Encrypt> → { msg, receiveId } (receiveId 通常为 corpId)
+export function decryptMsg(encodingAESKey, encryptedXml) {
+  const m = String(encryptedXml).match(/<Encrypt><!\[CDATA\[([\s\S]*?)\]\]><\/Encrypt>/);
+  const enc = m ? m[1] : "";
+  if (!enc) throw new Error("消息体无 <Encrypt>");
+  const key = keyOf(encodingAESKey);
+  const iv = key.slice(0, 16);
+  const decipher = crypto.createDecipheriv("aes-256-cbc", key, iv);
+  decipher.setAutoPadding(false);
+  const dec = Buffer.concat([decipher.update(enc, "base64"), decipher.final()]);
+  // PKCS7 去填充
+  const pad = dec[dec.length - 1];
+  const plain = dec.slice(0, dec.length - pad);
+  // 明文格式: random(16) + msgLen(4, 大端) + msg + receiveId
+  const msgLen = plain.readUInt32BE(16);
+  const msg = plain.slice(20, 20 + msgLen).toString("utf8");
+  const receiveId = plain.slice(20 + msgLen).toString("utf8");
+  return { msg, receiveId };
+}
+
+// 加密回复 → 返回 <Encrypt> 里的 base64 密文 (供拼回复 XML)
+export function encryptMsg(encodingAESKey, msg, receiveId = "") {
+  const key = keyOf(encodingAESKey);
+  const iv = key.slice(0, 16);
+  const msgBuf = Buffer.from(String(msg), "utf8");
+  const idBuf = Buffer.from(String(receiveId), "utf8");
+  const lenBuf = Buffer.alloc(4);
+  lenBuf.writeUInt32BE(msgBuf.length, 0);
+  const plain = Buffer.concat([crypto.randomBytes(16), lenBuf, msgBuf, idBuf]);
+  // PKCS7 填充到 32 字节倍数
+  const padLen = 32 - (plain.length % 32);
+  const padded = Buffer.concat([plain, Buffer.alloc(padLen, padLen)]);
+  const cipher = crypto.createCipheriv("aes-256-cbc", key, iv);
+  cipher.setAutoPadding(false);
+  return Buffer.concat([cipher.update(padded), cipher.final()]).toString("base64");
+}
+
+// 加密被动回复: 生成企业微信加密模式回包 XML (含 MsgSignature/TimeStamp/Nonce)
+// replyXml = 明文回复 XML, receiveId = corpId (解密时拿到的)
+export function encryptReplyXml({ encodingAESKey, token, replyXml, receiveId = "", timestamp = null, nonce = null }) {
+  const enc = encryptMsg(encodingAESKey, replyXml, receiveId);
+  const ts = String(timestamp ?? Math.floor(Date.now() / 1000));
+  const nc = nonce ?? Math.random().toString(36).slice(2, 12);
+  const sig = generateSignature(token, ts, nc, enc);
+  return `<xml>
+  <Encrypt><![CDATA[${enc}]]></Encrypt>
+  <MsgSignature><![CDATA[${sig}]]></MsgSignature>
+  <TimeStamp>${ts}</TimeStamp>
+  <Nonce><![CDATA[${nc}]]></Nonce>
+</xml>`;
+}