1
更新:(都只适配的英文界面) 1、韩国IP填写姓名年龄的页面要勾选:i agree.... 2、出现405 错误页面自动点击“try again” 3、修复 注册判定:"完成帐户创建" → 页面跳转 chatgpt.com → 内容脚本断开 → background 捕获通信错误 → 检测标签页 URL 为 chatgpt.com → 注入内容脚本 → 点击 Skip (没有完成所有引导,但是也注册成功过了)
This commit is contained in:
+96
-5
@@ -7439,12 +7439,103 @@ async function executeStep5(state) {
|
||||
|
||||
await addLog(`步骤 5:已生成姓名 ${firstName} ${lastName},生日 ${year}-${month}-${day}`);
|
||||
|
||||
await sendToContentScript('signup-page', {
|
||||
type: 'EXECUTE_STEP',
|
||||
step: 5,
|
||||
source: 'background',
|
||||
payload: { firstName, lastName, year, month, day },
|
||||
let step5Result = null;
|
||||
let step5TransportError = null;
|
||||
|
||||
try {
|
||||
step5Result = await sendToContentScript('signup-page', {
|
||||
type: 'EXECUTE_STEP',
|
||||
step: 5,
|
||||
source: 'background',
|
||||
payload: { firstName, lastName, year, month, day },
|
||||
});
|
||||
} catch (err) {
|
||||
// Cross-origin navigation (auth page → chatgpt.com) destroys the content
|
||||
// script, causing a transport error. Capture it so we can check if the tab
|
||||
// ended up on chatgpt.com onboarding.
|
||||
if (isRetryableContentScriptTransportError(err)) {
|
||||
step5TransportError = err;
|
||||
console.log(LOG_PREFIX, '步骤 5:内容脚本通信中断,正在检查是否跳转到 ChatGPT 引导页...', err?.message);
|
||||
} else {
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
// Case 1: content script successfully detected chatgpt redirect before dying
|
||||
if (step5Result?.chatgptOnboarding) {
|
||||
await addLog('步骤 5:检测到 ChatGPT 引导页跳转,正在处理引导页跳过...');
|
||||
await handleChatgptOnboardingSkip();
|
||||
return;
|
||||
}
|
||||
|
||||
// Case 2: content script died due to cross-origin navigation — check tab URL
|
||||
if (step5TransportError) {
|
||||
const signupTabId = await getTabId('signup-page');
|
||||
if (signupTabId) {
|
||||
const tab = await chrome.tabs.get(signupTabId).catch(() => null);
|
||||
if (tab && /chatgpt\.com/i.test(tab.url || '')) {
|
||||
await addLog('步骤 5:内容脚本因页面跳转到 ChatGPT 而断开,正在处理引导页跳过...');
|
||||
await handleChatgptOnboardingSkip(signupTabId);
|
||||
return;
|
||||
}
|
||||
}
|
||||
// Not on chatgpt.com — re-throw the original error
|
||||
throw step5TransportError;
|
||||
}
|
||||
}
|
||||
|
||||
async function handleChatgptOnboardingSkip(knownTabId) {
|
||||
const signupTabId = knownTabId || await getTabId('signup-page');
|
||||
if (!signupTabId) {
|
||||
throw new Error('步骤 5:无法找到注册页标签页,无法处理 ChatGPT 引导页。');
|
||||
}
|
||||
|
||||
// Wait for the tab to navigate to chatgpt.com (may already be there)
|
||||
const start = Date.now();
|
||||
const timeout = 15000;
|
||||
let tabUrl = '';
|
||||
while (Date.now() - start < timeout) {
|
||||
throwIfStopped();
|
||||
const tab = await chrome.tabs.get(signupTabId).catch(() => null);
|
||||
if (tab && /chatgpt\.com/i.test(tab.url || '')) {
|
||||
tabUrl = tab.url;
|
||||
break;
|
||||
}
|
||||
await sleepWithStop(500);
|
||||
}
|
||||
|
||||
if (!tabUrl) {
|
||||
throw new Error('步骤 5:等待页面跳转到 ChatGPT 引导页超时。');
|
||||
}
|
||||
|
||||
// Wait for page to finish loading
|
||||
await sleepWithStop(2000);
|
||||
|
||||
// Inject content script on chatgpt.com
|
||||
await ensureContentScriptReadyOnTab('signup-page', signupTabId, {
|
||||
inject: SIGNUP_PAGE_INJECT_FILES,
|
||||
injectSource: 'signup-page',
|
||||
timeoutMs: 15000,
|
||||
logMessage: '步骤 5:正在等待 ChatGPT 引导页内容脚本就绪...',
|
||||
});
|
||||
|
||||
// Send CHATGPT_SKIP_ONBOARDING message
|
||||
const result = await sendToContentScriptResilient('signup-page', {
|
||||
type: 'CHATGPT_SKIP_ONBOARDING',
|
||||
source: 'background',
|
||||
payload: {},
|
||||
}, {
|
||||
timeoutMs: 60000,
|
||||
retryDelayMs: 1000,
|
||||
logMessage: '步骤 5:ChatGPT 引导页正在处理,等待跳过完成...',
|
||||
});
|
||||
|
||||
if (result?.error) {
|
||||
throw new Error(result.error);
|
||||
}
|
||||
|
||||
await addLog('步骤 5:ChatGPT 引导页跳过完成,注册成功。', 'ok');
|
||||
await completeStepFromBackground(5, { chatgptOnboarding: true });
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
|
||||
Reference in New Issue
Block a user