@prosopo/provider 5.15.0 → 5.16.0

package/dist/cjs/tasks/captchaTypeSelection.cjs

@@ -20,16 +20,18 @@ let _prosopo_types = require("@prosopo/types");
 *
 * Pass `allowedTypes` from `resolveAllowedCaptchaTypes`, so Prosopo's
 * per-site captcha type feature flags are applied alongside the site owner's
-* own `frictionlessTypes`. Absent means every type is allowed.
+* own `frictionlessTypes`. Absent means the defaults for both, so icon-order
+* stays off.
 *
 * Coercion only ever narrows. A disabled type falls back to the other
 * interactive type if that is permitted, and to PoW otherwise — never the
 * reverse, so this can't hand a user a harder challenge than was asked for.
 */
 var coerceToEnabledCaptchaType = (requested, allowedTypes, logger) => {
-	const types = (0, _prosopo_types.resolveFrictionlessTypes)(allowedTypes);
+	const types = allowedTypes ? (0, _prosopo_types.resolveFrictionlessTypes)(allowedTypes) : (0, _prosopo_types.resolveAllowedCaptchaTypes)(void 0);
 	const puzzleAllowed = types.puzzle && require_puzzleRenderer.isPuzzleRenderAvailable();
 	const imageAllowed = types.image;
+	const iconOrderAllowed = types.iconOrder;
 	const resolved = (() => {
 		switch (requested) {
 			case _prosopo_types.CaptchaType.pow: return _prosopo_types.CaptchaType.pow;
@@ -39,6 +41,10 @@ var coerceToEnabledCaptchaType = (requested, allowedTypes, logger) => {
 			case _prosopo_types.CaptchaType.image:
 				if (imageAllowed) return _prosopo_types.CaptchaType.image;
 				return puzzleAllowed ? _prosopo_types.CaptchaType.puzzle : _prosopo_types.CaptchaType.pow;
+			case _prosopo_types.CaptchaType.iconOrder:
+				if (iconOrderAllowed) return _prosopo_types.CaptchaType.iconOrder;
+				if (puzzleAllowed) return _prosopo_types.CaptchaType.puzzle;
+				return imageAllowed ? _prosopo_types.CaptchaType.image : _prosopo_types.CaptchaType.pow;
 		}
 	})();
 	if (resolved !== requested) logger?.info(() => ({
@@ -48,7 +54,8 @@ var coerceToEnabledCaptchaType = (requested, allowedTypes, logger) => {
 			served: resolved,
 			imageEnabled: types.image,
 			puzzleEnabled: types.puzzle,
-			puzzleRenderable: require_puzzleRenderer.isPuzzleRenderAvailable()
+			puzzleRenderable: require_puzzleRenderer.isPuzzleRenderAvailable(),
+			iconOrderEnabled: types.iconOrder
 		}
 	}));
 	return resolved;

package/dist/cjs/tasks/client/clientTasks.cjs

@@ -1,10 +1,10 @@
-const require_validateAddress = require("../../api/validateAddress.cjs");
 const require_decisionMachineRunner = require("../decisionMachine/decisionMachineRunner.cjs");
+const require_validateAddress = require("../../api/validateAddress.cjs");
 let _prosopo_common = require("@prosopo/common");
 let _prosopo_database = require("@prosopo/database");
 let _prosopo_types = require("@prosopo/types");
-require("node:crypto");
 let _prosopo_util = require("@prosopo/util");
+require("node:crypto");
 /**
 * Matches `text` against a pattern where `*` matches any run of characters.
 * Greedy two-pointer match, retrying from the last `*` on mismatch, so time

package/dist/cjs/tasks/frictionless/frictionlessTasks.cjs

@@ -1,10 +1,11 @@
 const require_usageCounters = require("../../util/usageCounters.cjs");
-const require_decisionMachineRunner = require("../decisionMachine/decisionMachineRunner.cjs");
-const require_dnsEventUrl = require("../../api/dnsEventUrl.cjs");
 const require_rawTlsSignalsMiddleware = require("../../api/rawTlsSignalsMiddleware.cjs");
-const require_lang = require("../../rules/lang.cjs");
 const require_clientMetaData = require("../../utils/clientMetaData.cjs");
+const require_audioAlternative = require("../audioAlternative.cjs");
 const require_captchaManager = require("../captchaManager.cjs");
+const require_decisionMachineRunner = require("../decisionMachine/decisionMachineRunner.cjs");
+const require_dnsEventUrl = require("../../api/dnsEventUrl.cjs");
+const require_lang = require("../../rules/lang.cjs");
 const require_captchaTypeSelection = require("../captchaTypeSelection.cjs");
 const require_getBotScore = require("../detection/getBotScore.cjs");
 const require_puzzleDifficulty = require("../puzzle/puzzleDifficulty.cjs");
@@ -21,6 +22,7 @@ var getSessionIDPrefix = (host) => {
 var FrictionlessManager = class extends require_captchaManager.CaptchaManager {
 	constructor(db, pair, config, logger, writeQueue, decisionMachineRunner, usageCounters) {
 		super(db, pair, config, logger, writeQueue);
+		this.audioAlternativeEnabled = false;
 		this.config = config;
 		this.decisionMachineRunner = decisionMachineRunner ?? new require_decisionMachineRunner.DecisionMachineRunner(db);
 		this.usageCounters = usageCounters ?? null;
@@ -33,11 +35,15 @@ var FrictionlessManager = class extends require_captchaManager.CaptchaManager {
 	setRoutingContext(ctx) {
 		this.routingContext = ctx;
 	}
+	/** Separate from `setSessionParams`, which the short-circuit path bypasses. */
+	setAudioAlternativeEnabled(enabled) {
+		this.audioAlternativeEnabled = enabled;
+	}
 	/**
 	* The types this site may be served, from `resolveAllowedCaptchaTypes`.
 	* Set before any path can mint a session, including the short-circuits
 	* that skip routing, so the site's feature flags hold on every path.
-	* Unset means every type is allowed.
+	* Unset means the default flags and preferences.
 	*/
 	setAllowedCaptchaTypes(allowed) {
 		this.allowedCaptchaTypes = allowed;
@@ -96,7 +102,7 @@ var FrictionlessManager = class extends require_captchaManager.CaptchaManager {
 		return require_lang.checkLangRules(this.config, acceptLanguage);
 	}
 	async createSession(input) {
-		const { token, score, threshold, scoreComponents, ipAddress, captchaType, siteKey, mode, solvedImagesCount, powDifficulty, userSitekeyIpHash, reason, blocked, deleted, ipInfo, headers, bundleId, currentUrl, iframeUrl, d, tcpToChelloUs, chelloToHandshakeUs, simdReadings, puzzleTolerance, puzzle, isEscalation, originSessionId, refreshOf, refreshCount, refreshedAfterMs, isProtect, matchedRule, clientMetaData, webView = false, iFrame = false, decryptedHeadHash = "" } = input;
+		const { token, score, threshold, scoreComponents, ipAddress, captchaType, siteKey, mode, solvedImagesCount, powDifficulty, userSitekeyIpHash, reason, blocked, deleted, ipInfo, headers, bundleId, currentUrl, iframeUrl, d, tcpToChelloUs, chelloToHandshakeUs, simdReadings, puzzleTolerance, puzzle, iconOrderTolerance, iconOrder, isEscalation, originSessionId, refreshOf, refreshCount, refreshedAfterMs, isProtect, matchedRule, clientMetaData, webView = false, iFrame = false, decryptedHeadHash = "" } = input;
 		const sessionRecord = {
 			sessionId: `${getSessionIDPrefix(this.config.host)}-${(0, uuid.v4)()}`,
 			createdAt: /* @__PURE__ */ new Date(),
@@ -111,6 +117,8 @@ var FrictionlessManager = class extends require_captchaManager.CaptchaManager {
 			powDifficulty,
 			...puzzleTolerance !== void 0 && { puzzleTolerance },
 			...puzzle && { puzzle },
+			...iconOrderTolerance !== void 0 && { iconOrderTolerance },
+			...iconOrder && { iconOrder },
 			userSitekeyIpHash,
 			webView,
 			iFrame,
@@ -235,6 +243,9 @@ var FrictionlessManager = class extends require_captchaManager.CaptchaManager {
 	async sendPuzzleCaptcha(params) {
 		return this.sendCaptcha(_prosopo_types.CaptchaType.puzzle, params);
 	}
+	async sendIconOrderCaptcha(params) {
+		return this.sendCaptcha(_prosopo_types.CaptchaType.iconOrder, params);
+	}
 	async sendCaptcha(captchaType, params) {
 		const effectiveParams = {
 			...this.sessionParams,
@@ -270,6 +281,10 @@ var FrictionlessManager = class extends require_captchaManager.CaptchaManager {
 				...difficulty !== void 0 && { puzzleLevel: difficulty.level }
 			};
 		})() : {};
+		const finalIconOrderOverrides = finalCaptchaType === _prosopo_types.CaptchaType.iconOrder ? {
+			...routed.iconOrderTolerance !== void 0 && { iconOrderTolerance: routed.iconOrderTolerance },
+			...routed.iconOrder && { iconOrder: routed.iconOrder }
+		} : {};
 		const blocked = finalCaptchaType === _prosopo_types.CaptchaType.image ? effectiveParams.blocked : void 0;
 		const sessionRecord = await this.createSession({
 			...effectiveParams,
@@ -286,6 +301,8 @@ var FrictionlessManager = class extends require_captchaManager.CaptchaManager {
 			blocked,
 			puzzleTolerance: finalPuzzleOverrides.puzzleTolerance,
 			puzzle: finalPuzzleOverrides.puzzle,
+			iconOrderTolerance: finalIconOrderOverrides.iconOrderTolerance,
+			iconOrder: finalIconOrderOverrides.iconOrder,
 			deleted: void 0,
 			isEscalation: void 0,
 			originSessionId: void 0
@@ -295,7 +312,8 @@ var FrictionlessManager = class extends require_captchaManager.CaptchaManager {
 			[_prosopo_types.ApiParams.captchaType]: finalCaptchaType,
 			[_prosopo_types.ApiParams.sessionId]: sessionRecord.sessionId,
 			[_prosopo_types.ApiParams.status]: "ok",
-			dns_url: require_dnsEventUrl.buildDnsEventUrl(sessionRecord.sessionId)
+			dns_url: require_dnsEventUrl.buildDnsEventUrl(sessionRecord.sessionId),
+			...require_audioAlternative.offersAudioAlternative(finalCaptchaType, this.audioAlternativeEnabled) && { audioAlternativeAvailable: true }
 		};
 	}
 	async registerBlockedSession(params) {
@@ -318,6 +336,8 @@ var FrictionlessManager = class extends require_captchaManager.CaptchaManager {
 			deleted: true,
 			puzzleTolerance: void 0,
 			puzzle: void 0,
+			iconOrderTolerance: void 0,
+			iconOrder: void 0,
 			isEscalation: void 0,
 			originSessionId: void 0
 		});

package/dist/cjs/tasks/iconOrder/iconOrderRenderer.cjs

@@ -0,0 +1,42 @@
+let _prosopo_types = require("@prosopo/types");
+let _prosopo_puzzle_assets = require("@prosopo/puzzle-assets");
+let _prosopo_icon_order_assets = require("@prosopo/icon-order-assets");
+//#region src/tasks/iconOrder/iconOrderRenderer.ts
+/** Layers partial overrides onto the asset defaults; later sources win. */
+var resolveIconOrderRenderSettings = (...overrides) => {
+	let resolved = { ..._prosopo_icon_order_assets.DEFAULT_RENDER_SETTINGS };
+	for (const override of overrides) resolved = {
+		targetCount: override?.targetCount ?? resolved.targetCount,
+		decoyCount: override?.decoyCount ?? resolved.decoyCount,
+		strokeWidth: override?.strokeWidth ?? resolved.strokeWidth,
+		iconOpacity: override?.iconOpacity ?? resolved.iconOpacity,
+		haloOpacity: override?.haloOpacity ?? resolved.haloOpacity,
+		backgroundClutter: override?.backgroundClutter ?? resolved.backgroundClutter
+	};
+	const decoyBudget = _prosopo_types.ICON_ORDER_GLYPH_VOCABULARY - resolved.targetCount;
+	if (resolved.decoyCount > decoyBudget) resolved = {
+		...resolved,
+		decoyCount: Math.max(0, decoyBudget)
+	};
+	return resolved;
+};
+/** Drops the render-only fields (rotation, hue); grading needs none of them. */
+var toStoredTargets = (targets) => targets.map((target) => ({
+	x: target.x,
+	y: target.y,
+	size: target.size,
+	kind: target.kind
+}));
+var renderIconOrderImages = async (settings = _prosopo_icon_order_assets.DEFAULT_RENDER_SETTINGS) => {
+	const rendered = await (0, _prosopo_icon_order_assets.renderIconOrder)(_prosopo_icon_order_assets.DEFAULT_GEOMETRY, settings);
+	return {
+		background: (0, _prosopo_puzzle_assets.toDataUri)(rendered.background),
+		legend: (0, _prosopo_puzzle_assets.toDataUri)(rendered.legend),
+		legendIconSize: rendered.legendIconSize,
+		targets: rendered.targets
+	};
+};
+//#endregion
+exports.renderIconOrderImages = renderIconOrderImages;
+exports.resolveIconOrderRenderSettings = resolveIconOrderRenderSettings;
+exports.toStoredTargets = toStoredTargets;

package/dist/cjs/tasks/iconOrderCaptcha/iconOrderTasks.cjs

@@ -0,0 +1,69 @@
+const require_interactiveCaptchaManager = require("../interactiveCaptcha/interactiveCaptchaManager.cjs");
+const require_iconOrderRenderer = require("../iconOrder/iconOrderRenderer.cjs");
+let _prosopo_types = require("@prosopo/types");
+let _prosopo_icon_order_assets = require("@prosopo/icon-order-assets");
+//#region src/tasks/iconOrderCaptcha/iconOrderTasks.ts
+var IconOrderCaptchaManager = class extends require_interactiveCaptchaManager.InteractiveCaptchaManager {
+	constructor(..._args) {
+		super(..._args);
+		this.captchaType = _prosopo_types.CaptchaType.iconOrder;
+		this.logLabel = "icon-order";
+	}
+	getRecordByChallenge(challenge) {
+		return this.db.getIconOrderCaptchaRecordByChallenge(challenge);
+	}
+	updateRecord(challenge, updates) {
+		return this.db.updateIconOrderCaptchaRecord(challenge, updates);
+	}
+	updateSubmissionResult(challenge, result, userSignature, coords) {
+		return this.db.updateIconOrderCaptchaRecordResult(challenge, result, false, true, userSignature, coords);
+	}
+	/**
+	* An atomic claim rather than a read of `userSubmitted`: concurrent
+	* submissions would all read it unset and each get a verdict, enough to
+	* enumerate the ordering of a handful of icons.
+	*/
+	claimSubmission(record) {
+		return this.db.claimIconOrderCaptchaSubmission(record.challenge);
+	}
+	markRecordChecked(challenge) {
+		return this.db.markIconOrderCaptchaRecordChecked(challenge);
+	}
+	decisionMachineEventFields(record) {
+		return { iconOrderEvents: record.iconOrderEvents };
+	}
+	/**
+	* The renderer decides where the icons land, so the answer only exists
+	* once the imagery does; the caller must store `targets` before responding.
+	*/
+	async getIconOrderCaptchaChallenge(userAccount, dappAccount, tolerance, renderImages) {
+		const minted = this.mintChallenge(userAccount, dappAccount);
+		const { targets, ...images } = await renderImages();
+		return {
+			...minted,
+			targets: require_iconOrderRenderer.toStoredTargets(targets),
+			tolerance: tolerance ?? _prosopo_types.iconOrderToleranceDefault,
+			images
+		};
+	}
+	async verifyIconOrderCaptchaSolution(challenge, providerChallengeSignature, clicks, iconOrderEvents, timeout, userTimestampSignature, ipAddress, behavioralData, salt, simdReadings, clientMetaData) {
+		return this.submitInteractiveCaptchaSolution({
+			challenge,
+			providerChallengeSignature,
+			timeout,
+			userTimestampSignature,
+			ipAddress,
+			behavioralData,
+			salt,
+			simdReadings,
+			clientMetaData,
+			isCorrect: (record) => (0, _prosopo_icon_order_assets.gradeClicks)(record.targets, clicks, record.tolerance),
+			persistInteraction: () => this.db.updateIconOrderCaptchaRecord(challenge, {
+				clicks,
+				iconOrderEvents
+			})
+		});
+	}
+};
+//#endregion
+exports.IconOrderCaptchaManager = IconOrderCaptchaManager;

package/dist/cjs/tasks/imgCaptcha/imgCaptchaTasks.cjs

@@ -1,24 +1,24 @@
 const require_usageCounters = require("../../util/usageCounters.cjs");
-const require_decisionMachineRunner = require("../decisionMachine/decisionMachineRunner.cjs");
 const require_rawTlsSignalsMiddleware = require("../../api/rawTlsSignalsMiddleware.cjs");
-const require_lang = require("../../rules/lang.cjs");
-const require_clientMetaData = require("../../utils/clientMetaData.cjs");
 const require_compositeIpAddress = require("../../compositeIpAddress.cjs");
-const require_enrichDnsEvent = require("../dnsEvent/enrichDnsEvent.cjs");
-const require_captchaManager = require("../captchaManager.cjs");
-const require_pairs = require("../../pairs.cjs");
 const require_util = require("../../util.cjs");
+const require_clientMetaData = require("../../utils/clientMetaData.cjs");
 const require_devicePlatform = require("../../utils/devicePlatform.cjs");
+const require_enrichDnsEvent = require("../dnsEvent/enrichDnsEvent.cjs");
+const require_captchaManager = require("../captchaManager.cjs");
+const require_decisionMachineRunner = require("../decisionMachine/decisionMachineRunner.cjs");
 const require_frictionlessTasksUtils = require("../frictionless/frictionlessTasksUtils.cjs");
 const require_evaluateEmailSpamRules = require("../spam/evaluateEmailSpamRules.cjs");
+const require_lang = require("../../rules/lang.cjs");
+const require_pairs = require("../../pairs.cjs");
 const require_imgCaptchaTasksUtils = require("./imgCaptchaTasksUtils.cjs");
 let _prosopo_common = require("@prosopo/common");
 let _prosopo_types = require("@prosopo/types");
+let _polkadot_util = require("@polkadot/util");
+let _prosopo_user_access_policy = require("@prosopo/user-access-policy");
 let _prosopo_util = require("@prosopo/util");
 let _prosopo_util_crypto = require("@prosopo/util-crypto");
 let _prosopo_datasets = require("@prosopo/datasets");
-let _prosopo_user_access_policy = require("@prosopo/user-access-policy");
-let _polkadot_util = require("@polkadot/util");
 //#region src/tasks/imgCaptcha/imgCaptchaTasks.ts
 var ImgCaptchaManager = class extends require_captchaManager.CaptchaManager {
 	constructor(db, pair, config, logger, writeQueue, usageCounters) {