@prosopo/provider 5.19.3 → 5.20.0

package/dist/cjs/api/captcha/getFrictionlessCaptchaChallenge/handler.cjs

@@ -1,6 +1,7 @@
 const require_rawTlsSignalsMiddleware = require("../../rawTlsSignalsMiddleware.cjs");
 const require_compositeIpAddress = require("../../../compositeIpAddress.cjs");
 const require_devicePlatform = require("../../../utils/devicePlatform.cjs");
+const require_errorCodeForReason = require("../../errorCodeForReason.cjs");
 const require_metrics = require("../../metrics.cjs");
 const require_blacklistRequestInspector = require("../../blacklistRequestInspector.cjs");
 const require_audioAlternative = require("../../../tasks/audioAlternative.cjs");
@@ -93,23 +94,20 @@ var handler_default = (env, userAccessRulesStorage) => async (req, res, next) =>
 				token: existingToken,
 				msg: "Token has already been used"
 			}));
-			return next(new _prosopo_common.ProsopoApiError("API.BAD_REQUEST", {
+			return next(new _prosopo_common.ProsopoError({
+				code: "INVALID_REQUEST",
+				errorSite: "PROV-5",
+				message: "BadRequest",
 				context: {
-					code: 400,
 					siteKey: dapp,
 					user
-				},
-				i18n: req.i18n,
-				logger: req.logger
+				}
 			}));
 		}
-		if (!clientRecord) return next(new _prosopo_common.ProsopoApiError("API.SITE_KEY_NOT_REGISTERED", {
-			context: {
-				code: 400,
-				siteKey: dapp
-			},
-			i18n: req.i18n,
-			logger: req.logger
+		if (!clientRecord) return next(new _prosopo_common.ProsopoError({
+			code: "SITE_KEY_NOT_REGISTERED",
+			errorSite: "PROV-6",
+			context: { siteKey: dapp }
 		}));
 		const audioAlternativeEnabled = require_audioAlternative.isAudioAlternativeEnabled(clientRecord.settings);
 		tasks.frictionlessManager.setAudioAlternativeEnabled(audioAlternativeEnabled);
@@ -149,7 +147,11 @@ var handler_default = (env, userAccessRulesStorage) => async (req, res, next) =>
 				ip: normalizedIp,
 				...dedupCountryCode && { countryCode: dedupCountryCode },
 				score: dedup.session.score,
-				platform: require_devicePlatform.derivePlatform(dedupUserAgent, dedup.session.webView, { ...typeof dedupIsMobile === "boolean" && { isMobile: dedupIsMobile } }),
+				platform: require_devicePlatform.derivePlatform(dedupUserAgent, dedup.session.webView, {
+					headers: dedupFlatHeaders,
+					...typeof dedupIsMobile === "boolean" && { carrierNetwork: dedupIsMobile },
+					...req.tcpMss !== void 0 && { tcpMss: req.tcpMss }
+				}),
 				...dedup.session.d !== void 0 && { d: dedup.session.d },
 				raw: {
 					headers: dedupFlatHeaders,
@@ -348,14 +350,13 @@ var handler_default = (env, userAccessRulesStorage) => async (req, res, next) =>
 		}));
 		let botScore = baseBotScore + lScore;
 		const { valid, reason } = validation;
-		if (!valid) return next(new _prosopo_common.ProsopoApiError(reason || "API.BAD_REQUEST", {
+		if (!valid) return next(new _prosopo_common.ProsopoError({
+			code: require_errorCodeForReason.errorCodeForReason(reason),
+			errorSite: "PROV-80",
 			context: {
-				code: 400,
 				siteKey: dapp,
 				user
-			},
-			i18n: req.i18n,
-			logger: req.logger
+			}
 		}));
 		require_metrics.recordBotScore(botScore);
 		if (triggeredDetectors && triggeredDetectors.length > 0) require_metrics.recordDetectorTriggered(triggeredDetectors);
@@ -404,7 +405,11 @@ var handler_default = (env, userAccessRulesStorage) => async (req, res, next) =>
 			imageMinRounds: clientRecord.settings.imageMinRounds,
 			baseImageRounds: env.config.captchas.solved.count,
 			puzzleMaxDifficulty: clientRecord.settings.puzzleMaxDifficulty,
-			platform: require_devicePlatform.derivePlatform(requestUserAgent, webView, { ...typeof ipInfoMobile === "boolean" && { isMobile: ipInfoMobile } }),
+			platform: require_devicePlatform.derivePlatform(requestUserAgent, webView, {
+				headers: flatHeaders,
+				...typeof ipInfoMobile === "boolean" && { carrierNetwork: ipInfoMobile },
+				...req.tcpMss !== void 0 && { tcpMss: req.tcpMss }
+			}),
 			...d !== void 0 && { d },
 			raw: {
 				headers: flatHeaders,
@@ -484,13 +489,11 @@ var handler_default = (env, userAccessRulesStorage) => async (req, res, next) =>
 			err,
 			msg: "Error in frictionless captcha challenge"
 		}));
-		return next(new _prosopo_common.ProsopoApiError("API.BAD_REQUEST", {
-			context: {
-				code: 400,
-				error: err
-			},
-			i18n: req.i18n,
-			logger: req.logger
+		return next(new _prosopo_common.ProsopoError({
+			code: "INVALID_REQUEST",
+			errorSite: "PROV-7",
+			message: "BadRequest",
+			cause: err
 		}));
 	}
 };

package/dist/cjs/api/captcha/getImageCaptchaChallenge.cjs

@@ -1,3 +1,4 @@
+const require_errorCodeForReason = require("../errorCodeForReason.cjs");
 const require_metrics = require("../metrics.cjs");
 const require_blacklistRequestInspector = require("../blacklistRequestInspector.cjs");
 const require_validateAddress = require("../validateAddress.cjs");
@@ -13,42 +14,36 @@ const require_signedAssetsResolver = require("./signedAssetsResolver.cjs");
 let _prosopo_common = require("@prosopo/common");
 let _prosopo_types = require("@prosopo/types");
 let _prosopo_util = require("@prosopo/util");
-let _prosopo_locale = require("@prosopo/locale");
 let _prosopo_datasets = require("@prosopo/datasets");
+let _prosopo_locale = require("@prosopo/locale");
 //#region src/api/captcha/getImageCaptchaChallenge.ts
 var getImageCaptchaChallenge_default = (env, userAccessRulesStorage) => async (req, res, next) => {
 	let parsed;
 	const normalizedIp = require_normalizeRequestIp.normalizeRequestIp(req.ip, req.logger);
-	if (!normalizedIp) return next(new _prosopo_common.ProsopoApiError("API.BAD_REQUEST", {
-		context: {
-			code: 400,
-			error: "IP address not found"
-		},
-		i18n: req.i18n,
-		logger: req.logger
+	if (!normalizedIp) return next(new _prosopo_common.ProsopoError({
+		code: "INVALID_REQUEST",
+		errorSite: "PROV-8",
+		message: "BadRequest",
+		context: { error: "IP address not found" }
 	}));
 	const ipAddress = (0, _prosopo_util.getIPAddress)(normalizedIp);
 	try {
 		parsed = _prosopo_types.CaptchaRequestBody.parse(req.body);
 	} catch (err) {
-		return next(new _prosopo_common.ProsopoApiError("CAPTCHA.PARSE_ERROR", {
-			context: {
-				code: 400,
-				error: err
-			},
-			i18n: req.i18n,
-			logger: req.logger
+		return next(new _prosopo_common.ProsopoError({
+			code: "INVALID_REQUEST",
+			errorSite: "PROV-9",
+			message: "Error parsing captcha",
+			cause: err
 		}));
 	}
 	const { datasetId: clientDatasetId, user, dapp, sessionId, simdReadings } = parsed;
 	const datasetId = clientDatasetId ?? env.datasetId;
-	if (!datasetId) return next(new _prosopo_common.ProsopoApiError("API.BAD_REQUEST", {
-		context: {
-			code: 400,
-			error: "No dataset available. Please upload a dataset first."
-		},
-		i18n: req.i18n,
-		logger: req.logger
+	if (!datasetId) return next(new _prosopo_common.ProsopoError({
+		code: "INVALID_REQUEST",
+		errorSite: "PROV-10",
+		message: "BadRequest",
+		context: { error: "No dataset available. Please upload a dataset first." }
 	}));
 	require_validateAddress.validateSiteKey(dapp);
 	require_validateAddress.validateAddr(user);
@@ -77,13 +72,10 @@ var getImageCaptchaChallenge_default = (env, userAccessRulesStorage) => async (r
 	const tasks = new require_tasks.Tasks(env, req.logger);
 	try {
 		const clientRecord = await tasks.db.getClientRecord(dapp);
-		if (!clientRecord) return next(new _prosopo_common.ProsopoApiError("API.SITE_KEY_NOT_REGISTERED", {
-			context: {
-				code: 400,
-				siteKey: dapp
-			},
-			i18n: req.i18n,
-			logger: req.logger
+		if (!clientRecord) return next(new _prosopo_common.ProsopoError({
+			code: "SITE_KEY_NOT_REGISTERED",
+			errorSite: "PROV-11",
+			context: { siteKey: dapp }
 		}));
 		const countryCode = req.ipInfo && "isValid" in req.ipInfo && req.ipInfo.isValid ? req.ipInfo.countryCode : void 0;
 		const asn = req.ipInfo && "isValid" in req.ipInfo && req.ipInfo.isValid ? req.ipInfo.asnNumber : void 0;
@@ -93,14 +85,13 @@ var getImageCaptchaChallenge_default = (env, userAccessRulesStorage) => async (r
 		const userAccessPolicy = accessPolicies.find((p) => !p.deferToVerify);
 		const deferredParamsPolicy = accessPolicies.find((p) => p.deferToVerify === true);
 		const { valid, reason, sessionId: validSessionId, solvedImagesCount } = await tasks.imgCaptchaManager.isValidRequest(clientRecord, _prosopo_types.CaptchaType.image, env, sessionId, userAccessPolicy, normalizedIp);
-		if (!valid) return next(new _prosopo_common.ProsopoApiError(reason || "API.BAD_REQUEST", {
+		if (!valid) return next(new _prosopo_common.ProsopoError({
+			code: require_errorCodeForReason.errorCodeForReason(reason),
+			errorSite: "PROV-81",
 			context: {
-				code: 400,
 				siteKey: dapp,
 				user
-			},
-			i18n: req.i18n,
-			logger: req.logger
+			}
 		}));
 		const trafficVerdict = require_trafficFilterRequestTime.applyTrafficFilterAtRequestTime(req.ipInfo, clientRecord.settings?.trafficFilter, req.logger);
 		const trafficSolvedImagesCount = trafficVerdict.kind === "challenge" ? trafficVerdict.solvedImagesCount : void 0;
@@ -150,14 +141,12 @@ var getImageCaptchaChallenge_default = (env, userAccessRulesStorage) => async (r
 			data: req.params,
 			msg: "Error in image captcha challenge request"
 		}));
-		return next(new _prosopo_common.ProsopoApiError("API.BAD_REQUEST", {
-			context: {
-				error: err,
-				code: 500,
-				params: req.params
-			},
-			i18n: req.i18n,
-			logger: req.logger
+		return next(new _prosopo_common.ProsopoError({
+			code: "UNEXPECTED",
+			errorSite: "PROV-12",
+			message: "BadRequest",
+			cause: err,
+			context: { params: req.params }
 		}));
 	}
 };

package/dist/cjs/api/captcha/getPoWCaptchaChallenge.cjs

@@ -1,4 +1,5 @@
 const require_compositeIpAddress = require("../../compositeIpAddress.cjs");
+const require_errorCodeForReason = require("../errorCodeForReason.cjs");
 const require_metrics = require("../metrics.cjs");
 const require_blacklistRequestInspector = require("../blacklistRequestInspector.cjs");
 const require_validateAddress = require("../validateAddress.cjs");
@@ -18,13 +19,11 @@ var getPoWCaptchaChallenge_default = (env, userAccessRulesStorage) => async (req
 	try {
 		parsed = _prosopo_types.GetPowCaptchaChallengeRequestBody.parse(req.body);
 	} catch (err) {
-		return next(new _prosopo_common.ProsopoApiError("CAPTCHA.PARSE_ERROR", {
-			context: {
-				code: 400,
-				error: err
-			},
-			i18n: req.i18n,
-			logger: req.logger
+		return next(new _prosopo_common.ProsopoError({
+			code: "INVALID_REQUEST",
+			errorSite: "PROV-13",
+			message: "Error parsing captcha",
+			cause: err
 		}));
 	}
 	const { user, dapp, sessionId, simdReadings } = parsed;
@@ -55,13 +54,10 @@ var getPoWCaptchaChallenge_default = (env, userAccessRulesStorage) => async (req
 	const tasks = new require_tasks.Tasks(env, req.logger);
 	try {
 		const clientSettings = await tasks.db.getClientRecord(dapp);
-		if (!clientSettings) return next(new _prosopo_common.ProsopoApiError("API.SITE_KEY_NOT_REGISTERED", {
-			context: {
-				code: 400,
-				siteKey: dapp
-			},
-			i18n: req.i18n,
-			logger: req.logger
+		if (!clientSettings) return next(new _prosopo_common.ProsopoError({
+			code: "SITE_KEY_NOT_REGISTERED",
+			errorSite: "PROV-14",
+			context: { siteKey: dapp }
 		}));
 		const normalizedIp = require_normalizeRequestIp.normalizeRequestIp(req.ip, req.logger);
 		if (!normalizedIp) req.logger.warn(() => ({ msg: "Request missing IP; geoblocking will be skipped" }));
@@ -73,25 +69,24 @@ var getPoWCaptchaChallenge_default = (env, userAccessRulesStorage) => async (req
 		const userAccessPolicy = accessPolicies.find((p) => !p.deferToVerify);
 		const deferredParamsPolicy = accessPolicies.find((p) => p.deferToVerify === true);
 		const { valid, reason, sessionId: validSessionId, powDifficulty } = await tasks.powCaptchaManager.isValidRequest(clientSettings, _prosopo_types.CaptchaType.pow, env, sessionId, userAccessPolicy, normalizedIp);
-		if (!valid) return next(new _prosopo_common.ProsopoApiError(reason || "API.BAD_REQUEST", {
+		if (!valid) return next(new _prosopo_common.ProsopoError({
+			code: require_errorCodeForReason.errorCodeForReason(reason),
+			errorSite: "PROV-82",
 			context: {
-				code: 400,
 				siteKey: dapp,
 				user
-			},
-			i18n: req.i18n,
-			logger: req.logger
+			}
 		}));
 		const origin = req.headers.origin;
-		if (!origin) return next(new _prosopo_common.ProsopoApiError("API.BAD_REQUEST", {
+		if (!origin) return next(new _prosopo_common.ProsopoError({
+			code: "INVALID_REQUEST",
+			errorSite: "PROV-15",
+			message: "BadRequest",
 			context: {
 				error: "Origin header not found",
-				code: 400,
 				siteKey: dapp,
 				user
-			},
-			i18n: req.i18n,
-			logger: req.logger
+			}
 		}));
 		const trafficVerdict = require_trafficFilterRequestTime.applyTrafficFilterAtRequestTime(req.ipInfo, clientSettings.settings?.trafficFilter, req.logger);
 		const difficulty = (trafficVerdict.kind === "challenge" ? trafficVerdict.powDifficulty : void 0) || powDifficulty || userAccessPolicy?.powDifficulty || deferredParamsPolicy?.powDifficulty || clientSettings?.settings?.powDifficulty;
@@ -136,15 +131,15 @@ var getPoWCaptchaChallenge_default = (env, userAccessRulesStorage) => async (req
 			body: require_requestBodySummary.summariseRequestBody(req),
 			msg: "Error in PoW captcha challenge request"
 		}));
-		return next(new _prosopo_common.ProsopoApiError("API.BAD_REQUEST", {
+		return next(new _prosopo_common.ProsopoError({
+			code: "UNEXPECTED",
+			errorSite: "PROV-16",
+			message: "BadRequest",
+			cause: err,
 			context: {
-				code: 500,
 				siteKey: req.body.dapp,
-				user: req.body.user,
-				error: err
-			},
-			i18n: req.i18n,
-			logger: req.logger
+				user: req.body.user
+			}
 		}));
 	}
 };

package/dist/cjs/api/captcha/getPuzzleCaptchaChallenge.cjs

@@ -1,16 +1,29 @@
+const require_mobileSignals = require("../../utils/mobileSignals.cjs");
 const require_puzzleRenderer = require("../../tasks/puzzle/puzzleRenderer.cjs");
 const require_interactiveCaptchaChallenge = require("./interactiveCaptchaChallenge.cjs");
 const require_maintenanceModeResponses = require("./maintenanceModeResponses.cjs");
 const require_constants = require("./getFrictionlessCaptchaChallenge/constants.cjs");
 let _prosopo_types = require("@prosopo/types");
+let _prosopo_captcha_severity = require("@prosopo/captcha-severity");
 let _prosopo_puzzle_assets = require("@prosopo/puzzle-assets");
 //#region src/api/captcha/getPuzzleCaptchaChallenge.ts
+/** Exported for unit testing only; the default export is the entry point. */
 var issuePuzzleChallenge = async ({ tasks, user, dapp, origin, clientSettings, sessionRecord, trafficVerdict, provenance }) => {
 	const challengeVerdict = trafficVerdict.kind === "challenge" ? trafficVerdict : void 0;
-	const tolerance = challengeVerdict?.puzzleTolerance ?? sessionRecord?.puzzleTolerance ?? clientSettings?.settings?.puzzleTolerance;
+	const mobileVerdict = require_mobileSignals.deriveMobileVerdict({
+		userAgent: provenance.headers["user-agent"],
+		headers: provenance.headers,
+		...provenance.ipInfo?.isValid && { carrierNetwork: provenance.ipInfo.isMobile },
+		...sessionRecord?.tcpMss !== void 0 && { tcpMss: sessionRecord.tcpMss },
+		...sessionRecord?.webView !== void 0 && { webView: sessionRecord.webView }
+	});
+	const easeForTouch = mobileVerdict.isMobile && mobileVerdict.corroborated;
+	const requestedTolerance = challengeVerdict?.puzzleTolerance ?? sessionRecord?.puzzleTolerance ?? clientSettings?.settings?.puzzleTolerance;
+	const tolerance = easeForTouch && requestedTolerance !== void 0 ? (0, _prosopo_captcha_severity.easeToleranceForTouch)(requestedTolerance) : requestedTolerance;
 	const routedPuzzleSettings = challengeVerdict?.puzzleSettings ?? sessionRecord?.puzzle;
 	const effectivePuzzleSettings = require_puzzleRenderer.resolvePuzzleRenderSettings(clientSettings?.settings?.puzzle, routedPuzzleSettings);
-	const effectivePieceSize = require_puzzleRenderer.resolvePuzzlePieceSize(clientSettings?.settings?.puzzle, routedPuzzleSettings);
+	const pieceScaleRange = require_puzzleRenderer.resolvePuzzlePieceScaleRange(clientSettings?.settings?.puzzle, routedPuzzleSettings);
+	const effectivePieceSize = require_puzzleRenderer.samplePuzzlePieceSize(easeForTouch ? (0, _prosopo_captcha_severity.easePieceScaleForTouch)(pieceScaleRange) : pieceScaleRange);
 	const challenge = await tasks.puzzleCaptchaManager.getPuzzleCaptchaChallenge(user, dapp, origin, tolerance);
 	await tasks.db.storePuzzleCaptchaRecord(challenge.challenge, {
 		requestedAtTimestamp: challenge.requestedAtTimestamp,
@@ -45,7 +58,12 @@ var issuePuzzleChallenge = async ({ tasks, user, dapp, origin, clientSettings, s
 		}));
 	});
 	return {
-		logData: { tolerance: challenge.tolerance },
+		logData: {
+			tolerance: challenge.tolerance,
+			pieceSize: images.pieceSize,
+			mobileScore: mobileVerdict.score,
+			mobileCorroborated: mobileVerdict.corroborated ? 1 : 0
+		},
 		response: {
 			[_prosopo_types.ApiParams.status]: "ok",
 			[_prosopo_types.ApiParams.challenge]: challenge.challenge,
@@ -69,3 +87,4 @@ var getPuzzleCaptchaChallenge_default = (env, userAccessRulesStorage) => require
 });
 //#endregion
 exports.default = getPuzzleCaptchaChallenge_default;
+exports.issuePuzzleChallenge = issuePuzzleChallenge;

package/dist/cjs/api/captcha/interactiveCaptchaChallenge.cjs

@@ -1,4 +1,5 @@
 const require_compositeIpAddress = require("../../compositeIpAddress.cjs");
+const require_errorCodeForReason = require("../errorCodeForReason.cjs");
 const require_metrics = require("../metrics.cjs");
 const require_blacklistRequestInspector = require("../blacklistRequestInspector.cjs");
 const require_validateAddress = require("../validateAddress.cjs");
@@ -20,13 +21,11 @@ var interactiveChallengeHandler = (env, userAccessRulesStorage, spec) => async (
 	try {
 		parsed = _prosopo_types.GetPuzzleCaptchaChallengeRequestBody.parse(req.body);
 	} catch (err) {
-		return next(new _prosopo_common.ProsopoApiError("CAPTCHA.PARSE_ERROR", {
-			context: {
-				code: 400,
-				error: err
-			},
-			i18n: req.i18n,
-			logger: req.logger
+		return next(new _prosopo_common.ProsopoError({
+			code: "INVALID_REQUEST",
+			errorSite: "PROV-17",
+			message: "Error parsing captcha",
+			cause: err
 		}));
 	}
 	const { user, dapp, sessionId, simdReadings } = parsed;
@@ -58,13 +57,10 @@ var interactiveChallengeHandler = (env, userAccessRulesStorage, spec) => async (
 	const manager = spec.manager(tasks);
 	try {
 		const clientSettings = await tasks.db.getClientRecord(dapp);
-		if (!clientSettings) return next(new _prosopo_common.ProsopoApiError("API.SITE_KEY_NOT_REGISTERED", {
-			context: {
-				code: 400,
-				siteKey: dapp
-			},
-			i18n: req.i18n,
-			logger: req.logger
+		if (!clientSettings) return next(new _prosopo_common.ProsopoError({
+			code: "SITE_KEY_NOT_REGISTERED",
+			errorSite: "PROV-18",
+			context: { siteKey: dapp }
 		}));
 		const normalizedIp = require_normalizeRequestIp.normalizeRequestIp(req.ip, req.logger);
 		if (!normalizedIp) req.logger.warn(() => ({ msg: "Request missing IP; geoblocking will be skipped" }));
@@ -74,25 +70,24 @@ var interactiveChallengeHandler = (env, userAccessRulesStorage, spec) => async (
 		const userScope = require_blacklistRequestInspector.getRequestUserScope((0, _prosopo_util.flatten)(req.headers), req.ja4, normalizedIp, user, sessionRecord?.decryptedHeadHash, void 0, countryCode, asn);
 		const userAccessPolicy = (await manager.getPrioritisedAccessPolicies(userAccessRulesStorage, dapp, userScope, require_blacklistRequestInspector.normalizeHeadersForMatching(req.headers))).find((p) => !p.deferToVerify);
 		const { valid, reason, sessionId: validSessionId } = await manager.isValidRequest(clientSettings, captchaType, env, sessionId, userAccessPolicy, normalizedIp);
-		if (!valid) return next(new _prosopo_common.ProsopoApiError(reason || "API.BAD_REQUEST", {
+		if (!valid) return next(new _prosopo_common.ProsopoError({
+			code: require_errorCodeForReason.errorCodeForReason(reason),
+			errorSite: "PROV-83",
 			context: {
-				code: 400,
 				siteKey: dapp,
 				user
-			},
-			i18n: req.i18n,
-			logger: req.logger
+			}
 		}));
 		const origin = req.headers.origin;
-		if (!origin) return next(new _prosopo_common.ProsopoApiError("API.BAD_REQUEST", {
+		if (!origin) return next(new _prosopo_common.ProsopoError({
+			code: "INVALID_REQUEST",
+			errorSite: "PROV-19",
+			message: "BadRequest",
 			context: {
 				error: "Origin header not found",
-				code: 400,
 				siteKey: dapp,
 				user
-			},
-			i18n: req.i18n,
-			logger: req.logger
+			}
 		}));
 		const trafficVerdict = require_trafficFilterRequestTime.applyTrafficFilterAtRequestTime(req.ipInfo, clientSettings.settings?.trafficFilter, req.logger);
 		if (validSessionId && simdReadings) await tasks.frictionlessManager.decryptAndAttachSimdReadingsIfAbsent(validSessionId, simdReadings, _prosopo_types.SimdReadingsStage.challenge).catch((updateErr) => {
@@ -138,15 +133,15 @@ var interactiveChallengeHandler = (env, userAccessRulesStorage, spec) => async (
 			body: require_requestBodySummary.summariseRequestBody(req),
 			msg: `Error in ${label} captcha challenge request`
 		}));
-		return next(new _prosopo_common.ProsopoApiError("API.BAD_REQUEST", {
+		return next(new _prosopo_common.ProsopoError({
+			code: "UNEXPECTED",
+			errorSite: "PROV-20",
+			message: "BadRequest",
+			cause: err,
 			context: {
-				code: 500,
 				siteKey: req.body.dapp,
-				user: req.body.user,
-				error: err
-			},
-			i18n: req.i18n,
-			logger: req.logger
+				user: req.body.user
+			}
 		}));
 	}
 };

package/dist/cjs/api/captcha/interactiveCaptchaSolution.cjs

@@ -19,14 +19,12 @@ var interactiveSolutionHandler = (env, spec) => async (req, res, next) => {
 	try {
 		parsed = spec.parse(req.body);
 	} catch (err) {
-		return next(new _prosopo_common.ProsopoApiError("CAPTCHA.PARSE_ERROR", {
-			context: {
-				code: 400,
-				error: err,
-				body: require_requestBodySummary.summariseRequestBody(req)
-			},
-			i18n: req.i18n,
-			logger: req.logger
+		return next(new _prosopo_common.ProsopoError({
+			code: "INVALID_REQUEST",
+			errorSite: "PROV-21",
+			message: "Error parsing captcha",
+			cause: err,
+			context: { body: require_requestBodySummary.summariseRequestBody(req) }
 		}));
 	}
 	const { dapp, user } = parsed;
@@ -42,13 +40,10 @@ var interactiveSolutionHandler = (env, spec) => async (req, res, next) => {
 	}
 	try {
 		const clientRecord = await tasks.db.getClientRecord(dapp);
-		if (!clientRecord) return next(new _prosopo_common.ProsopoApiError("API.SITE_KEY_NOT_REGISTERED", {
-			context: {
-				code: 400,
-				siteKey: dapp
-			},
-			i18n: req.i18n,
-			logger: req.logger
+		if (!clientRecord) return next(new _prosopo_common.ProsopoError({
+			code: "SITE_KEY_NOT_REGISTERED",
+			errorSite: "PROV-22",
+			context: { siteKey: dapp }
 		}));
 		const submitWindowMs = clientRecord.settings.solutionTimeout ?? clientRecord.settings.verifiedTimeout;
 		const response = {
@@ -57,19 +52,18 @@ var interactiveSolutionHandler = (env, spec) => async (req, res, next) => {
 		};
 		return res.json(response);
 	} catch (err) {
+		if ((0, _prosopo_common.isProsopoError)(err) && !(0, _prosopo_common.isSevereError)(err)) return next(err);
 		req.logger.error(() => ({
 			err,
 			body: require_requestBodySummary.summariseRequestBody(req),
 			msg: `Error in ${spec.label} captcha solution submission`
 		}));
-		return next(new _prosopo_common.ProsopoApiError("API.BAD_REQUEST", {
-			context: {
-				code: 500,
-				siteKey: req.body.dapp,
-				error: err
-			},
-			i18n: req.i18n,
-			logger: req.logger
+		return next(new _prosopo_common.ProsopoError({
+			code: "UNEXPECTED",
+			errorSite: "PROV-23",
+			message: "BadRequest",
+			cause: err,
+			context: { siteKey: req.body.dapp }
 		}));
 	}
 };

package/dist/cjs/api/captcha/submitImageCaptchaSolution.cjs

@@ -21,14 +21,12 @@ var submitImageCaptchaSolution_default = (env) => async (req, res, next) => {
 	try {
 		parsed = _prosopo_types.CaptchaSolutionBody.parse(req.body);
 	} catch (err) {
-		return next(new _prosopo_common.ProsopoApiError("CAPTCHA.PARSE_ERROR", {
-			context: {
-				code: 400,
-				error: err,
-				body: require_requestBodySummary.summariseRequestBody(req)
-			},
-			i18n: req.i18n,
-			logger: req.logger
+		return next(new _prosopo_common.ProsopoError({
+			code: "INVALID_REQUEST",
+			errorSite: "PROV-24",
+			message: "Error parsing captcha",
+			cause: err,
+			context: { body: require_requestBodySummary.summariseRequestBody(req) }
 		}));
 	}
 	const { user, dapp } = parsed;
@@ -44,13 +42,10 @@ var submitImageCaptchaSolution_default = (env) => async (req, res, next) => {
 		return res.json(result);
 	}
 	try {
-		if (!await tasks.db.getClientRecord(parsed.dapp)) return next(new _prosopo_common.ProsopoApiError("API.SITE_KEY_NOT_REGISTERED", {
-			context: {
-				code: 400,
-				siteKey: dapp
-			},
-			i18n: req.i18n,
-			logger: req.logger
+		if (!await tasks.db.getClientRecord(parsed.dapp)) return next(new _prosopo_common.ProsopoError({
+			code: "SITE_KEY_NOT_REGISTERED",
+			errorSite: "PROV-25",
+			context: { siteKey: dapp }
 		}));
 		const result = await tasks.imgCaptchaManager.dappUserSolution(user, dapp, parsed[_prosopo_types.ApiParams.requestHash], parsed[_prosopo_types.ApiParams.captchas], parsed[_prosopo_types.ApiParams.signature].user.timestamp, Number.parseInt(parsed[_prosopo_types.ApiParams.timestamp]), parsed[_prosopo_types.ApiParams.signature].provider.requestHash, (0, _prosopo_util.getIPAddress)(req.ip || ""), (0, _prosopo_util.flatten)(req.headers), req.ja4, parsed[_prosopo_types.ApiParams.behavioralData], req.ipInfo, parsed[_prosopo_types.ApiParams.simdReadings], parsed[_prosopo_types.ApiParams.clientMetaData]);
 		const returnValue = {
@@ -59,19 +54,18 @@ var submitImageCaptchaSolution_default = (env) => async (req, res, next) => {
 		};
 		return res.json(returnValue);
 	} catch (err) {
+		if ((0, _prosopo_common.isProsopoError)(err) && !(0, _prosopo_common.isSevereError)(err)) return next(err);
 		req.logger.error(() => ({
 			err,
 			body: require_requestBodySummary.summariseRequestBody(req),
 			msg: "Error in image captcha solution submission"
 		}));
-		return next(new _prosopo_common.ProsopoApiError("API.BAD_REQUEST", {
-			context: {
-				code: 500,
-				siteKey: req.body.dapp,
-				error: err
-			},
-			i18n: req.i18n,
-			logger: req.logger
+		return next(new _prosopo_common.ProsopoError({
+			code: "UNEXPECTED",
+			errorSite: "PROV-26",
+			message: "BadRequest",
+			cause: err,
+			context: { siteKey: req.body.dapp }
 		}));
 	}
 };