Skip to content

添加Yahoo邮箱服务 #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sk856 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

添加Yahoo邮箱服务 #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77b49e0
添加Yahoo邮箱服务
sk856 May 20, 2026
c928ea8
处理 Yahoo 邮箱 PR 审查意见
sk856 May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 133 additions & 3 deletions background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ importScripts(
'background/cloudmail-provider.js',
'yyds-mail-utils.js',
'background/yyds-mail-provider.js',
'yahoo-utils.js',
'icloud-utils.js',
'mail-provider-utils.js',
'content/activation-utils.js'
Expand Down Expand Up @@ -390,6 +391,10 @@ const {
normalizeYydsMailMessageDetail,
normalizeYydsMailMessages,
} = self.YydsMailUtils;
const {
YAHOO_PROVIDER = 'yahoo',
YAHOO_GENERATOR = 'yahoo',
} = self.YahooUtils || {};
const {
findIcloudAliasByEmail,
getConfiguredIcloudHostPreference,
Expand Down Expand Up @@ -1297,6 +1302,7 @@ const PERSISTED_SETTING_DEFAULTS = {
customMailProviderPool: [],
customEmailPool: [],
customEmailPoolEntries: [],
yahooMailEmail: '',
autoDeleteUsedIcloudAlias: false,
icloudHostPreference: 'auto',
icloudTargetMailboxType: 'icloud-inbox',
Expand Down Expand Up @@ -2415,6 +2421,9 @@ function normalizeEmailGenerator(value = '') {
const yydsMailGenerator = typeof YYDS_MAIL_GENERATOR === 'string'
? YYDS_MAIL_GENERATOR
: 'yyds-mail';
const yahooGenerator = typeof YAHOO_GENERATOR === 'string'
? YAHOO_GENERATOR
: 'yahoo';
if (normalized === 'custom' || normalized === 'manual') {
return 'custom';
}
Expand All @@ -2430,6 +2439,7 @@ function normalizeEmailGenerator(value = '') {
if (normalized === 'cloudflare') return 'cloudflare';
if (normalized === CLOUDFLARE_TEMP_EMAIL_GENERATOR) return CLOUDFLARE_TEMP_EMAIL_GENERATOR;
if (normalized === 'cloudmail') return 'cloudmail';
if (normalized === yahooGenerator) return yahooGenerator;
if (normalized === yydsMailGenerator) return yydsMailGenerator;
return 'duck';
}
Expand Down Expand Up @@ -2669,10 +2679,14 @@ function normalizeMailProvider(value = '') {
const yydsMailProvider = typeof YYDS_MAIL_PROVIDER === 'string'
? YYDS_MAIL_PROVIDER
: 'yyds-mail';
const yahooProvider = typeof YAHOO_PROVIDER === 'string'
? YAHOO_PROVIDER
: 'yahoo';
switch (normalized) {
case 'custom':
case ICLOUD_PROVIDER:
case GMAIL_PROVIDER:
case yahooProvider:
case HOTMAIL_PROVIDER:
case LUCKMAIL_PROVIDER:
case CLOUDFLARE_TEMP_EMAIL_PROVIDER:
Expand Down Expand Up @@ -3334,6 +3348,8 @@ function normalizePersistentSettingValue(key, value) {
return normalizeCustomEmailPool(value);
case 'customEmailPoolEntries':
return normalizeCustomEmailPoolEntryObjects(value);
case 'yahooMailEmail':
return String(value || '').trim();
case 'autoDeleteUsedIcloudAlias':
case 'accountRunHistoryTextEnabled':
case 'cloudflareTempEmailUseRandomSubdomain':
Expand Down Expand Up @@ -8671,6 +8687,8 @@ function matchesSourceUrlFamily(source, candidateUrl, referenceUrl) {
return is163MailHost(candidate.hostname);
case 'gmail-mail':
return candidate.hostname === 'mail.google.com';
case 'yahoo-mail':
return candidate.hostname === 'mail.yahoo.com';
case 'icloud-mail':
return candidate.hostname === 'www.icloud.com' || candidate.hostname === 'www.icloud.com.cn';
case 'inbucket-mail':
Expand Down Expand Up @@ -8974,6 +8992,7 @@ function getSourceLabel(source) {
const labels = {
'openai-auth': '认证页',
'gmail-mail': 'Gmail 邮箱',
'yahoo-mail': 'Yahoo 邮箱',
'sidepanel': '侧边栏',
'signup-page': '认证页',
'vps-panel': 'CPA 面板',
Expand Down Expand Up @@ -11579,6 +11598,9 @@ function getEmailGeneratorLabel(generator) {
const yydsMailGenerator = typeof YYDS_MAIL_GENERATOR === 'string'
? YYDS_MAIL_GENERATOR
: 'yyds-mail';
const yahooGenerator = typeof YAHOO_GENERATOR === 'string'
? YAHOO_GENERATOR
: 'yahoo';
if (generator === 'custom') {
return '自定义邮箱';
}
Expand All @@ -11594,6 +11616,7 @@ function getEmailGeneratorLabel(generator) {
if (generator === 'cloudflare') return 'Cloudflare 邮箱';
if (generator === CLOUDFLARE_TEMP_EMAIL_GENERATOR) return 'Cloudflare Temp Email';
if (generator === CLOUD_MAIL_GENERATOR) return 'Cloud Mail';
if (generator === yahooGenerator) return 'Yahoo 临时邮箱';
if (generator === yydsMailGenerator) return 'YYDS Mail';
return 'Duck 邮箱';
}
Expand Down Expand Up @@ -11769,6 +11792,10 @@ async function fetchDuckEmail(options = {}) {
return generatedEmailHelpers.fetchDuckEmail(options);
}

async function fetchYahooTempEmail(state, options = {}) {
return generatedEmailHelpers.fetchYahooTempEmail(state, options);
}

async function fetchGeneratedEmail(state, options = {}) {
const currentState = state || await getState();
const yydsMailProvider = typeof YYDS_MAIL_PROVIDER === 'string'
Expand Down Expand Up @@ -12895,7 +12922,15 @@ async function runAutoSequenceFromNodeGraph(startNodeId, context = {}) {
if (resolvedSignupMethod === SIGNUP_METHOD_PHONE) {
await addLog(`=== 目标 ${targetRun}/${totalRuns} 轮：本轮注册方式为手机号注册，将跳过邮箱预获取 ===`, 'info');
} else {
await ensureAutoEmailReady(targetRun, totalRuns, attemptRuns);
const readyEmail = await ensureAutoEmailReady(targetRun, totalRuns, attemptRuns);
const normalizedReadyEmail = String(readyEmail || '').trim();
if (normalizedReadyEmail) {
const latestEmailState = await getState();
const normalizedStateEmail = String(latestEmailState?.email || '').trim();
if (normalizedStateEmail.toLowerCase() !== normalizedReadyEmail.toLowerCase()) {
await setEmailState(normalizedReadyEmail);
}
}
}
await executeNodeAndWait('submit-signup-email', getAutoRunNodeDelayMs('submit-signup-email'));
});
Expand Down Expand Up @@ -13318,12 +13353,14 @@ const verificationFlowHelpers = self.MultiPageBackgroundVerificationFlow?.create
getHotmailVerificationPollConfig,
getHotmailVerificationRequestTimestamp,
handleMail2925LimitReachedError,
ensureContentScriptReadyOnTab,
getState,
getTabId,
HOTMAIL_PROVIDER,
isMail2925LimitReachedError,
isRetryableContentScriptTransportError,
isStopError,
isTabAlive,
LUCKMAIL_PROVIDER,
YYDS_MAIL_PROVIDER,
MAIL_2925_VERIFICATION_INTERVAL_MS,
Expand All @@ -13333,6 +13370,7 @@ const verificationFlowHelpers = self.MultiPageBackgroundVerificationFlow?.create
pollHotmailVerificationCode,
pollLuckmailVerificationCode,
pollYydsMailVerificationCode,
reuseOrCreateTab,
sendToContentScript,
sendToContentScriptResilient,
sendToMailContentScriptResilient,
Expand Down Expand Up @@ -13903,6 +13941,7 @@ const messageRouter = self.MultiPageBackgroundMessageRouter?.createMessageRouter
executeNodeViaCompletionSignal,
exportSettingsBundle,
fetchGeneratedEmail,
openMailProviderLogin,
refreshGpcCardBalance,
finalizePhoneActivationAfterSuccessfulFlow,
testKiroRsConnection: async (baseUrl, apiKey) => {
Expand Down Expand Up @@ -14122,8 +14161,17 @@ async function ensureSignupPostEmailPageReadyInTab(tabId, step = 2, options = {}
return signupFlowHelpers.ensureSignupPostEmailPageReadyInTab(tabId, step, options);
}

async function resolveSignupEmailForFlow(state) {
return signupFlowHelpers.resolveSignupEmailForFlow(state);
async function resolveSignupEmailForFlow(state, options = {}) {
let latestState = null;
try {
latestState = await getState();
} catch {
latestState = null;
}
return signupFlowHelpers.resolveSignupEmailForFlow({
...(state || {}),
...(latestState || {}),
}, options);
}

// ============================================================
Expand Down Expand Up @@ -14159,12 +14207,26 @@ function getMailConfig(state) {
const yydsMailProvider = typeof YYDS_MAIL_PROVIDER === 'string'
? YYDS_MAIL_PROVIDER
: 'yyds-mail';
const yahooProvider = typeof YAHOO_PROVIDER === 'string'
? YAHOO_PROVIDER
: 'yahoo';
if (provider === 'custom') {
return { provider: 'custom', label: '自定义邮箱' };
}
if (provider === HOTMAIL_PROVIDER) {
return { provider: HOTMAIL_PROVIDER, label: 'Hotmail（API对接/本地助手）' };
}
if (provider === yahooProvider) {
return {
provider: yahooProvider,
source: 'yahoo-mail',
url: 'https://mail.yahoo.com/n/inbox/all?listFilter=ALL_INBOX',
label: 'Yahoo 邮箱',
navigateOnReuse: true,
inject: ['content/activation-utils.js', 'shared/source-registry.js', 'content/utils.js', 'content/yahoo-mail.js'],
injectSource: 'yahoo-mail',
};
}
if (provider === ICLOUD_PROVIDER) {
const configuredHost = getConfiguredIcloudHostPreference(state)
|| normalizeIcloudHost(state?.preferredIcloudHost)
Expand Down Expand Up @@ -14250,6 +14312,74 @@ function getMailConfig(state) {
return { source: 'qq-mail', url: 'https://wx.mail.qq.com/', label: 'QQ 邮箱' };
}

async function openMailProviderLogin(payload = {}) {
const state = await getState();
const provider = normalizeMailProvider(payload.provider || state.mailProvider || '');
const mail = getMailConfig({
...state,
mailProvider: provider,
});

if (mail?.error) {
throw new Error(mail.error);
}

const requestedUrl = String(payload.url || '').trim();
const targetUrl = requestedUrl || String(mail?.url || '').trim();
if (!targetUrl) {
throw new Error(`${mail?.label || provider || '当前邮箱服务'}没有可跳转的登录页。`);
}

if (mail?.source) {
const tabId = await reuseOrCreateTab(mail.source, targetUrl, {
inject: mail.inject,
injectSource: mail.injectSource,
navigateOnReuse: mail.navigateOnReuse !== false,
});
if (payload.active !== false && Number.isInteger(tabId)) {
await chrome.tabs.update(tabId, { active: true }).catch(() => { });
}
const yahooMailEmail = String(payload.yahooMailEmail || state.yahooMailEmail || '').trim();
const yahooMailPassword = String(payload.yahooMailPassword || '');
if (provider === YAHOO_PROVIDER && yahooMailEmail && yahooMailPassword) {
Comment thread
sk856 marked this conversation as resolved.
try {
const loginResult = await sendToContentScriptResilient(mail.source, {
type: 'YAHOO_LOGIN_WITH_CREDENTIALS',
payload: {
email: yahooMailEmail,
password: yahooMailPassword,
},
}, {
responseTimeoutMs: 45000,
logLabel: '填写 Yahoo 邮箱登录账号密码',
});
if (loginResult?.submitted) {
await addLog('Yahoo 邮箱：已自动填写登录账号密码并提交。', 'ok');
}
} catch (err) {
await addLog(`Yahoo 邮箱：自动填写登录账号密码失败，请在打开的页面手动完成登录。原因：${getErrorMessage(err)}`, 'warn');
}
}
await addLog(`${mail.label || '邮箱'}：已打开登录/收件箱页面。`, 'info');
return {
ok: true,
provider,
source: mail.source,
tabId,
url: targetUrl,
};
}

const tab = await chrome.tabs.create({ url: targetUrl, active: true });
await addLog(`${mail?.label || '邮箱'}：已打开登录页面。`, 'info');
return {
ok: true,
provider,
tabId: tab?.id ?? null,
url: targetUrl,
};
}

function normalizeInbucketOrigin(rawValue) {
const value = (rawValue || '').trim();
if (!value) return '';
Expand Down
51 changes: 51 additions & 0 deletions background/generated-email-helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,53 @@
return result.email;
}

async function fetchYahooTempEmail(state, options = {}) {
throwIfStopped();
const latestState = state || await getState();
const yahooSettingsUrl = 'https://mail.yahoo.com/n/settings/2';
await addLog('Yahoo 临时邮箱：正在打开设置页并准备创建新别名...', 'info');

const yahooTabOptions = {
navigateOnReuse: true,
inject: ['content/activation-utils.js', 'shared/source-registry.js', 'content/utils.js', 'content/yahoo-mail.js'],
injectSource: 'yahoo-mail',
};
await reuseOrCreateTab('yahoo-mail', yahooSettingsUrl, yahooTabOptions);

const createMessage = {
type: 'YAHOO_CREATE_TEMP_ALIAS',
source: 'background',
payload: {
prefix: String(options.prefix || latestState.emailPrefix || '').trim().toLowerCase(),
},
};
const sendCreateRequest = async () => sendToContentScript('yahoo-mail', createMessage, {
responseTimeoutMs: 120000,
});

let result = await sendCreateRequest();
if (result?.error && shouldRetryYahooAliasCreationInForeground(result.error)) {
await addLog(`Yahoo 临时邮箱：后台创建需要前台页面交互，正在自动切换到 Yahoo 设置页后重试。原因：${result.error}`, 'warn');
await reuseOrCreateTab('yahoo-mail', yahooSettingsUrl, yahooTabOptions);
result = await sendCreateRequest();
}

if (result?.error) {
throw new Error(result.error);
}
if (!result?.email) {
throw new Error('Yahoo 临时邮箱创建后未返回可用邮箱地址。');
}

await setEmailState(result.email);
await addLog(`Yahoo 临时邮箱：已创建 ${result.email}`, 'ok');
return result.email;
}

function shouldRetryYahooAliasCreationInForeground(message = '') {
return /未找到“新建一次性电子邮箱|未找到“新建一次性电子邮箱\/地址|点击“添加”后未出现创建面板|未找到一次性邮箱输入框|未找到保存\/创建按钮|创建面板/.test(String(message || ''));
}

async function fetchCustomEmailPoolEmail(state, options = {}) {
throwIfStopped();
const latestState = state || await getState();
Expand Down Expand Up @@ -340,6 +387,9 @@
if (generator === CLOUDFLARE_TEMP_EMAIL_GENERATOR) {
return fetchCloudflareTempEmailAddress(mergedState, options);
}
if (generator === 'yahoo') {
return fetchYahooTempEmail(mergedState, options);
}
const resolvedDuckBaselineEmail = typeof getRegistrationEmailBaseline === 'function'
? getRegistrationEmailBaseline(mergedState, {
preferredEmail: options.currentEmail,
Expand All @@ -365,6 +415,7 @@
fetchCloudflareTempEmailAddress,
fetchDuckEmail,
fetchGeneratedEmail,
fetchYahooTempEmail,
generateCloudflareAliasLocalPart,
requestCloudflareTempEmailJson,
};
Expand Down
Loading