@prosopo/provider 4.12.0 → 4.13.0

package/dist/cjs/api/public.cjs

@@ -5,12 +5,16 @@ const common = require("@prosopo/common");
 const types = require("@prosopo/types");
 const util = require("@prosopo/util");
 const express = require("express");
+const metrics = require("./metrics.cjs");
 function publicRouter(env) {
   const router = express.Router();
   router.get(types.PublicApiPaths.Healthz, (req, res) => {
     const host = env.config.host && env.config.host.length > 0 ? env.config.host : req.hostname;
     return res.status(200).json({ ok: true, host });
   });
+  if (metrics.metricsEnabled()) {
+    router.get(types.PublicApiPaths.Metrics, metrics.metricsHandler(env));
+  }
   router.get(types.PublicApiPaths.GetProviderDetails, async (req, res, next) => {
     try {
       const db = env.getDb();

package/dist/cjs/api/startProviderApi.cjs

@@ -20,6 +20,7 @@ const headerCheckMiddleware = require("./headerCheckMiddleware.cjs");
 const ignoreMiddleware = require("./ignoreMiddleware.cjs");
 const ipInfoMiddleware = require("./ipInfoMiddleware.cjs");
 const ja4Middleware = require("./ja4Middleware.cjs");
+const metrics = require("./metrics.cjs");
 const _public = require("./public.cjs");
 const robotsMiddleware = require("./robotsMiddleware.cjs");
 const verify = require("./verify.cjs");
@@ -102,8 +103,9 @@ async function startProviderApi(env, admin = false, port) {
       maxAge: 86400
     })
   );
-  apiApp.use(express.json({ limit: "50mb" }));
+  apiApp.use(express.json({ limit: "1mb" }));
   apiApp.use(_public.publicRouter(env));
+  apiApp.use(metrics.metricsMiddleware());
   const isTestOrDevelopmentEnv = process.env.NODE_ENV === "test" || env.config.defaultEnvironment === "development";
   if (!isTestOrDevelopmentEnv) {
     const configRateLimits = env.config.rateLimits;

package/dist/cjs/api/verify.cjs

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const api = require("@prosopo/api");
 const apiExpressRouter = require("@prosopo/api-express-router");
 const common = require("@prosopo/common");
 const types = require("@prosopo/types");
@@ -7,7 +8,26 @@ const utilCrypto = require("@prosopo/util-crypto");
 const express = require("express");
 const tasks = require("../tasks/tasks.cjs");
 const apiToggleMaintenanceModeEndpoint = require("./admin/apiToggleMaintenanceModeEndpoint.cjs");
+const forwardVerify = require("./forwardVerify.cjs");
+const metrics = require("./metrics.cjs");
 const testSiteKey = require("./testSiteKey.cjs");
+const deriveVerifySource = (body) => {
+  if (apiToggleMaintenanceModeEndpoint.getMaintenanceMode()) return "maintenance";
+  try {
+    const token = body?.token;
+    if (token) {
+      const { dapp } = types.decodeProcaptchaOutput(token);
+      if (testSiteKey.isReservedTestSiteKey(dapp)) return "test_key";
+    }
+  } catch {
+  }
+  return "real";
+};
+const VERIFY_PATH_TYPE = {
+  [types.ClientApiPaths.VerifyImageCaptchaSolutionDapp]: types.CaptchaType.image,
+  [types.ClientApiPaths.VerifyPowCaptchaSolution]: types.CaptchaType.pow,
+  [types.ClientApiPaths.VerifyPuzzleCaptchaSolution]: types.CaptchaType.puzzle
+};
 function prosopoVerifyRouter(env) {
   const router = express.Router();
   let userAccessRulesStorage;
@@ -20,6 +40,24 @@ function prosopoVerifyRouter(env) {
     }));
     userAccessRulesStorage = void 0;
   }
+  router.use((req, res, next) => {
+    if (!metrics.metricsEnabled()) return next();
+    const type = VERIFY_PATH_TYPE[req.path];
+    if (!type) return next();
+    const originalJson = res.json.bind(res);
+    res.json = (body) => {
+      if (res.statusCode < 300) {
+        const verified = !!(body && typeof body === "object" && body.verified);
+        metrics.recordCaptchaVerify({
+          type,
+          verified,
+          source: deriveVerifySource(req.body)
+        });
+      }
+      return originalJson(body);
+    };
+    next();
+  });
   router.post(
     types.ClientApiPaths.VerifyImageCaptchaSolutionDapp,
     async (req, res, next) => {
@@ -33,7 +71,6 @@ function prosopoVerifyRouter(env) {
         };
         return res.json(verificationResponse);
       }
-      const tasks$1 = new tasks.Tasks(env, req.logger);
       let parsed;
       try {
         parsed = types.VerifySolutionBody.parse(req.body);
@@ -48,7 +85,7 @@ function prosopoVerifyRouter(env) {
       }
       const { dappSignature, token, ip, maxVerifiedTime, email } = parsed;
       try {
-        const { user, dapp, timestamp, commitmentId } = types.decodeProcaptchaOutput(token);
+        const { user, dapp, timestamp, commitmentId, providerUrl } = types.decodeProcaptchaOutput(token);
         const testVerdict = testSiteKey.resolveTestSiteKeyVerdict(dapp, req.logger);
         if (testVerdict !== null) {
           const verificationResponse2 = {
@@ -57,6 +94,20 @@ function prosopoVerifyRouter(env) {
           };
           return res.json(verificationResponse2);
         }
+        const forwarded = await forwardVerify.forwardVerifyIfNotIssuer({
+          env,
+          logger: req.logger,
+          path: types.ClientApiPaths.VerifyImageCaptchaSolutionDapp,
+          providerUrl,
+          dapp,
+          user,
+          body: parsed,
+          alreadyForwarded: req.headers[api.VERIFY_FORWARDED_HEADER] !== void 0
+        });
+        if (forwarded) {
+          return res.json(forwarded);
+        }
+        const tasks$1 = new tasks.Tasks(env, req.logger);
         utilCrypto.validateAddress(dapp, false, 42);
         utilCrypto.validateAddress(user, false, 42);
         const clientRecord = await tasks$1.db.getClientRecord(dapp);
@@ -122,7 +173,6 @@ function prosopoVerifyRouter(env) {
         };
         return res.json(verificationResponse);
       }
-      const tasks$1 = new tasks.Tasks(env, req.logger);
       let parsed;
       try {
         parsed = types.ServerPowCaptchaVerifyRequestBody.parse(req.body);
@@ -137,7 +187,7 @@ function prosopoVerifyRouter(env) {
       }
       try {
         const { token, dappSignature, ip, email } = parsed;
-        const { dapp, user, timestamp, challenge } = types.decodeProcaptchaOutput(token);
+        const { dapp, user, timestamp, challenge, providerUrl } = types.decodeProcaptchaOutput(token);
         const testVerdict = testSiteKey.resolveTestSiteKeyVerdict(dapp, req.logger);
         if (testVerdict !== null) {
           const verificationResponse2 = {
@@ -146,6 +196,20 @@ function prosopoVerifyRouter(env) {
           };
           return res.json(verificationResponse2);
         }
+        const forwarded = await forwardVerify.forwardVerifyIfNotIssuer({
+          env,
+          logger: req.logger,
+          path: types.ClientApiPaths.VerifyPowCaptchaSolution,
+          providerUrl,
+          dapp,
+          user,
+          body: parsed,
+          alreadyForwarded: req.headers[api.VERIFY_FORWARDED_HEADER] !== void 0
+        });
+        if (forwarded) {
+          return res.json(forwarded);
+        }
+        const tasks$1 = new tasks.Tasks(env, req.logger);
         utilCrypto.validateAddress(dapp, false, 42);
         utilCrypto.validateAddress(user, false, 42);
         const clientRecord = await tasks$1.db.getClientRecord(dapp);
@@ -217,7 +281,6 @@ function prosopoVerifyRouter(env) {
         };
         return res.json(verificationResponse);
       }
-      const tasks$1 = new tasks.Tasks(env, req.logger);
       let parsed;
       try {
         parsed = types.ServerPuzzleCaptchaVerifyRequestBody.parse(req.body);
@@ -232,7 +295,7 @@ function prosopoVerifyRouter(env) {
       }
       try {
         const { token, dappSignature, ip, email } = parsed;
-        const { dapp, user, timestamp, challenge } = types.decodeProcaptchaOutput(token);
+        const { dapp, user, timestamp, challenge, providerUrl } = types.decodeProcaptchaOutput(token);
         const testVerdict = testSiteKey.resolveTestSiteKeyVerdict(dapp, req.logger);
         if (testVerdict !== null) {
           const verificationResponse2 = {
@@ -241,6 +304,20 @@ function prosopoVerifyRouter(env) {
           };
           return res.json(verificationResponse2);
         }
+        const forwarded = await forwardVerify.forwardVerifyIfNotIssuer({
+          env,
+          logger: req.logger,
+          path: types.ClientApiPaths.VerifyPuzzleCaptchaSolution,
+          providerUrl,
+          dapp,
+          user,
+          body: parsed,
+          alreadyForwarded: req.headers[api.VERIFY_FORWARDED_HEADER] !== void 0
+        });
+        if (forwarded) {
+          return res.json(forwarded);
+        }
+        const tasks$1 = new tasks.Tasks(env, req.logger);
         utilCrypto.validateAddress(dapp, false, 42);
         utilCrypto.validateAddress(user, false, 42);
         const clientRecord = await tasks$1.db.getClientRecord(dapp);

package/dist/cjs/index.cjs

@@ -34,6 +34,7 @@ exports.getIPAddressFromBigInt = util.getIPAddressFromBigInt;
 exports.shuffleArray = util.shuffleArray;
 exports.validateIpAddress = util.validateIpAddress;
 exports.blockMiddleware = block.blockMiddleware;
+exports.asyncHandler = captcha.asyncHandler;
 exports.prosopoRouter = captcha.prosopoRouter;
 exports.prosopoVerifyRouter = verify.prosopoVerifyRouter;
 exports.DEFAULT_JA4 = ja4Middleware.DEFAULT_JA4;

package/dist/cjs/tasks/captchaManager.cjs

@@ -8,7 +8,6 @@ const compositeIpAddress = require("../compositeIpAddress.cjs");
 const enrichDnsEvent = require("./dnsEvent/enrichDnsEvent.cjs");
 const checkSpamEmail = require("./spam/checkSpamEmail.cjs");
 const checkTrafficFilter = require("./spam/checkTrafficFilter.cjs");
-var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
 const findHardBlockPolicy = (accessPolicies) => {
   return accessPolicies.find(
     (policy) => policy.type === userAccessPolicy.AccessPolicyType.Block && (policy.deferToVerify || !policy.captchaType)
@@ -19,7 +18,7 @@ class CaptchaManager {
     this.pair = pair;
     this.db = db;
     this.config = config;
-    this.logger = logger$1 || logger.getLogger("info", typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("tasks/captchaManager.cjs", document.baseURI).href);
+    this.logger = logger$1 || logger.getLogger("info", "provider:captcha-manager");
     this.writeQueue = writeQueue ?? null;
   }
   /**

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

@@ -456,9 +456,10 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
     return void 0;
   }
   async verifyImageCaptchaSolution(user, dapp, commitmentId, env, maxVerifiedTime, ip, disallowWebView, contextAwareEnabled = false, userAccessRulesStorage, email, spamEmailDomainCheckingEnabled = false, spamFilter, trafficFilter, storeMetadata = false) {
+    const logger = this.logger.with({ commitmentId, dapp });
     const solution = await (commitmentId ? this.getDappUserCommitmentById(commitmentId) : this.getDappUserCommitmentByAccount(user, dapp));
     if (!solution) {
-      this.logger.debug(() => ({
+      logger.debug(() => ({
         msg: "Not verified - no solution found"
       }));
       return {
@@ -484,7 +485,7 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
     const submittedAt = solution.submittedAtTimestamp;
     const timeSinceCompletion = submittedAt instanceof Date ? currentTime - submittedAt.getTime() : Number.POSITIVE_INFINITY;
     if (timeSinceCompletion > maxVerifiedTime) {
-      this.logger.debug(() => ({
+      logger.debug(() => ({
         msg: "Not verified - timed out"
       }));
       return {
@@ -506,7 +507,7 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
           solution.ipInfo?.isValid ? solution.ipInfo.asnNumber : void 0
         );
         if (blockPolicy) {
-          this.logger.info(() => ({
+          logger.info(() => ({
             msg: "User blocked by access policy in server image verification",
             data: {
               userAccount: solution.userAccount,
@@ -521,8 +522,8 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
           failStatus = types.ResultReason.ACCESS_POLICY_BLOCK;
         }
       } catch (error) {
-        this.logger.warn(() => ({
-          msg: "Failed to check user access policies in server Image verification",
+        logger.warn(() => ({
+          msg: "Failed to check user access policies in server image verification",
           error
         }));
       }
@@ -532,9 +533,9 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
         const isSpam = await this.checkSpamEmail(email);
         if (isSpam) {
           const emailDomain = email.split("@")[1] || "unknown";
-          this.logger.info(() => ({
+          logger.info(() => ({
             msg: "Spam email domain detected in server image verification",
-            data: { commitmentId, dapp, emailDomain }
+            data: { emailDomain }
           }));
           commitmentUpdates.result = {
             status: types.CaptchaStatus.disapproved,
@@ -543,7 +544,7 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
           failStatus = types.ResultReason.SPAM_EMAIL_DOMAIN;
         }
       } catch (error) {
-        this.logger.warn(() => ({
+        logger.warn(() => ({
           msg: "Failed to check spam email domain in server image verification",
           error
         }));
@@ -552,9 +553,9 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
     if (!failStatus && spamFilter?.enabled && spamFilter.emailRules?.enabled && email) {
       const result = evaluateEmailSpamRules.evaluateEmailSpamRules(email, spamFilter.emailRules);
       if (result.isSpam) {
-        this.logger.info(() => ({
+        logger.info(() => ({
           msg: "Spam filter rejected email in image verification",
-          data: { commitmentId, dapp, reason: result.reason }
+          data: { reason: result.reason }
         }));
         commitmentUpdates.result = {
           status: types.CaptchaStatus.disapproved,
@@ -578,11 +579,9 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
         enrichedDnsEvent
       );
       if (check.isBlocked) {
-        this.logger.info(() => ({
+        logger.info(() => ({
           msg: "Traffic filter rejected request",
           data: {
-            commitmentId,
-            dapp,
             ip,
             reason: check.reason,
             dnsPeerIp: enrichedDnsEvent?.peerIp,
@@ -611,13 +610,13 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
         const ipValidation = await util.deepValidateIpAddress(
           ip,
           solutionIpAddress,
-          this.logger,
+          logger,
           env.ipInfoService,
           ipValidationRules,
           enrichedDnsEvent?.peerIp
         );
         if (!ipValidation.isValid) {
-          this.logger.error(() => ({
+          logger.error(() => ({
             msg: "IP validation failed for image captcha",
             data: {
               ip,
@@ -658,7 +657,7 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
         };
       }
       score = frictionlessTasksUtils.computeFrictionlessScore(sessionRecord?.scoreComponents);
-      this.logger.info(() => ({
+      logger.info(() => ({
         data: {
           scoreComponents: sessionRecord?.scoreComponents,
           score,
@@ -667,7 +666,7 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
         }
       }));
       if (!failStatus && disallowWebView === true && (sessionRecord.webView === true || (sessionRecord.scoreComponents.webView || 0) > 0)) {
-        this.logger.info(() => ({
+        logger.info(() => ({
           msg: "Disallowing webview access - user not verified"
         }));
         commitmentUpdates.result = {
@@ -679,7 +678,7 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
         failureStatus = types.ResultReason.DISALLOWED_WEBVIEW;
       }
       if (contextAwareEnabled && sessionRecord.reason === types.FrictionlessReason.CONTEXT_AWARE_VALIDATION_FAILED) {
-        this.logger.info(() => ({
+        logger.info(() => ({
           msg: "Context aware validation failed"
         }));
       }
@@ -708,14 +707,13 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
       try {
         const decision = await this.decisionMachineRunner.decide(
           decisionInput,
-          this.logger
+          logger
         );
         if (decision.decision === types.DecisionMachineDecision.Deny) {
           const dmReason = decision.reason || types.ResultReason.CAPTCHA_DECISION_MACHINE_DENIED;
-          this.logger?.info(() => ({
+          logger.info(() => ({
             msg: "Decision machine denied user verification",
             data: {
-              commitmentId,
               reason: decision.reason
             }
           }));
@@ -727,7 +725,7 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
           failureStatus = dmReason;
         }
       } catch (error) {
-        this.logger?.error(() => ({
+        logger.error(() => ({
           msg: "Failed to process decision machine",
           err: error
         }));

package/dist/cjs/tasks/powCaptcha/powTasks.cjs

@@ -363,9 +363,10 @@ class PowCaptchaManager extends captchaManager.CaptchaManager {
       verified: false,
       reason
     });
+    const logger = this.logger.with({ challenge, dappAccount });
     const challengeRecord = await this.db.getPowCaptchaRecordByChallenge(challenge);
     if (!challengeRecord) {
-      this.logger.debug(() => ({
+      logger.debug(() => ({
         msg: `No record of this challenge: ${challenge}`
       }));
       return notVerified("CAPTCHA.DAPP_USER_SOLUTION_NOT_FOUND");
@@ -417,12 +418,10 @@ class PowCaptchaManager extends captchaManager.CaptchaManager {
           challengeRecord.ipInfo?.isValid ? challengeRecord.ipInfo.asnNumber : void 0
         );
         if (blockPolicy) {
-          this.logger.info(() => ({
+          logger.info(() => ({
             msg: "User blocked by access policy in server PoW verification",
             data: {
-              challenge,
               userAccount: challengeRecord.userAccount,
-              dappAccount,
               policy: blockPolicy
             }
           }));
@@ -433,7 +432,7 @@ class PowCaptchaManager extends captchaManager.CaptchaManager {
           failReason = "API.ACCESS_POLICY_BLOCK";
         }
       } catch (error) {
-        this.logger.warn(() => ({
+        logger.warn(() => ({
           msg: "Failed to check user access policies in server PoW verification",
           error
         }));
@@ -444,9 +443,9 @@ class PowCaptchaManager extends captchaManager.CaptchaManager {
         const isSpam = await this.checkSpamEmail(email);
         if (isSpam) {
           const emailDomain = email.split("@")[1] || "unknown";
-          this.logger.info(() => ({
+          logger.info(() => ({
             msg: "Spam email domain detected in server PoW verification",
-            data: { challenge, dappAccount, emailDomain }
+            data: { emailDomain }
           }));
           failResult = {
             status: types.CaptchaStatus.disapproved,
@@ -455,7 +454,7 @@ class PowCaptchaManager extends captchaManager.CaptchaManager {
           failReason = "API.SPAM_EMAIL_DOMAIN";
         }
       } catch (error) {
-        this.logger.warn(() => ({
+        logger.warn(() => ({
           msg: "Failed to check spam email domain in server PoW verification",
           error
         }));
@@ -464,9 +463,9 @@ class PowCaptchaManager extends captchaManager.CaptchaManager {
     if (!failResult && spamFilter?.enabled && spamFilter.emailRules?.enabled && email) {
       const result = evaluateEmailSpamRules.evaluateEmailSpamRules(email, spamFilter.emailRules);
       if (result.isSpam) {
-        this.logger.info(() => ({
+        logger.info(() => ({
           msg: "Spam filter rejected email in PoW verification",
-          data: { challenge, dappAccount, reason: result.reason }
+          data: { reason: result.reason }
         }));
         failResult = {
           status: types.CaptchaStatus.disapproved,
@@ -490,11 +489,9 @@ class PowCaptchaManager extends captchaManager.CaptchaManager {
         enrichedDnsEvent
       );
       if (check.isBlocked) {
-        this.logger.info(() => ({
+        logger.info(() => ({
           msg: "Traffic filter rejected request in PoW verification",
           data: {
-            challenge,
-            dappAccount,
             ip,
             reason: check.reason,
             dnsPeerIp: enrichedDnsEvent?.peerIp,
@@ -525,13 +522,13 @@ class PowCaptchaManager extends captchaManager.CaptchaManager {
         const ipValidation = await util$2.deepValidateIpAddress(
           ip,
           challengeIpAddress,
-          this.logger,
+          logger,
           env.ipInfoService,
           ipValidationRules,
           enrichedDnsEvent?.peerIp
         );
         if (!ipValidation.isValid) {
-          this.logger.error(() => ({
+          logger.error(() => ({
             msg: "IP validation failed for PoW captcha",
             data: {
               ip,
@@ -561,7 +558,7 @@ class PowCaptchaManager extends captchaManager.CaptchaManager {
         };
       }
       score = frictionlessTasksUtils.computeFrictionlessScore(sessionRecord?.scoreComponents);
-      this.logger.info(() => ({
+      logger.info(() => ({
         data: {
           scoreComponents: { ...sessionRecord?.scoreComponents || {} },
           score,
@@ -596,15 +593,13 @@ class PowCaptchaManager extends captchaManager.CaptchaManager {
         };
         const decision = await this.decisionMachineRunner.decide(
           decisionInput,
-          this.logger
+          logger
         );
         if (decision.decision === types.DecisionMachineDecision.Deny) {
-          this.logger.info(() => ({
+          logger.info(() => ({
             msg: "Decision machine denied PoW captcha in server verification",
             data: {
-              challenge,
               userAccount: challengeRecord.userAccount,
-              dappAccount,
               reason: decision.reason,
               score: decision.score,
               tags: decision.tags
@@ -617,10 +612,9 @@ class PowCaptchaManager extends captchaManager.CaptchaManager {
           };
           failReason = dmReason;
         } else {
-          this.logger.debug(() => ({
+          logger.debug(() => ({
             msg: "Decision machine allowed PoW captcha",
             data: {
-              challenge,
               reason: decision.reason,
               score: decision.score,
               tags: decision.tags
@@ -628,7 +622,7 @@ class PowCaptchaManager extends captchaManager.CaptchaManager {
           }));
         }
       } catch (error) {
-        this.logger?.error(() => ({
+        logger.error(() => ({
           msg: "Failed to run decision machine in server PoW verification",
           err: error
         }));

package/dist/cjs/tasks/puzzleCaptcha/puzzleTasks.cjs

@@ -282,9 +282,10 @@ class PuzzleCaptchaManager extends captchaManager.CaptchaManager {
    */
   async serverVerifyPuzzleCaptchaSolution(dappAccount, challenge, timeout, env, ip, userAccessRulesStorage, email, spamEmailDomainCheckingEnabled = false, trafficFilter, storeMetadata = false) {
     const notVerifiedResponse = { verified: false };
+    const logger = this.logger.with({ challenge, dappAccount });
     const challengeRecord = await this.db.getPuzzleCaptchaRecordByChallenge(challenge);
     if (!challengeRecord) {
-      this.logger.debug(() => ({
+      logger.debug(() => ({
         msg: `No record of this challenge: ${challenge}`
       }));
       return notVerifiedResponse;
@@ -342,12 +343,10 @@ class PuzzleCaptchaManager extends captchaManager.CaptchaManager {
           challengeRecord.ipInfo?.isValid ? challengeRecord.ipInfo.asnNumber : void 0
         );
         if (blockPolicy) {
-          this.logger.info(() => ({
+          logger.info(() => ({
             msg: "User blocked by access policy in server puzzle verification",
             data: {
-              challenge,
               userAccount: challengeRecord.userAccount,
-              dappAccount,
               policy: blockPolicy
             }
           }));
@@ -367,7 +366,7 @@ class PuzzleCaptchaManager extends captchaManager.CaptchaManager {
           return notVerifiedResponse;
         }
       } catch (error) {
-        this.logger.warn(() => ({
+        logger.warn(() => ({
           msg: "Failed to check user access policies in server puzzle verification",
           error
         }));
@@ -378,9 +377,9 @@ class PuzzleCaptchaManager extends captchaManager.CaptchaManager {
         const isSpam = await this.checkSpamEmail(email);
         if (isSpam) {
           const emailDomain = email.split("@")[1] || "unknown";
-          this.logger.info(() => ({
+          logger.info(() => ({
             msg: "Spam email domain detected in server puzzle verification",
-            data: { challenge, dappAccount, emailDomain }
+            data: { emailDomain }
           }));
           await this.db.updatePuzzleCaptchaRecord(challengeRecord.challenge, {
             result: {
@@ -391,7 +390,7 @@ class PuzzleCaptchaManager extends captchaManager.CaptchaManager {
           return notVerifiedResponse;
         }
       } catch (error) {
-        this.logger.warn(() => ({
+        logger.warn(() => ({
           msg: "Failed to check spam email domain in server puzzle verification",
           error
         }));
@@ -412,11 +411,9 @@ class PuzzleCaptchaManager extends captchaManager.CaptchaManager {
         enrichedDnsEvent
       );
       if (check.isBlocked) {
-        this.logger.info(() => ({
+        logger.info(() => ({
           msg: "Traffic filter rejected request in puzzle verification",
           data: {
-            challenge,
-            dappAccount,
             ip,
             reason: check.reason,
             dnsPeerIp: enrichedDnsEvent?.peerIp,
@@ -460,13 +457,13 @@ class PuzzleCaptchaManager extends captchaManager.CaptchaManager {
         const ipValidation = await util$2.deepValidateIpAddress(
           ip,
           challengeIpAddress,
-          this.logger,
+          logger,
           env.ipInfoService,
           ipValidationRules,
           enrichedDnsEvent?.peerIp
         );
         if (!ipValidation.isValid) {
-          this.logger.error(() => ({
+          logger.error(() => ({
             msg: "IP validation failed for puzzle captcha",
             data: {
               ip,
@@ -505,7 +502,7 @@ class PuzzleCaptchaManager extends captchaManager.CaptchaManager {
         };
       }
       score = frictionlessTasksUtils.computeFrictionlessScore(sessionRecord?.scoreComponents);
-      this.logger.info(() => ({
+      logger.info(() => ({
         data: {
           scoreComponents: { ...sessionRecord?.scoreComponents || {} },
           score,
@@ -539,15 +536,13 @@ class PuzzleCaptchaManager extends captchaManager.CaptchaManager {
       };
       const decision = await this.decisionMachineRunner.decide(
         decisionInput,
-        this.logger
+        logger
       );
       if (decision.decision === types.DecisionMachineDecision.Deny) {
-        this.logger.info(() => ({
+        logger.info(() => ({
           msg: "Decision machine denied puzzle captcha in server verification",
           data: {
-            challenge,
             userAccount: challengeRecord.userAccount,
-            dappAccount,
             reason: decision.reason,
             score: decision.score,
             tags: decision.tags
@@ -568,17 +563,16 @@ class PuzzleCaptchaManager extends captchaManager.CaptchaManager {
         }
         return notVerifiedResponse;
       }
-      this.logger.debug(() => ({
+      logger.debug(() => ({
         msg: "Decision machine allowed puzzle captcha",
         data: {
-          challenge,
           reason: decision.reason,
           score: decision.score,
           tags: decision.tags
         }
       }));
     } catch (error) {
-      this.logger?.error(() => ({
+      logger.error(() => ({
         msg: "Failed to run decision machine in server puzzle verification",
         err: error
       }));

package/dist/index.js

@@ -2,7 +2,7 @@ import "./tasks/index.js";
 import { updateSpamEmailDomains } from "./tasks/spam/updateSpamEmailDomains.js";
 import { checkIfTaskIsRunning, deepValidateIpAddress, encodeStringAddress, evaluateIpValidationRules, getIPAddress, getIPAddressFromBigInt, shuffleArray, validateIpAddress } from "./util.js";
 import { blockMiddleware } from "./api/block.js";
-import { prosopoRouter } from "./api/captcha.js";
+import { asyncHandler, prosopoRouter } from "./api/captcha.js";
 import { prosopoVerifyRouter } from "./api/verify.js";
 import { DEFAULT_JA4, getJA4, ja4Middleware } from "./api/ja4Middleware.js";
 import { publicRouter } from "./api/public.js";
@@ -27,6 +27,7 @@ export {
   DEFAULT_JA4,
   FrictionlessReason,
   Tasks,
+  asyncHandler,
   blockMiddleware,
   checkIfTaskIsRunning,
   compareIPs,