dsh-mail-sender 0.1.3 → 0.1.5

package/lib/index.d.ts

@@ -7,78 +7,30 @@ interface Ref<T> {
     get(): T;
 }
 export interface Config {
-    imap: {
-        host: Ref<string>;
-        port: Ref<number>;
-        secure: Ref<boolean>;
-        user: Ref<string>;
-        password: Ref<string>;
-    };
-    smtp: {
-        host: Ref<string>;
-        port: Ref<number>;
-        secure: Ref<boolean>;
-        user: Ref<string>;
-        password: Ref<string>;
-    };
-    /** 入站+出站合并白名单 */
+    /** 机器人邮箱，同时用于 IMAP/SMTP 登录与回信 From */
+    email: Ref<string>;
+    /** 邮箱密码或授权码 */
+    password: Ref<string>;
+    imapHost: Ref<string>;
+    smtpHost: Ref<string>;
+    /** SMTP 端口，465 走 SSL，其余走 STARTTLS */
+    smtpPort: Ref<number>;
+    /** 入站+出站白名单 */
     allowedAddresses: Ref<string[]>;
 }
 export declare const Config: Schema<Schemastery.ObjectS<NoInfer<{
-    imap: Schema<Schemastery.ObjectS<NoInfer<{
-        host: Schema<string, string, "volatile-defined">;
-        port: Schema<number, number, "volatile-defined">;
-        secure: Schema<boolean, boolean, "volatile-defined">;
-        user: Schema<string, string, "volatile-defined">;
-        password: Schema<string, string, "volatile-defined">;
-    }>>, Schemastery.ObjectT<NoInfer<{
-        host: Schema<string, string, "volatile-defined">;
-        port: Schema<number, number, "volatile-defined">;
-        secure: Schema<boolean, boolean, "volatile-defined">;
-        user: Schema<string, string, "volatile-defined">;
-        password: Schema<string, string, "volatile-defined">;
-    }>>, "plain">;
-    smtp: Schema<Schemastery.ObjectS<NoInfer<{
-        host: Schema<string, string, "volatile-defined">;
-        port: Schema<number, number, "volatile-defined">;
-        secure: Schema<boolean, boolean, "volatile-defined">;
-        user: Schema<string, string, "volatile-defined">;
-        password: Schema<string, string, "volatile-defined">;
-    }>>, Schemastery.ObjectT<NoInfer<{
-        host: Schema<string, string, "volatile-defined">;
-        port: Schema<number, number, "volatile-defined">;
-        secure: Schema<boolean, boolean, "volatile-defined">;
-        user: Schema<string, string, "volatile-defined">;
-        password: Schema<string, string, "volatile-defined">;
-    }>>, "plain">;
+    email: Schema<string, string, "volatile-defined">;
+    password: Schema<string, string, "volatile-defined">;
+    imapHost: Schema<string, string, "volatile-defined">;
+    smtpHost: Schema<string, string, "volatile-defined">;
+    smtpPort: Schema<number, number, "volatile-defined">;
     allowedAddresses: Schema<NoInfer<string[]>, NoInfer<string[]>, "volatile-defined">;
 }>>, Schemastery.ObjectT<NoInfer<{
-    imap: Schema<Schemastery.ObjectS<NoInfer<{
-        host: Schema<string, string, "volatile-defined">;
-        port: Schema<number, number, "volatile-defined">;
-        secure: Schema<boolean, boolean, "volatile-defined">;
-        user: Schema<string, string, "volatile-defined">;
-        password: Schema<string, string, "volatile-defined">;
-    }>>, Schemastery.ObjectT<NoInfer<{
-        host: Schema<string, string, "volatile-defined">;
-        port: Schema<number, number, "volatile-defined">;
-        secure: Schema<boolean, boolean, "volatile-defined">;
-        user: Schema<string, string, "volatile-defined">;
-        password: Schema<string, string, "volatile-defined">;
-    }>>, "plain">;
-    smtp: Schema<Schemastery.ObjectS<NoInfer<{
-        host: Schema<string, string, "volatile-defined">;
-        port: Schema<number, number, "volatile-defined">;
-        secure: Schema<boolean, boolean, "volatile-defined">;
-        user: Schema<string, string, "volatile-defined">;
-        password: Schema<string, string, "volatile-defined">;
-    }>>, Schemastery.ObjectT<NoInfer<{
-        host: Schema<string, string, "volatile-defined">;
-        port: Schema<number, number, "volatile-defined">;
-        secure: Schema<boolean, boolean, "volatile-defined">;
-        user: Schema<string, string, "volatile-defined">;
-        password: Schema<string, string, "volatile-defined">;
-    }>>, "plain">;
+    email: Schema<string, string, "volatile-defined">;
+    password: Schema<string, string, "volatile-defined">;
+    imapHost: Schema<string, string, "volatile-defined">;
+    smtpHost: Schema<string, string, "volatile-defined">;
+    smtpPort: Schema<number, number, "volatile-defined">;
     allowedAddresses: Schema<NoInfer<string[]>, NoInfer<string[]>, "volatile-defined">;
 }>>, "plain">;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -6,65 +6,77 @@ import Schema from '@deepseek-ai/schemastery';
 export const name = 'dsh-mail-sender';
 export const inject = ['agents'];
 export const Config = Schema.object({
-    imap: Schema.object({
-        host: Schema.string().volatile().default('').description('IMAP 服务器地址'),
-        port: Schema.number().volatile().default(993),
-        secure: Schema.boolean().volatile().default(true),
-        user: Schema.string().volatile().default('').description('IMAP 登录账号'),
-        password: Schema.string().volatile().default('').description('IMAP 密码/授权码'),
-    }).description('IMAP 收信'),
-    smtp: Schema.object({
-        host: Schema.string().volatile().default('').description('SMTP 服务器地址'),
-        port: Schema.number().volatile().default(465),
-        secure: Schema.boolean().volatile().default(true),
-        user: Schema.string().volatile().default('').description('SMTP 登录账号'),
-        password: Schema.string().volatile().default('').description('SMTP 密码/授权码'),
-    }).description('SMTP 发信'),
+    email: Schema.string().volatile().default('').description('机器人邮箱，如 agent@qq.com'),
+    password: Schema.string().volatile().default('').description('邮箱密码或授权码'),
+    imapHost: Schema.string().volatile().default('').description('IMAP 服务器，如 imap.qq.com'),
+    smtpHost: Schema.string().volatile().default('').description('SMTP 服务器，如 smtp.qq.com'),
+    smtpPort: Schema.number().volatile().default(465).description('SMTP 端口，465 走 SSL，587 走 STARTTLS'),
     allowedAddresses: Schema.array(Schema.string())
         .volatile()
         .default([])
         .description('允许与 agent 通信的邮箱地址'),
 });
-export function apply(ctx, config) {
-    const imapConfig = () => ({
-        host: config.imap.host.get(),
-        port: config.imap.port.get(),
-        secure: config.imap.secure.get(),
-        auth: { user: config.imap.user.get(), pass: config.imap.password.get() },
-    });
-    const imap = new ImapFlow({ ...imapConfig(), logger: false });
-    // SMTP 传输按当前配置缓存，设置变更后自动重建
-    let smtp;
-    let smtpKey = '';
-    const getSmtp = () => {
-        const conf = {
-            host: config.smtp.host.get(),
-            port: config.smtp.port.get(),
-            secure: config.smtp.secure.get(),
-            auth: { user: config.smtp.user.get(), pass: config.smtp.password.get() },
-        };
-        const key = JSON.stringify(conf);
-        if (smtpKey !== key) {
-            smtp = nodemailer.createTransport(conf);
-            smtpKey = key;
-        }
-        return smtp;
+function resolveServers(config) {
+    const smtpPort = config.smtpPort.get();
+    return {
+        email: config.email.get().trim(),
+        password: config.password.get(),
+        imapHost: config.imapHost.get().trim(),
+        imapPort: 993,
+        smtpHost: config.smtpHost.get().trim(),
+        smtpPort,
+        smtpSecure: smtpPort === 465,
     };
+}
+export function apply(ctx, config) {
     // sessionId -> agent handle
     const handles = new Map();
-    // sessionId -> 最近一封来信的信息（用于回复）
+    // sessionId -> 最近一封来信（用于回复）
     const lastMail = new Map();
     // `${sessionId}:${turn}` -> 该 turn 内累积的 assistant 文本
     const turnBuffers = new Map();
-    ctx.effect(() => {
-        let closed = false;
-        let lock;
-        imap.on('exists', async () => {
+    let client;
+    let lock;
+    let startedKey = '';
+    let smtp;
+    let smtpKey = '';
+    const stopImap = async () => {
+        startedKey = '';
+        try {
+            lock?.release();
+        }
+        catch { }
+        lock = undefined;
+        const current = client;
+        client = undefined;
+        if (current)
+            await current.logout().catch(() => { });
+    };
+    const ensureStarted = async () => {
+        const servers = resolveServers(config);
+        const key = JSON.stringify(servers);
+        if (key === startedKey)
+            return;
+        await stopImap();
+        if (!servers.email || !servers.password || !servers.imapHost || !servers.smtpHost) {
+            console.warn('[mail-bot] 请在 设置 → 插件 → dsh-mail-sender 填写邮箱、密码与 IMAP/SMTP 服务器');
+            return;
+        }
+        const next = new ImapFlow({
+            host: servers.imapHost,
+            port: servers.imapPort,
+            secure: true,
+            auth: { user: servers.email, pass: servers.password },
+            logger: false,
+        });
+        client = next;
+        startedKey = key;
+        next.on('exists', async () => {
             try {
-                const mb = imap.mailbox;
+                const mb = next.mailbox;
                 if (mb === false)
                     return;
-                const fetched = await imap.fetchOne(mb.exists, { source: true });
+                const fetched = await next.fetchOne(mb.exists, { source: true });
                 if (fetched === false || !fetched.source)
                     return;
                 const parsed = await simpleParser(fetched.source);
@@ -86,11 +98,6 @@ export function apply(ctx, config) {
                 if (!handle) {
                     handle = await getOrCreateAgent(ctx, sessionId);
                     handles.set(sessionId, handle);
-                    ctx.on('session/event', (session, event) => {
-                        if (session?.header?.id !== sessionId)
-                            return;
-                        handleSessionEvent(sessionId, event);
-                    });
                 }
                 handle.agent.followup(createUserMessage({
                     content: [{ type: 'text', text: parsed.text || '' }],
@@ -101,18 +108,41 @@ export function apply(ctx, config) {
                 console.error('[mail-bot] 收信失败', err);
             }
         });
-        void (async () => {
-            await imap.connect();
-            if (closed)
-                return void imap.logout();
-            lock = await imap.getMailboxLock('INBOX');
-        })().catch(err => console.error('[mail-bot] IMAP 连接失败', err));
+        try {
+            await next.connect();
+            if (client !== next)
+                return void next.logout().catch(() => { });
+            lock = await next.getMailboxLock('INBOX');
+        }
+        catch (err) {
+            console.error('[mail-bot] IMAP 连接失败', err);
+            if (client === next)
+                await stopImap();
+        }
+    };
+    const getSmtp = (servers) => {
+        const key = `${servers.smtpHost}:${servers.smtpPort}:${servers.smtpSecure}:${servers.email}`;
+        if (smtpKey !== key) {
+            smtp = nodemailer.createTransport({
+                host: servers.smtpHost,
+                port: servers.smtpPort,
+                secure: servers.smtpSecure,
+                requireTLS: !servers.smtpSecure,
+                auth: { user: servers.email, pass: servers.password },
+            });
+            smtpKey = key;
+        }
+        return smtp;
+    };
+    ctx.on('loader/volatile-update', () => { void ensureStarted(); });
+    ctx.on('session/event', (session, event) => {
+        const id = session?.header?.id;
+        if (typeof id === 'string' && handles.has(id))
+            handleSessionEvent(id, event);
+    });
+    ctx.effect(() => {
+        void ensureStarted();
         return () => {
-            closed = true;
-            try {
-                lock?.release();
-            }
-            catch { }
             for (const h of handles.values()) {
                 try {
                     h.dispose();
@@ -122,7 +152,7 @@ export function apply(ctx, config) {
             handles.clear();
             turnBuffers.clear();
             lastMail.clear();
-            void imap.logout().catch(() => { });
+            void stopImap();
         };
     });
     function handleSessionEvent(sessionId, event) {
@@ -139,7 +169,7 @@ export function apply(ctx, config) {
             turnBuffers.set(key, [...(turnBuffers.get(key) ?? []), text]);
             return;
         }
-        // 一轮完整结束后才回复；一个 turn 可能含多个 step
+        // 一轮完整结束后才回信；一个 turn 可能含多个 step
         if (event.type === 'turn/end' && data.reason?.kind === 'completed') {
             const replyText = (turnBuffers.get(key) ?? []).join('\n\n').trim();
             turnBuffers.delete(key);
@@ -148,9 +178,10 @@ export function apply(ctx, config) {
             const mail = lastMail.get(sessionId);
             if (!mail)
                 return;
+            const servers = resolveServers(config);
             const subject = mail.subject.startsWith('Re:') ? mail.subject : `Re: ${mail.subject}`;
-            getSmtp().sendMail({
-                from: config.smtp.user.get(),
+            getSmtp(servers).sendMail({
+                from: servers.email,
                 to: mail.from,
                 subject,
                 text: replyText,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-mail-sender",
-  "version": "0.1.3",
-  "description": "DSH mail channel: inbound IMAP mail is delivered to an agent, whose reply is sent back over SMTP.",
+  "version": "0.1.5",
+  "description": "inbound IMAP mail is delivered to an agent, whose reply is sent back over SMTP.",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -41,5 +41,10 @@
     "@deepseek-ai/schemastery": "3.19.0",
     "@types/nodemailer": "^6.4.17",
     "typescript": "^5.6.0"
+  },
+  "pnpm": {
+    "overrides": {
+      "iconv-lite": "0.6.3"
+    }
   }
 }

package/readme.md

@@ -30,15 +30,7 @@ SMTP 回复 (Re: 原主题, In-Reply-To: 原 Message-ID)
 ## 安装
 
 ```bash
-# npm
 dsh plugin --profile web add dsh-mail-sender
-
-# GitHub（需仓库内已提交 lib/）
-dsh plugin --profile web add github:<你的用户名>/dsh-mail-sender
-
-# 本地源码
-npm install && npm run build
-dsh plugin --profile web add link:/path/to/dsh-mail-sender
 ```
 
 安装后重启 `dsh web`，用 `dsh --profile web --dump-config` 确认插件行已进入配置树。
@@ -53,21 +45,18 @@ dsh plugin --profile web add link:/path/to/dsh-mail-sender
 
 | 字段 | 说明 |
 |---|---|
-| `imap.host` | IMAP 服务器地址（如 `imap.qq.com`） |
-| `imap.port` | 端口，默认 `993` |
-| `imap.secure` | 是否 TLS，默认 `true` |
-| `imap.user` | IMAP 登录账号 |
-| `imap.password` | IMAP 密码或授权码 |
-| `smtp.host` | SMTP 服务器地址（如 `smtp.qq.com`） |
-| `smtp.port` | 端口，默认 `465` |
-| `smtp.secure` | 是否 TLS，默认 `true` |
-| `smtp.user` | SMTP 登录账号（也是回信 From） |
-| `smtp.password` | SMTP 密码或授权码 |
+| `email` | 机器人邮箱，如 `agent@qq.com`（同时用于 IMAP/SMTP 登录与回信 From） |
+| `password` | 邮箱密码或授权码 |
+| `imapHost` | IMAP 服务器，如 `imap.qq.com`（固定 993 + SSL） |
+| `smtpHost` | SMTP 服务器，如 `smtp.qq.com` |
+| `smtpPort` | 默认 `465`（SSL）；填 `587` 时自动走 STARTTLS |
 | `allowedAddresses` | 允许与 agent 通信的邮箱地址列表 |
 
+服务器地址按你的邮箱服务商填写，插件不做猜测。
+
 白名单同时控制两个方向：非名单内发件人的来信直接丢弃；agent 的回复目标就是来信人，因此也天然限定在名单内。
 
-配置为 `.volatile()`：白名单与 SMTP 设置在保存后即时生效；IMAP 连接参数变更后需重载插件（重启 `dsh web`）才重连。
+所有字段都是 `.volatile()`：保存后即时生效，IMAP 会按新配置自动重连，无需重启 host。
 
 ## 包结构
 
@@ -86,33 +75,4 @@ dsh plugin --profile web add link:/path/to/dsh-mail-sender
 - insert:
     - id: dsh-mail-sender
       name: dsh-mail-sender
-```
-
-## 发布
-
-### npm
-
-```bash
-npm run build     # 产出 lib/
-npm publish       # scoped 包用 --access public
-```
-
-`files` 已包含 `lib` 与 `cordis.patch.yml`——漏掉 patch 文件是最常见的“装上了但没进配置树”原因。
-
-### GitHub
-
-```bash
-git init && git add . && git commit -m "feat: dsh-mail-sender"
-git branch -M main
-git remote add origin https://github.com/<用户名>/dsh-mail-sender.git
-git push -u origin main
-git tag v0.1.3 && git push origin v0.1.3
-```
-
-从 git 安装时 pnpm 需要执行构建，请在 profile 的 `pnpm-workspace.yaml` 里加 `allowBuilds: { dsh-mail-sender: true }`；更省事的方式是发布到 npm（发布产物已构建好）。
-
-## 依赖
-
-运行时：`imapflow`、`mailparser`、`nodemailer`。
-
-Peer（由 DSH host 提供）：`@deepseek-ai/cordis`、`@deepseek-ai/dsh-agent`、`@deepseek-ai/dsh-llm`、`@deepseek-ai/schemastery`。
+```