@prosopo/provider 5.15.0 → 5.17.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build$colon$cjs.log +52 -34
- package/.turbo/turbo-build$colon$tsc.log +36 -30
- package/.turbo/turbo-build.log +53 -35
- package/CHANGELOG.md +94 -0
- package/dist/api/admin/apiToggleMaintenanceModeEndpoint.d.ts +4 -0
- package/dist/api/admin/apiToggleMaintenanceModeEndpoint.d.ts.map +1 -1
- package/dist/api/admin/apiToggleMaintenanceModeEndpoint.js +63 -3
- package/dist/api/admin/apiToggleMaintenanceModeEndpoint.js.map +1 -1
- package/dist/api/blacklistRequestInspector.js +2 -2
- package/dist/api/captcha/getAudioCaptchaChallenge.d.ts +5 -0
- package/dist/api/captcha/getAudioCaptchaChallenge.d.ts.map +1 -0
- package/dist/api/captcha/getAudioCaptchaChallenge.js +37 -0
- package/dist/api/captcha/getAudioCaptchaChallenge.js.map +1 -0
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/constants.d.ts +1 -0
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/constants.d.ts.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/constants.js +7 -2
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/constants.js.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/decisionMachine.js +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/handler.d.ts.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/handler.js +17 -12
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/handler.js.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/refreshLineage.d.ts +7 -2
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/refreshLineage.d.ts.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/refreshLineage.js +14 -4
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/refreshLineage.js.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/shortCircuit.d.ts.map +1 -1
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/shortCircuit.js +1 -0
- package/dist/api/captcha/getFrictionlessCaptchaChallenge/shortCircuit.js.map +1 -1
- package/dist/api/captcha/getIconOrderCaptchaChallenge.d.ts +5 -0
- package/dist/api/captcha/getIconOrderCaptchaChallenge.d.ts.map +1 -0
- package/dist/api/captcha/getIconOrderCaptchaChallenge.js +37 -0
- package/dist/api/captcha/getIconOrderCaptchaChallenge.js.map +1 -0
- package/dist/api/captcha/getImageCaptchaChallenge.js +2 -2
- package/dist/api/captcha/getPoWCaptchaChallenge.js +4 -4
- package/dist/api/captcha/getPuzzleCaptchaChallenge.d.ts +1 -3
- package/dist/api/captcha/getPuzzleCaptchaChallenge.d.ts.map +1 -1
- package/dist/api/captcha/getPuzzleCaptchaChallenge.js +55 -170
- package/dist/api/captcha/getPuzzleCaptchaChallenge.js.map +1 -1
- package/dist/api/captcha/interactiveCaptchaChallenge.d.ts +42 -0
- package/dist/api/captcha/interactiveCaptchaChallenge.d.ts.map +1 -0
- package/dist/api/captcha/interactiveCaptchaChallenge.js +154 -0
- package/dist/api/captcha/interactiveCaptchaChallenge.js.map +1 -0
- package/dist/api/captcha/interactiveCaptchaSolution.d.ts +14 -0
- package/dist/api/captcha/interactiveCaptchaSolution.d.ts.map +1 -0
- package/dist/api/captcha/interactiveCaptchaSolution.js +77 -0
- package/dist/api/captcha/interactiveCaptchaSolution.js.map +1 -0
- package/dist/api/captcha/maintenanceModeResponses.d.ts +4 -2
- package/dist/api/captcha/maintenanceModeResponses.d.ts.map +1 -1
- package/dist/api/captcha/maintenanceModeResponses.js +28 -1
- package/dist/api/captcha/maintenanceModeResponses.js.map +1 -1
- package/dist/api/captcha/submitAudioCaptchaSolution.d.ts +4 -0
- package/dist/api/captcha/submitAudioCaptchaSolution.d.ts.map +1 -0
- package/dist/api/captcha/submitAudioCaptchaSolution.js +11 -0
- package/dist/api/captcha/submitAudioCaptchaSolution.js.map +1 -0
- package/dist/api/captcha/submitIconOrderCaptchaSolution.d.ts +4 -0
- package/dist/api/captcha/submitIconOrderCaptchaSolution.d.ts.map +1 -0
- package/dist/api/captcha/submitIconOrderCaptchaSolution.js +11 -0
- package/dist/api/captcha/submitIconOrderCaptchaSolution.js.map +1 -0
- package/dist/api/captcha/submitPoWCaptchaSolution.js +2 -2
- package/dist/api/captcha/submitPuzzleCaptchaSolution.d.ts +1 -3
- package/dist/api/captcha/submitPuzzleCaptchaSolution.d.ts.map +1 -1
- package/dist/api/captcha/submitPuzzleCaptchaSolution.js +6 -73
- package/dist/api/captcha/submitPuzzleCaptchaSolution.js.map +1 -1
- package/dist/api/captcha/trafficFilterRequestTime.d.ts +4 -1
- package/dist/api/captcha/trafficFilterRequestTime.d.ts.map +1 -1
- package/dist/api/captcha/trafficFilterRequestTime.js +3 -0
- package/dist/api/captcha/trafficFilterRequestTime.js.map +1 -1
- package/dist/api/captcha.d.ts.map +1 -1
- package/dist/api/captcha.js +8 -0
- package/dist/api/captcha.js.map +1 -1
- package/dist/api/domainMiddleware.js +1 -1
- package/dist/api/ja4Middleware.js +1 -1
- package/dist/api/startProviderApi.js +1 -1
- package/dist/api/verify.d.ts.map +1 -1
- package/dist/api/verify.js +153 -96
- package/dist/api/verify.js.map +1 -1
- package/dist/cjs/api/admin/apiToggleMaintenanceModeEndpoint.cjs +65 -2
- package/dist/cjs/api/blacklistRequestInspector.cjs +2 -2
- package/dist/cjs/api/captcha/getAudioCaptchaChallenge.cjs +37 -0
- package/dist/cjs/api/captcha/getFrictionlessCaptchaChallenge/constants.cjs +6 -0
- package/dist/cjs/api/captcha/getFrictionlessCaptchaChallenge/decisionMachine.cjs +1 -1
- package/dist/cjs/api/captcha/getFrictionlessCaptchaChallenge/handler.cjs +15 -10
- package/dist/cjs/api/captcha/getFrictionlessCaptchaChallenge/refreshLineage.cjs +14 -3
- package/dist/cjs/api/captcha/getFrictionlessCaptchaChallenge/shortCircuit.cjs +1 -0
- package/dist/cjs/api/captcha/getIconOrderCaptchaChallenge.cjs +37 -0
- package/dist/cjs/api/captcha/getImageCaptchaChallenge.cjs +2 -2
- package/dist/cjs/api/captcha/getPoWCaptchaChallenge.cjs +4 -4
- package/dist/cjs/api/captcha/getPuzzleCaptchaChallenge.cjs +54 -169
- package/dist/cjs/api/captcha/interactiveCaptchaChallenge.cjs +154 -0
- package/dist/cjs/api/captcha/interactiveCaptchaSolution.cjs +77 -0
- package/dist/cjs/api/captcha/maintenanceModeResponses.cjs +29 -0
- package/dist/cjs/api/captcha/submitAudioCaptchaSolution.cjs +11 -0
- package/dist/cjs/api/captcha/submitIconOrderCaptchaSolution.cjs +11 -0
- package/dist/cjs/api/captcha/submitPoWCaptchaSolution.cjs +2 -2
- package/dist/cjs/api/captcha/submitPuzzleCaptchaSolution.cjs +6 -73
- package/dist/cjs/api/captcha/trafficFilterRequestTime.cjs +3 -0
- package/dist/cjs/api/captcha.cjs +8 -0
- package/dist/cjs/api/domainMiddleware.cjs +1 -1
- package/dist/cjs/api/ja4Middleware.cjs +1 -1
- package/dist/cjs/api/startProviderApi.cjs +1 -1
- package/dist/cjs/api/verify.cjs +152 -95
- package/dist/cjs/index.cjs +1 -1
- package/dist/cjs/tasks/audio/audioBuffer.cjs +72 -0
- package/dist/cjs/tasks/audio/audioRenderer.cjs +32 -0
- package/dist/cjs/tasks/audioAlternative.cjs +23 -0
- package/dist/cjs/tasks/audioCaptcha/audioTasks.cjs +65 -0
- package/dist/cjs/tasks/audioCaptcha/audioTasksUtils.cjs +19 -0
- package/dist/cjs/tasks/captchaManager.cjs +14 -2
- package/dist/cjs/tasks/captchaTypeSelection.cjs +20 -3
- package/dist/cjs/tasks/client/clientTasks.cjs +2 -2
- package/dist/cjs/tasks/frictionless/frictionlessTasks.cjs +40 -9
- package/dist/cjs/tasks/iconOrder/iconOrderRenderer.cjs +42 -0
- package/dist/cjs/tasks/iconOrderCaptcha/iconOrderTasks.cjs +69 -0
- package/dist/cjs/tasks/imgCaptcha/imgCaptchaTasks.cjs +8 -8
- package/dist/cjs/tasks/interactiveCaptcha/interactiveCaptchaManager.cjs +423 -0
- package/dist/cjs/tasks/powCaptcha/powTasks.cjs +8 -8
- package/dist/cjs/tasks/powCaptcha/powTasksUtils.cjs +1 -1
- package/dist/cjs/tasks/puzzleCaptcha/puzzleTasks.cjs +40 -486
- package/dist/cjs/tasks/spam/checkTrafficFilter.cjs +18 -1
- package/dist/cjs/tasks/tasks.cjs +6 -0
- package/dist/cjs/util.cjs +1 -1
- package/dist/index.js +2 -2
- package/dist/tasks/audio/audioBuffer.d.ts +23 -0
- package/dist/tasks/audio/audioBuffer.d.ts.map +1 -0
- package/dist/tasks/audio/audioBuffer.js +70 -0
- package/dist/tasks/audio/audioBuffer.js.map +1 -0
- package/dist/tasks/audio/audioRenderer.d.ts +11 -0
- package/dist/tasks/audio/audioRenderer.d.ts.map +1 -0
- package/dist/tasks/audio/audioRenderer.js +31 -0
- package/dist/tasks/audio/audioRenderer.js.map +1 -0
- package/dist/tasks/audioAlternative.d.ts +8 -0
- package/dist/tasks/audioAlternative.d.ts.map +1 -0
- package/dist/tasks/audioAlternative.js +20 -0
- package/dist/tasks/audioAlternative.js.map +1 -0
- package/dist/tasks/audioCaptcha/audioTasks.d.ts +19 -0
- package/dist/tasks/audioCaptcha/audioTasks.d.ts.map +1 -0
- package/dist/tasks/audioCaptcha/audioTasks.js +65 -0
- package/dist/tasks/audioCaptcha/audioTasks.js.map +1 -0
- package/dist/tasks/audioCaptcha/audioTasksUtils.d.ts +3 -0
- package/dist/tasks/audioCaptcha/audioTasksUtils.d.ts.map +1 -0
- package/dist/tasks/audioCaptcha/audioTasksUtils.js +18 -0
- package/dist/tasks/audioCaptcha/audioTasksUtils.js.map +1 -0
- package/dist/tasks/captchaManager.d.ts +9 -3
- package/dist/tasks/captchaManager.d.ts.map +1 -1
- package/dist/tasks/captchaManager.js +15 -3
- package/dist/tasks/captchaManager.js.map +1 -1
- package/dist/tasks/captchaTypeSelection.d.ts +2 -1
- package/dist/tasks/captchaTypeSelection.d.ts.map +1 -1
- package/dist/tasks/captchaTypeSelection.js +21 -5
- package/dist/tasks/captchaTypeSelection.js.map +1 -1
- package/dist/tasks/client/clientTasks.js +2 -2
- package/dist/tasks/frictionless/frictionlessTasks.d.ts +5 -0
- package/dist/tasks/frictionless/frictionlessTasks.d.ts.map +1 -1
- package/dist/tasks/frictionless/frictionlessTasks.js +41 -10
- package/dist/tasks/frictionless/frictionlessTasks.js.map +1 -1
- package/dist/tasks/iconOrder/iconOrderRenderer.d.ts +12 -0
- package/dist/tasks/iconOrder/iconOrderRenderer.d.ts.map +1 -0
- package/dist/tasks/iconOrder/iconOrderRenderer.js +40 -0
- package/dist/tasks/iconOrder/iconOrderRenderer.js.map +1 -0
- package/dist/tasks/iconOrderCaptcha/iconOrderTasks.d.ts +22 -0
- package/dist/tasks/iconOrderCaptcha/iconOrderTasks.d.ts.map +1 -0
- package/dist/tasks/iconOrderCaptcha/iconOrderTasks.js +69 -0
- package/dist/tasks/iconOrderCaptcha/iconOrderTasks.js.map +1 -0
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.js +8 -8
- package/dist/tasks/interactiveCaptcha/interactiveCaptchaManager.d.ts +52 -0
- package/dist/tasks/interactiveCaptcha/interactiveCaptchaManager.d.ts.map +1 -0
- package/dist/tasks/interactiveCaptcha/interactiveCaptchaManager.js +423 -0
- package/dist/tasks/interactiveCaptcha/interactiveCaptchaManager.js.map +1 -0
- package/dist/tasks/powCaptcha/powTasks.js +8 -8
- package/dist/tasks/powCaptcha/powTasksUtils.js +1 -1
- package/dist/tasks/puzzleCaptcha/puzzleTasks.d.ts +14 -16
- package/dist/tasks/puzzleCaptcha/puzzleTasks.d.ts.map +1 -1
- package/dist/tasks/puzzleCaptcha/puzzleTasks.js +41 -487
- package/dist/tasks/puzzleCaptcha/puzzleTasks.js.map +1 -1
- package/dist/tasks/spam/checkTrafficFilter.d.ts +4 -1
- package/dist/tasks/spam/checkTrafficFilter.d.ts.map +1 -1
- package/dist/tasks/spam/checkTrafficFilter.js +18 -1
- package/dist/tasks/spam/checkTrafficFilter.js.map +1 -1
- package/dist/tasks/tasks.d.ts +4 -0
- package/dist/tasks/tasks.d.ts.map +1 -1
- package/dist/tasks/tasks.js +6 -0
- package/dist/tasks/tasks.js.map +1 -1
- package/dist/tests/integration/api/admin/apiRegisterSiteKeyEndpoint.integration.test.js +7 -3
- package/dist/tests/integration/api/admin/apiRegisterSiteKeyEndpoint.integration.test.js.map +1 -1
- package/dist/tests/integration/clientSettingsPersistence.integration.test.js +45 -3
- package/dist/tests/integration/clientSettingsPersistence.integration.test.js.map +1 -1
- package/dist/tests/unit/api/admin/apiRegisterSiteKeyEndpoint.unit.test.js +4 -2
- package/dist/tests/unit/api/admin/apiRegisterSiteKeyEndpoint.unit.test.js.map +1 -1
- package/dist/tests/unit/api/admin/apiToggleMaintenanceModeEndpoint.unit.test.js +76 -1
- package/dist/tests/unit/api/admin/apiToggleMaintenanceModeEndpoint.unit.test.js.map +1 -1
- package/dist/tests/unit/api/captcha/getFrictionlessCaptchaChallenge/constants.unit.test.js +27 -8
- package/dist/tests/unit/api/captcha/getFrictionlessCaptchaChallenge/constants.unit.test.js.map +1 -1
- package/dist/tests/unit/api/captcha/getFrictionlessCaptchaChallenge/refreshLineage.unit.test.js +29 -3
- package/dist/tests/unit/api/captcha/getFrictionlessCaptchaChallenge/refreshLineage.unit.test.js.map +1 -1
- package/dist/tests/unit/api/captcha/maintenanceModeShortCircuit.unit.test.js +20 -0
- package/dist/tests/unit/api/captcha/maintenanceModeShortCircuit.unit.test.js.map +1 -1
- package/dist/tests/unit/api/getFrictionlessCaptchaChallenge.unit.test.js +81 -2
- package/dist/tests/unit/api/getFrictionlessCaptchaChallenge.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/audio/audioBuffer.unit.test.d.ts +2 -0
- package/dist/tests/unit/tasks/audio/audioBuffer.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/tasks/audio/audioBuffer.unit.test.js +105 -0
- package/dist/tests/unit/tasks/audio/audioBuffer.unit.test.js.map +1 -0
- package/dist/tests/unit/tasks/audioAlternative.unit.test.d.ts +2 -0
- package/dist/tests/unit/tasks/audioAlternative.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/tasks/audioAlternative.unit.test.js +76 -0
- package/dist/tests/unit/tasks/audioAlternative.unit.test.js.map +1 -0
- package/dist/tests/unit/tasks/audioCaptcha/audioTasks.unit.test.d.ts +2 -0
- package/dist/tests/unit/tasks/audioCaptcha/audioTasks.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/tasks/audioCaptcha/audioTasks.unit.test.js +259 -0
- package/dist/tests/unit/tasks/audioCaptcha/audioTasks.unit.test.js.map +1 -0
- package/dist/tests/unit/tasks/audioCaptcha/audioTasksUtils.unit.test.d.ts +2 -0
- package/dist/tests/unit/tasks/audioCaptcha/audioTasksUtils.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/tasks/audioCaptcha/audioTasksUtils.unit.test.js +52 -0
- package/dist/tests/unit/tasks/audioCaptcha/audioTasksUtils.unit.test.js.map +1 -0
- package/dist/tests/unit/tasks/captchaManager.unit.test.js +120 -2
- package/dist/tests/unit/tasks/captchaManager.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/captchaTypeSelection.unit.test.js +65 -6
- package/dist/tests/unit/tasks/captchaTypeSelection.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/frictionless/allowedCaptchaTypes.unit.test.js +29 -0
- package/dist/tests/unit/tasks/frictionless/allowedCaptchaTypes.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/frictionless/frictionlessTasks.unit.test.js +31 -0
- package/dist/tests/unit/tasks/frictionless/frictionlessTasks.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/frictionless/refreshSwitch.unit.test.js +27 -2
- package/dist/tests/unit/tasks/frictionless/refreshSwitch.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/frictionless/routerPuzzleOverrides.unit.test.js +28 -0
- package/dist/tests/unit/tasks/frictionless/routerPuzzleOverrides.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/iconOrder/iconOrderRenderer.unit.test.d.ts +2 -0
- package/dist/tests/unit/tasks/iconOrder/iconOrderRenderer.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/tasks/iconOrder/iconOrderRenderer.unit.test.js +60 -0
- package/dist/tests/unit/tasks/iconOrder/iconOrderRenderer.unit.test.js.map +1 -0
- package/dist/tests/unit/tasks/iconOrderCaptcha/iconOrderTasks.unit.test.d.ts +2 -0
- package/dist/tests/unit/tasks/iconOrderCaptcha/iconOrderTasks.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/tasks/iconOrderCaptcha/iconOrderTasks.unit.test.js +225 -0
- package/dist/tests/unit/tasks/iconOrderCaptcha/iconOrderTasks.unit.test.js.map +1 -0
- package/dist/util.js +1 -1
- package/package.json +19 -17
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { type AudioRenderSettings, type RenderedAudioChallenge } from "@prosopo/audio-assets";
|
|
2
|
+
export interface AudioChallengeBuffer {
|
|
3
|
+
take(settings: AudioRenderSettings): RenderedAudioChallenge;
|
|
4
|
+
depth(): number;
|
|
5
|
+
starvations(): number;
|
|
6
|
+
stop(): void;
|
|
7
|
+
}
|
|
8
|
+
export interface AudioBufferOptions {
|
|
9
|
+
capacity?: number;
|
|
10
|
+
refillIntervalMs?: number;
|
|
11
|
+
refillBatch?: number;
|
|
12
|
+
maxVariants?: number;
|
|
13
|
+
primeSettings?: AudioRenderSettings;
|
|
14
|
+
}
|
|
15
|
+
export declare const DEFAULT_CAPACITY = 8;
|
|
16
|
+
export declare const DEFAULT_REFILL_INTERVAL_MS = 500;
|
|
17
|
+
export declare const DEFAULT_REFILL_BATCH = 2;
|
|
18
|
+
export declare const DEFAULT_MAX_VARIANTS = 8;
|
|
19
|
+
export declare const createAudioChallengeBuffer: (options?: AudioBufferOptions) => AudioChallengeBuffer;
|
|
20
|
+
export declare const initAudioChallengeBuffer: (options?: AudioBufferOptions) => AudioChallengeBuffer;
|
|
21
|
+
export declare const getAudioChallengeBuffer: () => AudioChallengeBuffer | null;
|
|
22
|
+
export declare const resetAudioChallengeBuffer: () => void;
|
|
23
|
+
//# sourceMappingURL=audioBuffer.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"audioBuffer.d.ts","sourceRoot":"","sources":["../../../src/tasks/audio/audioBuffer.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,KAAK,mBAAmB,EAExB,KAAK,sBAAsB,EAE3B,MAAM,uBAAuB,CAAC;AAa/B,MAAM,WAAW,oBAAoB;IAEpC,IAAI,CAAC,QAAQ,EAAE,mBAAmB,GAAG,sBAAsB,CAAC;IAE5D,KAAK,IAAI,MAAM,CAAC;IAEhB,WAAW,IAAI,MAAM,CAAC;IAEtB,IAAI,IAAI,IAAI,CAAC;CACb;AAED,MAAM,WAAW,kBAAkB;IAElC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,aAAa,CAAC,EAAE,mBAAmB,CAAC;CACpC;AAED,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAClC,eAAO,MAAM,0BAA0B,MAAM,CAAC;AAC9C,eAAO,MAAM,oBAAoB,IAAI,CAAC;AACtC,eAAO,MAAM,oBAAoB,IAAI,CAAC;AAatC,eAAO,MAAM,0BAA0B,aAC7B,kBAAkB,KACzB,oBAiEF,CAAC;AAIF,eAAO,MAAM,wBAAwB,aAC3B,kBAAkB,KACzB,oBAIF,CAAC;AAEF,eAAO,MAAM,uBAAuB,QAAO,oBAAoB,GAAG,IACrD,CAAC;AAGd,eAAO,MAAM,yBAAyB,QAAO,IAG5C,CAAC"}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import { DEFAULT_RENDER_SETTINGS, renderAudioChallenge } from "@prosopo/audio-assets";
|
|
2
|
+
var settingsKey = (settings) => [
|
|
3
|
+
settings.digitCount,
|
|
4
|
+
settings.noiseSnrDb,
|
|
5
|
+
settings.babbleGain,
|
|
6
|
+
settings.babbleVoices,
|
|
7
|
+
settings.reverbMix,
|
|
8
|
+
settings.gapMs
|
|
9
|
+
].join(":");
|
|
10
|
+
var createAudioChallengeBuffer = (options = {}) => {
|
|
11
|
+
const capacity = options.capacity ?? 8;
|
|
12
|
+
const refillIntervalMs = options.refillIntervalMs ?? 500;
|
|
13
|
+
const refillBatch = options.refillBatch ?? 2;
|
|
14
|
+
const maxVariants = options.maxVariants ?? 8;
|
|
15
|
+
const variants = /* @__PURE__ */ new Map();
|
|
16
|
+
let starved = 0;
|
|
17
|
+
const touch = (key, settings) => {
|
|
18
|
+
const existing = variants.get(key);
|
|
19
|
+
if (existing) {
|
|
20
|
+
variants.delete(key);
|
|
21
|
+
variants.set(key, existing);
|
|
22
|
+
return existing;
|
|
23
|
+
}
|
|
24
|
+
const created = {
|
|
25
|
+
settings,
|
|
26
|
+
ready: []
|
|
27
|
+
};
|
|
28
|
+
variants.set(key, created);
|
|
29
|
+
while (variants.size > maxVariants) {
|
|
30
|
+
const oldest = variants.keys().next().value;
|
|
31
|
+
if (oldest === void 0) break;
|
|
32
|
+
variants.delete(oldest);
|
|
33
|
+
}
|
|
34
|
+
return created;
|
|
35
|
+
};
|
|
36
|
+
const topUp = (limit) => {
|
|
37
|
+
for (const variant of variants.values()) for (let i = 0; i < limit && variant.ready.length < capacity; i++) variant.ready.push(renderAudioChallenge(variant.settings));
|
|
38
|
+
};
|
|
39
|
+
const prime = options.primeSettings ?? DEFAULT_RENDER_SETTINGS;
|
|
40
|
+
touch(settingsKey(prime), prime);
|
|
41
|
+
topUp(capacity);
|
|
42
|
+
const timer = setInterval(() => topUp(refillBatch), refillIntervalMs);
|
|
43
|
+
timer.unref?.();
|
|
44
|
+
return {
|
|
45
|
+
take(settings) {
|
|
46
|
+
const challenge = touch(settingsKey(settings), settings).ready.pop();
|
|
47
|
+
if (!challenge) {
|
|
48
|
+
starved++;
|
|
49
|
+
return renderAudioChallenge(settings);
|
|
50
|
+
}
|
|
51
|
+
return challenge;
|
|
52
|
+
},
|
|
53
|
+
depth: () => {
|
|
54
|
+
let total = 0;
|
|
55
|
+
for (const variant of variants.values()) total += variant.ready.length;
|
|
56
|
+
return total;
|
|
57
|
+
},
|
|
58
|
+
starvations: () => starved,
|
|
59
|
+
stop: () => clearInterval(timer)
|
|
60
|
+
};
|
|
61
|
+
};
|
|
62
|
+
var globalBuffer = null;
|
|
63
|
+
var initAudioChallengeBuffer = (options = {}) => {
|
|
64
|
+
globalBuffer?.stop();
|
|
65
|
+
globalBuffer = createAudioChallengeBuffer(options);
|
|
66
|
+
return globalBuffer;
|
|
67
|
+
};
|
|
68
|
+
var getAudioChallengeBuffer = () => globalBuffer;
|
|
69
|
+
//#endregion
|
|
70
|
+
export { createAudioChallengeBuffer, getAudioChallengeBuffer, initAudioChallengeBuffer };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"audioBuffer.js","sourceRoot":"","sources":["../../../src/tasks/audio/audioBuffer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { type AudioRenderSettings } from "@prosopo/audio-assets";
|
|
2
|
+
import type { IAudioSettings } from "@prosopo/types";
|
|
3
|
+
export interface RenderedAudioClip {
|
|
4
|
+
clip: string;
|
|
5
|
+
characterCount: number;
|
|
6
|
+
answer: string;
|
|
7
|
+
durationMs: number;
|
|
8
|
+
}
|
|
9
|
+
export declare const resolveAudioRenderSettings: (...overrides: (IAudioSettings | undefined)[]) => AudioRenderSettings;
|
|
10
|
+
export declare const renderAudioClip: (settings: AudioRenderSettings) => RenderedAudioClip;
|
|
11
|
+
//# sourceMappingURL=audioRenderer.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"audioRenderer.d.ts","sourceRoot":"","sources":["../../../src/tasks/audio/audioRenderer.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,KAAK,mBAAmB,EAIxB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAMrD,MAAM,WAAW,iBAAiB;IAEjC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IAEvB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACnB;AAGD,eAAO,MAAM,0BAA0B,iBACxB,CAAC,cAAc,GAAG,SAAS,CAAC,EAAE,KAC1C,mBAaF,CAAC;AAMF,eAAO,MAAM,eAAe,aACjB,mBAAmB,KAC3B,iBAUF,CAAC"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { getAudioChallengeBuffer, initAudioChallengeBuffer } from "./audioBuffer.js";
|
|
2
|
+
import { DEFAULT_RENDER_SETTINGS, toDataUri } from "@prosopo/audio-assets";
|
|
3
|
+
//#region src/tasks/audio/audioRenderer.ts
|
|
4
|
+
/** Layers partial overrides onto the asset defaults; later sources win. */
|
|
5
|
+
var resolveAudioRenderSettings = (...overrides) => {
|
|
6
|
+
let resolved = { ...DEFAULT_RENDER_SETTINGS };
|
|
7
|
+
for (const override of overrides) resolved = {
|
|
8
|
+
digitCount: override?.digitCount ?? resolved.digitCount,
|
|
9
|
+
noiseSnrDb: override?.noiseSnrDb ?? resolved.noiseSnrDb,
|
|
10
|
+
babbleGain: override?.babbleGain ?? resolved.babbleGain,
|
|
11
|
+
babbleVoices: override?.babbleVoices ?? resolved.babbleVoices,
|
|
12
|
+
reverbMix: override?.reverbMix ?? resolved.reverbMix,
|
|
13
|
+
gapMs: override?.gapMs ?? resolved.gapMs
|
|
14
|
+
};
|
|
15
|
+
return resolved;
|
|
16
|
+
};
|
|
17
|
+
/**
|
|
18
|
+
* Takes one challenge from the process-wide buffer, created on first use so a
|
|
19
|
+
* provider that never serves audio pays nothing for it.
|
|
20
|
+
*/
|
|
21
|
+
var renderAudioClip = (settings) => {
|
|
22
|
+
const challenge = (getAudioChallengeBuffer() ?? initAudioChallengeBuffer()).take(settings);
|
|
23
|
+
return {
|
|
24
|
+
clip: toDataUri(challenge.wav),
|
|
25
|
+
characterCount: challenge.answer.length,
|
|
26
|
+
answer: challenge.answer,
|
|
27
|
+
durationMs: challenge.durationMs
|
|
28
|
+
};
|
|
29
|
+
};
|
|
30
|
+
//#endregion
|
|
31
|
+
export { renderAudioClip, resolveAudioRenderSettings };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"audioRenderer.js","sourceRoot":"","sources":["../../../src/tasks/audio/audioRenderer.ts"],"names":[],"mappings":"AAcA,OAAO,EAEN,uBAAuB,EAEvB,SAAS,GACT,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACN,uBAAuB,EACvB,wBAAwB,GACxB,MAAM,kBAAkB,CAAC;AAY1B,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACzC,GAAG,SAAyC,EACtB,EAAE;IACxB,IAAI,QAAQ,GAAwB,EAAE,GAAG,uBAAuB,EAAE,CAAC;IACnE,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QAClC,QAAQ,GAAG;YACV,UAAU,EAAE,QAAQ,EAAE,UAAU,IAAI,QAAQ,CAAC,UAAU;YACvD,UAAU,EAAE,QAAQ,EAAE,UAAU,IAAI,QAAQ,CAAC,UAAU;YACvD,UAAU,EAAE,QAAQ,EAAE,UAAU,IAAI,QAAQ,CAAC,UAAU;YACvD,YAAY,EAAE,QAAQ,EAAE,YAAY,IAAI,QAAQ,CAAC,YAAY;YAC7D,SAAS,EAAE,QAAQ,EAAE,SAAS,IAAI,QAAQ,CAAC,SAAS;YACpD,KAAK,EAAE,QAAQ,EAAE,KAAK,IAAI,QAAQ,CAAC,KAAK;SACxC,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AACjB,CAAC,CAAC;AAMF,MAAM,CAAC,MAAM,eAAe,GAAG,CAC9B,QAA6B,EACT,EAAE;IACtB,MAAM,MAAM,GAAG,uBAAuB,EAAE,IAAI,wBAAwB,EAAE,CAAC;IACvE,MAAM,SAAS,GAA2B,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEhE,OAAO;QACN,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC;QAC9B,cAAc,EAAE,SAAS,CAAC,MAAM,CAAC,MAAM;QACvC,MAAM,EAAE,SAAS,CAAC,MAAM;QACxB,UAAU,EAAE,SAAS,CAAC,UAAU;KAChC,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { CaptchaType, type IUserSettings } from "@prosopo/types";
|
|
2
|
+
export declare const isAudioAlternativeSessionType: (captchaType: string | undefined) => boolean;
|
|
3
|
+
type AudioAlternativeSettings = Pick<IUserSettings, "audioAccessibilityEnabled" | "captchaTypeFeatureFlags">;
|
|
4
|
+
export declare const isAudioAlternativeEnabled: (settings: AudioAlternativeSettings | undefined) => boolean;
|
|
5
|
+
export declare const offersAudioAlternative: (captchaType: string | undefined, audioAlternativeEnabled: boolean) => boolean;
|
|
6
|
+
export declare const isAudioAlternativeAllowed: (requestedCaptchaType: CaptchaType, sessionCaptchaType: CaptchaType, settings: AudioAlternativeSettings | undefined) => boolean;
|
|
7
|
+
export {};
|
|
8
|
+
//# sourceMappingURL=audioAlternative.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"audioAlternative.d.ts","sourceRoot":"","sources":["../../src/tasks/audioAlternative.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,WAAW,EACX,KAAK,aAAa,EAElB,MAAM,gBAAgB,CAAC;AAaxB,eAAO,MAAM,6BAA6B,gBAC5B,MAAM,GAAG,SAAS,KAC7B,OAC2E,CAAC;AAE/E,KAAK,wBAAwB,GAAG,IAAI,CACnC,aAAa,EACb,2BAA2B,GAAG,yBAAyB,CACvD,CAAC;AAMF,eAAO,MAAM,yBAAyB,aAC3B,wBAAwB,GAAG,SAAS,KAC5C,OAKD,CAAC;AAGH,eAAO,MAAM,sBAAsB,gBACrB,MAAM,GAAG,SAAS,2BACN,OAAO,KAC9B,OACmE,CAAC;AAGvE,eAAO,MAAM,yBAAyB,yBACf,WAAW,sBACb,WAAW,YACrB,wBAAwB,GAAG,SAAS,KAC5C,OAKD,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { CaptchaType, isCaptchaTypeFeatureEnabled } from "@prosopo/types";
|
|
2
|
+
//#region src/tasks/audioAlternative.ts
|
|
3
|
+
var AUDIO_ALTERNATIVE_SESSION_TYPES = /* @__PURE__ */ new Set([
|
|
4
|
+
CaptchaType.image,
|
|
5
|
+
CaptchaType.puzzle,
|
|
6
|
+
CaptchaType.iconOrder
|
|
7
|
+
]);
|
|
8
|
+
/** Whether a session of this type is a visual challenge that can offer audio. */
|
|
9
|
+
var isAudioAlternativeSessionType = (captchaType) => captchaType !== void 0 && AUDIO_ALTERNATIVE_SESSION_TYPES.has(captchaType);
|
|
10
|
+
/**
|
|
11
|
+
* The site owner has to turn the alternative on, and Prosopo has to have
|
|
12
|
+
* switched on the audio feature flag for the site.
|
|
13
|
+
*/
|
|
14
|
+
var isAudioAlternativeEnabled = (settings) => settings?.audioAccessibilityEnabled === true && isCaptchaTypeFeatureEnabled(CaptchaType.audio, settings.captchaTypeFeatureFlags);
|
|
15
|
+
/** Whether a challenge of this type shows "use audio instead". */
|
|
16
|
+
var offersAudioAlternative = (captchaType, audioAlternativeEnabled) => audioAlternativeEnabled && isAudioAlternativeSessionType(captchaType);
|
|
17
|
+
/** Whether an audio challenge may be issued against a session of another type. */
|
|
18
|
+
var isAudioAlternativeAllowed = (requestedCaptchaType, sessionCaptchaType, settings) => requestedCaptchaType === CaptchaType.audio && offersAudioAlternative(sessionCaptchaType, isAudioAlternativeEnabled(settings));
|
|
19
|
+
//#endregion
|
|
20
|
+
export { isAudioAlternativeAllowed, isAudioAlternativeEnabled, isAudioAlternativeSessionType, offersAudioAlternative };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"audioAlternative.js","sourceRoot":"","sources":["../../src/tasks/audioAlternative.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,WAAW,EAEX,2BAA2B,GAC3B,MAAM,gBAAgB,CAAC;AAMxB,MAAM,+BAA+B,GAAwB,IAAI,GAAG,CAAS;IAC5E,WAAW,CAAC,KAAK;IACjB,WAAW,CAAC,MAAM;IAClB,WAAW,CAAC,SAAS;CACrB,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAC5C,WAA+B,EACrB,EAAE,CACZ,WAAW,KAAK,SAAS,IAAI,+BAA+B,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AAW/E,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACxC,QAA8C,EACpC,EAAE,CACZ,QAAQ,EAAE,yBAAyB,KAAK,IAAI;IAC5C,2BAA2B,CAC1B,WAAW,CAAC,KAAK,EACjB,QAAQ,CAAC,uBAAuB,CAChC,CAAC;AAGH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACrC,WAA+B,EAC/B,uBAAgC,EACtB,EAAE,CACZ,uBAAuB,IAAI,6BAA6B,CAAC,WAAW,CAAC,CAAC;AAGvE,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACxC,oBAAiC,EACjC,kBAA+B,EAC/B,QAA8C,EACpC,EAAE,CACZ,oBAAoB,KAAK,WAAW,CAAC,KAAK;IAC1C,sBAAsB,CACrB,kBAAkB,EAClB,yBAAyB,CAAC,QAAQ,CAAC,CACnC,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { AudioRenderSettings } from "@prosopo/audio-assets";
|
|
2
|
+
import { type AudioEvent, type CaptchaResult, CaptchaType, type ClientMetaData, type DecisionMachineInput, type IPAddress, type PoWChallengeId } from "@prosopo/types";
|
|
3
|
+
import type { AudioCaptchaRecord } from "@prosopo/types-database";
|
|
4
|
+
import { type RenderedAudioClip } from "../audio/audioRenderer.js";
|
|
5
|
+
import { InteractiveCaptchaManager, type InteractiveCaptchaRecordUpdate, type MintedChallenge } from "../interactiveCaptcha/interactiveCaptchaManager.js";
|
|
6
|
+
export type AudioCaptchaChallenge = MintedChallenge & RenderedAudioClip;
|
|
7
|
+
export declare class AudioCaptchaManager extends InteractiveCaptchaManager<AudioCaptchaRecord> {
|
|
8
|
+
protected readonly captchaType = CaptchaType.audio;
|
|
9
|
+
protected readonly logLabel = "audio";
|
|
10
|
+
protected getRecordByChallenge(challenge: string): Promise<AudioCaptchaRecord | null>;
|
|
11
|
+
protected updateRecord(challenge: PoWChallengeId, updates: InteractiveCaptchaRecordUpdate): Promise<void>;
|
|
12
|
+
protected updateSubmissionResult(challenge: PoWChallengeId, result: CaptchaResult, userSignature: string, coords: [number, number][][] | undefined): Promise<void>;
|
|
13
|
+
protected claimSubmission(record: AudioCaptchaRecord): Promise<boolean>;
|
|
14
|
+
protected markRecordChecked(challenge: PoWChallengeId): Promise<boolean>;
|
|
15
|
+
protected decisionMachineEventFields(record: AudioCaptchaRecord): Partial<DecisionMachineInput>;
|
|
16
|
+
getAudioCaptchaChallenge(userAccount: string, dappAccount: string, settings: AudioRenderSettings): AudioCaptchaChallenge;
|
|
17
|
+
verifyAudioCaptchaSolution(challenge: PoWChallengeId, providerChallengeSignature: string, submittedAnswer: string, replays: number, audioEvents: AudioEvent[], timeout: number, userTimestampSignature: string, ipAddress: IPAddress, behavioralData?: string, salt?: string, simdReadings?: string, clientMetaData?: ClientMetaData): Promise<boolean>;
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=audioTasks.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"audioTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/audioCaptcha/audioTasks.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EACN,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,WAAW,EACX,KAAK,cAAc,EACnB,KAAK,oBAAoB,EACzB,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EACN,KAAK,iBAAiB,EAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACN,yBAAyB,EACzB,KAAK,8BAA8B,EACnC,KAAK,eAAe,EACpB,MAAM,oDAAoD,CAAC;AAM5D,MAAM,MAAM,qBAAqB,GAAG,eAAe,GAAG,iBAAiB,CAAC;AAExE,qBAAa,mBAAoB,SAAQ,yBAAyB,CAAC,kBAAkB,CAAC;IACrF,SAAS,CAAC,QAAQ,CAAC,WAAW,qBAAqB;IACnD,SAAS,CAAC,QAAQ,CAAC,QAAQ,WAAW;IAEtC,SAAS,CAAC,oBAAoB,CAC7B,SAAS,EAAE,MAAM,GACf,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAIrC,SAAS,CAAC,YAAY,CACrB,SAAS,EAAE,cAAc,EACzB,OAAO,EAAE,8BAA8B,GACrC,OAAO,CAAC,IAAI,CAAC;IAIhB,SAAS,CAAC,sBAAsB,CAC/B,SAAS,EAAE,cAAc,EACzB,MAAM,EAAE,aAAa,EACrB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,SAAS,GACtC,OAAO,CAAC,IAAI,CAAC;IAYhB,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IAIvE,SAAS,CAAC,iBAAiB,CAAC,SAAS,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAIxE,SAAS,CAAC,0BAA0B,CACnC,MAAM,EAAE,kBAAkB,GACxB,OAAO,CAAC,oBAAoB,CAAC;IAQhC,wBAAwB,CACvB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,mBAAmB,GAC3B,qBAAqB;IAOlB,0BAA0B,CAC/B,SAAS,EAAE,cAAc,EACzB,0BAA0B,EAAE,MAAM,EAClC,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,UAAU,EAAE,EACzB,OAAO,EAAE,MAAM,EACf,sBAAsB,EAAE,MAAM,EAC9B,SAAS,EAAE,SAAS,EACpB,cAAc,CAAC,EAAE,MAAM,EACvB,IAAI,CAAC,EAAE,MAAM,EACb,YAAY,CAAC,EAAE,MAAM,EACrB,cAAc,CAAC,EAAE,cAAc,GAC7B,OAAO,CAAC,OAAO,CAAC;CAuBnB"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { renderAudioClip } from "../audio/audioRenderer.js";
|
|
2
|
+
import { InteractiveCaptchaManager } from "../interactiveCaptcha/interactiveCaptchaManager.js";
|
|
3
|
+
import { normaliseAudioAnswer, validateAudioSolution } from "./audioTasksUtils.js";
|
|
4
|
+
import { CaptchaType } from "@prosopo/types";
|
|
5
|
+
//#region src/tasks/audioCaptcha/audioTasks.ts
|
|
6
|
+
var AudioCaptchaManager = class extends InteractiveCaptchaManager {
|
|
7
|
+
constructor(..._args) {
|
|
8
|
+
super(..._args);
|
|
9
|
+
this.captchaType = CaptchaType.audio;
|
|
10
|
+
this.logLabel = "audio";
|
|
11
|
+
}
|
|
12
|
+
getRecordByChallenge(challenge) {
|
|
13
|
+
return this.db.getAudioCaptchaRecordByChallenge(challenge);
|
|
14
|
+
}
|
|
15
|
+
updateRecord(challenge, updates) {
|
|
16
|
+
return this.db.updateAudioCaptchaRecord(challenge, updates);
|
|
17
|
+
}
|
|
18
|
+
updateSubmissionResult(challenge, result, userSignature, coords) {
|
|
19
|
+
return this.db.updateAudioCaptchaRecordResult(challenge, result, false, true, userSignature, coords);
|
|
20
|
+
}
|
|
21
|
+
/** Atomic, so concurrent submissions cannot each be graded. */
|
|
22
|
+
claimSubmission(record) {
|
|
23
|
+
return this.db.claimAudioCaptchaSubmission(record.challenge);
|
|
24
|
+
}
|
|
25
|
+
markRecordChecked(challenge) {
|
|
26
|
+
return this.db.markAudioCaptchaRecordChecked(challenge);
|
|
27
|
+
}
|
|
28
|
+
decisionMachineEventFields(record) {
|
|
29
|
+
return {
|
|
30
|
+
audioEvents: record.audioEvents,
|
|
31
|
+
audioReplays: record.replays
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* The renderer picks the digits, so the answer only exists once the clip
|
|
36
|
+
* does; the caller must store `answer` before responding.
|
|
37
|
+
*/
|
|
38
|
+
getAudioCaptchaChallenge(userAccount, dappAccount, settings) {
|
|
39
|
+
return {
|
|
40
|
+
...this.mintChallenge(userAccount, dappAccount),
|
|
41
|
+
...renderAudioClip(settings)
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
async verifyAudioCaptchaSolution(challenge, providerChallengeSignature, submittedAnswer, replays, audioEvents, timeout, userTimestampSignature, ipAddress, behavioralData, salt, simdReadings, clientMetaData) {
|
|
45
|
+
return this.submitInteractiveCaptchaSolution({
|
|
46
|
+
challenge,
|
|
47
|
+
providerChallengeSignature,
|
|
48
|
+
timeout,
|
|
49
|
+
userTimestampSignature,
|
|
50
|
+
ipAddress,
|
|
51
|
+
behavioralData,
|
|
52
|
+
salt,
|
|
53
|
+
simdReadings,
|
|
54
|
+
clientMetaData,
|
|
55
|
+
isCorrect: (record) => validateAudioSolution(submittedAnswer, record.answer),
|
|
56
|
+
persistInteraction: () => this.db.updateAudioCaptchaRecord(challenge, {
|
|
57
|
+
audioEvents,
|
|
58
|
+
replays,
|
|
59
|
+
submittedAnswer: normaliseAudioAnswer(submittedAnswer)
|
|
60
|
+
})
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
};
|
|
64
|
+
//#endregion
|
|
65
|
+
export { AudioCaptchaManager };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"audioTasks.js","sourceRoot":"","sources":["../../../src/tasks/audioCaptcha/audioTasks.ts"],"names":[],"mappings":"AAeA,OAAO,EAGN,WAAW,GAKX,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAEN,eAAe,GACf,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACN,yBAAyB,GAGzB,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EACN,oBAAoB,EACpB,qBAAqB,GACrB,MAAM,sBAAsB,CAAC;AAI9B,MAAM,OAAO,mBAAoB,SAAQ,yBAA6C;IAAtF;;QACoB,gBAAW,GAAG,WAAW,CAAC,KAAK,CAAC;QAChC,aAAQ,GAAG,OAAO,CAAC;IAiGvC,CAAC;IA/FU,oBAAoB,CAC7B,SAAiB;QAEjB,OAAO,IAAI,CAAC,EAAE,CAAC,gCAAgC,CAAC,SAAS,CAAC,CAAC;IAC5D,CAAC;IAES,YAAY,CACrB,SAAyB,EACzB,OAAuC;QAEvC,OAAO,IAAI,CAAC,EAAE,CAAC,wBAAwB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;IAES,sBAAsB,CAC/B,SAAyB,EACzB,MAAqB,EACrB,aAAqB,EACrB,MAAwC;QAExC,OAAO,IAAI,CAAC,EAAE,CAAC,8BAA8B,CAC5C,SAAS,EACT,MAAM,EACN,KAAK,EACL,IAAI,EACJ,aAAa,EACb,MAAM,CACN,CAAC;IACH,CAAC;IAGS,eAAe,CAAC,MAA0B;QACnD,OAAO,IAAI,CAAC,EAAE,CAAC,2BAA2B,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC9D,CAAC;IAES,iBAAiB,CAAC,SAAyB;QACpD,OAAO,IAAI,CAAC,EAAE,CAAC,6BAA6B,CAAC,SAAS,CAAC,CAAC;IACzD,CAAC;IAES,0BAA0B,CACnC,MAA0B;QAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,YAAY,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;IAC1E,CAAC;IAMD,wBAAwB,CACvB,WAAmB,EACnB,WAAmB,EACnB,QAA6B;QAE7B,OAAO;YACN,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,WAAW,CAAC;YAC/C,GAAG,eAAe,CAAC,QAAQ,CAAC;SAC5B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,0BAA0B,CAC/B,SAAyB,EACzB,0BAAkC,EAClC,eAAuB,EACvB,OAAe,EACf,WAAyB,EACzB,OAAe,EACf,sBAA8B,EAC9B,SAAoB,EACpB,cAAuB,EACvB,IAAa,EACb,YAAqB,EACrB,cAA+B;QAE/B,OAAO,IAAI,CAAC,gCAAgC,CAAC;YAC5C,SAAS;YACT,0BAA0B;YAC1B,OAAO;YACP,sBAAsB;YACtB,SAAS;YACT,cAAc;YACd,IAAI;YACJ,YAAY;YACZ,cAAc;YACd,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CACrB,qBAAqB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC;YAGtD,kBAAkB,EAAE,GAAG,EAAE,CACxB,IAAI,CAAC,EAAE,CAAC,wBAAwB,CAAC,SAAS,EAAE;gBAC3C,WAAW;gBACX,OAAO;gBACP,eAAe,EAAE,oBAAoB,CAAC,eAAe,CAAC;aACtD,CAAC;SACH,CAAC,CAAC;IACJ,CAAC;CACD"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"audioTasksUtils.d.ts","sourceRoot":"","sources":["../../../src/tasks/audioCaptcha/audioTasksUtils.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,oBAAoB,QAAS,MAAM,KAAG,MAC5B,CAAC;AAOxB,eAAO,MAAM,qBAAqB,cACtB,MAAM,YACP,MAAM,KACd,OAKF,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
//#region src/tasks/audioCaptcha/audioTasksUtils.ts
|
|
2
|
+
/**
|
|
3
|
+
* Keeps only the digits, in order: "1 2 3", "1-2-3" and screen-reader inserted
|
|
4
|
+
* separators all grade the same, and no different digit sequence can pass.
|
|
5
|
+
*/
|
|
6
|
+
var normaliseAudioAnswer = (raw) => raw.replace(/\D/g, "");
|
|
7
|
+
/**
|
|
8
|
+
* Exact match after normalisation. No edit-distance slack: one substitution
|
|
9
|
+
* widens the accepted set far more than it helps a listener, and a wrong
|
|
10
|
+
* answer only costs a fresh challenge.
|
|
11
|
+
*/
|
|
12
|
+
var validateAudioSolution = (submitted, expected) => {
|
|
13
|
+
const normalised = normaliseAudioAnswer(submitted);
|
|
14
|
+
if (normalised.length === 0 || expected.length === 0) return false;
|
|
15
|
+
return normalised === expected;
|
|
16
|
+
};
|
|
17
|
+
//#endregion
|
|
18
|
+
export { normaliseAudioAnswer, validateAudioSolution };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"audioTasksUtils.js","sourceRoot":"","sources":["../../../src/tasks/audioCaptcha/audioTasksUtils.ts"],"names":[],"mappings":"AAkBA,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,GAAW,EAAU,EAAE,CAC3D,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAOxB,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACpC,SAAiB,EACjB,QAAgB,EACN,EAAE;IACZ,MAAM,UAAU,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAEnD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACnE,OAAO,UAAU,KAAK,QAAQ,CAAC;AAChC,CAAC,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { RedisWriteQueue } from "@prosopo/database";
|
|
2
2
|
import type { TranslationKey } from "@prosopo/locale";
|
|
3
3
|
import { type Logger } from "@prosopo/logger";
|
|
4
|
-
import { type
|
|
5
|
-
import type { ClientRecord, IProviderDatabase, IUserDataSlim,
|
|
4
|
+
import { CaptchaType, type CompositeIpAddress, type EnrichedDnsEvent, type IPInfoResponse, type ITrafficFilter, type KeyringPair, type ProsopoConfigOutput, type RequestHeaders, type Session, type SimdReadingsStage, Tier } from "@prosopo/types";
|
|
5
|
+
import type { ClientRecord, IProviderDatabase, IUserDataSlim, ProjectedSession } from "@prosopo/types-database";
|
|
6
6
|
import type { ProviderEnvironment } from "@prosopo/types-env";
|
|
7
7
|
import { type AccessPolicy, type AccessRule, type AccessRulesStorage, type UserScope, type UserScopeRecord } from "@prosopo/user-access-policy";
|
|
8
8
|
import type { BehavioralDataResult } from "./detection/decodeBehavior.js";
|
|
@@ -14,6 +14,12 @@ export interface PoolBundleDecrypt {
|
|
|
14
14
|
payloadLayout?: string;
|
|
15
15
|
keyMap?: string;
|
|
16
16
|
}
|
|
17
|
+
export interface HardBlockRecordView {
|
|
18
|
+
dappAccount: string;
|
|
19
|
+
ipAddress: CompositeIpAddress;
|
|
20
|
+
ja4: string;
|
|
21
|
+
sessionId?: string;
|
|
22
|
+
}
|
|
17
23
|
export declare class CaptchaManager {
|
|
18
24
|
pair: KeyringPair;
|
|
19
25
|
db: IProviderDatabase;
|
|
@@ -68,7 +74,7 @@ export declare class CaptchaManager {
|
|
|
68
74
|
resolveBundleBySessionId(sessionId?: string): Promise<PoolBundleDecrypt | undefined>;
|
|
69
75
|
decryptSimdReadings(encryptedData: string, bundle: PoolBundleDecrypt | undefined): Promise<SimdReadingsResult | null>;
|
|
70
76
|
decryptBehavioralData(encryptedData: string, bundle: PoolBundleDecrypt | undefined): Promise<BehavioralDataResult | null>;
|
|
71
|
-
checkForHardBlock(userAccessRulesStorage: AccessRulesStorage, challengeRecord:
|
|
77
|
+
checkForHardBlock(userAccessRulesStorage: AccessRulesStorage, challengeRecord: HardBlockRecordView, userAccount: string, headers: RequestHeaders, coords?: [number, number][][], countryCode?: string, asn?: number): Promise<AccessRule | undefined>;
|
|
72
78
|
checkSpamEmail(email: string): Promise<boolean>;
|
|
73
79
|
resolveTrafficFilterCheck(env: ProviderEnvironment, recordIpInfo: IPInfoResponse | undefined, trafficFilter: Partial<ITrafficFilter> | undefined, currentIp?: string, enrichedDnsEvent?: EnrichedDnsEvent): Promise<TrafficCheckResult>;
|
|
74
80
|
static canClientSeeScore(tier: Tier, score?: number): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captchaManager.d.ts","sourceRoot":"","sources":["../../src/tasks/captchaManager.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAEN,KAAK,
|
|
1
|
+
{"version":3,"file":"captchaManager.d.ts","sourceRoot":"","sources":["../../src/tasks/captchaManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { getIpAddressFromComposite } from "../compositeIpAddress.js";
|
|
2
2
|
import { getPrioritisedAccessRule, getRequestUserScope, normalizeHeadersForMatching } from "../api/blacklistRequestInspector.js";
|
|
3
|
+
import { isAudioAlternativeAllowed, isAudioAlternativeEnabled } from "./audioAlternative.js";
|
|
3
4
|
import { getDetectorBundlePool } from "./detection/bundlePool.js";
|
|
4
5
|
import { decode } from "./detection/decoderPool.js";
|
|
5
6
|
import { checkTrafficFilter } from "./spam/checkTrafficFilter.js";
|
|
6
7
|
import { extraIpInfosFromEnrichedDnsEvent } from "./dnsEvent/enrichDnsEvent.js";
|
|
7
8
|
import { checkSpamEmail } from "./spam/checkSpamEmail.js";
|
|
8
9
|
import { getLogger } from "@prosopo/logger";
|
|
9
|
-
import { ApiParams, ResultReason, Tier, TrafficFilterAction, isCaptchaTypeFeatureEnabled } from "@prosopo/types";
|
|
10
|
+
import { ApiParams, CaptchaType, ResultReason, Tier, TrafficFilterAction, isCaptchaTypeFeatureEnabled } from "@prosopo/types";
|
|
10
11
|
import { AccessPolicyType } from "@prosopo/user-access-policy";
|
|
11
12
|
//#region src/tasks/captchaManager.ts
|
|
12
13
|
/**
|
|
@@ -225,7 +226,7 @@ var CaptchaManager = class CaptchaManager {
|
|
|
225
226
|
sessionId
|
|
226
227
|
}
|
|
227
228
|
}));
|
|
228
|
-
if (!isCaptchaTypeFeatureEnabled(requestedCaptchaType, clientSettings.settings?.captchaTypeFeatureFlags)) {
|
|
229
|
+
if (!(requestedCaptchaType === CaptchaType.audio ? isAudioAlternativeEnabled(clientSettings.settings) : isCaptchaTypeFeatureEnabled(requestedCaptchaType, clientSettings.settings?.captchaTypeFeatureFlags))) {
|
|
229
230
|
this.logger.warn(() => ({
|
|
230
231
|
msg: "Captcha type is switched off for this site",
|
|
231
232
|
data: {
|
|
@@ -332,7 +333,7 @@ var CaptchaManager = class CaptchaManager {
|
|
|
332
333
|
type: requestedCaptchaType
|
|
333
334
|
};
|
|
334
335
|
}
|
|
335
|
-
if (sessionRecord.captchaType !== requestedCaptchaType) {
|
|
336
|
+
if (sessionRecord.captchaType !== requestedCaptchaType && !isAudioAlternativeAllowed(requestedCaptchaType, sessionRecord.captchaType, clientSettings.settings)) {
|
|
336
337
|
this.logger.warn(() => ({
|
|
337
338
|
msg: "Session captcha type does not match requested type",
|
|
338
339
|
data: {
|
|
@@ -357,6 +358,17 @@ var CaptchaManager = class CaptchaManager {
|
|
|
357
358
|
ipInfo: sessionRecord.ipInfo
|
|
358
359
|
};
|
|
359
360
|
}
|
|
361
|
+
if (requestedCaptchaType === CaptchaType.audio) {
|
|
362
|
+
this.logger.warn(() => ({
|
|
363
|
+
msg: "Sessionless audio captcha request rejected",
|
|
364
|
+
data: { account: clientSettings.account }
|
|
365
|
+
}));
|
|
366
|
+
return {
|
|
367
|
+
valid: false,
|
|
368
|
+
reason: ResultReason.INCORRECT_CAPTCHA_TYPE,
|
|
369
|
+
type: requestedCaptchaType
|
|
370
|
+
};
|
|
371
|
+
}
|
|
360
372
|
if (userAccessPolicy?.captchaType !== void 0 && userAccessPolicy.captchaType !== requestedCaptchaType) {
|
|
361
373
|
this.logger.warn(() => ({
|
|
362
374
|
msg: "Invalid captcha type for user access policy (sessionless)",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captchaManager.js","sourceRoot":"","sources":["../../src/tasks/captchaManager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"captchaManager.js","sourceRoot":"","sources":["../../src/tasks/captchaManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { Logger } from "@prosopo/logger";
|
|
2
2
|
import { CaptchaType, type IFrictionlessTypes } from "@prosopo/types";
|
|
3
|
-
export type ConcreteCaptchaType = CaptchaType.pow | CaptchaType.image | CaptchaType.puzzle;
|
|
3
|
+
export type ConcreteCaptchaType = CaptchaType.pow | CaptchaType.image | CaptchaType.puzzle | CaptchaType.iconOrder;
|
|
4
4
|
export declare const coerceToEnabledCaptchaType: (requested: ConcreteCaptchaType, allowedTypes: Partial<IFrictionlessTypes> | undefined, logger?: Logger) => ConcreteCaptchaType;
|
|
5
5
|
export declare const PUZZLE_REFRESHES_BEFORE_IMAGE = 3;
|
|
6
6
|
export declare const switchTypeAfterRefreshes: (resolved: ConcreteCaptchaType, refreshCount: number | undefined, allowedTypes: Partial<IFrictionlessTypes> | undefined) => ConcreteCaptchaType;
|
|
7
|
+
export declare const switchTypeOnUserRequest: (resolved: ConcreteCaptchaType, switchToImage: boolean | undefined, allowedTypes: Partial<IFrictionlessTypes> | undefined) => ConcreteCaptchaType;
|
|
7
8
|
//# sourceMappingURL=captchaTypeSelection.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captchaTypeSelection.d.ts","sourceRoot":"","sources":["../../src/tasks/captchaTypeSelection.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EACN,WAAW,EACX,KAAK,kBAAkB,
|
|
1
|
+
{"version":3,"file":"captchaTypeSelection.d.ts","sourceRoot":"","sources":["../../src/tasks/captchaTypeSelection.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EACN,WAAW,EACX,KAAK,kBAAkB,EAGvB,MAAM,gBAAgB,CAAC;AAIxB,MAAM,MAAM,mBAAmB,GAC5B,WAAW,CAAC,GAAG,GACf,WAAW,CAAC,KAAK,GACjB,WAAW,CAAC,MAAM,GAClB,WAAW,CAAC,SAAS,CAAC;AA4BzB,eAAO,MAAM,0BAA0B,cAC3B,mBAAmB,gBAChB,OAAO,CAAC,kBAAkB,CAAC,GAAG,SAAS,WAC5C,MAAM,KACb,mBAiDF,CAAC;AAMF,eAAO,MAAM,6BAA6B,IAAI,CAAC;AAiB/C,eAAO,MAAM,wBAAwB,aAC1B,mBAAmB,gBACf,MAAM,GAAG,SAAS,gBAClB,OAAO,CAAC,kBAAkB,CAAC,GAAG,SAAS,KACnD,mBAKS,CAAC;AAUb,eAAO,MAAM,uBAAuB,aACzB,mBAAmB,iBACd,OAAO,GAAG,SAAS,gBACpB,OAAO,CAAC,kBAAkB,CAAC,GAAG,SAAS,KACnD,mBAKS,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { isPuzzleRenderAvailable } from "./puzzle/puzzleRenderer.js";
|
|
2
|
-
import { CaptchaType, resolveFrictionlessTypes } from "@prosopo/types";
|
|
2
|
+
import { CaptchaType, resolveAllowedCaptchaTypes, resolveFrictionlessTypes } from "@prosopo/types";
|
|
3
3
|
//#region src/tasks/captchaTypeSelection.ts
|
|
4
4
|
/**
|
|
5
5
|
* Resolve a requested captcha type against what the site permits and what
|
|
@@ -20,16 +20,18 @@ import { CaptchaType, resolveFrictionlessTypes } from "@prosopo/types";
|
|
|
20
20
|
*
|
|
21
21
|
* Pass `allowedTypes` from `resolveAllowedCaptchaTypes`, so Prosopo's
|
|
22
22
|
* per-site captcha type feature flags are applied alongside the site owner's
|
|
23
|
-
* own `frictionlessTypes`. Absent means
|
|
23
|
+
* own `frictionlessTypes`. Absent means the defaults for both, so icon-order
|
|
24
|
+
* stays off.
|
|
24
25
|
*
|
|
25
26
|
* Coercion only ever narrows. A disabled type falls back to the other
|
|
26
27
|
* interactive type if that is permitted, and to PoW otherwise — never the
|
|
27
28
|
* reverse, so this can't hand a user a harder challenge than was asked for.
|
|
28
29
|
*/
|
|
29
30
|
var coerceToEnabledCaptchaType = (requested, allowedTypes, logger) => {
|
|
30
|
-
const types = resolveFrictionlessTypes(allowedTypes);
|
|
31
|
+
const types = allowedTypes ? resolveFrictionlessTypes(allowedTypes) : resolveAllowedCaptchaTypes(void 0);
|
|
31
32
|
const puzzleAllowed = types.puzzle && isPuzzleRenderAvailable();
|
|
32
33
|
const imageAllowed = types.image;
|
|
34
|
+
const iconOrderAllowed = types.iconOrder;
|
|
33
35
|
const resolved = (() => {
|
|
34
36
|
switch (requested) {
|
|
35
37
|
case CaptchaType.pow: return CaptchaType.pow;
|
|
@@ -39,6 +41,10 @@ var coerceToEnabledCaptchaType = (requested, allowedTypes, logger) => {
|
|
|
39
41
|
case CaptchaType.image:
|
|
40
42
|
if (imageAllowed) return CaptchaType.image;
|
|
41
43
|
return puzzleAllowed ? CaptchaType.puzzle : CaptchaType.pow;
|
|
44
|
+
case CaptchaType.iconOrder:
|
|
45
|
+
if (iconOrderAllowed) return CaptchaType.iconOrder;
|
|
46
|
+
if (puzzleAllowed) return CaptchaType.puzzle;
|
|
47
|
+
return imageAllowed ? CaptchaType.image : CaptchaType.pow;
|
|
42
48
|
}
|
|
43
49
|
})();
|
|
44
50
|
if (resolved !== requested) logger?.info(() => ({
|
|
@@ -48,7 +54,8 @@ var coerceToEnabledCaptchaType = (requested, allowedTypes, logger) => {
|
|
|
48
54
|
served: resolved,
|
|
49
55
|
imageEnabled: types.image,
|
|
50
56
|
puzzleEnabled: types.puzzle,
|
|
51
|
-
puzzleRenderable: isPuzzleRenderAvailable()
|
|
57
|
+
puzzleRenderable: isPuzzleRenderAvailable(),
|
|
58
|
+
iconOrderEnabled: types.iconOrder
|
|
52
59
|
}
|
|
53
60
|
}));
|
|
54
61
|
return resolved;
|
|
@@ -69,5 +76,14 @@ var coerceToEnabledCaptchaType = (requested, allowedTypes, logger) => {
|
|
|
69
76
|
* turned off is exactly what `coerceToEnabledCaptchaType` exists to stop.
|
|
70
77
|
*/
|
|
71
78
|
var switchTypeAfterRefreshes = (resolved, refreshCount, allowedTypes) => CaptchaType.puzzle === resolved && (refreshCount ?? 0) >= 3 && resolveFrictionlessTypes(allowedTypes).image ? CaptchaType.image : resolved;
|
|
79
|
+
/**
|
|
80
|
+
* Swap a puzzle for an image challenge because the user asked for one.
|
|
81
|
+
*
|
|
82
|
+
* Same one-way rule as `switchTypeAfterRefreshes`: the request is
|
|
83
|
+
* client-reported, so it may only ever earn a harder challenge. Whatever the
|
|
84
|
+
* routing settled on other than a puzzle stands, and so does a site that may
|
|
85
|
+
* not be served image challenges.
|
|
86
|
+
*/
|
|
87
|
+
var switchTypeOnUserRequest = (resolved, switchToImage, allowedTypes) => CaptchaType.puzzle === resolved && true === switchToImage && resolveFrictionlessTypes(allowedTypes).image ? CaptchaType.image : resolved;
|
|
72
88
|
//#endregion
|
|
73
|
-
export { coerceToEnabledCaptchaType, switchTypeAfterRefreshes };
|
|
89
|
+
export { coerceToEnabledCaptchaType, switchTypeAfterRefreshes, switchTypeOnUserRequest };
|