@zhin.js/adapter-icqq 1.0.71 → 1.1.0

package/src/forward-msg.ts

@@ -0,0 +1,112 @@
+import {
+  icqqElementsToSegments,
+  type IcqqMessageElement,
+} from "./icqq-inbound.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;
+
+function parseJsonPayload(raw: unknown): Record<string, unknown> | null {
+  if (raw && typeof raw === "object" && !Array.isArray(raw)) {
+    return raw as Record<string, unknown>;
+  }
+  if (typeof raw !== "string" || !raw.trim()) return null;
+  try {
+    const parsed = JSON.parse(raw) as unknown;
+    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+      return parsed as Record<string, unknown>;
+    }
+  } catch {
+    // ignore
+  }
+  return null;
+}
+
+/** 从 QQ 合并转发 json 元素提取 resid */
+export function extractForwardResidFromJsonElement(
+  el: IcqqMessageElement,
+): string | undefined {
+  const record =
+    parseJsonPayload(el.data) ??
+    parseJsonPayload(el.text) ??
+    parseJsonPayload(el);
+  if (!record) {
+    const text = typeof el.text === "string" ? el.text : "";
+    const m = text.match(RESID_IN_XML_RE);
+    return m?.[1]?.trim();
+  }
+
+  const bytes = record.bytesData ?? record.bytes_data ?? record.bytes;
+  if (typeof bytes === "string" && bytes.trim()) {
+    const inner = parseJsonPayload(bytes);
+    if (inner) {
+      const nested = extractForwardResidFromJsonElement({
+        type: "json",
+        data: inner,
+      });
+      if (nested) return nested;
+    }
+    const m = bytes.match(RESID_IN_XML_RE);
+    if (m?.[1]) return m[1].trim();
+  }
+
+  const app = String(record.app ?? record.App ?? "");
+  if (app.includes("multimsg") || app.includes("MultiMsg")) {
+    const meta = record.meta as Record<string, unknown> | undefined;
+    const detail = meta?.detail as Record<string, unknown> | undefined;
+    const resid = detail?.resid ?? detail?.ResID ?? detail?.resId;
+    if (resid != null && String(resid).trim()) return String(resid).trim();
+  }
+
+  const prompt = record.prompt as string | undefined;
+  if (prompt) {
+    const m = prompt.match(RESID_IN_XML_RE);
+    if (m?.[1]) return m[1].trim();
+  }
+
+  const direct = record.resid ?? record.m_resid ?? record.fileid;
+  if (direct != null && String(direct).trim()) return String(direct).trim();
+
+  return undefined;
+}
+
+/** 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[]
+            : [];
+  return Object.freeze(list.flatMap((item): ForwardEntry[] => {
+    if (!item || typeof item !== 'object') return [];
+    const row = item as Record<string, unknown>;
+    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-endpoint-commands.ts

@@ -0,0 +1,28 @@
+import { addEndpointToConfig, createEndpointCommands } from 'zhin.js/adapter';
+import { defineCommand } from 'zhin.js/command';
+import { icqqRuntimeStateToken } from './icqq-runtime-state.js';
+
+export const icqqEndpointCommands = createEndpointCommands({
+  adapterKey: 'icqq',
+  adapterDisplayName: 'ICQQ',
+  running: (use) => use(icqqRuntimeStateToken).endpoints.values(),
+  describeEntry: () => 'direct（直连 @icqqjs/icqq）',
+  addDescription: '登记 ICQQ endpoint（重启 zhin 生效）',
+  bindFlow: ({ id }) => {
+    if (!id) {
+      return '用法：icqq.endpoint add <uin>（uin 为纯数字 QQ 号）';
+    }
+    if (!/^\d+$/.test(id)) {
+      return 'icqq endpoint 名必须是纯数字 QQ 号（uin）';
+    }
+    try {
+      const filePath = addEndpointToConfig('icqq', { id });
+      return (
+        `✅ endpoint「${id}」已追加到 ${filePath} 的 plugins.icqq.endpoints。\n` +
+        `重启 zhin 后生效。`
+      );
+    } catch (error) {
+      return `添加失败：${error instanceof Error ? error.message : String(error)}`;
+    }
+  },
+}, defineCommand);

package/src/icqq-guild.ts

@@ -0,0 +1,154 @@
+/**
+ * ICQQ guild (QQ 频道) catalog sync, inbound normalize, Console channel list.
+ */
+import { toCanonicalSegments, type MessageSegment } from "zhin.js";
+import type { GuildMessageEventData } from "./protocol.js";
+import { parseCqMessage } from "./cq-message.js";
+
+export interface IcqqGuildClient {
+  getGuildList(): Array<{ guild_id: string; guild_name: string }>;
+  getChannelList(guildId: string): Array<{ guild_id: string; channel_id: string; channel_name: string }>;
+}
+
+export interface IcqqGuildChannelEntry {
+  channel_id: string;
+  channel_name: string;
+  guild_id: string;
+  guild_name: string;
+}
+
+export interface NormalizedIcqqGuildInbound {
+  messageId: string;
+  channelId: string;
+  guildId: string;
+  guildName: string;
+  channelName: string;
+  userId: string;
+  nickname: string;
+  content: MessageSegment[];
+  rawMessage: string;
+  timestampMs: number;
+  raw: GuildMessageEventData;
+}
+
+export class IcqqGuildCatalog {
+  private readonly channels = new Map<string, IcqqGuildChannelEntry>();
+  private readonly guilds = new Map<string, { guild_id: string; guild_name: string }>();
+
+  clear(): void {
+    this.channels.clear();
+    this.guilds.clear();
+  }
+
+  async syncAll(client: IcqqGuildClient): Promise<void> {
+    const guildRows = client.getGuildList();
+    for (const row of guildRows) {
+      const guild_id = String(row.guild_id ?? "");
+      if (!guild_id) continue;
+      const guild_name = String(row.guild_name ?? guild_id);
+      this.guilds.set(guild_id, { guild_id, guild_name });
+
+      const channels = client.getChannelList(guild_id);
+      for (const ch of channels) {
+        const channel_id = String(ch.channel_id ?? "");
+        if (!channel_id) continue;
+        const channel_name = String(ch.channel_name ?? channel_id);
+        this.channels.set(channel_id, {
+          channel_id,
+          channel_name,
+          guild_id,
+          guild_name,
+        });
+      }
+    }
+  }
+
+  upsertFromInbound(data: GuildMessageEventData): void {
+    const guild_id = String(data.guild_id ?? "");
+    const channel_id = String(data.channel_id ?? "");
+    if (!guild_id || !channel_id) return;
+    const guild_name = String(data.guild_name ?? guild_id);
+    const channel_name = String(data.channel_name ?? channel_id);
+    this.guilds.set(guild_id, { guild_id, guild_name });
+    this.channels.set(channel_id, {
+      channel_id,
+      channel_name,
+      guild_id,
+      guild_name,
+    });
+  }
+
+  getGuildChannelList(): Array<{
+    id: string;
+    name: string;
+    parent: { type: "guild"; id: string; name: string };
+  }> {
+    return Array.from(this.channels.values()).map((entry) => ({
+      id: entry.channel_id,
+      name: entry.channel_name,
+      parent: {
+        type: "guild" as const,
+        id: entry.guild_id,
+        name: entry.guild_name,
+      },
+    }));
+  }
+
+  resolveConsoleChannelNames(
+    channelId: string,
+    guildId?: string,
+  ): { channelName?: string; parentName?: string } {
+    const entry = this.channels.get(channelId);
+    if (entry) {
+      return { channelName: entry.channel_name, parentName: entry.guild_name };
+    }
+    if (guildId) {
+      const guild = this.guilds.get(guildId);
+      return guild ? { parentName: guild.guild_name } : {};
+    }
+    return {};
+  }
+}
+
+export function isIcqqGuildEvent(eventName: string | undefined): boolean {
+  return typeof eventName === "string" && eventName.startsWith("message.guild");
+}
+
+export function normalizeIcqqGuildInboundMessage(
+  data: GuildMessageEventData & Record<string, unknown>,
+): NormalizedIcqqGuildInbound | null {
+  if (data.type !== "guild") return null;
+  const guildId = String(data.guild_id ?? "");
+  const channelId = String(data.channel_id ?? "");
+  if (!guildId || !channelId) return null;
+
+  const userId = String(data.tiny_id ?? data.user_id ?? "");
+  const nickname = String(data.nickname ?? userId);
+  const rawMessage = String(data.raw_message ?? "");
+  const timestampMs =
+    typeof data.time === "number" ? data.time * 1000 : Date.now();
+  const messageId =
+    data.message_id != null && String(data.message_id) !== ""
+      ? String(data.message_id)
+      : data.seq != null
+        ? String(data.seq)
+        : `${data.time ?? 0}_${userId}_${channelId}`;
+
+  const parsed = parseCqMessage(rawMessage);
+  const canonical = toCanonicalSegments(parsed);
+  const content: MessageSegment[] = canonical.length > 0 ? canonical : [{ type: "text", data: { text: rawMessage } }];
+
+  return {
+    messageId,
+    channelId,
+    guildId,
+    guildName: String(data.guild_name ?? guildId),
+    channelName: String(data.channel_name ?? channelId),
+    userId,
+    nickname,
+    content,
+    rawMessage,
+    timestampMs,
+    raw: data,
+  };
+}