@zaclinley/dsh-mailharbor 0.1.0 → 0.2.1

package/lib/index.js

@@ -74,7 +74,7 @@ __export(smtp_exports, {
   verifySmtp: () => verifySmtp
 });
 import nodemailer from "nodemailer";
-function transportOptions(settings, credentials) {
+function transportOptions(settings, credentials, security = {}) {
   const secure = settings.secure !== false;
   return {
     host: settings.host,
@@ -83,21 +83,21 @@ function transportOptions(settings, credentials) {
     // Plain submission ports must upgrade; never send credentials in the clear.
     requireTLS: !secure,
     auth: credentials.accessToken !== void 0 ? { type: "OAuth2", user: credentials.user, accessToken: credentials.accessToken } : { user: credentials.user, pass: credentials.pass ?? "" },
-    tls: { rejectUnauthorized: true, servername: settings.host },
+    tls: { rejectUnauthorized: security.allowSelfSigned !== true, servername: settings.host },
     connectionTimeout: 2e4,
     greetingTimeout: 2e4,
     socketTimeout: 12e4,
     pool: false
   };
 }
-function createTransport(settings, credentials) {
-  return nodemailer.createTransport(transportOptions(settings, credentials));
+function createTransport(settings, credentials, security = {}) {
+  return nodemailer.createTransport(transportOptions(settings, credentials, security));
 }
 function recipientsOf(value) {
   return value.split(/[,;]/).map((part) => addressOf(part)).filter((address) => isEmail(address));
 }
-async function verifySmtp(settings, credentials) {
-  const transport = createTransport(settings, credentials);
+async function verifySmtp(settings, credentials, security = {}) {
+  const transport = createTransport(settings, credentials, security);
   try {
     await transport.verify();
     return { ok: true, host: settings.host, port: Number(settings.port) };
@@ -105,13 +105,13 @@ async function verifySmtp(settings, credentials) {
     transport.close();
   }
 }
-async function sendMail(settings, credentials, account, mail) {
+async function sendMail(settings, credentials, account, mail, security = {}) {
   const from = addressOf(mail.from ?? account);
   if (!isEmail(from)) throw new Error("\u53D1\u4EF6\u4EBA\u5730\u5740\u65E0\u6548");
   const to = recipientsOf(mail.to);
   const cc = recipientsOf(mail.cc ?? "");
   if (to.length === 0) throw new Error("\u6536\u4EF6\u4EBA\u4E0D\u80FD\u4E3A\u7A7A");
-  const transport = createTransport(settings, credentials);
+  const transport = createTransport(settings, credentials, security);
   try {
     const info = await transport.sendMail({
       from: settings.fromName === "" ? from : { name: settings.fromName, address: from },
@@ -1452,6 +1452,16 @@ var Router = class {
 
 // src/host/api.ts
 init_smtp();
+
+// src/host/html.ts
+function htmlToText(html) {
+  return html.replace(/<style[\s\S]*?<\/style>/gi, "").replace(/<script[\s\S]*?<\/script>/gi, "").replace(/<br\s*\/?>/gi, "\n").replace(/<\/(p|div|li|tr|h[1-6])>/gi, "\n").replace(/<li[^>]*>/gi, "\u2022 ").replace(/<[^>]+>/g, "").replace(/&nbsp;/g, " ").replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/\n{3,}/g, "\n\n").trim();
+}
+function escapeHtml(value) {
+  return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
+}
+
+// src/host/api.ts
 var API_PREFIX = "/mail-plugin/api";
 function createApiHandler(runtime) {
   const router = buildRouter(runtime);
@@ -1964,12 +1974,6 @@ ${signature}`;
   );
   return { ok: true, result };
 }
-function htmlToText(html) {
-  return html.replace(/<style[\s\S]*?<\/style>/gi, "").replace(/<script[\s\S]*?<\/script>/gi, "").replace(/<br\s*\/?>/gi, "\n").replace(/<\/(p|div|li|tr|h[1-6])>/gi, "\n").replace(/<li[^>]*>/gi, "\u2022 ").replace(/<[^>]+>/g, "").replace(/&nbsp;/g, " ").replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/\n{3,}/g, "\n\n").trim();
-}
-function escapeHtml(value) {
-  return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
-}
 
 // src/host/runtime.ts
 import { statSync } from "node:fs";
@@ -2360,13 +2364,13 @@ var MailHarborRuntime = class {
     const live = new Set(this.config.accounts.map((account) => account.id));
     for (const id of [...this.providers.keys()]) {
       if (!live.has(id)) {
-        void this.providers.get(id)?.dispose();
+        void this.providers.get(id)?.value.dispose();
         this.providers.delete(id);
       }
     }
     for (const id of [...this.databases.keys()]) {
       if (!live.has(id)) {
-        this.databases.get(id)?.close();
+        this.databases.get(id)?.value.close();
         this.databases.delete(id);
       }
     }
@@ -2375,9 +2379,9 @@ var MailHarborRuntime = class {
   }
   /** Drop cached connections and stores for one account after a settings change. */
   invalidate(accountId) {
-    void this.providers.get(accountId)?.dispose();
+    void this.providers.get(accountId)?.value.dispose();
     this.providers.delete(accountId);
-    this.databases.get(accountId)?.close();
+    this.databases.get(accountId)?.value.close();
     this.databases.delete(accountId);
     this.draftStores.delete(accountId);
     this.readStores.delete(accountId);
@@ -2408,37 +2412,43 @@ var MailHarborRuntime = class {
     return account.imap;
   }
   provider(account) {
+    const signature = `${account.imap.host}:${String(account.imap.port)}:${String(account.imap.secure)}:${account.username}:${account.auth.type}`;
     const existing = this.providers.get(account.id);
-    if (existing !== void 0) return existing;
+    if (existing !== void 0 && existing.signature === signature) return existing.value;
+    if (existing !== void 0) void existing.value.dispose();
     const created = new ImapProvider(account.imap, this.credentialsFor(account), {
       onReconnect: () => {
       }
     });
-    this.providers.set(account.id, created);
+    this.providers.set(account.id, { signature, value: created });
     return created;
   }
   database(account) {
+    const root = this.paths(account);
     const existing = this.databases.get(account.id);
-    if (existing !== void 0) return existing;
-    const created = new MailDatabase(this.paths(account).mailDb, {
+    if (existing !== void 0 && existing.signature === root.mailDb) return existing.value;
+    if (existing !== void 0) existing.value.close();
+    const created = new MailDatabase(root.mailDb, {
       maxBodyChars: 4e5,
-      attachmentsRoot: this.paths(account).attachments
+      attachmentsRoot: root.attachments
     });
-    this.databases.set(account.id, created);
+    this.databases.set(account.id, { signature: root.mailDb, value: created });
     return created;
   }
   drafts(account) {
+    const file = draftPath(this.paths(account).root);
     const existing = this.draftStores.get(account.id);
-    if (existing !== void 0) return existing;
-    const created = new DraftStore(draftPath(this.paths(account).root), account.id);
-    this.draftStores.set(account.id, created);
+    if (existing !== void 0 && existing.signature === file) return existing.value;
+    const created = new DraftStore(file, account.id);
+    this.draftStores.set(account.id, { signature: file, value: created });
     return created;
   }
   readState(account) {
+    const file = join4(this.paths(account).root, "read-state.json");
     const existing = this.readStores.get(account.id);
-    if (existing !== void 0) return existing;
-    const created = new ReadStateStore(join4(this.paths(account).root, "read-state.json"));
-    this.readStores.set(account.id, created);
+    if (existing !== void 0 && existing.signature === file) return existing.value;
+    const created = new ReadStateStore(file);
+    this.readStores.set(account.id, { signature: file, value: created });
     return created;
   }
   backupStatus(account) {
@@ -2493,7 +2503,7 @@ var MailHarborRuntime = class {
         status.running = false;
         status.finishedAt = (/* @__PURE__ */ new Date()).toISOString();
         if (status.exitCode === 0) status.lastSuccessAt = status.finishedAt;
-        this.databases.get(account.id)?.close();
+        this.databases.get(account.id)?.value.close();
         this.databases.delete(account.id);
       }
     })();
@@ -2509,9 +2519,9 @@ var MailHarborRuntime = class {
   async dispose() {
     this.disposed = true;
     for (const job of this.backups.values()) job.controller.abort();
-    for (const provider of this.providers.values()) await provider.dispose();
+    for (const provider of this.providers.values()) await provider.value.dispose();
     this.providers.clear();
-    for (const db of this.databases.values()) db.close();
+    for (const db of this.databases.values()) db.value.close();
     this.databases.clear();
   }
 };
@@ -2894,7 +2904,7 @@ ${page.items.map(
 // src/host/index.ts
 var name = "mailharbor";
 var inject = ["webServer", "tools"];
-var VERSION2 = "0.1.0";
+var VERSION2 = "0.2.1";
 var ROUTE = "/mail-plugin";
 function apply(ctx) {
   const runtime = new MailHarborRuntime();