@zhin.js/adapter-icqq 6.0.2 → 6.0.3

package/lib/{src/protocol.js → protocol.js}

@@ -9,8 +9,9 @@
  * 2. 认证通过后发送 IpcRequest → 等待 IpcResponse
  * 3. 认证通过后自动接收 icqq 事件推送（IpcEvent），断开连接自动停止
  *
- * 登录相关：**推送**走 IpcEvent（`system.login.*`），续传 invoke 见 `login-ipc-contract.ts`。
+ * 登录相关：**推送**走 IpcEvent（`system.login.*`）。
  */
+import { pickCredential } from '@zhin.js/adapter';
 /** 从 IPC 入站 payload 解析可用于引用/撤回的消息 ID */
 export { resolveIcqqInboundMessageId } from "./icqq-inbound.js";
 /**
@@ -184,4 +185,125 @@ export const Actions = {
     SET_NOTIFY: "set_notify",
     GET_NOTIFY: "get_notify",
 };
-//# sourceMappingURL=protocol.js.map
+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 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;
+    return {
+        context: 'icqq',
+        name,
+        autoReconnect,
+        ...(outboundMedia ? { outboundMedia } : {}),
+        ...(rpc ? { rpc } : {}),
+    };
+}
+/** Gateway reply target: `private:uid` / `group:gid` / `temp:gid:uid` / `channel:guild:channel`. */
+export function formatInboundTarget(input) {
+    if (input.channelType === 'private' && input.channelParentGroupId) {
+        return `temp:${input.channelParentGroupId}:${input.channelId}`;
+    }
+    if (input.channelType === 'channel' && input.guildId) {
+        return `channel:${input.guildId}:${input.channelId}`;
+    }
+    return `${input.channelType}:${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}`);
+        return {
+            kind: 'channel',
+            guildId: rest.slice(0, idx),
+            channelId: rest.slice(idx + 1),
+        };
+    }
+    if (trimmed.startsWith('private:')) {
+        return { kind: 'private', userId: Number(trimmed.slice(8)) };
+    }
+    if (trimmed.startsWith('group:')) {
+        return { kind: 'group', groupId: Number(trimmed.slice(6)) };
+    }
+    // Bare numeric id → private (common reply path)
+    if (/^\d+$/.test(trimmed)) {
+        return { kind: 'private', userId: Number(trimmed) };
+    }
+    throw new TypeError(`Invalid icqq send target: ${target}`);
+}
+export function formatOutboundBody(payload) {
+    if (typeof payload === 'string') {
+        const text = payload.trim();
+        return text || '\u200b';
+    }
+    if (payload == null)
+        return '\u200b';
+    if (!Array.isArray(payload)) {
+        // 单个段对象（非数组）按单元素数组处理，杜绝 String(object) → '[object Object]'
+        if (isWireSegment(payload)) {
+            return formatOutboundBody([payload]);
+        }
+        if (typeof payload === 'object' && payload !== null && 'text' in payload) {
+            const text = String(payload.text ?? '').trim();
+            return text || '\u200b';
+        }
+        const text = String(payload).trim();
+        return text || '\u200b';
+    }
+    const joined = payload.map((seg) => {
+        if (typeof seg === 'string')
+            return seg;
+        const item = seg;
+        switch (item.type) {
+            case 'text':
+                return String(item.data?.text ?? '');
+            case 'at':
+            case 'mention':
+                return `[at:${item.data?.qq ?? item.data?.id ?? item.data?.target ?? ''}]`;
+            case 'image':
+                return `[image:${item.data?.file || item.data?.url || base64Media(item.data) || ''}]`;
+            case 'face':
+                return `[face:${item.data?.id ?? ''}]`;
+            case 'reply':
+                return `[reply:${item.data?.message_id ?? item.data?.id ?? ''}]`;
+            case 'record':
+            case 'audio':
+                return `[record:${item.data?.file || item.data?.url || base64Media(item.data) || ''}]`;
+            case 'video':
+                return `[video:${item.data?.file || item.data?.url || base64Media(item.data) || ''}]`;
+            default:
+                return String(item.data?.text ?? '');
+        }
+    }).join('').trim();
+    return joined || '\u200b';
+}
+export function formatInboundContent(rawMessage) {
+    return rawMessage;
+}
+/** base64 媒体回退：CQ `base64://` 由守护进程解码（异机 RPC 场景）。 */
+function base64Media(data) {
+    const b64 = data?.base64;
+    return typeof b64 === 'string' && b64 ? `base64://${b64}` : undefined;
+}
+/** 段对象判定：`{ type: string, data? }`（非数组 payload 的防御入口）。 */
+function isWireSegment(value) {
+    return typeof value === 'object'
+        && value !== null
+        && typeof value.type === 'string';
+}

package/lib/types.d.ts

@@ -0,0 +1,72 @@
+/**
+ * ICQQ 适配器类型与配置
+ *
+ * 不再直接依赖 @icqqjs/icqq，通过 @icqqjs/cli 守护进程 IPC 通信。
+ */
+export type GroupRole = "owner" | "admin" | "member";
+export interface IcqqSenderInfo {
+    id: string;
+    name: string;
+    role?: GroupRole;
+    isOwner?: boolean;
+    isAdmin?: boolean;
+    permissions?: string[];
+    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 {
+    user_id: number;
+    nickname: string;
+    remark?: string;
+    class_id?: number;
+}
+/** IPC 返回的群信息 */
+export interface IpcGroupInfo {
+    group_id: number;
+    group_name: string;
+    member_count: number;
+    max_member_count: number;
+    owner_id?: number;
+}
+/** IPC 返回的群成员信息 */
+export interface IpcMemberInfo {
+    user_id: number;
+    nickname: string;
+    card: string;
+    role: GroupRole;
+    title: string;
+    join_time?: number;
+    last_sent_time?: number;
+    shutup_time?: number;
+}

package/lib/{src/types.js → types.js}

@@ -4,4 +4,3 @@
  * 不再直接依赖 @icqqjs/icqq，通过 @icqqjs/cli 守护进程 IPC 通信。
  */
 export {};
-//# sourceMappingURL=types.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zhin.js/adapter-icqq",
-  "version": "6.0.2",
-  "description": "Zhin.js adapter for ICQQ (QQ Bot)",
+  "version": "6.0.3",
+  "description": "Zhin.js ICQQ adapter for Plugin Runtime (IPC daemon client)",
   "type": "module",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -33,60 +33,49 @@
     "type": "git",
     "directory": "plugins/adapters/icqq"
   },
-  "files": [
-    "src",
-    "lib",
-    "client",
-    "dist",
-    "plugin.yml",
-    "README.md",
-    "CHANGELOG.md",
-    "agent"
-  ],
-  "devDependencies": {
-    "@radix-ui/themes": "^3.2.1",
-    "@types/react": "^19.2.17",
-    "@types/react-dom": "^19.2.3",
-    "lucide-react": "^1.22.0",
-    "radix-ui": "^1.6.2",
-    "typescript": "^6.0.3",
-    "zod": "^4.4.3",
-    "@zhin.js/agent": "1.0.3",
-    "@zhin.js/cli": "1.0.93",
-    "@zhin.js/client": "2.0.5",
-    "@zhin.js/contract": "1.0.3",
-    "@zhin.js/core": "1.3.4",
-    "@zhin.js/host-api": "2.0.5",
-    "@zhin.js/host-router": "2.0.3",
-    "zhin.js": "4.1.2"
+  "dependencies": {
+    "@zhin.js/adapter": "1.0.1",
+    "@zhin.js/core": "1.3.5",
+    "@zhin.js/logger": "1.0.75",
+    "@zhin.js/plugin-runtime": "1.0.1"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/agent": "1.0.3",
-    "@zhin.js/client": "2.0.5",
-    "@zhin.js/host-api": "2.0.5",
-    "@zhin.js/contract": "1.0.3",
-    "@zhin.js/core": "1.3.4",
-    "@zhin.js/host-router": "2.0.3",
-    "zhin.js": "4.1.2"
+    "@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"
   },
   "peerDependenciesMeta": {
-    "@zhin.js/agent": {
-      "optional": true
-    },
-    "@zhin.js/client": {
-      "optional": true
-    },
-    "@zhin.js/host-router": {
+    "zhin.js": {
       "optional": true
     },
-    "@zhin.js/host-api": {
+    "@zhin.js/agent": {
       "optional": true
     },
     "zod": {
       "optional": true
     }
   },
+  "devDependencies": {
+    "@types/node": "^26.1.0",
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.10",
+    "zod": "^4.4.3",
+    "@zhin.js/agent": "1.0.4",
+    "zhin.js": "4.1.3"
+  },
+  "files": [
+    "adapters",
+    "plugin.ts",
+    "schema.json",
+    "src",
+    "lib",
+    "agent",
+    "README.md",
+    "CHANGELOG.md"
+  ],
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -94,8 +83,23 @@
   "engines": {
     "node": "^20.19.0 || >=22.12.0"
   },
+  "zhin": {
+    "protocol": 1,
+    "type": "plugin",
+    "entry": "./plugin.ts",
+    "engine": "^1.0.0",
+    "runtime": "trusted",
+    "features": [
+      {
+        "package": "@zhin.js/adapter",
+        "api": "^1.0.0"
+      }
+    ],
+    "plugins": []
+  },
   "scripts": {
-    "build": "zhin build",
-    "clean": "rimraf lib"
+    "build": "tsc",
+    "clean": "rimraf lib",
+    "test": "NODE_OPTIONS=--experimental-strip-types vitest run --root ../../.. plugins/adapters/icqq/tests"
   }
 }

package/plugin.ts

@@ -0,0 +1,32 @@
+import { definePlugin } from '@zhin.js/plugin-runtime';
+
+// Module-level guard: multiple icqq instances (icqq, icqq-2, …) share this
+// module, but the prompt contributor is per-platform — register it once.
+let promptContributorRegistered = false;
+
+export default definePlugin({
+  name: 'icqq',
+  metadata: {
+    displayName: 'ICQQ Adapter',
+  },
+  setup() {
+    // Agent prompt contributor (orchestrator/deferred-worker ICQQ guidance).
+    // `zhin.js/agent` is an optional peer — skip silently on IM-only installs.
+    if (promptContributorRegistered) return;
+    let cancelled = false;
+    let unregister: (() => void) | undefined;
+    void Promise.all([
+      import('zhin.js/agent'),
+      import('./src/agent-prompt.js'),
+    ]).then(([agent, prompt]) => {
+      if (cancelled || promptContributorRegistered) return;
+      agent.registerAgentPromptContributor(prompt.createIcqqAgentPromptContributor());
+      promptContributorRegistered = true;
+      unregister = () => agent.unregisterAgentPromptContributor('icqq');
+    }).catch(() => { /* optional peer not installed */ });
+    return () => {
+      cancelled = true;
+      unregister?.();
+    };
+  },
+});

package/schema.json

@@ -0,0 +1,35 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "additionalProperties": false,
+  "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)"
+    },
+    "autoReconnect": {
+      "type": "boolean",
+      "default": true
+    },
+    "outboundMedia": {
+      "type": "string",
+      "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"]
+    }
+  },
+  "required": ["name"]
+}