@xmanrui/dsh-im 4.22.0 → 4.24.0

package/src/channels/whatsapp/whatsapp-controller.mjs

@@ -1,3 +1,4 @@
+import { extractConnectionEvidence, atConnectionStage, createConnectionDiagnostics } from '../shared/connection-error.mjs';
 import { randomUUID } from 'node:crypto';
 
 import { connectionTestMessage } from '../shared/connection-test.mjs';
@@ -39,6 +40,7 @@ export class WhatsappController {
   #deleteAuth;
   #deleteState;
   #logger;
+  #diagnostics;
   #runtimes = new Map();
   #errors = new Map();
   #attempts = new Map();
@@ -71,6 +73,14 @@ export class WhatsappController {
     this.#deleteAuth = deleteAuth;
     this.#deleteState = deleteState;
     this.#logger = logger;
+    this.#diagnostics = createConnectionDiagnostics({ channel: 'whatsapp', logger });
+  }
+
+  get diagnostics() { return this.#diagnostics; }
+
+  #failure(error, code, message) {
+    const stage = code.startsWith('qr-') ? 'qr.begin' : code === 'activation-failed' ? 'activation' : 'connection.start';
+    return this.#diagnostics.report(error, { reuse: true, stage, publicError: { code, message } }).publicError;
   }
 
   async initialize() {
@@ -82,7 +92,7 @@ export class WhatsappController {
           await this.#startRuntime(config);
           this.#errors.delete(config.botId);
         } catch (error) {
-          this.#errors.set(config.botId, safeError(
+          this.#errors.set(config.botId, this.#failure(error,
             error?.code === 'relink-required' ? 'relink-required' : 'connection-failed',
             error?.code === 'relink-required'
               ? t('WhatsApp 关联设备已失效，请移除后重新扫码。')
@@ -191,7 +201,7 @@ export class WhatsappController {
         await this.#startRuntime(config);
         this.#errors.delete(botId);
       } catch (error) {
-        this.#errors.set(botId, safeError(
+        this.#errors.set(botId, this.#failure(error,
           error?.code === 'relink-required' ? 'relink-required' : 'connection-failed',
           error?.code === 'relink-required'
             ? t('WhatsApp 关联设备已失效，请移除后重新扫码。')
@@ -245,7 +255,7 @@ export class WhatsappController {
       if (this.#closed) throw new Error('WhatsApp controller is closed');
       const config = this.#configStore.get(botId);
       if (!config) throw new Error('Unknown WhatsApp bot');
-      const saved = await this.#configStore.save({ ...config, ...accessPolicy });
+      const saved = await atConnectionStage('account.save', () => this.#configStore.save({ ...config, ...accessPolicy }), 'account-config');
       this.#runtimes.get(botId)?.setAccessPolicy?.(saved);
       this.#touch();
     });
@@ -253,24 +263,31 @@ export class WhatsappController {
   }
 
   async deleteBot(botId) {
+    const warnings = [];
     const config = this.#configStore.get(botId);
     if (!config) throw new Error('Unknown WhatsApp bot');
     await this.#withBotTransition(botId, async () => {
       await this.#stopRuntime(botId);
       try {
-        await this.#configStore.remove(botId);
+        await atConnectionStage('account.remove', () => this.#configStore.remove(botId), 'account-config');
       } catch (error) {
-        await this.#startRuntime(config).catch(() => undefined);
-        throw error;
+        if (!this.#configStore.get(botId)) {
+          warnings.push(this.#diagnostics.report(error, { operation: 'bot.delete', stage: 'workspace.cleanup', warning: true,
+            publicError: { code: 'workspace-cleanup-failed', message: '账号已移除，但本地状态清理失败。' } }).publicError);
+        } else {
+          await this.#startRuntime(config).catch(() => undefined);
+          throw error;
+        }
       }
-      await Promise.allSettled([
+      const cleanup = await Promise.allSettled([
         this.#deleteAuth(config.authDirectory),
         this.#deleteState({ botId, config }),
       ]);
+      for (const result of cleanup) if (result.status === 'rejected') warnings.push(this.#diagnostics.report(result.reason, { operation: 'bot.delete', stage: 'state.cleanup', warning: true, publicError: { code: 'cleanup-failed', message: '账号已移除，但本地状态清理失败。' } }).publicError);
       this.#errors.delete(botId);
       this.#touch();
     });
-    return this.status();
+    return { ...this.status(), ...(warnings.length ? { warnings } : {}) };
   }
 
   status() {
@@ -302,7 +319,7 @@ export class WhatsappController {
         },
         lastMessageError: publicMessageFailure(runtimeStatus?.lastMessageError),
         accessPolicy: normalizeWhatsappAccessPolicy(config),
-        error: structuredClone(this.#errors.get(config.botId) ?? null),
+        error: structuredClone(runtimeStatus?.error ?? this.#errors.get(config.botId) ?? null),
       };
     });
     const connectedCount = bots.filter((bot) => bot.connected).length;
@@ -351,13 +368,13 @@ export class WhatsappController {
     };
     try {
       if (record.controller.signal.aborted || this.#closed) throw Object.assign(new Error(), { name: 'AbortError' });
-      await this.#configStore.save(config);
+      await atConnectionStage('account.save', () => this.#configStore.save(config), 'account-config');
       if (record.controller.signal.aborted || this.#closed) throw Object.assign(new Error(), { name: 'AbortError' });
       try {
         await this.#startRuntime(config);
         this.#errors.delete(botId);
       } catch (error) {
-        this.#errors.set(botId, safeError('connection-failed', t('WhatsApp 已绑定，消息连接暂未就绪。')));
+        this.#errors.set(botId, this.#failure(error, 'connection-failed', t('WhatsApp 已绑定，消息连接暂未就绪。')));
         this.#logger.warn?.(`[dsh-im:whatsapp] bot ${botId} did not reconnect after QR binding`);
       }
       if (previous?.authDirectory && previous.authDirectory !== config.authDirectory) {
@@ -368,12 +385,12 @@ export class WhatsappController {
     } catch (error) {
       if (record.controller.signal.aborted || this.#closed || error?.name === 'AbortError') {
         await this.#stopRuntime(botId);
-        if (previous) await this.#configStore.save(previous).catch(() => undefined);
+        if (previous) await atConnectionStage('account.save', () => this.#configStore.save(previous), 'account-config').catch(() => undefined);
         else {
-          const removed = await this.#configStore.remove(botId).catch(() => null);
+          const removed = await atConnectionStage('account.remove', () => this.#configStore.remove(botId), 'account-config').catch(() => null);
           if (removed) {
             await this.#deleteState({ botId, config }).catch((cleanupError) => {
-              this.#logger.warn?.('[dsh-im:whatsapp] cancelled bot state cleanup failed:', cleanupError);
+              this.#logger.warn?.('[dsh-im:whatsapp] cancelled bot state cleanup failed:', extractConnectionEvidence(cleanupError).details);
             });
           }
         }
@@ -384,7 +401,7 @@ export class WhatsappController {
       } else {
         await this.#deleteAuth(record.authDirectory).catch(() => undefined);
         record.state = 'failed';
-        record.error = safeError('activation-failed', t('WhatsApp 已扫码，但无法保存关联设备。'));
+        record.error = this.#failure(error, 'activation-failed', t('WhatsApp 已扫码，但无法保存关联设备。'));
         this.#logger.error?.('[dsh-im:whatsapp] unable to persist linked-device session');
       }
     } finally {
@@ -413,11 +430,11 @@ export class WhatsappController {
     if (this.#closed) throw new Error('WhatsApp controller is closed');
     await this.#stopRuntime(config.botId);
     if (this.#closed) throw new Error('WhatsApp controller is closed');
-    const runtime = await this.#createRuntime({
+    const runtime = await atConnectionStage('runtime.prepare', () => this.#createRuntime({
       botId: config.botId,
       config,
       authDir: this.#authPath(config.authDirectory),
-    });
+    }));
     if (!runtime || typeof runtime.start !== 'function' || typeof runtime.stop !== 'function') {
       throw new TypeError('createRuntime returned an invalid WhatsApp runtime');
     }

package/src/channels/whatsapp/whatsapp-runtime.mjs

@@ -1,9 +1,11 @@
+import { createConnectionDiagnostics, atConnectionStage } from '../shared/connection-error.mjs';
 import { createHash, randomBytes } from 'node:crypto';
 
 import {
   areJidsSameUser,
   downloadMediaMessage,
   jidDecode,
+  jidNormalizedUser,
   normalizeMessageContent,
 } from '@whiskeysockets/baileys';
 
@@ -14,6 +16,7 @@ import { trackOutboundArtifactProviderPromise } from '../shared/semantic/artifac
 import { createWhatsappBridgeStatus, WhatsappHarnessBridge } from './whatsapp-bridge.mjs';
 import {
   WHATSAPP_ACCESS_MODES,
+  normalizeWhatsappAccountJid,
 } from './config-store.mjs';
 import { createWhatsappWebSession } from './whatsapp-web-session.mjs';
 
@@ -289,8 +292,22 @@ export function createWhatsappMediaDownloader({
   });
 }
 
+function whatsappAccountMatcher(accountJid, aliases) {
+  // PN and LID are separate identities unless the linked account supplies both.
+  const accountJids = new Set(
+    [accountJid, ...(Array.isArray(aliases) ? aliases : [])]
+      .map((jid) => normalizeWhatsappAccountJid(jidNormalizedUser(jid)))
+      .filter(Boolean),
+  );
+  return (jid) => {
+    const normalized = normalizeWhatsappAccountJid(jidNormalizedUser(jid));
+    return normalized !== null && accountJids.has(normalized);
+  };
+}
+
 export function normalizeWhatsappMessage(message, accountJid, {
   download = downloadMediaMessage,
+  accountAliases = [],
 } = {}) {
   const remoteJid = typeof message?.key?.remoteJid === 'string' ? message.key.remoteJid : '';
   const alternateRemoteJid = typeof message?.key?.remoteJidAlt === 'string'
@@ -300,8 +317,9 @@ export function normalizeWhatsappMessage(message, accountJid, {
     || remoteJid.endsWith('@newsletter')) return null;
   const group = remoteJid.endsWith('@g.us');
   const fromMe = message.key.fromMe === true;
+  const matchesAccount = whatsappAccountMatcher(accountJid, accountAliases);
   const selfChat = fromMe && !group
-    && [remoteJid, alternateRemoteJid].some((jid) => jid && areJidsSameUser(jid, accountJid));
+    && [remoteJid, alternateRemoteJid].some(matchesAccount);
   if (fromMe && !selfChat && !group) return null;
   const senderJid = fromMe ? accountJid : group ? message.key.participant : remoteJid;
   const senderAlternateJid = group && !fromMe ? message.key.participantAlt : alternateRemoteJid;
@@ -310,9 +328,9 @@ export function normalizeWhatsappMessage(message, accountJid, {
   const content = normalizeMessageContent(message.message);
   const context = messageContext(content);
   const mentioned = Array.isArray(context?.mentionedJid)
-    && context.mentionedJid.some((jid) => areJidsSameUser(jid, accountJid));
+    && context.mentionedJid.some(matchesAccount);
   const replyToSelf = typeof context?.participant === 'string'
-    && areJidsSameUser(context.participant, accountJid);
+    && matchesAccount(context.participant);
   const image = whatsappImageSource(message, content, download, { viewOnce });
   const file = whatsappFileSource(message, content, download);
   const replyTo = whatsappReplyReference(context);
@@ -677,6 +695,7 @@ export class WhatsappRuntime {
   #contextEnhancement;
   #accessPolicy;
   #logger;
+  #diagnostics;
   #replyTimeoutMs;
   #connectTimeoutMs;
   #mediaUploadTimeoutMs;
@@ -710,7 +729,7 @@ export class WhatsappRuntime {
     this.#state = state;
     this.#contextEnhancement = contextEnhancement;
     this.#accessPolicy = accessPolicy;
-    this.#logger = logger;
+    this.#logger = logger; this.#diagnostics = createConnectionDiagnostics({ channel: 'whatsapp', logger });
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#connectTimeoutMs = connectTimeoutMs;
     if (!Number.isSafeInteger(mediaUploadTimeoutMs) || mediaUploadTimeoutMs <= 0) {
@@ -738,8 +757,8 @@ export class WhatsappRuntime {
     await this.stop();
     this.#status.startedAt = new Date().toISOString();
     this.#status.connectionState = 'connecting';
-    this.#status.lastError = null;
-    await this.#harness.ensureRunning();
+    this.#status.lastError = null; this.#status.error = null; this.#diagnostics.clear();
+    await atConnectionStage('harness.check', () => this.#harness.ensureRunning());
     this.#status.harnessReachable = true;
     const controller = new AbortController();
     this.#abortController = controller;
@@ -757,7 +776,13 @@ export class WhatsappRuntime {
           { code: 'relink-required' },
         )),
         onMessage: async (raw, context) => {
+          const linkedAccount = context?.socket?.user;
           const message = normalizeWhatsappMessage(raw, this.#config.accountJid, {
+            accountAliases: [
+              linkedAccount?.id,
+              linkedAccount?.lid,
+              linkedAccount?.phoneNumber,
+            ],
             download: createWhatsappMediaDownloader({
               socket: context?.socket,
               logger: this.#logger,
@@ -771,7 +796,8 @@ export class WhatsappRuntime {
           if (controller.signal.aborted) return;
           this.#status.ready = false;
           this.#status.connectionState = 'failed';
-          this.#status.lastError = error?.message ?? 'WhatsApp Web connection closed';
+          this.#status.error = this.#diagnostics.report(error, { operation: 'connection.monitor', botId: this.#config?.botId, automatic: true }).publicError;
+          this.#status.lastError = this.#status.error.message;
         },
       });
       this.#session = session;
@@ -822,7 +848,8 @@ export class WhatsappRuntime {
     } catch (error) {
       this.#status.ready = false;
       this.#status.connectionState = 'failed';
-      this.#status.lastError = error?.message ?? String(error);
+      this.#status.error = this.#diagnostics.report(error, { operation: 'connection.monitor', botId: this.#config?.botId, automatic: true }).publicError;
+      this.#status.lastError = this.#status.error.message;
       await this.stop();
       throw error;
     }