@prosopo/provider 2.9.8 → 3.0.6

package/dist/api/verify.js

@@ -1,14 +1,13 @@
-import { validateAddress } from "@polkadot/util-crypto/address";
-import { handleErrors } from "@prosopo/api-express-router";
+import { handleErrors, verifySignature } from "@prosopo/api-express-router";
 import { ProsopoApiError } from "@prosopo/common";
 import { ApiParams, ClientApiPaths, ServerPowCaptchaVerifyRequestBody, VerifySolutionBody, decodeProcaptchaOutput, } from "@prosopo/types";
+import { validateAddress } from "@prosopo/util-crypto";
 import express from "express";
 import { Tasks } from "../tasks/tasks.js";
-import { verifySignature } from "./authMiddleware.js";
 export function prosopoVerifyRouter(env) {
     const router = express.Router();
-    const tasks = new Tasks(env);
     router.post(ClientApiPaths.VerifyImageCaptchaSolutionDapp, async (req, res, next) => {
+        const tasks = new Tasks(env, req.logger);
         let parsed;
         try {
             parsed = VerifySolutionBody.parse(req.body);
@@ -36,12 +35,12 @@ export function prosopoVerifyRouter(env) {
             const keyPair = env.keyring.addFromAddress(dapp);
             verifySignature(dappSignature, timestamp.toString(), keyPair);
             const response = await tasks.imgCaptchaManager.verifyImageCaptchaSolution(user, dapp, commitmentId, parsed.maxVerifiedTime, ip);
-            req.logger.debug(response);
+            req.logger.debug(() => ({ data: { response } }));
             const verificationResponse = tasks.imgCaptchaManager.getVerificationResponse(response[ApiParams.verified], clientRecord, req.i18n.t, response[ApiParams.score], response[ApiParams.commitmentId]);
             res.json(verificationResponse);
         }
         catch (err) {
-            req.logger.error({ err, body: req.body });
+            req.logger.error(() => ({ err, data: { body: req.body } }));
             return next(new ProsopoApiError("API.BAD_REQUEST", {
                 context: { code: 500, siteKey: req.body.dapp, user: req.body.user },
                 i18n: req.i18n,
@@ -50,6 +49,7 @@ export function prosopoVerifyRouter(env) {
         }
     });
     router.post(ClientApiPaths.VerifyPowCaptchaSolution, async (req, res, next) => {
+        const tasks = new Tasks(env, req.logger);
         let parsed;
         try {
             parsed = ServerPowCaptchaVerifyRequestBody.parse(req.body);
@@ -88,7 +88,8 @@ export function prosopoVerifyRouter(env) {
             return res.json(verificationResponse);
         }
         catch (err) {
-            req.logger.error({ err, body: req.body });
+            console.error("\nError in verifyPowCaptchaSolution:", err);
+            req.logger.error(() => ({ err, data: { body: req.body } }));
             return next(new ProsopoApiError("API.BAD_REQUEST", {
                 context: { code: 500, error: err },
                 i18n: req.i18n,

package/dist/api/verify.js.map

@@ -1 +1 @@
-{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../src/api/verify.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../src/api/verify.ts"],"names":[],"mappings":"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"}

package/dist/cjs/api/admin/apiRegisterSiteKeyEndpoint.cjs

@@ -9,11 +9,11 @@ class ApiRegisterSiteKeyEndpoint {
   }
   async processRequest(args, logger) {
     const { siteKey, tier, settings } = args;
-    logger = logger || common.getLoggerDefault();
+    logger = logger || common.getLogger("info", module);
     const temp = settings || types.ClientSettingsSchema.parse({});
-    logger.info(`Registering site key: ${siteKey}`);
+    logger.info(() => ({ data: { siteKey }, msg: "`Registering site key" }));
     await this.clientTaskManager.registerSiteKey(siteKey, tier, temp);
-    logger.info("Site key registered");
+    logger.info(() => ({ msg: "Site key registered" }));
     return {
       status: apiRoute.ApiEndpointResponseStatus.SUCCESS
     };

package/dist/cjs/api/admin/apiRemoveDetectorKeyEndpoint.cjs

@@ -8,17 +8,17 @@ class ApiRemoveDetectorKeyEndpoint {
     this.clientTaskManager = clientTaskManager;
   }
   async processRequest(args, logger) {
-    logger = logger || common.getLoggerDefault();
+    logger = logger || common.getLogger("info", module);
     try {
       const { detectorKey } = args;
-      logger = logger || common.getLoggerDefault();
-      logger.info({ message: "Removing detector key" });
+      logger = logger || common.getLogger("info", module);
+      logger.info(() => ({ msg: "Removing detector key" }));
       await this.clientTaskManager.removeDetectorKey(detectorKey);
       return {
         status: apiRoute.ApiEndpointResponseStatus.SUCCESS
       };
     } catch (error) {
-      logger.error({ message: "Error updating detector key", error });
+      logger.error(() => ({ err: error, msg: "Error updating detector key" }));
       return {
         status: apiRoute.ApiEndpointResponseStatus.FAIL,
         error: error.message

package/dist/cjs/api/admin/apiUpdateDetectorKeyEndpoint.cjs

@@ -8,17 +8,17 @@ class ApiUpdateDetectorKeyEndpoint {
     this.clientTaskManager = clientTaskManager;
   }
   async processRequest(args, logger) {
-    logger = logger || common.getLoggerDefault();
+    logger = logger || common.getLogger("info", "");
     try {
       const { detectorKey } = args;
-      logger = logger || common.getLoggerDefault();
-      logger.info("Updating detector key");
+      logger = logger || common.getLogger("info", "");
+      logger.info(() => ({ msg: "Updating detector key" }));
       await this.clientTaskManager.updateDetectorKey(detectorKey);
       return {
         status: apiRoute.ApiEndpointResponseStatus.SUCCESS
       };
     } catch (error) {
-      logger.error("Error updating detector key", error);
+      logger.error(() => ({ msg: "Error updating detector key", err: error }));
       return {
         status: apiRoute.ApiEndpointResponseStatus.FAIL,
         error: error.message

package/dist/cjs/api/blacklistRequestInspector.cjs

@@ -1,16 +1,18 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const types = require("@prosopo/types");
-const util = require("../util.cjs");
+const userAccessPolicy = require("@prosopo/user-access-policy");
+const util = require("@prosopo/util");
 class BlacklistRequestInspector {
-  constructor(blacklistInspector, environmentReadinessWaiter, logger) {
-    this.blacklistInspector = blacklistInspector;
+  constructor(resolveAccessPolicy, environmentReadinessWaiter) {
+    this.resolveAccessPolicy = resolveAccessPolicy;
     this.environmentReadinessWaiter = environmentReadinessWaiter;
-    this.logger = logger;
   }
   async abortRequestForBlockedUsers(request, res, next) {
     const rawIp = request.ip || "";
-    request.logger.debug("JA4", request.ja4);
+    request.logger.debug(() => ({
+      data: { ja4: request.ja4 }
+    }));
     const shouldAbortRequest = await this.shouldAbortRequest(
       request.url,
       rawIp,
@@ -30,11 +32,14 @@ class BlacklistRequestInspector {
       return false;
     }
     if (!rawIp) {
-      logger.info("Request without IP", {
-        requestedRoute,
-        requestHeaders,
-        requestBody
-      });
+      logger.info(() => ({
+        data: {
+          requestedRoute,
+          requestHeaders,
+          requestBody
+        },
+        msg: "Request without IP"
+      }));
       return true;
     }
     await this.environmentReadinessWaiter();
@@ -44,14 +49,24 @@ class BlacklistRequestInspector {
         requestHeaders,
         requestBody
       );
-      return await this.blacklistInspector.isUserBlacklisted(
-        clientId,
-        userIpAddress,
-        ja4,
-        userId
-      );
+      const accessPolicy = await this.resolveAccessPolicy({
+        policyScope: {
+          clientId
+        },
+        policyScopeMatch: userAccessPolicy.ScopeMatch.Greedy,
+        userScope: {
+          userId,
+          numericIp: userIpAddress.bigInt(),
+          ja4Hash: ja4
+        },
+        userScopeMatch: userAccessPolicy.ScopeMatch.Greedy
+      });
+      return userAccessPolicy.AccessPolicyType.Block === accessPolicy?.type;
     } catch (err) {
-      logger.error("Block Middleware Error:", err);
+      logger.error(() => ({
+        err,
+        msg: "Block Middleware Error"
+      }));
       return true;
     }
   }
@@ -59,11 +74,11 @@ class BlacklistRequestInspector {
     return !url.includes(types.ApiPrefix);
   }
   extractIdsFromRequest(requestHeaders, requestBody) {
-    const userId = this.getObjectValue(requestHeaders, "Prosopo-User") || this.getObjectValue(requestBody, "user") || "";
-    const clientId = this.getObjectValue(requestHeaders, "Prosopo-Site-Key") || this.getObjectValue(requestBody, "dapp") || "";
+    const userId = this.getObjectValue(requestHeaders, "Prosopo-User") || this.getObjectValue(requestBody, "user");
+    const clientId = this.getObjectValue(requestHeaders, "Prosopo-Site-Key") || this.getObjectValue(requestBody, "dapp");
     return {
-      userId: "string" === typeof userId ? userId : "",
-      clientId: "string" === typeof clientId ? clientId : ""
+      userId: "string" === typeof userId ? userId : void 0,
+      clientId: "string" === typeof clientId ? clientId : void 0
     };
   }
   getObjectValue(object, key) {

package/dist/cjs/api/block.cjs

@@ -4,18 +4,17 @@ const common = require("@prosopo/common");
 const userAccessPolicy = require("@prosopo/user-access-policy");
 const blacklistRequestInspector = require("./blacklistRequestInspector.cjs");
 const blockMiddleware = (providerEnvironment) => {
-  const logLevel = providerEnvironment.config.logLevel;
+  const logLevel = common.parseLogLevel(providerEnvironment.config.logLevel);
   const logger = common.getLogger(logLevel, "blockMiddleware");
   const userAccessRulesStorage = providerEnvironment.getDb().getUserAccessRulesStorage();
   const environmentReadinessWaiter = providerEnvironment.isReady.bind(providerEnvironment);
-  const blacklistInspector = userAccessPolicy.createBlacklistInspector(
+  const resolveAccessPolicy = userAccessPolicy.createAccessPolicyResolver(
     userAccessRulesStorage,
     logger
   );
   const blacklistRequestInspector$1 = new blacklistRequestInspector.BlacklistRequestInspector(
-    blacklistInspector,
-    environmentReadinessWaiter,
-    logger
+    resolveAccessPolicy,
+    environmentReadinessWaiter
   );
   return blacklistRequestInspector$1.abortRequestForBlockedUsers.bind(
     blacklistRequestInspector$1

package/dist/cjs/api/captcha.cjs

@@ -5,20 +5,19 @@ const common = require("@prosopo/common");
 const datasets = require("@prosopo/datasets");
 const types = require("@prosopo/types");
 const userAccessPolicy = require("@prosopo/user-access-policy");
-const util$1 = require("@prosopo/util");
+const util = require("@prosopo/util");
 const express = require("express");
 const frictionlessTasks = require("../tasks/frictionless/frictionlessTasks.cjs");
 const tasks = require("../tasks/tasks.cjs");
-const util = require("../util.cjs");
 const validateAddress = require("./validateAddress.cjs");
 const DEFAULT_FRICTIONLESS_THRESHOLD = 0.5;
 function prosopoRouter(env) {
   const router = express.Router();
-  const tasks$1 = new tasks.Tasks(env);
   const userAccessRulesStorage = env.getDb().getUserAccessRulesStorage();
   router.post(
     types.ClientApiPaths.GetImageCaptchaChallenge,
     async (req, res, next) => {
+      const tasks$1 = new tasks.Tasks(env, req.logger);
       let parsed;
       if (!req.ip) {
         return next(
@@ -42,7 +41,7 @@ function prosopoRouter(env) {
         );
       }
       const { datasetId, user, dapp, sessionId } = parsed;
-      validateAddress.validiateSiteKey(dapp);
+      validateAddress.validateSiteKey(dapp);
       validateAddress.validateAddr(user);
       try {
         const clientRecord = await tasks$1.db.getClientRecord(dapp);
@@ -55,17 +54,6 @@ function prosopoRouter(env) {
             })
           );
         }
-        const imageCaptchaConfigResolver = userAccessPolicy.createImageCaptchaConfigResolver(
-          userAccessRulesStorage,
-          req.logger
-        );
-        const captchaConfig = await imageCaptchaConfigResolver.resolveConfig(
-          env.config.captchas,
-          ipAddress,
-          req.ja4,
-          user,
-          dapp
-        );
         const { valid, reason, frictionlessTokenId } = await tasks$1.imgCaptchaManager.isValidRequest(
           clientRecord,
           types.CaptchaType.image,
@@ -84,6 +72,24 @@ function prosopoRouter(env) {
             })
           );
         }
+        const userAccessPolicy2 = await tasks$1.imgCaptchaManager.getPrioritisedAccessPolicies(
+          userAccessRulesStorage,
+          dapp,
+          {
+            numericIp: ipAddress.bigInt(),
+            userId: user,
+            ja4Hash: req.ja4,
+            userAgent: req.headers["user-agent"]
+          }
+        );
+        const captchaConfig = {
+          solved: {
+            count: userAccessPolicy2?.solvedImagesCount || env.config.captchas.solved.count
+          },
+          unsolved: {
+            count: userAccessPolicy2?.unsolvedImagesCount || env.config.captchas.unsolved.count
+          }
+        };
         const taskData = await tasks$1.imgCaptchaManager.getRandomCaptchasAndRequestHash(
           datasetId,
           user,
@@ -111,7 +117,11 @@ function prosopoRouter(env) {
         };
         return res.json(captchaResponse);
       } catch (err) {
-        req.logger.error({ err, params: req.params });
+        req.logger.error(() => ({
+          err,
+          data: req.params,
+          msg: "Error in PoW captcha solution submission"
+        }));
         return next(
           new common.ProsopoApiError("API.BAD_REQUEST", {
             context: {
@@ -130,6 +140,7 @@ function prosopoRouter(env) {
   router.post(
     types.ClientApiPaths.SubmitImageCaptchaSolution,
     async (req, res, next) => {
+      const tasks$1 = new tasks.Tasks(env, req.logger);
       let parsed;
       try {
         parsed = types.CaptchaSolutionBody.parse(req.body);
@@ -143,7 +154,7 @@ function prosopoRouter(env) {
         );
       }
       const { user, dapp } = parsed;
-      validateAddress.validiateSiteKey(dapp);
+      validateAddress.validateSiteKey(dapp);
       validateAddress.validateAddr(user);
       try {
         const clientRecord = await tasks$1.db.getClientRecord(parsed.dapp);
@@ -165,7 +176,7 @@ function prosopoRouter(env) {
           Number.parseInt(parsed[types.ApiParams.timestamp]),
           parsed[types.ApiParams.signature].provider.requestHash,
           util.getIPAddress(req.ip || "").bigInt(),
-          util$1.flatten(req.headers),
+          util.flatten(req.headers),
           req.ja4
         );
         const returnValue = {
@@ -176,7 +187,11 @@ function prosopoRouter(env) {
         };
         return res.json(returnValue);
       } catch (err) {
-        req.logger.error({ err, body: req.body });
+        req.logger.error(() => ({
+          err,
+          body: req.body,
+          msg: "Error in PoW captcha solution submission"
+        }));
         return next(
           new common.ProsopoApiError("API.BAD_REQUEST", {
             context: {
@@ -193,6 +208,8 @@ function prosopoRouter(env) {
   );
   router.post(types.ClientApiPaths.GetPowCaptchaChallenge, async (req, res, next) => {
     let parsed;
+    const tasks$1 = new tasks.Tasks(env);
+    tasks$1.setLogger(req.logger);
     try {
       parsed = types.GetPowCaptchaChallengeRequestBody.parse(req.body);
     } catch (err) {
@@ -205,7 +222,7 @@ function prosopoRouter(env) {
       );
     }
     const { user, dapp, sessionId } = parsed;
-    validateAddress.validiateSiteKey(dapp);
+    validateAddress.validateSiteKey(dapp);
     validateAddress.validateAddr(user);
     try {
       const clientSettings = await tasks$1.db.getClientRecord(dapp);
@@ -267,7 +284,7 @@ function prosopoRouter(env) {
         challenge.difficulty,
         challenge.providerSignature,
         util.getIPAddress(req.ip || "").bigInt(),
-        util$1.flatten(req.headers),
+        util.flatten(req.headers),
         req.ja4,
         frictionlessTokenId
       );
@@ -284,7 +301,11 @@ function prosopoRouter(env) {
       };
       return res.json(getPowCaptchaResponse);
     } catch (err) {
-      req.logger.error({ err, body: req.body });
+      req.logger.error(() => ({
+        err,
+        body: req.body,
+        msg: "Error in PoW captcha solution submission"
+      }));
       return next(
         new common.ProsopoApiError("API.BAD_REQUEST", {
           context: {
@@ -303,6 +324,7 @@ function prosopoRouter(env) {
     types.ClientApiPaths.SubmitPowCaptchaSolution,
     async (req, res, next) => {
       let parsed;
+      const tasks$1 = new tasks.Tasks(env, req.logger);
       try {
         parsed = types.SubmitPowCaptchaSolutionBody.parse(req.body);
       } catch (err) {
@@ -323,7 +345,7 @@ function prosopoRouter(env) {
         dapp,
         user
       } = parsed;
-      validateAddress.validiateSiteKey(dapp);
+      validateAddress.validateSiteKey(dapp);
       validateAddress.validateAddr(user);
       try {
         const clientRecord = await tasks$1.db.getClientRecord(dapp);
@@ -344,12 +366,16 @@ function prosopoRouter(env) {
           verifiedTimeout,
           signature.user.timestamp,
           util.getIPAddress(req.ip || ""),
-          util$1.flatten(req.headers)
+          util.flatten(req.headers)
         );
         const response = { status: "ok", verified };
         return res.json(response);
       } catch (err) {
-        req.logger.error({ err, body: req.body });
+        req.logger.error(() => ({
+          err,
+          body: req.body,
+          msg: "Error in PoW captcha solution submission"
+        }));
         return next(
           new common.ProsopoApiError("API.BAD_REQUEST", {
             context: {
@@ -368,10 +394,14 @@ function prosopoRouter(env) {
     types.ClientApiPaths.GetFrictionlessCaptchaChallenge,
     async (req, res, next) => {
       try {
+        const tasks$1 = new tasks.Tasks(env, req.logger);
         const { token, dapp, user } = types.GetFrictionlessCaptchaChallengeRequestBody.parse(req.body);
         const existingToken = await tasks$1.db.getFrictionlessTokenRecordByToken(token);
         if (existingToken) {
-          req.logger.info(`Token ${existingToken} has already been used`);
+          req.logger.info(() => ({
+            token: existingToken,
+            msg: "Token has already been used"
+          }));
           return res.json(
             await tasks$1.frictionlessManager.sendImageCaptcha(
               existingToken._id
@@ -432,19 +462,58 @@ function prosopoRouter(env) {
           );
         }
         const ipAddress = util.getIPAddress(req.ip || "");
-        const imageCaptchaConfigResolver = userAccessPolicy.createImageCaptchaConfigResolver(
+        const resolveAccessPolicy = userAccessPolicy.createAccessPolicyResolver(
           userAccessRulesStorage,
           req.logger
         );
-        const imageCaptchaConfigDefined = await imageCaptchaConfigResolver.isConfigDefined(
-          dapp,
-          ipAddress,
-          req.ja4,
-          user
-        );
-        if (imageCaptchaConfigDefined) {
+        const accessPolicy = await resolveAccessPolicy({
+          policyScope: {
+            clientId: dapp
+          },
+          policyScopeMatch: userAccessPolicy.ScopeMatch.Greedy,
+          userScope: {
+            userId: user,
+            ja4Hash: req.ja4,
+            numericIp: ipAddress.bigInt()
+          },
+          userScopeMatch: userAccessPolicy.ScopeMatch.Greedy
+        });
+        const accessPolicies = await Promise.all([
+          resolveAccessPolicy({
+            userScope: {
+              userId: user,
+              ja4Hash: req.ja4,
+              numericIp: ipAddress.bigInt()
+            },
+            userScopeMatch: userAccessPolicy.ScopeMatch.Exact
+          }),
+          resolveAccessPolicy({
+            policyScope: {
+              clientId: dapp
+            },
+            policyScopeMatch: userAccessPolicy.ScopeMatch.Exact,
+            userScope: {
+              userId: user,
+              ja4Hash: req.ja4,
+              numericIp: ipAddress.bigInt()
+            },
+            userScopeMatch: userAccessPolicy.ScopeMatch.Exact
+          }),
+          resolveAccessPolicy({
+            policyScope: {
+              clientId: dapp
+            },
+            policyScopeMatch: userAccessPolicy.ScopeMatch.Exact,
+            userScope: {
+              ja4Hash: req.ja4,
+              numericIp: ipAddress.bigInt()
+            },
+            userScopeMatch: userAccessPolicy.ScopeMatch.Exact
+          })
+        ]);
+        if (accessPolicy?.solvedImagesCount || accessPolicy?.unsolvedImagesCount) {
           await tasks$1.frictionlessManager.scoreIncreaseAccessPolicy(
-            imageCaptchaConfigResolver.accessRule,
+            accessPolicy,
             baseBotScore,
             botScore,
             tokenId
@@ -454,9 +523,14 @@ function prosopoRouter(env) {
           );
         }
         if (Number(botScore) > botThreshold) {
-          req.logger.info({
-            message: `Bot score ${botScore} is greater than threshold ${botThreshold}`
-          });
+          req.logger.info(() => ({
+            message: "Bot score is greater than threshold",
+            data: {
+              botScore,
+              botThreshold,
+              tokenId
+            }
+          }));
           return res.json(
             await tasks$1.frictionlessManager.sendImageCaptcha(tokenId)
           );
@@ -465,7 +539,10 @@ function prosopoRouter(env) {
           await tasks$1.frictionlessManager.sendPowCaptcha(tokenId)
         );
       } catch (err) {
-        req.logger.error("Error in frictionless captcha challenge:", err);
+        req.logger.error(() => ({
+          err,
+          msg: "Error in frictionless captcha challenge"
+        }));
         return next(
           new common.ProsopoApiError("API.BAD_REQUEST", {
             context: { code: 400, error: err },

package/dist/cjs/api/domainMiddleware.cjs

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const utilCrypto = require("@polkadot/util-crypto");
 const apiExpressRouter = require("@prosopo/api-express-router");
 const common = require("@prosopo/common");
+const utilCrypto = require("@prosopo/util-crypto");
 const zod = require("zod");
 require("../tasks/index.cjs");
 const tasks = require("../tasks/tasks.cjs");
@@ -60,9 +60,9 @@ const siteKeyNotRegisteredError = (i18n, dapp, logger) => {
     logger
   });
 };
-const invalidSiteKeyError = (i18n, dapp, logger) => {
+const invalidSiteKeyError = (i18n, siteKey, logger) => {
   return new common.ProsopoApiError("API.INVALID_SITE_KEY", {
-    context: { code: 400, siteKey: dapp },
+    context: { code: 400, siteKey },
     i18n,
     logger
   });

package/dist/cjs/api/headerCheckMiddleware.cjs

@@ -15,7 +15,7 @@ const headerCheckMiddleware = (env) => {
         unauthorised(res);
         return;
       }
-      validateAddress.validiateSiteKey(siteKey, req.logger);
+      validateAddress.validateSiteKey(siteKey, req.logger);
       validateAddress.validateAddr(user, void 0, req.logger);
       req.user = user;
       req.siteKey = siteKey;

package/dist/cjs/api/ja4Middleware.cjs

@@ -7,7 +7,7 @@ const common = require("@prosopo/common");
 const readTlsClientHello = require("read-tls-client-hello");
 const DEFAULT_JA4 = "ja4";
 const getJA4 = async (headers, logger) => {
-  logger = logger || common.getLoggerDefault();
+  logger = logger || common.getLogger("info", module);
   if (process.env.NODE_ENV === "development") {
     return { ja4PlusFingerprint: DEFAULT_JA4 };
   }
@@ -16,15 +16,20 @@ const getJA4 = async (headers, logger) => {
     const xTlsVersion = (headers["x-tls-version"] || "").toString().toLowerCase();
     const xTlsServerName = (headers["x-tls-server-name"] || "").toString();
     const clientHelloBuffer = Buffer.from(xTlsClientHello, "base64");
-    logger.debug(
-      "ClientHello First Bytes:",
-      clientHelloBuffer.subarray(0, 5).toString("hex")
-    );
+    logger.debug(() => ({
+      msg: "ClientHello First Bytes:",
+      data: { hex: clientHelloBuffer.subarray(0, 5).toString("hex") }
+    }));
     if (clientHelloBuffer[5] !== 1) {
-      logger.warn("Invalid ClientHello message: First byte is not 0x01");
+      logger.debug(() => ({
+        msg: "Invalid ClientHello message: First byte is not 0x01"
+      }));
       return { ja4PlusFingerprint: DEFAULT_JA4 };
     }
-    logger.debug("Headers TLS Version:", xTlsVersion);
+    logger.debug(() => ({
+      msg: "Headers TLS Version:",
+      data: { xTlsVersion }
+    }));
     const tlsVersion = xTlsVersion.replace(/(tls)|\./g, "");
     const readableStream = new node_stream.Readable({
       read() {
@@ -53,13 +58,17 @@ const getJA4 = async (headers, logger) => {
     const ja4PlusFingerprint = `${transport}${tlsVersion}${sniIndicator}${cipherCount}${extensionCount}${alpnLabel}_${cipherHash}_${extensionHash}`;
     return { ja4PlusFingerprint };
   } catch (e) {
-    logger.error("Error generating JA4+ fingerprint:", e);
+    logger.error(() => ({
+      msg: "Error generating JA4+ fingerprint:",
+      err: e instanceof Error ? e : new Error(String(e))
+    }));
     return { ja4PlusFingerprint: DEFAULT_JA4 };
   }
 };
 const ja4Middleware = (env) => {
   return async (req, res, next) => {
     try {
+      req.logger.debug(() => ({ data: { url: req.url } }));
       const ja4 = await getJA4(req.headers, req.logger);
       req.ja4 = ja4.ja4PlusFingerprint || "";
       next();