@zaclinley/dsh-mailharbor 0.13.1 → 0.14.0

package/lib/index.js

@@ -128,14 +128,14 @@ function transportOptions(settings, credentials, security = {}) {
     pool: false
   };
 }
-function createTransport(settings, credentials, security = {}) {
+function createTransport2(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, security = {}) {
-  const transport = createTransport(settings, credentials, security);
+  const transport = createTransport2(settings, credentials, security);
   try {
     await transport.verify();
     return { ok: true, host: settings.host, port: Number(settings.port) };
@@ -149,7 +149,7 @@ async function sendMail(settings, credentials, account, mail, security = {}) {
   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, security);
+  const transport = createTransport2(settings, credentials, security);
   try {
     const info = await transport.sendMail({
       from: settings.fromName === "" ? from : { name: settings.fromName, address: from },
@@ -572,6 +572,28 @@ var init_imap = __esm({
           }
         });
       }
+      /** Append a message to the account's Drafts mailbox. */
+      async appendDraft(raw) {
+        const boxes = await this.mailboxes();
+        const box = boxes.find((item) => String(item.specialUse ?? "").toLowerCase() === "\\drafts") ?? boxes.find((item) => /drafts|草稿/i.test(item.name)) ?? boxes.find((item) => item.name.toLowerCase() === "drafts");
+        const path = box?.path ?? "Drafts";
+        return this.run(async (client) => {
+          const result = await client.append(path, raw, ["\\Draft"]);
+          if (result === false) throw new Error("\u670D\u52A1\u5668\u62D2\u7EDD\u4FDD\u5B58\u8349\u7A3F");
+          return { mailbox: path, uid: Number(result.uid) };
+        });
+      }
+      /** Delete one message (used when replacing a mirrored draft). */
+      async deleteMessage(mailbox, uid) {
+        return this.run(async (client) => {
+          const lock = await client.getMailboxLock(mailbox);
+          try {
+            await client.messageDelete(String(uid), { uid: true });
+          } finally {
+            lock.release();
+          }
+        });
+      }
       /** Move one message to another mailbox (server-side). */
       async move(mailbox, uid, target) {
         return this.run(async (client) => {
@@ -1006,6 +1028,30 @@ function moveLocalMessage(file, id, mailbox) {
   }
 }
 
+// src/host/draft-mime.ts
+import { createTransport } from "nodemailer";
+async function draftMime(account, draft) {
+  const transport = createTransport({ streamTransport: true, buffer: true, newline: "unix" });
+  const from = account.smtp.fromName === "" ? account.email : `"${account.smtp.fromName}" <${account.email}>`;
+  const info = await transport.sendMail({
+    from,
+    to: draft.to,
+    cc: draft.cc,
+    bcc: draft.bcc,
+    subject: draft.subject,
+    html: draft.html,
+    attachments: draft.attachments.map((file) => ({
+      filename: file.filename,
+      contentType: file.contentType,
+      content: Buffer.from(file.data, "base64")
+    })),
+    ...draft.inReplyTo === void 0 ? {} : { inReplyTo: draft.inReplyTo },
+    ...draft.references === void 0 ? {} : { references: draft.references }
+  });
+  if (Buffer.isBuffer(info.message)) return info.message;
+  return Buffer.from(info.message);
+}
+
 // src/host/backup.ts
 init_address();
 import { createHash as createHash2 } from "node:crypto";
@@ -2747,7 +2793,7 @@ ${conversation.trim()}
 }
 
 // src/host/version.ts
-var VERSION = "0.13.1";
+var VERSION = "0.14.0";
 
 // src/host/api.ts
 init_smtp();
@@ -3031,13 +3077,40 @@ function buildRouter(runtime) {
   router.post("/drafts", async ({ url, body }) => {
     const { account } = accountFrom(runtime, url);
     const payload = await body();
-    const draft = runtime.drafts(account).save(normalizeDraftInput(payload, account.id));
-    return { draft };
+    const store = runtime.drafts(account);
+    const draft = store.save(normalizeDraftInput(payload, account.id));
+    if (payload.remote !== true) return { draft };
+    if (!runtime.hasCredentials(account)) return { draft, syncError: "\u672A\u767B\u5F55\uFF0C\u8349\u7A3F\u4EC5\u4FDD\u5B58\u5728\u672C\u5730" };
+    try {
+      const raw = await draftMime(account, draft);
+      const provider = runtime.provider(account);
+      const appended = await provider.appendDraft(raw);
+      if (draft.remoteUid !== void 0 && draft.remoteMailbox !== void 0) {
+        try {
+          await provider.deleteMessage(draft.remoteMailbox, draft.remoteUid);
+        } catch {
+        }
+      }
+      const updated = store.save({ ...draft, remoteUid: appended.uid, remoteMailbox: appended.mailbox });
+      return { draft: updated };
+    } catch (error) {
+      return {
+        draft,
+        syncError: error instanceof Error ? error.message : String(error)
+      };
+    }
   });
-  router.delete("/drafts/:id", ({ url, params }) => {
+  router.delete("/drafts/:id", async ({ url, params }) => {
     const { account } = accountFrom(runtime, url);
+    const draft = runtime.drafts(account).get(params.id ?? "");
     const removed = runtime.drafts(account).remove(params.id ?? "");
     if (!removed) throw new HttpError(404, "\u8349\u7A3F\u4E0D\u5B58\u5728");
+    if (draft?.remoteUid !== void 0 && draft.remoteMailbox !== void 0 && runtime.hasCredentials(account)) {
+      try {
+        await runtime.provider(account).deleteMessage(draft.remoteMailbox, draft.remoteUid);
+      } catch {
+      }
+    }
     return { ok: true };
   });
   router.post("/send", async ({ url, body }) => {
@@ -4685,7 +4758,9 @@ var DraftStore = class {
         data: text(file.data)
       })) : [],
       inReplyTo: text(input.inReplyTo),
-      references: text(input.references)
+      references: text(input.references),
+      ...input.remoteUid === void 0 ? existing?.remoteUid === void 0 ? {} : { remoteUid: existing.remoteUid } : { remoteUid: Number(input.remoteUid) },
+      ...input.remoteMailbox === void 0 ? existing?.remoteMailbox === void 0 ? {} : { remoteMailbox: existing.remoteMailbox } : { remoteMailbox: text(input.remoteMailbox) }
     };
     if (existing !== void 0) {
       Object.assign(existing, fields, { updatedAt: now2 });