@zhin.js/adapter-icqq 1.0.71 → 1.1.2

package/src/icqq-inbox.ts

@@ -0,0 +1,147 @@
+import type { SystemMessage } from './types.js';
+
+/** 行级公共前缀：adapter 槽 localName + endpoint live 名（uin）。 */
+export interface IcqqInboxBase {
+  readonly adapter: string;
+  readonly endpointKey: string;
+}
+
+/** post_type=request / request.* 判定（OneBot 事件壳）。 */
+export function isIcqqRequestPayload(payload: unknown): boolean {
+  const postType = (payload as { post_type?: unknown } | null)?.post_type;
+  return typeof postType === 'string'
+    && (postType === 'request' || postType.startsWith('request.'));
+}
+
+/** post_type=notice / notice.* 判定。 */
+export function isIcqqNoticePayload(payload: unknown): boolean {
+  const postType = (payload as { post_type?: unknown } | null)?.post_type;
+  return typeof postType === 'string'
+    && (postType === 'notice' || postType.startsWith('notice.'));
+}
+
+/**
+ * request 事件载荷 → unified_inbox_request 行。
+ * platform_request_id 取 flag（审批回执句柄），缺省回退 seq；两者皆无则无法审批，丢弃。
+ */
+export function buildIcqqInboxRequestRow(
+  payload: Record<string, unknown>,
+  base: IcqqInboxBase,
+): Record<string, unknown> | null {
+  const userId = payload.user_id ?? payload.actor_id;
+  if (userId == null) return null;
+  const flag = asNonEmptyString(payload.flag);
+  const platformRequestId = flag ?? (payload.seq != null ? String(payload.seq) : '');
+  if (!platformRequestId) return null;
+  const requestType = asNonEmptyString(payload.request_type) ?? asNonEmptyString(payload.type);
+  const groupId = payload.group_id;
+  const isGroup = requestType === 'group' || groupId != null;
+  return {
+    adapter: base.adapter,
+    endpoint_id: base.endpointKey,
+    platform_request_id: platformRequestId,
+    type: isGroup ? 'group' : (requestType ?? 'friend'),
+    scene_type: isGroup ? 'group' : null,
+    scene_id: String(groupId ?? userId),
+    sub_type: asNonEmptyString(payload.sub_type),
+    actor_id: String(userId),
+    actor_name: asNonEmptyString(payload.nickname),
+    comment: asNonEmptyString(payload.comment),
+    created_at: toMillis(payload.time),
+    resolved: 0,
+    resolved_at: null,
+    consumed: 0,
+    consumed_at: null,
+  };
+}
+
+/**
+ * notice 事件载荷 → unified_inbox_notice 行。
+ * 事件本身无稳定 id，platform_notice_id 由 time + actor + type 合成（配合去重）。
+ */
+export function buildIcqqInboxNoticeRow(
+  payload: Record<string, unknown>,
+  base: IcqqInboxBase,
+): Record<string, unknown> | null {
+  const noticeType = asNonEmptyString(payload.notice_type) ?? asNonEmptyString(payload.type);
+  if (!noticeType) return null;
+  const subType = asNonEmptyString(payload.sub_type);
+  const userId = payload.user_id;
+  const operatorId = payload.operator_id;
+  const groupId = payload.group_id;
+  const createdAt = toMillis(payload.time);
+  const actorId = operatorId ?? userId;
+  const platformNoticeId = asNonEmptyString(payload.notice_id)
+    ?? (payload.seq != null ? String(payload.seq) : undefined)
+    ?? `${createdAt}_${String(actorId ?? '')}_${noticeType}${subType ? `.${subType}` : ''}`;
+  const targetId = userId != null && String(userId) !== String(actorId ?? '') ? userId : undefined;
+  return {
+    adapter: base.adapter,
+    endpoint_id: base.endpointKey,
+    platform_notice_id: platformNoticeId,
+    type: noticeType,
+    scene_type: groupId != null ? 'group' : null,
+    scene_id: String(groupId ?? userId ?? operatorId ?? ''),
+    sub_type: subType,
+    actor_id: actorId != null ? String(actorId) : null,
+    actor_name: asNonEmptyString(payload.nickname),
+    target_id: targetId != null ? String(targetId) : null,
+    target_name: null,
+    payload: safeJson(payload),
+    created_at: createdAt,
+    consumed: 0,
+    consumed_at: null,
+  };
+}
+
+/**
+ * GET_SYSTEM_MSG 返回项 → unified_inbox_request 行（启动时首次拉取）。
+ * friend 列表项 type 语义即好友请求；group 列表项 type 为 add/invite（记 sub_type）。
+ */
+export function buildIcqqSystemRequestRow(
+  message: SystemMessage,
+  kind: 'friend' | 'group',
+  base: IcqqInboxBase,
+): Record<string, unknown> | null {
+  if (message.user_id == null) return null;
+  const platformRequestId = asNonEmptyString(message.flag)
+    ?? (message.seq != null ? String(message.seq) : '');
+  if (!platformRequestId) return null;
+  return {
+    adapter: base.adapter,
+    endpoint_id: base.endpointKey,
+    platform_request_id: platformRequestId,
+    type: kind,
+    scene_type: kind === 'group' ? 'group' : null,
+    scene_id: String(kind === 'group' ? (message.group_id ?? message.user_id) : message.user_id),
+    sub_type: kind === 'group' ? (asNonEmptyString(message.type) ?? null) : null,
+    actor_id: String(message.user_id),
+    actor_name: asNonEmptyString(message.nickname),
+    comment: asNonEmptyString(message.comment),
+    created_at: toMillis(message.time),
+    resolved: 0,
+    resolved_at: null,
+    consumed: 0,
+    consumed_at: null,
+  };
+}
+
+function asNonEmptyString(value: unknown): string | null {
+  if (typeof value !== 'string') return null;
+  const trimmed = value.trim();
+  return trimmed ? trimmed : null;
+}
+
+/** oicq 事件 time 为秒；缺失时回退当前时间。 */
+function toMillis(time: unknown): number {
+  const seconds = Number(time);
+  return Number.isFinite(seconds) && seconds > 0 ? seconds * 1000 : Date.now();
+}
+
+function safeJson(value: unknown): string {
+  try {
+    return JSON.stringify(value ?? {});
+  } catch {
+    return '{}';
+  }
+}

package/src/icqq-login-assist.ts

@@ -0,0 +1,132 @@
+import type { LoginAssist, LoginAssistType, PendingLoginTaskPayload } from '@zhin.js/core';
+import { formatCompact } from '@zhin.js/logger';
+
+type IcqqLoginClient = {
+  login(password?: string): Promise<unknown>;
+  submitSlider(ticket: string): Promise<unknown>;
+  sendSmsCode(): Promise<unknown>;
+  submitSmsCode(code: string): Promise<unknown>;
+};
+
+type Logger = {
+  info(message: string): void;
+  warn(message: string): void;
+};
+
+/**
+ * Drive ICQQ login challenges through LoginAssist (refresh-safe pending tasks).
+ * Mirrors the classic stdin flow: qrcode/auth → login(); slider → submitSlider;
+ * device → sendSmsCode then submitSmsCode.
+ */
+export async function runIcqqLoginAssistStep(input: {
+  assist: LoginAssist;
+  client: IcqqLoginClient;
+  adapter: string;
+  endpointKey: string;
+  owner: object;
+  logger: Logger;
+  step: LoginAssistType;
+  event: unknown;
+}): Promise<void> {
+  const { assist, client, adapter, endpointKey, owner, logger, step, event } = input;
+  assist.cancelOwned(owner, `replaced_by_${step}`);
+
+  const payload = buildPayload(step, event);
+  logger.info(formatCompact({
+    op: 'login_assist_pending',
+    endpoint: endpointKey,
+    type: step,
+    message: payload.message,
+    ...(typeof payload.url === 'string' ? { url: payload.url } : {}),
+  }));
+
+  try {
+    if (step === 'device') {
+      try {
+        await client.sendSmsCode();
+      } catch (error) {
+        logger.warn(formatCompact({
+          op: 'login_assist_send_sms_failed',
+          endpoint: endpointKey,
+          error: error instanceof Error ? error.message : String(error),
+        }));
+      }
+    }
+
+    const value = await assist.waitForInput(adapter, endpointKey, step, payload, { owner });
+    const text = normalizeSubmitValue(value);
+
+    switch (step) {
+      case 'qrcode':
+      case 'auth':
+        await client.login();
+        break;
+      case 'slider':
+        await client.submitSlider(text);
+        break;
+      case 'device':
+      case 'sms':
+        await client.submitSmsCode(text);
+        break;
+      default:
+        await client.login();
+        break;
+    }
+  } catch (error) {
+    logger.warn(formatCompact({
+      op: 'login_assist_failed',
+      endpoint: endpointKey,
+      type: step,
+      error: error instanceof Error ? error.message : String(error),
+    }));
+  }
+}
+
+function buildPayload(step: LoginAssistType, event: unknown): PendingLoginTaskPayload {
+  const raw = event && typeof event === 'object' ? event as Record<string, unknown> : {};
+  switch (step) {
+    case 'qrcode':
+      return {
+        message: '扫码登录：请在手机 QQ 扫描二维码，完成后在 Console / 终端确认继续',
+        image: bufferToDataUrl(raw.image),
+      };
+    case 'slider':
+      return {
+        message: '滑动验证：打开链接完成滑块，将返回的 ticket（可含 randstr）提交继续',
+        url: typeof raw.url === 'string' ? raw.url : undefined,
+      };
+    case 'device':
+      return {
+        message: '设备锁：已请求短信验证码，请提交短信验证码继续',
+        url: typeof raw.url === 'string' ? raw.url : undefined,
+        phone: raw.phone,
+      };
+    case 'auth':
+      return {
+        message: '身份验证：完成后在 Console / 终端确认继续',
+        url: typeof raw.url === 'string' ? raw.url : undefined,
+        device: raw.device,
+      };
+    default:
+      return { message: `登录辅助（${step}）` };
+  }
+}
+
+function normalizeSubmitValue(value: string | Record<string, unknown>): string {
+  if (typeof value === 'string') return value.trim();
+  if (typeof value.ticket === 'string') return value.ticket.trim();
+  if (typeof value.code === 'string') return value.code.trim();
+  if (typeof value.value === 'string') return value.value.trim();
+  return JSON.stringify(value);
+}
+
+function bufferToDataUrl(image: unknown): string | undefined {
+  if (Buffer.isBuffer(image)) {
+    return `data:image/png;base64,${image.toString('base64')}`;
+  }
+  if (image instanceof Uint8Array) {
+    return `data:image/png;base64,${Buffer.from(image).toString('base64')}`;
+  }
+  if (typeof image === 'string' && image.trim()) return image.trim();
+  return undefined;
+}

package/src/icqq-runtime-state.ts

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

package/src/index.ts

@@ -1,149 +1,30 @@
-/**
- * ICQQ 适配器入口：类型扩展、导出、注册
- */
-import path from "path";
-import { usePlugin, type Plugin } from "zhin.js";
-import type { Router } from "@zhin.js/http";
-import { MessageCommand } from "zhin.js";
-import { IcqqAdapter } from "./adapter.js";
-import type { WebServer } from "@zhin.js/console";
-
-declare module "zhin.js" {
-  namespace Plugin {
-    interface Contexts {
-      web: WebServer;
-      router: Router;
-    }
-  }
-  interface Adapters {
-    icqq: IcqqAdapter;
-  }
-}
-
-export * from "./types.js";
-export { IcqqBot } from "./bot.js";
-export { IcqqAdapter } from "./adapter.js";
-
-const plugin = usePlugin();
-const { provide, useContext, addCommand, root } = plugin;
-
-provide({
-  name: "icqq",
-  description: "ICQQ Adapter",
-  mounted: async (p: Plugin) => {
-    const adapter = new IcqqAdapter(p);
-    await adapter.start();
-    return adapter;
-  },
-  dispose: async (adapter: IcqqAdapter) => {
-    await adapter.stop();
-  },
-} as any);
-
-useContext("icqq", (icqq: IcqqAdapter) => {
-  addCommand(
-    new MessageCommand<"icqq">("赞我 <times:number>")
-      .permit("adapter(icqq)")
-      .action(async (message, result) => {
-        const bot = icqq.bots.get(message.$bot);
-        const send1 = bot?.sendLike(Number(message.$sender.id), 20);
-        const send2 = bot?.sendLike(Number(message.$sender.id), 20);
-        const send3 = bot?.sendLike(Number(message.$sender.id), 10);
-        const [send1Result, send2Result, send3Result] = await Promise.all([send1, send2, send3]);
-        let times = 0;
-        if (send1Result) times += 20;
-        if (send2Result) times += 20;
-        if (send3Result) times += 10;
-        return `给你赞好啦，你已经获得了${times}个赞`;
-      }),
-  );
-});
-
-useContext("web", (web: WebServer) => {
-  const dispose = web.addEntry(
-    path.resolve(import.meta.dirname, "../client/index.tsx"),
-  );
-  return dispose;
-});
-
-useContext("router", "icqq", async (router: Router, icqq: IcqqAdapter) => {
-  const loginAssist = root.inject("loginAssist" as any) as
-    | {
-        listPending: () => unknown[];
-        submit: (id: string, value: string | Record<string, unknown>) => boolean;
-        cancel: (id: string, reason?: string) => boolean;
-      }
-    | undefined;
-  if (loginAssist) {
-    router.get("/api/login-assist/pending", (ctx: any) => {
-      ctx.body = loginAssist.listPending();
-    });
-    router.post("/api/login-assist/submit", async (ctx: any) => {
-      const body = ctx.request?.body as { id: string; value?: string | Record<string, unknown> };
-      if (!body?.id) {
-        ctx.status = 400;
-        ctx.body = { error: "missing id" };
-        return;
-      }
-      const ok = loginAssist.submit(body.id, body.value ?? "");
-      ctx.body = { ok };
-    });
-    router.post("/api/login-assist/cancel", async (ctx: any) => {
-      const body = ctx.request?.body as { id: string; reason?: string };
-      if (!body?.id) {
-        ctx.status = 400;
-        ctx.body = { error: "missing id" };
-        return;
-      }
-      const ok = loginAssist.cancel(body.id, body.reason);
-      ctx.body = { ok };
-    });
-  }
-
-  router.get("/api/icqq/bots", async (ctx) => {
-    try {
-      const bots = Array.from(icqq.bots.values());
-      if (bots.length === 0) {
-        ctx.body = { success: true, data: [], message: "暂无ICQQ机器人实例" };
-        return;
-      }
-      const result = bots.map((bot) => {
-        try {
-          return {
-            name: bot.$config.name,
-            connected: bot.$connected || false,
-            groupCount: bot.gl?.size || 0,
-            friendCount: bot.fl?.size || 0,
-            receiveCount: bot.stat?.recv_msg_cnt || 0,
-            sendCount: bot.stat?.sent_msg_cnt || 0,
-            loginMode: bot.$config.password ? "password" : "qrcode",
-            status: bot.$connected ? "online" : "offline",
-            lastActivity: new Date().toISOString(),
-          };
-        } catch {
-          return {
-            name: bot.$config.name,
-            connected: false,
-            groupCount: 0,
-            friendCount: 0,
-            receiveCount: 0,
-            sendCount: 0,
-            loginMode: "unknown",
-            status: "error",
-            error: "数据获取失败",
-          };
-        }
-      });
-      ctx.body = { success: true, data: result, timestamp: new Date().toISOString() };
-    } catch (error) {
-      ctx.status = 500;
-      ctx.body = {
-        success: false,
-        error: "ICQQ_API_ERROR",
-        message: "获取机器人数据失败",
-        details: process.env.NODE_ENV === "development" ? (error as Error).message : undefined,
-        timestamp: new Date().toISOString(),
-      };
-    }
-  });
-});
+export {
+  Actions,
+  formatInboundContent,
+  formatOutboundBody,
+  icqqInboundConversation,
+  icqqOutboundTarget,
+  type ActionResult,
+  type IcqqEndpointConfig,
+  type IcqqInboundMessage,
+  type IcqqWireSegment,
+  type ParsedIcqqSendTarget,
+  type ResolvedIcqqConfig,
+} from './protocol.js';
+
+export {
+  IcqqEndpoint,
+  type IcqqEndpointOptions,
+} from './endpoint.js';
+
+export * from './types.js';
+
+export {
+  icqqClient,
+  type IcqqClient,
+  type IcqqClientEventMap,
+} from './client.js';
+
+export {
+  resolveIcqqInboundMessageId,
+} from './icqq-inbound.js';

package/src/outbound-media.ts

@@ -0,0 +1,103 @@
+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/im-contract';
+import type { MessageSegment, SendContent } from "zhin.js";
+import type { IcqqEndpointConfig } from "./protocol.js";
+
+export type IcqqOutboundMediaMode = "file" | "base64";
+
+function extForMime(mime: string, fallback: string): string {
+  const map: Record<string, string> = {
+    "image/jpeg": ".jpg",
+    "image/png": ".png",
+    "image/gif": ".gif",
+    "image/webp": ".webp",
+    "audio/mpeg": ".mp3",
+    "audio/wav": ".wav",
+    "video/mp4": ".mp4",
+  };
+  return map[mime] || fallback;
+}
+
+function spoolBase64ToFile(
+  base64: string,
+  mime: string,
+  kind: string,
+): string {
+  const dir = path.join(os.tmpdir(), "zhin-icqq-outbound");
+  fs.mkdirSync(dir, { recursive: true });
+  const ext = extForMime(mime, kind === "audio" ? ".mp3" : kind === "video" ? ".mp4" : ".bin");
+  const filePath = path.join(dir, `${kind}-${crypto.randomBytes(6).toString("hex")}${ext}`);
+  fs.writeFileSync(filePath, Buffer.from(base64, "base64"));
+  return filePath;
+}
+
+export function resolveIcqqOutboundMediaMode(
+  config: Pick<IcqqEndpointConfig, "outboundMedia">,
+): IcqqOutboundMediaMode {
+  if (config.outboundMedia === "base64" || config.outboundMedia === "file") {
+    return config.outboundMedia;
+  }
+  return "file";
+}
+
+/**
+ * file 模式：将 canonical MediaRef（`data.media`，kind=base64）物化为本机路径，
+ * 并把 media 改写为 path 引用（icqq 客户端直接读盘）。
+ * base64 模式：不改动（由 native Sendable projection 生成 base64:// file）。
+ */
+export interface PreparedIcqqOutboundMedia {
+  readonly content: SendContent;
+  dispose(): void;
+}
+
+export function prepareIcqqOutboundMedia(
+  content: SendContent,
+  mode: IcqqOutboundMediaMode = "file",
+): PreparedIcqqOutboundMedia {
+  if (mode === "base64") return { content, dispose() {} };
+
+  const createdFiles: string[] = [];
+  const inputWasArray = Array.isArray(content);
+  const segments = Array.isArray(content) ? content : [content];
+  const materialized = segments.map((seg) => {
+    if (typeof seg === "string") return seg;
+    const { type, data } = seg as MessageSegment;
+    if (!data || typeof data !== "object") return seg;
+    const d = data as Record<string, unknown>;
+    const media = d.media;
+    if (!isMediaRef(media) || media.kind !== "base64") return seg;
+    const b64 = media.value.replace(/^base64:\/\//, "");
+    if (!b64) return seg;
+    if (type !== "image" && type !== "record" && type !== "audio" && type !== "video") {
+      return seg;
+    }
+
+    const mime = media.mime_type ?? "";
+    const filePath = spoolBase64ToFile(
+      b64,
+      mime || (type === "image" ? "image/jpeg" : type === "video" ? "video/mp4" : "audio/mpeg"),
+      type === "record" || type === "audio" ? "audio" : type,
+    );
+    createdFiles.push(filePath);
+    return {
+      type,
+      data: {
+        ...d,
+        media: {
+          kind: "path",
+          value: filePath,
+          ...(mime ? { mime_type: mime } : {}),
+        },
+      },
+    } as MessageSegment;
+  });
+  return {
+    content: inputWasArray ? materialized : materialized[0]!,
+    dispose() {
+      for (const filePath of createdFiles) fs.rmSync(filePath, { force: true });
+    },
+  };
+}