@xmanrui/dsh-im 0.1.0 → 0.2.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xmanrui/dsh-im",
-  "version": "0.1.0",
-  "description": "通过扫码或机器人凭据把IM机器人接入DeepSeek Harness（支持飞书、微信、钉钉、企业微信、QQ、Telegram和Discord）。",
+  "version": "0.2.0",
+  "description": "通过扫码或机器人凭据把IM机器人接入DeepSeek Harness（支持飞书、微信、钉钉、企业微信、QQ、Telegram、Discord和WhatsApp）。",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -14,7 +14,7 @@
     "access": "public"
   },
   "bin": {
-    "dsh-im": "./bin/dsh-im.mjs"
+    "dsh-im": "bin/dsh-im.mjs"
   },
   "main": "./lib/index.js",
   "exports": {
@@ -57,7 +57,6 @@
     "node": ">=22.19"
   },
   "dependencies": {
-    "@larksuiteoapi/node-sdk": "1.73.0",
     "@tencent-connect/qqbot-connector": "1.2.0",
     "@tencent-connect/qqbot-nodejs": "1.0.4",
     "@wecom/aibot-node-sdk": "1.0.7",
@@ -65,6 +64,8 @@
     "qrcode": "1.5.4"
   },
   "devDependencies": {
+    "@larksuiteoapi/node-sdk": "1.73.0",
+    "@whiskeysockets/baileys": "7.0.0-rc14",
     "esbuild": "0.25.9",
     "react": "18.3.1",
     "react-dom": "18.3.1",

package/plugin-src/client/channel-logos.js

@@ -105,3 +105,16 @@ export function DiscordLogoGlyph({ size } = {}) {
     d: 'M20.32 4.37a19.8 19.8 0 0 0-4.89-1.51c-.21.38-.46.89-.63 1.29a18.4 18.4 0 0 0-5.59 0 13 13 0 0 0-.64-1.29c-1.71.29-3.36.8-4.89 1.52C.59 9.09-.25 13.68.17 18.2a19.9 19.9 0 0 0 6 3.04c.48-.66.91-1.36 1.28-2.1-.7-.26-1.37-.58-2-.96.17-.12.33-.25.49-.38 3.86 1.79 8.04 1.79 11.86 0 .16.13.32.26.49.38-.64.38-1.31.7-2.01.97.37.73.8 1.44 1.28 2.09a19.8 19.8 0 0 0 6-3.04c.49-5.24-.84-9.79-3.24-13.83ZM8.02 15.42c-1.16 0-2.11-1.07-2.11-2.38s.93-2.38 2.11-2.38c1.18 0 2.13 1.08 2.11 2.38 0 1.31-.93 2.38-2.11 2.38Zm7.95 0c-1.16 0-2.11-1.07-2.11-2.38s.93-2.38 2.11-2.38c1.18 0 2.13 1.08 2.11 2.38 0 1.31-.93 2.38-2.11 2.38Z',
   }));
 }
+
+export function WhatsappLogoGlyph({ size } = {}) {
+  return h('svg', {
+    ...dimensions(size),
+    viewBox: '0 0 24 24',
+    focusable: 'false',
+    'aria-hidden': 'true',
+    'data-im-channel-logo': 'whatsapp',
+  }, h('path', {
+    fill: 'currentColor',
+    d: 'M17.472 14.382c-.297-.149-1.758-.867-2.03-.967-.273-.099-.471-.148-.67.15-.197.297-.767.966-.94 1.164-.173.199-.347.223-.644.074-.297-.149-1.255-.462-2.39-1.475-.883-.788-1.48-1.761-1.653-2.059-.173-.297-.018-.458.13-.606.134-.133.298-.347.446-.521.149-.173.198-.297.298-.495.099-.198.05-.372-.025-.521-.075-.149-.669-1.612-.916-2.207-.242-.579-.487-.5-.669-.51a12.8 12.8 0 0 0-.57-.01c-.198 0-.52.074-.792.372-.272.297-1.04 1.016-1.04 2.479s1.065 2.875 1.213 3.074c.149.198 2.095 3.2 5.077 4.487.709.306 1.262.489 1.694.626.712.227 1.36.195 1.871.118.571-.085 1.758-.719 2.006-1.413.248-.694.248-1.29.173-1.413-.074-.124-.272-.198-.57-.347m-5.421 7.403h-.004a9.87 9.87 0 0 1-5.031-1.378l-.361-.214-3.741.981.999-3.648-.235-.374a9.86 9.86 0 0 1-1.51-5.26c.001-5.45 4.436-9.884 9.888-9.884 2.64 0 5.122 1.03 6.988 2.898a9.83 9.83 0 0 1 2.893 6.991c-.003 5.45-4.437 9.884-9.886 9.884m8.413-18.297A11.8 11.8 0 0 0 12.055 0C5.495 0 .16 5.335.157 11.892c0 2.096.547 4.142 1.588 5.945L.057 24l6.305-1.654a11.9 11.9 0 0 0 5.688 1.448h.005c6.557 0 11.892-5.335 11.895-11.893a11.82 11.82 0 0 0-3.486-8.413',
+  }));
+}

package/plugin-src/client/channels/shared/token-channel.js

@@ -43,6 +43,13 @@ export function createTokenChannelSettings(definition) {
     emptyTitle,
     emptyDescription,
     platformLabel,
+    CredentialPanel = null,
+    credentialPayload = ({ secret }) => ({ token: secret }),
+    credentialAriaLabel = `使用 Bot Token 接入 ${channel} 机器人`,
+    credentialOpenLabel = '手动接入',
+    credentialCloseLabel = '收起凭据',
+    credentialNoun = 'Bot Token',
+    emptyActionLabel = '填写 Bot Token',
   } = definition;
 
   function AccountCard({ account, busy, removing, onReconnect, onRequestRemove, onConfirmRemove, onCancelRemove }) {
@@ -83,7 +90,7 @@ export function createTokenChannelSettings(definition) {
             }, '移除接入')))),
       removing ? h('div', { className: 'ddt-confirm dim-confirm', role: 'alertdialog' },
         h('strong', null, `从 DeepSeek Harness 移除“${account.bot.name}”？`),
-        h('p', null, `这会停止消息连接，并删除本机保存的 Bot Token、机器人配置及会话映射。${platformLabel}中的机器人不会被自动删除。`),
+        h('p', null, `这会停止消息连接，并删除本机保存的 ${credentialNoun}、机器人配置及会话映射。${platformLabel}中的机器人不会被自动删除。`),
         h('div', { className: 'ddt-actions dim-viewActions' },
           h(Button, { onClick: onCancelRemove, disabled: Boolean(busy) }, '保留机器人'),
           h(Button, { kind: 'danger', onClick: onConfirmRemove, disabled: Boolean(busy) },
@@ -153,11 +160,14 @@ export function createTokenChannelSettings(definition) {
       };
     }, [loadStatus, model.phase]);
 
-    const bindCredentials = React.useCallback(async ({ secret }) => {
+    const bindCredentials = React.useCallback(async (values) => {
       setBusy(true);
       setCredentialError(null);
       try {
-        const snapshot = api.normalizeSnapshot(await invoke(endpoints.bindCredentials, { token: secret }));
+        const snapshot = api.normalizeSnapshot(await invoke(
+          endpoints.bindCredentials,
+          credentialPayload(values),
+        ));
         if (!mounted.current) return;
         setModel({ phase: 'ready', bots: snapshot.bots, totals: snapshot.totals, error: null });
         setCredentialOpen(false);
@@ -224,8 +234,8 @@ export function createTokenChannelSettings(definition) {
             onClick: () => { setCredentialOpen((value) => !value); setCredentialError(null); },
             disabled: busy,
             'aria-pressed': credentialOpen,
-            'aria-label': `使用 Bot Token 接入 ${channel} 机器人`,
-          }, h(CredentialActionIcon), credentialOpen ? '收起凭据' : '手动接入')),
+            'aria-label': credentialAriaLabel,
+          }, h(CredentialActionIcon), credentialOpen ? credentialCloseLabel : credentialOpenLabel)),
         model.totals.configured > 0
           ? h('div', { className: 'ddt-badge dim-onlineBadge' },
               h('span', null, `${model.totals.connected} / ${model.totals.configured} 在线`))
@@ -242,15 +252,22 @@ export function createTokenChannelSettings(definition) {
               h('p', null, model.error?.message),
               h(Button, { onClick: () => void loadStatus() }, '重新读取')))
         : h(React.Fragment, null,
-            credentialOpen ? h(CredentialBindingPanel, {
-              channel,
-              secretLabel: 'Bot Token',
-              secretPlaceholder: tokenPlaceholder,
-              busy,
-              error: credentialError,
-              onSubmit: bindCredentials,
-              onCancel: () => { setCredentialOpen(false); setCredentialError(null); },
-            }) : null,
+            credentialOpen ? (CredentialPanel
+              ? h(CredentialPanel, {
+                  busy,
+                  error: credentialError,
+                  onSubmit: bindCredentials,
+                  onCancel: () => { setCredentialOpen(false); setCredentialError(null); },
+                })
+              : h(CredentialBindingPanel, {
+                  channel,
+                  secretLabel: 'Bot Token',
+                  secretPlaceholder: tokenPlaceholder,
+                  busy,
+                  error: credentialError,
+                  onSubmit: bindCredentials,
+                  onCancel: () => { setCredentialOpen(false); setCredentialError(null); },
+                })) : null,
             model.bots.length === 0 && !credentialOpen
               ? h('div', { className: 'ddt-card dim-surfaceCard' },
                   h('div', { className: 'ddt-cardBody ddt-empty dim-surfaceBody dim-emptyView' },
@@ -264,7 +281,7 @@ export function createTokenChannelSettings(definition) {
                         h(Button, {
                           kind: 'primary',
                           onClick: () => setCredentialOpen(true),
-                        }, '填写 Bot Token'))),
+                        }, emptyActionLabel))),
                     h('div', {
                       className: `ddt-brandMark dim-emptyBrand ${avatarClass}`,
                       'aria-hidden': 'true',

package/plugin-src/client/channels/whatsapp/api.js

@@ -0,0 +1,123 @@
+export const WHATSAPP_RPC_CHANNEL = '/whatsapp';
+
+export const WHATSAPP_ENDPOINTS = Object.freeze({
+  status: 'connection.status',
+  beginProvisioning: 'provision.begin',
+  pollProvisioning: 'provision.poll',
+  cancelProvisioning: 'provision.cancel',
+  reconnectBot: 'bot.reconnect',
+  deleteBot: 'bot.delete',
+});
+
+const PROVISION_STATES = new Set(['starting', 'pending', 'connecting', 'connected', 'failed', 'cancelled']);
+const BOT_STATES = new Set(['connected', 'connecting', 'offline', 'error']);
+const QR_DATA_URL = /^data:image\/(?:png|webp);base64,[a-z\d+/]+={0,2}$/i;
+
+function isRecord(value) {
+  return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+
+function text(value, fallback, max = 240) {
+  return typeof value === 'string' && value.trim() ? value.trim().slice(0, max) : fallback;
+}
+
+function id(value) {
+  const result = text(value, '', 128);
+  return /^[a-z\d_-]+$/i.test(result) ? result : undefined;
+}
+
+function timestamp(value) {
+  if (typeof value === 'number' && Number.isFinite(value)) return value;
+  const parsed = typeof value === 'string' ? Date.parse(value) : Number.NaN;
+  return Number.isNaN(parsed) ? undefined : parsed;
+}
+
+export function unwrapRpcResult(result) {
+  if (!isRecord(result) || typeof result.ok !== 'boolean') {
+    throw new Error('WhatsApp 服务返回了无法识别的响应');
+  }
+  if (!result.ok) {
+    const error = new Error(text(result.error?.message, 'WhatsApp 操作失败'));
+    error.code = text(result.error?.code, 'WHATSAPP_RPC_ERROR', 80);
+    throw error;
+  }
+  return result.value;
+}
+
+export function safeQrSource(value) {
+  return typeof value === 'string' && value.length <= 2 * 1024 * 1024 && QR_DATA_URL.test(value)
+    ? value : undefined;
+}
+
+export function normalizeProvisioning(value, now = Date.now()) {
+  const source = isRecord(value?.provisioning) ? value.provisioning : value;
+  if (!isRecord(source)) throw new Error('WhatsApp 服务没有返回扫码进度');
+  const attemptId = id(source.attemptId);
+  if (!attemptId) throw new Error('WhatsApp 服务没有返回有效的扫码任务');
+  const reported = text(source.status, 'failed', 32);
+  const result = {
+    attemptId,
+    status: PROVISION_STATES.has(reported) ? reported : 'failed',
+    expiresAt: timestamp(source.expiresAt) ?? now + 60_000,
+    pollIntervalMs: Math.min(5_000, Math.max(500, Number(source.pollIntervalMs) || 1_000)),
+    qrRevision: Number.isSafeInteger(source.qrRevision) ? source.qrRevision : 0,
+  };
+  const qrCodeDataUrl = safeQrSource(source.qrCodeDataUrl);
+  if (qrCodeDataUrl) result.qrCodeDataUrl = qrCodeDataUrl;
+  if (id(source.botId)) result.botId = id(source.botId);
+  if (isRecord(source.error)) result.error = {
+    code: text(source.error.code, 'WHATSAPP_PROVISION_FAILED', 80),
+    message: text(source.error.message, 'WhatsApp 没有接入完成'),
+  };
+  return result;
+}
+
+function normalizeBot(value) {
+  if (!isRecord(value) || !id(value.botId)) return undefined;
+  const connected = value.connected === true;
+  const state = BOT_STATES.has(value.state) ? value.state : 'offline';
+  return {
+    botId: id(value.botId),
+    connected,
+    state: connected ? 'connected' : state,
+    bot: {
+      name: text(value.bot?.name, 'WhatsApp机器人', 100),
+      idMasked: text(value.bot?.idMasked, 'WhatsApp账号', 140),
+    },
+    health: {
+      summary: text(value.health?.summary, connected
+        ? 'WhatsApp Web 关联设备运行正常' : 'WhatsApp 连接尚未就绪'),
+      lastCheckedAt: timestamp(value.health?.lastCheckedAt),
+    },
+    error: isRecord(value.error) ? {
+      code: text(value.error.code, 'WHATSAPP_ACCOUNT_ERROR', 80),
+      message: text(value.error.message, 'WhatsApp 连接尚未就绪'),
+    } : null,
+  };
+}
+
+export function normalizeSnapshot(value) {
+  const source = isRecord(value?.snapshot) ? value.snapshot : value;
+  if (!isRecord(source) || !Array.isArray(source.bots)) {
+    throw new Error('WhatsApp 服务没有返回有效的机器人列表');
+  }
+  const bots = source.bots.map(normalizeBot).filter(Boolean);
+  return {
+    revision: Number.isSafeInteger(source.revision) ? source.revision : 0,
+    bots,
+    totals: { configured: bots.length, connected: bots.filter((bot) => bot.connected).length },
+    provisioning: source.provisioning ? normalizeProvisioning(source.provisioning) : null,
+  };
+}
+
+export function presentError(error) {
+  return {
+    code: text(error?.code, 'WHATSAPP_ERROR', 80),
+    message: text(error?.message, 'WhatsApp 操作失败，请稍后重试'),
+  };
+}
+
+export function formatRemaining(milliseconds) {
+  const seconds = Math.max(0, Math.ceil(Number(milliseconds) / 1_000) || 0);
+  return `${String(Math.floor(seconds / 60)).padStart(2, '0')}:${String(seconds % 60).padStart(2, '0')}`;
+}