@zhin.js/adapter-icqq 1.1.0 → 1.1.2

package/src/index.ts

@@ -5,7 +5,7 @@ export {
   icqqInboundConversation,
   icqqOutboundTarget,
   type ActionResult,
-  type IcqqAdapterConfig,
+  type IcqqEndpointConfig,
   type IcqqInboundMessage,
   type IcqqWireSegment,
   type ParsedIcqqSendTarget,

package/src/outbound-media.ts

@@ -2,9 +2,9 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import * as crypto from "node:crypto";
-import { isMediaRef } from "@zhin.js/core";
+import { isMediaRef } from '@zhin.js/im-contract';
 import type { MessageSegment, SendContent } from "zhin.js";
-import type { IcqqEndpointConfig } from "./types.js";
+import type { IcqqEndpointConfig } from "./protocol.js";
 
 export type IcqqOutboundMediaMode = "file" | "base64";
 

package/src/protocol.ts

@@ -1,5 +1,4 @@
-import { pickCredential } from 'zhin.js/adapter';
-import type { MessageElem, Sendable } from '@icqqjs/icqq';
+import type { MessageElem, Sendable, ShareElem } from '@icqqjs/icqq';
 import type { ConversationRef } from '@zhin.js/im-contract';
 import type { MessageSegment } from "zhin.js";
 import { resolveIcqqMediaFile } from "./cq-message.js";
@@ -231,9 +230,9 @@ export const Actions = {
   GET_NOTIFY: "get_notify",
 } as const;
 
-/** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
-export interface IcqqAdapterConfig {
-  readonly id?: string;
+/** One expanded ICQQ endpoint configuration produced by AdapterIndex. */
+export interface IcqqEndpointConfig {
+  readonly id: string;
   readonly autoReconnect?: boolean;
   readonly outboundMedia?: 'file' | 'base64';
   readonly password?: string;
@@ -247,24 +246,6 @@ export interface IcqqAdapterConfig {
   readonly autoServer?: boolean;
   readonly qqnt?: boolean;
   readonly ntLogin?: boolean;
-  /** Transitional: legacy root `endpoints[]` with `context: icqq`. */
-  readonly endpoints?: ReadonlyArray<{
-    readonly context?: string;
-    readonly id?: string;
-    readonly autoReconnect?: boolean;
-    readonly outboundMedia?: 'file' | 'base64';
-    readonly password?: string;
-    readonly platform?: number;
-    readonly ver?: string;
-    readonly dataDir?: string;
-    readonly signApiAddr?: string;
-    readonly ignoreSelf?: boolean;
-    readonly resend?: boolean;
-    readonly cacheGroupMember?: boolean;
-    readonly autoServer?: boolean;
-    readonly qqnt?: boolean;
-    readonly ntLogin?: boolean;
-  }>;
 }
 
 export interface ResolvedIcqqConfig {
@@ -311,27 +292,24 @@ export type ParsedIcqqSendTarget =
   | { readonly kind: 'temp'; readonly groupId: number; readonly userId: number }
   | { readonly kind: 'channel'; readonly guildId: string; readonly channelId: string };
 
-export function resolveIcqqConfig(config: IcqqAdapterConfig = {}): ResolvedIcqqConfig {
-  const entry = config.endpoints?.find((item) => item.context === 'icqq');
-  const id = pickCredential(config.id, entry?.id, process.env.ICQQ_ACCOUNT);
+export function resolveIcqqConfig(config: IcqqEndpointConfig): ResolvedIcqqConfig {
+  const id = typeof config.id === 'string' ? config.id.trim() : '';
   if (!/^\d+$/.test(id)) {
-    throw new TypeError(
-      'ICQQ adapter requires numeric id (QQ uin) via plugins.<key>.id or ICQQ_ACCOUNT',
-    );
+    throw new TypeError('ICQQ endpoint requires a numeric id (QQ uin)');
   }
-  const autoReconnect = config.autoReconnect ?? entry?.autoReconnect ?? true;
-  const outboundMedia = config.outboundMedia ?? entry?.outboundMedia;
-  const password = config.password ?? entry?.password;
-  const platform = config.platform ?? entry?.platform ?? 2;
-  const ver = config.ver ?? entry?.ver ?? '9.1.70';
-  const dataDir = config.dataDir ?? entry?.dataDir ?? `data/icqq/${id}`;
-  const signApiAddr = config.signApiAddr ?? entry?.signApiAddr;
-  const ignoreSelf = config.ignoreSelf ?? entry?.ignoreSelf ?? true;
-  const resend = config.resend ?? entry?.resend;
-  const cacheGroupMember = config.cacheGroupMember ?? entry?.cacheGroupMember ?? true;
-  const autoServer = config.autoServer ?? entry?.autoServer ?? true;
-  const qqnt = config.qqnt ?? entry?.qqnt;
-  const ntLogin = config.ntLogin ?? entry?.ntLogin;
+  const autoReconnect = config.autoReconnect ?? true;
+  const outboundMedia = config.outboundMedia;
+  const password = config.password;
+  const platform = config.platform ?? 2;
+  const ver = config.ver ?? '9.1.70';
+  const dataDir = config.dataDir ?? `data/icqq/${id}`;
+  const signApiAddr = config.signApiAddr;
+  const ignoreSelf = config.ignoreSelf ?? true;
+  const resend = config.resend;
+  const cacheGroupMember = config.cacheGroupMember ?? true;
+  const autoServer = config.autoServer ?? true;
+  const qqnt = config.qqnt;
+  const ntLogin = config.ntLogin;
   return {
     context: 'icqq',
     id,
@@ -411,6 +389,7 @@ const ICQQ_STANDALONE_ELEMENTS = new Set([
   'video',
   'file',
   'json',
+  'share',
   'long_msg',
 ] as const);
 
@@ -497,7 +476,7 @@ export function formatOutboundBody(payload: unknown): Sendable {
         return { type: 'long_msg', resid };
       }
       case 'share':
-        return formatMusicShareJson(item.data);
+        return formatShare(item.data);
       default: {
         const text = item.data?.text;
         if (typeof text === 'string' && text) return text;
@@ -528,48 +507,45 @@ function isWireSegment(value: unknown): value is IcqqWireSegment {
     && typeof (value as { type?: unknown }).type === 'string';
 }
 
-function formatMusicShareJson(data: Record<string, unknown> | undefined): MessageElem {
+function formatShare(data: Record<string, unknown> | undefined): ShareElem {
   if (!data) throw new TypeError('ICQQ share segment requires data');
   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,
-      },
-    },
+  const title = String(data.title ?? '').trim();
+  const url = String(data.url ?? '').trim();
+  if (!title) throw new TypeError('ICQQ share segment requires title');
+  if (!url) throw new TypeError('ICQQ share segment requires url');
+
+  const optionalString = (value: unknown): string | undefined => {
+    const text = String(value ?? '').trim();
+    return text || undefined;
+  };
+  const appid = Number(config?.appid);
+  const appname = optionalString(config?.package);
+  const appsign = optionalString(config?.sign);
+  const shareConfig = Number.isSafeInteger(appid) && appid > 0
+    ? {
+        appid,
+        ...(appname ? { appname } : {}),
+        ...(appsign ? { appsign } : {}),
+      }
+    : undefined;
+  const summary = optionalString(data.artist);
+  const content = optionalString(data.content);
+  const image = optionalString(data.image);
+  const audio = optionalString(data.audio);
+
+  return {
+    type: 'share',
+    title,
+    url,
+    ...(summary ? { summary } : {}),
+    ...(content ? { content } : {}),
+    ...(image ? { image } : {}),
+    ...(audio ? { audio } : {}),
+    ...(shareConfig ? { config: shareConfig } : {}),
   };
-  return { type: 'json', data: json };
 }

package/src/types.ts

@@ -11,13 +11,6 @@ export interface IcqqSenderInfo {
   title?: string;
 }
 
-export interface IcqqEndpointConfig {
-  context: "icqq";
-  name: `${number}`;
-  autoReconnect?: boolean;
-  outboundMedia?: "file" | "base64";
-}
-
 export interface FriendInfo {
   user_id: number;
   nickname: string;

package/commands/endpoint/add/[[id]].ts

@@ -1,3 +0,0 @@
-import { icqqEndpointCommands } from '../../../src/icqq-endpoint-commands.js';
-
-export default icqqEndpointCommands.add;

package/commands/endpoint/list.ts

@@ -1,3 +0,0 @@
-import { icqqEndpointCommands } from '../../src/icqq-endpoint-commands.js';
-
-export default icqqEndpointCommands.list;

package/commands/endpoint/remove/[id].ts

@@ -1,3 +0,0 @@
-import { icqqEndpointCommands } from '../../../src/icqq-endpoint-commands.js';
-
-export default icqqEndpointCommands.remove;

package/lib/icqq-endpoint-commands.d.ts

@@ -1 +0,0 @@
-export declare const icqqEndpointCommands: import("@zhin.js/adapter").EndpointCommands<Readonly<import("@zhin.js/command").CommandDefinition<unknown, unknown, import("@zhin.js/command").CommandMessage, string | undefined>>>;