@zhin.js/adapter-icqq 6.0.3 → 7.0.0

package/lib/icqq-inbox.js

@@ -0,0 +1,129 @@
+/** post_type=request / request.* 判定（OneBot 事件壳）。 */
+export function isIcqqRequestPayload(payload) {
+    const postType = payload?.post_type;
+    return typeof postType === 'string'
+        && (postType === 'request' || postType.startsWith('request.'));
+}
+/** post_type=notice / notice.* 判定。 */
+export function isIcqqNoticePayload(payload) {
+    const postType = payload?.post_type;
+    return typeof postType === 'string'
+        && (postType === 'notice' || postType.startsWith('notice.'));
+}
+/**
+ * request 事件载荷 → unified_inbox_request 行。
+ * platform_request_id 取 flag（审批回执句柄），缺省回退 seq；两者皆无则无法审批，丢弃。
+ */
+export function buildIcqqInboxRequestRow(payload, base) {
+    const userId = payload.user_id ?? payload.actor_id;
+    if (userId == null)
+        return null;
+    const flag = asNonEmptyString(payload.flag);
+    const platformRequestId = flag ?? (payload.seq != null ? String(payload.seq) : '');
+    if (!platformRequestId)
+        return null;
+    const requestType = asNonEmptyString(payload.request_type) ?? asNonEmptyString(payload.type);
+    const groupId = payload.group_id;
+    const isGroup = requestType === 'group' || groupId != null;
+    return {
+        adapter: base.adapter,
+        endpoint_id: base.endpointId,
+        platform_request_id: platformRequestId,
+        type: isGroup ? 'group' : (requestType ?? 'friend'),
+        scene_type: isGroup ? 'group' : null,
+        scene_id: String(groupId ?? userId),
+        sub_type: asNonEmptyString(payload.sub_type),
+        actor_id: String(userId),
+        actor_name: asNonEmptyString(payload.nickname),
+        comment: asNonEmptyString(payload.comment),
+        created_at: toMillis(payload.time),
+        resolved: 0,
+        resolved_at: null,
+        consumed: 0,
+        consumed_at: null,
+    };
+}
+/**
+ * notice 事件载荷 → unified_inbox_notice 行。
+ * 事件本身无稳定 id，platform_notice_id 由 time + actor + type 合成（配合去重）。
+ */
+export function buildIcqqInboxNoticeRow(payload, base) {
+    const noticeType = asNonEmptyString(payload.notice_type) ?? asNonEmptyString(payload.type);
+    if (!noticeType)
+        return null;
+    const subType = asNonEmptyString(payload.sub_type);
+    const userId = payload.user_id;
+    const operatorId = payload.operator_id;
+    const groupId = payload.group_id;
+    const createdAt = toMillis(payload.time);
+    const actorId = operatorId ?? userId;
+    const platformNoticeId = asNonEmptyString(payload.notice_id)
+        ?? (payload.seq != null ? String(payload.seq) : undefined)
+        ?? `${createdAt}_${String(actorId ?? '')}_${noticeType}${subType ? `.${subType}` : ''}`;
+    const targetId = userId != null && String(userId) !== String(actorId ?? '') ? userId : undefined;
+    return {
+        adapter: base.adapter,
+        endpoint_id: base.endpointId,
+        platform_notice_id: platformNoticeId,
+        type: noticeType,
+        scene_type: groupId != null ? 'group' : null,
+        scene_id: String(groupId ?? userId ?? operatorId ?? ''),
+        sub_type: subType,
+        actor_id: actorId != null ? String(actorId) : null,
+        actor_name: asNonEmptyString(payload.nickname),
+        target_id: targetId != null ? String(targetId) : null,
+        target_name: null,
+        payload: safeJson(payload),
+        created_at: createdAt,
+        consumed: 0,
+        consumed_at: null,
+    };
+}
+/**
+ * GET_SYSTEM_MSG 返回项 → unified_inbox_request 行（启动时首次拉取）。
+ * friend 列表项 type 语义即好友请求；group 列表项 type 为 add/invite（记 sub_type）。
+ */
+export function buildIcqqSystemRequestRow(message, kind, base) {
+    if (message.user_id == null)
+        return null;
+    const platformRequestId = asNonEmptyString(message.flag)
+        ?? (message.seq != null ? String(message.seq) : '');
+    if (!platformRequestId)
+        return null;
+    return {
+        adapter: base.adapter,
+        endpoint_id: base.endpointId,
+        platform_request_id: platformRequestId,
+        type: kind,
+        scene_type: kind === 'group' ? 'group' : null,
+        scene_id: String(kind === 'group' ? (message.group_id ?? message.user_id) : message.user_id),
+        sub_type: kind === 'group' ? (asNonEmptyString(message.type) ?? null) : null,
+        actor_id: String(message.user_id),
+        actor_name: asNonEmptyString(message.nickname),
+        comment: asNonEmptyString(message.comment),
+        created_at: toMillis(message.time),
+        resolved: 0,
+        resolved_at: null,
+        consumed: 0,
+        consumed_at: null,
+    };
+}
+function asNonEmptyString(value) {
+    if (typeof value !== 'string')
+        return null;
+    const trimmed = value.trim();
+    return trimmed ? trimmed : null;
+}
+/** oicq 事件 time 为秒；缺失时回退当前时间。 */
+function toMillis(time) {
+    const seconds = Number(time);
+    return Number.isFinite(seconds) && seconds > 0 ? seconds * 1000 : Date.now();
+}
+function safeJson(value) {
+    try {
+        return JSON.stringify(value ?? {});
+    }
+    catch {
+        return '{}';
+    }
+}

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 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 { IcqqIpcEndpoint, type CreateIcqqIpc, type IcqqEndpointOptions, type IcqqIpcTransport, } from './endpoint.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';
 export { IpcClient } from './ipc-client.js';

package/lib/types.d.ts

@@ -70,3 +70,18 @@ export interface IpcMemberInfo {
     last_sent_time?: number;
     shutup_time?: number;
 }
+/**
+ * GET_SYSTEM_MSG 归一后的待处理请求（@icqqjs/cli NormalizedSystemMessage）。
+ * friendRequests 与 groupRequests 均为该形状，按 flag 处理。
+ */
+export interface IpcSystemMessage {
+    type: string;
+    user_id?: number;
+    nickname?: string;
+    group_id?: number;
+    group_name?: string;
+    comment?: string;
+    flag?: string;
+    seq?: number;
+    time?: number;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-icqq",
-  "version": "6.0.3",
+  "version": "7.0.0",
   "description": "Zhin.js ICQQ adapter for Plugin Runtime (IPC daemon client)",
   "type": "module",
   "main": "./lib/index.js",
@@ -34,18 +34,18 @@
     "directory": "plugins/adapters/icqq"
   },
   "dependencies": {
-    "@zhin.js/adapter": "1.0.1",
-    "@zhin.js/core": "1.3.5",
+    "@zhin.js/adapter": "1.1.0",
+    "@zhin.js/core": "1.4.0",
     "@zhin.js/logger": "1.0.75",
-    "@zhin.js/plugin-runtime": "1.0.1"
+    "@zhin.js/plugin-runtime": "1.1.0"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "1.0.1",
-    "@zhin.js/agent": "1.0.4",
-    "@zhin.js/core": "1.3.5",
-    "@zhin.js/plugin-runtime": "1.0.1",
-    "zhin.js": "4.1.3"
+    "@zhin.js/adapter": "1.1.0",
+    "@zhin.js/agent": "1.0.5",
+    "@zhin.js/core": "1.4.0",
+    "@zhin.js/plugin-runtime": "1.1.0",
+    "zhin.js": "5.0.0"
   },
   "peerDependenciesMeta": {
     "zhin.js": {
@@ -63,8 +63,8 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.0.4",
-    "zhin.js": "4.1.3"
+    "@zhin.js/agent": "1.0.5",
+    "zhin.js": "5.0.0"
   },
   "files": [
     "adapters",

package/schema.json

@@ -3,33 +3,102 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "name": {
-      "type": "string",
-      "description": "QQ uin (must match icqq login account)"
-    },
     "master": {
-      "type": ["string", "number"],
+      "type": [
+        "string",
+        "number"
+      ],
       "description": "Endpoint Owner QQ uin (for /approve bash and master role)"
     },
+    "trusted": {
+      "type": "array",
+      "items": {
+        "type": [
+          "string",
+          "number"
+        ],
+        "description": "Trusted QQ uin"
+      },
+      "description": "Trusted QQ uin list"
+    },
     "autoReconnect": {
       "type": "boolean",
       "default": true
     },
     "outboundMedia": {
       "type": "string",
-      "enum": ["file", "base64"],
+      "enum": [
+        "file",
+        "base64"
+      ],
       "description": "file=local path (same host as daemon); base64=CQ base64:// (default when rpc set)"
     },
-    "rpc": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "host": { "type": "string" },
-        "port": { "type": "number" },
-        "token": { "type": "string" }
-      },
-      "required": ["host", "port", "token"]
+    "endpoints": {
+      "type": "array",
+      "description": "多账号：一个插件实例挂多个 endpoint。每项与顶层字段同构（name 必填，其余覆盖顶层）",
+      "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)"
+          },
+          "trusted": {
+            "type": "array",
+            "items": {
+              "type": [
+                "string",
+                "number"
+              ],
+              "description": "Trusted QQ uin"
+            },
+            "description": "Trusted QQ uin list"
+          },
+          "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"
+            ]
+          }
+        },
+        "required": [
+          "name"
+        ]
+      }
+    },
+    "commandPrefix": {
+      "type": "string",
+      "default": "",
+      "description": "命令前缀（默认 '' 无前缀，任意文本按命令匹配；如 '/' 要求 / 开头）。endpoints[i] 可逐项覆盖"
     }
   },
-  "required": ["name"]
-}
+  "required": [
+    "master",
+    "endpoints"
+  ]
+}