@prosopo/provider 4.11.6 → 4.13.0

package/dist/cjs/api/captcha/checkSpamEmail.cjs

@@ -1,18 +1,32 @@
 "use strict";
 const common = require("@prosopo/common");
+const types = require("@prosopo/types");
 const util = require("@prosopo/util");
 const zod = require("zod");
 require("../../tasks/index.cjs");
 const checkSpamEmail$1 = require("../../tasks/spam/checkSpamEmail.cjs");
 const apiToggleMaintenanceModeEndpoint = require("../admin/apiToggleMaintenanceModeEndpoint.cjs");
+const metrics = require("../metrics.cjs");
 const tasks = require("../../tasks/tasks.cjs");
 const CheckSpamEmailRequestBody = zod.object({
-  email: zod.string(),
-  dapp: zod.string()
+  email: types.safeLine(types.INPUT_LIMITS.EMAIL),
+  dapp: types.safeLine(types.INPUT_LIMITS.ID)
 });
 const checkSpamEmail = (env) => async (req, res, next) => {
+  let email;
+  let dapp;
+  try {
+    ({ email, dapp } = CheckSpamEmailRequestBody.parse(req.body));
+  } catch (err) {
+    return next(
+      new common.ProsopoApiError("CAPTCHA.PARSE_ERROR", {
+        context: { code: 400, error: err },
+        i18n: req.i18n,
+        logger: req.logger
+      })
+    );
+  }
   try {
-    const { email, dapp } = CheckSpamEmailRequestBody.parse(req.body);
     const emailDomain = util.extractDomainFromEmail(email);
     req.logger.info(() => ({
       msg: "Check spam email handler entry",
@@ -66,6 +80,7 @@ const checkSpamEmail = (env) => async (req, res, next) => {
         isSpam
       }
     }));
+    metrics.recordSpamEmail(isSpam ? "spam" : "ham");
     return res.json({
       isSpam,
       emailDomain

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

@@ -11,11 +11,10 @@ const handleAccessPolicy = async (input, res) => {
       scoreComponents: input.scoreComponents
     };
   }
-  const { tasks, clientRecord, userAccessPolicy, logger, requestId } = input;
+  const { tasks, clientRecord, userAccessPolicy, logger } = input;
   logger.info(() => ({
     msg: "User access policy matched",
     data: {
-      requestId,
       policy: userAccessPolicy,
       captchaType: userAccessPolicy.captchaType,
       userScope: input.userScope
@@ -34,7 +33,6 @@ const handleAccessPolicy = async (input, res) => {
     logger.info(() => ({
       msg: "Frictionless decision",
       data: {
-        requestId,
         decision: "block",
         captchaType: types.CaptchaType.image
       }
@@ -52,6 +50,30 @@ const handleAccessPolicy = async (input, res) => {
       response: res.status(401).json({ error: "Unauthorized" })
     };
   }
+  const autoBanThreshold = clientRecord.settings.autoBanScoreThreshold;
+  if (autoBanThreshold !== void 0 && Number(botScore) >= autoBanThreshold) {
+    logger.info(() => ({
+      msg: "Frictionless decision",
+      data: {
+        decision: "auto_ban_score",
+        botScore,
+        autoBanThreshold,
+        captchaType: userAccessPolicy.captchaType
+      }
+    }));
+    await tasks.frictionlessManager.registerBlockedSession({
+      solvedImagesCount: clientRecord.settings.imageMaxRounds,
+      userSitekeyIpHash: input.userSitekeyIpHash,
+      reason: types.FrictionlessReason.AUTO_BAN_SCORE,
+      siteKey: input.dapp,
+      ipInfo: input.ipInfo,
+      headers: input.flatHeaders
+    });
+    return {
+      handled: true,
+      response: res.status(401).json({ error: "Unauthorized" })
+    };
+  }
   const captchaTypeBaseParams = {
     userSitekeyIpHash: input.userSitekeyIpHash,
     reason: types.FrictionlessReason.USER_ACCESS_POLICY,
@@ -63,7 +85,6 @@ const handleAccessPolicy = async (input, res) => {
     logger.info(() => ({
       msg: "Frictionless decision",
       data: {
-        requestId,
         decision: "user_access_policy",
         captchaType: types.CaptchaType.image
       }
@@ -86,7 +107,6 @@ const handleAccessPolicy = async (input, res) => {
     logger.info(() => ({
       msg: "Frictionless decision",
       data: {
-        requestId,
         decision: "user_access_policy",
         captchaType: types.CaptchaType.pow
       }
@@ -103,7 +123,6 @@ const handleAccessPolicy = async (input, res) => {
     logger.info(() => ({
       msg: "Frictionless decision",
       data: {
-        requestId,
         decision: "user_access_policy",
         captchaType: types.CaptchaType.puzzle
       }

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

@@ -6,6 +6,7 @@ const util = require("@prosopo/util");
 const frictionlessTasks = require("../../../tasks/frictionless/frictionlessTasks.cjs");
 const frictionlessTasksUtils = require("../../../tasks/frictionless/frictionlessTasksUtils.cjs");
 const hashUserAgent = require("../../../utils/hashUserAgent.cjs");
+const metrics = require("../../metrics.cjs");
 const contextAwareValidation = require("../contextAwareValidation.cjs");
 const constants = require("./constants.cjs");
 const honeypotResponse = require("./honeypotResponse.cjs");
@@ -52,32 +53,18 @@ const runDecisionMachine = async (input, handle) => {
     scoreComponents = scoreUpdate.scoreComponents;
     tasks.frictionlessManager.updateScore(botScore, scoreComponents);
   }
-  const hostVerified = await tasks.frictionlessManager.hostVerified(
-    input.providerSelectEntropy
-  );
-  if (!hostVerified.verified) {
-    const scoreUpdate = tasks.frictionlessManager.scoreIncreaseUnverifiedHost(
-      hostVerified.domain,
-      input.baseBotScore,
-      botScore,
-      scoreComponents
-    );
-    botScore = scoreUpdate.score;
-    scoreComponents = scoreUpdate.scoreComponents;
-    tasks.frictionlessManager.updateScore(botScore, scoreComponents);
-  }
   const autoBanThreshold = clientRecord.settings.autoBanScoreThreshold;
   if (autoBanThreshold !== void 0 && Number(botScore) >= autoBanThreshold) {
     req.logger.info(() => ({
       msg: "Frictionless decision",
       data: {
-        requestId: req.requestId,
         decision: "auto_ban_score",
         botScore,
         autoBanThreshold,
         token: input.token
       }
     }));
+    metrics.recordFrictionlessDecision("auto_ban_score");
     await tasks.frictionlessManager.registerBlockedSession({
       solvedImagesCount: clientRecord.settings.imageMaxRounds,
       userSitekeyIpHash,
@@ -92,11 +79,11 @@ const runDecisionMachine = async (input, handle) => {
     req.logger.info(() => ({
       msg: "Frictionless decision",
       data: {
-        requestId: req.requestId,
         decision: "webview_detected",
         captchaType: types.CaptchaType.image
       }
     }));
+    metrics.recordFrictionlessDecision("webview_detected");
     honeypotResponse.attachHoneypot(res, clientRecord);
     return res.json(
       await tasks.frictionlessManager.sendImageCaptcha({
@@ -116,11 +103,11 @@ const runDecisionMachine = async (input, handle) => {
     req.logger.info(() => ({
       msg: "Frictionless decision",
       data: {
-        requestId: req.requestId,
         decision: "timestamp_too_old",
         captchaType: types.CaptchaType.image
       }
     }));
+    metrics.recordFrictionlessDecision("timestamp_too_old");
     honeypotResponse.attachHoneypot(res, clientRecord);
     return res.json(
       await tasks.frictionlessManager.sendImageCaptcha({
@@ -149,11 +136,11 @@ const runDecisionMachine = async (input, handle) => {
     req.logger.info(() => ({
       msg: "Frictionless decision",
       data: {
-        requestId: req.requestId,
         decision: "bot_score_above_threshold",
         captchaType: types.CaptchaType.image
       }
     }));
+    metrics.recordFrictionlessDecision("bot_score_above_threshold");
     honeypotResponse.attachHoneypot(res, clientRecord);
     return res.json(
       await tasks.frictionlessManager.sendImageCaptcha({
@@ -172,11 +159,11 @@ const runDecisionMachine = async (input, handle) => {
   req.logger.info(() => ({
     msg: "Frictionless decision",
     data: {
-      requestId: req.requestId,
       decision: "default_pow",
       captchaType: types.CaptchaType.pow
     }
   }));
+  metrics.recordFrictionlessDecision("default_pow");
   honeypotResponse.attachHoneypot(res, clientRecord);
   return res.json(
     await tasks.frictionlessManager.sendPowCaptcha({
@@ -208,11 +195,11 @@ const runUserAgentMismatchCheck = async (input, handle) => {
   req.logger.info(() => ({
     msg: "Frictionless decision",
     data: {
-      requestId: req.requestId,
       decision: "user_agent_mismatch",
       captchaType: types.CaptchaType.image
     }
   }));
+  metrics.recordFrictionlessDecision("user_agent_mismatch");
   honeypotResponse.attachHoneypot(res, input.clientRecord);
   return res.json(
     await input.tasks.frictionlessManager.sendImageCaptcha({
@@ -268,13 +255,13 @@ const runContextAwareValidation = async (input, handle) => {
   req.logger.info(() => ({
     msg: "Frictionless decision",
     data: {
-      requestId: req.requestId,
       decision: "context_aware_failed",
       captchaType: types.CaptchaType.image,
       sim,
       threshold
     }
   }));
+  metrics.recordFrictionlessDecision("context_aware_failed");
   honeypotResponse.attachHoneypot(res, clientRecord);
   return res.json(
     await tasks.frictionlessManager.sendImageCaptcha({

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

@@ -1,6 +1,7 @@
 "use strict";
 const common = require("@prosopo/common");
 const types = require("@prosopo/types");
+const userAccessPolicy = require("@prosopo/user-access-policy");
 const util = require("@prosopo/util");
 const compositeIpAddress = require("../../../compositeIpAddress.cjs");
 require("../../../tasks/index.cjs");
@@ -10,6 +11,7 @@ const normalizeRequestIp = require("../../../utils/normalizeRequestIp.cjs");
 const apiToggleMaintenanceModeEndpoint = require("../../admin/apiToggleMaintenanceModeEndpoint.cjs");
 const blacklistRequestInspector = require("../../blacklistRequestInspector.cjs");
 const dnsEventUrl = require("../../dnsEventUrl.cjs");
+const metrics = require("../../metrics.cjs");
 const testSiteKey = require("../../testSiteKey.cjs");
 const maintenanceModeResponses = require("../maintenanceModeResponses.cjs");
 const accessPolicy = require("./accessPolicy.cjs");
@@ -26,7 +28,6 @@ const getFrictionlessCaptchaChallenge = (env, userAccessRulesStorage) => async (
       req.logger.info(() => ({
         msg: "Frictionless response finished",
         data: {
-          requestId: req.requestId,
           status: res.statusCode,
           path: req.path,
           method: req.method
@@ -39,7 +40,6 @@ const getFrictionlessCaptchaChallenge = (env, userAccessRulesStorage) => async (
     req.logger.info(() => ({
       msg: "Frictionless handler entry",
       data: {
-        requestId: req.requestId,
         token,
         user,
         dapp,
@@ -104,30 +104,68 @@ const getFrictionlessCaptchaChallenge = (env, userAccessRulesStorage) => async (
       );
     }
     if (dedup) {
-      req.logger.info(() => ({
-        msg: "Reusing existing session for user-IP-sitekey combination",
-        data: {
-          userSitekeyIpHash,
-          sessionId: dedup.sessionId,
-          captchaType: dedup.captchaType
-        }
-      }));
-      req.logger.info(() => ({
-        msg: "Frictionless decision",
-        data: {
-          requestId: req.requestId,
-          decision: "reuse_session",
-          captchaType: dedup.captchaType,
-          sessionId: dedup.sessionId
-        }
-      }));
-      honeypotResponse.attachHoneypot(res, clientRecord);
-      return res.json({
-        [types.ApiParams.captchaType]: dedup.captchaType,
-        [types.ApiParams.sessionId]: dedup.sessionId,
-        [types.ApiParams.status]: "ok",
-        dns_url: dnsEventUrl.buildDnsEventUrl(dedup.sessionId)
-      });
+      const dedupCountryCode = req.ipInfo && "isValid" in req.ipInfo && req.ipInfo.isValid ? req.ipInfo.countryCode : void 0;
+      const dedupAsn = req.ipInfo && "isValid" in req.ipInfo && req.ipInfo.isValid ? req.ipInfo.asnNumber : void 0;
+      const dedupUserScope = blacklistRequestInspector.getRequestUserScope(
+        util.flatten(req.headers),
+        req.ja4,
+        normalizedIp,
+        user,
+        void 0,
+        void 0,
+        dedupCountryCode,
+        dedupAsn
+      );
+      const dedupAccessPolicy = (await tasks$1.frictionlessManager.getPrioritisedAccessPolicies(
+        userAccessRulesStorage,
+        dapp,
+        dedupUserScope
+      ))[0];
+      const dedupConflictsWithPolicy = dedupAccessPolicy !== void 0 && (dedupAccessPolicy.type === userAccessPolicy.AccessPolicyType.Block || dedupAccessPolicy.captchaType !== void 0 && dedupAccessPolicy.captchaType !== dedup.captchaType);
+      if (dedupConflictsWithPolicy) {
+        req.logger.info(() => ({
+          msg: "Evicting reused session: cached captchaType conflicts with access policy",
+          data: {
+            userSitekeyIpHash,
+            sessionId: dedup.sessionId,
+            cachedCaptchaType: dedup.captchaType,
+            policyType: dedupAccessPolicy.type,
+            policyCaptchaType: dedupAccessPolicy.captchaType
+          }
+        }));
+        await tasks$1.db.checkAndRemoveSession(dedup.sessionId);
+        await Promise.all([
+          tasks$1.writeQueue?.invalidateCachedSession(dedup.sessionId) ?? Promise.resolve(),
+          tasks$1.writeQueue?.invalidateCachedSessionByHash(
+            userSitekeyIpHash
+          ) ?? Promise.resolve()
+        ]);
+      } else {
+        req.logger.info(() => ({
+          msg: "Reusing existing session for user-IP-sitekey combination",
+          data: {
+            userSitekeyIpHash,
+            sessionId: dedup.sessionId,
+            captchaType: dedup.captchaType
+          }
+        }));
+        req.logger.info(() => ({
+          msg: "Frictionless decision",
+          data: {
+            decision: "reuse_session",
+            captchaType: dedup.captchaType,
+            sessionId: dedup.sessionId
+          }
+        }));
+        metrics.recordFrictionlessDecision("reuse_session");
+        honeypotResponse.attachHoneypot(res, clientRecord);
+        return res.json({
+          [types.ApiParams.captchaType]: dedup.captchaType,
+          [types.ApiParams.sessionId]: dedup.sessionId,
+          [types.ApiParams.status]: "ok",
+          dns_url: dnsEventUrl.buildDnsEventUrl(dedup.sessionId)
+        });
+      }
     }
     const ipAddress = compositeIpAddress.getCompositeIpAddress(normalizedIp);
     const flatHeaders = util.flatten(req.headers);
@@ -145,7 +183,6 @@ const getFrictionlessCaptchaChallenge = (env, userAccessRulesStorage) => async (
         flatHeaders,
         sessionMode,
         userSitekeyIpHash,
-        requestId: req.requestId,
         logger: req.logger
       },
       res
@@ -180,7 +217,6 @@ const getFrictionlessCaptchaChallenge = (env, userAccessRulesStorage) => async (
     const {
       baseBotScore,
       timestamp,
-      providerSelectEntropy,
       userId,
       userAgent,
       webView,
@@ -199,7 +235,6 @@ const getFrictionlessCaptchaChallenge = (env, userAccessRulesStorage) => async (
       data: {
         baseBotScore,
         timestamp,
-        providerSelectEntropy,
         userId,
         userAgent,
         webView
@@ -216,6 +251,10 @@ const getFrictionlessCaptchaChallenge = (env, userAccessRulesStorage) => async (
         })
       );
     }
+    metrics.recordBotScore(botScore);
+    if (triggeredDetectors && triggeredDetectors.length > 0) {
+      metrics.recordDetectorTriggered(triggeredDetectors);
+    }
     const botThreshold = clientRecord.settings?.frictionlessThreshold || constants.DEFAULT_FRICTIONLESS_THRESHOLD;
     let scoreComponents = {
       baseScore: baseBotScore,
@@ -228,7 +267,6 @@ const getFrictionlessCaptchaChallenge = (env, userAccessRulesStorage) => async (
       score: botScore,
       threshold: botThreshold,
       scoreComponents,
-      providerSelectEntropy,
       ipAddress,
       webView,
       iFrame,
@@ -268,12 +306,12 @@ const getFrictionlessCaptchaChallenge = (env, userAccessRulesStorage) => async (
         ...req.ja4 && { ja4: req.ja4 }
       }
     });
-    const userAccessPolicy = accessPolicies[0];
+    const userAccessPolicy$1 = accessPolicies[0];
     const accessPolicyOutcome = await accessPolicy.handleAccessPolicy(
       {
         tasks: tasks$1,
         clientRecord,
-        userAccessPolicy,
+        userAccessPolicy: userAccessPolicy$1,
         baseBotScore,
         botScore,
         scoreComponents,
@@ -281,7 +319,6 @@ const getFrictionlessCaptchaChallenge = (env, userAccessRulesStorage) => async (
         dapp,
         ipInfo: req.ipInfo,
         flatHeaders,
-        requestId: req.requestId,
         logger: req.logger,
         userScope
       },
@@ -306,7 +343,6 @@ const getFrictionlessCaptchaChallenge = (env, userAccessRulesStorage) => async (
         userId,
         webView,
         decryptedHeadHash,
-        providerSelectEntropy,
         baseBotScore,
         botScore,
         scoreComponents,

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

@@ -13,7 +13,6 @@ const runConfiguredCaptchaTypeShortCircuit = async (input, res) => {
     score: 0,
     threshold: input.clientRecord.settings?.frictionlessThreshold ?? constants.DEFAULT_FRICTIONLESS_THRESHOLD,
     scoreComponents: { baseScore: 0 },
-    providerSelectEntropy: 0,
     ipAddress: input.ipAddress,
     webView: false,
     iFrame: false,
@@ -27,7 +26,6 @@ const runConfiguredCaptchaTypeShortCircuit = async (input, res) => {
   input.logger.info(() => ({
     msg: "Frictionless decision",
     data: {
-      requestId: input.requestId,
       decision: "configured_captcha_type",
       captchaType: configuredType
     }

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

@@ -7,6 +7,7 @@ require("../../tasks/index.cjs");
 const normalizeRequestIp = require("../../utils/normalizeRequestIp.cjs");
 const apiToggleMaintenanceModeEndpoint = require("../admin/apiToggleMaintenanceModeEndpoint.cjs");
 const blacklistRequestInspector = require("../blacklistRequestInspector.cjs");
+const metrics = require("../metrics.cjs");
 const validateAddress = require("../validateAddress.cjs");
 const maintenanceModeResponses = require("./maintenanceModeResponses.cjs");
 const tasks = require("../../tasks/tasks.cjs");
@@ -34,7 +35,26 @@ const getImageCaptchaChallenge = (env, userAccessRulesStorage) => async (req, re
       })
     );
   }
-  const { datasetId, user, dapp, sessionId, simdReadings } = parsed;
+  const {
+    datasetId: clientDatasetId,
+    user,
+    dapp,
+    sessionId,
+    simdReadings
+  } = parsed;
+  const datasetId = clientDatasetId ?? env.datasetId;
+  if (!datasetId) {
+    return next(
+      new common.ProsopoApiError("API.BAD_REQUEST", {
+        context: {
+          code: 400,
+          error: "No dataset available. Please upload a dataset first."
+        },
+        i18n: req.i18n,
+        logger: req.logger
+      })
+    );
+  }
   validateAddress.validateSiteKey(dapp);
   validateAddress.validateAddr(user);
   if (apiToggleMaintenanceModeEndpoint.getMaintenanceMode()) {
@@ -164,8 +184,10 @@ const getImageCaptchaChallenge = (env, userAccessRulesStorage) => async (req, re
         sessionId
       }
     }));
+    metrics.recordCaptchaIssued(types.CaptchaType.image);
     return res.json(captchaResponse);
   } catch (err) {
+    metrics.recordCaptchaIssueError(types.CaptchaType.image);
     req.logger.error(() => ({
       err,
       data: req.params,

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

@@ -7,6 +7,7 @@ require("../../tasks/index.cjs");
 const normalizeRequestIp = require("../../utils/normalizeRequestIp.cjs");
 const apiToggleMaintenanceModeEndpoint = require("../admin/apiToggleMaintenanceModeEndpoint.cjs");
 const blacklistRequestInspector = require("../blacklistRequestInspector.cjs");
+const metrics = require("../metrics.cjs");
 const validateAddress = require("../validateAddress.cjs");
 const maintenanceModeResponses = require("./maintenanceModeResponses.cjs");
 const tasks = require("../../tasks/tasks.cjs");
@@ -175,8 +176,10 @@ const getPoWCaptchaChallenge = (env, userAccessRulesStorage) => async (req, res,
         session: sessionId
       }
     }));
+    metrics.recordCaptchaIssued(types.CaptchaType.pow);
     return res.json(getPowCaptchaResponse);
   } catch (err) {
+    metrics.recordCaptchaIssueError(types.CaptchaType.pow);
     req.logger.error(() => ({
       err,
       body: req.body,

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

@@ -7,6 +7,7 @@ require("../../tasks/index.cjs");
 const normalizeRequestIp = require("../../utils/normalizeRequestIp.cjs");
 const apiToggleMaintenanceModeEndpoint = require("../admin/apiToggleMaintenanceModeEndpoint.cjs");
 const blacklistRequestInspector = require("../blacklistRequestInspector.cjs");
+const metrics = require("../metrics.cjs");
 const validateAddress = require("../validateAddress.cjs");
 const maintenanceModeResponses = require("./maintenanceModeResponses.cjs");
 const tasks = require("../../tasks/tasks.cjs");
@@ -178,8 +179,10 @@ const getPuzzleCaptchaChallenge = (env, userAccessRulesStorage) => async (req, r
         session: sessionId
       }
     }));
+    metrics.recordCaptchaIssued(types.CaptchaType.puzzle);
     return res.json(getPuzzleCaptchaResponse);
   } catch (err) {
+    metrics.recordCaptchaIssueError(types.CaptchaType.puzzle);
     req.logger.error(() => ({
       err,
       body: req.body,

package/dist/cjs/api/captcha/submitPoWCaptchaSolution.cjs

@@ -160,7 +160,6 @@ const buildEscalation = async (tasks2, result, challenge) => {
     originSession.score,
     originSession.threshold,
     originSession.scoreComponents,
-    originSession.providerSelectEntropy,
     originSession.ipAddress,
     routed.captchaType,
     originSession.siteKey ?? powRecord.dappAccount,

package/dist/cjs/api/captcha.cjs

@@ -12,6 +12,9 @@ const submitImageCaptchaSolution = require("./captcha/submitImageCaptchaSolution
 const submitPoWCaptchaSolution = require("./captcha/submitPoWCaptchaSolution.cjs");
 const submitPuzzleCaptchaSolution = require("./captcha/submitPuzzleCaptchaSolution.cjs");
 const handler = require("./captcha/getFrictionlessCaptchaChallenge/handler.cjs");
+const asyncHandler = (handler2) => (req, res, next) => {
+  Promise.resolve().then(() => handler2(req, res, next)).catch(next);
+};
 function prosopoRouter(env) {
   const router = express.Router();
   let userAccessRulesStorage;
@@ -26,41 +29,35 @@ function prosopoRouter(env) {
   }
   router.post(
     types.ClientApiPaths.GetImageCaptchaChallenge,
-    (req, res, next) => getImageCaptchaChallenge(env, userAccessRulesStorage)(req, res, next)
+    asyncHandler(getImageCaptchaChallenge(env, userAccessRulesStorage))
   );
   router.post(
     types.ClientApiPaths.SubmitImageCaptchaSolution,
-    (req, res, next) => submitImageCaptchaSolution(env)(req, res, next)
+    asyncHandler(submitImageCaptchaSolution(env))
   );
   router.post(
     types.ClientApiPaths.GetPowCaptchaChallenge,
-    (req, res, next) => getPoWCaptchaChallenge(env, userAccessRulesStorage)(req, res, next)
+    asyncHandler(getPoWCaptchaChallenge(env, userAccessRulesStorage))
   );
   router.post(
     types.ClientApiPaths.SubmitPowCaptchaSolution,
-    (req, res, next) => submitPoWCaptchaSolution(env)(req, res, next)
+    asyncHandler(submitPoWCaptchaSolution(env))
   );
   router.post(
     types.ClientApiPaths.GetFrictionlessCaptchaChallenge,
-    (req, res, next) => handler(env, userAccessRulesStorage)(
-      req,
-      res,
-      next
-    )
+    asyncHandler(handler(env, userAccessRulesStorage))
   );
   router.post(
     types.ClientApiPaths.GetPuzzleCaptchaChallenge,
-    (req, res, next) => getPuzzleCaptchaChallenge(env, userAccessRulesStorage)(req, res, next)
+    asyncHandler(getPuzzleCaptchaChallenge(env, userAccessRulesStorage))
   );
   router.post(
     types.ClientApiPaths.SubmitPuzzleCaptchaSolution,
-    (req, res, next) => submitPuzzleCaptchaSolution(env)(req, res, next)
-  );
-  router.post(
-    types.ClientApiPaths.CheckSpamEmail,
-    (req, res, next) => checkSpamEmail(env)(req, res, next)
+    asyncHandler(submitPuzzleCaptchaSolution(env))
   );
+  router.post(types.ClientApiPaths.CheckSpamEmail, asyncHandler(checkSpamEmail(env)));
   router.use(apiExpressRouter.handleErrors);
   return router;
 }
+exports.asyncHandler = asyncHandler;
 exports.prosopoRouter = prosopoRouter;

package/dist/cjs/api/domainMiddleware.cjs

@@ -7,6 +7,7 @@ const utilCrypto = require("@prosopo/util-crypto");
 const zod = require("zod");
 require("../tasks/index.cjs");
 const apiToggleMaintenanceModeEndpoint = require("./admin/apiToggleMaintenanceModeEndpoint.cjs");
+const metrics = require("./metrics.cjs");
 const testSiteKey = require("./testSiteKey.cjs");
 const tasks = require("../tasks/tasks.cjs");
 const domainMiddleware = (env) => {
@@ -37,6 +38,7 @@ const domainMiddleware = (env) => {
         throw invalidSiteKeyError(req.i18n, siteKey, req.logger);
       }
       if (testSiteKey.isReservedTestSiteKey(siteKey)) {
+        metrics.recordDomainValidation("test_key");
         next();
         return;
       }
@@ -58,6 +60,7 @@ const domainMiddleware = (env) => {
       for (const candidate of candidateOrigins) {
         for (const domain of allowedDomains) {
           if (tasks$1.clientTaskManager.domainPatternMatcher(candidate, domain)) {
+            metrics.recordDomainValidation("allowed");
             next();
             return;
           }
@@ -65,6 +68,7 @@ const domainMiddleware = (env) => {
       }
       throw unauthorizedOriginError(req.i18n, origin, req.logger);
     } catch (err) {
+      metrics.recordDomainValidation("rejected");
       if (err instanceof common.ProsopoApiError || err instanceof zod.ZodError || err instanceof SyntaxError) {
         apiExpressRouter.handleErrors(err, req, res, next);
       } else {