@zhin.js/adapter-icqq 1.1.0 → 1.1.3

package/src/endpoint.ts

@@ -5,29 +5,25 @@ import {
   type FileElem,
   type PttElem,
   type Sendable,
+  type ShareElem,
   type VideoElem,
 } from '@icqqjs/icqq';
 import { inspect } from 'node:util';
 import { AsyncLocalStorage } from 'node:async_hooks';
-import { Endpoint } from 'zhin.js/adapter';
-import type {
-  EndpointControl,
-  EndpointManagement,
-  EndpointPendingRequest,
-  EndpointSendRequest,
+import {
+  Endpoint,
+  type EndpointControl,
+  type EndpointManagement,
+  type EndpointPendingRequest,
+  type EndpointSendRequest,
 } from 'zhin.js/adapter';
-import type { EndpointContentPort, EndpointContentResolveContext } from '@zhin.js/adapter';
+import type { EndpointContentPort } from '@zhin.js/adapter';
 import { receiveOneBotLikeSideEvent, SystemEvent, toCanonicalSegments, type LoginAssist } from '@zhin.js/core';
-import type {
-  ConversationMessage,
-  ConversationReference,
-  ForwardEntry,
-  MessageRef,
-  Segment,
-} from '@zhin.js/im-contract';
+import type { MessageRef } from '@zhin.js/im-contract';
 import { formatCompact, getAdapterLogger, truncatePreview } from '@zhin.js/logger';
 import type { CapabilityId } from 'zhin.js';
 import { runIcqqLoginAssistStep } from './icqq-login-assist.js';
+import { IcqqContentResolver } from './content-resolver.js';
 import {
   InboundMessageDeduper,
   findIcqqNestedMessageSource,
@@ -61,7 +57,6 @@ import {
   type ResolvedIcqqConfig,
 } from './protocol.js';
 import type { SystemMessage as IcqqSystemMessage } from './types.js';
-import { normalizeForwardMsgResponse } from './forward-msg.js';
 
 export interface IcqqEndpointOptions {
   readonly id: CapabilityId;
@@ -115,87 +110,8 @@ export class IcqqEndpoint extends Endpoint<Client> {
   #heldInbound: IcqqInboundMessage[] = [];
   readonly #inflightInbound = new Set<Promise<void>>();
   readonly #inboundOwner = new AsyncLocalStorage<symbol>();
-  readonly #messageContent = new Map<string, ConversationMessage>();
-
-  readonly content: EndpointContentPort = Object.freeze({
-    resolve: async (reference: ConversationReference, context: EndpointContentResolveContext) => {
-      context.signal.throwIfAborted();
-      if (reference.kind === 'message') {
-        const cached = this.#messageContent.get(reference.message.id);
-        return cached
-          ? Object.freeze({ status: 'resolved' as const, reference, value: cached })
-          : Object.freeze({ status: 'not_found' as const, code: 'icqq_message_not_observed' });
-      }
-      if (reference.kind === 'forward') {
-        try {
-          const entries = await this.#resolveForwardEntries(
-            reference.forwardId,
-            context,
-            { remainingEntries: context.maxEntries, path: new Set<string>() },
-            0,
-          );
-          if (entries.length === 0) return Object.freeze({ status: 'not_found' as const, code: 'icqq_forward_not_found' });
-          return Object.freeze({ status: 'resolved' as const, reference, value: Object.freeze(entries) });
-        } catch (error) {
-          if (context.signal.aborted) throw error;
-          return Object.freeze({
-            status: 'failed' as const,
-            code: 'icqq_forward_fetch_failed',
-            message: error instanceof Error ? error.message : String(error),
-          });
-        }
-      }
-      if (reference.media.kind === 'url' || reference.media.kind === 'base64' || reference.media.kind === 'path') {
-        return Object.freeze({ status: 'resolved' as const, reference, value: reference.media });
-      }
-      return Object.freeze({ status: 'unsupported' as const, code: 'icqq_media_reference_unsupported' });
-    },
-  });
-
-  async #resolveForwardEntries(
-    forwardId: string,
-    context: EndpointContentResolveContext,
-    state: { remainingEntries: number; readonly path: Set<string> },
-    depth: number,
-  ): Promise<readonly ForwardEntry[]> {
-    context.signal.throwIfAborted();
-    if (state.remainingEntries <= 0 || state.path.has(forwardId)) return Object.freeze([]);
-    state.path.add(forwardId);
-    try {
-      // ICQQ does not expose a cancellable getForwardMsg API. Keep the caller's
-      // generation lease until the native operation actually settles, then honor
-      // cancellation before publishing any resolved content.
-      const raw = await this.client.getForwardMsg(forwardId);
-      context.signal.throwIfAborted();
-      const entries = normalizeForwardMsgResponse(raw).slice(0, state.remainingEntries);
-      state.remainingEntries -= entries.length;
-      const expanded: ForwardEntry[] = [];
-      for (const entry of entries) {
-        context.signal.throwIfAborted();
-        const segments: Segment[] = [];
-        for (const segment of entry.segments) {
-          if (segment.type !== 'forward' || depth >= context.maxDepth) {
-            segments.push(segment);
-            continue;
-          }
-          const nestedId = String((segment.data as { forward_id?: unknown }).forward_id ?? '').trim();
-          if (!nestedId || state.path.has(nestedId) || state.remainingEntries <= 0) {
-            segments.push(segment);
-            continue;
-          }
-          const nested = await this.#resolveForwardEntries(nestedId, context, state, depth + 1);
-          segments.push(Object.freeze({
-            ...segment,
-            data: Object.freeze({ ...segment.data, ...(nested.length > 0 ? { entries: nested } : {}) }),
-          }));
-        }
-        expanded.push(Object.freeze({ ...entry, segments: Object.freeze(segments) }));
-      }
-      return Object.freeze(expanded);
-    } finally {
-      state.path.delete(forwardId);
-    }
-  }
+  readonly #contentResolver: IcqqContentResolver;
+  readonly content: EndpointContentPort;
 
   readonly management: EndpointManagement = Object.freeze<EndpointManagement>({
     listFriends: async () =>
@@ -275,6 +191,8 @@ export class IcqqEndpoint extends Endpoint<Client> {
     super();
     const nativeConfig = resolveNativeClientConfig(options.config);
     this.client = new ManagedIcqqClient(Number(options.config.id), nativeConfig);
+    this.#contentResolver = new IcqqContentResolver(this.client);
+    this.content = this.#contentResolver.port;
     this.#logger = getAdapterLogger('icqq', options.config.id);
     this.#options = options;
     this.endpointName = options.config.id;
@@ -436,6 +354,27 @@ export class IcqqEndpoint extends Endpoint<Client> {
     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 'temp':
+          await this.client.pickMember(target.groupId, target.userId).share(message);
+          return {};
+        case 'channel': {
+          const channel = this.client.pickGuild(target.guildId).channels.get(target.channelId);
+          if (!channel) {
+            throw new TypeError(`ICQQ guild channel is unavailable: ${target.guildId}/${target.channelId}`);
+          }
+          await channel.share(message);
+          return {};
+        }
+      }
+    }
     if (isIcqqFileElement(message)) {
       switch (target.kind) {
         case 'private': {
@@ -800,7 +739,7 @@ export class IcqqEndpoint extends Endpoint<Client> {
     const quoteId = resolveIcqqQuoteIdFromEvent(data);
     const quoted = messageLookupFromIcqqSource(findIcqqNestedMessageSource(data));
     if (quoteId && quoted) {
-      this.#messageContent.set(quoteId, Object.freeze({
+      this.#contentResolver.remember(quoteId, Object.freeze({
         ref: Object.freeze({ conversation, id: quoteId }),
         ...(quoted.sender?.id ? { actor: Object.freeze({
           id: quoted.sender.id,
@@ -1014,6 +953,13 @@ export class IcqqEndpoint extends Endpoint<Client> {
   }
 }
 
+function isIcqqShareElement(message: Sendable): message is ShareElem {
+  return !Array.isArray(message)
+    && typeof message === 'object'
+    && message !== null
+    && message.type === 'share';
+}
+
 function formatIcqqSendablePreview(message: Sendable): string {
   if (typeof message === 'string') return message;
   try {

package/src/icqq-inbound.ts

@@ -500,6 +500,45 @@ export function icqqElementsToSegments(
         });
         break;
       }
+      case "share": {
+        const url = typeof el.url === "string" ? el.url.trim() : "";
+        const title = typeof el.title === "string" ? el.title.trim() : "";
+        if (!url || !title) break;
+        const description = typeof el.summary === "string" && el.summary
+          ? el.summary
+          : undefined;
+        const image = typeof el.image === "string" && el.image ? el.image : undefined;
+        const audio = typeof el.audio === "string" && el.audio ? el.audio : undefined;
+        const content = typeof el.content === "string" && el.content ? el.content : undefined;
+        const rawConfig = el.config && typeof el.config === "object" && !Array.isArray(el.config)
+          ? el.config as Record<string, unknown>
+          : undefined;
+        const appid = Number(rawConfig?.appid);
+        const config = Number.isSafeInteger(appid) && appid > 0
+          ? {
+              appid,
+              ...(typeof rawConfig?.appname === "string" && rawConfig.appname
+                ? { package: rawConfig.appname }
+                : {}),
+              ...(typeof rawConfig?.appsign === "string" && rawConfig.appsign
+                ? { sign: rawConfig.appsign }
+                : {}),
+            }
+          : undefined;
+        out.push({
+          type: "share",
+          data: {
+            url,
+            title,
+            ...(description ? { description } : {}),
+            ...(image ? { image } : {}),
+            ...(audio ? { audio } : {}),
+            ...(content ? { content } : {}),
+            ...(config ? { config } : {}),
+          },
+        });
+        break;
+      }
       default:
         if (el.text != null && el.text !== "") {
           out.push({ type: "text", data: { text: String(el.text) } });

package/src/icqq-runtime-state.ts

@@ -1,6 +1,6 @@
 /**
  * ICQQ 插件实例的运行时状态：adapter create() 注册的 endpoint 列表。
- * 由 plugin.ts setup() provide，adapter create 与 `icqq.endpoint` 命令共享（同一 owner generation）。
+ * 由 plugin.ts setup() provide，adapter create 与 `icqq endpoint` 命令共享（同一 owner generation）。
  */
 import { defineEndpointRuntimeStateToken } from 'zhin.js/adapter';
 

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.description) ?? 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>>>;