diff --git a/background/message-router.js b/background/message-router.js index 1fadb689..25e47e1c 100644 --- a/background/message-router.js +++ b/background/message-router.js @@ -523,6 +523,129 @@ || status === 'skipped'; } + function isPhoneSignupStepPayload(payload = {}, state = {}) { + const payloadIdentifierType = String(payload?.accountIdentifierType || '').trim().toLowerCase(); + if (payloadIdentifierType === 'email') { + return false; + } + + const stateIdentifierType = String(state?.accountIdentifierType || '').trim().toLowerCase(); + return payloadIdentifierType === 'phone' + || Boolean(resolveSignupPhonePayload(payload)) + || stateIdentifierType === 'phone' + || Boolean(String(state?.signupPhoneNumber || '').trim()) + || Boolean(state?.signupPhoneActivation) + || Boolean(state?.signupPhoneCompletedActivation); + } + + function isLoginPasswordPagePayload(payload = {}) { + const passwordPageMode = String(payload?.passwordPageMode || '').trim().toLowerCase(); + if (passwordPageMode === 'login') { + return true; + } + const rawPath = String(payload?.passwordPagePath || '').trim(); + if (/\/log-in\/password(?:[/?#]|$)/i.test(rawPath)) { + return true; + } + const rawUrl = String(payload?.passwordPageUrl || '').trim(); + if (!rawUrl) { + return false; + } + try { + return /\/log-in\/password(?:[/?#]|$)/i.test(new URL(rawUrl).pathname || ''); + } catch { + return /\/log-in\/password(?:[/?#]|$)/i.test(rawUrl); + } + } + + function isSignupPasswordPagePayload(payload = {}) { + const passwordPageMode = String(payload?.passwordPageMode || '').trim().toLowerCase(); + if (passwordPageMode === 'signup') { + return true; + } + const rawPath = String(payload?.passwordPagePath || '').trim(); + if (/\/(?:create-account|u\/signup|signup)\/password(?:[/?#]|$)/i.test(rawPath)) { + return true; + } + const rawUrl = String(payload?.passwordPageUrl || '').trim(); + if (!rawUrl) { + return false; + } + try { + return /\/(?:create-account|u\/signup|signup)\/password(?:[/?#]|$)/i.test(new URL(rawUrl).pathname || ''); + } catch { + return /\/(?:create-account|u\/signup|signup)\/password(?:[/?#]|$)/i.test(rawUrl); + } + } + + function isSuccessfulLoginPasswordFlowPayload(payload = {}) { + if (!isLoginPasswordPagePayload(payload)) { + return false; + } + const state = String(payload?.state || payload?.successState || '').trim().toLowerCase(); + return Boolean(payload?.ready) + || Boolean(payload?.alreadyVerified) + || Boolean(payload?.passwordLoginFlow) + || state === 'verification' + || state === 'verification_page' + || state === 'phone_verification_page' + || state === 'oauth_consent_page' + || state === 'logged_in_home'; + } + + function shouldSkipPhoneSignupRegistrationTailAfterPassword(payload = {}, state = {}) { + if (!isPhoneSignupStepPayload(payload, state)) { + return false; + } + if (isSignupPasswordPagePayload(payload)) { + return false; + } + return isSuccessfulLoginPasswordFlowPayload(payload); + } + + function shouldSkipPhoneSignupRegistrationTailBeforePasswordFinalize(payload = {}, state = {}) { + if (!isPhoneSignupStepPayload(payload, state)) { + return false; + } + if (!Boolean(payload?.deferredSubmit)) { + return false; + } + if (isSignupPasswordPagePayload(payload)) { + return false; + } + return isLoginPasswordPagePayload(payload); + } + + async function skipPhoneSignupRegistrationTailAfterPassword(currentStep, payload = {}) { + const latestState = await getState(); + const skippedSteps = []; + for (const stepKey of ['fetch-signup-code', 'fill-profile', 'wait-registration-success']) { + const skippedStep = findStepByKeyAfter(currentStep, stepKey, latestState); + if (!skippedStep) { + continue; + } + const status = getNodeStatusByStep(skippedStep, latestState); + if (isStepProtectedFromAutoSkip(status)) { + continue; + } + await setNodeStatusByStep(skippedStep, 'skipped', latestState); + skippedSteps.push(skippedStep); + } + + await setState({ signupVerificationRequestedAt: null }); + if (skippedSteps.length) { + await addLog( + `步骤 ${currentStep}：手机号密码提交后已确认账号进入登录后续状态，已自动跳过步骤 ${skippedSteps.join('/')}，流程将直接进入 OAuth 后续节点。`, + 'warn', + { step: currentStep, stepKey: 'fill-password' } + ); + } + return { + ...payload, + skipRegistrationFlow: true, + }; + } + function findStepByKeyAfter(currentOrder, targetKey, state = {}) { const activeStepIds = typeof getStepIdsForState === 'function' ? getStepIdsForState(state) @@ -847,15 +970,20 @@ break; case 3: await syncStepAccountIdentityFromPayload(payload); - if (payload.signupVerificationRequestedAt) { - await setState({ signupVerificationRequestedAt: payload.signupVerificationRequestedAt }); - } - if (payload.skipProfileStep) { + { const latestState = await getState(); - const step5Status = getNodeStatusByStep(5, latestState); - if (step5Status !== 'running' && step5Status !== 'completed' && step5Status !== 'manual_completed') { - await setNodeStatusByStep(5, 'skipped', latestState); - await addLog('步骤 3：页面已直接进入已登录态，已自动跳过步骤 5。', 'warn'); + const skipRegistrationTail = shouldSkipPhoneSignupRegistrationTailAfterPassword(payload, latestState); + if (payload.signupVerificationRequestedAt && !skipRegistrationTail) { + await setState({ signupVerificationRequestedAt: payload.signupVerificationRequestedAt }); + } + if (skipRegistrationTail) { + await skipPhoneSignupRegistrationTailAfterPassword(step, payload); + } else if (payload.skipProfileStep) { + const step5Status = getNodeStatusByStep(5, latestState); + if (step5Status !== 'running' && step5Status !== 'completed' && step5Status !== 'manual_completed') { + await setNodeStatusByStep(5, 'skipped', latestState); + await addLog('步骤 3：页面已直接进入已登录态，已自动跳过步骤 5。', 'warn'); + } } } if (payload.loginVerificationRequestedAt) { @@ -967,9 +1095,26 @@ notifyNodeError(nodeId, '流程已被用户停止。'); return { ok: true }; } + let completionPayload = message.payload || {}; try { - if (nodeId === 'fill-password' && typeof finalizeStep3Completion === 'function') { - await finalizeStep3Completion(message.payload || {}); + const skipStep3FinalizeForPhoneLoginPassword = nodeId === 'fill-password' + && shouldSkipPhoneSignupRegistrationTailBeforePasswordFinalize(completionPayload, await getState()); + if (skipStep3FinalizeForPhoneLoginPassword) { + completionPayload = { + ...completionPayload, + signupVerificationRequestedAt: null, + passwordLoginFlow: true, + skipRegistrationFlow: true, + state: 'login_password_page', + }; + } else if (nodeId === 'fill-password' && typeof finalizeStep3Completion === 'function') { + const finalizedPayload = await finalizeStep3Completion(message.payload || {}); + if (finalizedPayload && typeof finalizedPayload === 'object') { + completionPayload = { + ...completionPayload, + ...finalizedPayload, + }; + } } } catch (error) { if (typeof isCloudflareSecurityBlockedError === 'function' && isCloudflareSecurityBlockedError(error)) { @@ -1004,11 +1149,11 @@ stepKey: nodeId, }); } - await handleStepData(resolvedStep, message.payload); + await handleStepData(resolvedStep, completionPayload); if (isFinalNode && typeof appendAccountRunRecord === 'function') { await appendAccountRunRecord('success', completionState); } - notifyNodeComplete(nodeId, message.payload); + notifyNodeComplete(nodeId, completionPayload); return { ok: true }; } diff --git a/flows/openai/background/steps/create-plus-checkout.js b/flows/openai/background/steps/create-plus-checkout.js index a912624a..135693da 100644 --- a/flows/openai/background/steps/create-plus-checkout.js +++ b/flows/openai/background/steps/create-plus-checkout.js @@ -10,6 +10,11 @@ const PLUS_PAYMENT_METHOD_PAYPAL_HOSTED = 'paypal-hosted'; const PLUS_PAYMENT_METHOD_GOPAY = 'gopay'; const PLUS_PAYMENT_METHOD_GPC_HELPER = 'gpc-helper'; + const LOCAL_CHECKOUT_PROXY_HEALTH_URL = 'http://127.0.0.1:21988/health'; + const LOCAL_CHECKOUT_PROXY_URL = 'socks5://127.0.0.1:21987'; + const LOCAL_CHECKOUT_PROXY_SETTINGS_SCOPE = 'regular'; + const LOCAL_CHECKOUT_PROXY_TIMEOUT_MS = 1200; + const LOCAL_CHECKOUT_PROXY_SETTLE_MS = 350; const DEFAULT_GPC_HELPER_API_URL = 'https://gpc.qlhazycoder.top'; const GPC_HELPER_PHONE_MODE_AUTO = 'auto'; const GPC_HELPER_PHONE_MODE_MANUAL = 'manual'; @@ -24,6 +29,7 @@ const PAYPAL_HOSTED_STAGE_LOGIN = 'pay_login'; const PAYPAL_HOSTED_STAGE_GUEST_CHECKOUT = 'guest_checkout'; const PAYPAL_HOSTED_STAGE_CREATE_ACCOUNT = 'create_account'; + const PAYPAL_HOSTED_STAGE_SECURITY_CODE = 'security_code'; const PAYPAL_HOSTED_STAGE_REVIEW = 'review_consent'; const PAYPAL_HOSTED_STAGE_APPROVAL = 'approval'; const PAYPAL_HOSTED_STAGE_UNKNOWN = 'unknown'; @@ -58,6 +64,7 @@ sleepWithStop, waitForTabCompleteUntilStopped, waitForTabUrlMatchUntilStopped = null, + withCheckoutCreationProxy = null, throwIfStopped = () => {}, } = deps; @@ -78,6 +85,194 @@ }); } + function parseSocks5Endpoint(proxyUrl = '') { + const text = String(proxyUrl || '').trim(); + if (!text) { + return null; + } + let parsed = null; + try { + parsed = new URL(text); + } catch { + return null; + } + if (String(parsed.protocol || '').replace(/:$/, '').toLowerCase() !== 'socks5') { + return null; + } + const host = String(parsed.hostname || '').replace(/^\[|\]$/g, '').trim(); + const port = Number.parseInt(String(parsed.port || ''), 10); + if (!host || !Number.isInteger(port) || port <= 0 || port > 65535) { + return null; + } + return { host, port }; + } + + function buildCheckoutCreationPacScript(endpoint) { + const proxyHost = String(endpoint?.host || '').replace(/\\/g, '\\\\').replace(/"/g, '\\"'); + const port = Number.parseInt(String(endpoint?.port || ''), 10); + return ` +function FindProxyForURL(url, host) { + host = String(host || '').toLowerCase(); + if (host === 'chatgpt.com' || dnsDomainIs(host, '.chatgpt.com')) { + return "SOCKS5 ${proxyHost}:${port}"; + } + return "DIRECT"; +}`.trim(); + } + + function callChromeProxySettings(method, details = {}) { + const proxySettings = chrome?.proxy?.settings; + if (!proxySettings || typeof proxySettings[method] !== 'function') { + return Promise.reject(new Error('当前浏览器不支持扩展代理 API')); + } + return new Promise((resolve, reject) => { + proxySettings[method](details, (value) => { + const lastError = chrome?.runtime?.lastError; + if (lastError) { + reject(new Error(lastError.message || String(lastError))); + return; + } + resolve(value); + }); + }); + } + + function canControlProxySettings(details = {}) { + const level = String(details?.levelOfControl || '').trim(); + return !level || level === 'controlled_by_this_extension' || level === 'controllable_by_this_extension'; + } + + async function readProxySettingsSnapshot() { + return callChromeProxySettings('get', { incognito: false }); + } + + async function restoreProxySettingsSnapshot(snapshot = null) { + const value = snapshot?.value; + const level = String(snapshot?.levelOfControl || '').trim(); + if (level === 'controlled_by_this_extension' && value && typeof value === 'object') { + await callChromeProxySettings('set', { + value, + scope: LOCAL_CHECKOUT_PROXY_SETTINGS_SCOPE, + }); + return; + } + await callChromeProxySettings('clear', { + scope: LOCAL_CHECKOUT_PROXY_SETTINGS_SCOPE, + }); + } + + async function fetchLocalCheckoutProxyHealth() { + if (typeof fetchImpl !== 'function') { + return null; + } + const controller = typeof AbortController === 'function' ? new AbortController() : null; + let timer = null; + try { + timer = controller + ? setTimeout(() => controller.abort(), LOCAL_CHECKOUT_PROXY_TIMEOUT_MS) + : null; + const response = await fetchImpl(`${LOCAL_CHECKOUT_PROXY_HEALTH_URL}?t=${Date.now()}`, { + method: 'GET', + cache: 'no-store', + headers: { Accept: 'application/json,text/plain,*/*' }, + ...(controller ? { signal: controller.signal } : {}), + }); + if (!response?.ok) { + return null; + } + const payload = await response.json().catch(() => ({})); + if (!payload?.ok) { + return null; + } + const endpoint = parseSocks5Endpoint(payload.localProxy || LOCAL_CHECKOUT_PROXY_URL); + return endpoint ? { endpoint, payload } : null; + } catch { + return null; + } finally { + if (timer) { + clearTimeout(timer); + } + } + } + + async function applyTemporaryCheckoutProxy(endpoint) { + const pacScript = buildCheckoutCreationPacScript(endpoint); + await callChromeProxySettings('set', { + value: { + mode: 'pac_script', + pacScript: { + data: pacScript, + mandatory: true, + }, + }, + scope: LOCAL_CHECKOUT_PROXY_SETTINGS_SCOPE, + }); + } + + async function runWithLocalCheckoutCreationProxy(action) { + if (typeof withCheckoutCreationProxy === 'function') { + return withCheckoutCreationProxy({ + healthUrl: LOCAL_CHECKOUT_PROXY_HEALTH_URL, + localProxyUrl: LOCAL_CHECKOUT_PROXY_URL, + }, action); + } + if (!chrome?.proxy?.settings || typeof fetchImpl !== 'function') { + return action(); + } + + const health = await fetchLocalCheckoutProxyHealth(); + if (!health?.endpoint) { + return action(); + } + + let snapshot = null; + let applied = false; + let result = null; + let proxyError = null; + let restoreFailed = false; + try { + try { + snapshot = await readProxySettingsSnapshot(); + } catch (error) { + return action(); + } + if (!canControlProxySettings(snapshot)) { + return action(); + } + await applyTemporaryCheckoutProxy(health.endpoint); + applied = true; + await sleepWithStop(LOCAL_CHECKOUT_PROXY_SETTLE_MS); + result = await action(); + if (result?.error && !result?.stopped) { + proxyError = new Error(result.error); + } + } catch (error) { + if (!applied) { + return action(); + } + proxyError = error; + } finally { + if (applied) { + try { + await restoreProxySettingsSnapshot(snapshot); + await sleepWithStop(LOCAL_CHECKOUT_PROXY_SETTLE_MS); + } catch (error) { + restoreFailed = true; + } + } + } + if (result && !proxyError) { + return result; + } + if (proxyError) { + if (restoreFailed) { + throw proxyError; + } + return action(); + } + return null; + } + function normalizePlusPaymentMethod(value = '') { const rootScope = typeof self !== 'undefined' ? self : globalThis; if (rootScope.GoPayUtils?.normalizePlusPaymentMethod) { @@ -589,6 +784,16 @@ return result || {}; } + async function submitHostedPayPalSecurityCode(tabId, config = {}, stepKey = PAYPAL_HOSTED_STEP_CREATE_ACCOUNT) { + const stepNumber = getHostedStepNumber(stepKey); + const verificationCode = await pollHostedVerificationCode(config.verificationUrl); + await addHostedStepLog(stepKey, `步骤 ${stepNumber}：已获取 PayPal 手机验证码，正在填写。`, 'info'); + return runHostedPayPalStep(tabId, { + expectedStage: PAYPAL_HOSTED_STAGE_SECURITY_CODE, + securityCode: verificationCode, + }); + } + function getHostedStageOrder(stage = '') { switch (stage) { case PAYPAL_HOSTED_STAGE_LOGIN: @@ -597,6 +802,8 @@ return 2; case PAYPAL_HOSTED_STAGE_CREATE_ACCOUNT: return 3; + case PAYPAL_HOSTED_STAGE_SECURITY_CODE: + return 3.5; case PAYPAL_HOSTED_STAGE_REVIEW: return 4; case PAYPAL_HOSTED_STAGE_OUTSIDE: @@ -634,7 +841,7 @@ try { const pageState = await getHostedPayPalState(tabId); lastStage = pageState?.hostedStage || lastStage; - if (predicate(pageState)) { + if (await predicate(pageState)) { return pageState; } } catch (error) { @@ -934,6 +1141,19 @@ } const pageState = await getHostedPayPalState(tabId); + const config = await getHostedCheckoutRuntimeConfig(state); + if (pageState.hostedStage === PAYPAL_HOSTED_STAGE_SECURITY_CODE) { + await submitHostedPayPalSecurityCode(tabId, config, stepKey); + const nextState = await waitForHostedPayPalStage( + tabId, + (stateInfo) => stateInfo?.hostedStage && stateInfo.hostedStage !== PAYPAL_HOSTED_STAGE_SECURITY_CODE, + { label: `步骤 ${stepNumber}：等待 PayPal 验证码提交后跳转` } + ); + await completeHostedStep(stepKey, tabId, { + plusHostedCheckoutLastStage: nextState.hostedStage || '', + }); + return; + } if (isHostedStageAtOrAfter(pageState.hostedStage, PAYPAL_HOSTED_STAGE_REVIEW) && pageState.hostedStage !== PAYPAL_HOSTED_STAGE_CREATE_ACCOUNT) { await addHostedStepLog(stepKey, `步骤 ${stepNumber}：当前 PayPal 已进入后续页面（${pageState.hostedStage}），创建确认节点直接完成。`, 'info'); @@ -952,7 +1172,13 @@ }); const nextState = await waitForHostedPayPalStage( tabId, - (stateInfo) => stateInfo?.hostedStage && stateInfo.hostedStage !== PAYPAL_HOSTED_STAGE_CREATE_ACCOUNT, + async (stateInfo) => { + if (stateInfo?.hostedStage === PAYPAL_HOSTED_STAGE_SECURITY_CODE) { + await submitHostedPayPalSecurityCode(tabId, config, stepKey); + return false; + } + return stateInfo?.hostedStage && stateInfo.hostedStage !== PAYPAL_HOSTED_STAGE_CREATE_ACCOUNT; + }, { label: `步骤 ${stepNumber}：等待 PayPal 创建确认页跳转` } ); await completeHostedStep(stepKey, tabId, { @@ -1392,7 +1618,9 @@ const paymentMethodLabel = getPlusPaymentMethodLabel(paymentMethod); const checkoutModeLabel = getCheckoutModeLabel(state); await addLog(`步骤 6：正在打开新的 ChatGPT 会话，准备创建${checkoutModeLabel}...`, 'info'); - const tabId = await openFreshChatGptTabForCheckoutCreate(); + let tabId = 0; + const createCheckout = async () => { + tabId = await openFreshChatGptTabForCheckoutCreate(); await waitForTabCompleteUntilStopped(tabId); await sleepWithStop(1000); @@ -1402,11 +1630,15 @@ logMessage: '步骤 6：正在等待 ChatGPT 页面完成加载，再继续创建订阅页...', }); - const result = await sendTabMessageUntilStopped(tabId, PLUS_CHECKOUT_SOURCE, { + return sendTabMessageUntilStopped(tabId, PLUS_CHECKOUT_SOURCE, { type: 'CREATE_PLUS_CHECKOUT', source: 'background', payload: { paymentMethod }, }); + }; + const result = paymentMethod === PLUS_PAYMENT_METHOD_PAYPAL_HOSTED + ? await runWithLocalCheckoutCreationProxy(createCheckout) + : await createCheckout(); if (result?.error) { throw new Error(result.error); diff --git a/flows/openai/content/openai-auth.js b/flows/openai/content/openai-auth.js index cde7b69b..fea4ee9a 100644 --- a/flows/openai/content/openai-auth.js +++ b/flows/openai/content/openai-auth.js @@ -2624,6 +2624,19 @@ async function step2_clickRegister(payload = {}) { // ============================================================ async function step3_fillEmailPassword(payload) { + const resolvePasswordPageInfo = (rawUrl = '') => { + const url = String(rawUrl || '').trim(); + let path = ''; + try { + path = new URL(url || location.href, 'https://auth.openai.com').pathname || ''; + } catch { + path = String(location.pathname || ''); + } + const mode = /\/log-in\/password(?:[/?#]|$)/i.test(path) + ? 'login' + : (/\/(?:create-account|u\/signup|signup)\/password(?:[/?#]|$)/i.test(path) ? 'signup' : ''); + return { url: url || location.href, path, mode }; + }; const performOperationWithDelay = typeof getOperationDelayRunner === 'function' ? getOperationDelayRunner() : async (metadata, operation) => { @@ -2693,6 +2706,7 @@ async function step3_fillEmailPassword(payload) { throw new Error(`当前密码页邮箱为 ${snapshot.displayedEmail}，与目标邮箱 ${email} 不一致，请先回到步骤 1 重新开始。`); } + const passwordPageInfo = resolvePasswordPageInfo(snapshot.url || location.href); await humanPause(600, 1500); await performOperationWithDelay({ stepKey: 'fill-password', kind: 'fill', label: 'signup-password' }, async () => { fillInput(snapshot.passwordInput, password); @@ -2709,7 +2723,8 @@ async function step3_fillEmailPassword(payload) { logSignupPasswordDiagnostics('步骤 3：当前密码页同时存在一次性验证码入口', 'info'); } - const signupVerificationRequestedAt = submitBtn ? Date.now() : null; + const isLoginPasswordPage = passwordPageInfo.mode === 'login'; + const signupVerificationRequestedAt = submitBtn && !isLoginPasswordPage ? Date.now() : null; const completionPayload = { email, phoneNumber: String(payload?.phoneNumber || '').trim(), @@ -2717,6 +2732,10 @@ async function step3_fillEmailPassword(payload) { accountIdentifier, signupVerificationRequestedAt, deferredSubmit: Boolean(submitBtn), + passwordPageUrl: passwordPageInfo.url, + passwordPagePath: passwordPageInfo.path, + passwordPageMode: passwordPageInfo.mode, + ...(isLoginPasswordPage ? { passwordLoginFlow: true } : {}), }; reportComplete(3, completionPayload); @@ -4762,6 +4781,13 @@ function inspectSignupVerificationState() { }; } + if (typeof isOAuthConsentPage === 'function' && isOAuthConsentPage()) { + return { + state: 'oauth_consent_page', + url: location.href, + }; + } + if (typeof isPhoneVerificationPageReady === 'function' && isPhoneVerificationPageReady()) { return { state: 'verification', @@ -4804,6 +4830,7 @@ async function waitForSignupVerificationTransition(timeout = 5000) { if ( snapshot.state === 'step5' || snapshot.state === 'logged_in_home' + || snapshot.state === 'oauth_consent_page' || snapshot.state === 'verification' || snapshot.state === 'contact_verification_server_error' || snapshot.state === 'error' @@ -4901,6 +4928,19 @@ async function prepareSignupVerificationFlow(payload = {}, timeout = 30000) { }; } + if (snapshot.state === 'oauth_consent_page') { + log(`${prepareLogLabel}：页面已直接进入 OAuth 授权页，本步骤按已完成处理。`, 'ok'); + return { + ready: true, + alreadyVerified: true, + state: 'oauth_consent_page', + skipLoginVerificationStep: true, + directOAuthConsentPage: true, + retried: recoveryRound, + prepareSource, + }; + } + if (snapshot.state === 'verification') { await waitForDocumentLoadComplete(15000, `${prepareLogLabel}：注册验证码页面`); await waitForVerificationCodeTarget(15000); diff --git a/flows/openai/content/paypal-flow.js b/flows/openai/content/paypal-flow.js index 8f899439..613a5f75 100644 --- a/flows/openai/content/paypal-flow.js +++ b/flows/openai/content/paypal-flow.js @@ -8,6 +8,7 @@ const PAYPAL_HOSTED_STAGE_OUTSIDE = 'outside_paypal'; const PAYPAL_HOSTED_STAGE_LOGIN = 'pay_login'; const PAYPAL_HOSTED_STAGE_GUEST_CHECKOUT = 'guest_checkout'; const PAYPAL_HOSTED_STAGE_CREATE_ACCOUNT = 'create_account'; +const PAYPAL_HOSTED_STAGE_SECURITY_CODE = 'security_code'; const PAYPAL_HOSTED_STAGE_REVIEW = 'review_consent'; const PAYPAL_HOSTED_STAGE_APPROVAL = 'approval'; const PAYPAL_HOSTED_STAGE_UNKNOWN = 'unknown'; @@ -15,6 +16,7 @@ const PAYPAL_HOSTED_STEP_KEYS = { [PAYPAL_HOSTED_STAGE_LOGIN]: 'paypal-hosted-email', [PAYPAL_HOSTED_STAGE_GUEST_CHECKOUT]: 'paypal-hosted-card', [PAYPAL_HOSTED_STAGE_CREATE_ACCOUNT]: 'paypal-hosted-create-account', + [PAYPAL_HOSTED_STAGE_SECURITY_CODE]: 'paypal-hosted-create-account', [PAYPAL_HOSTED_STAGE_REVIEW]: 'paypal-hosted-review', }; @@ -308,10 +310,63 @@ function findHostedReviewConsentButton() { ]); } +function getHostedSecurityCodeInputs() { + const pageText = normalizeText(document.body?.innerText || document.body?.textContent || ''); + const pageLooksLikeSecurityCode = /enter\s+(?:your\s+)?code|6[-\s]*digit\s+code|security\s+code|verification\s+code|we\s+sent\s+a\s+6[-\s]*digit\s+code/i.test(pageText); + const visibleInputs = getVisibleControls('input') + .filter((input) => { + const type = String(input.getAttribute?.('type') || input.type || '').trim().toLowerCase(); + return isEnabledControl(input) + && !['hidden', 'checkbox', 'radio', 'submit', 'button', 'file'].includes(type); + }); + const candidates = visibleInputs + .filter((input) => { + const maxLength = Number(input.getAttribute?.('maxlength') || input.maxLength || 0); + const metadata = getActionText(input); + return maxLength === 1 || /otp|code|verification|security|one[-\s]*time/i.test(metadata); + }); + if (candidates.length < 6 && pageLooksLikeSecurityCode && visibleInputs.length >= 6) { + return visibleInputs.slice(0, 6); + } + const singleDigitInputs = candidates.filter((input) => { + const maxLength = Number(input.getAttribute?.('maxlength') || input.maxLength || 0); + const valueLength = String(input.value || '').length; + return maxLength === 1 || valueLength <= 1; + }); + return singleDigitInputs.length >= 6 ? singleDigitInputs.slice(0, 6) : candidates; +} + +function getHostedSecurityCodeSingleInput() { + return getVisibleControls('input').find((input) => { + const type = String(input.getAttribute?.('type') || input.type || '').trim().toLowerCase(); + const maxLength = Number(input.getAttribute?.('maxlength') || input.maxLength || 0); + const metadata = getActionText(input); + return isEnabledControl(input) + && !['hidden', 'checkbox', 'radio', 'submit', 'button', 'file'].includes(type) + && maxLength >= 6 + && /otp|code|verification|security|one[-\s]*time/i.test(metadata); + }) || null; +} + +function findHostedSecurityCodeSubmitButton() { + return findClickableByText([ + /submit|continue|next|verify|confirm|done/i, + ]); +} + +function isHostedSecurityCodePage() { + const pageText = normalizeText(document.body?.innerText || document.body?.textContent || ''); + const hasSecurityText = /enter\s+(?:your\s+)?code|6[-\s]*digit\s+code|security\s+code|verification\s+code|we\s+sent\s+a\s+6[-\s]*digit\s+code/i.test(pageText); + return hasSecurityText && (getHostedSecurityCodeInputs().length >= 6 || Boolean(getHostedSecurityCodeSingleInput())); +} + function detectPayPalHostedStage() { if (!/paypal\./i.test(String(location?.host || ''))) { return PAYPAL_HOSTED_STAGE_OUTSIDE; } + if (isHostedSecurityCodePage()) { + return PAYPAL_HOSTED_STAGE_SECURITY_CODE; + } if (isHostedGuestCheckoutPage()) { return PAYPAL_HOSTED_STAGE_GUEST_CHECKOUT; } @@ -465,6 +520,48 @@ function verifyHostedPhoneBeforeSubmit(expectedPhone = '') { }; } +function normalizeHostedSecurityCode(value = '') { + const code = String(value || '').replace(/\D/g, '').slice(0, 6); + return /^\d{6}$/.test(code) ? code : ''; +} + +async function submitHostedSecurityCode(payload = {}) { + await waitForDocumentComplete(); + const code = normalizeHostedSecurityCode(payload.securityCode || payload.verificationCode || payload.code || ''); + if (!code) { + throw new Error('PayPal hosted checkout 验证码为空或不是 6 位数字。'); + } + const digitInputs = getHostedSecurityCodeInputs(); + const singleInput = getHostedSecurityCodeSingleInput(); + if (digitInputs.length >= 6) { + digitInputs.slice(0, 6).forEach((input, index) => { + fillInput(input, code[index]); + }); + } else if (singleInput) { + fillInput(singleInput, code); + } else { + throw new Error('PayPal hosted checkout 未找到验证码输入框。'); + } + + const submitButton = findHostedSecurityCodeSubmitButton(); + if (submitButton && isVisibleElement(submitButton) && isEnabledControl(submitButton)) { + await performPayPalOperationWithDelay({ + stepKey: getHostedStepKey(PAYPAL_HOSTED_STAGE_SECURITY_CODE), + kind: 'click', + label: 'hosted-paypal-security-code-submit', + }, async () => { + simulateClick(submitButton); + }); + } + await sleep(1000); + return { + stage: PAYPAL_HOSTED_STAGE_SECURITY_CODE, + securityCodeSubmitted: true, + submitted: Boolean(submitButton), + inputCount: digitInputs.length >= 6 ? 6 : 1, + }; +} + async function clickHostedCreateAccount(payload = {}) { await waitForDocumentComplete(); const button = await waitUntil(() => { @@ -640,6 +737,9 @@ async function runPayPalHostedCheckoutStep(payload = {}) { if (stage === PAYPAL_HOSTED_STAGE_CREATE_ACCOUNT) { return clickHostedCreateAccount(payload); } + if (stage === PAYPAL_HOSTED_STAGE_SECURITY_CODE) { + return submitHostedSecurityCode(payload); + } if (stage === PAYPAL_HOSTED_STAGE_REVIEW) { return clickHostedReviewConsent(); } @@ -659,6 +759,7 @@ function inspectPayPalHostedState() { hostedStage: stage, hasGuestCardFields: Boolean(document.getElementById('cardNumber')), hasHostedEmailInput: Boolean(document.getElementById('email') || findEmailInput()), + securityCodeVisible: stage === PAYPAL_HOSTED_STAGE_SECURITY_CODE, createAccountReady: Boolean(createAccountButton && isVisibleElement(createAccountButton) && isEnabledControl(createAccountButton)), reviewConsentReady: Boolean(findHostedReviewConsentButton()), approveReady: Boolean(findApproveButton()), diff --git a/tests/background-message-router-step2-skip.test.js b/tests/background-message-router-step2-skip.test.js index c969047d..8f8df169 100644 --- a/tests/background-message-router-step2-skip.test.js +++ b/tests/background-message-router-step2-skip.test.js @@ -574,6 +574,213 @@ test('message router marks step 3 failed when post-submit finalize fails', async assert.deepStrictEqual(response, { ok: true, error: '步骤 3 提交后仍停留在密码页。' }); }); +test('message router skips signup tail before finalizing when phone password submit used login password page', async () => { + const { router, events } = createRouter({ + state: { + signupMethod: 'phone', + accountIdentifierType: 'phone', + accountIdentifier: '+66959916439', + signupPhoneNumber: '+66959916439', + stepStatuses: { + 3: 'running', + 4: 'pending', + 5: 'pending', + 6: 'pending', + 7: 'pending', + }, + }, + getStepIdsForState: () => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], + finalizeStep3Completion: async (payload) => { + events.finalizePayloads.push(payload); + throw new Error('should not finalize login password page as signup verification'); + }, + }); + + const response = await router.handleMessage({ + type: 'NODE_COMPLETE', + nodeId: 'fill-password', + source: 'openai-auth', + payload: { + nodeId: 'fill-password', + accountIdentifierType: 'phone', + accountIdentifier: '+66959916439', + signupPhoneNumber: '+66959916439', + signupVerificationRequestedAt: 123456, + deferredSubmit: true, + passwordPageUrl: 'https://auth.openai.com/log-in/password', + passwordPagePath: '/log-in/password', + passwordPageMode: 'login', + }, + }, {}); + + assert.deepStrictEqual(response, { ok: true }); + assert.deepStrictEqual(events.finalizePayloads, []); + assert.deepStrictEqual(events.stepStatuses, [ + { step: 3, status: 'completed' }, + { step: 4, status: 'skipped' }, + { step: 5, status: 'skipped' }, + { step: 6, status: 'skipped' }, + ]); + assert.deepStrictEqual(events.signupPhoneSilentStates, ['+66959916439']); + assert.equal(events.stateUpdates.some((updates) => updates.signupVerificationRequestedAt === 123456), false); + assert.equal(events.stateUpdates.some((updates) => updates.signupVerificationRequestedAt === null), true); + assert.equal(events.logs.some(({ message }) => /手机号密码提交后已确认账号进入登录后续状态/.test(message)), true); + assert.deepStrictEqual(events.notifyCompletions, [ + { + step: 3, + nodeId: 'fill-password', + payload: { + nodeId: 'fill-password', + accountIdentifierType: 'phone', + accountIdentifier: '+66959916439', + signupPhoneNumber: '+66959916439', + signupVerificationRequestedAt: null, + deferredSubmit: true, + passwordPageUrl: 'https://auth.openai.com/log-in/password', + passwordPagePath: '/log-in/password', + passwordPageMode: 'login', + step: 3, + passwordLoginFlow: true, + skipRegistrationFlow: true, + state: 'login_password_page', + }, + }, + ]); +}); + +test('message router keeps signup tail when phone password submit used create-account page', async () => { + const finalizeResult = { + ready: true, + state: 'verification', + }; + const { router, events } = createRouter({ + state: { + signupMethod: 'phone', + accountIdentifierType: 'phone', + accountIdentifier: '+66959916439', + signupPhoneNumber: '+66959916439', + stepStatuses: { + 3: 'running', + 4: 'pending', + 5: 'pending', + 6: 'pending', + 7: 'pending', + }, + }, + getStepIdsForState: () => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], + finalizeStep3Completion: async (payload) => { + events.finalizePayloads.push(payload); + return finalizeResult; + }, + }); + + const response = await router.handleMessage({ + type: 'NODE_COMPLETE', + nodeId: 'fill-password', + source: 'openai-auth', + payload: { + nodeId: 'fill-password', + accountIdentifierType: 'phone', + accountIdentifier: '+66959916439', + signupPhoneNumber: '+66959916439', + signupVerificationRequestedAt: 123456, + passwordPageUrl: 'https://auth.openai.com/create-account/password', + passwordPagePath: '/create-account/password', + passwordPageMode: 'signup', + }, + }, {}); + + assert.deepStrictEqual(response, { ok: true }); + assert.deepStrictEqual(events.stepStatuses, [ + { step: 3, status: 'completed' }, + ]); + assert.equal(events.stateUpdates.some((updates) => updates.signupVerificationRequestedAt === 123456), true); + assert.equal(events.stateUpdates.some((updates) => updates.signupVerificationRequestedAt === null), false); + assert.equal(events.logs.some(({ message }) => /手机号密码提交后已确认账号进入登录后续状态/.test(message)), false); + assert.deepStrictEqual(events.notifyCompletions, [ + { + step: 3, + nodeId: 'fill-password', + payload: { + nodeId: 'fill-password', + accountIdentifierType: 'phone', + accountIdentifier: '+66959916439', + signupPhoneNumber: '+66959916439', + signupVerificationRequestedAt: 123456, + passwordPageUrl: 'https://auth.openai.com/create-account/password', + passwordPagePath: '/create-account/password', + passwordPageMode: 'signup', + step: 3, + ...finalizeResult, + }, + }, + ]); +}); + +test('message router keeps signup tail when phone password submit lacks login password page url', async () => { + const finalizeResult = { + ready: true, + state: 'oauth_consent_page', + directOAuthConsentPage: true, + }; + const { router, events } = createRouter({ + state: { + signupMethod: 'phone', + accountIdentifierType: 'phone', + accountIdentifier: '+66959916439', + signupPhoneNumber: '+66959916439', + stepStatuses: { + 3: 'running', + 4: 'pending', + 5: 'pending', + 6: 'pending', + 7: 'pending', + }, + }, + getStepIdsForState: () => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], + finalizeStep3Completion: async (payload) => { + events.finalizePayloads.push(payload); + return finalizeResult; + }, + }); + + const response = await router.handleMessage({ + type: 'NODE_COMPLETE', + nodeId: 'fill-password', + source: 'openai-auth', + payload: { + nodeId: 'fill-password', + accountIdentifierType: 'phone', + accountIdentifier: '+66959916439', + signupPhoneNumber: '+66959916439', + signupVerificationRequestedAt: 123456, + }, + }, {}); + + assert.deepStrictEqual(response, { ok: true }); + assert.deepStrictEqual(events.stepStatuses, [ + { step: 3, status: 'completed' }, + ]); + assert.equal(events.stateUpdates.some((updates) => updates.signupVerificationRequestedAt === 123456), true); + assert.equal(events.stateUpdates.some((updates) => updates.signupVerificationRequestedAt === null), false); + assert.equal(events.logs.some(({ message }) => /手机号密码提交后已确认账号进入登录后续状态/.test(message)), false); + assert.deepStrictEqual(events.notifyCompletions, [ + { + step: 3, + nodeId: 'fill-password', + payload: { + nodeId: 'fill-password', + accountIdentifierType: 'phone', + accountIdentifier: '+66959916439', + signupPhoneNumber: '+66959916439', + signupVerificationRequestedAt: 123456, + step: 3, + ...finalizeResult, + }, + }, + ]); +}); + test('message router does not duplicate step 3 mismatch failure log after finalize already failed', async () => { const mismatchError = 'SIGNUP_PHONE_PASSWORD_MISMATCH::步骤 3：检测到注册手机号或密码不正确，需要重新开始当前轮。页面提示：Incorrect phone number or password'; const state = { diff --git a/tests/paypal-flow-content.test.js b/tests/paypal-flow-content.test.js index db41f5c8..ea0ae8b8 100644 --- a/tests/paypal-flow-content.test.js +++ b/tests/paypal-flow-content.test.js @@ -413,6 +413,16 @@ function createHostedPayPalHarness(options = {}) { id: 'btnNext', text: '下一页', }); + const securityCodeInputs = Array.from({ length: 6 }, (_value, index) => createDomElement({ + tagName: 'INPUT', + id: `securityCode${index + 1}`, + type: 'text', + })); + const securityCodeContinueButton = createDomElement({ + tagName: 'BUTTON', + id: 'securityCodeContinue', + text: 'Continue', + }); function setElements(nextElements) { elements = nextElements; @@ -464,6 +474,15 @@ function createHostedPayPalHarness(options = {}) { setElements([emailInput, nextButton, createAccountButton]); } + function showSecurityCode() { + location.href = 'https://www.paypal.com/checkoutweb/security-code'; + location.host = 'www.paypal.com'; + location.pathname = '/checkoutweb/security-code'; + body.innerText = 'Enter your code We sent a 6-digit code to (835) 253-1607 Resend'; + body.textContent = body.innerText; + setElements([...securityCodeInputs, securityCodeContinueButton]); + } + const context = { console: { log() {}, warn() {}, error() {}, info() {} }, location, @@ -558,6 +577,7 @@ function createHostedPayPalHarness(options = {}) { showPayEmail, showCreateAccount, showGuestCheckout, + showSecurityCode, }; } @@ -687,3 +707,37 @@ test('PayPal hosted create account page is detected and handled as its own step' [{ stepKey: 'paypal-hosted-create-account', kind: 'click', label: 'hosted-paypal-create-account' }] ); }); + +test('PayPal hosted security code page fills six digit code inputs', async () => { + const harness = createHostedPayPalHarness(); + harness.showSecurityCode(); + + const state = await harness.send({ + type: 'PAYPAL_HOSTED_GET_STATE', + source: 'test', + payload: {}, + }); + assert.equal(state.ok, true); + assert.equal(state.hostedStage, 'security_code'); + assert.equal(state.securityCodeVisible, true); + + const result = await harness.send({ + type: 'PAYPAL_RUN_HOSTED_CHECKOUT_STEP', + source: 'test', + payload: { + expectedStage: 'security_code', + securityCode: '921714', + }, + }); + + assert.equal(result.ok, true); + assert.equal(result.stage, 'security_code'); + assert.equal(result.securityCodeSubmitted, true); + assert.deepEqual( + harness.events + .filter((event) => event.type === 'fill' && /^securityCode/.test(event.id)) + .map((event) => event.value), + ['9', '2', '1', '7', '1', '4'] + ); + assert.equal(harness.events.some((event) => event.type === 'click' && event.id === 'securityCodeContinue'), true); +}); diff --git a/tests/plus-checkout-create-wait.test.js b/tests/plus-checkout-create-wait.test.js index 06ae2f26..f4d2eb6e 100644 --- a/tests/plus-checkout-create-wait.test.js +++ b/tests/plus-checkout-create-wait.test.js @@ -259,6 +259,7 @@ test('Plus checkout create does not wait 20 seconds after opening checkout page' test('GoPay plus checkout create forwards gopay payment method to the checkout content script', async () => { const events = []; + let proxyCallCount = 0; const executor = api.createPlusCheckoutCreateExecutor({ addLog: async () => {}, chrome: { @@ -281,11 +282,183 @@ test('GoPay plus checkout create forwards gopay payment method to the checkout c setState: async () => {}, sleepWithStop: async () => {}, waitForTabCompleteUntilStopped: async () => {}, + withCheckoutCreationProxy: async () => { + proxyCallCount += 1; + throw new Error('gopay checkout should not use the checkout proxy wrapper'); + }, }); await executor.executePlusCheckoutCreate({ plusPaymentMethod: 'gopay' }); assert.deepStrictEqual(events[0]?.payload, { paymentMethod: 'gopay' }); + assert.equal(proxyCallCount, 0); +}); + +test('PayPal no-card binding creates checkout inside the local checkout proxy wrapper', async () => { + const events = []; + const executor = api.createPlusCheckoutCreateExecutor({ + addLog: async () => {}, + chrome: { + tabs: { + create: async () => ({ id: 77, url: 'https://chatgpt.com/', status: 'complete' }), + update: async () => {}, + get: async () => ({ id: 77, url: 'https://www.paypal.com/pay?token=BA-wrapper', status: 'complete' }), + }, + }, + completeNodeFromBackground: async () => {}, + ensureContentScriptReadyOnTabUntilStopped: async () => {}, + fetch: async () => ({ + ok: true, + status: 200, + json: async () => ({ + address: { + Address: '1 Main St', + City: 'New York', + State: 'New York', + Zip_Code: '10001', + }, + }), + }), + getState: async () => ({ + hostedCheckoutPhoneNumber: '4155551234', + }), + registerTab: async () => {}, + sendTabMessageUntilStopped: async (_tabId, _source, message) => { + events.push({ type: 'tab-message', message, inProxy: events.some((event) => event.type === 'proxy-enter') && !events.some((event) => event.type === 'proxy-exit') }); + if (message.type === 'CREATE_PLUS_CHECKOUT') { + return { + checkoutUrl: 'https://chatgpt.com/checkout/openai_llc/cs_hosted', + preferredCheckoutUrl: 'https://pay.openai.com/c/pay/cs_hosted', + hostedCheckoutUrl: 'https://pay.openai.com/c/pay/cs_hosted', + country: 'US', + currency: 'USD', + }; + } + if (message.type === 'RUN_PAYPAL_HOSTED_OPENAI_CHECKOUT_STEP') { + return { clicked: true }; + } + throw new Error(`unexpected message type ${message.type}`); + }, + setState: async () => {}, + sleepWithStop: async () => {}, + waitForTabCompleteUntilStopped: async () => {}, + withCheckoutCreationProxy: async (config, action) => { + events.push({ type: 'proxy-enter', config }); + const result = await action(); + events.push({ type: 'proxy-exit' }); + return result; + }, + }); + + await executor.executePlusCheckoutCreate({ + plusPaymentMethod: 'paypal-hosted', + plusHostedCheckoutOauthDelaySeconds: 0, + }); + + assert.deepStrictEqual(events.find((event) => event.type === 'proxy-enter')?.config, { + healthUrl: 'http://127.0.0.1:21988/health', + localProxyUrl: 'socks5://127.0.0.1:21987', + }); + assert.equal( + events.find((event) => event.type === 'tab-message' && event.message.type === 'CREATE_PLUS_CHECKOUT')?.inProxy, + true + ); +}); + +test('PayPal no-card binding falls back to direct checkout when local helper proxy fails', async () => { + const events = []; + let createAttempts = 0; + const proxySettings = { + get(details, callback) { + events.push({ type: 'proxy-get', details }); + callback({ + levelOfControl: 'controllable_by_this_extension', + value: { mode: 'system' }, + }); + }, + set(details, callback) { + events.push({ type: 'proxy-set', details }); + callback(); + }, + clear(details, callback) { + events.push({ type: 'proxy-clear', details }); + callback(); + }, + }; + const executor = api.createPlusCheckoutCreateExecutor({ + addLog: async () => {}, + chrome: { + runtime: {}, + proxy: { + settings: proxySettings, + }, + tabs: { + create: async () => ({ id: 78, url: 'https://chatgpt.com/', status: 'complete' }), + update: async () => {}, + get: async () => ({ id: 78, url: 'https://www.paypal.com/pay?token=BA-direct', status: 'complete' }), + }, + }, + completeNodeFromBackground: async () => {}, + ensureContentScriptReadyOnTabUntilStopped: async () => {}, + fetch: async (url) => { + events.push({ type: 'fetch', url }); + if (String(url).startsWith('http://127.0.0.1:21988/health')) { + return { + ok: true, + status: 200, + json: async () => ({ ok: true, localProxy: 'socks5://127.0.0.1:21987' }), + }; + } + return { + ok: true, + status: 200, + json: async () => ({ + address: { + Address: '1 Main St', + City: 'New York', + State: 'New York', + Zip_Code: '10001', + }, + }), + }; + }, + getState: async () => ({ + hostedCheckoutPhoneNumber: '4155551234', + }), + registerTab: async () => {}, + sendTabMessageUntilStopped: async (_tabId, _source, message) => { + events.push({ type: 'tab-message', message }); + if (message.type === 'CREATE_PLUS_CHECKOUT') { + createAttempts += 1; + if (createAttempts === 1) { + return { error: 'proxy connect failed' }; + } + return { + checkoutUrl: 'https://chatgpt.com/checkout/openai_llc/cs_hosted', + preferredCheckoutUrl: 'https://www.paypal.com/pay?token=BA-direct', + hostedCheckoutUrl: 'https://www.paypal.com/pay?token=BA-direct', + country: 'US', + currency: 'USD', + }; + } + if (message.type === 'RUN_PAYPAL_HOSTED_OPENAI_CHECKOUT_STEP') { + return { clicked: true }; + } + throw new Error(`unexpected message type ${message.type}`); + }, + setState: async () => {}, + sleepWithStop: async () => {}, + waitForTabCompleteUntilStopped: async () => {}, + }); + + await executor.executePlusCheckoutCreate({ + plusPaymentMethod: 'paypal-hosted', + plusHostedCheckoutOauthDelaySeconds: 0, + }); + + assert.equal(createAttempts, 2); + assert.equal(events.some((event) => event.type === 'proxy-set' && event.details?.value?.mode === 'pac_script'), true); + assert.equal(events.some((event) => event.type === 'proxy-clear' && event.details?.scope === 'regular'), true); }); test('PayPal no-card binding create opens and submits hosted OpenAI checkout before completing', async () => { @@ -554,6 +727,89 @@ test('PayPal hosted email node completes when Next navigation drops the content ); }); +test('PayPal hosted create account node submits PayPal security code from SMS text payload', async () => { + const events = []; + let stage = 'create_account'; + const executor = api.createPlusCheckoutCreateExecutor({ + addLog: async (message, level = 'info', options = {}) => events.push({ type: 'log', message, level, options }), + chrome: { + tabs: { + get: async (tabId) => ({ id: tabId, url: 'https://www.paypal.com/checkoutweb/create-account', status: 'complete' }), + }, + }, + completeNodeFromBackground: async (step, payload) => events.push({ type: 'complete', step, payload }), + ensureContentScriptReadyOnTabUntilStopped: async (source, tabId, options) => events.push({ type: 'ready', source, tabId, options }), + fetch: async (url) => { + events.push({ type: 'fetch', url }); + if (url === 'https://www.meiguodizhi.com/api/v1/dz') { + return { + ok: true, + status: 200, + json: async () => ({ + address: { + Address: '1 Main St', + City: 'New York', + State: 'New York', + Zip_Code: '10001', + }, + }), + }; + } + assert.equal(String(url).startsWith('https://otp.example.test/latest?t='), true); + return { + ok: true, + status: 200, + text: async () => JSON.stringify({ + code: 1, + msg: 'ok', + data: { + code: "PayPal: 921714 is your security code. Don't share it.", + code_time: '2026-05-25 01:41:22', + expired_date: '2026-08-15 00:00:00', + }, + }), + }; + }, + getState: async () => ({ + hostedCheckoutVerificationUrl: 'https://otp.example.test/latest', + hostedCheckoutPhoneNumber: '8352531607', + }), + registerTab: async (source, tabId) => events.push({ type: 'register', source, tabId }), + sendTabMessageUntilStopped: async (tabId, source, message) => { + events.push({ type: 'tab-message', tabId, source, message }); + if (message.type === 'PAYPAL_HOSTED_GET_STATE') { + return { hostedStage: stage }; + } + if (message.type === 'PAYPAL_RUN_HOSTED_CHECKOUT_STEP' && message.payload.expectedStage === 'create_account') { + stage = 'security_code'; + return { clicked: true, submitted: true, stage: 'create_account' }; + } + if (message.type === 'PAYPAL_RUN_HOSTED_CHECKOUT_STEP' && message.payload.expectedStage === 'security_code') { + stage = 'review_consent'; + return { securityCodeSubmitted: true, stage: 'security_code' }; + } + throw new Error(`unexpected message type ${message.type}`); + }, + setState: async (payload) => events.push({ type: 'set-state', payload }), + sleepWithStop: async (ms) => events.push({ type: 'sleep', ms }), + waitForTabCompleteUntilStopped: async () => events.push({ type: 'tab-complete' }), + }); + + await executor.executePayPalHostedCreateAccount({ + plusCheckoutTabId: 55, + plusPaymentMethod: 'paypal-hosted', + }); + + assert.deepStrictEqual( + events.find((event) => event.type === 'tab-message' && event.message?.payload?.expectedStage === 'security_code')?.message?.payload, + { + expectedStage: 'security_code', + securityCode: '921714', + } + ); + assert.equal(events.some((event) => event.type === 'complete' && event.step === 'paypal-hosted-create-account'), true); +}); + test('Plus checkout content routes billing operations through the operation delay gate', async () => { const { checkoutEvents, send } = createCheckoutContentHarness(); diff --git a/tests/step3-direct-complete.test.js b/tests/step3-direct-complete.test.js index aa2290e9..34165029 100644 --- a/tests/step3-direct-complete.test.js +++ b/tests/step3-direct-complete.test.js @@ -211,6 +211,9 @@ return { assert.deepStrictEqual(result, beforeSubmit.completions[0].payload); assert.equal(result.email, 'user@example.com'); assert.equal(result.deferredSubmit, true); + assert.equal(result.passwordPageUrl, 'https://auth.openai.com/create-account/password'); + assert.equal(result.passwordPagePath, '/create-account/password'); + assert.equal(result.passwordPageMode, 'signup'); assert.equal(typeof result.signupVerificationRequestedAt, 'number'); assert.equal(beforeSubmit.events.includes('report:true'), true); assert.equal(beforeSubmit.events.includes('operation:submit-signup-password:start'), false); @@ -233,3 +236,71 @@ return { assert.deepStrictEqual(afterSubmit.clicks, ['Continue']); assert.equal(afterSubmit.events.includes('delay:submit-signup-password:2000'), true); }); + +test('step 3 marks login password page from log-in URL', async () => { + const api = new Function(` +const completions = []; +const scheduled = []; +const snapshot = { + state: 'password_page', + passwordInput: { value: '', hidden: false }, + submitButton: { textContent: 'Continue', hidden: false }, + displayedEmail: '', + url: 'https://auth.openai.com/log-in/password', +}; +const window = { + setTimeout(fn, ms) { + scheduled.push({ fn, ms }); + return scheduled.length; + }, + CodexOperationDelay: { + async performOperationWithDelay(metadata, operation) { + return operation(); + }, + }, +}; +const location = { + href: 'https://auth.openai.com/log-in/password', + pathname: '/log-in/password', +}; +function inspectSignupEntryState() { return snapshot; } +function ensureSignupPasswordPageReady() { return { ready: true }; } +function getSignupPasswordSubmitButton() { return snapshot.submitButton; } +async function waitForElementByText() { return null; } +function fillInput(input, value) { input.value = value; } +async function humanPause() {} +async function sleep() {} +function throwIfStopped() {} +function isStopError() { return false; } +function log() {} +function logSignupPasswordDiagnostics() {} +function reportComplete(step, payload) { completions.push({ step, payload }); } +function simulateClick() {} +function getOperationDelayRunner() { return window.CodexOperationDelay.performOperationWithDelay; } + +${extractFunction('step3_fillEmailPassword')} + +return { + run() { + return step3_fillEmailPassword({ + accountIdentifierType: 'phone', + accountIdentifier: '+66959916439', + phoneNumber: '+66959916439', + password: 'Secret123!', + }); + }, + completions, +}; +`)(); + + const result = await api.run(); + + assert.equal(result.accountIdentifierType, 'phone'); + assert.equal(result.accountIdentifier, '+66959916439'); + assert.equal(result.passwordPageUrl, 'https://auth.openai.com/log-in/password'); + assert.equal(result.passwordPagePath, '/log-in/password'); + assert.equal(result.passwordPageMode, 'login'); + assert.equal(result.passwordLoginFlow, true); + assert.equal(result.signupVerificationRequestedAt, null); + assert.equal(api.completions[0].payload.passwordPageMode, 'login'); +}); diff --git "a/\351\241\271\347\233\256\345\256\214\346\225\264\351\223\276\350\267\257\350\257\264\346\230\216.md" "b/\351\241\271\347\233\256\345\256\214\346\225\264\351\223\276\350\267\257\350\257\264\346\230\216.md" index 80078ddb..9b055359 100644 --- "a/\351\241\271\347\233\256\345\256\214\346\225\264\351\223\276\350\267\257\350\257\264\346\230\216.md" +++ "b/\351\241\271\347\233\256\345\256\214\346\225\264\351\223\276\350\267\257\350\257\264\346\230\216.md" @@ -452,6 +452,7 @@ IP 代理模块在同步、切换、Change、出口探测和自动运行成功 8. 后台在真正确认 Step 3 完成前，会额外检查提交后是否切换页面；如果出现认证页 `Try again / 重试` 页面，或 `/email-verification` 上的 `405 / Route Error` 重试页，会先通过共享恢复逻辑最多自动点击 5 次 `重试` 尝试恢复，再继续后续链路 9. Step 3 收尾阶段如果页面切换导致旧内容脚本失联，后台会把单次消息等待收口到当前收尾预算内，优先尽快重试重连；若最终仍未恢复，则输出中文的步骤级错误，而不是直接暴露底层英文通信超时 10. 手机号注册时，如果 Step 3 收尾或 Step 4 准备验证码阶段在密码页检测到 `Incorrect phone number or password`，后台会把它视为当前注册手机号/密码不匹配：清空本轮 `signupPhoneNumber / signupPhoneActivation / signupPhoneCompletedActivation` 和手机号账号身份，回到 Step 1 重新获取号码并重开当前轮，避免继续在密码页重复点击 +11. 手机号注册时，如果 Step 3 实际落在 `/log-in/password` 登录密码页（已注册手机号），并且密码提交后的后台收尾确认已进入登录验证码、OAuth 授权页或 ChatGPT 已登录态，则自动跳过注册验证码、资料填写和注册成功等待节点，直接进入 OAuth 尾链 补充：