@zaclinley/dsh-mailharbor 0.14.0 → 0.16.0

package/lib/index.js

@@ -120,7 +120,7 @@ function transportOptions(settings, credentials, security = {}) {
     secure,
     // 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 ?? "" },
+    auth: { user: credentials.user, pass: credentials.pass ?? "" },
     tls: { rejectUnauthorized: security.allowSelfSigned !== true, servername: settings.host },
     connectionTimeout: 2e4,
     greetingTimeout: 2e4,
@@ -287,7 +287,7 @@ var init_imap = __esm({
             host: this.settings.host,
             port: Number(this.settings.port),
             secure: this.settings.secure !== false,
-            auth: this.credentials.accessToken !== void 0 ? { user: this.credentials.user, accessToken: this.credentials.accessToken } : { user: this.credentials.user, pass: this.credentials.pass ?? "" },
+            auth: { user: this.credentials.user, pass: this.credentials.pass ?? "" },
             logger: false,
             tls: { rejectUnauthorized: true },
             connectionTimeout: this.options.connectionTimeoutMs ?? 15e3,
@@ -710,18 +710,7 @@ var DEFAULTS = {
   },
   read: { markOnOpen: true, pollSeconds: 60 },
   render: { listLimit: 40 },
-  projects: { root: join2(homedir2(), "work", "projects") },
-  oauth: {
-    google: { clientId: "", redirectPort: 8765, scopes: ["https://mail.google.com/"] },
-    microsoft: {
-      clientId: "",
-      scopes: [
-        "offline_access",
-        "https://outlook.office.com/IMAP.AccessAsUser.All",
-        "https://outlook.office.com/SMTP.Send"
-      ]
-    }
-  }
+  projects: { root: join2(homedir2(), "work", "projects") }
 };
 var ACCOUNT_ID = /^[A-Za-z0-9_-]{1,64}$/;
 var EMAIL = /^[^@\s]+@[^@\s]+$/;
@@ -771,7 +760,7 @@ function normalizeAccount(input, index = 0, existing = []) {
     },
     keychainService: stringOr(input.keychainService, `dsh-mailharbor:${id}`),
     dataDir: stringOr(input.dataDir, `accounts/${id}`),
-    auth: input.auth?.type === "oauth2" ? { type: "oauth2", provider: input.auth.provider } : { type: "password" },
+    auth: { type: "password" },
     caldav: normalizeCaldav(input.caldav),
     signature: stringOr(input.signature, "").slice(0, 5e3),
     enabled: input.enabled !== false,
@@ -826,9 +815,6 @@ function loadConfig() {
   const readRaw = file.read ?? {};
   const renderRaw = file.render ?? {};
   const projectsRaw = file.projects ?? {};
-  const oauthRaw = file.oauth ?? {};
-  const googleRaw = oauthRaw.google ?? {};
-  const microsoftRaw = oauthRaw.microsoft ?? {};
   return {
     dataDir: DATA_ROOT,
     configFile: CONFIG_PATH,
@@ -853,17 +839,6 @@ function loadConfig() {
     projects: {
       root: stringOr(projectsRaw.root, DEFAULTS.projects.root)
     },
-    oauth: {
-      google: {
-        clientId: stringOr(googleRaw.clientId, DEFAULTS.oauth.google.clientId),
-        redirectPort: intOr(googleRaw.redirectPort, DEFAULTS.oauth.google.redirectPort, 1024, 65535),
-        scopes: Array.isArray(googleRaw.scopes) ? googleRaw.scopes.filter((item) => typeof item === "string") : DEFAULTS.oauth.google.scopes
-      },
-      microsoft: {
-        clientId: stringOr(microsoftRaw.clientId, DEFAULTS.oauth.microsoft.clientId),
-        scopes: Array.isArray(microsoftRaw.scopes) ? microsoftRaw.scopes.filter((item) => typeof item === "string") : DEFAULTS.oauth.microsoft.scopes
-      }
-    },
     revision: Date.now()
   };
 }
@@ -1760,7 +1735,7 @@ var BackupEngine = class {
       host: this.runtime.imap.host,
       port: Number(this.runtime.imap.port),
       secure: this.runtime.imap.secure !== false,
-      auth: this.credentials.accessToken !== void 0 ? { user: this.credentials.user, accessToken: this.credentials.accessToken } : { user: this.credentials.user, pass: this.credentials.pass ?? "" },
+      auth: { user: this.credentials.user, pass: this.credentials.pass ?? "" },
       logger: false,
       tls: { rejectUnauthorized: true },
       connectionTimeout: 2e4,
@@ -2793,7 +2768,7 @@ ${conversation.trim()}
 }
 
 // src/host/version.ts
-var VERSION = "0.14.0";
+var VERSION = "0.16.0";
 
 // src/host/api.ts
 init_smtp();
@@ -3007,6 +2982,78 @@ function buildRouter(runtime) {
     }
     return { ok: true, count };
   });
+  router.get("/transfer/export", () => {
+    const config = runtime.current;
+    return {
+      format: "mailharbor-transfer",
+      version: 1,
+      exportedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      settings: {
+        signature: config.signature,
+        read: config.read,
+        render: config.render,
+        ai: {
+          enabled: config.ai.enabled,
+          provider: config.ai.provider,
+          model: config.ai.model,
+          summaryLength: config.ai.summaryLength
+        }
+      },
+      accounts: config.accounts.map((account) => ({
+        email: account.email,
+        label: account.label,
+        username: account.username,
+        imap: account.imap,
+        smtp: account.smtp,
+        auth: account.auth,
+        enabled: account.enabled
+      }))
+    };
+  });
+  router.post("/transfer/import", async ({ body }) => {
+    const payload = await body();
+    if (payload.format !== "mailharbor-transfer" || !Array.isArray(payload.accounts)) {
+      throw new HttpError(400, "\u4E0D\u662F\u6709\u6548\u7684 MailHarbor \u914D\u7F6E\u6587\u4EF6");
+    }
+    const config = runtime.current;
+    const accounts = [...config.accounts];
+    let added = 0;
+    for (const raw of payload.accounts) {
+      const email = String(raw.email ?? "").trim();
+      if (email === "" || accounts.some((account) => account.email.toLowerCase() === email.toLowerCase()))
+        continue;
+      try {
+        const account = normalizeAccount(
+          {
+            email,
+            label: typeof raw.label === "string" ? raw.label : void 0,
+            username: typeof raw.username === "string" ? raw.username : void 0,
+            imap: asObject(raw.imap),
+            smtp: asObject(raw.smtp),
+            ...raw.auth !== void 0 ? { auth: raw.auth } : {}
+          },
+          accounts.length,
+          accounts.map((account2) => account2.id)
+        );
+        accounts.push(account);
+        added += 1;
+      } catch {
+      }
+    }
+    if (added > 0) saveAccounts(accounts, config.activeAccountId ?? accounts[0]?.id ?? null);
+    const settings = asObject(payload.settings);
+    const patch = {};
+    if (typeof settings.signature === "string") patch.signature = settings.signature.slice(0, 5e3);
+    const read = asObject(settings.read);
+    if (typeof read.markOnOpen === "boolean") patch.read = { markOnOpen: read.markOnOpen };
+    const render = asObject(settings.render);
+    if (typeof render.listLimit === "number") patch.render = { listLimit: render.listLimit };
+    const ai = asObject(settings.ai);
+    if (ai.summaryLength !== void 0) patch.ai = { summaryLength: ai.summaryLength };
+    if (Object.keys(patch).length > 0) saveSettings(patch);
+    runtime.refresh();
+    return { ok: true, addedAccounts: added, state: appState(runtime) };
+  });
   router.get("/messages/thread", ({ url }) => {
     const { account } = accountFrom(runtime, url);
     const subject = url.searchParams.get("subject") ?? "";
@@ -4986,9 +5033,6 @@ var MailHarborRuntime = class {
   }
   /** Credentials for an account, with a clear message when the user must log in. */
   credentialsFor(account) {
-    if (account.auth.type === "oauth2") {
-      throw new Error("OAuth2 \u8D26\u53F7\u6682\u672A\u5728\u6B64\u7248\u672C\u542F\u7528\uFF0C\u8BF7\u4F7F\u7528\u5E94\u7528\u4E13\u7528\u5BC6\u7801\u767B\u5F55");
-    }
     const resolved = this.credentials.resolve(account);
     if (resolved === void 0) throw new Error("\u8BF7\u5148\u767B\u5F55\u90AE\u7BB1\u8D26\u53F7");
     return { user: account.username || account.email, pass: resolved.password };