From 6c2bec652073af7b057c91d946c45b7a35334d41 Mon Sep 17 00:00:00 2001 From: QLHazyCoder <2825305047@qq.com> Date: Sun, 26 Apr 2026 15:50:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=BC=BA=20Plus=20Checkout=20?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=80=BB=E8=BE=91=EF=BC=8C=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E9=87=8D=E7=94=A8=20ChatGPT=20=E6=A0=87=E7=AD=BE=E9=A1=B5?= =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- background.js | 3 + background/steps/create-plus-checkout.js | 55 +++++++++++++++++- tests/plus-checkout-create-wait.test.js | 71 ++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 3 deletions(-) diff --git a/background.js b/background.js index 94e90f2..bddd1d3 100644 --- a/background.js +++ b/background.js @@ -7067,6 +7067,9 @@ const plusCheckoutCreateExecutor = self.MultiPageBackgroundPlusCheckoutCreate?.c chrome, completeStepFromBackground, ensureContentScriptReadyOnTabUntilStopped, + getTabId, + isTabAlive, + registerTab, reuseOrCreateTab, sendTabMessageUntilStopped, setState, diff --git a/background/steps/create-plus-checkout.js b/background/steps/create-plus-checkout.js index ba8ca83..8686f95 100644 --- a/background/steps/create-plus-checkout.js +++ b/background/steps/create-plus-checkout.js @@ -2,8 +2,21 @@ root.MultiPageBackgroundPlusCheckoutCreate = factory(); })(typeof self !== 'undefined' ? self : globalThis, function createBackgroundPlusCheckoutCreateModule() { const PLUS_CHECKOUT_SOURCE = 'plus-checkout'; + const SIGNUP_PAGE_SOURCE = 'signup-page'; const PLUS_CHECKOUT_ENTRY_URL = 'https://chatgpt.com/'; const PLUS_CHECKOUT_INJECT_FILES = ['content/utils.js', 'content/plus-checkout.js']; + const PLUS_CHECKOUT_ONLY_INJECT_FILES = ['content/plus-checkout.js']; + + function isReusableChatGptTabUrl(url = '') { + try { + const parsed = new URL(String(url || '')); + const hostname = parsed.hostname.toLowerCase(); + return ['chatgpt.com', 'www.chatgpt.com', 'chat.openai.com'].includes(hostname) + && !/^\/checkout(?:\/|$)/i.test(parsed.pathname || ''); + } catch { + return false; + } + } function createPlusCheckoutCreateExecutor(deps = {}) { const { @@ -11,6 +24,9 @@ chrome, completeStepFromBackground, ensureContentScriptReadyOnTabUntilStopped, + getTabId, + isTabAlive, + registerTab, reuseOrCreateTab, sendTabMessageUntilStopped, setState, @@ -18,16 +34,49 @@ waitForTabCompleteUntilStopped, } = deps; - async function executePlusCheckoutCreate() { - await addLog('步骤 6：正在打开 ChatGPT 会话页，准备创建 Plus Checkout...', 'info'); + async function getReusableSignupChatGptTabId() { + if (typeof getTabId !== 'function' || typeof isTabAlive !== 'function') { + return null; + } + const tabId = await getTabId(SIGNUP_PAGE_SOURCE); + if (!tabId || !(await isTabAlive(SIGNUP_PAGE_SOURCE))) { + return null; + } + const tab = await chrome.tabs.get(tabId).catch(() => null); + return tab && isReusableChatGptTabUrl(tab.url) ? tabId : null; + } + + async function resolveChatGptTabForCheckoutCreate() { + const existingSignupTabId = await getReusableSignupChatGptTabId(); + if (existingSignupTabId) { + await chrome.tabs.update(existingSignupTabId, { active: true }); + if (typeof registerTab === 'function') { + await registerTab(PLUS_CHECKOUT_SOURCE, existingSignupTabId); + } + await addLog('步骤 6：检测到第 5 步已打开 ChatGPT 页面，直接接管当前标签页创建 Plus Checkout。', 'info'); + return { + tabId: existingSignupTabId, + injectFiles: PLUS_CHECKOUT_ONLY_INJECT_FILES, + }; + } + const tabId = await reuseOrCreateTab(PLUS_CHECKOUT_SOURCE, PLUS_CHECKOUT_ENTRY_URL, { reloadIfSameUrl: false, }); + return { + tabId, + injectFiles: PLUS_CHECKOUT_INJECT_FILES, + }; + } + + async function executePlusCheckoutCreate() { + await addLog('步骤 6：正在打开 ChatGPT 会话页，准备创建 Plus Checkout...', 'info'); + const { tabId, injectFiles } = await resolveChatGptTabForCheckoutCreate(); await waitForTabCompleteUntilStopped(tabId); await sleepWithStop(1000); await ensureContentScriptReadyOnTabUntilStopped(PLUS_CHECKOUT_SOURCE, tabId, { - inject: PLUS_CHECKOUT_INJECT_FILES, + inject: injectFiles, injectSource: PLUS_CHECKOUT_SOURCE, logMessage: '步骤 6：ChatGPT 页面仍在加载，等待 Plus Checkout 脚本就绪...', }); diff --git a/tests/plus-checkout-create-wait.test.js b/tests/plus-checkout-create-wait.test.js index 097c645..02325fa 100644 --- a/tests/plus-checkout-create-wait.test.js +++ b/tests/plus-checkout-create-wait.test.js @@ -62,3 +62,74 @@ test('Plus checkout create does not wait 20 seconds after opening checkout page' assert.equal(events.some((event) => event.type === 'sleep' && event.ms === 20000), false); assert.equal(events.some((event) => event.type === 'log' && /固定等待 20 秒后继续下一步/.test(event.message)), false); }); + +test('Plus checkout create reuses the ChatGPT tab from signup step 5', async () => { + const events = []; + const executor = api.createPlusCheckoutCreateExecutor({ + addLog: async (message, level = 'info') => { + events.push({ type: 'log', message, level }); + }, + chrome: { + tabs: { + get: async (tabId) => { + events.push({ type: 'tab-get', tabId }); + return { id: tabId, url: 'https://chatgpt.com/' }; + }, + update: async (tabId, payload) => { + events.push({ type: 'tab-update', tabId, payload }); + }, + }, + }, + completeStepFromBackground: async (step, payload) => { + events.push({ type: 'complete', step, payload }); + }, + ensureContentScriptReadyOnTabUntilStopped: async (source, tabId, options) => { + events.push({ type: 'ready', source, tabId, options }); + }, + getTabId: async (source) => { + events.push({ type: 'get-tab-id', source }); + return source === 'signup-page' ? 55 : null; + }, + isTabAlive: async (source) => { + events.push({ type: 'alive', source }); + return source === 'signup-page'; + }, + registerTab: async (source, tabId) => { + events.push({ type: 'register', source, tabId }); + }, + reuseOrCreateTab: async () => { + events.push({ type: 'reuse-tab' }); + return 42; + }, + sendTabMessageUntilStopped: async () => ({ + checkoutUrl: 'https://checkout.stripe.com/c/pay/session', + country: 'US', + currency: 'USD', + }), + setState: async (payload) => { + events.push({ type: 'set-state', payload }); + }, + sleepWithStop: async (ms) => { + events.push({ type: 'sleep', ms }); + }, + waitForTabCompleteUntilStopped: async (tabId) => { + events.push({ type: 'tab-complete', tabId }); + }, + }); + + await executor.executePlusCheckoutCreate(); + + assert.equal(events.some((event) => event.type === 'reuse-tab'), false); + assert.deepEqual( + events.find((event) => event.type === 'register'), + { type: 'register', source: 'plus-checkout', tabId: 55 } + ); + assert.deepEqual( + events.find((event) => event.type === 'ready').options.inject, + ['content/plus-checkout.js'] + ); + assert.equal( + events.some((event) => event.type === 'log' && /直接接管当前标签页/.test(event.message)), + true + ); +});