@zhin.js/adapter-icqq 1.1.28 → 1.1.30

package/commands/icqq/login/qr/index.js

@@ -1,6 +1,6 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
 import { defineCommand } from 'zhin.js/command';
-import { icqqLoginControls, icqqLoginForbidden, isIcqqLoginOperator, pickIcqqLoginControl, } from '../definition.js';
+import { activeIcqqChallenge, challengeCommandHint, challengeLinks, icqqLoginControls, icqqLoginForbidden, isIcqqLoginOperator, pendingTaskLabel, pickIcqqLoginControl, } from '../definition.js';
 const QR_IMAGE = /^data:image\/[a-z0-9.+-]+;base64,(.+)$/iu;
 export default defineCommand({
     description: '获取 ICQQ 登录二维码（发给当前会话）',
@@ -12,36 +12,34 @@ export default defineCommand({
         if (!picked.control)
             return picked.text ?? 'ICQQ 适配器还没有启动';
         const control = picked.control;
-        const findQr = () => control.pending().find((task) => task.type === 'qrcode' || task.type === 'auth');
-        let task = findQr();
-        if (!task) {
-            const other = control.pending().find((item) => item.type !== 'qrcode' && item.type !== 'auth');
-            if (other) {
-                const url = typeof other.payload.url === 'string' ? other.payload.url : '';
-                return `ICQQ ${other.endpointKey} 当前是${other.type === 'slider' ? '滑块验证' : '登录验证'}，请打开 ${url || '验证页面'}，`
-                    + '完成后回复 `icqq login code <内容>`。';
-            }
+        let active = activeIcqqChallenge(control);
+        if (active && active.challenge.kind !== 'qrcode') {
+            const links = challengeLinks(active.challenge).map((link) => `${link.label}：${link.url}`);
+            return [`ICQQ ${control.endpointId} 当前是${pendingTaskLabel(active.challenge.kind)}，不是扫码登录。`, ...links,
+                challengeCommandHint(active.challenge.kind, control.endpointId)].join('\n');
+        }
+        if (!active) {
             try {
                 await control.relogin();
             }
             catch {
                 // The SDK may still deliver a QR challenge asynchronously.
             }
-            task = findQr();
-            if (!task)
+            active = activeIcqqChallenge(control);
+            if (!active || active.challenge.kind !== 'qrcode')
                 return '已触发重新登录，请 5 秒后再发送 `icqq login qr` 获取二维码。';
         }
-        const raw = typeof task.payload.image === 'string' ? task.payload.image : '';
+        const raw = active.challenge.media?.qrImage ?? '';
         const base64 = QR_IMAGE.exec(raw)?.[1];
         if (!base64) {
-            return `ICQQ ${task.endpointKey} 当前是 ${task.type === 'qrcode' ? '二维码' : '登录确认'}待办，但没有可发送的图片；请打开 Console 的 ICQQ 页面完成。`;
+            return `ICQQ ${control.endpointId} 正在等待扫码，但没有可发送的二维码图片；请打开 Console 的 ICQQ 页面完成。`;
         }
         return [
             {
                 type: 'text',
                 data: {
-                    text: `ICQQ ${task.endpointKey} 登录二维码（约 3 分钟有效）。\n`
-                        + '用手机 QQ 扫码，完成后回复 `icqq login confirm`。',
+                    text: `ICQQ ${control.endpointId} 登录二维码（约 2 分钟有效）。\n`
+                        + '用手机 QQ 扫码，并在手机上确认登录，登录会自动继续；没有继续时回复 `icqq login confirm`。',
                 },
             },
             {

package/commands/icqq/login/qr/index.ts

@@ -1,8 +1,12 @@
 import { defineCommand } from 'zhin.js/command';
 import {
+  activeIcqqChallenge,
+  challengeCommandHint,
+  challengeLinks,
   icqqLoginControls,
   icqqLoginForbidden,
   isIcqqLoginOperator,
+  pendingTaskLabel,
   pickIcqqLoginControl,
 } from '../definition.js';
 
@@ -16,34 +20,32 @@ export default defineCommand({
     const picked = pickIcqqLoginControl(icqqLoginControls({ project, owner }), args[0]);
     if (!picked.control) return picked.text ?? 'ICQQ 适配器还没有启动';
     const control = picked.control;
-    const findQr = () => control.pending().find((task) => task.type === 'qrcode' || task.type === 'auth');
-    let task = findQr();
-    if (!task) {
-      const other = control.pending().find((item) => item.type !== 'qrcode' && item.type !== 'auth');
-      if (other) {
-        const url = typeof other.payload.url === 'string' ? other.payload.url : '';
-        return `ICQQ ${other.endpointKey} 当前是${other.type === 'slider' ? '滑块验证' : '登录验证'}，请打开 ${url || '验证页面'}，`
-          + '完成后回复 `icqq login code <内容>`。';
-      }
+    let active = activeIcqqChallenge(control);
+    if (active && active.challenge.kind !== 'qrcode') {
+      const links = challengeLinks(active.challenge).map((link) => `${link.label}：${link.url}`);
+      return [`ICQQ ${control.endpointId} 当前是${pendingTaskLabel(active.challenge.kind)}，不是扫码登录。`, ...links,
+        challengeCommandHint(active.challenge.kind, control.endpointId)].join('\n');
+    }
+    if (!active) {
       try {
         await control.relogin();
       } catch {
         // The SDK may still deliver a QR challenge asynchronously.
       }
-      task = findQr();
-      if (!task) return '已触发重新登录，请 5 秒后再发送 `icqq login qr` 获取二维码。';
+      active = activeIcqqChallenge(control);
+      if (!active || active.challenge.kind !== 'qrcode') return '已触发重新登录，请 5 秒后再发送 `icqq login qr` 获取二维码。';
     }
-    const raw = typeof task.payload.image === 'string' ? task.payload.image : '';
+    const raw = active.challenge.media?.qrImage ?? '';
     const base64 = QR_IMAGE.exec(raw)?.[1];
     if (!base64) {
-      return `ICQQ ${task.endpointKey} 当前是 ${task.type === 'qrcode' ? '二维码' : '登录确认'}待办，但没有可发送的图片；请打开 Console 的 ICQQ 页面完成。`;
+      return `ICQQ ${control.endpointId} 正在等待扫码，但没有可发送的二维码图片；请打开 Console 的 ICQQ 页面完成。`;
     }
     return [
       {
         type: 'text',
         data: {
-          text: `ICQQ ${task.endpointKey} 登录二维码（约 3 分钟有效）。\n`
-            + '用手机 QQ 扫码，完成后回复 `icqq login confirm`。',
+          text: `ICQQ ${control.endpointId} 登录二维码（约 2 分钟有效）。\n`
+            + '用手机 QQ 扫码，并在手机上确认登录，登录会自动继续；没有继续时回复 `icqq login confirm`。',
         },
       },
       {

package/commands/icqq/login/status/index.js

@@ -1,30 +1,49 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
 import { defineCommand } from 'zhin.js/command';
-import { icqqLoginControls, icqqLoginForbidden, isIcqqLoginOperator, pendingTaskLabel, pickIcqqLoginControl, } from '../definition.js';
+import { activeIcqqChallenge, challengeCommandHint, challengeLinks, icqqLoginControls, icqqLoginForbidden, isIcqqLoginOperator, pendingTaskLabel, pickIcqqLoginControl, } from '../definition.js';
 export default defineCommand({
-    description: '查看 ICQQ 掉线状态与登录待办',
-    descriptionI18n: { en: 'Show ICQQ offline status and pending login tasks' },
+    description: '查看 ICQQ 掉线状态与登录验证',
+    descriptionI18n: { en: 'Show ICQQ offline status and the pending login verification' },
     async execute({ args, config, input, project, owner }) {
         if (!isIcqqLoginOperator(config, input))
             return icqqLoginForbidden();
         const picked = pickIcqqLoginControl(icqqLoginControls({ project, owner }), args[0]);
         if (!picked.control)
             return picked.text ?? 'ICQQ 适配器还没有启动';
-        const state = picked.control.state();
-        const lines = [
-            `ICQQ ${state.endpointId}: ${state.online ? '在线' : '离线'}（${state.transportState}）`,
-        ];
-        if (state.pending.length === 0) {
-            lines.push('没有待处理的登录验证。');
+        const control = picked.control;
+        const state = control.state();
+        const lines = [`ICQQ ${state.endpointId}: ${state.online ? '在线' : '离线'}（${state.transportState}）`];
+        const flow = control.flow();
+        const active = activeIcqqChallenge(control);
+        if (active) {
+            const { challenge } = active;
+            lines.push(`待处理：${pendingTaskLabel(challenge.kind)}（${challenge.title}）`);
+            if (challenge.help?.short)
+                lines.push(challenge.help.short);
+            (challenge.help?.steps ?? []).forEach((step, index) => {
+                lines.push(`${index + 1}. ${typeof step === 'string' ? step : step.text}`);
+            });
+            if (challenge.help?.warning)
+                lines.push(`⚠ ${challenge.help.warning}`);
+            for (const link of challengeLinks(challenge))
+                lines.push(`${link.label}：${link.url}`);
+            lines.push(challengeCommandHint(challenge.kind, state.endpointId));
         }
-        else {
+        else if (state.pending.length > 0) {
+            // A challenge raised outside the login flow (another LoginAssist producer).
             lines.push('待处理：');
             for (const task of state.pending) {
                 const url = typeof task.payload.url === 'string' ? task.payload.url : undefined;
-                lines.push(`- ${pendingTaskLabel(task.type)}（${task.id}，endpoint ${task.endpointKey}）`
-                    + (url ? `：${url}` : ''));
+                lines.push(`- ${pendingTaskLabel(task.type)}（${task.id}）${url ? `：${url}` : ''}`);
+            }
+        }
+        else {
+            lines.push('没有待处理的登录验证。');
+            const outcome = flow?.lastOutcome;
+            if (flow && (flow.state === 'failed' || flow.state === 'expired')) {
+                lines.push(`上次登录${flow.state === 'expired' ? '验证已过期' : '失败'}${outcome?.message ? `：${outcome.message}` : ''}。`
+                    + '发送 `icqq login retry` 重新登录。');
             }
-            lines.push('二维码：`icqq login qr`；完成扫码后：`icqq login confirm`；滑块/短信：`icqq login code <内容>`。');
         }
         return lines.join('\n');
     },

package/commands/icqq/login/status/index.ts

@@ -1,5 +1,8 @@
 import { defineCommand } from 'zhin.js/command';
 import {
+  activeIcqqChallenge,
+  challengeCommandHint,
+  challengeLinks,
   icqqLoginControls,
   icqqLoginForbidden,
   isIcqqLoginOperator,
@@ -8,26 +11,41 @@ import {
 } from '../definition.js';
 
 export default defineCommand({
-  description: '查看 ICQQ 掉线状态与登录待办',
-  descriptionI18n: { en: 'Show ICQQ offline status and pending login tasks' },
+  description: '查看 ICQQ 掉线状态与登录验证',
+  descriptionI18n: { en: 'Show ICQQ offline status and the pending login verification' },
   async execute({ args, config, input, project, owner }) {
     if (!isIcqqLoginOperator(config, input)) return icqqLoginForbidden();
     const picked = pickIcqqLoginControl(icqqLoginControls({ project, owner }), args[0]);
     if (!picked.control) return picked.text ?? 'ICQQ 适配器还没有启动';
-    const state = picked.control.state();
-    const lines = [
-      `ICQQ ${state.endpointId}: ${state.online ? '在线' : '离线'}（${state.transportState}）`,
-    ];
-    if (state.pending.length === 0) {
-      lines.push('没有待处理的登录验证。');
-    } else {
+    const control = picked.control;
+    const state = control.state();
+    const lines = [`ICQQ ${state.endpointId}: ${state.online ? '在线' : '离线'}（${state.transportState}）`];
+    const flow = control.flow();
+    const active = activeIcqqChallenge(control);
+    if (active) {
+      const { challenge } = active;
+      lines.push(`待处理：${pendingTaskLabel(challenge.kind)}（${challenge.title}）`);
+      if (challenge.help?.short) lines.push(challenge.help.short);
+      (challenge.help?.steps ?? []).forEach((step, index) => {
+        lines.push(`${index + 1}. ${typeof step === 'string' ? step : step.text}`);
+      });
+      if (challenge.help?.warning) lines.push(`⚠ ${challenge.help.warning}`);
+      for (const link of challengeLinks(challenge)) lines.push(`${link.label}：${link.url}`);
+      lines.push(challengeCommandHint(challenge.kind, state.endpointId));
+    } else if (state.pending.length > 0) {
+      // A challenge raised outside the login flow (another LoginAssist producer).
       lines.push('待处理：');
       for (const task of state.pending) {
         const url = typeof task.payload.url === 'string' ? task.payload.url : undefined;
-        lines.push(`- ${pendingTaskLabel(task.type)}（${task.id}，endpoint ${task.endpointKey}）`
-          + (url ? `：${url}` : ''));
+        lines.push(`- ${pendingTaskLabel(task.type)}（${task.id}）${url ? `：${url}` : ''}`);
+      }
+    } else {
+      lines.push('没有待处理的登录验证。');
+      const outcome = flow?.lastOutcome;
+      if (flow && (flow.state === 'failed' || flow.state === 'expired')) {
+        lines.push(`上次登录${flow.state === 'expired' ? '验证已过期' : '失败'}${outcome?.message ? `：${outcome.message}` : ''}。`
+          + '发送 `icqq login retry` 重新登录。');
       }
-      lines.push('二维码：`icqq login qr`；完成扫码后：`icqq login confirm`；滑块/短信：`icqq login code <内容>`。');
     }
     return lines.join('\n');
   },

package/lib/endpoint.d.ts

@@ -14,13 +14,26 @@ export interface IcqqEndpointOptions {
     /** Out-of-band outage notifier; absent in tests/hosts without outbound. */
     readonly notifier?: AdapterOutageNotifier;
 }
+/**
+ * Log level of an ICQQ `system.*` event by meaning: coming online and login challenges waiting for
+ * the person (QR code, device lock, slider, identity check) are normal progress (`info`); only
+ * failures (login errors, going offline) are `warn`, so a routine login stays out of the warnings.
+ */
+export declare function icqqSystemEventLogLevel(type: string): 'info' | 'warn';
 export declare class IcqqEndpoint extends ManagedIcqqClient implements Endpoint {
     #private;
     readonly [endpointSpec]: EndpointSpecification;
     readonly endpointName: string;
     readonly loginControl: IcqqLoginControl;
     constructor(options: IcqqEndpointOptions);
-    /** Force a login attempt (manual recovery command). */
+    /** Force a login attempt (Console「重新登录」, recovery command): a new login flow. */
     relogin(): Promise<void>;
+    /**
+     * Console「刷新二维码」: a new QR code in place while a QR challenge is shown; any other
+     * challenge cannot be refreshed alone, so this logs in again.
+     */
+    refreshLoginChallenge(): Promise<void>;
     admit(msg: IcqqInboundMessage): Promise<void>;
 }
+/** Log line of a login challenge: its kind and the link's host, never the link, image or device. */
+export declare function loginChallengeLogLine(kind: string, payload: Record<string, unknown> | null): Record<string, unknown>;