2925邮箱增加账号池功能

2026-04-20 18:56:08 +08:00
parent 8dd6daccd1
commit 6783cf02b4
25 changed files with 2630 additions and 108 deletions
@@ -13,6 +13,7 @@
      getCloudflareTempEmailAddressFromResponse,
      getCloudflareTempEmailConfig,
      getState,
+      ensureMail2925AccountForFlow,
      joinCloudflareTempEmailUrl,
      normalizeCloudflareDomain,
      normalizeCloudflareTempEmailAddress,
@@ -190,7 +191,7 @@
    async function fetchManagedAliasEmail(state, options = {}) {
      throwIfStopped();
      const provider = String(options.mailProvider || state?.mailProvider || '').trim().toLowerCase();
-      const mergedState = {
+      let mergedState = {
        ...(state || {}),
        mailProvider: provider,
      };
@@ -200,6 +201,22 @@
      if (options.mail2925BaseEmail !== undefined) {
        mergedState.mail2925BaseEmail = String(options.mail2925BaseEmail || '').trim();
      }
+      if (
+        provider === '2925'
+        && Boolean(mergedState.mail2925UseAccountPool)
+        && typeof ensureMail2925AccountForFlow === 'function'
+      ) {
+        const account = await ensureMail2925AccountForFlow({
+          allowAllocate: true,
+          preferredAccountId: mergedState.currentMail2925AccountId || null,
+        });
+        const latestState = await getState();
+        mergedState = {
+          ...latestState,
+          ...mergedState,
+          currentMail2925AccountId: account.id,
+        };
+      }

      const email = buildGeneratedAliasEmail(mergedState);
      await setEmailState(email);