dsh-email 0.14.3 → 0.14.4

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.14.4（2026-09-29）
+
+- 修复：SMTP 发送改为**每次发送独占连接**，取消（AbortSignal）时只销毁本次连接的 socket 并立即拒绝，不再影响同账号的其它发送，也不会在取消后仍把邮件发出去。
+- 修复：OAuth2 令牌刷新与取消的竞态——取消后即使令牌刷新成功也不再继续发送。
+- 测试：修正 TLS fixture 的两处握手缺陷（STARTTLS 明文阶段未发送 220；取消用例把 greeting 压住导致走不到 TLS 升级），TLS 与取消回归现可稳定通过（285 项）。
 ## 0.14.3（2026-09-28）
 
 - 兼容验证更新到 Harness 0.2.0-rc.1：282 项邮件测试与 18 插件共同加载检查通过。

package/README.en.md

@@ -55,10 +55,6 @@ Example:
 
 The current baseline is official-source Harness **0.2.0-rc.1** (2026-09-28, with a local `Symbol.for` tool-scheduler fix). All 18 plugins load together. Settings coverage includes legacy migration, real Web UI editing and automatic saving, refresh, revision conflicts and restart persistence with isolated fixture accounts. No live mailbox connection or sending was exercised in this round.
 
-2026-09-21: the current release package was installed through the official CLI in an isolated profile and co-loaded with the other two most-downloaded plugins on source-built Harness `0.1.6-alpha.2`. All 18 plugin tools registered; calendar/email configuration checks, PPT theme listing and 17-row table generation passed. The host is based on the official alpha.2 release plus the tool-scheduler `Symbol.for` fix (`93badd88`). This run did not connect to live mail or calendar services.
-
-Co-load verification was performed on 2026-09-16 with official source builds of Harness `0.1.5-rc.2` and `0.1.6-alpha.1`: all 18 components load alongside ModLens, with passing tool schemas, skill registration and offline read-only calls.
-
 **0.11.0 co-load verification (2026-09-18, locally built Harness `0.1.5-rc.2`, `web` profile)**: the plugin mounted without errors; the settings route answered GET with 200 and no `raw` field in the response; a `text/plain` POST was refused with **415**, proving the same-origin guard holds in the real host; under a `application/json` POST the card projection was correct, and an account pinning `authKind: password` reported both `authKindDeclared` and `authKind` as `password`; the panel actually rendered account cards, the eight provider presets with localized labels, the three-way authentication selector, the application (client) ID field with its hint, the missing-ID warning banner (so `--dsw-alias-state-warn-primary` is genuinely defined in the real host) and the Sign in with Microsoft button; the browser console was clean; save worked end to end, and afterwards `accountsYaml` was restored to empty with the original account intact. Offline tests: 231 green. **Still not done**: an end-to-end OAuth2 run against a real Outlook tenant (the device-code flow needs a human to authorize in a browser) and real sending; the `clientId` paths are covered only against a fake authority. Uses the `cordis.patch.yml` + `dsh.bundle.patch` bundle model. Node requirements are 22.19 or later within 22.x, or 24 or later. Live external-service workflows require separate configuration and validation.
 
 On 2026-09-10, npm `dsh-email@0.10.6` passed real QQ mailbox folder/list/read/search calls, the settings page's connection test and Save & Apply, and separate SMTP authentication. An empty authorization-code field correctly used `DSH_EMAIL_PASSWORD`. This recheck did not connect to a real mailbox or send, modify or delete mail.

package/README.md

@@ -63,14 +63,8 @@ IMAP/SMTP email tools for DeepSeek Harness, with replies, forwarding, mailbox or
 
 当前验证基线为官方源码构建的 Harness **0.2.0-rc.1**（2026-09-28，含本地工具调度器 `Symbol.for` 修复）。18 个插件共同加载；邮件设置覆盖旧配置迁移、真实网页编辑与自动保存、刷新恢复、修订冲突和重启持久化检查。本轮使用隔离测试账号，未连接真实邮箱或发送邮件。
 
-2026-09-21：当前发布包经官方 CLI 安装到隔离 profile，在源码构建的 Harness `0.1.6-alpha.2` 上与另外两个下载量前三插件共同加载，18 个插件工具注册正常；日历/邮件配置自检、PPT 主题查询和 17 行表格生成通过。测试本体基于官方 alpha.2 发布提交，另含工具调度器 `Symbol.for` 修复（`93badd88`）。本轮未连接真实邮箱或日历服务。
-
-2026-09-16 曾在官方源码构建的 Harness `0.1.5-rc.2` 和 `0.1.6-alpha.1` 上完成同载验证：18 个组件与 ModLens 同载，工具 schema、技能注册及离线只读调用检查通过。
-
 **0.11.0 的同载验证（2026-09-18，本地构建的 Harness `0.1.5-rc.2`，`web` profile）**：插件挂载无报错；设置路由 GET 返回 200 且响应中已无 `raw` 字段；用 `text/plain` 发 POST 被 **415** 拒绝（同源守卫在真实宿主下生效）；`application/json` 的 POST 下卡片投影正确，账号钉住 `authKind: password` 后 `authKindDeclared` 与 `authKind` 均为 `password`；设置面板实际渲染出账号卡片、8 个服务商预设的中文下拉、「认证方式」三态选择器、「应用（客户端）ID」输入格与提示、未填 ID 时的警示条（说明 `--dsw-alias-state-warn-primary` 在真实宿主下确有定义）与「登录 Microsoft 账号」按钮；浏览器控制台无报错；save 全链路可用，验证结束后已把 `accountsYaml` 还原为空、原有账号恢复。离线测试 231 项全绿。**仍未做**：真实 Outlook 租户的 OAuth2 端到端（设备码流程要真人在浏览器完成授权）与真实发信未测，`clientId` 相关路径目前只有假 authority 的用例覆盖。采用 `cordis.patch.yml` + `dsh.bundle.patch` 组合包模型。Node 要求为 22.19 及以上的 22.x，或 24 及以上。外部服务的实际业务操作需按各组件配置单独验证。
 
-2026-09-10，npm `dsh-email@0.10.6` 曾通过真实 QQ 邮箱目录、列表、读取和搜索，以及设置页“测试连接”“保存并应用”检查；授权码留空时能继续使用 `DSH_EMAIL_PASSWORD`。独立 SMTP 登录认证也已通过。此次复验未连接真实邮箱，未发送、修改或删除邮件。
-
 遵循官方[插件打包与安装要求](https://github.com/deepseek-ai/deepseek-harness/blob/master/docs/user/develop/basic/publish.md)：ESM 入口、预构建 `lib/`、`dsh.bundle.patch` 和 `cordis.patch.yml` 配置层；显式注入所需服务，提供 JSON Schema 参数、规范化输出和渲染函数，运行时不导入宿主内部服务；配置声明使用官方 `@deepseek-ai/schemastery` 公共包。使用 Node 22.19 及以上的 22.x 或 Node 24 及以上版本；Harness 仍在快速迭代，上述版本是实测基线。
 
 ## 安装

package/lib/mail-client.d.ts

@@ -108,8 +108,7 @@ export declare function extractMessageIds(source: Buffer): {
  */
 export declare function buildReplyMessage(original: OriginalDigest, mode: EmailReplyMode, selfAddress: string | readonly string[], text: string, forwardTo?: string): BuiltReply;
 /**
- * One mailbox pool for the whole plugin: pooled IMAP connections per
- * account plus pooled SMTP transporters, with idle sweep and error eviction.
+ * One mailbox pool for the whole plugin: pooled IMAP connections per account.
  */
 export declare class EmailPool {
     private readonly settings;
@@ -155,14 +154,13 @@ export declare class EmailPool {
     startIdleSweep(): void;
     dispose(): void;
     /**
-     * A pooled transporter for one account. The token is captured when the
-     * transporter is built; an OAuth2 token that turns out to be stale is
-     * re-minted in sendMail, which rebuilds the transporter.
+     * Create an unpooled sender with its own socket. The socket callback exposes
+     * only the public SMTP transport hook to the cancellation owner.
      */
     private transporter;
-    private dropTransporter;
     /**
-     * Send through the pooled transporter while making cancellation close it.
+     * Give each send its own SMTP connection so cancellation can close that
+     * operation without closing another send for the same account.
      *
      * An OAuth2 transporter carries a token that was minted when it was built,
      * so a rejection is retried once against a freshly built one (and a fresh

package/lib/mail-client.js

@@ -1,5 +1,6 @@
 import { ImapFlow } from 'imapflow';
 import nodemailer from 'nodemailer';
+import { createConnection } from 'node:net';
 import { mkdir, stat, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { getFreshAccessToken, OAuth2Error } from './oauth2.js';
@@ -293,8 +294,7 @@ const READ_CACHE_TTL_MS = 10 * 60 * 1000;
 /** Folder names change rarely; a short TTL keeps email_folders off the wire. */
 const FOLDER_CACHE_TTL_MS = 60 * 1000;
 /**
- * One mailbox pool for the whole plugin: pooled IMAP connections per
- * account plus pooled SMTP transporters, with idle sweep and error eviction.
+ * One mailbox pool for the whole plugin: pooled IMAP connections per account.
  */
 export class EmailPool {
     settings;
@@ -566,41 +566,64 @@ export class EmailPool {
         this.idleTimer = undefined;
         for (const name of [...this.imaps.keys()])
             void this.evictImap(name);
-        for (const transporter of this.smtps.values())
+        for (const [transporter, socket] of this.smtps) {
+            socket?.destroy();
             transporter.close();
+        }
         this.smtps.clear();
     }
     /**
-     * A pooled transporter for one account. The token is captured when the
-     * transporter is built; an OAuth2 token that turns out to be stale is
-     * re-minted in sendMail, which rebuilds the transporter.
+     * Create an unpooled sender with its own socket. The socket callback exposes
+     * only the public SMTP transport hook to the cancellation owner.
      */
-    transporter(name, cfg, accessToken) {
-        let t = this.smtps.get(name);
-        if (t === undefined) {
-            t = nodemailer.createTransport({
-                pool: true,
-                host: cfg.smtp.host,
-                port: cfg.smtp.port,
-                secure: cfg.smtp.secure,
-                auth: smtpAuthOf(cfg, accessToken),
-                connectionTimeout: 30000,
-                greetingTimeout: 10000,
-                socketTimeout: 60000,
-                maxConnections: 2,
-                maxMessages: 50,
-            });
-            this.smtps.set(name, t);
-        }
-        return t;
-    }
-    dropTransporter(name, transporter) {
-        if (this.smtps.get(name) === transporter)
-            this.smtps.delete(name);
-        transporter.close();
+    transporter(name, cfg, accessToken, signal, onSocket) {
+        const transporter = nodemailer.createTransport({
+            host: cfg.smtp.host,
+            port: cfg.smtp.port,
+            secure: cfg.smtp.secure,
+            auth: smtpAuthOf(cfg, accessToken),
+            connectionTimeout: 30000,
+            greetingTimeout: 10000,
+            socketTimeout: 60000,
+            getSocket: (options, callback) => {
+                const socket = createConnection({ host: options.host ?? cfg.smtp.host, port: options.port ?? cfg.smtp.port });
+                onSocket(socket);
+                let settled = false;
+                const finish = (error, socketOptions) => {
+                    if (settled)
+                        return;
+                    settled = true;
+                    clearTimeout(timer);
+                    socket.removeListener('connect', onConnect);
+                    socket.removeListener('error', onError);
+                    signal?.removeEventListener('abort', onAbort);
+                    if (error !== null)
+                        socket.destroy();
+                    callback(error, socketOptions);
+                };
+                const onConnect = () => {
+                    if (signal?.aborted === true) {
+                        finish(signal.reason instanceof Error ? signal.reason : new Error('SMTP connection aborted'));
+                    }
+                    else
+                        finish(null, { connection: socket });
+                };
+                const onError = (error) => finish(error);
+                const onAbort = () => finish(signal?.reason instanceof Error ? signal.reason : new Error('SMTP connection aborted'));
+                const timer = setTimeout(() => finish(new Error('SMTP connection timeout')), 30000);
+                socket.once('connect', onConnect);
+                socket.once('error', onError);
+                signal?.addEventListener('abort', onAbort, { once: true });
+                if (signal?.aborted === true)
+                    onAbort();
+            },
+        });
+        this.smtps.set(transporter, undefined);
+        return transporter;
     }
     /**
-     * Send through the pooled transporter while making cancellation close it.
+     * Give each send its own SMTP connection so cancellation can close that
+     * operation without closing another send for the same account.
      *
      * An OAuth2 transporter carries a token that was minted when it was built,
      * so a rejection is retried once against a freshly built one (and a fresh
@@ -610,44 +633,78 @@ export class EmailPool {
     async sendMail(name, cfg, message, signal) {
         signal?.throwIfAborted();
         const attempt = async (forceToken) => {
-            const token = cfg.authKind === 'oauth2' ? await getFreshAccessToken(name, cfg, { force: forceToken }) : undefined;
-            const transporter = this.transporter(name, cfg, token);
-            const onAbort = () => {
-                this.dropTransporter(name, transporter);
-            };
-            signal?.addEventListener('abort', onAbort, { once: true });
+            let token;
+            if (cfg.authKind === 'oauth2') {
+                const refreshing = getFreshAccessToken(name, cfg, { force: forceToken });
+                if (signal === undefined)
+                    token = await refreshing;
+                else {
+                    let onAbort;
+                    const aborted = new Promise((_resolve, reject) => {
+                        onAbort = () => reject(signal.reason ?? new DOMException('The operation was aborted', 'AbortError'));
+                        signal.addEventListener('abort', onAbort, { once: true });
+                        if (signal.aborted)
+                            onAbort();
+                    });
+                    try {
+                        token = await Promise.race([refreshing, aborted]);
+                    }
+                    finally {
+                        if (onAbort !== undefined)
+                            signal.removeEventListener('abort', onAbort);
+                    }
+                }
+            }
+            signal?.throwIfAborted();
+            let smtpSocket;
+            const transporter = this.transporter(name, cfg, token, signal, socket => {
+                smtpSocket = socket;
+                this.smtps.set(transporter, socket);
+            });
+            let onAbort;
+            const aborted = signal === undefined ? undefined : new Promise((_resolve, reject) => {
+                onAbort = () => {
+                    smtpSocket?.destroy();
+                    transporter.close();
+                    reject(new MailError('SMTP发送已取消；服务器是否已接收邮件无法确认，请先检查邮箱再决定是否重发'));
+                };
+                signal.addEventListener('abort', onAbort, { once: true });
+            });
             try {
-                const info = await transporter.sendMail(message);
-                signal?.throwIfAborted();
+                const sending = transporter.sendMail(message);
+                const info = aborted === undefined ? await sending : await Promise.race([sending, aborted]);
                 return info;
             }
             finally {
-                signal?.removeEventListener('abort', onAbort);
+                if (onAbort !== undefined)
+                    signal?.removeEventListener('abort', onAbort);
+                smtpSocket?.destroy();
+                transporter.close();
+                this.smtps.delete(transporter);
             }
         };
         try {
             return await attempt(false);
         }
         catch (error) {
-            signal?.throwIfAborted();
+            if (signal?.aborted === true)
+                throw error;
             if (cfg.authKind !== 'oauth2')
                 throw error;
-            // A pooled connection that already authenticated can fail for reasons no
+            // A connection that already authenticated can fail for reasons no
             // token can fix (a rejected recipient, a full mailbox). Only a credential
             // rejection is worth a second, freshly-tokened attempt — and a token
             // store that refused outright is reported as itself.
             if (!looksLikeAuthFailure(error))
                 throw this.oauth2ErrorOf(error);
-            // The cached transporter holds the old token: it has to go, or the retry
-            // would reuse the very credential that was just refused.
-            const stale = this.smtps.get(name);
-            if (stale !== undefined)
-                this.dropTransporter(name, stale);
+            // A fresh transporter is created for the retry so it cannot reuse the
+            // credential that was just refused.
             try {
                 return await attempt(true);
             }
             catch (retryError) {
-                signal?.throwIfAborted();
+                if (signal !== undefined && Boolean(signal.aborted))
+                    throw retryError;
                 throw this.oauth2ErrorOf(retryError);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-email",
-  "version": "0.14.3",
+  "version": "0.14.4",
   "description": "DSH 邮件插件：IMAP/SMTP 收发搜索、回复转发、附件与整理，多账号卡片设置页、Outlook OAuth2 登录与发信审批。",
   "type": "module",
   "main": "lib/index.js",