@xmanrui/dsh-im 1.4.0 → 2.0.0

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

@@ -10,6 +10,7 @@ import {
   connectionTestMessage,
   connectionTestTargetUnavailable,
 } from '../shared/connection-test.mjs';
+import { t } from '../shared/i18n.mjs';
 
 const ACTIVE_ATTEMPT_STATES = new Set([
   'starting',
@@ -98,8 +99,8 @@ function publicProvisioningError(error) {
   if (error instanceof WeixinApiError) return safeAccountError(error.code, error.message);
   const message = ACTIVATION_ERROR_MESSAGES[error?.code];
   return message
-    ? safeAccountError(error.code, message)
-    : safeAccountError('activation-unknown-failed', '微信已授权，但激活过程中发生未知错误。请查看 dsh web 日志。');
+    ? safeAccountError(error.code, t(message))
+    : safeAccountError('activation-unknown-failed', t('微信已授权，但激活过程中发生未知错误。请查看 dsh web 日志。'));
 }
 
 function preserveActivationError(error, fallbackCode) {
@@ -167,7 +168,7 @@ export class WeixinController {
           if (!token) {
             this.#errors.set(
               latest.botId,
-              safeAccountError('missing-token', '登录凭据缺失，请移除账号后重新扫码。'),
+              safeAccountError('missing-token', t('登录凭据缺失，请移除账号后重新扫码。')),
             );
             return;
           }
@@ -176,7 +177,7 @@ export class WeixinController {
         } catch (error) {
           this.#errors.set(
             latest.botId,
-            safeAccountError('connection-failed', '微信连接未就绪，插件会自动重试。'),
+            safeAccountError('connection-failed', t('微信连接未就绪，插件会自动重试。')),
           );
           this.#logger.warn?.(`[dsh-weixin] account ${latest.botId} failed to initialize:`, error);
         } finally {
@@ -227,12 +228,12 @@ export class WeixinController {
     } catch (error) {
       if (record.controller.signal.aborted) {
         record.state = 'cancelled';
-        record.error = safeAccountError('cancelled', '扫码绑定已取消。');
+        record.error = safeAccountError('cancelled', t('扫码绑定已取消。'));
       } else {
         record.state = 'failed';
         record.error = safeAccountError(
           error instanceof WeixinApiError ? error.code : 'qr-start-failed',
-          error instanceof WeixinApiError ? error.message : '无法生成微信二维码，请稍后重试。',
+          error instanceof WeixinApiError ? error.message : t('无法生成微信二维码，请稍后重试。'),
         );
       }
       if (this.#activeAttemptId === record.id) this.#activeAttemptId = null;
@@ -271,7 +272,7 @@ export class WeixinController {
       record.verifyResolve = null;
       await record.task?.catch(() => undefined);
       if (!TERMINAL_ATTEMPT_STATES.has(record.state)) record.state = 'cancelled';
-      record.error ??= safeAccountError('cancelled', '扫码绑定已取消。');
+      record.error ??= safeAccountError('cancelled', t('扫码绑定已取消。'));
     }
     if (this.#activeAttemptId === record.id) this.#activeAttemptId = null;
     this.#touch();
@@ -288,7 +289,7 @@ export class WeixinController {
         await this.#startRuntime(config, token);
         this.#errors.delete(botId);
       } catch (error) {
-        this.#errors.set(botId, safeAccountError('connection-failed', '微信连接仍未就绪，请稍后重试。'));
+        this.#errors.set(botId, safeAccountError('connection-failed', t('微信连接仍未就绪，请稍后重试。')));
         throw error;
       } finally {
         this.#touch();
@@ -303,10 +304,10 @@ export class WeixinController {
     return this.#withBotTransition(botId, async () => {
       const runtime = this.#runtimes.get(botId);
       if (!runtime?.status?.ready || typeof runtime.sendConnectionTest !== 'function') {
-        throw connectionTestTargetUnavailable('微信机器人');
+        throw connectionTestTargetUnavailable(t('微信机器人'));
       }
       return runtime.sendConnectionTest(connectionTestMessage(
-        `微信机器人（${maskWeixinAccountId(config.accountId)}）`,
+        t('微信机器人（{name}）', { name: maskWeixinAccountId(config.accountId) }),
       ));
     });
   }
@@ -352,7 +353,7 @@ export class WeixinController {
             ? 'error'
             : 'offline';
       const error = this.#errors.get(config.botId) ?? (state === 'error'
-        ? safeAccountError('connection-failed', '微信连接未就绪，插件会自动重试。')
+        ? safeAccountError('connection-failed', t('微信连接未就绪，插件会自动重试。'))
         : null);
       return {
         botId: config.botId,
@@ -360,16 +361,16 @@ export class WeixinController {
         connected,
         configured: true,
         bot: {
-          name: '微信机器人',
+          name: t('微信机器人'),
           accountIdMasked: maskWeixinAccountId(config.accountId),
         },
         health: {
           status: connected ? 'healthy' : state === 'error' ? 'error' : 'offline',
           summary: connected
-            ? '微信消息长轮询运行正常'
+            ? t('微信消息长轮询运行正常')
             : state === 'error'
-              ? '微信连接未就绪，插件会自动重试'
-              : '微信连接当前离线',
+              ? t('微信连接未就绪，插件会自动重试')
+              : t('微信连接当前离线'),
           lastCheckedAt: runtimeStatus?.lastCheckedAt ?? null,
         },
         stats: {
@@ -438,11 +439,11 @@ export class WeixinController {
           record.state = 'needs_verification';
         } else if (response.status === 'verify_code_blocked') {
           record.state = 'failed';
-          record.error = safeAccountError('verification-blocked', '配对码多次错误，请重新生成二维码。');
+          record.error = safeAccountError('verification-blocked', t('配对码多次错误，请重新生成二维码。'));
           break;
         } else if (response.status === 'expired') {
           record.state = 'expired';
-          record.error = safeAccountError('expired', '二维码已过期，请重新生成。');
+          record.error = safeAccountError('expired', t('二维码已过期，请重新生成。'));
           break;
         } else if (response.status === 'scaned_but_redirect') {
           record.currentBaseUrl = apiBaseFromServer(response.redirect_host, record.currentBaseUrl);
@@ -453,7 +454,7 @@ export class WeixinController {
           ) ?? this.#configStore.list()[0];
           if (!existing) {
             record.state = 'failed';
-            record.error = safeAccountError('already-bound', '该微信账号已绑定，但本机没有可恢复的凭据。');
+            record.error = safeAccountError('already-bound', t('该微信账号已绑定，但本机没有可恢复的凭据。'));
           } else {
             record.state = 'connected';
             record.botId = existing.botId;
@@ -465,7 +466,7 @@ export class WeixinController {
           const accountId = cleanString(response.ilink_bot_id);
           const ownerUserId = cleanString(response.ilink_user_id);
           if (!token || !accountId || !ownerUserId) {
-            throw new WeixinApiError('incomplete-login', '微信授权成功，但返回的账号凭据不完整。');
+            throw new WeixinApiError('incomplete-login', t('微信授权成功，但返回的账号凭据不完整。'));
           }
           record.state = 'connecting';
           this.#touch();
@@ -485,12 +486,12 @@ export class WeixinController {
       if (!record.controller.signal.aborted && Date.now() >= record.expiresAt
         && !TERMINAL_ATTEMPT_STATES.has(record.state)) {
         record.state = 'expired';
-        record.error = safeAccountError('expired', '二维码已过期，请重新生成。');
+        record.error = safeAccountError('expired', t('二维码已过期，请重新生成。'));
       }
     } catch (error) {
       if (record.controller.signal.aborted || error?.name === 'AbortError') {
         record.state = 'cancelled';
-        record.error = safeAccountError('cancelled', '扫码绑定已取消。');
+        record.error = safeAccountError('cancelled', t('扫码绑定已取消。'));
       } else {
         record.state = 'failed';
         record.error = publicProvisioningError(error);

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

@@ -4,6 +4,7 @@ import {
   connectionTestTarget,
   connectionTestTargetUnavailable,
 } from '../shared/connection-test.mjs';
+import { t } from '../shared/i18n.mjs';
 
 const DEFAULT_START_RETRY_DELAYS_MS = Object.freeze([250, 1_000, 3_000]);
 const HARNESS_HEALTH_ERROR_CODES = new Set([
@@ -224,7 +225,7 @@ export class WeixinRuntime {
           const code = response.errcode ?? response.ret;
           throw new WeixinApiError(
             code === -14 ? 'stale-token' : 'updates-rejected',
-            code === -14 ? '微信登录凭据已失效，请移除账号后重新扫码。' : '微信消息同步请求被拒绝。',
+            code === -14 ? t('微信登录凭据已失效，请移除账号后重新扫码。') : t('微信消息同步请求被拒绝。'),
           );
         }
         consecutiveFailures = 0;
@@ -293,7 +294,7 @@ export class WeixinRuntime {
       : typeof this.#config.ownerUserId === 'string' && this.#config.ownerUserId.trim()
         ? this.#config.ownerUserId.trim()
         : null;
-    if (!toUserId) throw connectionTestTargetUnavailable('微信机器人');
+    if (!toUserId) throw connectionTestTargetUnavailable(t('微信机器人'));
     if (!this.#status.ready || !this.#abortController) {
       throw new Error('Weixin runtime is not connected');
     }

package/src/channels/whatsapp/config-store.mjs

@@ -2,6 +2,8 @@ import { createHash } from 'node:crypto';
 import { mkdir, readFile, rename, unlink, writeFile } from 'node:fs/promises';
 import { dirname } from 'node:path';
 
+import { t } from '../shared/i18n.mjs';
+
 const EMPTY_DOCUMENT = Object.freeze({ version: 2, bots: Object.freeze([]) });
 const BOT_ID_PATTERN = /^whatsapp_[a-f0-9]{24}$/;
 const AUTH_DIRECTORY_PATTERN = /^[a-f0-9-]{36}$/;
@@ -30,7 +32,7 @@ export function deriveWhatsappBotId(accountJid) {
 
 export function maskWhatsappAccount(accountJid) {
   const digits = normalizeWhatsappAccountJid(accountJid)?.split('@')[0] ?? '';
-  if (!digits) return 'WhatsApp账号';
+  if (!digits) return t('WhatsApp账号');
   if (digits.length <= 7) return `${digits.slice(0, 2)}•••${digits.slice(-2)}`;
   return `${digits.slice(0, 4)}••••${digits.slice(-4)}`;
 }

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

@@ -1,9 +1,11 @@
+import { t } from '../shared/i18n.mjs';
 import { createTextBridgeStatus, TextHarnessBridge } from '../shared/text-harness-bridge.mjs';
 
 export const WHATSAPP_DESCRIPTOR = Object.freeze({
   key: 'whatsapp',
   label: 'WhatsApp',
-  connectionLabel: ' Web 关联设备',
+  // Translated lazily: t() must run after setImHostLanguage, not at import time.
+  get connectionLabel() { return t(' Web 关联设备'); },
 });
 
 export class WhatsappHarnessBridge extends TextHarnessBridge {

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

@@ -1,6 +1,7 @@
 import { randomUUID } from 'node:crypto';
 
 import { connectionTestMessage } from '../shared/connection-test.mjs';
+import { t } from '../shared/i18n.mjs';
 import {
   deriveWhatsappBotId,
   maskWhatsappAccount,
@@ -83,8 +84,8 @@ export class WhatsappController {
           this.#errors.set(config.botId, safeError(
             error?.code === 'relink-required' ? 'relink-required' : 'connection-failed',
             error?.code === 'relink-required'
-              ? 'WhatsApp 关联设备已失效，请移除后重新扫码。'
-              : 'WhatsApp 连接未就绪，插件会自动重试。',
+              ? t('WhatsApp 关联设备已失效，请移除后重新扫码。')
+              : t('WhatsApp 连接未就绪，插件会自动重试。'),
           ));
           this.#logger.warn?.(`[dsh-im:whatsapp] bot ${config.botId} failed to initialize`);
         } finally {
@@ -172,7 +173,7 @@ export class WhatsappController {
       await record.task?.catch(() => undefined);
       if (!TERMINAL_ATTEMPT_STATES.has(record.state)) {
         record.state = 'cancelled';
-        record.error = safeError('cancelled', '扫码接入已取消。');
+        record.error = safeError('cancelled', t('扫码接入已取消。'));
       }
       await this.#deleteAuth(record.authDirectory).catch(() => undefined);
     }
@@ -192,8 +193,8 @@ export class WhatsappController {
         this.#errors.set(botId, safeError(
           error?.code === 'relink-required' ? 'relink-required' : 'connection-failed',
           error?.code === 'relink-required'
-            ? 'WhatsApp 关联设备已失效，请移除后重新扫码。'
-            : 'WhatsApp 连接仍未就绪，请稍后重试。',
+            ? t('WhatsApp 关联设备已失效，请移除后重新扫码。')
+            : t('WhatsApp 连接仍未就绪，请稍后重试。'),
         ));
         throw error;
       } finally {
@@ -209,14 +210,14 @@ export class WhatsappController {
     return this.#withBotTransition(botId, async () => {
       const runtime = this.#runtimes.get(botId);
       if (!runtime?.status?.ready || typeof runtime.sendConnectionTest !== 'function') {
-        const error = new Error('WhatsApp机器人尚未连接');
+        const error = new Error(t('WhatsApp机器人尚未连接'));
         error.code = 'test-target-unavailable';
         throw error;
       }
       return runtime.sendConnectionTest(
         connectionTestMessage(
           `${config.name}（${maskWhatsappAccount(config.accountJid)}）`,
-          'WhatsApp机器人',
+          t('WhatsApp机器人'),
         ),
       );
     });
@@ -275,8 +276,8 @@ export class WhatsappController {
         bot: { name: config.name, idMasked: maskWhatsappAccount(config.accountJid) },
         health: {
           status: connected ? 'healthy' : state === 'error' ? 'error' : 'offline',
-          summary: connected ? 'WhatsApp Web 关联设备运行正常'
-            : state === 'error' ? 'WhatsApp 连接未就绪' : 'WhatsApp 连接当前离线',
+          summary: connected ? t('WhatsApp Web 关联设备运行正常')
+            : state === 'error' ? t('WhatsApp 连接未就绪') : t('WhatsApp 连接当前离线'),
           lastCheckedAt: runtimeStatus?.lastCheckedAt ?? null,
           lastConnectedAt: runtimeStatus?.lastConnectedAt ?? null,
         },
@@ -340,7 +341,7 @@ export class WhatsappController {
         await this.#startRuntime(config);
         this.#errors.delete(botId);
       } catch (error) {
-        this.#errors.set(botId, safeError('connection-failed', 'WhatsApp 已绑定，消息连接暂未就绪。'));
+        this.#errors.set(botId, safeError('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) {
@@ -363,11 +364,11 @@ export class WhatsappController {
         await this.#deleteAuth(record.authDirectory).catch(() => undefined);
         if (previous) await this.#startRuntime(previous).catch(() => undefined);
         record.state = 'cancelled';
-        record.error = safeError('cancelled', '扫码接入已取消。');
+        record.error = safeError('cancelled', t('扫码接入已取消。'));
       } else {
         await this.#deleteAuth(record.authDirectory).catch(() => undefined);
         record.state = 'failed';
-        record.error = safeError('activation-failed', 'WhatsApp 已扫码，但无法保存关联设备。');
+        record.error = safeError('activation-failed', t('WhatsApp 已扫码，但无法保存关联设备。'));
         this.#logger.error?.('[dsh-im:whatsapp] unable to persist linked-device session');
       }
     } finally {
@@ -380,10 +381,10 @@ export class WhatsappController {
     if (TERMINAL_ATTEMPT_STATES.has(record.state)) return;
     if (record.controller.signal.aborted || error?.name === 'AbortError') {
       record.state = 'cancelled';
-      record.error = safeError('cancelled', '扫码接入已取消。');
+      record.error = safeError('cancelled', t('扫码接入已取消。'));
     } else {
       record.state = 'failed';
-      record.error = safeError('qr-connect-failed', '无法连接 WhatsApp，请重新生成二维码。');
+      record.error = safeError('qr-connect-failed', t('无法连接 WhatsApp，请重新生成二维码。'));
     }
     if (this.#activeAttemptId === record.id) this.#activeAttemptId = null;
     await record.session?.close().catch(() => undefined);

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

@@ -7,6 +7,7 @@ import {
 } from '@whiskeysockets/baileys';
 
 import { splitMessageText } from '../shared/editable-message-stream.mjs';
+import { t } from '../shared/i18n.mjs';
 import { ImagePromptError } from '../shared/image-prompt.mjs';
 import { trackOutboundArtifactProviderPromise } from '../shared/semantic/artifact.mjs';
 import { createWhatsappBridgeStatus, WhatsappHarnessBridge } from './whatsapp-bridge.mjs';
@@ -107,7 +108,7 @@ async function downloadWhatsappImage(message, download, {
       throw new ImagePromptError(
         'image-download-failed',
         `WhatsApp image download timed out after ${IMAGE_DOWNLOAD_TIMEOUT_MS} ms`,
-        '图片下载失败，请重新发送后再试。',
+        t('图片下载失败，请重新发送后再试。'),
       );
     }
     throw error;
@@ -126,7 +127,7 @@ async function downloadWhatsappImage(message, download, {
         throw new ImagePromptError(
           'image-too-large',
           `WhatsApp image exceeded ${maxBytes} bytes`,
-          '图片超过 5 MB，请压缩后重试。',
+          t('图片超过 5 MB，请压缩后重试。'),
         );
       }
       chunks.push(data);
@@ -137,7 +138,7 @@ async function downloadWhatsappImage(message, download, {
       throw new ImagePromptError(
         'image-download-failed',
         `WhatsApp image stream timed out after ${IMAGE_DOWNLOAD_TIMEOUT_MS} ms`,
-        '图片下载失败，请重新发送后再试。',
+        t('图片下载失败，请重新发送后再试。'),
       );
     }
     throw error;
@@ -313,12 +314,31 @@ function waitWithSignal(promise, signal) {
 
 function uncertainArtifactDelivery(error) {
   if (error?.code === 'artifact-delivery-uncertain') return error;
-  const uncertain = new Error('WhatsApp could not confirm result file delivery.');
+  const uncertain = new Error('WhatsApp could not confirm artifact delivery.');
   uncertain.code = 'artifact-delivery-uncertain';
   uncertain.cause = error;
   return uncertain;
 }
 
+function whatsappArtifactError(error) {
+  if (error?.code?.startsWith?.('artifact-')) return error;
+  const status = error?.output?.statusCode
+    ?? error?.data?.statusCode
+    ?? error?.statusCode;
+  let code;
+  if (status === 401 || status === 403) code = 'artifact-permission-required';
+  else if (status === 413) code = 'artifact-too-large';
+  else if (status === 429) code = 'artifact-rate-limited';
+  else if ([400, 404, 405, 406, 410, 415, 422].includes(status)) {
+    code = 'artifact-provider-rejected';
+  }
+  if (!code) return uncertainArtifactDelivery(error);
+  const wrapped = new Error('WhatsApp rejected artifact delivery.');
+  wrapped.code = code;
+  wrapped.cause = error;
+  return wrapped;
+}
+
 export class WhatsappBotClient {
   #socket;
   #outboundIds;
@@ -354,14 +374,32 @@ export class WhatsappBotClient {
   }
 
   async sendFile(target, file) {
+    return this.#sendArtifact(target, file, {
+      document: file.bytes,
+      mimetype: file.mediaType ?? 'application/octet-stream',
+      fileName: file.fileName,
+    }, 'file');
+  }
+
+  async sendImage(target, file) {
+    return this.#sendArtifact(target, file, {
+      image: file.bytes,
+      mimetype: file.mediaType ?? 'image/jpeg',
+    }, 'image');
+  }
+
+  async #sendArtifact(target, file, content, presentation) {
     this.#signal?.throwIfAborted();
     await this.#stopTyping(target.jid);
     this.#signal?.throwIfAborted();
     const deliverySeed = typeof file.deliveryKey === 'string' && file.deliveryKey
       ? file.deliveryKey
       : file.artifactId;
-    const messageId = typeof deliverySeed === 'string' && deliverySeed
-      ? createHash('sha256').update(deliverySeed).digest('hex').slice(0, 20).toUpperCase()
+    const messageIdSeed = presentation === 'image'
+      ? `${deliverySeed}:image`
+      : deliverySeed;
+    const messageId = typeof messageIdSeed === 'string' && messageIdSeed
+      ? createHash('sha256').update(messageIdSeed).digest('hex').slice(0, 20).toUpperCase()
       : undefined;
     const options = {
       ...(target.quoted ? { quoted: target.quoted } : {}),
@@ -375,11 +413,7 @@ export class WhatsappBotClient {
     try {
       const pending = this.#socket.sendMessage(
         target.jid,
-        {
-          document: file.bytes,
-          mimetype: file.mediaType ?? 'application/octet-stream',
-          fileName: file.fileName,
-        },
+        content,
         options,
       );
       trackOutboundArtifactProviderPromise(file, pending);
@@ -390,7 +424,7 @@ export class WhatsappBotClient {
       result = await waitWithSignal(pending, waitSignal);
     } catch (error) {
       if (this.#signal?.aborted) throw abortReason(this.#signal);
-      throw uncertainArtifactDelivery(error);
+      throw whatsappArtifactError(error);
     }
     this.#signal?.throwIfAborted();
     this.#outboundIds.remember(result?.key?.id);
@@ -607,7 +641,7 @@ export class WhatsappRuntime {
 
   async sendConnectionTest(text) {
     if (!this.#status.ready || !this.#client) {
-      const error = new Error('WhatsApp机器人尚未连接');
+      const error = new Error(t('WhatsApp机器人尚未连接'));
       error.code = 'test-target-unavailable';
       throw error;
     }

package/src/channels/whatsapp/whatsapp-web-session.mjs

@@ -7,6 +7,8 @@ import makeWASocket, {
   useMultiFileAuthState,
 } from '@whiskeysockets/baileys';
 
+import { t } from '../shared/i18n.mjs';
+
 const SILENT_LOGGER = Object.freeze({
   level: 'silent',
   trace() {},
@@ -57,7 +59,7 @@ function normalizeIdentity(socket, authState) {
   return {
     accountJid,
     name: typeof source?.name === 'string' && source.name.trim()
-      ? source.name.trim().slice(0, 100) : 'WhatsApp机器人',
+      ? source.name.trim().slice(0, 100) : t('WhatsApp机器人'),
   };
 }