@zhin.js/adapter-icqq 3.0.3 → 3.0.5

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @zhin.js/adapter-icqq
 
+## 3.0.5
+
+### Patch Changes
+
+- 6295cbd: fix: @优化
+- a51d504: fix: ai 回应
+- 7e14f8d: fix: 统一发个版,优化一些列安全问题
+- Updated dependencies [6295cbd]
+- Updated dependencies [7e14f8d]
+- Updated dependencies [996ebb3]
+  - @zhin.js/agent@0.1.26
+  - @zhin.js/core@1.1.28
+  - @zhin.js/client@1.1.4
+  - zhin.js@1.0.86
+  - @zhin.js/console@3.0.5
+  - @zhin.js/http@1.0.79
+
+## 3.0.4
+
+### Patch Changes
+
+- zhin.js@1.0.85
+- @zhin.js/console@3.0.4
+- @zhin.js/http@1.0.78
+- @zhin.js/core@1.1.27
+
 ## 3.0.3
 
 ### Patch Changes

package/README.md

@@ -384,7 +384,7 @@ onGroupMessage(async (message) => {
 
 ## icqq CLI 与 AI bash 安全
 
-启用 **icqq 技能**（`skills/icqq`）时，模型通常会通过 **`bash`** 调用 `icqq …` 命令行。此时由框架 **`execSecurity` / `execAsk`** 与 **Owner 私聊指令**（`approve always bash`、`approve rule <正则>` 等）共同约束：在 `allowlist` 下，**非敏感**子命令多数可直接执行；**敏感**子命令（踢人、禁言、解散、支付等）在开启 `execAsk` 时需 Owner 确认，并可用 **正则匹配整条子命令** 做持久化放行（不必把 QQ 号写进配置）。持久化文件为数据目录下的 `owner-approve-always.json`。
+启用 **icqq 技能**（`skills/icqq`）时，模型通常会通过 **`bash`** 调用 `icqq …` 命令行。此时由框架 **`execSecurity` / `execApprovalMode`** 与 **Owner 私聊指令**（`approve always bash`、`approve rule <正则>` 等）共同约束：在 `allowlist` 下，**非敏感**子命令多数可直接执行；**敏感**子命令（踢人、禁言、解散、支付等）在 `execApprovalMode: ask` 时需 Owner 确认，并可用 **正则匹配整条子命令** 做持久化放行（不必把 QQ 号写进配置）。持久化文件为数据目录下的 `owner-approve-always.json`。
 
 完整说明与指令表见仓库文档：[docs/advanced/ai.md](../../../docs/advanced/ai.md)（锚点：`#icqq-bash-exec`、`#owner-approve-commands`）。
 

package/dist/index.js

@@ -26,7 +26,7 @@ lucide-react/dist/esm/icons/wifi.mjs:
 lucide-react/dist/esm/icons/x.mjs:
 lucide-react/dist/esm/lucide-react.mjs:
   (**
-   * @license lucide-react v1.16.0 - ISC
+   * @license lucide-react v1.17.0 - ISC
    *
    * This source code is licensed under the ISC license.
    * See the LICENSE file in the root directory of this source tree.

package/lib/bot.d.ts

@@ -4,12 +4,15 @@
  * 不再直接依赖 @icqqjs/icqq 协议库。
  * 登录由 `icqq login` 完成，本 Bot 只负责连接守护进程并收发消息。
  */
-import { Bot, Message, MessageSegment, SendContent, SendOptions } from 'zhin.js';
+import { Bot, Message, SendOptions, type QuotedMessagePayload } from 'zhin.js';
 import type { IcqqBotConfig, IpcFriendInfo, IpcGroupInfo } from "./types.js";
 import type { IcqqAdapter } from "./adapter.js";
 import { IpcClient } from "./ipc-client.js";
-import { type IpcMessageEventData } from "./protocol.js";
-export declare class IcqqBot implements Bot<IcqqBotConfig, IpcMessageEventData> {
+import type { IcqqIpcMessageEvent } from "./icqq-inbound.js";
+import { type NormalizedIcqqInbound } from "./icqq-inbound.js";
+import { buildIcqqIpcMessage as buildIcqqIpcMessageImpl, parseCqMessage as parseCqMessageImpl, toCqString as toCqStringImpl } from "./cq-message.js";
+import { type ICQQTypingIndicatorManager } from "./typing-indicator.js";
+export declare class IcqqBot implements Bot<IcqqBotConfig, IcqqIpcMessageEvent> {
     adapter: IcqqAdapter;
     $connected: boolean;
     $config: IcqqBotConfig;
@@ -19,14 +22,25 @@ export declare class IcqqBot implements Bot<IcqqBotConfig, IpcMessageEventData>
     /** 缓存的群列表 */
     groups: Map<number, IpcGroupInfo>;
     private subscriptions;
+    /** 事件去重：覆盖多端回流/服务端重复推送等场景 */
+    private readonly inboundDeduper;
+    /** MessageEvent.source 解析结果，供 $getMsg 优先命中 */
+    private readonly quotedSourceCache;
     /** 用户主动断开时为 true，阻止自动重连 */
     private intentionalDisconnect;
     /** 是否已有重连循环在跑（避免多次 schedule 叠套） */
     private reconnectRunning;
+    /** Typing Indicator 管理器 */
+    $typingIndicator?: ICQQTypingIndicatorManager;
     get $id(): `${number}`;
     get logger(): import("zhin.js").Logger;
     constructor(adapter: IcqqAdapter, config: IcqqBotConfig);
     $connect(): Promise<void>;
+    /**
+     * 初始化 Typing Indicator
+     * 根据配置自动启用或禁用
+     */
+    private initTypingIndicator;
     /** 建立或恢复与守护进程的 IPC/RPC 会话（订阅、缓存列表） */
     private rebindIpcSession;
     /** IPC/RPC 意外断开时调度重连（指数退避） */
@@ -36,20 +50,50 @@ export declare class IcqqBot implements Bot<IcqqBotConfig, IpcMessageEventData>
     refreshLists(): Promise<void>;
     $disconnect(): Promise<void>;
     private handleEvent;
-    $formatMessage(raw: IpcMessageEventData): Message<IpcMessageEventData>;
+    private dispatchInboundMessage;
+    private handleNoticeEvent;
+    private handleRequestEvent;
+    private handleMetaEvent;
+    /** 调试 IPC 入站字段：默认 debug；设 ICQQ_IPC_LOG_RAW=1 则 info 打完整 payload */
+    private logIpcInboundPayload;
+    $formatMessage(input: NormalizedIcqqInbound | IcqqIpcMessageEvent): ReturnType<typeof Message.from<IcqqIpcMessageEvent>>;
+    /**
+     * 有 source.message_id 时用 get_msg 拉全量正文；否则仅用 source 内联摘要。
+     */
+    private primeQuotedSourceCache;
+    private fetchQuotedMessagePayload;
+    $getMsg(messageId: string): Promise<QuotedMessagePayload>;
     $recallMessage(id: string): Promise<void>;
     $sendMessage(options: SendOptions): Promise<string>;
-}
-export declare namespace IcqqBot {
     /**
-     * 将 CQ 码原始消息字符串解析为 MessageSegment 数组。
-     * 格式: `[type:value]` 或纯文本
+     * 表情符号到 reaction id 的映射
+     * QQ 使用数字 ID 来标识表情，而不是 Unicode 字符
      */
-    function parseCqMessage(raw: string): MessageSegment[];
+    private static readonly EMOJI_MAP;
     /**
-     * 将 SendContent（MessageSegment[] 或字符串）转为 CQ 码字符串。
-     * 守护进程使用 CQ 码字符串格式收发消息。
+     * 将表情符号转换为 reaction id
      */
-    function toCqString(content: SendContent): string;
+    private getEmojiId;
+    /**
+     * 添加消息回应（表情）
+     *
+     * @param messageId - 消息 ID
+    * @param emoji - 表情符号或 reaction id
+     * @returns 反应 ID，可用于后续移除
+     */
+    $addReaction(messageId: string, emoji: string): Promise<string | null>;
+    /**
+     * 移除消息回应
+     *
+     * @param messageId - 消息 ID
+     * @param reactionId - 反应 ID（由 $addReaction 返回）
+     */
+    $removeReaction(messageId: string, reactionId: string): Promise<void>;
+}
+/** @deprecated 使用 `./cq-message.js` 导出 */
+export declare namespace IcqqBot {
+    const parseCqMessage: typeof parseCqMessageImpl;
+    const buildIcqqIpcMessage: typeof buildIcqqIpcMessageImpl;
+    const toCqString: typeof toCqStringImpl;
 }
 //# sourceMappingURL=bot.d.ts.map

package/lib/bot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAiB,GAAG,EAAE,OAAO,EAAE,cAAc,EAAW,WAAW,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACzG,OAAO,KAAK,EACV,aAAa,EAEb,aAAa,EACb,YAAY,EAEb,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAEL,KAAK,mBAAmB,EAEzB,MAAM,eAAe,CAAC;AAEvB,qBAAa,OAAQ,YAAW,GAAG,CAAC,aAAa,EAAE,mBAAmB,CAAC;IAyB5D,OAAO,EAAE,WAAW;IAxB7B,UAAU,UAAS;IACnB,OAAO,EAAE,aAAa,CAAC;IACvB,GAAG,EAAG,SAAS,CAAC;IAEhB,cAAc;IACd,OAAO,6BAAoC;IAC3C,aAAa;IACb,MAAM,4BAAmC;IAEzC,OAAO,CAAC,aAAa,CAAmD;IACxE,2BAA2B;IAC3B,OAAO,CAAC,qBAAqB,CAAS;IACtC,mCAAmC;IACnC,OAAO,CAAC,gBAAgB,CAAS;IAEjC,IAAI,GAAG,gBAEN;IAED,IAAI,MAAM,6BAET;gBAGQ,OAAO,EAAE,WAAW,EAC3B,MAAM,EAAE,aAAa;IAOjB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB/B,sCAAsC;YACxB,gBAAgB;IAiD9B,8BAA8B;IAC9B,OAAO,CAAC,iBAAiB;YAQX,gBAAgB;IA0C9B,iBAAiB;IACX,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB7B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAclC,OAAO,CAAC,WAAW;IAWnB,cAAc,CAAC,GAAG,EAAE,mBAAmB;IAwDjC,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBzC,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;CAgC1D;AAID,yBAAiB,OAAO,CAAC;IACvB;;;OAGG;IACH,SAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,EAAE,CA6D5D;IAED;;;OAGG;IACH,SAAgB,UAAU,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CA+BvD;CACF"}
+{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"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"}