@zxh126/pi-qqbot 2.3.0 → 2.4.0

package/package.json

@@ -1,60 +1,60 @@
-{
-  "name": "@zxh126/pi-qqbot",
-  "version": "2.3.0",
-  "type": "module",
-  "description": "Bridge the Pi coding agent into QQ private chats, with remote tool-call approval",
-  "license": "MIT",
-  "keywords": [
-    "pi-package",
-    "pi",
-    "qq",
-    "qqbot",
-    "bot",
-    "coding-agent",
-    "approval"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://gitee.com/zxh126/pi-qqbot.git"
-  },
-  "homepage": "https://gitee.com/zxh126/pi-qqbot#readme",
-  "bugs": {
-    "url": "https://gitee.com/zxh126/pi-qqbot/issues"
-  },
-  "pi": {
-    "extensions": [
-      "./index.ts"
-    ]
-  },
-  "scripts": {
-    "test": "node test/queue.test.mjs && node test/approver.test.mjs && node test/logger.test.mjs && node test/usage-bridge.test.mjs && node test/progress.test.mjs && node test/redact.test.mjs && node test/config.test.mjs && node test/remote-notice.test.mjs && node test/lock.test.mjs && node test/accounts.test.mjs && node test/auth.test.mjs && node test/attachment.test.mjs && node test/upload.test.mjs"
-  },
-  "files": [
-    "*.ts",
-    "qq",
-    "util",
-    "README.md",
-    "CHANGELOG.md",
-    "docs",
-    "LICENSE"
-  ],
-  "dependencies": {
-    "proper-lockfile": "^4.1.2",
-    "ws": "^8.18.0"
-  },
-  "peerDependencies": {
-    "@earendil-works/pi-coding-agent": "*",
-    "typebox": "*"
-  },
-  "peerDependenciesMeta": {
-    "typebox": {
-      "optional": true
-    }
-  },
-  "devDependencies": {
-    "@types/proper-lockfile": "^4.1.4",
-    "@types/ws": "^8.18.2",
-    "jiti": "^2.6.1",
-    "typebox": "^1.3.27"
-  }
-}
+{
+  "name": "@zxh126/pi-qqbot",
+  "version": "2.4.0",
+  "type": "module",
+  "description": "Bridge the Pi coding agent into QQ private chats, with remote tool-call approval",
+  "license": "MIT",
+  "keywords": [
+    "pi-package",
+    "pi",
+    "qq",
+    "qqbot",
+    "bot",
+    "coding-agent",
+    "approval"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitee.com/zxh126/pi-qqbot.git"
+  },
+  "homepage": "https://gitee.com/zxh126/pi-qqbot#readme",
+  "bugs": {
+    "url": "https://gitee.com/zxh126/pi-qqbot/issues"
+  },
+  "pi": {
+    "extensions": [
+      "./index.ts"
+    ]
+  },
+  "scripts": {
+    "test": "node test/queue.test.mjs && node test/approver.test.mjs && node test/logger.test.mjs && node test/usage-bridge.test.mjs && node test/progress.test.mjs && node test/redact.test.mjs && node test/config.test.mjs && node test/remote-notice.test.mjs && node test/lock.test.mjs && node test/accounts.test.mjs && node test/auth.test.mjs && node test/attachment.test.mjs && node test/upload.test.mjs && node test/error-notice.test.mjs && node test/billing.test.mjs && node test/credential-intake.test.mjs && node test/selfupdate.test.mjs"
+  },
+  "files": [
+    "*.ts",
+    "qq",
+    "util",
+    "README.md",
+    "CHANGELOG.md",
+    "docs",
+    "LICENSE"
+  ],
+  "dependencies": {
+    "proper-lockfile": "^4.1.2",
+    "ws": "^8.18.0"
+  },
+  "peerDependencies": {
+    "@earendil-works/pi-coding-agent": "*",
+    "typebox": "*"
+  },
+  "peerDependenciesMeta": {
+    "typebox": {
+      "optional": true
+    }
+  },
+  "devDependencies": {
+    "@types/proper-lockfile": "^4.1.4",
+    "@types/ws": "^8.18.2",
+    "jiti": "^2.6.1",
+    "typebox": "^1.3.27"
+  }
+}

package/qq/api.ts

@@ -1,107 +1,107 @@
-import { MAX_REPLIES_PER_MSG_ID } from "../constants";
-
-export interface QQApiOptions {
-  restBase: string;
-  getToken: () => Promise<string>;
-  fetchFn?: typeof fetch;
-}
-
-export interface SendOptions {
-  msgId?: string;
-  format?: "text" | "markdown";
-}
-
-export interface MediaSendOptions {
-  msgId?: string;
-}
-
-export class QQApi {
-  private queue: Promise<void> = Promise.resolve();
-  private seqCounters = new Map<string, number>();
-
-  constructor(private opts: QQApiOptions) {}
-
-  sendC2C(openid: string, content: string, options: SendOptions = {}): Promise<void> {
-    const task = this.queue.then(() => this.doSend(openid, content, options));
-    this.queue = task.catch(() => {});
-    return task;
-  }
-
-  /** 发富媒体（msg_type=7）：fileInfo 来自 `/v2/users/{openid}/files` 的上传结果 */
-  sendC2CMedia(openid: string, fileInfo: string, options: MediaSendOptions = {}): Promise<void> {
-    const task = this.queue.then(() => this.doMedia(openid, fileInfo, options));
-    this.queue = task.catch(() => {});
-    return task;
-  }
-
-  private nextSeq(msgId?: string): number | undefined {
-    if (!msgId) return undefined;
-    const used = this.seqCounters.get(msgId) ?? 0;
-    if (used >= MAX_REPLIES_PER_MSG_ID) return undefined;
-    const seq = used + 1;
-    this.seqCounters.set(msgId, seq);
-    if (this.seqCounters.size > 500) this.seqCounters.clear();
-    return seq;
-  }
-
-  private async postWithRetry(openid: string, body: any): Promise<void> {
-    const fetchFn = this.opts.fetchFn ?? fetch;
-    for (let attempt = 0; attempt <= 3; attempt++) {
-      const token = await this.opts.getToken();
-      const res = await fetchFn(`${this.opts.restBase}/v2/users/${openid}/messages`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json", Authorization: `QQBot ${token}` },
-        body: JSON.stringify(body),
-      });
-      if (res.status === 429 && attempt < 3) {
-        const retryAfter = Number(res.headers.get("Retry-After") ?? "1");
-        await new Promise((r) => setTimeout(r, Math.min(retryAfter, 30) * 1000));
-        continue;
-      }
-      if (!res.ok) throw new Error(`sendC2C failed: HTTP ${res.status} ${await res.text()}`);
-      return;
-    }
-  }
-
-  private async doMedia(openid: string, fileInfo: string, options: MediaSendOptions): Promise<void> {
-    let msgId = options.msgId;
-    let seq: number | undefined;
-    if (msgId) {
-      seq = this.nextSeq(msgId);
-      if (seq === undefined) msgId = undefined; // 被动额度用尽 → 主动消息
-    }
-    const body: any = { msg_type: 7, media: { file_info: fileInfo } };
-    if (msgId && seq !== undefined) {
-      body.msg_id = msgId;
-      body.msg_seq = seq;
-    }
-    await this.postWithRetry(openid, body);
-  }
-
-  private async doSend(openid: string, content: string, options: SendOptions): Promise<void> {
-    const format = options.format ?? "text";
-    let msgId = options.msgId;
-    let seq: number | undefined;
-    if (msgId) {
-      seq = this.nextSeq(msgId);
-      if (seq === undefined) msgId = undefined; // 被动额度用尽 → 主动消息
-    }
-    const makeBody = (fmt: "text" | "markdown") => {
-      const body: any = fmt === "markdown" ? { msg_type: 2, markdown: { content } } : { msg_type: 0, content };
-      if (msgId && seq !== undefined) {
-        body.msg_id = msgId;
-        body.msg_seq = seq;
-      }
-      return body;
-    };
-    try {
-      await this.postWithRetry(openid, makeBody(format));
-    } catch (e) {
-      if (format === "markdown") {
-        await this.postWithRetry(openid, makeBody("text"));
-        return;
-      }
-      throw e;
-    }
-  }
-}
+import { MAX_REPLIES_PER_MSG_ID } from "../constants";
+
+export interface QQApiOptions {
+  restBase: string;
+  getToken: () => Promise<string>;
+  fetchFn?: typeof fetch;
+}
+
+export interface SendOptions {
+  msgId?: string;
+  format?: "text" | "markdown";
+}
+
+export interface MediaSendOptions {
+  msgId?: string;
+}
+
+export class QQApi {
+  private queue: Promise<void> = Promise.resolve();
+  private seqCounters = new Map<string, number>();
+
+  constructor(private opts: QQApiOptions) {}
+
+  sendC2C(openid: string, content: string, options: SendOptions = {}): Promise<void> {
+    const task = this.queue.then(() => this.doSend(openid, content, options));
+    this.queue = task.catch(() => {});
+    return task;
+  }
+
+  /** 发富媒体（msg_type=7）：fileInfo 来自 `/v2/users/{openid}/files` 的上传结果 */
+  sendC2CMedia(openid: string, fileInfo: string, options: MediaSendOptions = {}): Promise<void> {
+    const task = this.queue.then(() => this.doMedia(openid, fileInfo, options));
+    this.queue = task.catch(() => {});
+    return task;
+  }
+
+  private nextSeq(msgId?: string): number | undefined {
+    if (!msgId) return undefined;
+    const used = this.seqCounters.get(msgId) ?? 0;
+    if (used >= MAX_REPLIES_PER_MSG_ID) return undefined;
+    const seq = used + 1;
+    this.seqCounters.set(msgId, seq);
+    if (this.seqCounters.size > 500) this.seqCounters.clear();
+    return seq;
+  }
+
+  private async postWithRetry(openid: string, body: any): Promise<void> {
+    const fetchFn = this.opts.fetchFn ?? fetch;
+    for (let attempt = 0; attempt <= 3; attempt++) {
+      const token = await this.opts.getToken();
+      const res = await fetchFn(`${this.opts.restBase}/v2/users/${openid}/messages`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json", Authorization: `QQBot ${token}` },
+        body: JSON.stringify(body),
+      });
+      if (res.status === 429 && attempt < 3) {
+        const retryAfter = Number(res.headers.get("Retry-After") ?? "1");
+        await new Promise((r) => setTimeout(r, Math.min(retryAfter, 30) * 1000));
+        continue;
+      }
+      if (!res.ok) throw new Error(`sendC2C failed: HTTP ${res.status} ${await res.text()}`);
+      return;
+    }
+  }
+
+  private async doMedia(openid: string, fileInfo: string, options: MediaSendOptions): Promise<void> {
+    let msgId = options.msgId;
+    let seq: number | undefined;
+    if (msgId) {
+      seq = this.nextSeq(msgId);
+      if (seq === undefined) msgId = undefined; // 被动额度用尽 → 主动消息
+    }
+    const body: any = { msg_type: 7, media: { file_info: fileInfo } };
+    if (msgId && seq !== undefined) {
+      body.msg_id = msgId;
+      body.msg_seq = seq;
+    }
+    await this.postWithRetry(openid, body);
+  }
+
+  private async doSend(openid: string, content: string, options: SendOptions): Promise<void> {
+    const format = options.format ?? "text";
+    let msgId = options.msgId;
+    let seq: number | undefined;
+    if (msgId) {
+      seq = this.nextSeq(msgId);
+      if (seq === undefined) msgId = undefined; // 被动额度用尽 → 主动消息
+    }
+    const makeBody = (fmt: "text" | "markdown") => {
+      const body: any = fmt === "markdown" ? { msg_type: 2, markdown: { content } } : { msg_type: 0, content };
+      if (msgId && seq !== undefined) {
+        body.msg_id = msgId;
+        body.msg_seq = seq;
+      }
+      return body;
+    };
+    try {
+      await this.postWithRetry(openid, makeBody(format));
+    } catch (e) {
+      if (format === "markdown") {
+        await this.postWithRetry(openid, makeBody("text"));
+        return;
+      }
+      throw e;
+    }
+  }
+}