@zhin.js/adapter-icqq 1.1.13 → 1.1.14

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @zhin.js/adapter-icqq
 
+## 1.1.14
+
+### Patch Changes
+
+- 860faa0: Group and private share cards are now confirmed with a real message id: ICQQ's share API returns none, so after an accepted share the adapter reads the conversation history for the bot's own newest card (once more after a short wait). When it cannot be found the delivery stays unconfirmed as before; no id is invented.
+- Updated dependencies [974fa85]
+- Updated dependencies [1e9b3d6]
+  - @zhin.js/core@1.1.49
+
 ## 1.1.13
 
 ### Patch Changes

package/README.md

@@ -184,7 +184,7 @@ MIT
 
 发送成功回执只接受平台真实消息 ID。网络超时、断线、缺少消息 ID 的响应会报告 `deliveryUnknown`，框架不会自动重发；手动重发可能重复发送。
 
-ICQQ 原生分享和文件 API 可能已经成功，但只返回空值或文件 ID；这类结果不能当作可引用、可撤回的消息 ID，因此报告投递结果未知。平台操作仍只执行一次。文件撤回应使用平台专用文件 API。
+ICQQ 原生分享和文件 API 可能已经成功，但只返回空值或文件 ID；这类结果不能当作可引用、可撤回的消息 ID。群聊和私聊的分享卡片发出后，适配器会读一次会话记录，找到机器人自己刚发出的卡片消息，用它的真实消息 ID 作为回执（记录有延迟时半秒后再读一次）。找不到时（以及临时会话、频道和文件）仍报告投递结果未知，不编造 ID。平台操作仍只执行一次。文件撤回应使用平台专用文件 API。
 
 ### 独立元素按顺序拆分发送
 

package/lib/endpoint.js

@@ -331,15 +331,42 @@ export class IcqqEndpoint extends Endpoint {
             prepared.dispose();
         }
     }
+    /**
+     * ICQQ's share API returns no message id; a resolved call only means the server accepted it.
+     * The card is the bot's own newest card message in the conversation history, so read the id
+     * from there (once more after a short wait, history can lag). Undefined keeps the delivery
+     * unconfirmed rather than inventing an id.
+     */
+    async #findOwnCard(history, sentAt) {
+        const self = Number(this.client.uin);
+        for (const wait of [0, 500]) {
+            if (wait)
+                await new Promise(resolve => setTimeout(resolve, wait));
+            // A missing or throwing history API must not turn an accepted share into a send failure.
+            const messages = await Promise.resolve().then(history).catch(() => []);
+            const card = [...messages].reverse().find(item => Number(item.sender?.user_id ?? item.user_id) === self
+                && (item.time ?? 0) >= sentAt - 2
+                && (item.message ?? []).some(element => element.type === 'json' || element.type === 'xml' || element.type === 'share'));
+            if (card && card.message_id != null && String(card.message_id).trim())
+                return String(card.message_id);
+        }
+        return undefined;
+    }
     async #sendNative(target, message) {
         if (isIcqqShareElement(message)) {
             switch (target.kind) {
-                case 'private':
-                    await this.client.pickFriend(target.userId).share(message);
-                    return {};
-                case 'group':
-                    await this.client.pickGroup(target.groupId).share(message);
-                    return {};
+                case 'private': {
+                    const sentAt = Math.floor(Date.now() / 1000);
+                    const friend = this.client.pickFriend(target.userId);
+                    await friend.share(message);
+                    return { message_id: await this.#findOwnCard(() => friend.getChatHistory(), sentAt) };
+                }
+                case 'group': {
+                    const sentAt = Math.floor(Date.now() / 1000);
+                    const group = this.client.pickGroup(target.groupId);
+                    await group.share(message);
+                    return { message_id: await this.#findOwnCard(() => group.getChatHistory(), sentAt) };
+                }
                 case 'temp':
                     await this.client.pickMember(target.groupId, target.userId).share(message);
                     return {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-icqq",
-  "version": "1.1.13",
+  "version": "1.1.14",
   "description": "Zhin.js ICQQ adapter — direct connection to @icqqjs/icqq",
   "type": "module",
   "main": "./lib/index.js",
@@ -35,7 +35,7 @@
   "dependencies": {
     "@zhin.js/adapter": "1.1.21",
     "@zhin.js/agent-feature": "1.1.8",
-    "@zhin.js/core": "1.1.48",
+    "@zhin.js/core": "1.1.49",
     "@zhin.js/feature-kit": "1.1.7",
     "@zhin.js/im-contract": "1.1.5",
     "@zhin.js/logger": "1.1.2",
@@ -48,9 +48,9 @@
     "zod": "^4.0.0",
     "@zhin.js/adapter": "^1.1.21",
     "@zhin.js/command": "^1.1.9",
-    "@zhin.js/core": "^1.1.48",
+    "@zhin.js/core": "^1.1.49",
     "@zhin.js/prompt-section": "^1.1.7",
-    "zhin.js": "^1.1.13"
+    "zhin.js": "^1.1.14"
   },
   "peerDependenciesMeta": {
     "@icqqjs/icqq": {
@@ -76,7 +76,7 @@
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
     "@zhin.js/prompt-section": "1.1.7",
-    "zhin.js": "1.1.13"
+    "zhin.js": "1.1.14"
   },
   "files": [
     "adapters",

package/src/endpoint.ts

@@ -389,18 +389,47 @@ export class IcqqEndpoint extends Endpoint<Client> {
     }
   }
 
+  /**
+   * ICQQ's share API returns no message id; a resolved call only means the server accepted it.
+   * The card is the bot's own newest card message in the conversation history, so read the id
+   * from there (once more after a short wait, history can lag). Undefined keeps the delivery
+   * unconfirmed rather than inventing an id.
+   */
+  async #findOwnCard(
+    history: () => Promise<readonly { message_id?: unknown; time?: number; message?: readonly { type?: string }[]; sender?: { user_id?: number }; user_id?: number }[]>,
+    sentAt: number,
+  ): Promise<string | undefined> {
+    const self = Number(this.client.uin);
+    for (const wait of [0, 500]) {
+      if (wait) await new Promise(resolve => setTimeout(resolve, wait));
+      // A missing or throwing history API must not turn an accepted share into a send failure.
+      const messages = await Promise.resolve().then(history).catch(() => []);
+      const card = [...messages].reverse().find(item => Number(item.sender?.user_id ?? item.user_id) === self
+        && (item.time ?? 0) >= sentAt - 2
+        && (item.message ?? []).some(element => element.type === 'json' || element.type === 'xml' || element.type === 'share'));
+      if (card && card.message_id != null && String(card.message_id).trim()) return String(card.message_id);
+    }
+    return undefined;
+  }
+
   async #sendNative(
     target: ReturnType<typeof icqqOutboundTarget>,
     message: Sendable,
   ): Promise<{ message_id?: unknown }> {
     if (isIcqqShareElement(message)) {
       switch (target.kind) {
-        case 'private':
-          await this.client.pickFriend(target.userId).share(message);
-          return {};
-        case 'group':
-          await this.client.pickGroup(target.groupId).share(message);
-          return {};
+        case 'private': {
+          const sentAt = Math.floor(Date.now() / 1000);
+          const friend = this.client.pickFriend(target.userId);
+          await friend.share(message);
+          return { message_id: await this.#findOwnCard(() => friend.getChatHistory(), sentAt) };
+        }
+        case 'group': {
+          const sentAt = Math.floor(Date.now() / 1000);
+          const group = this.client.pickGroup(target.groupId);
+          await group.share(message);
+          return { message_id: await this.#findOwnCard(() => group.getChatHistory(), sentAt) };
+        }
         case 'temp':
           await this.client.pickMember(target.groupId, target.userId).share(message);
           return {};