@xmanrui/dsh-im 3.0.3 → 3.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmanrui/dsh-im",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "把九种 IM 机器人和公网 AI Office 接入本机 DeepSeek Harness。 Connect nine IM channels and a public AI Office to a local DeepSeek Harness.",
   "keywords": [
     "deepseek-harness",

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

@@ -97,11 +97,6 @@ function normalizeBot(value) {
             typeof entry === 'string' && /^[1-9]\d{4,14}$/.test(entry)
           )))]
         : [],
-      groupAllowedNumbers: Array.isArray(value.accessPolicy?.groupAllowedNumbers)
-        ? [...new Set(value.accessPolicy.groupAllowedNumbers.filter((entry) => (
-            typeof entry === 'string' && /^[1-9]\d{4,14}$/.test(entry)
-          )))]
-        : [],
     },
     bot: {
       name: text(value.bot?.name, 'WhatsApp机器人', 100),

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

@@ -37,8 +37,6 @@ function accessPolicyFor(account) {
     accessMode,
     allowedNumbers: Array.isArray(account?.accessPolicy?.allowedNumbers)
       ? account.accessPolicy.allowedNumbers : [],
-    groupAllowedNumbers: Array.isArray(account?.accessPolicy?.groupAllowedNumbers)
-      ? account.accessPolicy.groupAllowedNumbers : [],
   };
 }
 
@@ -54,39 +52,30 @@ function allowedNumbersFromText(value) {
 export function WhatsappAccessSettings({ account, busy = false, onSave }) {
   const policy = accessPolicyFor(account);
   const sourceNumbers = policy.allowedNumbers.join('\n');
-  const sourceGroupNumbers = policy.groupAllowedNumbers.join('\n');
   const helpId = React.useId();
   const [accessMode, setAccessMode] = React.useState(policy.accessMode);
   const [allowedNumbers, setAllowedNumbers] = React.useState(sourceNumbers);
-  const [groupAllowedNumbers, setGroupAllowedNumbers] = React.useState(sourceGroupNumbers);
   const [error, setError] = React.useState(null);
 
   React.useEffect(() => {
     setAccessMode(policy.accessMode);
     setAllowedNumbers(sourceNumbers);
-    setGroupAllowedNumbers(sourceGroupNumbers);
     setError(null);
-  }, [policy.accessMode, sourceNumbers, sourceGroupNumbers]);
+  }, [policy.accessMode, sourceNumbers]);
 
   const save = async (event) => {
     event.preventDefault();
     setError(null);
     try {
       const normalized = allowedNumbersFromText(allowedNumbers);
-      const normalizedGroup = allowedNumbersFromText(groupAllowedNumbers);
       if (typeof onSave !== 'function') throw new Error('WhatsApp 访问设置暂不可用。');
-      await onSave({
-        accessMode,
-        allowedNumbers: normalized,
-        groupAllowedNumbers: normalizedGroup,
-      });
+      await onSave({ accessMode, allowedNumbers: normalized });
     } catch (caught) {
       setError(caught?.message ?? 'WhatsApp 访问设置保存失败。');
     }
   };
 
   const allowlistEnabled = accessMode === 'private-allowlist';
-  const groupAllowlistEnabled = accessMode === 'open';
   const labels = {
     'self-only': '仅自己模式',
     'private-allowlist': '指定联系人模式',
@@ -114,7 +103,7 @@ export function WhatsappAccessSettings({ account, busy = false, onSave }) {
               h('span', null, '响应自聊和白名单联系人的私聊，忽略群聊。')),
             h('span', { className: 'dwa-accessTooltipItem' },
               h('strong', null, '开放响应模式'),
-              h('span', null, '响应所有私聊、已绑定账号自己发出的群聊消息，以及允许成员的提及或回复；群聊号码列表留空时允许所有群成员。')))))),
+              h('span', null, '响应所有私聊、已绑定账号自己发出的群聊消息，以及其他群成员的提及或回复。')))))),
     h('label', { className: 'dwa-accessField' },
       h('span', null, '模式'),
       h('select', {
@@ -126,28 +115,18 @@ export function WhatsappAccessSettings({ account, busy = false, onSave }) {
       h('option', { value: 'self-only' }, '仅自己模式（默认）'),
       h('option', { value: 'private-allowlist' }, '指定联系人模式'),
       h('option', { value: 'open' }, '开放响应模式'))),
-    (allowlistEnabled || groupAllowlistEnabled)
+    allowlistEnabled
       ? h('label', { className: 'dwa-accessField' },
-          h('span', null, allowlistEnabled
-            ? '允许私聊的 WhatsApp 电话号码'
-            : '允许在群聊中呼叫机器人的 WhatsApp 电话号码'),
+          h('span', null, '允许私聊的 WhatsApp 电话号码'),
           h('textarea', {
-            value: allowlistEnabled ? allowedNumbers : groupAllowedNumbers,
+            value: allowedNumbers,
             disabled: busy,
             rows: 3,
             placeholder: '每行一个含国家或地区代码的号码',
-            'aria-label': allowlistEnabled
-              ? '允许私聊的 WhatsApp 电话号码'
-              : '允许在群聊中呼叫机器人的 WhatsApp 电话号码',
-            onChange: (event) => {
-              if (allowlistEnabled) setAllowedNumbers(event.target.value);
-              else setGroupAllowedNumbers(event.target.value);
-              setError(null);
-            },
+            'aria-label': '允许私聊的 WhatsApp 电话号码',
+            onChange: (event) => { setAllowedNumbers(event.target.value); setError(null); },
           }),
-          h('small', null, allowlistEnabled
-            ? '可以包含开头的 +，保存时会自动移除。'
-            : '留空表示所有群成员都可以通过提及或回复呼叫机器人。'))
+          h('small', null, '可以包含开头的 +，保存时会自动移除。'))
       : null,
     allowlistEnabled && allowedNumbers.trim() === ''
       ? h('p', { className: 'dwa-accessWarning', role: 'status' },

package/plugin-src/client/i18n.js

@@ -380,12 +380,9 @@ const EN = Object.freeze({
   '只响应已绑定 WhatsApp 账号的自聊消息。': 'Only respond to self-chat messages from the linked WhatsApp account.',
   '响应自聊和白名单联系人的私聊，忽略群聊。': 'Respond to self-chat and allowlisted direct messages; ignore group messages.',
   '响应所有私聊、已绑定账号自己发出的群聊消息，以及其他群成员的提及或回复。': 'Respond to all direct messages, group messages sent by the linked account, and mentions or replies from other group members.',
-  '响应所有私聊、已绑定账号自己发出的群聊消息，以及允许成员的提及或回复；群聊号码列表留空时允许所有群成员。': 'Respond to all direct messages, group messages sent by the linked account, and mentions or replies from allowed members; leaving the group number list empty allows every group member.',
   '允许私聊的 WhatsApp 电话号码': 'WhatsApp phone numbers allowed to send direct messages',
-  '允许在群聊中呼叫机器人的 WhatsApp 电话号码': 'WhatsApp phone numbers allowed to call the bot in group chats',
   '每行一个含国家或地区代码的号码': 'One number with country or region code per line',
   '可以包含开头的 +，保存时会自动移除。': 'A leading + is allowed and removed when saved.',
-  '留空表示所有群成员都可以通过提及或回复呼叫机器人。': 'Leave empty to let every group member call the bot by mentioning it or replying to it.',
   '仅指定联系人模式使用白名单，切换模式时会保留。': 'Only Selected contacts uses the allowlist; it is retained when modes change.',
   '白名单为空；保存后将只接受自聊消息。': 'The allowlist is empty; only self-chat messages will be accepted after saving.',
   '电话号码必须包含国家或地区代码，每行一个。': 'Each phone number must include a country or region code on its own line.',

package/plugin-src/host/channels/whatsapp/rpc.mjs

@@ -53,8 +53,8 @@ function payloadFailure(endpoint, payload) {
       && payload.confirm === true ? null : 'bot.delete requires a botId and confirm=true.';
   }
   if (endpoint === WHATSAPP_ENDPOINTS.setAccessPolicy) {
-    if (!exactKeys(payload, ['botId', 'accessMode', 'allowedNumbers', 'groupAllowedNumbers'])
-      || Object.keys(payload).length !== 4
+    if (!exactKeys(payload, ['botId', 'accessMode', 'allowedNumbers'])
+      || Object.keys(payload).length !== 3
       || !validId(payload.botId)) return '请输入有效的 WhatsApp 访问模式和电话号码。';
     try {
       normalizeWhatsappAccessPolicy(payload);

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

@@ -63,7 +63,6 @@ export function normalizeWhatsappAccessPolicy(value = {}) {
   return Object.freeze({
     accessMode,
     allowedNumbers: normalizeWhatsappAllowedNumbers(value.allowedNumbers),
-    groupAllowedNumbers: normalizeWhatsappAllowedNumbers(value.groupAllowedNumbers),
   });
 }
 

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

@@ -334,7 +334,6 @@ export class WhatsappController {
       connectedAt: new Date().toISOString(),
       accessMode: previous?.accessMode,
       allowedNumbers: previous?.allowedNumbers,
-      groupAllowedNumbers: previous?.groupAllowedNumbers,
     };
     try {
       if (record.controller.signal.aborted || this.#closed) throw Object.assign(new Error(), { name: 'AbortError' });

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

@@ -3,7 +3,6 @@ import { createHash, randomBytes } from 'node:crypto';
 import {
   areJidsSameUser,
   downloadMediaMessage,
-  jidNormalizedUser,
   normalizeMessageContent,
 } from '@whiskeysockets/baileys';
 
@@ -14,7 +13,6 @@ import { trackOutboundArtifactProviderPromise } from '../shared/semantic/artifac
 import { createWhatsappBridgeStatus, WhatsappHarnessBridge } from './whatsapp-bridge.mjs';
 import {
   WHATSAPP_ACCESS_MODES,
-  normalizeWhatsappAccountJid,
   normalizeWhatsappAccessPolicy,
 } from './config-store.mjs';
 import { createWhatsappWebSession } from './whatsapp-web-session.mjs';
@@ -206,21 +204,8 @@ export function createWhatsappMediaDownloader({
   });
 }
 
-function whatsappAccountMatcher(accountJid, aliases) {
-  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'
@@ -230,9 +215,8 @@ 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(matchesAccount);
+    && [remoteJid, alternateRemoteJid].some((jid) => jid && areJidsSameUser(jid, accountJid));
   if (fromMe && !selfChat && !group) return null;
   const senderJid = fromMe ? accountJid : group ? message.key.participant : remoteJid;
   const senderAlternateJid = group && !fromMe ? message.key.participantAlt : alternateRemoteJid;
@@ -241,9 +225,9 @@ export function normalizeWhatsappMessage(message, accountJid, {
   const content = normalizeMessageContent(message.message);
   const context = messageContext(content);
   const mentioned = Array.isArray(context?.mentionedJid)
-    && context.mentionedJid.some(matchesAccount);
+    && context.mentionedJid.some((jid) => areJidsSameUser(jid, accountJid));
   const replyToSelf = typeof context?.participant === 'string'
-    && matchesAccount(context.participant);
+    && areJidsSameUser(context.participant, accountJid);
   const image = whatsappImageSource(message, content, download, { viewOnce });
   const file = whatsappFileSource(message, content, download);
   return {
@@ -251,7 +235,6 @@ export function normalizeWhatsappMessage(message, accountJid, {
     providerMessageId: messageId,
     senderId: senderJid,
     senderAlternateId: typeof senderAlternateJid === 'string' ? senderAlternateJid : '',
-    senderIsSelf: fromMe,
     senderIsBot: false,
     kind: group ? 'group' : 'direct',
     conversationId: remoteJid,
@@ -270,22 +253,12 @@ export function normalizeWhatsappMessage(message, accountJid, {
 export function whatsappInboundAllowed(message, {
   accessMode = WHATSAPP_ACCESS_MODES.selfOnly,
   allowedNumbers = new Set(),
-  groupAllowedNumbers = new Set(),
 } = {}) {
-  if (accessMode === WHATSAPP_ACCESS_MODES.open) {
-    if (message?.kind !== 'group' || message.senderIsSelf === true) return true;
-    if (!(groupAllowedNumbers instanceof Set)) return false;
-    if (groupAllowedNumbers.size === 0) return true;
-    const senderJids = [message.senderId, message.senderAlternateId]
-      .filter((jid) => typeof jid === 'string' && jid.endsWith('@s.whatsapp.net'));
-    return [...groupAllowedNumbers].some((number) => senderJids.some((jid) => (
-      areJidsSameUser(jid, `${number}@s.whatsapp.net`)
-    )));
-  }
+  if (accessMode === WHATSAPP_ACCESS_MODES.open) return true;
   if (message?.kind !== 'direct') return false;
   if (message.selfChat === true) return true;
-  if (accessMode !== WHATSAPP_ACCESS_MODES.privateAllowlist) return false;
-  if (!(allowedNumbers instanceof Set)) return false;
+  if (accessMode !== WHATSAPP_ACCESS_MODES.privateAllowlist
+    || !(allowedNumbers instanceof Set)) return false;
   const senderJids = [message.senderId, message.senderAlternateId]
     .filter((jid) => typeof jid === 'string' && jid.endsWith('@s.whatsapp.net'));
   return [...allowedNumbers].some((number) => senderJids.some((jid) => (
@@ -569,7 +542,6 @@ export class WhatsappRuntime {
   #mediaUploadTimeoutMs;
   #accessMode;
   #allowedPrivateNumbers;
-  #allowedGroupNumbers;
   #createSession;
   #status = createWhatsappRuntimeStatus();
   #abortController = null;
@@ -618,7 +590,6 @@ export class WhatsappRuntime {
     const policy = normalizeWhatsappAccessPolicy(value);
     this.#accessMode = policy.accessMode;
     this.#allowedPrivateNumbers = new Set(policy.allowedNumbers);
-    this.#allowedGroupNumbers = new Set(policy.groupAllowedNumbers);
     this.#config = { ...this.#config, ...policy };
     return policy;
   }
@@ -653,13 +624,7 @@ 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,
@@ -670,7 +635,6 @@ export class WhatsappRuntime {
           if (!whatsappInboundAllowed(message, {
             accessMode: this.#accessMode,
             allowedNumbers: this.#allowedPrivateNumbers,
-            groupAllowedNumbers: this.#allowedGroupNumbers,
           })) {
             this.#status.messagesRejected += 1;
             this.#status.lastRejectedAt = new Date().toISOString();