dsh-email 0.15.3 → 0.16.0

package/CHANGELOG.md

@@ -4,6 +4,10 @@
 
 [历史英文记录](docs/CHANGELOG.en.md)
 
+## 0.16.0 (2026-10-05)
+
+- 增加每账号收件人禁止地址与禁止域名；禁止规则优先于可信名单，并在所有发信路径的 SMTP 连接前拦截。草稿预览显示阻止原因并保留可编辑草稿。
+
 ## 0.15.3 (2026-10-04)
 
 - 完成 [#21](https://github.com/STARDUSTLC666/dsh-email/issues/21)：邮箱账号页新增「显示新邮件弹窗」开关，自动保存、重启后保留。关闭时隐藏当前卡片并停止自动邮件检查，不影响手动邮件工具。

package/README.en.md

@@ -6,7 +6,7 @@
 
 Read, send, search and organize email from DSH with multiple accounts.
 
-[![npm](https://img.shields.io/npm/v/dsh-email)](https://www.npmjs.com/package/dsh-email) [![downloads](https://img.shields.io/npm/dm/dsh-email)](https://www.npmjs.com/package/dsh-email)
+[![npm](https://img.shields.io/npm/v/dsh-email)](https://www.npmjs.com/package/dsh-email) [![downloads](https://raw.githubusercontent.com/STARDUSTLC666/dsh-suite/npm-downloads/assets/dsh-email-downloads.svg)](https://www.npmjs.com/package/dsh-email)
 
 ## What it does
 

package/README.md

@@ -6,7 +6,7 @@
 
 在 DSH 中收发、搜索和整理邮件，支持多个邮箱账号。
 
-[![npm](https://img.shields.io/npm/v/dsh-email)](https://www.npmjs.com/package/dsh-email) [![downloads](https://img.shields.io/npm/dm/dsh-email)](https://www.npmjs.com/package/dsh-email)
+[![npm](https://img.shields.io/npm/v/dsh-email)](https://www.npmjs.com/package/dsh-email) [![downloads](https://raw.githubusercontent.com/STARDUSTLC666/dsh-suite/npm-downloads/assets/dsh-email-downloads.svg)](https://www.npmjs.com/package/dsh-email)
 
 ## 功能
 

package/docs/CHANGELOG.en.md

@@ -4,6 +4,10 @@
 
 These English notes preserve the earlier translations. The main changelog contains the consolidated version history.
 
+## 0.16.0 (2026-10-05)
+
+- Add per-account blocked addresses and domains. Deny rules override trust and stop every sending path before SMTP connection. Draft previews explain the block and preserve editable drafts.
+
 ## 0.14.7 (2026-10-02)
 
 - Account cards display the effective IMAP/SMTP endpoints. Changing providers clears stale display values without persisting the endpoint summary into account configuration.

package/docs/USAGE.en.md

@@ -2,6 +2,10 @@
 
 [Overview](../README.en.md) · [Changelog](../CHANGELOG.md) · [Validation](VALIDATION.md)
 
+## Current improvements
+
+Optionally configure blockedAddresses / blockedDomains per account. Rules cover To and Cc and remain active with sendApproval=off. Domains match exactly, excluding subdomains unless listed. Remove blocked recipients and preview again before sending.
+
 ## Tools
 
 See the [draft workbench](DRAFTS.en.md) for editable drafts and per-account trusted recipients. The new workbench was validated with official Harness 0.2.0-rc.2.

package/docs/USAGE.md

@@ -2,6 +2,10 @@
 
 [返回简介](../README.md) · [更新记录](../CHANGELOG.md) · [验证记录](VALIDATION.md)
 
+## 本次改进
+
+设置页可选填 blockedAddresses / blockedDomains。禁止规则覆盖 To、Cc，sendApproval=off 时仍生效。域名按完整域名匹配，不自动包含子域名。移除被禁止的收件人并重新预览后才能确认发送。
+
 ## 工具一览
 
 可编辑草稿和按账号的可信收件人规则见[草稿工作台](DRAFTS.md)。新工作台已用官方 Harness 0.2.0-rc.2 验收。

package/lib/approval.js

@@ -4,8 +4,6 @@ export function installSendApproval(ctx, runtime) {
         if (exec?.name !== 'email_send' && exec?.name !== 'email_reply')
             return next();
         const value = runtime.getSettingsValue();
-        if (value.sendApproval === false)
-            return next();
         try {
             runtime.getEffectiveSettings();
         }
@@ -18,12 +16,19 @@ export function installSendApproval(ctx, runtime) {
                 const settings = runtime.getEffectiveSettings(), account = typeof args.account === 'string' && args.account.trim() ? args.account.trim() : settings.defaultAccount;
                 if (settings.accounts.has(account) && typeof args.to === 'string' && (args.cc === undefined || typeof args.cc === 'string')) {
                     const policy = parseRecipientPolicies(value.trustedRecipientsYaml).get(account);
-                    if (policy?.skipApproval && (await matchRecipients(args.to, args.cc ?? '', policy)).skipsApproval)
-                        return next();
+                    if (policy) {
+                        const matching = await matchRecipients(args.to, args.cc ?? '', policy);
+                        if (matching.blocked)
+                            return { kind: 'deny', reason: '收件人被禁止规则拦截，邮件未发送：' + matching.rows.filter(row => row.blocked).map(row => row.address).join(', ') };
+                        if (matching.skipsApproval)
+                            return next();
+                    }
                 }
             }
             catch { /* Invalid rules or addresses keep the usual approval; never grant trust on a parse failure. */ }
         }
+        if (value.sendApproval === false)
+            return next();
         let reason;
         if (exec.name === 'email_send') {
             const args = (exec.arguments ?? {});

package/lib/client.js

@@ -2209,7 +2209,8 @@ function DraftWorkbench({ active }) {
     h("h3", null, dt("发送前预览", "Review before sending")),
     h("p", null, dt("发件人：", "From: ") + (preview.from.name ? preview.from.name + " <" + preview.from.address + ">" : preview.from.address)),
     h("p", null, dt("主题：", "Subject: ") + preview.draft.subject),
-    h("ul", { className: "dshe-match-list" }, preview.matching.rows.map((row, index) => h("li", { key: index }, (row.field === "cc" ? "Cc: " : "To: ") + row.address + " · " + (row.matched ? dt("匹配可信规则", "Matches a trusted rule") : dt("需要确认", "Needs confirmation"))))),
+    preview.matching.blocked ? h("div", { className: "dshe-alert error", role: "alert" }, dt("有收件人命中禁止规则，无法发送。请修改草稿或收件人规则。", "A recipient is blocked. Change the draft or recipient rules before sending.")) : null,
+    h("ul", { className: "dshe-match-list" }, preview.matching.rows.map((row, index) => h("li", { key: index }, (row.field === "cc" ? "Cc: " : "To: ") + row.address + " · " + (row.blocked ? dt("禁止发送：", "Blocked: ") + row.value : row.matched ? dt("匹配可信规则", "Matches a trusted rule") : dt("需要确认", "Needs confirmation"))))),
     h("pre", null, preview.draft.text || dt("（空正文）", "(Empty body)")),
     preview.attachments.length ? h("ul", { className: "dshe-files" }, preview.attachments.map(file => h("li", { key: file.id }, [
       h("span", null, file.filename + " · " + Math.ceil(file.size / 1024) + " KiB"),
@@ -2219,7 +2220,7 @@ function DraftWorkbench({ active }) {
     h("label", { className: "dshe-check" }, [h("input", { type: "checkbox", checked: acknowledged, disabled: busy, onChange: event => setAcknowledged(event.target.checked) }), dt("我已核对发件人、所有收件人、正文和附件", "I checked the sender, all recipients, content and attachments")]),
     h("div", { className: "dshe-actions" }, [
       h("button", { type: "button", className: "dshe-btn", disabled: busy, onClick: () => run(async () => { await draftApi("cancelPreview", { id: selected.id }); setPreview(null); setAcknowledged(false); setNotice(dt("预览已取消，邮件未发送。", "Review cancelled. No email was sent.")); }) }, dt("取消预览", "Cancel review")),
-      h("button", { type: "button", className: "dshe-btn primary", disabled: busy || !acknowledged || dirty, onClick: () => run(async () => {
+      h("button", { type: "button", className: "dshe-btn primary", disabled: busy || !acknowledged || dirty || preview.matching.blocked, onClick: () => run(async () => {
         try { const result = await draftApi("send", { id: selected.id, preview: preview.id, confirmed: true }); adopt(result.draft); }
         finally { setPreview(null); setAcknowledged(false); const fresh = await reload(); const current = fresh.drafts.find(draft => draft.id === selected.id); if (current && current.state !== "draft") adopt(current); }
       }) }, busy ? dt("正在提交…", "Submitting…") : dt("确认发送", "Confirm send")),
@@ -2265,35 +2266,38 @@ function DraftWorkbench({ active }) {
 }
 
 function RecipientRules({ active, onSaved }) {
-  const [data, setData] = useState(() => rulesUiCache && rulesUiCache.data), [account, setAccount] = useState(() => rulesUiCache && rulesUiCache.account || ""), [form, setForm] = useState(() => rulesUiCache && rulesUiCache.form || { addresses: "", domains: "", skipApproval: false });
+  const [data, setData] = useState(() => rulesUiCache && rulesUiCache.data), [account, setAccount] = useState(() => rulesUiCache && rulesUiCache.account || ""), [form, setForm] = useState(() => rulesUiCache && rulesUiCache.form || { addresses: "", domains: "", denyAddresses: "", denyDomains: "", skipApproval: false });
   const [base, setBase] = useState(() => rulesUiCache && rulesUiCache.base || ""), [busy, setBusy] = useState(false), [error, setError] = useState(""), [notice, setNotice] = useState(""), [pending, setPending] = useState(null), [to, setTo] = useState(() => rulesUiCache && rulesUiCache.to || ""), [cc, setCc] = useState(() => rulesUiCache && rulesUiCache.cc || ""), [match, setMatch] = useState(null);
   const operation = useRef(false), dirty = data && JSON.stringify(form) !== base;
   useEffect(() => { rulesUiCache = { data, account, form, base, to, cc }; }, [data, account, form, base, to, cc]);
-  const choose = (next, name) => { const rule = next.policies[name] || { addresses: [], domains: [], skipApproval: false }, fields = { addresses: rule.addresses.join("\n"), domains: rule.domains.join("\n"), skipApproval: rule.skipApproval }; setAccount(name); setForm(fields); setBase(JSON.stringify(fields)); setMatch(null); setPending(null); };
+  const choose = (next, name) => { const rule = next.policies[name] || { addresses: [], domains: [], skipApproval: false }, fields = { addresses: rule.addresses.join("\n"), domains: rule.domains.join("\n"), denyAddresses: (rule.denyAddresses || []).join("\n"), denyDomains: (rule.denyDomains || []).join("\n"), skipApproval: rule.skipApproval }; setAccount(name); setForm(fields); setBase(JSON.stringify(fields)); setMatch(null); setPending(null); };
   const run = async (fn) => { if (operation.current) return; operation.current = true; setBusy(true); setError(""); try { await fn(); } catch (e) { setError(e.message || String(e)); } finally { operation.current = false; setBusy(false); } };
   const load = async () => { const next = await draftApi("rules"); setData(next); choose(next, next.accounts.includes(account) ? account : next.accounts[0] || ""); };
   useEffect(() => { if (active && !dirty) run(load); }, [active]);
   useEffect(() => { const guard = event => { if (dirty) { event.preventDefault(); event.returnValue = ""; } }; window.addEventListener("beforeunload", guard); return () => window.removeEventListener("beforeunload", guard); }, [dirty]);
-  const policy = () => ({ skipApproval: form.skipApproval, addresses: form.addresses.split(/\r?\n/).map(row => row.trim()).filter(Boolean), domains: form.domains.split(/\r?\n/).map(row => row.trim()).filter(Boolean) });
+  const policy = () => ({ skipApproval: form.skipApproval, ...Object.fromEntries(['addresses', 'domains', 'denyAddresses', 'denyDomains'].map(key => [key, (form[key] || '').split(/\r?\n/).map(row => row.trim()).filter(Boolean)])) });
   const save = async () => { const next = await draftApi("saveRules", { account, policy: policy(), revision: data.revision }); setData(next); choose(next, account); onSaved(next.revision); setNotice(dt("此账号规则已保存。", "Rules saved for this account.")); return next; };
   const change = patch => { setForm(current => ({ ...current, ...patch })); setMatch(null); setNotice(""); };
   const request = target => { if (dirty) setPending(target); else if (target.kind === "reload") run(load); else choose(data, target.name); };
   return h("section", { className: "dshe-panel dshe-rule-panel", "aria-label": dt("可信收件人规则", "Trusted recipients") }, [
     h("p", { className: "dshe-hint" }, dt("默认每次确认。主动启用后，只有该账号的全部 To/Cc 都匹配时，email_send 才跳过插件确认；宿主权限仍然生效，草稿仍需手动确认。域名规则只匹配指定域名，不包含子域名。", "Approval is the default. When enabled, email_send skips this plugin's approval only if every To/Cc address matches this account's rules. Host permissions still apply, and drafts still need manual confirmation. Domain rules exclude subdomains.")),
+    h("p", { className: "dshe-hint" }, dt("禁止规则优先于可信规则，关闭发信确认也不能绕过；同样适用于草稿、回复与转发。禁止域名也仅精确匹配，不包含子域名。", "Blocked recipients take precedence over trusted rules, even with send approval off. Blocks also apply to drafts, replies and forwards. Blocked domains match exactly and exclude subdomains.")),
     error ? h("div", { className: "dshe-alert error", role: "alert" }, error) : null,
     notice ? h("div", { className: "dshe-alert success", role: "status" }, notice) : null,
-    data && data.sendApproval === false ? h("div", { className: "dshe-alert info" }, dt("全局发信确认目前已关闭；这份规则不会额外拦截 email_send。", "Global send approval is currently off. These rules do not add another email_send gate.")) : null,
+    data && data.sendApproval === false ? h("div", { className: "dshe-alert info" }, dt("全局发信确认目前已关闭；禁止规则仍然生效。", "Global send approval is off; blocked-recipient rules still apply.")) : null,
     h("div", { className: "dshe-field" }, [h("label", { htmlFor: "dshe-rule-account" }, dt("规则所属账号", "Account for these rules")), h("select", { id: "dshe-rule-account", value: account, disabled: busy, onChange: event => request({ kind: "account", name: event.target.value }) }, [h("option", { value: "", disabled: true }, dt("请选择已配置账号", "Choose a configured account")), ...(data ? data.accounts : []).map(name => h("option", { key: name, value: name }, name))])]),
     pending ? h("div", { className: "dshe-alert info" }, [dt("规则还未保存。", "Rules have unsaved edits."), h("div", { className: "dshe-actions" }, [h("button", { type: "button", className: "dshe-btn", disabled: busy, onClick: () => run(async () => { const next = await save(); if (pending.kind === "reload") await load(); else choose(next, pending.name); }) }, dt("保存并切换", "Save and switch")), h("button", { type: "button", className: "dshe-btn", disabled: busy, onClick: () => { if (pending.kind === "reload") run(load); else choose(data, pending.name); } }, dt("放弃编辑并切换", "Discard edits and switch")), h("button", { type: "button", className: "dshe-btn", onClick: () => setPending(null) }, dt("保留编辑", "Keep editing"))])]) : null,
     h("div", { className: "dshe-field" }, [h("label", { htmlFor: "dshe-rule-addresses" }, dt("可信邮箱地址（每行一个）", "Trusted email addresses (one per line)")), h("textarea", { id: "dshe-rule-addresses", rows: 4, value: form.addresses, placeholder: "name@example.com", disabled: busy || !account, onChange: event => change({ addresses: event.target.value }) })]),
     h("div", { className: "dshe-field" }, [h("label", { htmlFor: "dshe-rule-domains" }, dt("可信域名（每行一个，匹配该域所有邮箱）", "Trusted domains (one per line, all mailboxes in that domain)")), h("textarea", { id: "dshe-rule-domains", rows: 3, value: form.domains, placeholder: "example.com", disabled: busy || !account, onChange: event => change({ domains: event.target.value }) })]),
+    h("div", { className: "dshe-field" }, [h("label", { htmlFor: "dshe-rule-deny-addresses" }, dt("禁止邮箱地址（每行一个）", "Blocked email addresses (one per line)")), h("textarea", { id: "dshe-rule-deny-addresses", rows: 3, value: form.denyAddresses || '', placeholder: "blocked@example.com", disabled: busy || !account, onChange: event => change({ denyAddresses: event.target.value }) })]),
+    h("div", { className: "dshe-field" }, [h("label", { htmlFor: "dshe-rule-deny-domains" }, dt("禁止域名（每行一个）", "Blocked domains (one per line)")), h("textarea", { id: "dshe-rule-deny-domains", rows: 3, value: form.denyDomains || '', placeholder: "blocked.example.com", disabled: busy || !account, onChange: event => change({ denyDomains: event.target.value }) })]),
     h("label", { className: "dshe-check" }, [h("input", { type: "checkbox", checked: form.skipApproval, disabled: busy || !account, onChange: event => change({ skipApproval: event.target.checked }) }), dt("允许全部匹配时跳过 email_send 的插件确认", "Skip plugin approval for email_send when all addresses match")]),
     h("div", { className: "dshe-actions" }, [h("button", { type: "button", className: "dshe-btn primary", disabled: busy || !dirty || !account || data && !data.writable, onClick: () => run(save) }, dt("保存此账号规则", "Save rules for this account")), h("button", { type: "button", className: "dshe-btn", disabled: busy, onClick: () => request({ kind: "reload" }) }, dt("重新加载规则", "Reload rules"))]),
     h("div", { className: "dshe-hint", role: "status" }, dirty ? dt("未保存；匹配预览使用当前编辑的规则。", "Unsaved; matching uses the rules you are editing.") : dt("已保存的规则才会作用于模型发信。", "Only saved rules affect model-initiated sends.")),
     h("div", { className: "dshe-field" }, [h("label", { htmlFor: "dshe-rule-to" }, dt("试填收件人 To", "Try recipients To")), h("input", { id: "dshe-rule-to", type: "text", value: to, disabled: busy, onChange: event => { setTo(event.target.value); setMatch(null); } })]),
     h("div", { className: "dshe-field" }, [h("label", { htmlFor: "dshe-rule-cc" }, dt("试填抄送 Cc", "Try copy Cc")), h("input", { id: "dshe-rule-cc", type: "text", value: cc, disabled: busy, onChange: event => { setCc(event.target.value); setMatch(null); } })]),
     h("button", { type: "button", className: "dshe-btn", disabled: busy || !account, onClick: () => run(async () => setMatch(await draftApi("matchRules", { account, policy: policy(), to, cc }))) }, dt("检查规则匹配（不发送）", "Check matches (no email sent)")),
-    match ? h("div", { className: "dshe-review" }, [h("p", null, match.skipsApproval ? dt("全部 To/Cc 匹配，可跳过插件确认。", "All To/Cc match; plugin approval can be skipped.") : dt("不会跳过插件确认。", "Plugin approval will remain.")), h("ul", { className: "dshe-match-list" }, match.rows.map((row, index) => h("li", { key: index }, row.field.toUpperCase() + ": " + row.address + " · " + (row.matched ? dt("匹配：", "Match: ") + row.value : dt("未匹配", "No match")))))]) : null,
+    match ? h("div", { className: "dshe-review", role: "status" }, [h("p", null, match.blocked ? dt("收件人被禁止，无法发送。", "A recipient is blocked; sending is refused.") : match.skipsApproval ? dt("全部 To/Cc 匹配，可跳过插件确认。", "All To/Cc match; plugin approval can be skipped.") : dt("不会跳过插件确认。", "Plugin approval will remain.")), h("ul", { className: "dshe-match-list" }, match.rows.map((row, index) => h("li", { key: index }, row.field.toUpperCase() + ": " + row.address + " · " + (row.blocked ? dt("禁止：", "Blocked: ") + row.value : row.matched ? dt("匹配：", "Match: ") + row.value : dt("未匹配", "No match")))))]) : null,
   ]);
 }
 

package/lib/config.d.ts

@@ -1,3 +1,4 @@
+import { type RecipientPolicy } from './recipient-policy.js';
 /** The 8 built-in provider ids. A `provider` may also name a custom preset. */
 export type ProviderName = 'qq' | '163' | '126' | 'sina' | 'aliyun' | 'gmail' | 'outlook' | 'icloud';
 /**
@@ -217,6 +218,7 @@ export interface ResolvedEmailConfig {
 export declare function isOAuth2Account(provider: string | undefined, imapHost: string | undefined): boolean;
 /** Fully resolved plugin settings: the account map plus shared policy. */
 export interface ResolvedEmailSettings {
+    recipientPolicies?: Map<string, RecipientPolicy>;
     accounts: Map<string, ResolvedEmailConfig>;
     defaultAccount: string;
     sendApproval: boolean;

package/lib/config.js

@@ -1,6 +1,7 @@
 import { homedir } from 'node:os';
 import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
 import { join } from 'node:path';
+import { parseRecipientPolicies } from './recipient-policy.js';
 /**
  * The provider that authenticates with OAuth2 instead of a password.
  *
@@ -293,6 +294,7 @@ export function resolveEmailSettings(config, onlyAccount) {
     }
     return {
         accounts,
+        recipientPolicies: parseRecipientPolicies(raw.trustedRecipientsYaml),
         defaultAccount: defaultName,
         sendApproval: raw.sendApproval !== false,
         maxBodyChars: clampInt(raw.maxBodyChars, 20000, 1000, 200000),

package/lib/draft-web.js

@@ -3,7 +3,7 @@ import { createReadStream } from 'node:fs';
 import { mkdir, open, stat } from 'node:fs/promises';
 import { basename, dirname, resolve } from 'node:path';
 import { DraftError, DraftStore, draftFields } from './draft-store.js';
-import { matchRecipients, parseRecipientPolicies, serializeRecipientPolicies } from './recipient-policy.js';
+import { assertRecipientsAllowed, matchRecipients, parseRecipientPolicies, serializeRecipientPolicies, RecipientPolicyError } from './recipient-policy.js';
 import { messageOf, redactCredentials } from './mail-client.js';
 export const EMAIL_DRAFT_ROUTE = '/api/dsh-email/drafts';
 const MAX_BYTES = 20 * 1024 * 1024;
@@ -229,6 +229,7 @@ export class EmailDraftBackend {
                 editable(before);
                 if (before.revision !== plan.draft.revision || plan.key !== this.connection(before.account).key)
                     throw new DraftError('草稿、账号或规则已改变，请重新预览', 'draft-conflict');
+                await assertRecipientsAllowed(before.to, before.cc, this.connection(before.account).policy);
                 const pool = this.runtime.getPool();
                 current.throwIfAborted();
                 const pending = await this.store.change(id, before.revision, value => { editable(value); value.state = 'sending'; value.attemptAt = new Date(this.now()).toISOString(); }, current);
@@ -247,6 +248,10 @@ export class EmailDraftBackend {
                     receipt = await pool.sendPrepared(before.account, before.to, before.subject, before.text, before.cc, plan.attachments.map(({ filename, content }) => ({ filename, content })), current);
                 }
                 catch (error) {
+                    if (error instanceof RecipientPolicyError) {
+                        await this.store.change(id, pending.revision, value => { value.state = 'draft'; delete value.attemptAt; });
+                        throw error;
+                    }
                     const failed = await this.store.change(id, pending.revision, value => { value.state = 'uncertain'; value.error = '提交结果未确定；请先去邮箱核对，不会自动重发。' + this.safe(error); }).catch(() => null);
                     if (!failed)
                         throw new DraftError('提交结果未确定，且回执未能保存；请先去邮箱核对，不要直接重发', 'draft-storage');

package/lib/mail-client.js

@@ -4,6 +4,7 @@ import { createConnection } from 'node:net';
 import { mkdir, stat, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { getFreshAccessToken, OAuth2Error } from './oauth2.js';
+import { assertRecipientsAllowed } from './recipient-policy.js';
 import { flattenAddresses, parseRawMessage, sanitizeFilename, stripHtml, truncateText } from './parse.js';
 export class MailError extends Error {
     constructor(message) {
@@ -630,6 +631,10 @@ export class EmailPool {
      * single attempt they always had.
      */
     async sendMail(name, cfg, message, signal) {
+        signal?.throwIfAborted();
+        // This is shared by chat sends, prepared drafts, replies and forwards. Enforce
+        // before token refresh or opening any SMTP connection, even with approval off.
+        await assertRecipientsAllowed(message.to ?? '', message.cc ?? '', this.settings.recipientPolicies?.get(name));
         signal?.throwIfAborted();
         const attempt = async (forceToken) => {
             let token;

package/lib/recipient-policy.d.ts

@@ -2,14 +2,21 @@ export interface RecipientPolicy {
     skipApproval: boolean;
     addresses: string[];
     domains: string[];
+    denyAddresses?: string[];
+    denyDomains?: string[];
 }
 export interface RecipientMatch {
     field: 'to' | 'cc';
     address: string;
     matched: boolean;
+    blocked: boolean;
     rule: 'address' | 'domain' | '';
     value: string;
 }
+export declare class RecipientPolicyError extends Error {
+    readonly code = "recipient-denied";
+    constructor(addresses: string[]);
+}
 export declare function canonicalDomain(value: string): string;
 export declare function canonicalAddress(value: string): string;
 /** The public Nodemailer JSON transport compiles the same recipient envelope without delivery. */
@@ -23,4 +30,6 @@ export declare function matchRecipients(to: string, cc: string, policy?: Recipie
     rows: RecipientMatch[];
     allTrusted: boolean;
     skipsApproval: boolean;
+    blocked: boolean;
 }>;
+export declare function assertRecipientsAllowed(to: string, cc: string, policy?: RecipientPolicy): Promise<void>;

package/lib/recipient-policy.js

@@ -1,6 +1,10 @@
 import nodemailer from 'nodemailer';
 import { domainToASCII } from 'node:url';
 import { parse, stringify } from 'yaml';
+export class RecipientPolicyError extends Error {
+    code = 'recipient-denied';
+    constructor(addresses) { super('收件人被禁止规则拦截，邮件未发送 / Recipients blocked; no email sent: ' + addresses.join(', ')); this.name = 'RecipientPolicyError'; }
+}
 const normalizer = nodemailer.createTransport({ jsonTransport: true, disableFileAccess: true, disableUrlAccess: true });
 export function canonicalDomain(value) {
     const domain = domainToASCII(value.trim().replace(/\.$/, '')).toLowerCase();
@@ -57,8 +61,8 @@ export function parseRecipientPolicies(text) {
         throw new Error('规则应按账号名填写，最多 50 个账号');
     const policies = new Map();
     for (const [account, raw] of Object.entries(data)) {
-        if (!account.trim() || account.length > 200 || !plain(raw) || Object.keys(raw).some(key => !['skipApproval', 'addresses', 'domains'].includes(key)))
-            throw new Error('账号规则只支持 skipApproval、addresses 与 domains');
+        if (!account.trim() || account.length > 200 || !plain(raw) || Object.keys(raw).some(key => !['skipApproval', 'addresses', 'domains', 'denyAddresses', 'denyDomains'].includes(key)))
+            throw new Error('账号规则只支持 skipApproval、addresses、domains、denyAddresses 与 denyDomains');
         if (raw.skipApproval !== undefined && typeof raw.skipApproval !== 'boolean')
             throw new Error('skipApproval 必须是布尔值');
         const list = (key, convert) => {
@@ -67,7 +71,7 @@ export function parseRecipientPolicies(text) {
                 throw new Error(key + ' 必须为字符串数组，最多 100 项');
             return [...new Set(values.map(value => convert(value)))];
         };
-        policies.set(account, { skipApproval: raw.skipApproval === true, addresses: list('addresses', canonicalAddress), domains: list('domains', canonicalDomain) });
+        policies.set(account, { skipApproval: raw.skipApproval === true, addresses: list('addresses', canonicalAddress), domains: list('domains', canonicalDomain), denyAddresses: list('denyAddresses', canonicalAddress), denyDomains: list('denyDomains', canonicalDomain) });
     }
     return policies;
 }
@@ -76,13 +80,24 @@ export function serializeRecipientPolicies(policies) {
 }
 export async function matchRecipients(to, cc, policy) {
     const rows = (await normalizeRecipients(to, cc)).map(row => {
-        if (policy?.addresses.includes(row.address))
-            return { ...row, matched: true, rule: 'address', value: row.address };
         const domain = row.address.slice(row.address.lastIndexOf('@') + 1);
+        if (policy?.denyAddresses?.includes(row.address))
+            return { ...row, matched: false, blocked: true, rule: 'address', value: row.address };
+        if (policy?.denyDomains?.includes(domain))
+            return { ...row, matched: false, blocked: true, rule: 'domain', value: domain };
+        if (policy?.addresses.includes(row.address))
+            return { ...row, matched: true, blocked: false, rule: 'address', value: row.address };
         if (policy?.domains.includes(domain))
-            return { ...row, matched: true, rule: 'domain', value: domain };
-        return { ...row, matched: false, rule: '', value: '' };
+            return { ...row, matched: true, blocked: false, rule: 'domain', value: domain };
+        return { ...row, matched: false, blocked: false, rule: '', value: '' };
     });
     const allTrusted = rows.length > 0 && rows.every(row => row.matched);
-    return { rows, allTrusted, skipsApproval: policy?.skipApproval === true && allTrusted };
+    return { rows, allTrusted, skipsApproval: policy?.skipApproval === true && allTrusted, blocked: rows.some(row => row.blocked) };
+}
+export async function assertRecipientsAllowed(to, cc, policy) {
+    if (!policy?.denyAddresses?.length && !policy?.denyDomains?.length)
+        return;
+    const matching = await matchRecipients(to, cc, policy);
+    if (matching.blocked)
+        throw new RecipientPolicyError(matching.rows.filter(row => row.blocked).map(row => row.address));
 }

package/lib/runtime.js

@@ -71,6 +71,7 @@ export function createEmailRuntime(ctx, config, createPool = settings => new Ema
         });
     };
     let pool = null;
+    let poolSettings = null;
     let poolFingerprint = '';
     let disposed = false;
     const getPool = () => {
@@ -81,9 +82,14 @@ export function createEmailRuntime(ctx, config, createPool = settings => new Ema
         if (pool === null || fingerprint !== poolFingerprint) {
             pool?.dispose();
             pool = createPool(effective);
+            poolSettings = effective;
             pool.startIdleSweep();
             poolFingerprint = fingerprint;
         }
+        // Rules change without disrupting an IMAP connection or watch cursor. The
+        // pool reads this shared settings object at its SMTP submission boundary.
+        if (poolSettings)
+            poolSettings.recipientPolicies = effective.recipientPolicies;
         return pool;
     };
     // Tool and browser watches share the implementation but never consume each

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-email",
-  "version": "0.15.3",
+  "version": "0.16.0",
   "description": "在 DSH 中收发、搜索和整理邮件，支持多个邮箱账号。",
   "type": "module",
   "main": "lib/index.js",