@prosopo/provider 2.9.8 → 3.0.6

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

@@ -40,12 +40,12 @@ class FrictionlessManager extends captchaManager.CaptchaManager {
       [types.ApiParams.status]: "ok"
     };
   }
-  async scoreIncreaseAccessPolicy(accessRule, baseBotScore, botScore, tokenId) {
-    const accessPolicyPenalty = accessRule?.score || this.config.penalties.PENALTY_ACCESS_RULE;
+  async scoreIncreaseAccessPolicy(accessPolicy, baseBotScore, botScore, tokenId) {
+    const accessPolicyPenalty = accessPolicy?.frictionlessScore || this.config.penalties.PENALTY_ACCESS_RULE;
     botScore += accessPolicyPenalty;
-    this.logger.info({
-      message: "Address has an image captcha config defined"
-    });
+    this.logger.info(() => ({
+      msg: "Address has an image captcha config defined"
+    }));
     await this.db.updateFrictionlessTokenRecord(tokenId, {
       score: botScore,
       scoreComponents: {
@@ -56,7 +56,10 @@ class FrictionlessManager extends captchaManager.CaptchaManager {
     return botScore;
   }
   async scoreIncreaseTimestamp(timestamp, baseBotScore, botScore, tokenId) {
-    this.logger.info("Timestamp is older than 10 minutes", new Date(timestamp));
+    this.logger.info(() => ({
+      msg: "Timestamp is older than 10 minutes",
+      data: { timestamp: new Date(timestamp) }
+    }));
     botScore += this.config.penalties.PENALTY_OLD_TIMESTAMP;
     await this.db.updateFrictionlessTokenRecord(tokenId, {
       score: botScore,
@@ -77,41 +80,45 @@ class FrictionlessManager extends captchaManager.CaptchaManager {
       process.env.BOT_DECRYPTION_KEY,
       ...await this.getDetectorKeys()
     ].filter((k) => k);
-    this.logger.debug({
-      action: "Decrypting score",
-      keysLength: decryptKeys.length,
-      keys: decryptKeys.map(
-        (k) => k ? `${k.slice(0, 5)}...${k.slice(-5)}` || "" : ""
-      )
-    });
+    this.logger.debug(() => ({
+      msg: "Decrypting score",
+      data: {
+        keysLength: decryptKeys.length,
+        keys: decryptKeys.map(
+          (k) => k ? `${k.slice(0, 5)}...${k.slice(-5)}` || "" : ""
+        )
+      }
+    }));
     let baseBotScore;
     let timestamp;
     for (const [keyIndex, key] of decryptKeys.entries()) {
       try {
         const { baseBotScore: s, timestamp: t } = await getBotScore.getBotScore(token, key);
-        this.logger.debug({
-          message: "Successfully decrypted score",
-          key: key ? `${key.slice(0, 5)}...${key.slice(-5)}` : "",
-          baseBotScore: s,
-          timestamp: t
-        });
+        this.logger.info(() => ({
+          msg: "Successfully decrypted score",
+          data: {
+            key: key ? `${key.slice(0, 5)}...${key.slice(-5)}` : "",
+            baseBotScore: s,
+            timestamp: t
+          }
+        }));
         baseBotScore = s;
         timestamp = t;
         break;
       } catch (err) {
         if (keyIndex === decryptKeys.length - 1) {
-          this.logger.warn({
-            message: "Error decrypting score: no more keys to try"
-          });
+          this.logger.warn(() => ({
+            msg: "Error decrypting score: no more keys to try"
+          }));
           baseBotScore = 1;
           timestamp = 0;
         }
       }
     }
     if (baseBotScore === void 0 || timestamp === void 0) {
-      this.logger.error({
-        message: "Error decrypting score: baseBotScore or timestamp is undefined"
-      });
+      this.logger.error(() => ({
+        msg: "Error decrypting score: baseBotScore or timestamp is undefined"
+      }));
       baseBotScore = 1;
       timestamp = 0;
     }

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

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const util$1 = require("@polkadot/util");
-const utilCrypto = require("@polkadot/util-crypto");
 const common = require("@prosopo/common");
 const datasets = require("@prosopo/datasets");
 const types = require("@prosopo/types");
 const util$2 = require("@prosopo/util");
+const utilCrypto = require("@prosopo/util-crypto");
 const lang = require("../../rules/lang.cjs");
 const util = require("../../util.cjs");
 const captchaManager = require("../captchaManager.cjs");
@@ -110,10 +110,14 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
       userAccount
     );
     if (!verification.isValid) {
-      this.logger.info("Invalid user timestamp signature");
-      throw new common.ProsopoEnvError("GENERAL.INVALID_SIGNATURE", {
+      const err = new common.ProsopoEnvError("GENERAL.INVALID_SIGNATURE", {
         context: { failedFuncName: this.dappUserSolution.name, userAccount }
       });
+      this.logger.info(() => ({
+        err,
+        msg: "Invalid user timestamp signature"
+      }));
+      throw err;
     }
     const providerRequestHashSignatureVerify = utilCrypto.signatureVerify(
       util$1.stringToHex(requestHash.toString()),
@@ -121,14 +125,18 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
       this.pair.address
     );
     if (!providerRequestHashSignatureVerify.isValid) {
-      this.logger.info("Invalid provider requestHash signature");
-      throw new common.ProsopoEnvError("GENERAL.INVALID_SIGNATURE", {
+      const err = new common.ProsopoEnvError("GENERAL.INVALID_SIGNATURE", {
         context: {
           failedFuncName: this.dappUserSolution.name,
           userAccount,
           error: "requestHash signature is invalid"
         }
       });
+      this.logger.info(() => ({
+        err,
+        msg: "Invalid provider requestHash signature"
+      }));
+      throw err;
     }
     let response = {
       captchas: [],
@@ -211,7 +219,9 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
         };
       }
     } else {
-      this.logger.info("Request hash not found");
+      this.logger.info(() => ({
+        msg: "Request hash not found"
+      }));
     }
     return response;
   }
@@ -253,11 +263,15 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
   async validateDappUserSolutionRequestIsPending(requestHash, pendingRecord, userAccount, captchaIds) {
     const currentTime = Date.now();
     if (!pendingRecord) {
-      this.logger.info("No pending record found");
+      this.logger.info(() => ({
+        msg: "No pending record found"
+      }));
       return false;
     }
     if (pendingRecord.deadlineTimestamp < currentTime) {
-      this.logger.info("Deadline for responding to captcha has expired");
+      this.logger.info(() => ({
+        msg: "Deadline for responding to captcha has expired"
+      }));
       return false;
     }
     if (pendingRecord) {
@@ -303,21 +317,14 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
   async verifyImageCaptchaSolution(user, dapp, commitmentId, maxVerifiedTime, ip) {
     const solution = await (commitmentId ? this.getDappUserCommitmentById(commitmentId) : this.getDappUserCommitmentByAccount(user, dapp));
     if (!solution) {
-      this.logger.debug("Not verified - no solution found");
+      this.logger.debug(() => ({
+        msg: "Not verified - no solution found"
+      }));
       return { status: "API.USER_NOT_VERIFIED_NO_SOLUTION", verified: false };
     }
-    if (ip) {
-      const ipV4Address = util.getIPAddress(ip);
-      if (!ipV4Address) {
-        this.logger.debug(`Invalid IP address: ${ip}`);
-        return { status: "API.USER_NOT_VERIFIED", verified: false };
-      }
-      if (solution.ipAddress !== ipV4Address.bigInt()) {
-        this.logger.debug(
-          `IP address mismatch: ${util.getIPAddressFromBigInt(solution.ipAddress).address} !== ${ip}`
-        );
-        return { status: "API.USER_NOT_VERIFIED", verified: false };
-      }
+    const ipValidation = util.validateIpAddress(ip, solution.ipAddress, this.logger);
+    if (!ipValidation.isValid) {
+      return { status: "API.USER_NOT_VERIFIED", verified: false };
     }
     if (solution.serverChecked) {
       return { status: "API.USER_ALREADY_VERIFIED", verified: false };
@@ -331,7 +338,9 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
       const currentTime = Date.now();
       const timeSinceCompletion = currentTime - solution.requestedAtTimestamp;
       if (timeSinceCompletion > maxVerifiedTime) {
-        this.logger.debug("Not verified - timed out");
+        this.logger.debug(() => ({
+          msg: "Not verified - timed out"
+        }));
         return {
           status: "API.USER_NOT_VERIFIED_TIME_EXPIRED",
           verified: false
@@ -346,10 +355,12 @@ class ImgCaptchaManager extends captchaManager.CaptchaManager {
       );
       if (tokenRecord) {
         score = frictionlessTasksUtils.computeFrictionlessScore(tokenRecord?.scoreComponents);
-        this.logger.info({
-          tscoreComponents: tokenRecord?.scoreComponents,
-          score
-        });
+        this.logger.info(() => ({
+          data: {
+            tscoreComponents: tokenRecord?.scoreComponents,
+            score
+          }
+        }));
       }
     }
     return {

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

@@ -65,7 +65,9 @@ class PowCaptchaManager extends captchaManager.CaptchaManager {
     );
     const challengeRecord = await this.db.getPowCaptchaRecordByChallenge(challenge);
     if (!challengeRecord) {
-      this.logger.debug("No record of this challenge");
+      this.logger.debug(() => ({
+        msg: `No record of this challenge: ${challenge}`
+      }));
       return false;
     }
     if (!util$1.verifyRecency(challenge, timeout)) {
@@ -112,21 +114,18 @@ class PowCaptchaManager extends captchaManager.CaptchaManager {
   async serverVerifyPowCaptchaSolution(dappAccount, challenge, timeout, ip) {
     const challengeRecord = await this.db.getPowCaptchaRecordByChallenge(challenge);
     if (!challengeRecord) {
-      this.logger.debug(`No record of this challenge: ${challenge}`);
+      this.logger.debug(() => ({
+        msg: `No record of this challenge: ${challenge}`
+      }));
       return { verified: false };
     }
-    if (ip) {
-      const ipV4Address = util$2.getIPAddress(ip);
-      if (!ipV4Address) {
-        this.logger.debug(`Invalid IP address: ${ip}`);
-        return { verified: false };
-      }
-      if (challengeRecord.ipAddress !== ipV4Address.bigInt()) {
-        this.logger.debug(
-          `IP address mismatch: ${util$2.getIPAddressFromBigInt(challengeRecord.ipAddress).address} !== ${ip}`
-        );
-        return { verified: false };
-      }
+    const ipValidation = util$2.validateIpAddress(
+      ip,
+      challengeRecord.ipAddress,
+      this.logger
+    );
+    if (!ipValidation.isValid) {
+      return { verified: false };
     }
     if (challengeRecord.result.status !== types.CaptchaStatus.approved) {
       throw new common.ProsopoApiError("CAPTCHA.INVALID_SOLUTION", {
@@ -158,10 +157,12 @@ class PowCaptchaManager extends captchaManager.CaptchaManager {
       );
       if (tokenRecord) {
         score = frictionlessTasksUtils.computeFrictionlessScore(tokenRecord?.scoreComponents);
-        this.logger.info({
-          tscoreComponents: tokenRecord?.scoreComponents,
-          score
-        });
+        this.logger.info(() => ({
+          data: {
+            tscoreComponents: { ...tokenRecord?.scoreComponents || {} },
+            score
+          }
+        }));
       }
     }
     return { verified: true, ...score ? { score } : {} };

package/dist/cjs/tasks/powCaptcha/powTasksUtils.cjs

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const sha256 = require("@noble/hashes/sha256");
 const util = require("@polkadot/util");
-const utilCrypto = require("@polkadot/util-crypto");
 const common = require("@prosopo/common");
+const utilCrypto = require("@prosopo/util-crypto");
 const validateSolution = (nonce, challenge, difficulty) => Array.from(sha256.sha256(new TextEncoder().encode(nonce + challenge))).map((byte) => byte.toString(16).padStart(2, "0")).join("").startsWith("0".repeat(difficulty));
-const checkPowSignature = (challenge, signature, address, signatureType) => {
+const checkPowSignature = (message, signature, address, signatureType) => {
   const signatureVerification = utilCrypto.signatureVerify(
-    util.stringToHex(challenge),
+    util.stringToHex(message),
     signature,
     address
   );
@@ -16,6 +16,8 @@ const checkPowSignature = (challenge, signature, address, signatureType) => {
       context: {
         ERROR: `Signature is invalid for this message: ${signatureType}`,
         failedFuncName: checkPowSignature.name,
+        address,
+        message,
         signature,
         signatureType
       }

package/dist/cjs/tasks/tasks.cjs

@@ -7,11 +7,11 @@ const frictionlessTasks = require("./frictionless/frictionlessTasks.cjs");
 const imgCaptchaTasks = require("./imgCaptcha/imgCaptchaTasks.cjs");
 const powTasks = require("./powCaptcha/powTasks.cjs");
 class Tasks {
-  constructor(env) {
+  constructor(env, logger) {
     this.config = env.config;
     this.db = env.getDb();
     this.captchaConfig = env.config.captchas;
-    this.logger = common.getLogger(env.config.logLevel, "Tasks");
+    this.logger = logger || common.getLogger(common.parseLogLevel(env.config.logLevel), "Tasks");
     if (!env.pair) {
       throw new common.ProsopoEnvError("DEVELOPER.MISSING_PROVIDER_PAIR", {
         context: { failedFuncName: "Tasks.constructor" }
@@ -47,5 +47,14 @@ class Tasks {
       this.logger
     );
   }
+  setLogger(logger) {
+    this.logger = logger;
+    this.powCaptchaManager.logger = logger;
+    this.datasetManager.logger = logger;
+    this.imgCaptchaManager.logger = logger;
+    this.clientTaskManager.logger = logger;
+    this.frictionlessManager.logger = logger;
+    this.db.logger = logger;
+  }
 }
 exports.Tasks = Tasks;

package/dist/cjs/util.cjs

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const address = require("@polkadot/util-crypto/address");
 const hex = require("@polkadot/util/hex");
 const is = require("@polkadot/util/is");
 const common = require("@prosopo/common");
 const types = require("@prosopo/types");
 const util = require("@prosopo/util");
+const utilCrypto = require("@prosopo/util-crypto");
 const ipAddress = require("ip-address");
-function encodeStringAddress(address$1) {
+function encodeStringAddress(address) {
   try {
-    return address.encodeAddress(
-      is.isHex(address$1) ? hex.hexToU8a(address$1) : address.decodeAddress(address$1)
+    return utilCrypto.encodeAddress(
+      is.isHex(address) ? hex.hexToU8a(address) : utilCrypto.decodeAddress(address)
     );
   } catch (err) {
     throw new common.ProsopoContractError("CONTRACT.INVALID_ADDRESS", {
-      context: { address: address$1 }
+      context: { address }
     });
   }
 }
@@ -44,19 +44,69 @@ async function checkIfTaskIsRunning(taskName, db) {
 }
 const getIPAddress = (ipAddressString) => {
   try {
-    if (ipAddressString.match(/^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}$/)) {
+    try {
       return new ipAddress.Address4(ipAddressString);
+    } catch (e) {
+      return new ipAddress.Address6(ipAddressString);
     }
-    return new ipAddress.Address6(ipAddressString);
   } catch (e) {
     throw new common.ProsopoEnvError("API.INVALID_IP");
   }
 };
 const getIPAddressFromBigInt = (ipAddressBigInt) => {
-  return ipAddress.Address4.fromBigInt(ipAddressBigInt);
+  try {
+    if (ipAddressBigInt > 4228250626n) {
+      return ipAddress.Address6.fromBigInt(BigInt(ipAddressBigInt));
+    }
+    return ipAddress.Address4.fromBigInt(BigInt(ipAddressBigInt));
+  } catch (e) {
+    throw new common.ProsopoEnvError("API.INVALID_IP");
+  }
+};
+const validateIpAddress = (ip, challengeRecordIpAddress, logger) => {
+  if (!ip) {
+    return { isValid: true };
+  }
+  let ipV4orV6Address;
+  try {
+    ipV4orV6Address = getIPAddress(ip);
+    logger.info(() => ({ data: { ipV4orV6Address } }));
+  } catch (e) {
+    const errorMessage = `Invalid IP address: ${ip}`;
+    logger.info(() => ({ msg: errorMessage }));
+    return { isValid: false, errorMessage };
+  }
+  let challengeIpV4orV6Address = getIPAddressFromBigInt(
+    challengeRecordIpAddress
+  );
+  ipV4orV6Address = "address4" in ipV4orV6Address && ipV4orV6Address.address4 ? ipV4orV6Address.address4 : ipV4orV6Address;
+  challengeIpV4orV6Address = "address4" in challengeIpV4orV6Address && challengeIpV4orV6Address.address4 ? challengeIpV4orV6Address.address4 : challengeIpV4orV6Address;
+  if (ipV4orV6Address.v4 && !challengeIpV4orV6Address.v4) {
+    challengeIpV4orV6Address = new ipAddress.Address4(
+      challengeIpV4orV6Address.to4().correctForm()
+    );
+  }
+  if (!ipV4orV6Address.v4 && challengeIpV4orV6Address.v4) {
+    ipV4orV6Address = new ipAddress.Address6(
+      ipV4orV6Address.to4().correctForm()
+    );
+  }
+  if (challengeIpV4orV6Address.bigInt() - ipV4orV6Address.bigInt() !== 0n) {
+    const errorMessage = `IP address mismatch: ${challengeIpV4orV6Address.address} !== ${ipV4orV6Address.address}`;
+    logger.info(() => ({
+      msg: errorMessage,
+      data: {
+        challengeIp: challengeIpV4orV6Address.address,
+        providedIp: ipV4orV6Address.address
+      }
+    }));
+    return { isValid: false, errorMessage };
+  }
+  return { isValid: true };
 };
 exports.checkIfTaskIsRunning = checkIfTaskIsRunning;
 exports.encodeStringAddress = encodeStringAddress;
 exports.getIPAddress = getIPAddress;
 exports.getIPAddressFromBigInt = getIPAddressFromBigInt;
 exports.shuffleArray = shuffleArray;
+exports.validateIpAddress = validateIpAddress;

package/dist/index.d.ts

@@ -3,7 +3,6 @@ export * from "./util.js";
 export * from "./api/block.js";
 export * from "./api/captcha.js";
 export * from "./api/verify.js";
-export * from "./api/authMiddleware.js";
 export * from "./api/ja4Middleware.js";
 export * from "./api/public.js";
 export * from "./api/domainMiddleware.js";
@@ -11,7 +10,6 @@ export * from "./schedulers/captchaScheduler.js";
 export * from "./schedulers/getClientList.js";
 export * from "./api/headerCheckMiddleware.js";
 export * from "./api/admin/createApiAdminRoutesProvider.js";
-export * from "./api/requestLoggerMiddleware.js";
 export * from "./api/ignoreMiddleware.js";
 export * from "./api/robotsMiddleware.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAcA,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kCAAkC,CAAC;AACjD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6CAA6C,CAAC;AAC5D,cAAc,kCAAkC,CAAC;AACjD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAcA,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kCAAkC,CAAC;AACjD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6CAA6C,CAAC;AAC5D,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC"}

package/dist/index.js

@@ -3,7 +3,6 @@ export * from "./util.js";
 export * from "./api/block.js";
 export * from "./api/captcha.js";
 export * from "./api/verify.js";
-export * from "./api/authMiddleware.js";
 export * from "./api/ja4Middleware.js";
 export * from "./api/public.js";
 export * from "./api/domainMiddleware.js";
@@ -11,7 +10,6 @@ export * from "./schedulers/captchaScheduler.js";
 export * from "./schedulers/getClientList.js";
 export * from "./api/headerCheckMiddleware.js";
 export * from "./api/admin/createApiAdminRoutesProvider.js";
-export * from "./api/requestLoggerMiddleware.js";
 export * from "./api/ignoreMiddleware.js";
 export * from "./api/robotsMiddleware.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAcA,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kCAAkC,CAAC;AACjD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6CAA6C,CAAC;AAC5D,cAAc,kCAAkC,CAAC;AACjD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAcA,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kCAAkC,CAAC;AACjD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6CAA6C,CAAC;AAC5D,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC"}

package/dist/schedulers/captchaScheduler.d.ts

@@ -1,4 +1,4 @@
-import type { KeyringPair } from "@polkadot/keyring/types";
+import type { KeyringPair } from "@prosopo/types";
 import { type ProsopoConfigOutput } from "@prosopo/types";
 export declare function storeCaptchasExternally(pair: KeyringPair, cronSchedule: string, config: ProsopoConfigOutput): Promise<void>;
 //# sourceMappingURL=captchaScheduler.d.ts.map

package/dist/schedulers/captchaScheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"captchaScheduler.d.ts","sourceRoot":"","sources":["../../src/schedulers/captchaScheduler.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,KAAK,mBAAmB,EAAsB,MAAM,gBAAgB,CAAC;AAK9E,wBAAsB,uBAAuB,CAC5C,IAAI,EAAE,WAAW,EACjB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,mBAAmB,iBA0B3B"}
+{"version":3,"file":"captchaScheduler.d.ts","sourceRoot":"","sources":["../../src/schedulers/captchaScheduler.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,KAAK,mBAAmB,EAAsB,MAAM,gBAAgB,CAAC;AAK9E,wBAAsB,uBAAuB,CAC5C,IAAI,EAAE,WAAW,EACjB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,mBAAmB,iBA8B3B"}

package/dist/schedulers/captchaScheduler.js

@@ -9,11 +9,19 @@ export async function storeCaptchasExternally(pair, cronSchedule, config) {
     const tasks = new Tasks(env);
     const job = new CronJob(cronSchedule, async () => {
         const taskRunning = await checkIfTaskIsRunning(ScheduledTaskNames.StoreCommitmentsExternal, env.getDb());
-        env.logger.info(`${ScheduledTaskNames.StoreCommitmentsExternal} task running: ${taskRunning}`);
+        env.logger.info(() => ({
+            data: { taskRunning },
+            msg: `${ScheduledTaskNames.StoreCommitmentsExternal} task running: ${taskRunning}`,
+        }));
         if (!taskRunning) {
-            env.logger.info(`${ScheduledTaskNames.StoreCommitmentsExternal} task....`);
+            env.logger.info(() => ({
+                msg: `${ScheduledTaskNames.StoreCommitmentsExternal} task....`,
+            }));
             await tasks.clientTaskManager.storeCommitmentsExternal().catch((err) => {
-                env.logger.error(err);
+                env.logger.error(() => ({
+                    err,
+                    msg: "Error storing commitments externally",
+                }));
             });
         }
     });

package/dist/schedulers/captchaScheduler.js.map

@@ -1 +1 @@
-{"version":3,"file":"captchaScheduler.js","sourceRoot":"","sources":["../../src/schedulers/captchaScheduler.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAA4B,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC5C,IAAiB,EACjB,YAAoB,EACpB,MAA2B;IAE3B,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAClD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IAEpB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;IAE7B,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAChD,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAC7C,kBAAkB,CAAC,wBAAwB,EAC3C,GAAG,CAAC,KAAK,EAAE,CACX,CAAC;QACF,GAAG,CAAC,MAAM,CAAC,IAAI,CACd,GAAG,kBAAkB,CAAC,wBAAwB,kBAAkB,WAAW,EAAE,CAC7E,CAAC;QACF,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,GAAG,CAAC,MAAM,CAAC,IAAI,CACd,GAAG,kBAAkB,CAAC,wBAAwB,WAAW,CACzD,CAAC;YACF,MAAM,KAAK,CAAC,iBAAiB,CAAC,wBAAwB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACtE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,KAAK,EAAE,CAAC;AACb,CAAC"}
+{"version":3,"file":"captchaScheduler.js","sourceRoot":"","sources":["../../src/schedulers/captchaScheduler.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,EAA4B,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC5C,IAAiB,EACjB,YAAoB,EACpB,MAA2B;IAE3B,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAClD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IAEpB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;IAE7B,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAChD,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAC7C,kBAAkB,CAAC,wBAAwB,EAC3C,GAAG,CAAC,KAAK,EAAE,CACX,CAAC;QACF,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YACtB,IAAI,EAAE,EAAE,WAAW,EAAE;YACrB,GAAG,EAAE,GAAG,kBAAkB,CAAC,wBAAwB,kBAAkB,WAAW,EAAE;SAClF,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;gBACtB,GAAG,EAAE,GAAG,kBAAkB,CAAC,wBAAwB,WAAW;aAC9D,CAAC,CAAC,CAAC;YACJ,MAAM,KAAK,CAAC,iBAAiB,CAAC,wBAAwB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACtE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;oBACvB,GAAG;oBACH,GAAG,EAAE,sCAAsC;iBAC3C,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,KAAK,EAAE,CAAC;AACb,CAAC"}

package/dist/schedulers/getClientList.d.ts

@@ -1,4 +1,4 @@
-import type { KeyringPair } from "@polkadot/keyring/types";
+import type { KeyringPair } from "@prosopo/types";
 import { type ProsopoConfigOutput } from "@prosopo/types";
 export declare function getClientList(pair: KeyringPair, cronSchedule: string, config: ProsopoConfigOutput): Promise<void>;
 //# sourceMappingURL=getClientList.d.ts.map

package/dist/schedulers/getClientList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getClientList.d.ts","sourceRoot":"","sources":["../../src/schedulers/getClientList.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,KAAK,mBAAmB,EAAsB,MAAM,gBAAgB,CAAC;AAW9E,wBAAsB,aAAa,CAClC,IAAI,EAAE,WAAW,EACjB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,mBAAmB,iBAwB3B"}
+{"version":3,"file":"getClientList.d.ts","sourceRoot":"","sources":["../../src/schedulers/getClientList.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,KAAK,mBAAmB,EAAsB,MAAM,gBAAgB,CAAC;AAW9E,wBAAsB,aAAa,CAClC,IAAI,EAAE,WAAW,EACjB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,mBAAmB,iBA+B3B"}

package/dist/schedulers/getClientList.js

@@ -9,11 +9,20 @@ export async function getClientList(pair, cronSchedule, config) {
     const tasks = new Tasks(env);
     const job = new CronJob(cronSchedule, async () => {
         const taskRunning = await checkIfTaskIsRunning(ScheduledTaskNames.GetClientList, env.getDb());
-        env.logger.info(`${ScheduledTaskNames.GetClientList} task running: ${taskRunning}`);
+        env.logger.info(() => ({
+            msg: `${ScheduledTaskNames.GetClientList} task running: ${taskRunning}`,
+            data: { taskRunning },
+        }));
         if (!taskRunning) {
-            env.logger.info(`${ScheduledTaskNames.GetClientList} task....`);
+            env.logger.info(() => ({
+                msg: `${ScheduledTaskNames.GetClientList} task....`,
+                data: {},
+            }));
             await tasks.clientTaskManager.getClientList().catch((err) => {
-                env.logger.error(err);
+                env.logger.error(() => ({
+                    err,
+                    msg: "Error getting client list",
+                }));
             });
         }
     });

package/dist/schedulers/getClientList.js.map

@@ -1 +1 @@
-{"version":3,"file":"getClientList.js","sourceRoot":"","sources":["../../src/schedulers/getClientList.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAA4B,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAQlD,MAAM,CAAC,KAAK,UAAU,aAAa,CAClC,IAAiB,EACjB,YAAoB,EACpB,MAA2B;IAE3B,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAClD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IAEpB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;IAE7B,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAChD,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAC7C,kBAAkB,CAAC,aAAa,EAChC,GAAG,CAAC,KAAK,EAAE,CACX,CAAC;QACF,GAAG,CAAC,MAAM,CAAC,IAAI,CACd,GAAG,kBAAkB,CAAC,aAAa,kBAAkB,WAAW,EAAE,CAClE,CAAC;QACF,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,aAAa,WAAW,CAAC,CAAC;YAChE,MAAM,KAAK,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC3D,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,KAAK,EAAE,CAAC;AACb,CAAC"}
+{"version":3,"file":"getClientList.js","sourceRoot":"","sources":["../../src/schedulers/getClientList.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,EAA4B,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAQlD,MAAM,CAAC,KAAK,UAAU,aAAa,CAClC,IAAiB,EACjB,YAAoB,EACpB,MAA2B;IAE3B,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAClD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IAEpB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;IAE7B,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAChD,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAC7C,kBAAkB,CAAC,aAAa,EAChC,GAAG,CAAC,KAAK,EAAE,CACX,CAAC;QACF,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YACtB,GAAG,EAAE,GAAG,kBAAkB,CAAC,aAAa,kBAAkB,WAAW,EAAE;YACvE,IAAI,EAAE,EAAE,WAAW,EAAE;SACrB,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;gBACtB,GAAG,EAAE,GAAG,kBAAkB,CAAC,aAAa,WAAW;gBACnD,IAAI,EAAE,EAAE;aACR,CAAC,CAAC,CAAC;YACJ,MAAM,KAAK,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC3D,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;oBACvB,GAAG;oBACH,GAAG,EAAE,2BAA2B;iBAChC,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,KAAK,EAAE,CAAC;AACb,CAAC"}

package/dist/tasks/captchaManager.d.ts

@@ -1,8 +1,9 @@
-import type { KeyringPair } from "@polkadot/keyring/types";
 import { type Logger } from "@prosopo/common";
 import type { TranslationKey } from "@prosopo/locale";
+import type { KeyringPair } from "@prosopo/types";
 import { CaptchaType, Tier } from "@prosopo/types";
 import type { ClientRecord, FrictionlessTokenId, IProviderDatabase, IUserDataSlim, Session } from "@prosopo/types-database";
+import { type AccessRulesStorage } from "@prosopo/user-access-policy";
 export declare class CaptchaManager {
     pair: KeyringPair;
     db: IProviderDatabase;
@@ -20,6 +21,18 @@ export declare class CaptchaManager {
         status: string;
         verified: boolean;
     };
+    getPrioritisedAccessPolicies(userAccessRulesStorage: AccessRulesStorage, clientId: string, userScope: {
+        [key: string]: bigint | string | undefined;
+    }): Promise<{
+        type?: any;
+        captchaType?: any;
+        description?: any;
+        solvedImagesCount?: any;
+        imageThreshold?: any;
+        powDifficulty?: any;
+        unsolvedImagesCount?: any;
+        frictionlessScore?: any;
+    } | undefined>;
     getDetectorKeys(): Promise<string[]>;
     static canClientSeeScore(tier: Tier, score?: number): boolean | 0 | undefined;
 }

package/dist/tasks/captchaManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"captchaManager.d.ts","sourceRoot":"","sources":["../../src/tasks/captchaManager.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,KAAK,MAAM,EAAoB,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAa,WAAW,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,KAAK,EACX,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EACjB,aAAa,EACb,OAAO,EACP,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,cAAc;IAC1B,IAAI,EAAE,WAAW,CAAC;IAClB,EAAE,EAAE,iBAAiB,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;gBAEH,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,MAAM;IAM/D,iCAAiC,CAAC,aAAa,EAAE,OAAO;IAOxD,cAAc,CACnB,cAAc,EAAE,YAAY,GAAG,aAAa,EAC5C,WAAW,EAAE,WAAW,EACxB,SAAS,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;QACV,KAAK,EAAE,OAAO,CAAC;QACf,MAAM,CAAC,EAAE,cAAc,CAAC;QACxB,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C,IAAI,EAAE,WAAW,CAAC;KAClB,CAAC;IAuEF,uBAAuB,CACtB,QAAQ,EAAE,OAAO,EACjB,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,EACpC,KAAK,CAAC,EAAE,MAAM;;;;;IAaT,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI1C,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,MAAM;CAGnD"}
+{"version":3,"file":"captchaManager.d.ts","sourceRoot":"","sources":["../../src/tasks/captchaManager.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAa,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAa,WAAW,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,KAAK,EACX,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EACjB,aAAa,EACb,OAAO,EACP,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACN,KAAK,kBAAkB,EAIvB,MAAM,6BAA6B,CAAC;AAGrC,qBAAa,cAAc;IAC1B,IAAI,EAAE,WAAW,CAAC;IAClB,EAAE,EAAE,iBAAiB,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;gBAEH,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,MAAM;IAM/D,iCAAiC,CAAC,aAAa,EAAE,OAAO;IAOxD,cAAc,CACnB,cAAc,EAAE,YAAY,GAAG,aAAa,EAC5C,WAAW,EAAE,WAAW,EACxB,SAAS,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;QACV,KAAK,EAAE,OAAO,CAAC;QACf,MAAM,CAAC,EAAE,cAAc,CAAC;QACxB,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C,IAAI,EAAE,WAAW,CAAC;KAClB,CAAC;IA+EF,uBAAuB,CACtB,QAAQ,EAAE,OAAO,EACjB,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,EACpC,KAAK,CAAC,EAAE,MAAM;;;;;IAaT,4BAA4B,CACjC,sBAAsB,EAAE,kBAAkB,EAC1C,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE;QACV,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;KAC3C;;;;;;;;;;IAkDI,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI1C,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,MAAM;CAGnD"}