@prosopo/database 3.4.5 → 3.5.0

package/CHANGELOG.md

@@ -1,5 +1,113 @@
 # @prosopo/database
 
+## 3.5.0
+### Minor Changes
+
+- bb5f41c: Context awareness
+
+### Patch Changes
+
+- 55a64c6: stop refresh image to pow
+- 8ce9205: Change engine requirements
+- b6e98b2: Run npm audit
+- 55a64c6: Persist sessions for user ip combinations
+- Updated dependencies [8ce9205]
+- Updated dependencies [15ae7cf]
+- Updated dependencies [bb5f41c]
+- Updated dependencies [55a64c6]
+- Updated dependencies [8ce9205]
+- Updated dependencies [df79c03]
+- Updated dependencies [8f22479]
+- Updated dependencies [b6e98b2]
+- Updated dependencies [55a64c6]
+  - @prosopo/user-access-policy@3.5.28
+  - @prosopo/types@3.6.0
+  - @prosopo/types-database@4.0.0
+  - @prosopo/redis-client@1.0.7
+  - @prosopo/common@3.1.22
+  - @prosopo/locale@3.1.22
+  - @prosopo/config@3.1.22
+
+## 3.4.13
+### Patch Changes
+
+- Updated dependencies [8f1773a]
+  - @prosopo/types@3.5.11
+  - @prosopo/types-database@3.3.13
+  - @prosopo/user-access-policy@3.5.27
+
+## 3.4.12
+### Patch Changes
+
+- Updated dependencies [cb8ab85]
+  - @prosopo/types-database@3.3.12
+  - @prosopo/types@3.5.10
+  - @prosopo/user-access-policy@3.5.26
+
+## 3.4.11
+### Patch Changes
+
+- 43907e8: Convert timestamp fields from numbers to Date objects throughout codebase
+- b4639ec: Merge frictionless tokens into sessions
+- Updated dependencies [43907e8]
+- Updated dependencies [b4639ec]
+- Updated dependencies [005ce66]
+- Updated dependencies [7101036]
+  - @prosopo/types-database@3.3.11
+  - @prosopo/types@3.5.9
+  - @prosopo/user-access-policy@3.5.25
+
+## 3.4.10
+### Patch Changes
+
+- Updated dependencies [b10a65f]
+- Updated dependencies [e5c259d]
+- Updated dependencies [6420187]
+  - @prosopo/types-database@3.3.10
+  - @prosopo/types@3.5.8
+  - @prosopo/user-access-policy@3.5.24
+
+## 3.4.9
+### Patch Changes
+
+- b8185a4: feat/uap-rules-syncer
+- Updated dependencies [c9d8fdf]
+- Updated dependencies [b8185a4]
+- Updated dependencies [3a027ef]
+- Updated dependencies [3a027ef]
+  - @prosopo/user-access-policy@3.5.23
+  - @prosopo/common@3.1.21
+  - @prosopo/config@3.1.21
+  - @prosopo/types-database@3.3.9
+  - @prosopo/redis-client@1.0.6
+  - @prosopo/locale@3.1.21
+  - @prosopo/types@3.5.7
+
+## 3.4.8
+### Patch Changes
+
+- Updated dependencies [5d11a81]
+  - @prosopo/types@3.5.6
+  - @prosopo/types-database@3.3.8
+  - @prosopo/user-access-policy@3.5.22
+
+## 3.4.7
+### Patch Changes
+
+- Updated dependencies [494c5a8]
+  - @prosopo/types-database@3.3.7
+  - @prosopo/types@3.5.5
+  - @prosopo/user-access-policy@3.5.21
+
+## 3.4.6
+### Patch Changes
+
+- Updated dependencies [08ff50f]
+- Updated dependencies [08ff50f]
+  - @prosopo/types-database@3.3.6
+  - @prosopo/types@3.5.4
+  - @prosopo/user-access-policy@3.5.20
+
 ## 3.4.5
 ### Patch Changes
 

package/dist/cjs/base/mongo.cjs

@@ -3,6 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const common = require("@prosopo/common");
 const mongodb = require("mongodb");
 const mongoose = require("mongoose");
+var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
 mongoose.set("strictQuery", false);
 const DEFAULT_ENDPOINT = "mongodb://127.0.0.1:27017";
 class MongoDatabase {
@@ -19,7 +20,7 @@ class MongoDatabase {
     this._url = parsedUrl.toString();
     this.safeURL = this.url.replace(/\w+:\w+/, "<Credentials>");
     this.dbname = dbname || parsedUrl.pathname.replace("/", "");
-    this.logger = logger || common.getLogger("info", module);
+    this.logger = logger || common.getLogger("info", typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("base/mongo.cjs", document.baseURI).href);
   }
   get url() {
     return this._url;

package/dist/cjs/databases/captcha.cjs

@@ -4,7 +4,8 @@ const common = require("@prosopo/common");
 const typesDatabase = require("@prosopo/types-database");
 require("../base/index.cjs");
 const mongo = require("../base/mongo.cjs");
-const logger = common.getLogger("info", module);
+var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
+const logger = common.getLogger("info", typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("databases/captcha.cjs", document.baseURI).href);
 var TableNames = /* @__PURE__ */ ((TableNames2) => {
   TableNames2["frictionlessToken"] = "frictionlessToken";
   TableNames2["session"] = "session";
@@ -87,8 +88,8 @@ class CaptchaDatabase extends mongo.MongoDatabase {
     await this.connect();
     if (sessionEvents.length) {
       const result = await this.tables.session.bulkWrite(
-        sessionEvents.map((document) => {
-          const { _id, ...safeDoc } = document;
+        sessionEvents.map((document2) => {
+          const { _id, ...safeDoc } = document2;
           return {
             insertOne: {
               document: safeDoc

package/dist/cjs/databases/provider.cjs

@@ -5,8 +5,9 @@ const common = require("@prosopo/common");
 const redisClient = require("@prosopo/redis-client");
 const types = require("@prosopo/types");
 const typesDatabase = require("@prosopo/types-database");
-const userAccessPolicy = require("@prosopo/user-access-policy");
+const redis = require("@prosopo/user-access-policy/redis");
 const mongo = require("../base/mongo.cjs");
+const TWENTY_FOUR_HOURS_IN_MS = 24 * 60 * 60 * 1e3;
 var TableNames = /* @__PURE__ */ ((TableNames2) => {
   TableNames2["captcha"] = "captcha";
   TableNames2["dataset"] = "dataset";
@@ -17,9 +18,9 @@ var TableNames = /* @__PURE__ */ ((TableNames2) => {
   TableNames2["scheduler"] = "scheduler";
   TableNames2["powcaptcha"] = "powcaptcha";
   TableNames2["client"] = "client";
-  TableNames2["frictionlessToken"] = "frictionlessToken";
   TableNames2["session"] = "session";
   TableNames2["detector"] = "detector";
+  TableNames2["clientEntropy"] = "clientEntropy";
   return TableNames2;
 })(TableNames || {});
 const PROVIDER_TABLES = [
@@ -68,11 +69,6 @@ const PROVIDER_TABLES = [
     modelName: "Client",
     schema: typesDatabase.ClientRecordSchema
   },
-  {
-    collectionName: "frictionlessToken",
-    modelName: "FrictionlessToken",
-    schema: typesDatabase.FrictionlessTokenRecordSchema
-  },
   {
     collectionName: "session",
     modelName: "Session",
@@ -82,6 +78,11 @@ const PROVIDER_TABLES = [
     collectionName: "detector",
     modelName: "Detector",
     schema: typesDatabase.DetectorRecordSchema
+  },
+  {
+    collectionName: "clientEntropy",
+    modelName: "ClientEntropy",
+    schema: typesDatabase.ClientEntropyRecordSchema
   }
 ];
 class ProviderDatabase extends mongo.MongoDatabase {
@@ -114,12 +115,12 @@ class ProviderDatabase extends mongo.MongoDatabase {
     this.redisAccessRulesConnection = redisClient.setupRedisIndex(
       this.redisConnection,
       {
-        ...userAccessPolicy.redisAccessRulesIndex,
-        name: this.options.redis?.indexName || userAccessPolicy.redisAccessRulesIndex.name
+        ...redis.accessRulesRedisIndex,
+        name: this.options.redis?.indexName || redis.accessRulesRedisIndex.name
       },
       this.logger
     );
-    this.userAccessRulesStorage = userAccessPolicy.createRedisAccessRulesStorage(
+    this.userAccessRulesStorage = redis.createRedisAccessRulesStorage(
       this.redisAccessRulesConnection,
       this.logger
     );
@@ -448,7 +449,7 @@ class ProviderDatabase extends mongo.MongoDatabase {
   async storeUserImageCaptchaSolution(captchas, commit) {
     const commitmentRecord = typesDatabase.UserCommitmentSchema.parse({
       ...commit,
-      lastUpdatedTimestamp: Date.now()
+      lastUpdatedTimestamp: /* @__PURE__ */ new Date()
     });
     if (captchas.length) {
       const filter = {
@@ -488,18 +489,20 @@ class ProviderDatabase extends mongo.MongoDatabase {
    * @param ipAddress
    * @param headers
    * @param ja4
-   * @param frictionlessTokenId
+   * @param sessionId
    * @param serverChecked
    * @param userSubmitted
    * @param storedStatus
    * @param userSignature
    * @returns {Promise<void>} A promise that resolves when the record is added.
    */
-  async storePowCaptchaRecord(challenge, components, difficulty, providerSignature, ipAddress, headers, ja4, frictionlessTokenId, serverChecked = false, userSubmitted = false, storedStatus = types.StoredStatusNames.notStored, userSignature) {
+  async storePowCaptchaRecord(challenge, components, difficulty, providerSignature, ipAddress, headers, ja4, sessionId, serverChecked = false, userSubmitted = false, storedStatus = types.StoredStatusNames.notStored, userSignature) {
     const tables = this.getTables();
     const powCaptchaRecord = {
       challenge,
-      ...components,
+      userAccount: components.userAccount,
+      dappAccount: components.dappAccount,
+      requestedAtTimestamp: new Date(components.requestedAtTimestamp),
       ipAddress,
       headers,
       ja4,
@@ -509,8 +512,8 @@ class ProviderDatabase extends mongo.MongoDatabase {
       difficulty,
       providerSignature,
       userSignature,
-      lastUpdatedTimestamp: Date.now(),
-      frictionlessTokenId
+      lastUpdatedTimestamp: /* @__PURE__ */ new Date(),
+      sessionId
     };
     try {
       await tables.powcaptcha.create(powCaptchaRecord);
@@ -591,7 +594,7 @@ class ProviderDatabase extends mongo.MongoDatabase {
    */
   async updatePowCaptchaRecordResult(challenge, result, serverChecked = false, userSubmitted = false, userSignature) {
     const tables = this.getTables();
-    const timestamp = Date.now();
+    const timestamp = /* @__PURE__ */ new Date();
     const update = {
       result,
       serverChecked,
@@ -692,7 +695,7 @@ class ProviderDatabase extends mongo.MongoDatabase {
    */
   async markDappUserCommitmentsStored(commitmentIds) {
     const updateDoc = {
-      storedAtTimestamp: Date.now()
+      storedAtTimestamp: /* @__PURE__ */ new Date()
     };
     await this.tables?.commitment.updateMany(
       { id: { $in: commitmentIds } },
@@ -705,7 +708,7 @@ class ProviderDatabase extends mongo.MongoDatabase {
   async markDappUserCommitmentsChecked(commitmentIds) {
     const updateDoc = {
       [types.StoredStatusNames.serverChecked]: true,
-      lastUpdatedTimestamp: Date.now()
+      lastUpdatedTimestamp: /* @__PURE__ */ new Date()
     };
     await this.tables?.commitment.updateMany(
       { id: { $in: commitmentIds } },
@@ -769,7 +772,7 @@ class ProviderDatabase extends mongo.MongoDatabase {
    */
   async markDappUserPoWCommitmentsStored(challenges) {
     const updateDoc = {
-      storedAtTimestamp: Date.now()
+      storedAtTimestamp: /* @__PURE__ */ new Date()
     };
     await this.tables?.powcaptcha.updateMany(
       { challenge: { $in: challenges } },
@@ -782,7 +785,7 @@ class ProviderDatabase extends mongo.MongoDatabase {
   async markDappUserPoWCommitmentsChecked(challenges) {
     const updateDoc = {
       [types.StoredStatusNames.serverChecked]: true,
-      lastUpdatedTimestamp: Date.now()
+      lastUpdatedTimestamp: /* @__PURE__ */ new Date()
     };
     await this.tables?.powcaptcha.updateMany(
       { challenge: { $in: challenges } },
@@ -792,46 +795,6 @@ class ProviderDatabase extends mongo.MongoDatabase {
       { upsert: false }
     );
   }
-  /**
-   * Store a new frictionless token record
-   */
-  async storeFrictionlessTokenRecord(tokenRecord) {
-    const doc = await this.tables.frictionlessToken.create(
-      tokenRecord
-    );
-    return doc._id;
-  }
-  /** Update a frictionless token record */
-  async updateFrictionlessTokenRecord(tokenId, updates) {
-    const filter = { _id: tokenId };
-    await this.tables.frictionlessToken.updateOne(filter, updates);
-  }
-  /** Get a frictionless token record */
-  async getFrictionlessTokenRecordByTokenId(tokenId) {
-    const filter = { _id: tokenId };
-    const doc = await this.tables.frictionlessToken.findOne(
-      filter
-    );
-    return doc ? doc : void 0;
-  }
-  /** Get many frictionless token records */
-  async getFrictionlessTokenRecordsByTokenIds(tokenId) {
-    const filter = {
-      _id: { $in: tokenId }
-    };
-    return this.tables.frictionlessToken.find(filter).lean();
-  }
-  /**
-   * Check if a frictionless token record exists.
-   * Used to ensure that a token is not used more than once.
-   */
-  async getFrictionlessTokenRecordByToken(token) {
-    const filter = { token };
-    const record = await this.tables.frictionlessToken.findOne(
-      filter
-    );
-    return record || void 0;
-  }
   /**
    * Store a new session record
    */
@@ -848,6 +811,23 @@ class ProviderDatabase extends mongo.MongoDatabase {
       });
     }
   }
+  /**
+   * Get a session record by sessionId
+   */
+  async getSessionRecordBySessionId(sessionId) {
+    const filter = { sessionId };
+    const doc = await this.tables.session.findOne(filter).lean();
+    return doc || void 0;
+  }
+  /**
+   * Get a session record by token
+   * Used to ensure that a token is not used more than once.
+   */
+  async getSessionRecordByToken(token) {
+    const filter = { token };
+    const record = await this.tables.session.findOne(filter).lean();
+    return record || void 0;
+  }
   /**
    * Check if a session exists and mark it as removed
    * @returns The session record if it existed, undefined otherwise
@@ -863,7 +843,7 @@ class ProviderDatabase extends mongo.MongoDatabase {
     try {
       const session = await this.tables.session.findOneAndUpdate(filter, {
         deleted: true,
-        lastUpdatedTimestamp: Date.now()
+        lastUpdatedTimestamp: /* @__PURE__ */ new Date()
       }).lean();
       return session || void 0;
     } catch (err) {
@@ -873,6 +853,29 @@ class ProviderDatabase extends mongo.MongoDatabase {
       });
     }
   }
+  /**
+   * Get an active session by user IP hash
+   * @param userSitekeyIpHash The hash of user, IP and sitekey combination
+   * @returns The session record if it exists and is not deleted, undefined otherwise
+   */
+  async getSessionByuserSitekeyIpHash(userSitekeyIpHash) {
+    this.logger.debug(() => ({
+      data: { action: "getting session by user IP hash", userSitekeyIpHash }
+    }));
+    const filter = {
+      userSitekeyIpHash,
+      deleted: { $exists: false }
+    };
+    try {
+      const session = await this.tables.session.findOne(filter).lean();
+      return session || void 0;
+    } catch (err) {
+      throw new common.ProsopoDBError("DATABASE.SESSION_GET_FAILED", {
+        context: { error: err, userSitekeyIpHash },
+        logger: this.logger
+      });
+    }
+  }
   /** Get unstored session records
    * @description Get session records that have not been stored yet
    * @param limit
@@ -928,21 +931,10 @@ class ProviderDatabase extends mongo.MongoDatabase {
       { upsert: false }
     );
   }
-  /** Mark a list of token records as stored */
-  async markFrictionlessTokenRecordsStored(tokenIds) {
-    const updateDoc = {
-      storedAtTimestamp: /* @__PURE__ */ new Date()
-    };
-    await this.tables?.frictionlessToken.updateMany(
-      { _id: { $in: tokenIds } },
-      { $set: updateDoc },
-      { upsert: false }
-    );
-  }
   /**
    * @description Store a Dapp User's pending record
    */
-  async storePendingImageCommitment(userAccount, requestHash, salt, deadlineTimestamp, requestedAtTimestamp, ipAddress, threshold, frictionlessTokenId) {
+  async storePendingImageCommitment(userAccount, requestHash, salt, deadlineTimestamp, requestedAtTimestamp, ipAddress, threshold, sessionId) {
     if (!is.isHex(requestHash)) {
       throw new common.ProsopoDBError("DATABASE.INVALID_HASH", {
         context: {
@@ -959,7 +951,7 @@ class ProviderDatabase extends mongo.MongoDatabase {
       deadlineTimestamp,
       requestedAtTimestamp: new Date(requestedAtTimestamp),
       ipAddress,
-      frictionlessTokenId,
+      sessionId,
       threshold
     };
     await this.tables?.pending.updateOne(
@@ -1162,7 +1154,7 @@ class ProviderDatabase extends mongo.MongoDatabase {
       const result = { status: types.CaptchaStatus.approved };
       const updateDoc = {
         result,
-        lastUpdatedTimestamp: Date.now(),
+        lastUpdatedTimestamp: /* @__PURE__ */ new Date(),
         ...coords ? { coords } : {}
       };
       const filter = { id: commitmentId };
@@ -1183,7 +1175,7 @@ class ProviderDatabase extends mongo.MongoDatabase {
     try {
       const updateDoc = {
         result: { status: types.CaptchaStatus.disapproved, reason },
-        lastUpdatedTimestamp: Date.now(),
+        lastUpdatedTimestamp: /* @__PURE__ */ new Date(),
         ...coords ? { coords } : {}
       };
       const filter = { id: commitmentId };
@@ -1258,7 +1250,7 @@ class ProviderDatabase extends mongo.MongoDatabase {
    * @description Create the status of a scheduled task
    */
   async createScheduledTaskStatus(taskName, status) {
-    const now = (/* @__PURE__ */ new Date()).getTime();
+    const now = /* @__PURE__ */ new Date();
     const doc = typesDatabase.ScheduledTaskSchema.parse({
       processName: taskName,
       datetime: now,
@@ -1273,7 +1265,7 @@ class ProviderDatabase extends mongo.MongoDatabase {
   async updateScheduledTaskStatus(taskId, status, result) {
     const update = {
       status,
-      updated: (/* @__PURE__ */ new Date()).getTime(),
+      updated: /* @__PURE__ */ new Date(),
       ...result && { result }
     };
     const filter = { _id: taskId };
@@ -1319,6 +1311,13 @@ class ProviderDatabase extends mongo.MongoDatabase {
     });
     await this.tables?.client.bulkWrite(ops);
   }
+  /**
+   * @description Get all client records
+   */
+  async getAllClientRecords() {
+    const docs = await this.tables?.client.find().lean();
+    return docs || [];
+  }
   /**
    * @description Get a client record
    */
@@ -1362,5 +1361,70 @@ class ProviderDatabase extends mongo.MongoDatabase {
     ).sort({ createdAt: -1 }).lean();
     return (keyRecords || []).map((record) => record.detectorKey);
   }
+  /**
+   * @description set client entropy
+   */
+  async setClientEntropy(account, entropy) {
+    const filter = { account };
+    await this.tables?.clientEntropy.updateOne(
+      filter,
+      { $set: { entropy } },
+      { upsert: true }
+    );
+  }
+  /**
+   * @description get client entropy
+   */
+  async getClientEntropy(account) {
+    const filter = { account };
+    const doc = await this.tables?.clientEntropy.findOne(filter).lean();
+    return doc ? doc.entropy : void 0;
+  }
+  /** Sample captcha records from the database */
+  async sampleEntropy(sampleSize, siteKey) {
+    const size = sampleSize ? Math.abs(Math.trunc(sampleSize)) : 1;
+    const max = 1e4;
+    if (size > max) {
+      throw new common.ProsopoDBError("DATABASE.CAPTCHA_SAMPLE_SIZE_EXCEEDED", {
+        context: {
+          failedFuncName: this.sampleEntropy.name,
+          sampleSize
+        }
+      });
+    }
+    const cursor = this.tables?.powcaptcha.aggregate([
+      {
+        $match: {
+          dappAccount: siteKey,
+          requestedAtTimestamp: {
+            $gt: new Date((/* @__PURE__ */ new Date()).getTime() - TWENTY_FOUR_HOURS_IN_MS)
+          }
+        }
+      },
+      { $limit: max },
+      { $sample: { size } },
+      {
+        $project: {
+          _id: 0,
+          frictionlessTokenId: 1
+        }
+      }
+    ]);
+    const docs = await cursor;
+    if (docs?.length === 0) {
+      return [];
+    }
+    return (await Promise.all(
+      docs.map(async (doc) => {
+        if (doc.frictionlessTokenId) {
+          const tokenRecord = await this.getSessionRecordByToken(
+            doc.frictionlessTokenId
+          );
+          return tokenRecord?.decryptedHeadHash;
+        }
+        return void 0;
+      })
+    )).filter((headHash) => headHash !== void 0);
+  }
 }
 exports.ProviderDatabase = ProviderDatabase;

package/dist/cjs/index.cjs

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const makeDir = require("make-dir");
 require("./base/index.cjs");
 const index = require("./databases/index.cjs");
 const mongo = require("./base/mongo.cjs");
@@ -7,6 +8,7 @@ const mongoMemory = require("./base/mongoMemory.cjs");
 const provider = require("./databases/provider.cjs");
 const captcha = require("./databases/captcha.cjs");
 const client = require("./databases/client.cjs");
+console.debug(makeDir);
 exports.Databases = index.Databases;
 exports.MongoDatabase = mongo.MongoDatabase;
 exports.MongoMemoryDatabase = mongoMemory.MongoMemoryDatabase;

package/dist/databases/provider.js

@@ -2,9 +2,10 @@ import { isHex } from "@polkadot/util/is";
 import { ProsopoDBError } from "@prosopo/common";
 import { connectToRedis, setupRedisIndex } from "@prosopo/redis-client";
 import { DatasetWithIdsAndTreeSchema, StoredStatusNames, CaptchaStatus, ApiParams, CaptchaStates } from "@prosopo/types";
-import { CaptchaRecordSchema, PoWCaptchaRecordSchema, DatasetRecordSchema, SolutionRecordSchema, UserCommitmentRecordSchema, UserSolutionRecordSchema, PendingRecordSchema, ScheduledTaskRecordSchema, ClientRecordSchema, FrictionlessTokenRecordSchema, SessionRecordSchema, DetectorRecordSchema, UserCommitmentSchema, ScheduledTaskSchema } from "@prosopo/types-database";
-import { redisAccessRulesIndex, createRedisAccessRulesStorage } from "@prosopo/user-access-policy";
+import { CaptchaRecordSchema, PoWCaptchaRecordSchema, DatasetRecordSchema, SolutionRecordSchema, UserCommitmentRecordSchema, UserSolutionRecordSchema, PendingRecordSchema, ScheduledTaskRecordSchema, ClientRecordSchema, SessionRecordSchema, DetectorRecordSchema, ClientEntropyRecordSchema, UserCommitmentSchema, ScheduledTaskSchema } from "@prosopo/types-database";
+import { accessRulesRedisIndex, createRedisAccessRulesStorage } from "@prosopo/user-access-policy/redis";
 import { MongoDatabase } from "../base/mongo.js";
+const TWENTY_FOUR_HOURS_IN_MS = 24 * 60 * 60 * 1e3;
 var TableNames = /* @__PURE__ */ ((TableNames2) => {
   TableNames2["captcha"] = "captcha";
   TableNames2["dataset"] = "dataset";
@@ -15,9 +16,9 @@ var TableNames = /* @__PURE__ */ ((TableNames2) => {
   TableNames2["scheduler"] = "scheduler";
   TableNames2["powcaptcha"] = "powcaptcha";
   TableNames2["client"] = "client";
-  TableNames2["frictionlessToken"] = "frictionlessToken";
   TableNames2["session"] = "session";
   TableNames2["detector"] = "detector";
+  TableNames2["clientEntropy"] = "clientEntropy";
   return TableNames2;
 })(TableNames || {});
 const PROVIDER_TABLES = [
@@ -66,11 +67,6 @@ const PROVIDER_TABLES = [
     modelName: "Client",
     schema: ClientRecordSchema
   },
-  {
-    collectionName: "frictionlessToken",
-    modelName: "FrictionlessToken",
-    schema: FrictionlessTokenRecordSchema
-  },
   {
     collectionName: "session",
     modelName: "Session",
@@ -80,6 +76,11 @@ const PROVIDER_TABLES = [
     collectionName: "detector",
     modelName: "Detector",
     schema: DetectorRecordSchema
+  },
+  {
+    collectionName: "clientEntropy",
+    modelName: "ClientEntropy",
+    schema: ClientEntropyRecordSchema
   }
 ];
 class ProviderDatabase extends MongoDatabase {
@@ -112,8 +113,8 @@ class ProviderDatabase extends MongoDatabase {
     this.redisAccessRulesConnection = setupRedisIndex(
       this.redisConnection,
       {
-        ...redisAccessRulesIndex,
-        name: this.options.redis?.indexName || redisAccessRulesIndex.name
+        ...accessRulesRedisIndex,
+        name: this.options.redis?.indexName || accessRulesRedisIndex.name
       },
       this.logger
     );
@@ -446,7 +447,7 @@ class ProviderDatabase extends MongoDatabase {
   async storeUserImageCaptchaSolution(captchas, commit) {
     const commitmentRecord = UserCommitmentSchema.parse({
       ...commit,
-      lastUpdatedTimestamp: Date.now()
+      lastUpdatedTimestamp: /* @__PURE__ */ new Date()
     });
     if (captchas.length) {
       const filter = {
@@ -486,18 +487,20 @@ class ProviderDatabase extends MongoDatabase {
    * @param ipAddress
    * @param headers
    * @param ja4
-   * @param frictionlessTokenId
+   * @param sessionId
    * @param serverChecked
    * @param userSubmitted
    * @param storedStatus
    * @param userSignature
    * @returns {Promise<void>} A promise that resolves when the record is added.
    */
-  async storePowCaptchaRecord(challenge, components, difficulty, providerSignature, ipAddress, headers, ja4, frictionlessTokenId, serverChecked = false, userSubmitted = false, storedStatus = StoredStatusNames.notStored, userSignature) {
+  async storePowCaptchaRecord(challenge, components, difficulty, providerSignature, ipAddress, headers, ja4, sessionId, serverChecked = false, userSubmitted = false, storedStatus = StoredStatusNames.notStored, userSignature) {
     const tables = this.getTables();
     const powCaptchaRecord = {
       challenge,
-      ...components,
+      userAccount: components.userAccount,
+      dappAccount: components.dappAccount,
+      requestedAtTimestamp: new Date(components.requestedAtTimestamp),
       ipAddress,
       headers,
       ja4,
@@ -507,8 +510,8 @@ class ProviderDatabase extends MongoDatabase {
       difficulty,
       providerSignature,
       userSignature,
-      lastUpdatedTimestamp: Date.now(),
-      frictionlessTokenId
+      lastUpdatedTimestamp: /* @__PURE__ */ new Date(),
+      sessionId
     };
     try {
       await tables.powcaptcha.create(powCaptchaRecord);
@@ -589,7 +592,7 @@ class ProviderDatabase extends MongoDatabase {
    */
   async updatePowCaptchaRecordResult(challenge, result, serverChecked = false, userSubmitted = false, userSignature) {
     const tables = this.getTables();
-    const timestamp = Date.now();
+    const timestamp = /* @__PURE__ */ new Date();
     const update = {
       result,
       serverChecked,
@@ -690,7 +693,7 @@ class ProviderDatabase extends MongoDatabase {
    */
   async markDappUserCommitmentsStored(commitmentIds) {
     const updateDoc = {
-      storedAtTimestamp: Date.now()
+      storedAtTimestamp: /* @__PURE__ */ new Date()
     };
     await this.tables?.commitment.updateMany(
       { id: { $in: commitmentIds } },
@@ -703,7 +706,7 @@ class ProviderDatabase extends MongoDatabase {
   async markDappUserCommitmentsChecked(commitmentIds) {
     const updateDoc = {
       [StoredStatusNames.serverChecked]: true,
-      lastUpdatedTimestamp: Date.now()
+      lastUpdatedTimestamp: /* @__PURE__ */ new Date()
     };
     await this.tables?.commitment.updateMany(
       { id: { $in: commitmentIds } },
@@ -767,7 +770,7 @@ class ProviderDatabase extends MongoDatabase {
    */
   async markDappUserPoWCommitmentsStored(challenges) {
     const updateDoc = {
-      storedAtTimestamp: Date.now()
+      storedAtTimestamp: /* @__PURE__ */ new Date()
     };
     await this.tables?.powcaptcha.updateMany(
       { challenge: { $in: challenges } },
@@ -780,7 +783,7 @@ class ProviderDatabase extends MongoDatabase {
   async markDappUserPoWCommitmentsChecked(challenges) {
     const updateDoc = {
       [StoredStatusNames.serverChecked]: true,
-      lastUpdatedTimestamp: Date.now()
+      lastUpdatedTimestamp: /* @__PURE__ */ new Date()
     };
     await this.tables?.powcaptcha.updateMany(
       { challenge: { $in: challenges } },
@@ -790,46 +793,6 @@ class ProviderDatabase extends MongoDatabase {
       { upsert: false }
     );
   }
-  /**
-   * Store a new frictionless token record
-   */
-  async storeFrictionlessTokenRecord(tokenRecord) {
-    const doc = await this.tables.frictionlessToken.create(
-      tokenRecord
-    );
-    return doc._id;
-  }
-  /** Update a frictionless token record */
-  async updateFrictionlessTokenRecord(tokenId, updates) {
-    const filter = { _id: tokenId };
-    await this.tables.frictionlessToken.updateOne(filter, updates);
-  }
-  /** Get a frictionless token record */
-  async getFrictionlessTokenRecordByTokenId(tokenId) {
-    const filter = { _id: tokenId };
-    const doc = await this.tables.frictionlessToken.findOne(
-      filter
-    );
-    return doc ? doc : void 0;
-  }
-  /** Get many frictionless token records */
-  async getFrictionlessTokenRecordsByTokenIds(tokenId) {
-    const filter = {
-      _id: { $in: tokenId }
-    };
-    return this.tables.frictionlessToken.find(filter).lean();
-  }
-  /**
-   * Check if a frictionless token record exists.
-   * Used to ensure that a token is not used more than once.
-   */
-  async getFrictionlessTokenRecordByToken(token) {
-    const filter = { token };
-    const record = await this.tables.frictionlessToken.findOne(
-      filter
-    );
-    return record || void 0;
-  }
   /**
    * Store a new session record
    */
@@ -846,6 +809,23 @@ class ProviderDatabase extends MongoDatabase {
       });
     }
   }
+  /**
+   * Get a session record by sessionId
+   */
+  async getSessionRecordBySessionId(sessionId) {
+    const filter = { sessionId };
+    const doc = await this.tables.session.findOne(filter).lean();
+    return doc || void 0;
+  }
+  /**
+   * Get a session record by token
+   * Used to ensure that a token is not used more than once.
+   */
+  async getSessionRecordByToken(token) {
+    const filter = { token };
+    const record = await this.tables.session.findOne(filter).lean();
+    return record || void 0;
+  }
   /**
    * Check if a session exists and mark it as removed
    * @returns The session record if it existed, undefined otherwise
@@ -861,7 +841,7 @@ class ProviderDatabase extends MongoDatabase {
     try {
       const session = await this.tables.session.findOneAndUpdate(filter, {
         deleted: true,
-        lastUpdatedTimestamp: Date.now()
+        lastUpdatedTimestamp: /* @__PURE__ */ new Date()
       }).lean();
       return session || void 0;
     } catch (err) {
@@ -871,6 +851,29 @@ class ProviderDatabase extends MongoDatabase {
       });
     }
   }
+  /**
+   * Get an active session by user IP hash
+   * @param userSitekeyIpHash The hash of user, IP and sitekey combination
+   * @returns The session record if it exists and is not deleted, undefined otherwise
+   */
+  async getSessionByuserSitekeyIpHash(userSitekeyIpHash) {
+    this.logger.debug(() => ({
+      data: { action: "getting session by user IP hash", userSitekeyIpHash }
+    }));
+    const filter = {
+      userSitekeyIpHash,
+      deleted: { $exists: false }
+    };
+    try {
+      const session = await this.tables.session.findOne(filter).lean();
+      return session || void 0;
+    } catch (err) {
+      throw new ProsopoDBError("DATABASE.SESSION_GET_FAILED", {
+        context: { error: err, userSitekeyIpHash },
+        logger: this.logger
+      });
+    }
+  }
   /** Get unstored session records
    * @description Get session records that have not been stored yet
    * @param limit
@@ -926,21 +929,10 @@ class ProviderDatabase extends MongoDatabase {
       { upsert: false }
     );
   }
-  /** Mark a list of token records as stored */
-  async markFrictionlessTokenRecordsStored(tokenIds) {
-    const updateDoc = {
-      storedAtTimestamp: /* @__PURE__ */ new Date()
-    };
-    await this.tables?.frictionlessToken.updateMany(
-      { _id: { $in: tokenIds } },
-      { $set: updateDoc },
-      { upsert: false }
-    );
-  }
   /**
    * @description Store a Dapp User's pending record
    */
-  async storePendingImageCommitment(userAccount, requestHash, salt, deadlineTimestamp, requestedAtTimestamp, ipAddress, threshold, frictionlessTokenId) {
+  async storePendingImageCommitment(userAccount, requestHash, salt, deadlineTimestamp, requestedAtTimestamp, ipAddress, threshold, sessionId) {
     if (!isHex(requestHash)) {
       throw new ProsopoDBError("DATABASE.INVALID_HASH", {
         context: {
@@ -957,7 +949,7 @@ class ProviderDatabase extends MongoDatabase {
       deadlineTimestamp,
       requestedAtTimestamp: new Date(requestedAtTimestamp),
       ipAddress,
-      frictionlessTokenId,
+      sessionId,
       threshold
     };
     await this.tables?.pending.updateOne(
@@ -1160,7 +1152,7 @@ class ProviderDatabase extends MongoDatabase {
       const result = { status: CaptchaStatus.approved };
       const updateDoc = {
         result,
-        lastUpdatedTimestamp: Date.now(),
+        lastUpdatedTimestamp: /* @__PURE__ */ new Date(),
         ...coords ? { coords } : {}
       };
       const filter = { id: commitmentId };
@@ -1181,7 +1173,7 @@ class ProviderDatabase extends MongoDatabase {
     try {
       const updateDoc = {
         result: { status: CaptchaStatus.disapproved, reason },
-        lastUpdatedTimestamp: Date.now(),
+        lastUpdatedTimestamp: /* @__PURE__ */ new Date(),
         ...coords ? { coords } : {}
       };
       const filter = { id: commitmentId };
@@ -1256,7 +1248,7 @@ class ProviderDatabase extends MongoDatabase {
    * @description Create the status of a scheduled task
    */
   async createScheduledTaskStatus(taskName, status) {
-    const now = (/* @__PURE__ */ new Date()).getTime();
+    const now = /* @__PURE__ */ new Date();
     const doc = ScheduledTaskSchema.parse({
       processName: taskName,
       datetime: now,
@@ -1271,7 +1263,7 @@ class ProviderDatabase extends MongoDatabase {
   async updateScheduledTaskStatus(taskId, status, result) {
     const update = {
       status,
-      updated: (/* @__PURE__ */ new Date()).getTime(),
+      updated: /* @__PURE__ */ new Date(),
       ...result && { result }
     };
     const filter = { _id: taskId };
@@ -1317,6 +1309,13 @@ class ProviderDatabase extends MongoDatabase {
     });
     await this.tables?.client.bulkWrite(ops);
   }
+  /**
+   * @description Get all client records
+   */
+  async getAllClientRecords() {
+    const docs = await this.tables?.client.find().lean();
+    return docs || [];
+  }
   /**
    * @description Get a client record
    */
@@ -1360,6 +1359,71 @@ class ProviderDatabase extends MongoDatabase {
     ).sort({ createdAt: -1 }).lean();
     return (keyRecords || []).map((record) => record.detectorKey);
   }
+  /**
+   * @description set client entropy
+   */
+  async setClientEntropy(account, entropy) {
+    const filter = { account };
+    await this.tables?.clientEntropy.updateOne(
+      filter,
+      { $set: { entropy } },
+      { upsert: true }
+    );
+  }
+  /**
+   * @description get client entropy
+   */
+  async getClientEntropy(account) {
+    const filter = { account };
+    const doc = await this.tables?.clientEntropy.findOne(filter).lean();
+    return doc ? doc.entropy : void 0;
+  }
+  /** Sample captcha records from the database */
+  async sampleEntropy(sampleSize, siteKey) {
+    const size = sampleSize ? Math.abs(Math.trunc(sampleSize)) : 1;
+    const max = 1e4;
+    if (size > max) {
+      throw new ProsopoDBError("DATABASE.CAPTCHA_SAMPLE_SIZE_EXCEEDED", {
+        context: {
+          failedFuncName: this.sampleEntropy.name,
+          sampleSize
+        }
+      });
+    }
+    const cursor = this.tables?.powcaptcha.aggregate([
+      {
+        $match: {
+          dappAccount: siteKey,
+          requestedAtTimestamp: {
+            $gt: new Date((/* @__PURE__ */ new Date()).getTime() - TWENTY_FOUR_HOURS_IN_MS)
+          }
+        }
+      },
+      { $limit: max },
+      { $sample: { size } },
+      {
+        $project: {
+          _id: 0,
+          frictionlessTokenId: 1
+        }
+      }
+    ]);
+    const docs = await cursor;
+    if (docs?.length === 0) {
+      return [];
+    }
+    return (await Promise.all(
+      docs.map(async (doc) => {
+        if (doc.frictionlessTokenId) {
+          const tokenRecord = await this.getSessionRecordByToken(
+            doc.frictionlessTokenId
+          );
+          return tokenRecord?.decryptedHeadHash;
+        }
+        return void 0;
+      })
+    )).filter((headHash) => headHash !== void 0);
+  }
 }
 export {
   ProviderDatabase

package/dist/index.js

@@ -1,3 +1,4 @@
+import makeDir from "make-dir";
 import "./base/index.js";
 import { Databases } from "./databases/index.js";
 import { MongoDatabase } from "./base/mongo.js";
@@ -5,6 +6,7 @@ import { MongoMemoryDatabase } from "./base/mongoMemory.js";
 import { ProviderDatabase } from "./databases/provider.js";
 import { CaptchaDatabase } from "./databases/captcha.js";
 import { ClientDatabase } from "./databases/client.js";
+console.debug(makeDir);
 export {
   CaptchaDatabase,
   ClientDatabase,

package/package.json

@@ -1,13 +1,13 @@
 {
 	"name": "@prosopo/database",
-	"version": "3.4.5",
+	"version": "3.5.0",
 	"description": "Prosopo database plugins for provider",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"type": "module",
 	"engines": {
-		"node": "20",
-		"npm": "10.8.2"
+		"node": ">=v20.0.0",
+		"npm": ">=10.6.0"
 	},
 	"exports": {
 		".": {
@@ -34,29 +34,30 @@
 	},
 	"homepage": "https://github.com/prosopo/captcha#readme",
 	"dependencies": {
-		"@polkadot/util": "12.6.2",
-		"@prosopo/common": "3.1.20",
-		"@prosopo/config": "3.1.20",
-		"@prosopo/locale": "3.1.20",
-		"@prosopo/types": "3.5.3",
-		"@prosopo/types-database": "3.3.5",
-		"@prosopo/user-access-policy": "3.5.19",
+		"@polkadot/util": "13.5.7",
+		"@prosopo/common": "3.1.22",
+		"@prosopo/config": "3.1.22",
+		"@prosopo/locale": "3.1.22",
+		"@prosopo/redis-client": "1.0.7",
+		"@prosopo/types": "3.6.0",
+		"@prosopo/types-database": "4.0.0",
+		"@prosopo/user-access-policy": "3.5.28",
+		"make-dir": "3.1.0",
 		"mongodb": "6.15.0",
-		"mongodb-memory-server": "10.0.0",
-		"mongoose": "8.13.0",
-		"@prosopo/redis-client": "1.0.5"
+		"mongodb-memory-server": "10.3.0",
+		"mongoose": "8.13.0"
 	},
 	"devDependencies": {
 		"@types/node": "22.10.2",
-		"@vitest/coverage-v8": "3.0.9",
+		"@vitest/coverage-v8": "3.2.4",
 		"concurrently": "9.0.1",
 		"del-cli": "6.0.0",
 		"npm-run-all": "4.1.5",
 		"tslib": "2.7.0",
 		"tsx": "4.20.3",
 		"typescript": "5.6.2",
-		"vite": "6.3.5",
-		"vitest": "3.0.9"
+		"vite": "6.4.1",
+		"vitest": "3.2.4"
 	},
 	"sideEffects": false
 }