@zhin.js/adapter-icqq 8.0.2 → 8.0.5

package/lib/icqq-inbox.js

@@ -27,7 +27,7 @@ export function buildIcqqInboxRequestRow(payload, base) {
     const isGroup = requestType === 'group' || groupId != null;
     return {
         adapter: base.adapter,
-        endpoint_id: base.endpointId,
+        endpoint_id: base.endpointKey,
         platform_request_id: platformRequestId,
         type: isGroup ? 'group' : (requestType ?? 'friend'),
         scene_type: isGroup ? 'group' : null,
@@ -63,7 +63,7 @@ export function buildIcqqInboxNoticeRow(payload, base) {
     const targetId = userId != null && String(userId) !== String(actorId ?? '') ? userId : undefined;
     return {
         adapter: base.adapter,
-        endpoint_id: base.endpointId,
+        endpoint_id: base.endpointKey,
         platform_notice_id: platformNoticeId,
         type: noticeType,
         scene_type: groupId != null ? 'group' : null,
@@ -92,7 +92,7 @@ export function buildIcqqSystemRequestRow(message, kind, base) {
         return null;
     return {
         adapter: base.adapter,
-        endpoint_id: base.endpointId,
+        endpoint_id: base.endpointKey,
         platform_request_id: platformRequestId,
         type: kind,
         scene_type: kind === 'group' ? 'group' : null,

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-export { Actions, formatInboundContent, formatInboundTarget, formatOutboundBody, parseSendTarget, resolveIcqqConfig, type IcqqAdapterConfig, type IcqqInboundMessage, type IcqqWireSegment, type IpcEvent, type IpcMessage, type IpcRequest, type IpcResponse, type ParsedIcqqSendTarget, type ResolvedIcqqConfig, } from './protocol.js';
+export { Actions, formatInboundContent, formatOutboundBody, icqqInboundConversation, icqqOutboundTarget, resolveIcqqConfig, type IcqqAdapterConfig, type IcqqInboundMessage, type IcqqWireSegment, type IpcEvent, type IpcMessage, type IpcRequest, type IpcResponse, type ParsedIcqqSendTarget, type ResolvedIcqqConfig, } from './protocol.js';
 export { IcqqIpcEndpoint, type CreateIcqqIpc, type IcqqEndpointOptions, type IcqqInboxHooks, type IcqqIpcTransport, } from './endpoint.js';
 export * from './types.js';
 export { getIcqqAgentDeps, registerIcqqAgentEndpoint, setIcqqAgentDeps, type IcqqAgentDeps, type IcqqAgentEndpoint, } from './icqq-agent-deps.js';

package/lib/index.js

@@ -1,4 +1,4 @@
-export { Actions, formatInboundContent, formatInboundTarget, formatOutboundBody, parseSendTarget, resolveIcqqConfig, } from './protocol.js';
+export { Actions, formatInboundContent, formatOutboundBody, icqqInboundConversation, icqqOutboundTarget, resolveIcqqConfig, } from './protocol.js';
 export { IcqqIpcEndpoint, } from './endpoint.js';
 export * from './types.js';
 export { getIcqqAgentDeps, registerIcqqAgentEndpoint, setIcqqAgentDeps, } from './icqq-agent-deps.js';

package/lib/ipc-client.d.ts

@@ -61,7 +61,7 @@ export declare class IpcClient {
      */
     request(action: string, params?: Record<string, unknown>, timeoutMs?: number): Promise<IpcResponse>;
     /**
-     * @deprecated 兼容旧调用方式：服务端已自动推送事件，type/id 过滤在客户端完成。
+     * 订阅 daemon 推送事件：服务端自动推送全部事件，type/id 过滤在客户端完成。
      * @returns 订阅句柄，包含 unsubscribe() 方法
      */
     subscribe(_action: string, params: Record<string, unknown>, onEvent: (event: IpcEvent) => void): {

package/lib/ipc-client.js

@@ -310,7 +310,7 @@ export class IpcClient {
         });
     }
     /**
-     * @deprecated 兼容旧调用方式：服务端已自动推送事件，type/id 过滤在客户端完成。
+     * 订阅 daemon 推送事件：服务端自动推送全部事件，type/id 过滤在客户端完成。
      * @returns 订阅句柄，包含 unsubscribe() 方法
      */
     subscribe(_action, params, onEvent) {

package/lib/protocol.d.ts

@@ -11,6 +11,7 @@
  *
  * 登录相关：**推送**走 IpcEvent（`system.login.*`）。
  */
+import type { ConversationRef } from '@zhin.js/im-contract';
 import type { MessageSegment } from "zhin.js";
 /** CLI → Daemon 请求 */
 export type IpcRequest = {
@@ -198,7 +199,7 @@ export declare const Actions: {
 };
 /** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
 export interface IcqqAdapterConfig {
-    readonly name?: string;
+    readonly id?: string;
     readonly autoReconnect?: boolean;
     readonly outboundMedia?: 'file' | 'base64';
     readonly rpc?: {
@@ -209,7 +210,7 @@ export interface IcqqAdapterConfig {
     /** Transitional: legacy root `endpoints[]` with `context: icqq`. */
     readonly endpoints?: ReadonlyArray<{
         readonly context?: string;
-        readonly name?: string;
+        readonly id?: string;
         readonly autoReconnect?: boolean;
         readonly outboundMedia?: 'file' | 'base64';
         readonly rpc?: {
@@ -221,7 +222,7 @@ export interface IcqqAdapterConfig {
 }
 export interface ResolvedIcqqConfig {
     readonly context: 'icqq';
-    readonly name: string;
+    readonly id: string;
     readonly autoReconnect: boolean;
     readonly outboundMedia?: 'file' | 'base64';
     readonly rpc?: {
@@ -236,14 +237,17 @@ export interface IcqqWireSegment {
 }
 export interface IcqqInboundMessage {
     readonly id: string;
-    readonly target: string;
+    readonly conversation: ConversationRef;
     readonly content: string;
     /**
      * 结构化段视图（canonical Segment，经 toCanonicalSegments 归一）。
      * 与 content（CQ 原文纯文本视图）同源，随 gateway.receive 上送。
      */
     readonly segments?: readonly MessageSegment[];
-    readonly sender: string;
+    readonly sender: {
+        readonly id: string;
+        readonly name?: string;
+    };
     readonly channelType: 'private' | 'group' | 'channel';
     readonly metadata?: Record<string, unknown>;
 }
@@ -263,13 +267,20 @@ export type ParsedIcqqSendTarget = {
     readonly channelId: string;
 };
 export declare function resolveIcqqConfig(config?: IcqqAdapterConfig): ResolvedIcqqConfig;
-/** Gateway reply target: `private:uid` / `group:gid` / `temp:gid:uid` / `channel:guild:channel`. */
-export declare function formatInboundTarget(input: {
+/**
+ * 入站归一化 → ConversationRef：群临时会话（temp）映射为群容器内的 private
+ * 会话（parent kind 'group'）；频道消息的所属 guild 进 `parent`（kind 'channel'）。
+ */
+export declare function icqqInboundConversation(endpointKey: string, input: {
     readonly channelType: 'private' | 'group' | 'channel';
     readonly channelId: string;
     readonly channelParentGroupId?: string;
     readonly guildId?: string;
-}): string;
-export declare function parseSendTarget(target: string): ParsedIcqqSendTarget;
+}): ConversationRef;
+/**
+ * 出站：从 ConversationRef 派生 IPC action 路由。
+ * 群容器（parent kind 'group'）内的 private 会话即 ICQQ 群临时会话（temp）。
+ */
+export declare function icqqOutboundTarget(conversation: ConversationRef): ParsedIcqqSendTarget;
 export declare function formatOutboundBody(payload: unknown): string;
 export declare function formatInboundContent(rawMessage: string): string;

package/lib/protocol.js

@@ -188,9 +188,9 @@ export const Actions = {
 };
 export function resolveIcqqConfig(config = {}) {
     const entry = config.endpoints?.find((item) => item.context === 'icqq');
-    const name = pickCredential(config.name, entry?.name, process.env.ICQQ_ACCOUNT);
-    if (!/^\d+$/.test(name)) {
-        throw new TypeError('ICQQ adapter requires numeric name (QQ uin) via plugins.<key>.name or ICQQ_ACCOUNT');
+    const id = pickCredential(config.id, entry?.id, process.env.ICQQ_ACCOUNT);
+    if (!/^\d+$/.test(id)) {
+        throw new TypeError('ICQQ adapter requires numeric id (QQ uin) via plugins.<key>.id or ICQQ_ACCOUNT');
     }
     const autoReconnect = config.autoReconnect ?? entry?.autoReconnect ?? true;
     const outboundMedia = config.outboundMedia ?? entry?.outboundMedia;
@@ -200,53 +200,59 @@ export function resolveIcqqConfig(config = {}) {
         : undefined;
     return {
         context: 'icqq',
-        name,
+        id,
         autoReconnect,
         ...(outboundMedia ? { outboundMedia } : {}),
         ...(rpc ? { rpc } : {}),
     };
 }
-/** Gateway reply target: `private:uid` / `group:gid` / `temp:gid:uid` / `channel:guild:channel`. */
-export function formatInboundTarget(input) {
+/**
+ * 入站归一化 → ConversationRef：群临时会话（temp）映射为群容器内的 private
+ * 会话（parent kind 'group'）；频道消息的所属 guild 进 `parent`（kind 'channel'）。
+ */
+export function icqqInboundConversation(endpointKey, input) {
+    const endpoint = { id: endpointKey, adapter: endpointKey.split('\0')[0] ?? endpointKey };
     if (input.channelType === 'private' && input.channelParentGroupId) {
-        return `temp:${input.channelParentGroupId}:${input.channelId}`;
+        return {
+            endpoint,
+            kind: 'private',
+            id: input.channelId,
+            parent: { kind: 'group', id: input.channelParentGroupId },
+        };
     }
     if (input.channelType === 'channel' && input.guildId) {
-        return `channel:${input.guildId}:${input.channelId}`;
+        return {
+            endpoint,
+            kind: 'channel',
+            id: input.channelId,
+            parent: { kind: 'channel', id: input.guildId },
+        };
     }
-    return `${input.channelType}:${input.channelId}`;
+    return { endpoint, kind: input.channelType, id: input.channelId };
 }
-export function parseSendTarget(target) {
-    const trimmed = target.trim();
-    if (trimmed.startsWith('temp:')) {
-        const rest = trimmed.slice(5);
-        const [groupId, userId] = rest.split(':');
-        if (!groupId || !userId)
-            throw new TypeError(`Invalid icqq temp target: ${target}`);
-        return { kind: 'temp', groupId: Number(groupId), userId: Number(userId) };
-    }
-    if (trimmed.startsWith('channel:')) {
-        const rest = trimmed.slice(8);
-        const idx = rest.indexOf(':');
-        if (idx <= 0)
-            throw new TypeError(`Invalid icqq channel target: ${target}`);
+/**
+ * 出站：从 ConversationRef 派生 IPC action 路由。
+ * 群容器（parent kind 'group'）内的 private 会话即 ICQQ 群临时会话（temp）。
+ */
+export function icqqOutboundTarget(conversation) {
+    if (conversation.kind === 'private' && conversation.parent?.kind === 'group') {
         return {
-            kind: 'channel',
-            guildId: rest.slice(0, idx),
-            channelId: rest.slice(idx + 1),
+            kind: 'temp',
+            groupId: Number(conversation.parent.id),
+            userId: Number(conversation.id),
         };
     }
-    if (trimmed.startsWith('private:')) {
-        return { kind: 'private', userId: Number(trimmed.slice(8)) };
+    if (conversation.kind === 'private') {
+        return { kind: 'private', userId: Number(conversation.id) };
     }
-    if (trimmed.startsWith('group:')) {
-        return { kind: 'group', groupId: Number(trimmed.slice(6)) };
+    if (conversation.kind === 'group') {
+        return { kind: 'group', groupId: Number(conversation.id) };
     }
-    // Bare numeric id → private (common reply path)
-    if (/^\d+$/.test(trimmed)) {
-        return { kind: 'private', userId: Number(trimmed) };
+    const guildId = conversation.parent?.kind === 'channel' ? conversation.parent.id : undefined;
+    if (!guildId) {
+        throw new TypeError(`Invalid icqq channel conversation (missing guild parent): ${conversation.id}`);
     }
-    throw new TypeError(`Invalid icqq send target: ${target}`);
+    return { kind: 'channel', guildId, channelId: conversation.id };
 }
 export function formatOutboundBody(payload) {
     if (typeof payload === 'string') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-icqq",
-  "version": "8.0.2",
+  "version": "8.0.5",
   "description": "Zhin.js ICQQ adapter for Plugin Runtime (IPC daemon client)",
   "type": "module",
   "main": "./lib/index.js",
@@ -34,19 +34,20 @@
     "directory": "plugins/adapters/icqq"
   },
   "dependencies": {
-    "@zhin.js/adapter": "1.1.4",
-    "@zhin.js/command": "1.0.6",
-    "@zhin.js/core": "1.5.1",
-    "@zhin.js/logger": "1.0.75",
-    "@zhin.js/plugin-runtime": "1.1.2"
+    "@zhin.js/adapter": "1.1.7",
+    "@zhin.js/command": "1.0.9",
+    "@zhin.js/core": "1.5.4",
+    "@zhin.js/im-contract": "1.0.3",
+    "@zhin.js/logger": "1.0.76",
+    "@zhin.js/plugin-runtime": "1.1.5"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "1.1.4",
-    "@zhin.js/agent": "1.1.2",
-    "@zhin.js/core": "1.5.1",
-    "@zhin.js/plugin-runtime": "1.1.2",
-    "zhin.js": "6.0.1"
+    "@zhin.js/adapter": "1.1.7",
+    "@zhin.js/agent": "1.1.5",
+    "@zhin.js/core": "1.5.4",
+    "@zhin.js/plugin-runtime": "1.1.5",
+    "zhin.js": "6.0.4"
   },
   "peerDependenciesMeta": {
     "zhin.js": {
@@ -64,8 +65,8 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.2",
-    "zhin.js": "6.0.1"
+    "@zhin.js/agent": "1.1.5",
+    "zhin.js": "6.0.4"
   },
   "files": [
     "adapters",

package/schema.json

@@ -8,7 +8,7 @@
         "string",
         "number"
       ],
-      "description": "Endpoint Owner QQ uin (for /approve bash and master role)"
+      "description": "框架 master QQ uin（/approve、AI/工具权限）；endpoints[i].master 可逐项覆盖"
     },
     "trusted": {
       "type": "array",
@@ -19,7 +19,7 @@
         ],
         "description": "Trusted QQ uin"
       },
-      "description": "Trusted QQ uin list"
+      "description": "框架 trusted QQ uin 列表（弱于 master）"
     },
     "autoReconnect": {
       "type": "boolean",
@@ -35,21 +35,17 @@
     },
     "endpoints": {
       "type": "array",
-      "description": "多账号：一个插件实例挂多个 endpoint。每项与顶层字段同构（name 必填，其余覆盖顶层）",
+      "description": "多账号：一个插件实例挂多个 endpoint。每项与顶层字段同构（id 必填，其余覆盖顶层）",
       "items": {
         "type": "object",
         "additionalProperties": true,
         "properties": {
-          "name": {
-            "type": "string",
-            "description": "QQ uin (must match icqq login account)"
-          },
           "master": {
             "type": [
               "string",
               "number"
             ],
-            "description": "Endpoint Owner QQ uin (for /approve bash and master role)"
+            "description": "本 endpoint 的框架 master QQ uin；覆盖顶层 master"
           },
           "trusted": {
             "type": "array",
@@ -60,7 +56,7 @@
               ],
               "description": "Trusted QQ uin"
             },
-            "description": "Trusted QQ uin list"
+            "description": "本 endpoint 的 trusted 列表"
           },
           "rpc": {
             "type": "object",
@@ -84,10 +80,14 @@
               "port",
               "token"
             ]
+          },
+          "id": {
+            "type": "string",
+            "description": "QQ uin (must match icqq login account)"
           }
         },
         "required": [
-          "name"
+          "id"
         ]
       }
     },
@@ -101,4 +101,4 @@
     "master",
     "endpoints"
   ]
-}
+}