@prosopo/database 3.0.13 → 3.4.13

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";
@@ -32,6 +33,7 @@ const CAPTCHA_TABLES = [
 class CaptchaDatabase extends mongo.MongoDatabase {
   constructor(url, dbname, authSource, logger2) {
     super(url, dbname, authSource, logger2);
+    this.indexesEnsured = false;
     this.tables = {};
   }
   async connect() {
@@ -51,12 +53,43 @@ class CaptchaDatabase extends mongo.MongoDatabase {
     }
     return this.tables;
   }
+  async ensureIndexes() {
+    const indexPromises = [];
+    if (!this.indexesEnsured) {
+      CAPTCHA_TABLES.map(({ collectionName }) => {
+        indexPromises.push(
+          new Promise((resolve) => {
+            if (this.connected) {
+              this.tables[collectionName].collection.dropIndexes().then(() => {
+                this.tables[collectionName].ensureIndexes().then(() => {
+                  resolve();
+                }).catch((err) => {
+                  this.logger.warn(() => ({
+                    err,
+                    msg: `Error creating indexes for collection ${collectionName}`
+                  }));
+                  resolve();
+                });
+              });
+            } else {
+              this.logger.info(() => ({
+                msg: `Skipping index creation for collection ${collectionName} as not connected`
+              }));
+              resolve();
+            }
+          })
+        );
+      });
+    }
+    await Promise.all(indexPromises);
+    this.indexesEnsured = true;
+  }
   async saveCaptchas(sessionEvents, imageCaptchaEvents, powCaptchaEvents) {
     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

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const is = require("@polkadot/util/is");
 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("redis");
+const redis = require("@prosopo/user-access-policy/redis");
 const mongo = require("../base/mongo.cjs");
 var TableNames = /* @__PURE__ */ ((TableNames2) => {
   TableNames2["captcha"] = "captcha";
@@ -17,7 +17,6 @@ var TableNames = /* @__PURE__ */ ((TableNames2) => {
   TableNames2["scheduler"] = "scheduler";
   TableNames2["powcaptcha"] = "powcaptcha";
   TableNames2["client"] = "client";
-  TableNames2["frictionlessToken"] = "frictionlessToken";
   TableNames2["session"] = "session";
   TableNames2["detector"] = "detector";
   return TableNames2;
@@ -68,11 +67,6 @@ const PROVIDER_TABLES = [
     modelName: "Client",
     schema: typesDatabase.ClientRecordSchema
   },
-  {
-    collectionName: "frictionlessToken",
-    modelName: "FrictionlessToken",
-    schema: typesDatabase.FrictionlessTokenRecordSchema
-  },
   {
     collectionName: "session",
     modelName: "Session",
@@ -94,7 +88,10 @@ class ProviderDatabase extends mongo.MongoDatabase {
     );
     this.options = options;
     this.tables = {};
+    this.indexesEnsured = false;
     this.tables = {};
+    this.redisAccessRulesConnection = null;
+    this.redisConnection = null;
     this.userAccessRulesStorage = null;
   }
   async connect() {
@@ -103,27 +100,24 @@ class ProviderDatabase extends mongo.MongoDatabase {
     await this.setupRedis();
   }
   async setupRedis() {
-    const redisClient = await this.createRedisClient();
-    await userAccessPolicy.createRedisAccessRulesIndex(
-      redisClient,
-      this.options.redis?.indexName
+    this.redisConnection = redisClient.connectToRedis({
+      url: this.options.redis?.url,
+      password: this.options.redis?.password,
+      logger: this.logger
+    });
+    this.redisAccessRulesConnection = redisClient.setupRedisIndex(
+      this.redisConnection,
+      {
+        ...redis.accessRulesRedisIndex,
+        name: this.options.redis?.indexName || redis.accessRulesRedisIndex.name
+      },
+      this.logger
     );
-    this.userAccessRulesStorage = userAccessPolicy.createRedisAccessRulesStorage(
-      redisClient,
+    this.userAccessRulesStorage = redis.createRedisAccessRulesStorage(
+      this.redisAccessRulesConnection,
       this.logger
     );
   }
-  async createRedisClient() {
-    return await redis.createClient({
-      url: this.options.redis?.url,
-      password: this.options.redis?.password
-    }).on("error", (error) => {
-      this.logger.error(() => ({
-        err: error,
-        msg: "Redis client error"
-      }));
-    }).connect();
-  }
   loadTables() {
     const tables = {};
     PROVIDER_TABLES.map(({ collectionName, modelName, schema }) => {
@@ -142,6 +136,56 @@ class ProviderDatabase extends mongo.MongoDatabase {
     }
     return this.tables;
   }
+  getRedisAccessRulesConnection() {
+    if (null === this.redisAccessRulesConnection) {
+      throw new common.ProsopoDBError(
+        "DATABASE.REDIS_ACCESS_RULES_CONNECTION_UNDEFINED"
+      );
+    }
+    return this.redisAccessRulesConnection;
+  }
+  getRedisConnection() {
+    if (null === this.redisConnection) {
+      throw new common.ProsopoDBError(
+        "DATABASE.REDIS_ACCESS_RULES_CONNECTION_UNDEFINED"
+      );
+    }
+    return this.redisConnection;
+  }
+  async ensureIndexes() {
+    const indexPromises = [];
+    if (!this.indexesEnsured) {
+      PROVIDER_TABLES.map(({ collectionName }) => {
+        indexPromises.push(
+          new Promise((resolve) => {
+            if (this.connected) {
+              this.tables[collectionName].collection.dropIndexes().then(() => {
+                this.tables[collectionName].ensureIndexes().then(() => {
+                  this.logger.info(() => ({
+                    msg: `Indexes ensured for collection ${collectionName}`
+                  }));
+                  resolve();
+                }).catch((err) => {
+                  this.logger.warn(() => ({
+                    err,
+                    msg: `Error creating indexes for collection ${collectionName}`
+                  }));
+                  resolve();
+                });
+              });
+            } else {
+              this.logger.info(() => ({
+                msg: `Skipping index creation for collection ${collectionName} as not connected`
+              }));
+              resolve();
+            }
+          })
+        );
+      });
+    }
+    await Promise.all(indexPromises);
+    this.indexesEnsured = true;
+  }
   getUserAccessRulesStorage() {
     if (null === this.userAccessRulesStorage) {
       throw new common.ProsopoDBError("DATABASE.USER_ACCESS_RULES_STORAGE_UNDEFINED");
@@ -398,7 +442,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 = {
@@ -438,18 +482,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,
@@ -459,8 +505,8 @@ class ProviderDatabase extends mongo.MongoDatabase {
       difficulty,
       providerSignature,
       userSignature,
-      lastUpdatedTimestamp: Date.now(),
-      frictionlessTokenId
+      lastUpdatedTimestamp: /* @__PURE__ */ new Date(),
+      sessionId
     };
     try {
       await tables.powcaptcha.create(powCaptchaRecord);
@@ -539,9 +585,9 @@ class ProviderDatabase extends mongo.MongoDatabase {
    * @param userSignature
    * @returns {Promise<void>} A promise that resolves when the record is updated.
    */
-  async updatePowCaptchaRecord(challenge, result, serverChecked = false, userSubmitted = false, userSignature) {
+  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,
@@ -593,6 +639,14 @@ class ProviderDatabase extends mongo.MongoDatabase {
       throw err;
     }
   }
+  async updatePowCaptchaRecord(challenge, updates) {
+    const tables = this.getTables();
+    await tables.powcaptcha.updateOne(
+      { challenge },
+      { $set: updates },
+      { upsert: false }
+    );
+  }
   /** @description Get serverChecked Dapp User image captcha commitments from the commitments table
    */
   async getCheckedDappUserCommitments() {
@@ -634,7 +688,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 } },
@@ -647,7 +701,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 } },
@@ -655,6 +709,12 @@ class ProviderDatabase extends mongo.MongoDatabase {
       { upsert: false }
     );
   }
+  /** @description Update an image captcha commitment
+   */
+  async updateDappUserCommitment(commitmentId, updates) {
+    const filter = { id: commitmentId };
+    await this.tables?.commitment.updateOne(filter, updates);
+  }
   /**
    * @description Get Dapp User PoW captcha commitments that have not been counted towards the client's total
    * @param {number} limit Maximum number of records to return
@@ -705,7 +765,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 } },
@@ -718,7 +778,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 } },
@@ -728,46 +788,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);
-  }
-  /**
-   * 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
    */
@@ -784,6 +804,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
@@ -799,7 +836,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) {
@@ -856,7 +893,7 @@ class ProviderDatabase extends mongo.MongoDatabase {
   /** Mark a list of session records as stored */
   async markSessionRecordsStored(sessionIds) {
     const updateDoc = {
-      storedAtTimestamp: Date.now()
+      storedAtTimestamp: /* @__PURE__ */ new Date()
     };
     await this.tables?.session.updateMany(
       { sessionId: { $in: sessionIds } },
@@ -867,7 +904,7 @@ class ProviderDatabase extends mongo.MongoDatabase {
   /**
    * @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: {
@@ -884,7 +921,7 @@ class ProviderDatabase extends mongo.MongoDatabase {
       deadlineTimestamp,
       requestedAtTimestamp: new Date(requestedAtTimestamp),
       ipAddress,
-      frictionlessTokenId,
+      sessionId,
       threshold
     };
     await this.tables?.pending.updateOne(
@@ -1080,13 +1117,15 @@ class ProviderDatabase extends mongo.MongoDatabase {
   /**
    * @description Approve a dapp user's solution
    * @param {string[]} commitmentId
+   * @param coords
    */
-  async approveDappUserCommitment(commitmentId) {
+  async approveDappUserCommitment(commitmentId, coords) {
     try {
       const result = { status: types.CaptchaStatus.approved };
       const updateDoc = {
         result,
-        lastUpdatedTimestamp: Date.now()
+        lastUpdatedTimestamp: /* @__PURE__ */ new Date(),
+        ...coords ? { coords } : {}
       };
       const filter = { id: commitmentId };
       await this.tables?.commitment?.findOneAndUpdate(filter, { $set: updateDoc }, { upsert: false }).lean();
@@ -1099,13 +1138,15 @@ class ProviderDatabase extends mongo.MongoDatabase {
   /**
    * @description Disapprove a dapp user's solution
    * @param {string} commitmentId
+   * @param coords
    * @param reason
    */
-  async disapproveDappUserCommitment(commitmentId, reason) {
+  async disapproveDappUserCommitment(commitmentId, reason, coords) {
     try {
       const updateDoc = {
         result: { status: types.CaptchaStatus.disapproved, reason },
-        lastUpdatedTimestamp: Date.now()
+        lastUpdatedTimestamp: /* @__PURE__ */ new Date(),
+        ...coords ? { coords } : {}
       };
       const filter = { id: commitmentId };
       await this.tables?.commitment?.findOneAndUpdate(filter, { $set: updateDoc }, { upsert: false }).lean();
@@ -1179,7 +1220,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,
@@ -1194,7 +1235,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 };
@@ -1257,10 +1298,16 @@ class ProviderDatabase extends mongo.MongoDatabase {
       createdAt: /* @__PURE__ */ new Date()
     });
   }
-  /** @description Remove a detector key */
-  async removeDetectorKey(detectorKey) {
+  /**
+   * @description Remove a detector key
+   * @param detectorKey The detector key to remove
+   * @param expirationInSeconds Optional expiration time in seconds (default is 10 minutes)
+   * */
+  async removeDetectorKey(detectorKey, expirationInSeconds) {
     const filter = { detectorKey };
-    const expiresAt = new Date(Date.now() + 10 * 60 * 1e3);
+    const expiresAt = new Date(
+      Date.now() + (expirationInSeconds || 10 * 60) * 1e3
+    );
     await this.tables?.detector.updateOne(filter, {
       $set: { expiresAt }
     });

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/captcha.d.ts

@@ -0,0 +1,25 @@
+import { type Logger } from "@prosopo/common";
+import { type CaptchaProperties, type ICaptchaDatabase, type PoWCaptchaRecord, type StoredSession, type Tables, type UserCommitmentRecord } from "@prosopo/types-database";
+import type { RootFilterQuery } from "mongoose";
+import { MongoDatabase } from "../base/index.js";
+declare enum TableNames {
+    frictionlessToken = "frictionlessToken",
+    session = "session",
+    commitment = "commitment",
+    powcaptcha = "powcaptcha"
+}
+export declare class CaptchaDatabase extends MongoDatabase implements ICaptchaDatabase {
+    tables: Tables<TableNames>;
+    private indexesEnsured;
+    constructor(url: string, dbname?: string, authSource?: string, logger?: Logger);
+    connect(): Promise<void>;
+    getTables(): Tables<TableNames>;
+    ensureIndexes(): Promise<void>;
+    saveCaptchas(sessionEvents: StoredSession[], imageCaptchaEvents: UserCommitmentRecord[], powCaptchaEvents: PoWCaptchaRecord[]): Promise<void>;
+    getCaptchas(filter?: RootFilterQuery<CaptchaProperties>, limit?: number): Promise<{
+        userCommitmentRecords: UserCommitmentRecord[];
+        powCaptchaRecords: PoWCaptchaRecord[];
+    }>;
+}
+export {};
+//# sourceMappingURL=captcha.d.ts.map

package/dist/databases/captcha.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../src/databases/captcha.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,MAAM,EAA6B,MAAM,iBAAiB,CAAC;AACzE,OAAO,EACN,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EAErB,KAAK,aAAa,EAGlB,KAAK,MAAM,EACX,KAAK,oBAAoB,EACzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,aAAK,UAAU;IACd,iBAAiB,sBAAsB;IACvC,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,UAAU,eAAe;CACzB;AAoBD,qBAAa,eAAgB,SAAQ,aAAc,YAAW,gBAAgB;IAC7E,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IAC3B,OAAO,CAAC,cAAc,CAAS;gBAG9B,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM;IAMD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAUvC,SAAS,IAAI,MAAM,CAAC,UAAU,CAAC;IAUzB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC9B,YAAY,CACjB,aAAa,EAAE,aAAa,EAAE,EAC9B,kBAAkB,EAAE,oBAAoB,EAAE,EAC1C,gBAAgB,EAAE,gBAAgB,EAAE;IA2E/B,WAAW,CAChB,MAAM,GAAE,eAAe,CAAC,iBAAiB,CAAM,EAC/C,KAAK,SAAM,GACT,OAAO,CAAC;QACV,qBAAqB,EAAE,oBAAoB,EAAE,CAAC;QAC9C,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;KACtC,CAAC;CAgCF"}

package/dist/databases/captcha.js

@@ -30,6 +30,7 @@ const CAPTCHA_TABLES = [
 class CaptchaDatabase extends MongoDatabase {
   constructor(url, dbname, authSource, logger2) {
     super(url, dbname, authSource, logger2);
+    this.indexesEnsured = false;
     this.tables = {};
   }
   async connect() {
@@ -49,6 +50,37 @@ class CaptchaDatabase extends MongoDatabase {
     }
     return this.tables;
   }
+  async ensureIndexes() {
+    const indexPromises = [];
+    if (!this.indexesEnsured) {
+      CAPTCHA_TABLES.map(({ collectionName }) => {
+        indexPromises.push(
+          new Promise((resolve) => {
+            if (this.connected) {
+              this.tables[collectionName].collection.dropIndexes().then(() => {
+                this.tables[collectionName].ensureIndexes().then(() => {
+                  resolve();
+                }).catch((err) => {
+                  this.logger.warn(() => ({
+                    err,
+                    msg: `Error creating indexes for collection ${collectionName}`
+                  }));
+                  resolve();
+                });
+              });
+            } else {
+              this.logger.info(() => ({
+                msg: `Skipping index creation for collection ${collectionName} as not connected`
+              }));
+              resolve();
+            }
+          })
+        );
+      });
+    }
+    await Promise.all(indexPromises);
+    this.indexesEnsured = true;
+  }
   async saveCaptchas(sessionEvents, imageCaptchaEvents, powCaptchaEvents) {
     await this.connect();
     if (sessionEvents.length) {

package/dist/databases/captcha.js.map

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

package/dist/databases/client.d.ts

@@ -0,0 +1,12 @@
+import { type Logger } from "@prosopo/common";
+import type { Timestamp } from "@prosopo/types";
+import { type ClientRecord, type IClientDatabase, TableNames, type Tables } from "@prosopo/types-database";
+import { MongoDatabase } from "../base/index.js";
+export declare class ClientDatabase extends MongoDatabase implements IClientDatabase {
+    tables: Tables<TableNames>;
+    constructor(url: string, dbname?: string, authSource?: string, logger?: Logger);
+    connect(): Promise<void>;
+    getTables(): Tables<TableNames>;
+    getUpdatedClients(updatedAtTimestamp: Timestamp): Promise<ClientRecord[]>;
+}
+//# sourceMappingURL=client.d.ts.map

package/dist/databases/client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/databases/client.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,MAAM,EAAkB,MAAM,iBAAiB,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAEN,KAAK,YAAY,EACjB,KAAK,eAAe,EACpB,UAAU,EACV,KAAK,MAAM,EACX,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAUjD,qBAAa,cAAe,SAAQ,aAAc,YAAW,eAAe;IAC3E,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;gBAG1B,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM;IAMD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC,SAAS,IAAI,MAAM,CAAC,UAAU,CAAC;IAUzB,iBAAiB,CACtB,kBAAkB,EAAE,SAAS,GAC3B,OAAO,CAAC,YAAY,EAAE,CAAC;CA6B1B"}

package/dist/databases/client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/databases/client.ts"],"names":[],"mappings":"AAcA,OAAO,EAAe,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE9D,OAAO,EACN,aAAa,EAGb,UAAU,GAEV,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,aAAa,GAAG;IACrB;QACC,cAAc,EAAE,UAAU,CAAC,QAAQ;QACnC,SAAS,EAAE,SAAS;QACpB,MAAM,EAAE,aAAa;KACrB;CACD,CAAC;AAEF,MAAM,OAAO,cAAe,SAAQ,aAAa;IAGhD,YACC,GAAW,EACX,MAAe,EACf,UAAmB,EACnB,MAAe;QAEf,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QACvC,IAAI,CAAC,MAAM,GAAG,EAAwB,CAAC;IACxC,CAAC;IAEQ,KAAK,CAAC,OAAO;QACrB,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE;YAC3D,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACrB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACxE,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,SAAS;QACR,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,IAAI,cAAc,CAAC,2BAA2B,EAAE;gBACrD,OAAO,EAAE,EAAE,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE;gBAChD,MAAM,EAAE,IAAI,CAAC,MAAM;aACnB,CAAC,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,iBAAiB,CACtB,kBAA6B;QAE7B,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAErB,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ;aACjD,IAAI,CACJ;YACC,GAAG,EAAE;gBACJ,EAAE,iBAAiB,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE,EAAE;gBAClD,EAAE,iBAAiB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;aACzC;YACD,cAAc,EAAE,QAAQ;SACxB,EACD,EAAE,eAAe,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAC5D;aACA,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CACjB,OAAO,CAAC,GAAG,CACV,CAAC,MAAM,EAAE,EAAE,CACV,CAAC;YACA,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO;YAC7B,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ;YAC/B,IAAI,EAAE,MAAM,CAAC,IAAI;SACjB,CAAiB,CACnB,CACD,CAAC;QAEH,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,gBAAgB,CAAC;IACzB,CAAC;CACD"}

package/dist/databases/index.d.ts

@@ -0,0 +1,16 @@
+import { MongoDatabase } from "../base/mongo.js";
+import { MongoMemoryDatabase } from "../base/mongoMemory.js";
+import { CaptchaDatabase } from "./captcha.js";
+import { ClientDatabase } from "./client.js";
+import { ProviderDatabase } from "./provider.js";
+export * from "./captcha.js";
+export * from "./client.js";
+export { ProviderDatabase } from "./provider.js";
+export declare const Databases: {
+    mongo: typeof MongoDatabase;
+    provider: typeof ProviderDatabase;
+    client: typeof ClientDatabase;
+    captcha: typeof CaptchaDatabase;
+    mongoMemory: typeof MongoMemoryDatabase;
+};
+//# sourceMappingURL=index.d.ts.map

package/dist/databases/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/databases/index.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,eAAO,MAAM,SAAS;;;;;;CAMrB,CAAC"}

package/dist/databases/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/databases/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,MAAM,CAAC,MAAM,SAAS,GAAG;IACxB,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,aAAa;IAC3C,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,gBAAgB;IACjD,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,cAAc;IAC7C,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,eAAe;IAC/C,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,mBAAmB;CACvD,CAAC"}