Open-source AI browser agent for Chrome and Firefox (monorepo) ðŸ§
JavaScript ai-agentai-agentsai-toolsbrowser-aibrowser-automationbrowser-extensionchrome-aichrome-devtoolschrome-extensionchrome-extensionsfirefox-addonfirefox-addonsfirefox-extensionfirefox-extensionsgemmagemma4minimaxoffline-aioffline-llmqwen
Match Alibaba verification metadata before fallback
Emre Sokullu2993b3c4d102
diff --git a/src/chrome/src/agent/captcha-native-providers.js b/src/chrome/src/agent/captcha-native-providers.jsindex c1b8f752f..e1f5acc33 100644--- a/src/chrome/src/agent/captcha-native-providers.js+++ b/src/chrome/src/agent/captcha-native-providers.js@@ -164,7 +164,9 @@ const FAMILY_IDENTIFIERS = {['jsapiScript', 'awsApiJs']],alibaba: [['sceneId', 'metadata.sceneId'], ['prefix', 'metadata.prefix'],['userId', 'metadata.userId'], ['userUserId', 'metadata.userUserId'],- ['userCertifyId', 'metadata.UserCertifyId']],+ ['userCertifyId', 'metadata.UserCertifyId'], ['verifyType', 'metadata.verifyType'],+ ['region', 'metadata.region'], ['apiGetLib', 'metadata.apiGetLib'],+ ['metadata.punishUrl'], ['metadata.cookieRequired']],datadome: [['captchaUrl', 'captcha_url', 'metadata.captchaUrl']],hunt: [['apiGetLib', 'metadata.apiGetLib'], ['data', 'metadata.data']],imperva: [['incapsulaScriptUrl', 'metadata.incapsulaScriptUrl'],diff --git a/src/firefox/src/agent/captcha-native-providers.js b/src/firefox/src/agent/captcha-native-providers.jsindex c1b8f752f..e1f5acc33 100644--- a/src/firefox/src/agent/captcha-native-providers.js+++ b/src/firefox/src/agent/captcha-native-providers.js@@ -164,7 +164,9 @@ const FAMILY_IDENTIFIERS = {['jsapiScript', 'awsApiJs']],alibaba: [['sceneId', 'metadata.sceneId'], ['prefix', 'metadata.prefix'],['userId', 'metadata.userId'], ['userUserId', 'metadata.userUserId'],- ['userCertifyId', 'metadata.UserCertifyId']],+ ['userCertifyId', 'metadata.UserCertifyId'], ['verifyType', 'metadata.verifyType'],+ ['region', 'metadata.region'], ['apiGetLib', 'metadata.apiGetLib'],+ ['metadata.punishUrl'], ['metadata.cookieRequired']],datadome: [['captchaUrl', 'captcha_url', 'metadata.captchaUrl']],hunt: [['apiGetLib', 'metadata.apiGetLib'], ['data', 'metadata.data']],imperva: [['incapsulaScriptUrl', 'metadata.incapsulaScriptUrl'],diff --git a/test/captcha-native-providers.mjs b/test/captcha-native-providers.mjsindex 3340dfeb9..14c9c3afe 100644--- a/test/captcha-native-providers.mjs+++ b/test/captcha-native-providers.mjs@@ -395,6 +395,34 @@ for (const browser of ['chrome', 'firefox']) {await assert.rejects(async () => native.solveNativeCaptchaTasks(native.prepareNativeCaptchaTasks(providers, entries)), /same observed challenge/);assert.equal(calls.length, 0);});+ test(`${browser}: Alibaba fallback preserves verification mode, region and script identity`, t => {+ const calls = mockApi(t, () => { throw new Error('Must not dispatch'); });+ const enabled = ['2captcha', 'capmonster'].map(id => ({ id, apiKey: 'key' }));+ const twoCaptcha = { provider: '2captcha', method: 'AlibabaTaskProxyless', parameters: {+ websiteURL: url, sceneId: 'scene', prefix: 'prefix', verifyType: 'slide',+ region: 'cn', apiGetLib: 'https://g.test/lib.js',+ } };+ const capmonster = { provider: 'capmonster', method: 'CustomTask:alibaba', parameters: {+ websiteURL: url, metadata: { sceneId: 'scene', prefix: 'prefix', verifyType: 'slide',+ region: 'cn', apiGetLib: 'https://g.test/lib.js' },+ } };+ assert.equal(native.prepareNativeCaptchaTasks(enabled, [twoCaptcha, capmonster]).length, 2);+ for (const [key, value] of [+ ['verifyType', 'click'], ['region', 'sg'], ['apiGetLib', 'https://other.test/lib.js'],+ ]) assert.throws(() => native.prepareNativeCaptchaTasks(enabled, [twoCaptcha, {+ ...capmonster, parameters: { ...capmonster.parameters,+ metadata: { ...capmonster.parameters.metadata, [key]: value } },+ }]), /same observed challenge/);+ assert.throws(() => native.prepareNativeCaptchaTasks(enabled, [twoCaptcha, {+ ...capmonster, parameters: { ...capmonster.parameters,+ metadata: { sceneId: 'scene', prefix: 'prefix' } },+ }]), /same observed challenge/);+ assert.throws(() => native.prepareNativeCaptchaTasks(enabled, [twoCaptcha, {+ ...capmonster, parameters: { ...capmonster.parameters,+ metadata: { ...capmonster.parameters.metadata, cookieRequired: true } },+ }]), /same observed challenge/);+ assert.equal(calls.length, 0);+ });const actionBoundPairs = [['DataDome User-Agent', ['2captcha', 'DataDomeSliderTask', { websiteURL: url, captchaUrl: 'https://example.test/captcha', userAgent: 'browser-UA', proxyType: 'http', proxyAddress: 'proxy.test', proxyPort: 8080 }], ['solvecaptcha', 'datadome', { pageurl: url, captcha_url: 'https://example.test/captcha', userAgent: 'browser-UA', proxy: 'proxy.test:8080', proxytype: 'http' }], 'userAgent'],['DataDome proxy', ['2captcha', 'DataDomeSliderTask', { websiteURL: url, captchaUrl: 'https://example.test/captcha', userAgent: 'browser-UA', proxyType: 'http', proxyAddress: 'proxy.test', proxyPort: 8080 }], ['solvecaptcha', 'datadome', { pageurl: url, captcha_url: 'https://example.test/captcha', userAgent: 'browser-UA', proxy: 'proxy.test:8080', proxytype: 'http' }], 'proxy'],