@zhin.js/adapter-icqq 8.0.8 → 8.0.9

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @zhin.js/adapter-icqq
 
+## 8.0.9
+
+### Patch Changes
+
+- Updated dependencies [63253bb]
+- Updated dependencies [6fb24dd]
+- Updated dependencies [d162216]
+- Updated dependencies [7427818]
+- Updated dependencies [90da255]
+- Updated dependencies [8e973dc]
+- Updated dependencies [953cfe1]
+- Updated dependencies [0e73866]
+  - @zhin.js/plugin-runtime@1.1.6
+  - @zhin.js/core@1.5.8
+  - @zhin.js/adapter@1.1.8
+  - @zhin.js/agent@1.1.9
+  - zhin.js@6.0.8
+  - @zhin.js/command@1.0.12
+
 ## 8.0.8
 
 ### Patch Changes

package/lib/cq-message.js

@@ -76,6 +76,9 @@ function pushCqSegment(segments, type, arg) {
         case "reply":
             segments.push({ type: "reply", data: { message_id: arg } });
             break;
+        case "json":
+            segments.push({ type: "json", data: { text: arg } });
+            break;
         default:
             segments.push({ type, data: { text: `[${type}:${arg}]` } });
             break;
@@ -159,6 +162,8 @@ export function toCqString(content) {
             }
             case "reply":
                 return `[reply:${data.message_id ?? data.id}]`;
+            case "json":
+                return `[json:${data.text ?? ''}]`;
             default:
                 return segment.toString(seg);
         }

package/lib/endpoint.js

@@ -32,9 +32,9 @@ export class IcqqIpcEndpoint {
         deleteFriend: (userId) => this.deleteFriend(userId),
     });
     control = Object.freeze({
-        recall: (messageId) => this.recallMessage(messageId),
-        addReaction: (messageId, emoji) => this.addReaction(messageId, emoji),
-        removeReaction: (messageId, reactionId) => this.removeReaction(messageId, reactionId),
+        recall: (message) => this.recallMessage(message.id),
+        addReaction: (message, emoji) => this.addReaction(message.id, emoji),
+        removeReaction: (message, reactionId) => this.removeReaction(message.id, reactionId),
     });
     #open = false;
     #started = false;

package/lib/protocol.js

@@ -300,6 +300,8 @@ export function formatOutboundBody(payload) {
                 const arg = resolveCqMediaArg('video', item.data);
                 return arg ? `[video:${arg}]` : '';
             }
+            case 'share':
+                return formatMusicShareJson(item.data);
             default:
                 return String(item.data?.text ?? '');
         }
@@ -315,3 +317,44 @@ function isWireSegment(value) {
         && value !== null
         && typeof value.type === 'string';
 }
+function formatMusicShareJson(data) {
+    if (!data)
+        return '';
+    const config = data.config;
+    const title = String(data.title ?? '');
+    const desc = String(data.artist ?? '');
+    const jumpUrl = String(data.url ?? '');
+    const musicUrl = String(data.audio ?? '');
+    const preview = String(data.image ?? '');
+    const tag = config?.appid === 100497308 ? 'QQ音乐'
+        : config?.appid === 100495085 ? '网易云音乐'
+            : config?.appid === 100243533 ? '酷我音乐'
+                : config?.appid === 205141 ? '酷狗音乐'
+                    : '音乐';
+    const json = {
+        app: 'com.tencent.structmsg',
+        view: 'music',
+        ver: '0.0.0.1',
+        desc: 'music',
+        prompt: `[分享]${title}`,
+        meta: {
+            music: {
+                action: '',
+                android_pkg_name: config?.package ?? '',
+                app_type: 1,
+                appid: config?.appid ?? 0,
+                ctime: 0,
+                desc,
+                jumpUrl,
+                musicUrl,
+                preview,
+                sourceMsgId: '0',
+                source_icon: config?.icon ?? '',
+                source_url: '',
+                tag,
+                title,
+            },
+        },
+    };
+    return `[json:${JSON.stringify(json)}]`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-icqq",
-  "version": "8.0.8",
+  "version": "8.0.9",
   "description": "Zhin.js ICQQ adapter for Plugin Runtime (IPC daemon client)",
   "type": "module",
   "main": "./lib/index.js",
@@ -34,20 +34,20 @@
     "directory": "plugins/adapters/icqq"
   },
   "dependencies": {
-    "@zhin.js/adapter": "1.1.7",
-    "@zhin.js/command": "1.0.11",
-    "@zhin.js/core": "1.5.7",
+    "@zhin.js/adapter": "1.1.8",
+    "@zhin.js/command": "1.0.12",
+    "@zhin.js/core": "1.5.8",
     "@zhin.js/im-contract": "1.0.3",
     "@zhin.js/logger": "1.0.76",
-    "@zhin.js/plugin-runtime": "1.1.5"
+    "@zhin.js/plugin-runtime": "1.1.6"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "1.1.7",
-    "@zhin.js/agent": "1.1.8",
-    "@zhin.js/core": "1.5.7",
-    "@zhin.js/plugin-runtime": "1.1.5",
-    "zhin.js": "6.0.7"
+    "@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"
   },
   "peerDependenciesMeta": {
     "zhin.js": {
@@ -65,8 +65,8 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.8",
-    "zhin.js": "6.0.7"
+    "@zhin.js/agent": "1.1.9",
+    "zhin.js": "6.0.8"
   },
   "files": [
     "adapters",

package/src/cq-message.ts

@@ -83,6 +83,9 @@ function pushCqSegment(segments: MessageSegment[], type: string, arg: string): v
     case "reply":
       segments.push({ type: "reply", data: { message_id: arg } });
       break;
+    case "json":
+      segments.push({ type: "json", data: { text: arg } });
+      break;
     default:
       segments.push({ type, data: { text: `[${type}:${arg}]` } });
       break;
@@ -167,6 +170,8 @@ export function toCqString(content: SendContent): string {
         }
         case "reply":
           return `[reply:${data.message_id ?? data.id}]`;
+        case "json":
+          return `[json:${data.text ?? ''}]`;
         default:
           return segment.toString(seg);
       }

package/src/endpoint.ts

@@ -8,6 +8,7 @@ import type {
   EndpointSendRequest,
 } from '@zhin.js/adapter';
 import type { MessageGateway } from '@zhin.js/core/runtime';
+import type { MessageRef } from '@zhin.js/im-contract';
 import { formatCompact, getAdapterLogger, truncatePreview } from '@zhin.js/logger';
 import type { CapabilityId } from '@zhin.js/plugin-runtime';
 import { registerIcqqAgentEndpoint } from './icqq-agent-deps.js';
@@ -113,10 +114,10 @@ export class IcqqIpcEndpoint implements EndpointInstance {
     deleteFriend: (userId) => this.deleteFriend(userId),
   });
   readonly control: EndpointControl = Object.freeze({
-    recall: (messageId: string) => this.recallMessage(messageId),
-    addReaction: (messageId: string, emoji: string) => this.addReaction(messageId, emoji),
-    removeReaction: (messageId: string, reactionId: string) =>
-      this.removeReaction(messageId, reactionId),
+    recall: (message: MessageRef) => this.recallMessage(message.id),
+    addReaction: (message: MessageRef, emoji: string) => this.addReaction(message.id, emoji),
+    removeReaction: (message: MessageRef, reactionId: string) =>
+      this.removeReaction(message.id, reactionId),
   });
   #open = false;
   #started = false;

package/src/protocol.ts

@@ -454,6 +454,8 @@ export function formatOutboundBody(payload: unknown): string {
         const arg = resolveCqMediaArg('video', item.data);
         return arg ? `[video:${arg}]` : '';
       }
+      case 'share':
+        return formatMusicShareJson(item.data);
       default:
         return String(item.data?.text ?? '');
     }
@@ -471,3 +473,49 @@ function isWireSegment(value: unknown): value is IcqqWireSegment {
     && value !== null
     && typeof (value as { type?: unknown }).type === 'string';
 }
+
+function formatMusicShareJson(data: Record<string, unknown> | undefined): string {
+  if (!data) return '';
+  const config = data.config as {
+    appid?: number;
+    package?: string;
+    icon?: string;
+    sign?: string;
+  } | undefined;
+  const title = String(data.title ?? '');
+  const desc = String(data.artist ?? '');
+  const jumpUrl = String(data.url ?? '');
+  const musicUrl = String(data.audio ?? '');
+  const preview = String(data.image ?? '');
+  const tag = config?.appid === 100497308 ? 'QQ音乐'
+    : config?.appid === 100495085 ? '网易云音乐'
+    : config?.appid === 100243533 ? '酷我音乐'
+    : config?.appid === 205141 ? '酷狗音乐'
+    : '音乐';
+  const json = {
+    app: 'com.tencent.structmsg',
+    view: 'music',
+    ver: '0.0.0.1',
+    desc: 'music',
+    prompt: `[分享]${title}`,
+    meta: {
+      music: {
+        action: '',
+        android_pkg_name: config?.package ?? '',
+        app_type: 1,
+        appid: config?.appid ?? 0,
+        ctime: 0,
+        desc,
+        jumpUrl,
+        musicUrl,
+        preview,
+        sourceMsgId: '0',
+        source_icon: config?.icon ?? '',
+        source_url: '',
+        tag,
+        title,
+      },
+    },
+  };
+  return `[json:${JSON.stringify(json)}]`;
+}