@zhin.js/adapter-icqq 6.0.1 → 6.0.3

package/src/icqq-login-assist-bridge.ts

@@ -1,196 +0,0 @@
-/**
- * 将 icqq 守护进程 IPC 的 system.login.* 事件桥接到 core LoginAssist。
- *
- * 推送契约（@icqqjs/cli IpcEvent）：
- *   { id: "*", event: "system.login.auth", data: { url, device } }
- * 须在 endpoint.handleEvent 中按 event.event 先行处理（非 OneBot post_type）。
- *
- * 续传契约（LoginIpcActions ↔ LoginFlow）见 login-ipc-contract.ts。
- */
-import type { LoginAssist, LoginAssistType } from '@zhin.js/core';
-import type { IcqqEndpoint } from './endpoint.js';
-import {
-  LoginIpcActions,
-  type IcqqLoginDeviceInfo,
-} from './login-ipc-contract.js';
-
-const activeByEndpoint = new Set<string>();
-
-function asRecord(value: unknown): Record<string, unknown> | null {
-  return value && typeof value === 'object' && !Array.isArray(value)
-    ? (value as Record<string, unknown>)
-    : null;
-}
-
-function resolveQrcodeImage(data: Record<string, unknown>): string | undefined {
-  const image = data.image;
-  if (image && typeof image === 'object') {
-    const buf = image as { type?: string; data?: string };
-    if (buf.type === 'Buffer' && typeof buf.data === 'string') {
-      return `data:image/png;base64,${buf.data}`;
-    }
-  }
-  if (typeof data.url === 'string' && data.url.startsWith('data:image')) {
-    return data.url;
-  }
-  return undefined;
-}
-
-function mapLoginEvent(
-  eventName: string,
-  data: Record<string, unknown>,
-): { type: LoginAssistType; payload: Record<string, unknown> } | null {
-  switch (eventName) {
-    case 'system.login.qrcode':
-      return {
-        type: 'qrcode',
-        payload: {
-          message: '请使用手机 QQ 扫码登录',
-          image: resolveQrcodeImage(data),
-        },
-      };
-    case 'system.login.slider':
-      return {
-        type: 'slider',
-        payload: {
-          message: '请完成滑块验证并提交 ticket',
-          url: String(data.url ?? ''),
-        },
-      };
-    case 'system.login.device':
-      return {
-        type: 'device',
-        payload: {
-          message: data.phone
-            ? `请完成设备锁验证（密保手机 ${String(data.phone)}）`
-            : '请完成设备锁验证',
-          url: String(data.url ?? ''),
-          phone: data.phone,
-        },
-      };
-    case 'system.login.auth':
-      return {
-        type: 'auth',
-        payload: {
-          message: '请在浏览器完成身份验证（需使用下方设备信息）',
-          url: String(data.url ?? ''),
-          device: data.device as IcqqLoginDeviceInfo | undefined,
-        },
-      };
-  }
-  return null;
-}
-
-/** 对齐 @icqqjs/cli LoginFlow.handleSubmit → Client 方法 */
-async function continueLoginAfterAssist(
-  endpoint: IcqqEndpoint,
-  loginType: LoginAssistType,
-  value: string | Record<string, unknown>,
-): Promise<void> {
-  if (!endpoint.ipc || endpoint.ipc.closed) return;
-
-  try {
-    if (loginType === 'slider') {
-      const ticket =
-        typeof value === 'string'
-          ? value.trim()
-          : typeof value === 'object' && value !== null
-            ? String((value as { ticket?: string }).ticket ?? '').trim()
-            : '';
-      if (!ticket) return;
-      await endpoint.ipc.request(LoginIpcActions.SUBMIT_SLIDER, { ticket });
-      return;
-    }
-
-    if (loginType === 'sms') {
-      const code = typeof value === 'string' ? value.trim() : '';
-      if (!code) return;
-      await endpoint.ipc.request(LoginIpcActions.SUBMIT_SMS_CODE, { code });
-      return;
-    }
-
-    if (loginType === 'device') {
-      if (
-        typeof value === 'object' &&
-        value !== null &&
-        (value as { action?: string }).action === 'sms'
-      ) {
-        await endpoint.ipc.request(LoginIpcActions.SEND_SMS_CODE, {});
-        return;
-      }
-      if (typeof value === 'string' && value.trim()) {
-        await endpoint.ipc.request(LoginIpcActions.SUBMIT_SMS_CODE, {
-          code: value.trim(),
-        });
-        return;
-      }
-    }
-
-    // qrcode / device 链接确认 / auth 237 确认 → client.login()
-    await endpoint.ipc.request(LoginIpcActions.LOGIN, {});
-  } catch (err) {
-    endpoint.logger.warn(
-      `登录辅助提交后 IPC 续传失败：${
-        err instanceof Error ? err.message : String(err)
-      }（action 须与 @icqqjs/cli action-catalog 一致）`,
-    );
-  }
-}
-
-export function handleIcqqLoginIpcEvent(
-  endpoint: IcqqEndpoint,
-  eventName: string,
-  rawData: unknown,
-): void {
-  if (!eventName.startsWith('system.login.')) return;
-
-  const root = endpoint.adapter.plugin.root;
-  const loginAssist = root.inject('loginAssist') as LoginAssist | undefined;
-  if (!loginAssist) {
-    endpoint.logger.debug(`收到 ${eventName}，但 loginAssist 未启用`);
-    return;
-  }
-
-  if (eventName === 'system.login.error') {
-    const data = asRecord(rawData);
-    endpoint.logger.warn(
-      `icqq 登录错误：${String(data?.message ?? 'unknown')}${
-        data?.code != null ? ` [code=${String(data.code)}]` : ''
-      }`,
-    );
-    return;
-  }
-
-  const data = asRecord(rawData);
-  if (!data) return;
-
-  const mapped = mapLoginEvent(eventName, data);
-  if (!mapped) return;
-
-  const guardKey = endpoint.$id;
-  if (activeByEndpoint.has(guardKey)) {
-    endpoint.logger.debug(`跳过重复登录待办：${eventName}`);
-    return;
-  }
-  activeByEndpoint.add(guardKey);
-
-  endpoint.logger.info(`icqq 登录待办：${mapped.type}（${eventName}）`);
-
-  void loginAssist
-    .waitForInput('icqq', endpoint.$id, mapped.type, mapped.payload)
-    .then((value) => continueLoginAfterAssist(endpoint, mapped.type, value))
-    .catch((err) => {
-      if (err instanceof Error && err.message !== 'cancelled') {
-        endpoint.logger.warn(`登录辅助已取消或失败：${err.message}`);
-      }
-    })
-    .finally(() => {
-      activeByEndpoint.delete(guardKey);
-    });
-}
-
-export function disposeIcqqLoginAssistBridge(endpointId: string): void {
-  activeByEndpoint.delete(endpointId);
-}
-
-export type { IcqqLoginDeviceInfo } from './login-ipc-contract.js';

package/src/icqq-side-events.ts

@@ -1,228 +0,0 @@
-/**
- * icqq IPC 非 message 入站：notice / request / meta（对齐 OneBot 与 @icqqjs/icqq EventMap）
- * @see https://icqq.pages.dev/interfaces/EventMap.html
- */
-import { Notice, Request, formatCompact } from "zhin.js";
-import type { NoticeType } from "zhin.js";
-import type { RequestType } from "zhin.js";
-import { Actions } from "./protocol.js";
-import type { IpcClient } from "./ipc-client.js";
-
-/** OneBot / icqq 守护进程推送的通用事件字段 */
-export interface IcqqIpcRawEvent {
-  post_type?: string;
-  time?: number;
-  self_id?: number;
-  notice_type?: string;
-  request_type?: string;
-  sub_type?: string;
-  meta_event_type?: string;
-  group_id?: number;
-  user_id?: number;
-  operator_id?: number;
-  flag?: string;
-  comment?: string;
-  [key: string]: unknown;
-}
-
-export function resolveIcqqEventPostType(
-  data: Record<string, unknown>,
-): string | undefined {
-  const pt = data.post_type;
-  if (typeof pt === "string" && pt !== "") return pt;
-  if (data.notice_type != null) return "notice";
-  if (data.request_type != null) return "request";
-  if (data.meta_event_type != null) return "meta_event";
-  return undefined;
-}
-
-export function isIcqqNoticePayload(data: unknown): data is IcqqIpcRawEvent {
-  if (!data || typeof data !== "object") return false;
-  const pt = resolveIcqqEventPostType(data as Record<string, unknown>);
-  return pt === "notice" || (typeof pt === "string" && pt.startsWith("notice."));
-}
-
-export function isIcqqRequestPayload(data: unknown): data is IcqqIpcRawEvent {
-  if (!data || typeof data !== "object") return false;
-  const pt = resolveIcqqEventPostType(data as Record<string, unknown>);
-  return pt === "request" || (typeof pt === "string" && pt.startsWith("request."));
-}
-
-export function isIcqqMetaPayload(data: unknown): data is IcqqIpcRawEvent {
-  if (!data || typeof data !== "object") return false;
-  const pt = resolveIcqqEventPostType(data as Record<string, unknown>);
-  return pt === "meta_event" || (typeof pt === "string" && pt.startsWith("system."));
-}
-
-/** 去重用：notice / request 无稳定 id 时组合键 */
-export function resolveSideEventDedupeKey(
-  data: IcqqIpcRawEvent,
-  kind: "notice" | "request" | "meta",
-): string {
-  if (data.flag != null && String(data.flag) !== "") {
-    return `${kind}:${data.flag}`;
-  }
-  const time = data.time ?? 0;
-  const type =
-    data.notice_type ?? data.request_type ?? data.meta_event_type ?? kind;
-  const scope = data.group_id ?? data.user_id ?? "";
-  const sub = data.sub_type ?? "";
-  return `${kind}:${time}_${type}_${scope}_${sub}`;
-}
-
-const NOTICE_TYPE_MAP: Record<string, NoticeType> = {
-  group_increase: "group_member_increase",
-  group_decrease: "group_member_decrease",
-  group_admin: "group_admin_change",
-  group_ban: "group_ban",
-  group_recall: "group_recall",
-  friend_recall: "friend_recall",
-  friend_add: "friend_add",
-  group_upload: "group_upload",
-  group_sign: "group_sign",
-  group_transfer: "group_transfer",
-  // icqq EventMap 命名 → Zhin NoticeType
-  "group.increase": "group_member_increase",
-  "group.decrease": "group_member_decrease",
-  "group.admin": "group_admin_change",
-  "group.ban": "group_ban",
-  "group.recall": "group_recall",
-  "friend.increase": "friend_add",
-  "friend.decrease": "friend_recall",
-  "friend.recall": "friend_recall",
-};
-
-function resolveNoticeZhinType(event: IcqqIpcRawEvent): NoticeType {
-  const raw = event.notice_type ?? "";
-  if (NOTICE_TYPE_MAP[raw]) return NOTICE_TYPE_MAP[raw];
-  if (raw === "notify") {
-    if (event.sub_type === "poke") {
-      return event.group_id != null ? "group_poke" : "friend_poke";
-    }
-    return `notify_${event.sub_type ?? "unknown"}` as NoticeType;
-  }
-  if (raw.startsWith("notice.")) {
-    const suffix = raw.slice("notice.".length).replace(/\./g, "_");
-    return (NOTICE_TYPE_MAP[suffix] ?? suffix) as NoticeType;
-  }
-  return raw as NoticeType;
-}
-
-function senderFromId(id: unknown, name?: string) {
-  if (id == null) return undefined;
-  const s = String(id);
-  return { id: s, name: name ?? s };
-}
-
-export function formatIcqqNotice(
-  event: IcqqIpcRawEvent,
-  endpointName: string,
-): ReturnType<typeof Notice.from<IcqqIpcRawEvent>> {
-  const $type = resolveNoticeZhinType(event);
-  const isGroup = event.group_id != null;
-  const channelId = String(
-    event.group_id ?? event.user_id ?? event.operator_id ?? "",
-  );
-  const tsSec = event.time ?? Math.floor(Date.now() / 1000);
-
-  return Notice.from(event, {
-    $id: resolveSideEventDedupeKey(event, "notice"),
-    $adapter: "icqq",
-    $endpoint: endpointName,
-    $type,
-    $subType: event.sub_type,
-    $channel: {
-      id: channelId,
-      type: isGroup ? "group" : "private",
-    },
-    $operator: senderFromId(event.operator_id),
-    $target: senderFromId(event.user_id),
-    $timestamp: tsSec * 1000,
-  });
-}
-
-function resolveRequestZhinType(event: IcqqIpcRawEvent): RequestType {
-  const rt = event.request_type ?? "";
-  if (rt === "friend" || rt.startsWith("friend")) return "friend_add";
-  if (rt === "group" || rt.startsWith("group")) {
-    return event.sub_type === "invite" ? "group_invite" : "group_add";
-  }
-  return rt as RequestType;
-}
-
-export function formatIcqqRequest(
-  event: IcqqIpcRawEvent,
-  endpointName: string,
-  ipc: IpcClient,
-): ReturnType<typeof Request.from<IcqqIpcRawEvent>> {
-  const $type = resolveRequestZhinType(event);
-  const isGroup = event.group_id != null;
-  const channelId = String(event.group_id ?? event.user_id ?? "");
-  const tsSec = event.time ?? Math.floor(Date.now() / 1000);
-  const flag = event.flag ?? resolveSideEventDedupeKey(event, "request");
-
-  const isFriend =
-    event.request_type === "friend" ||
-    (typeof event.request_type === "string" &&
-      event.request_type.startsWith("friend"));
-
-  return Request.from(event, {
-    $id: String(flag),
-    $adapter: "icqq",
-    $endpoint: endpointName,
-    $type,
-    $subType: event.sub_type,
-    $channel: {
-      id: channelId,
-      type: isGroup ? "group" : "private",
-    },
-    $sender: senderFromId(event.user_id) ?? { id: "", name: "" },
-    $comment: event.comment,
-    $timestamp: tsSec * 1000,
-    $approve: async (remark?: string) => {
-      const action = isFriend
-        ? Actions.HANDLE_FRIEND_REQUEST
-        : Actions.HANDLE_GROUP_REQUEST;
-      const params: Record<string, unknown> = {
-        flag: event.flag ?? flag,
-        approve: true,
-      };
-      if (remark) params.remark = remark;
-      if (!isFriend && event.sub_type) params.sub_type = event.sub_type;
-      const resp = await ipc.request(action, params);
-      if (!resp.ok) throw new Error(resp.error ?? "同意请求失败");
-    },
-    $reject: async (reason?: string) => {
-      const action = isFriend
-        ? Actions.HANDLE_FRIEND_REQUEST
-        : Actions.HANDLE_GROUP_REQUEST;
-      const params: Record<string, unknown> = {
-        flag: event.flag ?? flag,
-        approve: false,
-      };
-      if (reason) params.reason = reason;
-      if (!isFriend && event.sub_type) params.sub_type = event.sub_type;
-      const resp = await ipc.request(action, params);
-      if (!resp.ok) throw new Error(resp.error ?? "拒绝请求失败");
-    },
-  });
-}
-
-/** meta_event / system.*：返回是否建议在上线后刷新好友/群列表 */
-export function shouldRefreshListsOnMeta(event: IcqqIpcRawEvent): boolean {
-  if (event.meta_event_type === "lifecycle") {
-    const sub = event.sub_type;
-    return sub === "connect" || sub === "enable";
-  }
-  const pt = event.post_type ?? "";
-  if (pt === "system.online" || pt.endsWith(".online")) return true;
-  return false;
-}
-
-export function formatIcqqMetaLog(event: IcqqIpcRawEvent): string {
-  return formatCompact({
-    meta: event.meta_event_type ?? event.post_type ?? "meta",
-    sub_type: event.sub_type,
-    time: event.time,
-  });
-}

package/src/login-assist-routes.ts

@@ -1,39 +0,0 @@
-/**
- * loginAssist HTTP 路由（供 Web 控制台 /icqq 登录辅助 Tab）
- */
-import type { Router } from "@zhin.js/host-router";
-import type { Plugin } from "zhin.js";
-
-export function registerLoginAssistRoutes(router: Router, root: Plugin): void {
-  const loginAssist = root.inject("loginAssist");
-  if (!loginAssist) return;
-
-  router.get("/api/login-assist/pending", async (ctx) => {
-    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 = { success: false, message: "missing id" };
-      return;
-    }
-    const ok = loginAssist.submit(body.id, body.value ?? "");
-    ctx.body = { success: 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 = { success: false, message: "missing id" };
-      return;
-    }
-    const ok = loginAssist.cancel(body.id, body.reason);
-    ctx.body = { success: ok };
-  });
-}

package/src/login-ipc-contract.ts

@@ -1,52 +0,0 @@
-/**
- * ICQQ 登录 IPC 契约（与 @icqqjs/cli / @icqqjs/icqq 对齐）
- *
- * **推送（Daemon → Client）** — 见 @icqqjs/cli `src/daemon/protocol.ts` 的 `IpcEvent`：
- * ```json
- * { "id": "*", "event": "system.login.auth", "data": { "url", "device" } }
- * ```
- * 事件名与载荷形状以 @icqqjs/icqq `EventMap` 为准（非 OneBot `post_type`）。
- *
- * **续传（Client → Daemon）** — 与 CLI `LoginFlow` / `AccountBootstrap` 对 icqq Client 的调用一致，
- * action 名为 Client 方法的 snake_case；收录于守护进程 `action-catalog` 后可通过 IPC invoke。
- *
- * @see https://github.com/icqqjs/cli/blob/master/src/daemon/protocol.ts
- * @see https://github.com/icqqjs/cli/blob/master/src/lib/account-bootstrap.ts
- * @see https://github.com/icqqjs/cli/blob/master/src/components/LoginFlow.tsx
- */
-
-/** system.login.auth 等设备指纹（@icqqjs/icqq EventMap） */
-export interface IcqqLoginDeviceInfo {
-  guid?: string;
-  qimei?: string;
-  qimei36?: string;
-  subappid?: string;
-  platform?: string;
-  brand?: string;
-  model?: string;
-  bssid?: string;
-  devInfo?: string;
-  sysVersion?: string;
-}
-
-/** 登录续传 IPC action（与 LoginFlow → Client 方法一一对应） */
-export const LoginIpcActions = {
-  /** 扫码确认 / 设备锁链接确认 / auth 237 验证完成后继续 — client.login() */
-  LOGIN: 'login',
-  /** 滑块 ticket — client.submitSlider(ticket) */
-  SUBMIT_SLIDER: 'submit_slider',
-  /** 设备锁短信验证码 — client.submitSmsCode(code) */
-  SUBMIT_SMS_CODE: 'submit_sms_code',
-  /** 请求发送设备锁短信 — client.sendSmsCode() */
-  SEND_SMS_CODE: 'send_sms_code',
-} as const;
-
-export type LoginIpcAction = (typeof LoginIpcActions)[keyof typeof LoginIpcActions];
-
-/** CLI LoginFlow 237 验证步骤（供 Web 控制台展示） */
-export const AUTH_DEVICE_STEPS = [
-  '打开上方验证链接，正常完成验证流程，直到发送完验证码，不要点击「我已发送」',
-  '复制下方 JS，打开浏览器开发者工具（F12）→ Console，粘贴并回车',
-  '在弹窗中粘贴设备信息 JSON 并确认（可使用下方单行 JSON）',
-  '回到验证页点击「我已发送」，完成 237 验证后回到控制台点击确认',
-] as const;

package/src/routes.ts

@@ -1,83 +0,0 @@
-/**
- * ICQQ HTTP 路由注册 — 通过 IPC 查询守护进程数据
- */
-import type { Router } from "@zhin.js/host-router";
-import type { Plugin } from "zhin.js";
-import type { IcqqAdapter } from "./adapter.js";
-import { Actions } from "./protocol.js";
-
-export function registerRoutes(
-  router: Router,
-  icqq: IcqqAdapter,
-  _root: Plugin,
-) {
-  router.get("/api/icqq/endpoints", async (ctx) => {
-    try {
-      const endpoints = Array.from(icqq.endpoints.values());
-      if (endpoints.length === 0) {
-        ctx.body = { success: true, data: [], message: "暂无ICQQEndpoint 实例" };
-        return;
-      }
-      const result = await Promise.all(
-        endpoints.map(async (endpoint) => {
-          try {
-            const base: Record<string, unknown> = {
-              name: endpoint.$config.name,
-              connected: endpoint.$connected || false,
-              groupCount: endpoint.groups.size,
-              friendCount: endpoint.friends.size,
-              status: endpoint.$connected ? "online" : "offline",
-              lastActivity: new Date().toISOString(),
-            };
-
-            // 尝试从守护进程获取详细状态
-            if (endpoint.$connected && endpoint.ipc && !endpoint.ipc.closed) {
-              try {
-                const statusResp = await endpoint.ipc.request(
-                  Actions.GET_STATUS,
-                  {},
-                  5000,
-                );
-                if (statusResp.ok && statusResp.data) {
-                  const stat = statusResp.data as Record<string, unknown>;
-                  base.receiveCount = stat.recv_msg_cnt ?? 0;
-                  base.sendCount = stat.sent_msg_cnt ?? 0;
-                }
-              } catch {
-                // status 查询超时，忽略
-              }
-            }
-
-            return base;
-          } catch {
-            return {
-              name: endpoint.$config.name,
-              connected: false,
-              groupCount: 0,
-              friendCount: 0,
-              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: "获取 Endpoint 数据失败",
-        details:
-          process.env.NODE_ENV === "development"
-            ? (error as Error).message
-            : undefined,
-        timestamp: new Date().toISOString(),
-      };
-    }
-  });
-}

package/src/segment-mapper.ts

@@ -1 +0,0 @@
-export { toCanonicalSegments, fromCanonicalSegments } from 'zhin.js';