@zhin.js/adapter-icqq 8.0.13 → 8.0.14

package/src/forward-msg.ts

@@ -1,17 +1,13 @@
-import { segment, type MessageSegment, type QuotedMessagePayload } from 'zhin.js';
-
 import {
   icqqElementsToSegments,
   type IcqqMessageElement,
 } from "./icqq-inbound.js";
-import { parseCqMessage } from "./cq-message.js";
+import { toCanonicalSegments } from '@zhin.js/core';
+import type { ForwardEntry, Segment } from '@zhin.js/im-contract';
 
 const RESID_IN_XML_RE =
   /(?:m_resid|resid|fileid|res_id)=["']?([A-Za-z0-9+/=_.-]{8,})/i;
 
-const FORWARD_PLACEHOLDER_RE =
-  /\[聊天记录\]|合并转发|转发消息|聊天记录/i;
-
 function parseJsonPayload(raw: unknown): Record<string, unknown> | null {
   if (raw && typeof raw === "object" && !Array.isArray(raw)) {
     return raw as Record<string, unknown>;
@@ -76,344 +72,41 @@ export function extractForwardResidFromJsonElement(
   return undefined;
 }
 
-/** 从 get_msg 的 raw_message 解析 multimsg resid（XML / JSON / CQ:json） */
-export function extractForwardResidFromRawMessage(
-  raw: string,
-): string | undefined {
-  const text = raw.trim();
-  if (!text) return undefined;
-
-  const xml = text.match(RESID_IN_XML_RE);
-  if (xml?.[1]) return xml[1].trim();
-
-  const asJson = parseJsonPayload(text);
-  if (asJson) {
-    const fromJson = extractForwardResidFromJsonElement({
-      type: "json",
-      data: asJson,
-    });
-    if (fromJson) return fromJson;
-  }
-
-  for (const match of text.matchAll(/\[CQ:json(?:,([^\]]*))?\]/gi)) {
-    const arg = match[1] ?? "";
-    const dataMatch = arg.match(/(?:^|,)data=(.+)$/s);
-    if (!dataMatch?.[1]) continue;
-    const record = parseJsonPayload(dataMatch[1].trim());
-    if (!record) continue;
-    const fromCq = extractForwardResidFromJsonElement({
-      type: "json",
-      data: record,
-    });
-    if (fromCq) return fromCq;
-  }
-
-  const segs = parseCqMessage(text);
-  return extractForwardResidFromSegments(segs);
-}
-
-/** 从 get_msg 的 message 元素数组解析 multimsg resid */
-export function extractForwardResidFromGetMsgElements(
-  elements: IcqqMessageElement[] | undefined,
-): string | undefined {
-  if (!elements?.length) return undefined;
-  for (const el of elements) {
-    if (!el || typeof el !== "object") continue;
-    if (el.type === "forward") {
-      const id = String(el.id ?? el.resid ?? el.res_id ?? el.file ?? "").trim();
-      if (id) return id;
-    }
-    const fromJson = extractForwardResidFromJsonElement(el);
-    if (fromJson) return fromJson;
-  }
-  const segs = icqqElementsToSegments(elements);
-  if (segs?.length) {
-    return extractForwardResidFromSegments(segs);
-  }
-  return extractForwardResidDeep(elements);
-}
-
-/**
- * 从 get_msg 响应解析合并转发 resid（优先 message 数组，其次 raw_message）。
- */
-export function extractForwardResidFromGetMsg(
-  data: unknown,
-): string | undefined {
-  if (!data || typeof data !== "object") return undefined;
-  const record = data as Record<string, unknown>;
-
-  if (Array.isArray(record.message)) {
-    const fromElements = extractForwardResidFromGetMsgElements(
-      record.message as IcqqMessageElement[],
-    );
-    if (fromElements) return fromElements;
-  }
-
-  if (typeof record.raw_message === "string" && record.raw_message.trim()) {
-    const fromRaw = extractForwardResidFromRawMessage(record.raw_message);
-    if (fromRaw) return fromRaw;
-  }
-
-  if (typeof record.message === "string" && record.message.trim()) {
-    return extractForwardResidFromRawMessage(record.message);
-  }
-
-  return undefined;
-}
-
-export function extractForwardResidFromSegments(
-  content: MessageSegment[],
-): string | undefined {
-  for (const seg of content) {
-    if (seg.type === "forward") {
-      const id = seg.data?.id ?? seg.data?.resid;
-      if (id != null && String(id).trim()) return String(id).trim();
-    }
-    if (seg.type === "json" && seg.data) {
-      const resid = extractForwardResidFromJsonElement(
-        seg.data as IcqqMessageElement,
-      );
-      if (resid) return resid;
-      const raw = seg.data.data ?? seg.data.text;
-      const record = parseJsonPayload(raw);
-      if (record) {
-        const fromEl = extractForwardResidFromJsonElement({
-          type: "json",
-          data: record,
-        });
-        if (fromEl) return fromEl;
-      }
-    }
-  }
-  const raw = segment.raw(content);
-  const m = raw.match(RESID_IN_XML_RE);
-  return m?.[1]?.trim();
-}
-
-export function extractForwardResidFromPayload(
-  payload: QuotedMessagePayload,
-): string | undefined {
-  if (Array.isArray(payload.content)) {
-    const fromSeg = extractForwardResidFromSegments(
-      payload.content as MessageSegment[],
-    );
-    if (fromSeg) return fromSeg;
-  }
-  if (typeof payload.raw === "string") {
-    const m = payload.raw.match(RESID_IN_XML_RE);
-    if (m?.[1]) return m[1].trim();
-    const record = parseJsonPayload(payload.raw);
-    if (record) {
-      return extractForwardResidFromJsonElement({ type: "json", data: record });
-    }
-  }
-  return undefined;
-}
-
-/** 在 get_msg 原始对象里深度搜索 resid */
-export function extractForwardResidDeep(
-  root: unknown,
-  maxDepth = 14,
-): string | undefined {
-  const seen = new Set<unknown>();
-  function walk(node: unknown, depth: number): string | undefined {
-    if (depth > maxDepth || node == null) return undefined;
-    if (typeof node === "string") {
-      const m = node.match(RESID_IN_XML_RE);
-      if (m?.[1]) return m[1].trim();
-      const record = parseJsonPayload(node);
-      if (record) {
-        const fromJson = extractForwardResidFromJsonElement({
-          type: "json",
-          data: record,
-        });
-        if (fromJson) return fromJson;
-      }
-      return undefined;
-    }
-    if (typeof node !== "object") return undefined;
-    if (seen.has(node)) return undefined;
-    seen.add(node);
-
-    if (Array.isArray(node)) {
-      for (const item of node) {
-        const hit = walk(item, depth + 1);
-        if (hit) return hit;
-      }
-      return undefined;
-    }
-
-    const fromEl = extractForwardResidFromJsonElement({
-      type: "json",
-      data: node as IcqqMessageElement,
-    });
-    if (fromEl) return fromEl;
-
-    for (const value of Object.values(node as Record<string, unknown>)) {
-      const hit = walk(value, depth + 1);
-      if (hit) return hit;
-    }
-    return undefined;
-  }
-  return walk(root, 0);
-}
-
-export function isForwardPlaceholderPayload(
-  payload: QuotedMessagePayload,
-): boolean {
-  if (
-    Array.isArray(payload.content) &&
-    payload.content.some((s) => s.type === "forward")
-  ) {
-    return true;
-  }
-  const raw = Array.isArray(payload.content)
-    ? segment.raw(payload.content as MessageSegment[])
-    : String(payload.content ?? payload.raw ?? "");
-  return FORWARD_PLACEHOLDER_RE.test(raw);
-}
-
-function hasMergedForwardBlock(payload: QuotedMessagePayload): boolean {
-  const raw = Array.isArray(payload.content)
-    ? segment.raw(payload.content as MessageSegment[])
-    : String(payload.content ?? "");
-  return raw.includes("[Merged chat history");
-}
-
-function senderLabel(sender: unknown): string {
-  if (!sender || typeof sender !== "object") return "unknown";
-  const s = sender as Record<string, unknown>;
-  const name = s.nickname ?? s.name ?? s.card;
-  const id = s.user_id ?? s.uin ?? s.uid ?? s.id;
-  if (name && id) return `${name} (${id})`;
-  if (name) return String(name);
-  if (id != null) return String(id);
-  return "unknown";
-}
-
-function messageBodyToText(body: unknown): string {
-  if (body == null) return "";
-  if (typeof body === "string") return body.trim();
-  if (Array.isArray(body)) {
-    const segs = icqqElementsToSegments(body as IcqqMessageElement[]);
-    return segs?.length ? segment.raw(segs).trim() : segment.raw(body).trim();
-  }
-  if (typeof body === "object") {
-    const r = body as Record<string, unknown>;
-    if (typeof r.raw_message === "string" && r.raw_message.trim()) {
-      return r.raw_message.trim();
-    }
-    if (Array.isArray(r.message)) {
-      return messageBodyToText(r.message);
-    }
-    if (Array.isArray(r.elements)) {
-      return messageBodyToText(r.elements);
-    }
-    if (typeof r.content === "string") return r.content.trim();
-  }
-  return "";
-}
-
-/** 将 get_forward_msg 响应格式化为可读聊天记录 */
-export function formatForwardMsgResponse(data: unknown): string {
-  if (!data) return "";
-
-  const root =
-    data && typeof data === "object" && !Array.isArray(data)
-      ? (data as Record<string, unknown>)
-      : null;
-
+/** Canonical merged-forward entries. Speakers are data actors, never LLM roles. */
+export function normalizeForwardMsgResponse(data: unknown): readonly ForwardEntry[] {
+  const root = data && typeof data === 'object' && !Array.isArray(data)
+    ? data as Record<string, unknown>
+    : undefined;
   const list: unknown[] = Array.isArray(data)
     ? data
-    : Array.isArray(root?.messages)
-      ? (root!.messages as unknown[])
-      : Array.isArray(root?.msgList)
-        ? (root!.msgList as unknown[])
-        : Array.isArray(root?.msg_list)
-          ? (root!.msg_list as unknown[])
-          : Array.isArray(root?.message)
-            ? (root!.message as unknown[])
+    : Array.isArray(root?.messages) ? root.messages as unknown[]
+      : Array.isArray(root?.msgList) ? root.msgList as unknown[]
+        : Array.isArray(root?.msg_list) ? root.msg_list as unknown[]
+          : Array.isArray(root?.message) ? root.message as unknown[]
             : [];
-
-  if (!list.length) return "";
-
-  const lines: string[] = [];
-  let index = 0;
-  for (const item of list) {
-    if (!item || typeof item !== "object") continue;
+  return Object.freeze(list.flatMap((item): ForwardEntry[] => {
+    if (!item || typeof item !== 'object') return [];
     const row = item as Record<string, unknown>;
-    index += 1;
-    const who = senderLabel(row.sender ?? row.user);
-    const time =
-      typeof row.time === "number"
-        ? new Date(row.time * (row.time > 1e12 ? 1 : 1000)).toISOString()
-        : "";
-    const text = messageBodyToText(
-      row.message ??
-        row.content ??
-        row.raw_message ??
-        row.elements ??
-        row,
-    );
-    const head = time ? `${index}. ${who} @ ${time}` : `${index}. ${who}`;
-    lines.push(text ? `${head}\n${text}` : `${head}\n(非文本或无法解析的内容)`);
-  }
-  return lines.join("\n\n");
-}
-
-export async function fetchForwardMsgText(
-  client: { getForwardMsg(resId: string, fileName?: string): Promise<unknown[]> },
-  id: string,
-): Promise<string> {
-  try {
-    const messages = await client.getForwardMsg(id);
-    const text = formatForwardMsgResponse(messages);
-    if (text.trim()) return text.trim();
-  } catch { /* ignore */ }
-  return "";
-}
-
-function appendForwardBlock(
-  payload: QuotedMessagePayload,
-  block: string,
-): QuotedMessagePayload {
-  if (Array.isArray(payload.content)) {
-    return {
-      ...payload,
-      content: [...payload.content, { type: "text", data: { text: block } }],
-    };
-  }
-  const prev =
-    typeof payload.content === "string" ? payload.content.trim() : "";
-  return {
-    ...payload,
-    content: prev ? `${prev}\n\n${block}` : block,
-  };
-}
-
-export async function enrichQuotedPayloadWithForward(
-  client: { getForwardMsg(resId: string, fileName?: string): Promise<unknown[]> } | null | undefined,
-  payload: QuotedMessagePayload,
-  rawData?: unknown,
-): Promise<QuotedMessagePayload> {
-  if (!client || hasMergedForwardBlock(payload)) return payload;
-
-  const resid =
-    extractForwardResidFromPayload(payload) ??
-    (rawData ? extractForwardResidFromGetMsg(rawData) : undefined) ??
-    (rawData ? extractForwardResidDeep(rawData) : undefined);
-
-  const fetchIds = [
-    resid,
-    isForwardPlaceholderPayload(payload) ? payload.messageId : undefined,
-  ].filter((v, i, a): v is string => !!v && a.indexOf(v) === i);
-
-  for (const fetchId of fetchIds) {
-    const forwardText = await fetchForwardMsgText(client, fetchId);
-    if (!forwardText.trim()) continue;
-    const block = `[Merged chat history — id ${fetchId}]\n${forwardText.trim()}`;
-    return appendForwardBlock(payload, block);
-  }
-
-  return payload;
+    const sender = row.sender && typeof row.sender === 'object'
+      ? row.sender as Record<string, unknown>
+      : row.user && typeof row.user === 'object'
+        ? row.user as Record<string, unknown>
+        : undefined;
+    const id = sender?.user_id ?? sender?.uin ?? sender?.id;
+    const displayName = sender?.nickname ?? sender?.card ?? sender?.name;
+    const body = row.message ?? row.content ?? row.elements ?? row.raw_message;
+    let segments: Segment[];
+    if (Array.isArray(body)) segments = toCanonicalSegments(icqqElementsToSegments(body as IcqqMessageElement[]) ?? body);
+    else if (typeof body === 'string' && body.trim()) segments = [{ type: 'text', data: { text: body.trim() } }];
+    else segments = [];
+    if (segments.length === 0) return [];
+    return [Object.freeze({
+      ...(id != null ? { actor: Object.freeze({
+        id: String(id),
+        ...(displayName != null && String(displayName).trim() ? { displayName: String(displayName) } : {}),
+      }) } : {}),
+      ...(typeof row.time === 'number' ? { timestamp: row.time < 1e12 ? row.time * 1000 : row.time } : {}),
+      segments: Object.freeze(segments),
+    })];
+  }));
 }

package/src/icqq-inbound.ts

@@ -1,7 +1,7 @@
 /**
  * icqq 入站事件归一化（post_type / message_type / message 段）
  */
-import { Message, toCanonicalSegments, type MessageSegment, type QuotedMessagePayload } from "zhin.js";
+import { toCanonicalSegments, type MessageSegment } from "zhin.js";
 import { parseCqMessage, icqqMediaRefFromString } from "./cq-message.js";
 import { extractForwardResidFromJsonElement } from "./forward-msg.js";
 import type { GroupRole } from "./types.js";
@@ -66,6 +66,14 @@ export interface IcqqMessageSource {
   [key: string]: unknown;
 }
 
+interface IcqqMessageLookup {
+  readonly messageId: string;
+  readonly sender?: Readonly<{ id?: string; name?: string }>;
+  readonly content: readonly MessageSegment[] | string;
+  readonly raw?: string;
+  readonly time?: number;
+}
+
 export type IcqqMessageElement = {
   type: string;
   text?: string;
@@ -74,9 +82,45 @@ export type IcqqMessageElement = {
   id?: string | number;
   url?: string;
   file?: string;
+  fid?: string;
+  name?: string;
+  size?: number;
+  seconds?: number;
   [key: string]: unknown;
 };
 
+export interface IcqqInboundMediaResolver {
+  getPttUrl(element: IcqqMessageElement): Promise<string | null | undefined>;
+  getVideoUrl(element: IcqqMessageElement): Promise<string | null | undefined>;
+}
+
+/**
+ * Resolve ICQQ's opaque protobuf media references while the endpoint-owned
+ * native client is still available. Resolution failure preserves the opaque
+ * reference, so canonical ingress stays truthful and can report unsupported
+ * media instead of inventing a URL.
+ */
+export async function resolveIcqqInboundMedia(
+  elements: IcqqMessageElement[] | undefined,
+  resolver: IcqqInboundMediaResolver,
+): Promise<void> {
+  if (!elements?.length) return;
+  await Promise.all(elements.map(async (element) => {
+    if (!element || typeof element !== "object") return;
+    if (typeof element.url === "string" && element.url) return;
+    try {
+      const url = element.type === "record" || element.type === "audio"
+        ? await resolver.getPttUrl(element)
+        : element.type === "video"
+          ? await resolver.getVideoUrl(element)
+          : undefined;
+      if (typeof url === "string" && url) element.url = url;
+    } catch {
+      // The original platform reference remains the canonical fallback.
+    }
+  }));
+}
+
 /** 归一化后供适配器使用的入站消息 */
 export interface NormalizedIcqqInbound {
   messageId: string;
@@ -343,9 +387,19 @@ export function icqqElementsToSegments(
         break;
       case "image": {
         const value = String(el.url ?? el.file ?? "");
+        if (!value) break;
+        out.push({
+          type: "image",
+          data: { media: icqqMediaRefFromElement(value, el) },
+        });
+        break;
+      }
+      case "flash": {
+        const value = String(el.url ?? el.file ?? "");
+        if (!value) break;
         out.push({
           type: "image",
-          data: { media: icqqMediaRefFromString(value) },
+          data: { media: icqqMediaRefFromElement(value, el), flash: true },
         });
         break;
       }
@@ -410,18 +464,39 @@ export function icqqElementsToSegments(
       }
       case "record":
       case "audio": {
-        const value = String(el.file ?? el.url ?? "");
+        const value = String(el.url ?? el.file ?? "");
+        if (!value) break;
         out.push({
-          type: "record",
-          data: { media: icqqMediaRefFromString(value) },
+          type: "audio",
+          data: {
+            media: icqqMediaRefFromElement(value, el),
+            ...(typeof el.seconds === "number" ? { duration: el.seconds } : {}),
+          },
         });
         break;
       }
       case "video": {
-        const value = String(el.file ?? el.url ?? "");
+        const value = String(el.url ?? el.file ?? "");
+        if (!value) break;
         out.push({
           type: "video",
-          data: { media: icqqMediaRefFromString(value) },
+          data: {
+            media: icqqMediaRefFromElement(value, el),
+            ...(typeof el.seconds === "number" ? { duration: el.seconds } : {}),
+          },
+        });
+        break;
+      }
+      case "file": {
+        const value = String(el.url ?? el.file ?? el.fid ?? "");
+        if (!value) break;
+        const name = typeof el.name === "string" && el.name ? el.name : undefined;
+        out.push({
+          type: "file",
+          data: {
+            media: icqqMediaRefFromElement(value, el),
+            ...(name ? { name } : {}),
+          },
         });
         break;
       }
@@ -435,6 +510,24 @@ export function icqqElementsToSegments(
   return out.length ? out : null;
 }
 
+function icqqMediaRefFromElement(
+  value: string,
+  element: IcqqMessageElement,
+): ReturnType<typeof icqqMediaRefFromString> {
+  const media = icqqMediaRefFromString(value);
+  const fileName = typeof element.name === "string" && element.name
+    ? element.name
+    : undefined;
+  const size = typeof element.size === "number" && Number.isFinite(element.size)
+    ? element.size
+    : undefined;
+  return {
+    ...media,
+    ...(fileName ? { file_name: fileName } : {}),
+    ...(size != null ? { size } : {}),
+  };
+}
+
 function resolveReplyIdFromJsonElement(el: IcqqMessageElement): string | undefined {
   let payload: unknown = el.data ?? el;
   if (typeof payload === "string") {
@@ -556,10 +649,10 @@ function icqqSourceToContentSegments(
   return [];
 }
 
-/** 将 source 转为 QuotedMessagePayload（供 $getMsg 缓存，避免重复拉取） */
-export function quotedPayloadFromIcqqSource(
+/** Convert an ICQQ source into the adapter-local lookup payload. */
+export function messageLookupFromIcqqSource(
   source: unknown,
-): QuotedMessagePayload | null {
+): IcqqMessageLookup | null {
   if (!source || typeof source !== "object") return null;
   const s = source as IcqqMessageSource;
   const body = icqqSourceMessageBody(s);
@@ -622,9 +715,9 @@ function mergeReplyFromRawMessage(
   content: MessageSegment[],
   rawMessage: string,
 ): MessageSegment[] {
-  if (!rawMessage || Message.quoteIdFromContent(content)) return content;
+  if (!rawMessage || quoteIdFromSegments(content)) return content;
   const fromRaw = parseCqMessage(rawMessage);
-  const quoteFromRaw = Message.quoteIdFromContent(fromRaw);
+  const quoteFromRaw = quoteIdFromSegments(fromRaw);
   if (!quoteFromRaw) return content;
   return [
     { type: "reply", data: { message_id: quoteFromRaw } },
@@ -636,7 +729,7 @@ function mergeReplyFromSource(
   content: MessageSegment[],
   data: IcqqMessageEvent,
 ): MessageSegment[] {
-  if (Message.quoteIdFromContent(content)) return content;
+  if (quoteIdFromSegments(content)) return content;
   const quoteId =
     resolveQuoteIdFromIcqqSource(data.source) ??
     resolveQuoteIdFromIcqqSource(findIcqqNestedMessageSource(data));
@@ -647,6 +740,12 @@ function mergeReplyFromSource(
   ];
 }
 
+function quoteIdFromSegments(content: readonly MessageSegment[]): string | undefined {
+  const reply = content.find((item) => item.type === 'reply');
+  const value = reply?.data?.message_id ?? reply?.data?.id;
+  return value == null || !String(value).trim() ? undefined : String(value).trim();
+}
+
 export function resolveInboundContent(
   data: IcqqMessageEvent,
 ): MessageSegment[] {