@zhin.js/adapter-icqq 8.0.9 → 8.0.11

package/lib/protocol.d.ts

@@ -1,51 +1,14 @@
-/**
- * IPC 协议类型定义与 Action 常量 (ported from @icqqjs/cli)
- *
- * CLI 与守护进程通过 Unix Domain Socket 通信，
- * 使用 JSON + 换行符（\n）分隔的文本协议。
- *
- * 通信流程（@icqqjs/cli `src/daemon/protocol.ts`）：
- * 1. CLI 连接 Socket → auth（token）
- * 2. 认证通过后发送 IpcRequest → 等待 IpcResponse
- * 3. 认证通过后自动接收 icqq 事件推送（IpcEvent），断开连接自动停止
- *
- * 登录相关：**推送**走 IpcEvent（`system.login.*`）。
- */
 import type { ConversationRef } from '@zhin.js/im-contract';
 import type { MessageSegment } from "zhin.js";
-/** CLI → Daemon 请求 */
-export type IpcRequest = {
-    id: string;
-    action: string;
-    params: Record<string, unknown>;
-};
-/** Daemon → CLI 响应 */
-export type IpcResponse = {
+export type ActionResult = {
     id: string;
     ok: boolean;
     data?: unknown;
     error?: string;
 };
-/**
- * Daemon → CLI 事件推送（icqq client.em 分发的全部事件）
- *
- * 登录/重连时推送 `system.login.*`（如 `system.login.auth` 含 url + device），
- * 语义在 `event` 字段，不在 OneBot 式 `post_type` 里。
- */
-export type IpcEvent = {
-    /** 固定为 `"*"`，客户端应忽略，由本地 handler 按 `event` 过滤 */
-    id: string;
-    /** icqq 事件名，如 `system.login.auth`、`message.group.normal` */
-    event: string;
-    /** icqq 事件 toJSON 后的 plain object */
-    data: unknown;
-};
-export type IpcMessage = IpcResponse | IpcEvent;
-export type { IcqqIpcMessageEvent } from "./icqq-inbound.js";
-/** 从 IPC 入站 payload 解析可用于引用/撤回的消息 ID */
+export type { IcqqMessageEvent } from "./icqq-inbound.js";
 export { resolveIcqqInboundMessageId } from "./icqq-inbound.js";
-/** Guild 消息事件数据 */
-export interface IpcGuildMessageEventData {
+export interface GuildMessageEventData {
     type: "guild";
     guild_id: string;
     guild_name: string;
@@ -58,7 +21,7 @@ export interface IpcGuildMessageEventData {
     seq: number;
 }
 /**
- * 所有 IPC 操作常量 (from @icqqjs/cli)
+ * 所有操作常量（@icqqjs/icqq）
  */
 export declare const Actions: {
     readonly PING: "ping";
@@ -202,22 +165,34 @@ export interface IcqqAdapterConfig {
     readonly id?: string;
     readonly autoReconnect?: boolean;
     readonly outboundMedia?: 'file' | 'base64';
-    readonly rpc?: {
-        readonly host?: string;
-        readonly port?: number;
-        readonly token?: string;
-    };
+    readonly password?: string;
+    readonly platform?: number;
+    readonly ver?: string;
+    readonly dataDir?: string;
+    readonly signApiAddr?: string;
+    readonly ignoreSelf?: boolean;
+    readonly resend?: boolean;
+    readonly cacheGroupMember?: boolean;
+    readonly autoServer?: boolean;
+    readonly qqnt?: boolean;
+    readonly ntLogin?: boolean;
     /** Transitional: legacy root `endpoints[]` with `context: icqq`. */
     readonly endpoints?: ReadonlyArray<{
         readonly context?: string;
         readonly id?: string;
         readonly autoReconnect?: boolean;
         readonly outboundMedia?: 'file' | 'base64';
-        readonly rpc?: {
-            readonly host?: string;
-            readonly port?: number;
-            readonly token?: string;
-        };
+        readonly password?: string;
+        readonly platform?: number;
+        readonly ver?: string;
+        readonly dataDir?: string;
+        readonly signApiAddr?: string;
+        readonly ignoreSelf?: boolean;
+        readonly resend?: boolean;
+        readonly cacheGroupMember?: boolean;
+        readonly autoServer?: boolean;
+        readonly qqnt?: boolean;
+        readonly ntLogin?: boolean;
     }>;
 }
 export interface ResolvedIcqqConfig {
@@ -225,11 +200,17 @@ export interface ResolvedIcqqConfig {
     readonly id: string;
     readonly autoReconnect: boolean;
     readonly outboundMedia?: 'file' | 'base64';
-    readonly rpc?: {
-        readonly host: string;
-        readonly port: number;
-        readonly token: string;
-    };
+    readonly password?: string;
+    readonly platform?: number;
+    readonly ver?: string;
+    readonly dataDir?: string;
+    readonly signApiAddr?: string;
+    readonly ignoreSelf?: boolean;
+    readonly resend?: boolean;
+    readonly cacheGroupMember?: boolean;
+    readonly autoServer?: boolean;
+    readonly qqnt?: boolean;
+    readonly ntLogin?: boolean;
 }
 export interface IcqqWireSegment {
     readonly type: string;
@@ -278,7 +259,7 @@ export declare function icqqInboundConversation(endpointKey: string, input: {
     readonly guildId?: string;
 }): ConversationRef;
 /**
- * 出站：从 ConversationRef 派生 IPC action 路由。
+ * 出站：从 ConversationRef 派生 action 路由。
  * 群容器（parent kind 'group'）内的 private 会话即 ICQQ 群临时会话（temp）。
  */
 export declare function icqqOutboundTarget(conversation: ConversationRef): ParsedIcqqSendTarget;

package/lib/protocol.js

@@ -1,22 +1,8 @@
-/**
- * IPC 协议类型定义与 Action 常量 (ported from @icqqjs/cli)
- *
- * CLI 与守护进程通过 Unix Domain Socket 通信，
- * 使用 JSON + 换行符（\n）分隔的文本协议。
- *
- * 通信流程（@icqqjs/cli `src/daemon/protocol.ts`）：
- * 1. CLI 连接 Socket → auth（token）
- * 2. 认证通过后发送 IpcRequest → 等待 IpcResponse
- * 3. 认证通过后自动接收 icqq 事件推送（IpcEvent），断开连接自动停止
- *
- * 登录相关：**推送**走 IpcEvent（`system.login.*`）。
- */
-import { pickCredential } from '@zhin.js/adapter';
+import { pickCredential } from 'zhin.js/adapter';
 import { resolveCqMediaArg } from "./cq-message.js";
-/** 从 IPC 入站 payload 解析可用于引用/撤回的消息 ID */
 export { resolveIcqqInboundMessageId } from "./icqq-inbound.js";
 /**
- * 所有 IPC 操作常量 (from @icqqjs/cli)
+ * 所有操作常量（@icqqjs/icqq）
  */
 export const Actions = {
     PING: "ping",
@@ -194,16 +180,33 @@ export function resolveIcqqConfig(config = {}) {
     }
     const autoReconnect = config.autoReconnect ?? entry?.autoReconnect ?? true;
     const outboundMedia = config.outboundMedia ?? entry?.outboundMedia;
-    const rpcRaw = config.rpc ?? entry?.rpc;
-    const rpc = rpcRaw?.host && rpcRaw.port != null && rpcRaw.token
-        ? { host: rpcRaw.host, port: Number(rpcRaw.port), token: rpcRaw.token }
-        : undefined;
+    const password = entry?.password;
+    const platform = config.platform ?? entry?.platform ?? 2;
+    const ver = config.ver ?? entry?.ver ?? '9.1.70';
+    const dataDir = config.dataDir ?? entry?.dataDir ?? `data/icqq/${id}`;
+    const signApiAddr = config.signApiAddr ?? entry?.signApiAddr;
+    const ignoreSelf = config.ignoreSelf ?? entry?.ignoreSelf ?? true;
+    const resend = config.resend ?? entry?.resend;
+    const cacheGroupMember = config.cacheGroupMember ?? entry?.cacheGroupMember ?? true;
+    const autoServer = config.autoServer ?? entry?.autoServer ?? true;
+    const qqnt = config.qqnt ?? entry?.qqnt;
+    const ntLogin = config.ntLogin ?? entry?.ntLogin;
     return {
         context: 'icqq',
         id,
         autoReconnect,
         ...(outboundMedia ? { outboundMedia } : {}),
-        ...(rpc ? { rpc } : {}),
+        ...(password ? { password } : {}),
+        ...(platform != null ? { platform: Number(platform) } : {}),
+        ...(ver ? { ver } : {}),
+        ...(dataDir ? { dataDir } : {}),
+        ...(signApiAddr ? { signApiAddr } : {}),
+        ...(ignoreSelf != null ? { ignoreSelf } : {}),
+        ...(resend != null ? { resend } : {}),
+        ...(cacheGroupMember != null ? { cacheGroupMember } : {}),
+        ...(autoServer != null ? { autoServer } : {}),
+        ...(qqnt != null ? { qqnt } : {}),
+        ...(ntLogin != null ? { ntLogin } : {}),
     };
 }
 /**
@@ -231,7 +234,7 @@ export function icqqInboundConversation(endpointKey, input) {
     return { endpoint, kind: input.channelType, id: input.channelId };
 }
 /**
- * 出站：从 ConversationRef 派生 IPC action 路由。
+ * 出站：从 ConversationRef 派生 action 路由。
  * 群容器（parent kind 'group'）内的 private 会话即 ICQQ 群临时会话（temp）。
  */
 export function icqqOutboundTarget(conversation) {

package/lib/types.d.ts

@@ -1,8 +1,3 @@
-/**
- * ICQQ 适配器类型与配置
- *
- * 不再直接依赖 @icqqjs/icqq，通过 @icqqjs/cli 守护进程 IPC 通信。
- */
 export type GroupRole = "owner" | "admin" | "member";
 export interface IcqqSenderInfo {
     id: string;
@@ -14,53 +9,26 @@ export interface IcqqSenderInfo {
     card?: string;
     title?: string;
 }
-/**
- * Endpoint 配置：支持本地 IPC 和远程 RPC 两种连接模式。
- *
- * - 本地模式（默认）：只需 name（QQ号），自动连接 ~/.icqq/<uin>/daemon.sock
- * - 远程模式：额外配置 rpc.host / rpc.port / rpc.token
- */
 export interface IcqqEndpointConfig {
     context: "icqq";
-    /** QQ 号码字符串 */
     name: `${number}`;
-    /** RPC 远程连接配置（不配置则使用本地 IPC） */
-    rpc?: {
-        /** 远程主机地址 */
-        host: string;
-        /** 远程端口 */
-        port: number;
-        /** 认证 token（用于 HMAC-SHA256 挑战-响应，不会明文传输） */
-        token: string;
-    };
-    /**
-     * IPC/RPC 与守护进程连接意外断开时是否自动重连（指数退避，上限约 30s）。
-     * 默认 true；设为 false 则断开后仅将 `$connected` 置为 false，需手动重连。
-     */
     autoReconnect?: boolean;
-    /**
-     * 出站图片/语音/视频：file=本机临时文件路径（需与 icqq 守护进程同机可读）；
-     * base64=经 CQ `base64://` 交给守护进程解码（Zhin 与 icqq 异进程/异机时用，配置 rpc 时默认 base64）。
-     */
     outboundMedia?: "file" | "base64";
 }
-/** IPC 返回的好友信息 */
-export interface IpcFriendInfo {
+export interface FriendInfo {
     user_id: number;
     nickname: string;
     remark?: string;
     class_id?: number;
 }
-/** IPC 返回的群信息 */
-export interface IpcGroupInfo {
+export interface GroupInfo {
     group_id: number;
     group_name: string;
     member_count: number;
     max_member_count: number;
     owner_id?: number;
 }
-/** IPC 返回的群成员信息 */
-export interface IpcMemberInfo {
+export interface MemberInfo {
     user_id: number;
     nickname: string;
     card: string;
@@ -70,11 +38,7 @@ export interface IpcMemberInfo {
     last_sent_time?: number;
     shutup_time?: number;
 }
-/**
- * GET_SYSTEM_MSG 归一后的待处理请求（@icqqjs/cli NormalizedSystemMessage）。
- * friendRequests 与 groupRequests 均为该形状，按 flag 处理。
- */
-export interface IpcSystemMessage {
+export interface SystemMessage {
     type: string;
     user_id?: number;
     nickname?: string;

package/lib/types.js

@@ -1,6 +1 @@
-/**
- * ICQQ 适配器类型与配置
- *
- * 不再直接依赖 @icqqjs/icqq，通过 @icqqjs/cli 守护进程 IPC 通信。
- */
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zhin.js/adapter-icqq",
-  "version": "8.0.9",
-  "description": "Zhin.js ICQQ adapter for Plugin Runtime (IPC daemon client)",
+  "version": "8.0.11",
+  "description": "Zhin.js ICQQ adapter — direct connection to @icqqjs/icqq",
   "type": "module",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -34,25 +34,28 @@
     "directory": "plugins/adapters/icqq"
   },
   "dependencies": {
-    "@zhin.js/adapter": "1.1.8",
-    "@zhin.js/command": "1.0.12",
-    "@zhin.js/core": "1.5.8",
+    "@zhin.js/adapter": "1.1.10",
+    "@zhin.js/core": "1.5.10",
     "@zhin.js/im-contract": "1.0.3",
     "@zhin.js/logger": "1.0.76",
-    "@zhin.js/plugin-runtime": "1.1.6"
+    "@zhin.js/permission": "1.0.2",
+    "@zhin.js/tool": "1.0.11"
   },
   "peerDependencies": {
+    "@icqqjs/icqq": "^1.12.2",
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "1.1.8",
-    "@zhin.js/agent": "1.1.9",
-    "@zhin.js/core": "1.5.8",
-    "@zhin.js/plugin-runtime": "1.1.6",
-    "zhin.js": "6.0.8"
+    "@zhin.js/adapter": "1.1.10",
+    "@zhin.js/agent": "1.1.11",
+    "@zhin.js/core": "1.5.10",
+    "zhin.js": "6.0.10"
   },
   "peerDependenciesMeta": {
     "zhin.js": {
       "optional": true
     },
+    "@icqqjs/icqq": {
+      "optional": true
+    },
     "@zhin.js/agent": {
       "optional": true
     },
@@ -61,12 +64,13 @@
     }
   },
   "devDependencies": {
+    "@icqqjs/icqq": "^1.12.2",
     "@types/node": "^26.1.2",
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.9",
-    "zhin.js": "6.0.8"
+    "@zhin.js/agent": "1.1.11",
+    "zhin.js": "6.0.10"
   },
   "files": [
     "adapters",
@@ -76,6 +80,7 @@
     "src",
     "lib",
     "agent",
+    "tools",
     "README.md",
     "CHANGELOG.md"
   ],
@@ -100,6 +105,10 @@
       {
         "package": "@zhin.js/command",
         "api": "^1.0.0"
+      },
+      {
+        "package": "@zhin.js/tool",
+        "api": "^1.0.0"
       }
     ],
     "plugins": []

package/plugin.js

@@ -1,6 +1,7 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { createEndpointRuntimeState } from '@zhin.js/adapter';
-import { definePlugin } from '@zhin.js/plugin-runtime';
+import { createEndpointRuntimeState } from 'zhin.js/adapter';
+import { definePlugin } from 'zhin.js';
+import { permissionHostToken, createSceneRolePlatformChecker } from '@zhin.js/permission';
 import { icqqRuntimeStateToken } from "./lib/icqq-runtime-state.js";
 // Module-level guard: multiple icqq instances (icqq, icqq-2, …) share this
 // module, but the prompt contributor is per-platform — register it once.
@@ -13,10 +14,13 @@ export default definePlugin({
     setup(context) {
         // 运行中 endpoint 注册表（icqq.endpoint list 的"运行中"数据源）
         context.resources.provide(icqqRuntimeStateToken, createEndpointRuntimeState());
+        const disposePlatform = context.resources.has(permissionHostToken)
+            ? context.resources.use(permissionHostToken).registerPlatform('icqq', createSceneRolePlatformChecker())
+            : undefined;
         // Agent prompt contributor (orchestrator/deferred-worker ICQQ guidance).
         // `zhin.js/agent` is an optional peer — skip silently on IM-only installs.
         if (promptContributorRegistered)
-            return;
+            return disposePlatform;
         let cancelled = false;
         let unregister;
         void Promise.all([
@@ -32,6 +36,7 @@ export default definePlugin({
         return () => {
             cancelled = true;
             unregister?.();
+            disposePlatform?.();
         };
     },
 });

package/schema.json

@@ -4,34 +4,75 @@
   "additionalProperties": false,
   "properties": {
     "master": {
-      "type": [
-        "string",
-        "number"
-      ],
+      "type": ["string", "number"],
       "description": "框架 master QQ uin（/approve、AI/工具权限）；endpoints[i].master 可逐项覆盖"
     },
     "trusted": {
       "type": "array",
-      "items": {
-        "type": [
-          "string",
-          "number"
-        ],
-        "description": "Trusted QQ uin"
-      },
+      "items": { "type": ["string", "number"] },
       "description": "框架 trusted QQ uin 列表（弱于 master）"
     },
+    "password": {
+      "type": "string",
+      "description": "QQ 密码（可选，不填则扫码登录）"
+    },
+    "platform": {
+      "type": "number",
+      "enum": [1, 2, 3, 4, 5, 6, 7],
+      "default": 1,
+      "description": "登录设备平台：1=Android, 2=aPad, 3=Watch, 4=iMac, 5=iPad, 6=Tim, 7=Custom"
+    },
+    "ver": {
+      "type": "string",
+      "description": "协议版本号，仅在对应 platform 有多个版本时有效，不填则使用最新版本"
+    },
+    "signApiAddr": {
+      "type": "string",
+      "description": "签名服务器地址；未配置时若安装了 @icqqjs/qqsign 则自动使用本地签名"
+    },
+    "dataDir": {
+      "type": "string",
+      "description": "数据存储文件夹路径，默认为主模块下的 data 文件夹"
+    },
     "autoReconnect": {
       "type": "boolean",
-      "default": true
+      "default": true,
+      "description": "断线后是否自动重连（默认 true）"
     },
     "outboundMedia": {
       "type": "string",
-      "enum": [
-        "file",
-        "base64"
-      ],
-      "description": "file=local path (same host as daemon); base64=CQ base64:// (default when rpc set)"
+      "enum": ["file", "base64"],
+      "default": "file",
+      "description": "出站媒体模式：file=落盘本地路径（默认）; base64=CQ base64:// 内联"
+    },
+    "ignoreSelf": {
+      "type": "boolean",
+      "default": true,
+      "description": "群聊和频道中是否过滤自己的消息（默认 true）"
+    },
+    "resend": {
+      "type": "boolean",
+      "default": false,
+      "description": "被风控时是否尝试用分片发送（默认 false）"
+    },
+    "cacheGroupMember": {
+      "type": "boolean",
+      "default": true,
+      "description": "是否缓存群员列表（默认 true）；群多时（500+）会多占约 100MB+ 内存"
+    },
+    "autoServer": {
+      "type": "boolean",
+      "default": true,
+      "description": "是否自动选择最优服务器（默认 true）"
+    },
+    "qqnt": {
+      "type": "boolean",
+      "default": true,
+      "description": "是否使用 QQNT 协议（默认 true）"
+    },
+    "ntLogin": {
+      "type": "boolean",
+      "description": "是否使用 NT 登录方式"
     },
     "endpoints": {
       "type": "array",
@@ -40,65 +81,82 @@
         "type": "object",
         "additionalProperties": true,
         "properties": {
+          "id": {
+            "type": "string",
+            "description": "QQ uin"
+          },
           "master": {
-            "type": [
-              "string",
-              "number"
-            ],
-            "description": "本 endpoint 的框架 master QQ uin；覆盖顶层 master"
+            "type": ["string", "number"],
+            "description": "本 endpoint 的 master QQ uin；覆盖顶层 master"
           },
           "trusted": {
             "type": "array",
-            "items": {
-              "type": [
-                "string",
-                "number"
-              ],
-              "description": "Trusted QQ uin"
-            },
+            "items": { "type": ["string", "number"] },
             "description": "本 endpoint 的 trusted 列表"
           },
-          "rpc": {
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-              "host": {
-                "type": "string",
-                "description": "RPC host"
-              },
-              "port": {
-                "type": "number",
-                "description": "RPC port"
-              },
-              "token": {
-                "type": "string",
-                "description": "RPC token"
-              }
-            },
-            "required": [
-              "host",
-              "port",
-              "token"
-            ]
+          "password": {
+            "type": "string",
+            "description": "本 endpoint 的 QQ 密码"
+          },
+          "platform": {
+            "type": "number",
+            "enum": [1, 2, 3, 4, 5, 6, 7],
+            "description": "登录设备平台：1=Android, 2=aPad, 3=Watch, 4=iMac, 5=iPad, 6=Tim, 7=Custom"
           },
-          "id": {
+          "ver": {
+            "type": "string",
+            "description": "协议版本号"
+          },
+          "signApiAddr": {
+            "type": "string",
+            "description": "签名服务器地址"
+          },
+          "dataDir": {
             "type": "string",
-            "description": "QQ uin (must match icqq login account)"
+            "description": "数据存储文件夹路径"
+          },
+          "autoReconnect": {
+            "type": "boolean",
+            "description": "断线后是否自动重连"
+          },
+          "outboundMedia": {
+            "type": "string",
+            "enum": ["file", "base64"],
+            "description": "出站媒体模式"
+          },
+          "ignoreSelf": {
+            "type": "boolean",
+            "description": "是否过滤自己的消息"
+          },
+          "resend": {
+            "type": "boolean",
+            "description": "被风控时是否分片发送"
+          },
+          "cacheGroupMember": {
+            "type": "boolean",
+            "description": "是否缓存群员列表"
+          },
+          "autoServer": {
+            "type": "boolean",
+            "description": "是否自动选择最优服务器"
+          },
+          "qqnt": {
+            "type": "boolean",
+            "description": "是否使用 QQNT 协议"
+          },
+          "ntLogin": {
+            "type": "boolean",
+            "description": "是否使用 NT 登录方式"
           }
         },
-        "required": [
-          "id"
-        ]
+        "required": ["id"]
       }
     },
     "commandPrefix": {
       "type": "string",
       "default": "",
-      "description": "命令前缀（默认 '' 无前缀，任意文本按命令匹配；如 '/' 要求 / 开头）。endpoints[i] 可逐项覆盖"
+      "description": "命令前缀（默认 '' 无前缀）。endpoints[i] 可逐项覆盖"
     }
   },
-  "required": [
-    "master",
-    "endpoints"
-  ]
+  "required": ["master", "endpoints"]
 }