@prosopo/database 1.0.1 → 2.0.0

package/dist/captchaDatabase/captchaDatabase.d.ts

@@ -0,0 +1,4 @@
+import { type UserCommitmentRecord } from "@prosopo/types-database";
+import { PowCaptcha } from "@prosopo/types";
+export declare const saveCaptchas: (imageCaptchaEvents: UserCommitmentRecord[], powCaptchaEvents: PowCaptcha[], atlasUri: string) => Promise<void>;
+//# sourceMappingURL=captchaDatabase.d.ts.map

package/dist/captchaDatabase/captchaDatabase.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"captchaDatabase.d.ts","sourceRoot":"","sources":["../../src/captchaDatabase/captchaDatabase.ts"],"names":[],"mappings":"AAcA,OAAO,EAEL,KAAK,oBAAoB,EAE1B,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAM5C,eAAO,MAAM,YAAY,uBACH,oBAAoB,EAAE,oBACxB,UAAU,EAAE,YACpB,MAAM,kBA+BjB,CAAC"}

package/dist/captchaDatabase/captchaDatabase.js

@@ -0,0 +1,31 @@
+import { getLoggerDefault } from "@prosopo/common";
+import { PowCaptchaRecordSchema, UserCommitmentRecordSchema, } from "@prosopo/types-database";
+import mongoose from "mongoose";
+const logger = getLoggerDefault();
+let StoredImageCaptcha;
+let StoredPoWCaptcha;
+export const saveCaptchas = async (imageCaptchaEvents, powCaptchaEvents, atlasUri) => {
+    const connection = mongoose.createConnection(atlasUri, {
+        authSource: "admin",
+    });
+    await new Promise((resolve, reject) => {
+        connection
+            .once("open", () => {
+            logger.info("Connected to MongoDB Atlas");
+            StoredImageCaptcha = connection.model("StoredImageCaptcha", UserCommitmentRecordSchema);
+            StoredPoWCaptcha = connection.model("StoredPoWCaptcha", PowCaptchaRecordSchema);
+            resolve();
+        })
+            .on("error", reject);
+    });
+    if (imageCaptchaEvents.length) {
+        await StoredImageCaptcha.insertMany(imageCaptchaEvents);
+        logger.info("Mongo Saved Image Events");
+    }
+    if (powCaptchaEvents.length) {
+        await StoredPoWCaptcha.insertMany(powCaptchaEvents);
+        logger.info("Mongo Saved PoW Events");
+    }
+    await connection.close();
+};
+//# sourceMappingURL=captchaDatabase.js.map

package/dist/captchaDatabase/captchaDatabase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"captchaDatabase.js","sourceRoot":"","sources":["../../src/captchaDatabase/captchaDatabase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAcnD,OAAO,EACL,sBAAsB,EAEtB,0BAA0B,GAC3B,MAAM,yBAAyB,CAAC;AACjC,OAAO,QAAQ,MAAM,UAAU,CAAC;AAEhC,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;AAElC,IAAI,kBAAwD,CAAC;AAC7D,IAAI,gBAA4C,CAAC;AAEjD,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAC/B,kBAA0C,EAC1C,gBAA8B,EAC9B,QAAgB,EAChB,EAAE;IACF,MAAM,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,EAAE;QACrD,UAAU,EAAE,OAAO;KACpB,CAAC,CAAC;IACH,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,UAAU;aACP,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;YACjB,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;YAC1C,kBAAkB,GAAG,UAAU,CAAC,KAAK,CACnC,oBAAoB,EACpB,0BAA0B,CAC3B,CAAC;YACF,gBAAgB,GAAG,UAAU,CAAC,KAAK,CACjC,kBAAkB,EAClB,sBAAsB,CACvB,CAAC;YACF,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC;aACD,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;IACH,IAAI,kBAAkB,CAAC,MAAM,EAAE;QAC7B,MAAM,kBAAkB,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;QACxD,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;KACzC;IACD,IAAI,gBAAgB,CAAC,MAAM,EAAE;QAC3B,MAAM,gBAAgB,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;QACpD,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;KACvC;IAED,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;AAC3B,CAAC,CAAC"}

package/dist/captchaDatabase/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./captchaDatabase.js";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/captchaDatabase/index.ts"],"names":[],"mappings":"AAaA,cAAc,sBAAsB,CAAC"}

package/dist/captchaDatabase/index.js

@@ -0,0 +1,2 @@
+export * from "./captchaDatabase.js";
+//# sourceMappingURL=index.js.map

package/dist/captchaDatabase/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/captchaDatabase/index.ts"],"names":[],"mappings":"AAaA,cAAc,sBAAsB,CAAC"}

package/dist/cjs/captchaDatabase/captchaDatabase.cjs

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const common = require("@prosopo/common");
+const typesDatabase = require("@prosopo/types-database");
+const mongoose = require("mongoose");
+const logger = common.getLoggerDefault();
+let StoredImageCaptcha;
+let StoredPoWCaptcha;
+const saveCaptchas = async (imageCaptchaEvents, powCaptchaEvents, atlasUri) => {
+  const connection = mongoose.createConnection(atlasUri, {
+    authSource: "admin"
+  });
+  await new Promise((resolve, reject) => {
+    connection.once("open", () => {
+      logger.info("Connected to MongoDB Atlas");
+      StoredImageCaptcha = connection.model(
+        "StoredImageCaptcha",
+        typesDatabase.UserCommitmentRecordSchema
+      );
+      StoredPoWCaptcha = connection.model(
+        "StoredPoWCaptcha",
+        typesDatabase.PowCaptchaRecordSchema
+      );
+      resolve();
+    }).on("error", reject);
+  });
+  if (imageCaptchaEvents.length) {
+    await StoredImageCaptcha.insertMany(imageCaptchaEvents);
+    logger.info("Mongo Saved Image Events");
+  }
+  if (powCaptchaEvents.length) {
+    await StoredPoWCaptcha.insertMany(powCaptchaEvents);
+    logger.info("Mongo Saved PoW Events");
+  }
+  await connection.close();
+};
+exports.saveCaptchas = saveCaptchas;

package/dist/cjs/captchaDatabase/index.cjs

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const captchaDatabase = require("./captchaDatabase.cjs");
+exports.saveCaptchas = captchaDatabase.saveCaptchas;

package/dist/cjs/databases/mongo.cjs

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const is = require("@polkadot/util/is");
 const common = require("@prosopo/common");
 const types = require("@prosopo/types");
 const typesDatabase = require("@prosopo/types-database");
-const typesReturns = require("@prosopo/captcha-contract/types-returns");
 const mongodb = require("mongodb");
-const is = require("@polkadot/util/is");
 const mongoose = require("mongoose");
 mongoose.set("strictQuery", false);
 const DEFAULT_ENDPOINT = "mongodb://127.0.0.1:27017";
@@ -50,7 +49,9 @@ class ProsopoDatabase extends common.AsyncFactory {
    * @description Connect to the database and set the various tables
    */
   async connect() {
-    this.logger.info(`Mongo url: ${this.url.replace(/\w+:\w+/, "<Credentials>")}`);
+    this.logger.info(
+      `Mongo url: ${this.url.replace(/\w+:\w+/, "<Credentials>")}`
+    );
     this.connection = await new Promise((resolve, reject) => {
       const connection = mongoose.createConnection(this.url, {
         dbName: this.dbname,
@@ -66,12 +67,14 @@ class ProsopoDatabase extends common.AsyncFactory {
       });
       connection.on("connected", () => {
         this.logger.info(`Database connected to ${this.url}`);
+        resolve(connection);
       });
       connection.on("disconnected", () => {
         this.logger.info(`Database disconnected from ${this.url}`);
       });
       connection.on("reconnected", () => {
         this.logger.info(`Database reconnected to ${this.url}`);
+        resolve(connection);
       });
       connection.on("reconnectFailed", () => {
         this.logger.error(`Database reconnect failed to ${this.url}`);
@@ -81,6 +84,7 @@ class ProsopoDatabase extends common.AsyncFactory {
       });
       connection.on("fullsetup", () => {
         this.logger.info(`Database connection to ${this.url} is fully setup`);
+        resolve(connection);
       });
     });
     this.tables = {
@@ -88,8 +92,14 @@ class ProsopoDatabase extends common.AsyncFactory {
       powCaptcha: this.connection.model("PowCaptcha", typesDatabase.PowCaptchaRecordSchema),
       dataset: this.connection.model("Dataset", typesDatabase.DatasetRecordSchema),
       solution: this.connection.model("Solution", typesDatabase.SolutionRecordSchema),
-      commitment: this.connection.model("UserCommitment", typesDatabase.UserCommitmentRecordSchema),
-      usersolution: this.connection.model("UserSolution", typesDatabase.UserSolutionRecordSchema),
+      commitment: this.connection.model(
+        "UserCommitment",
+        typesDatabase.UserCommitmentRecordSchema
+      ),
+      usersolution: this.connection.model(
+        "UserSolution",
+        typesDatabase.UserSolutionRecordSchema
+      ),
       pending: this.connection.model("Pending", typesDatabase.PendingRecordSchema),
       scheduler: this.connection.model("Scheduler", typesDatabase.ScheduledTaskRecordSchema)
     };
@@ -105,7 +115,7 @@ class ProsopoDatabase extends common.AsyncFactory {
    */
   async storeDataset(dataset) {
     try {
-      this.logger.debug(`Storing dataset in database`);
+      this.logger.debug("Storing dataset in database");
       const parsedDataset = types.DatasetWithIdsAndTreeSchema.parse(dataset);
       const datasetDoc = {
         datasetId: parsedDataset.datasetId,
@@ -119,14 +129,16 @@ class ProsopoDatabase extends common.AsyncFactory {
         { $set: datasetDoc },
         { upsert: true }
       );
-      const captchaDocs = parsedDataset.captchas.map(({ solution, ...captcha }, index) => ({
-        ...captcha,
-        datasetId: parsedDataset.datasetId,
-        datasetContentId: parsedDataset.datasetContentId,
-        index,
-        solved: !!solution?.length
-      }));
-      this.logger.debug(`Inserting captcha records`);
+      const captchaDocs = parsedDataset.captchas.map(
+        ({ solution, ...captcha }, index) => ({
+          ...captcha,
+          datasetId: parsedDataset.datasetId,
+          datasetContentId: parsedDataset.datasetContentId,
+          index,
+          solved: !!solution?.length
+        })
+      );
+      this.logger.debug("Inserting captcha records");
       if (captchaDocs.length) {
         await this.tables?.captcha.bulkWrite(
           captchaDocs.map((captchaDoc) => ({
@@ -146,7 +158,7 @@ class ProsopoDatabase extends common.AsyncFactory {
         datasetId: parsedDataset.datasetId,
         datasetContentId: parsedDataset.datasetContentId
       }));
-      this.logger.debug(`Inserting solution records`);
+      this.logger.debug("Inserting solution records");
       if (captchaSolutionDocs.length) {
         await this.tables?.solution.bulkWrite(
           captchaSolutionDocs.map((captchaSolutionDoc) => ({
@@ -158,7 +170,7 @@ class ProsopoDatabase extends common.AsyncFactory {
           }))
         );
       }
-      this.logger.debug(`Dataset stored in database`);
+      this.logger.debug("Dataset stored in database");
     } catch (err) {
       throw new common.ProsopoDBError("DATABASE.DATASET_LOAD_FAILED", {
         context: { failedFuncName: this.storeDataset.name, error: err },
@@ -239,11 +251,16 @@ class ProsopoDatabase extends common.AsyncFactory {
       }
     ]);
     const docs = await cursor;
-    if (docs && docs.length) {
+    if (docs?.length) {
       return docs.map(({ _id, ...keepAttrs }) => keepAttrs);
     }
     throw new common.ProsopoDBError("DATABASE.CAPTCHA_GET_FAILED", {
-      context: { failedFuncName: this.getRandomCaptcha.name, solved, datasetId, size }
+      context: {
+        failedFuncName: this.getRandomCaptcha.name,
+        solved,
+        datasetId,
+        size
+      }
     });
   }
   /**
@@ -253,7 +270,7 @@ class ProsopoDatabase extends common.AsyncFactory {
   async getCaptchaById(captchaId) {
     const cursor = this.tables?.captcha.find({ captchaId: { $in: captchaId } }).lean();
     const docs = await cursor;
-    if (docs && docs.length) {
+    if (docs?.length) {
       return docs.map(({ _id, ...keepAttrs }) => keepAttrs);
     }
     throw new common.ProsopoDBError("DATABASE.CAPTCHA_GET_FAILED", {
@@ -272,7 +289,11 @@ class ProsopoDatabase extends common.AsyncFactory {
       });
     }
     try {
-      await this.tables?.captcha.updateOne({ datasetId }, { $set: captcha }, { upsert: false });
+      await this.tables?.captcha.updateOne(
+        { datasetId },
+        { $set: captcha },
+        { upsert: false }
+      );
     } catch (err) {
       throw new common.ProsopoDBError("DATABASE.CAPTCHA_UPDATE_FAILED", {
         context: { failedFuncName: this.getDatasetDetails.name, error: err }
@@ -299,7 +320,10 @@ class ProsopoDatabase extends common.AsyncFactory {
       return doc;
     }
     throw new common.ProsopoDBError("DATABASE.DATASET_GET_FAILED", {
-      context: { failedFuncName: this.getDatasetDetails.name, datasetId }
+      context: {
+        failedFuncName: this.getDatasetDetails.name,
+        datasetId
+      }
     });
   }
   /**
@@ -337,25 +361,29 @@ class ProsopoDatabase extends common.AsyncFactory {
   /**
    * @description Adds a new PoW Captcha record to the database.
    * @param {string} challenge The challenge string for the captcha.
+   * @param components The components of the PoW challenge.
    * @param {boolean} checked Indicates if the captcha has been checked.
    * @returns {Promise<void>} A promise that resolves when the record is added.
    */
-  async storePowCaptchaRecord(challenge, checked) {
-    if (!this.tables) {
-      throw new common.ProsopoEnvError("DATABASE.DATABASE_UNDEFINED", {
-        context: { failedFuncName: this.storePowCaptchaRecord.name },
-        logger: this.logger
-      });
-    }
+  async storePowCaptchaRecord(challenge, components, checked) {
+    const tables = this.getTables();
     const powCaptchaRecord = {
       challenge,
+      ...components,
       checked
     };
     try {
-      await this.tables.powCaptcha.create(powCaptchaRecord);
-      this.logger.info("PowCaptcha record added successfully", { challenge, checked });
+      await tables.powCaptcha.create(powCaptchaRecord);
+      this.logger.info("PowCaptcha record added successfully", {
+        challenge,
+        checked
+      });
     } catch (error) {
-      this.logger.error("Failed to add PowCaptcha record", { error, challenge, checked });
+      this.logger.error("Failed to add PowCaptcha record", {
+        error,
+        challenge,
+        checked
+      });
       throw new common.ProsopoDBError("DATABASE.CAPTCHA_UPDATE_FAILED", {
         context: { error, challenge, checked },
         logger: this.logger
@@ -377,14 +405,18 @@ class ProsopoDatabase extends common.AsyncFactory {
     try {
       const record = await this.tables.powCaptcha.findOne({ challenge }).lean();
       if (record) {
-        this.logger.info("PowCaptcha record retrieved successfully", { challenge });
+        this.logger.info("PowCaptcha record retrieved successfully", {
+          challenge
+        });
         return record;
-      } else {
-        this.logger.info("No PowCaptcha record found", { challenge });
-        return null;
       }
+      this.logger.info("No PowCaptcha record found", { challenge });
+      return null;
     } catch (error) {
-      this.logger.error("Failed to retrieve PowCaptcha record", { error, challenge });
+      this.logger.error("Failed to retrieve PowCaptcha record", {
+        error,
+        challenge
+      });
       throw new common.ProsopoDBError("DATABASE.CAPTCHA_GET_FAILED", {
         context: { error, challenge },
         logger: this.logger
@@ -398,25 +430,32 @@ class ProsopoDatabase extends common.AsyncFactory {
    * @returns {Promise<void>} A promise that resolves when the record is updated.
    */
   async updatePowCaptchaRecord(challenge, checked) {
-    if (!this.tables) {
-      throw new common.ProsopoEnvError("DATABASE.DATABASE_UNDEFINED", {
-        context: { failedFuncName: this.updatePowCaptchaRecord.name },
-        logger: this.logger
-      });
-    }
+    const tables = this.getTables();
     try {
-      const updateResult = await this.tables.powCaptcha.updateOne({ challenge }, { $set: { checked } });
+      const updateResult = await tables.powCaptcha.updateOne(
+        { challenge },
+        { $set: { checked } }
+      );
       if (updateResult.matchedCount === 0) {
-        this.logger.info("No PowCaptcha record found to update", { challenge, checked });
+        this.logger.info("No PowCaptcha record found to update", {
+          challenge,
+          checked
+        });
         throw new common.ProsopoDBError("DATABASE.CAPTCHA_GET_FAILED", {
           context: { challenge, checked },
           logger: this.logger
         });
-      } else {
-        this.logger.info("PowCaptcha record updated successfully", { challenge, checked });
       }
+      this.logger.info("PowCaptcha record updated successfully", {
+        challenge,
+        checked
+      });
     } catch (error) {
-      this.logger.error("Failed to update PowCaptcha record", { error, challenge, checked });
+      this.logger.error("Failed to update PowCaptcha record", {
+        error,
+        challenge,
+        checked
+      });
       throw new common.ProsopoDBError("DATABASE.CAPTCHA_UPDATE_FAILED", {
         context: { error, challenge, checked },
         logger: this.logger
@@ -441,6 +480,41 @@ class ProsopoDatabase extends common.AsyncFactory {
     const docs = await this.tables?.commitment.find({ batched: false }).lean();
     return docs ? docs.map((doc) => typesDatabase.UserCommitmentSchema.parse(doc)) : [];
   }
+  /** @description Get Dapp User captcha commitments from the commitments table that have not been counted towards the
+   * client's total
+   */
+  async getUnstoredDappUserCommitments() {
+    const docs = await this.tables?.commitment.find({
+      $or: [{ stored: false }, { stored: { $exists: false } }]
+    }).lean();
+    return docs ? docs.map((doc) => typesDatabase.UserCommitmentSchema.parse(doc)) : [];
+  }
+  /** @description Mark a list of captcha commits as stored
+   */
+  async markDappUserCommitmentsStored(commitmentIds) {
+    await this.tables?.commitment.updateMany(
+      { id: { $in: commitmentIds } },
+      { $set: { stored: true } },
+      { upsert: false }
+    );
+  }
+  /** @description Get Dapp User PoW captcha commitments that have not been counted towards the client's total
+   */
+  async getUnstoredDappUserPoWCommitments() {
+    const docs = await this.tables?.powCaptcha.find({
+      $or: [{ stored: false }, { stored: { $exists: false } }]
+    }).lean();
+    return docs || [];
+  }
+  /** @description Mark a list of PoW captcha commits as stored
+   */
+  async markDappUserPoWCommitmentsStored(challengeIds) {
+    await this.tables?.powCaptcha.updateMany(
+      { challenge: { $in: challengeIds } },
+      { $set: { stored: true } },
+      { upsert: false }
+    );
+  }
   /** @description Get Dapp User captcha commitments from the commitments table that have been batched on-chain
    */
   async getBatchedDappUserCommitments() {
@@ -450,12 +524,18 @@ class ProsopoDatabase extends common.AsyncFactory {
   /** @description Remove processed Dapp User captcha solutions from the user solution table
    */
   async removeProcessedDappUserSolutions(commitmentIds) {
-    return await this.tables?.usersolution.deleteMany({ processed: true, commitmentId: { $in: commitmentIds } });
+    return await this.tables?.usersolution.deleteMany({
+      processed: true,
+      commitmentId: { $in: commitmentIds }
+    });
   }
   /** @description Remove processed Dapp User captcha commitments from the user commitments table
    */
   async removeProcessedDappUserCommitments(commitmentIds) {
-    return await this.tables?.commitment.deleteMany({ processed: true, id: { $in: commitmentIds } });
+    return await this.tables?.commitment.deleteMany({
+      processed: true,
+      id: { $in: commitmentIds }
+    });
   }
   /**
    * @description Store a Dapp User's pending record
@@ -463,7 +543,10 @@ class ProsopoDatabase extends common.AsyncFactory {
   async storeDappUserPending(userAccount, requestHash, salt, deadlineTimestamp, requestedAtBlock) {
     if (!is.isHex(requestHash)) {
       throw new common.ProsopoDBError("DATABASE.INVALID_HASH", {
-        context: { failedFuncName: this.storeDappUserPending.name, requestHash }
+        context: {
+          failedFuncName: this.storeDappUserPending.name,
+          requestHash
+        }
       });
     }
     const pendingRecord = {
@@ -474,7 +557,11 @@ class ProsopoDatabase extends common.AsyncFactory {
       deadlineTimestamp,
       requestedAtBlock
     };
-    await this.tables?.pending.updateOne({ requestHash }, { $set: pendingRecord }, { upsert: true });
+    await this.tables?.pending.updateOne(
+      { requestHash },
+      { $set: pendingRecord },
+      { upsert: true }
+    );
   }
   /**
    * @description Get a Dapp user's pending record
@@ -499,7 +586,10 @@ class ProsopoDatabase extends common.AsyncFactory {
   async updateDappUserPendingStatus(requestHash) {
     if (!is.isHex(requestHash)) {
       throw new common.ProsopoEnvError("DATABASE.INVALID_HASH", {
-        context: { failedFuncName: this.updateDappUserPendingStatus.name, requestHash }
+        context: {
+          failedFuncName: this.updateDappUserPendingStatus.name,
+          requestHash
+        }
       });
     }
     await this.tables?.pending.updateOne(
@@ -533,7 +623,9 @@ class ProsopoDatabase extends common.AsyncFactory {
     const cursor = this.tables?.usersolution?.find({ captchaId: { $in: captchaId } }).lean();
     const docs = await cursor;
     if (docs) {
-      return docs.map(({ _id, ...keepAttrs }) => keepAttrs);
+      return docs.map(
+        ({ _id, ...keepAttrs }) => keepAttrs
+      );
     }
     throw new common.ProsopoEnvError("DATABASE.SOLUTION_GET_FAILED");
   }
@@ -558,7 +650,7 @@ class ProsopoDatabase extends common.AsyncFactory {
       }
     ]);
     const docs = await cursor;
-    if (docs && docs.length) {
+    if (docs?.length) {
       return docs[0]._id;
     }
     throw new common.ProsopoDBError("DATABASE.DATASET_WITH_SOLUTIONS_GET_FAILED");
@@ -566,7 +658,10 @@ class ProsopoDatabase extends common.AsyncFactory {
   async getRandomSolvedCaptchasFromSingleDataset(datasetId, size) {
     if (!is.isHex(datasetId)) {
       throw new common.ProsopoDBError("DATABASE.INVALID_HASH", {
-        context: { failedFuncName: this.getRandomSolvedCaptchasFromSingleDataset.name, datasetId }
+        context: {
+          failedFuncName: this.getRandomSolvedCaptchasFromSingleDataset.name,
+          datasetId
+        }
       });
     }
     const sampleSize = size ? Math.abs(Math.trunc(size)) : 1;
@@ -582,11 +677,15 @@ class ProsopoDatabase extends common.AsyncFactory {
       }
     ]);
     const docs = await cursor;
-    if (docs && docs.length) {
+    if (docs?.length) {
       return docs;
     }
     throw new common.ProsopoDBError("DATABASE.SOLUTION_GET_FAILED", {
-      context: { failedFuncName: this.getRandomSolvedCaptchasFromSingleDataset.name, datasetId, size }
+      context: {
+        failedFuncName: this.getRandomSolvedCaptchasFromSingleDataset.name,
+        datasetId,
+        size
+      }
     });
   }
   /**
@@ -633,11 +732,13 @@ class ProsopoDatabase extends common.AsyncFactory {
     try {
       await this.tables?.commitment?.findOneAndUpdate(
         { id: commitmentId },
-        { $set: { status: typesReturns.CaptchaStatus.approved } },
+        { $set: { status: types.CaptchaStatus.approved } },
         { upsert: false }
       ).lean();
     } catch (err) {
-      throw new common.ProsopoDBError("DATABASE.SOLUTION_APPROVE_FAILED", { context: { error: err, commitmentId } });
+      throw new common.ProsopoDBError("DATABASE.SOLUTION_APPROVE_FAILED", {
+        context: { error: err, commitmentId }
+      });
     }
   }
   /**
@@ -646,9 +747,15 @@ class ProsopoDatabase extends common.AsyncFactory {
    */
   async flagProcessedDappUserSolutions(captchaIds) {
     try {
-      await this.tables?.usersolution?.updateMany({ captchaId: { $in: captchaIds } }, { $set: { processed: true } }, { upsert: false }).lean();
+      await this.tables?.usersolution?.updateMany(
+        { captchaId: { $in: captchaIds } },
+        { $set: { processed: true } },
+        { upsert: false }
+      ).lean();
     } catch (err) {
-      throw new common.ProsopoDBError("DATABASE.SOLUTION_FLAG_FAILED", { context: { error: err, captchaIds } });
+      throw new common.ProsopoDBError("DATABASE.SOLUTION_FLAG_FAILED", {
+        context: { error: err, captchaIds }
+      });
     }
   }
   /**
@@ -658,9 +765,15 @@ class ProsopoDatabase extends common.AsyncFactory {
   async flagProcessedDappUserCommitments(commitmentIds) {
     try {
       const distinctCommitmentIds = [...new Set(commitmentIds)];
-      await this.tables?.commitment?.updateMany({ id: { $in: distinctCommitmentIds } }, { $set: { processed: true } }, { upsert: false }).lean();
+      await this.tables?.commitment?.updateMany(
+        { id: { $in: distinctCommitmentIds } },
+        { $set: { processed: true } },
+        { upsert: false }
+      ).lean();
     } catch (err) {
-      throw new common.ProsopoDBError("DATABASE.COMMITMENT_FLAG_FAILED", { context: { error: err, commitmentIds } });
+      throw new common.ProsopoDBError("DATABASE.COMMITMENT_FLAG_FAILED", {
+        context: { error: err, commitmentIds }
+      });
     }
   }
   /**
@@ -670,16 +783,25 @@ class ProsopoDatabase extends common.AsyncFactory {
   async flagBatchedDappUserCommitments(commitmentIds) {
     try {
       const distinctCommitmentIds = [...new Set(commitmentIds)];
-      await this.tables?.commitment?.updateMany({ id: { $in: distinctCommitmentIds } }, { $set: { batched: true } }, { upsert: false }).lean();
+      await this.tables?.commitment?.updateMany(
+        { id: { $in: distinctCommitmentIds } },
+        { $set: { batched: true } },
+        { upsert: false }
+      ).lean();
     } catch (err) {
-      throw new common.ProsopoDBError("DATABASE.COMMITMENT_FLAG_FAILED", { context: { error: err, commitmentIds } });
+      throw new common.ProsopoDBError("DATABASE.COMMITMENT_FLAG_FAILED", {
+        context: { error: err, commitmentIds }
+      });
     }
   }
   /**
    * @description Get the last batch commit time or return 0 if none
    */
   async getLastBatchCommitTime() {
-    const cursor = this.tables?.scheduler?.findOne({ processName: types.ScheduledTaskNames.BatchCommitment, status: types.ScheduledTaskStatus.Completed }).sort({ timestamp: -1 });
+    const cursor = this.tables?.scheduler?.findOne({
+      processName: types.ScheduledTaskNames.BatchCommitment,
+      status: types.ScheduledTaskStatus.Completed
+    }).sort({ timestamp: -1 });
     const doc = await cursor?.lean();
     if (doc) {
       return doc.datetime;
@@ -699,7 +821,7 @@ class ProsopoDatabase extends common.AsyncFactory {
   async getLastScheduledTaskStatus(task, status) {
     const lookup = { processName: task };
     if (status) {
-      lookup["status"] = status;
+      lookup.status = status;
     }
     const cursor = await this.tables?.scheduler?.findOne(lookup).sort({ datetime: -1 }).lean();
     return cursor ? cursor : void 0;

package/dist/cjs/databases/mongoMemory.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const mongo = require("./mongo.cjs");
 const mongodbMemoryServer = require("mongodb-memory-server");
+const mongo = require("./mongo.cjs");
 class MongoMemoryDatabase extends mongo.ProsopoDatabase {
   constructor() {
     super(...arguments);

package/dist/cjs/index.cjs

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const index = require("./databases/index.cjs");
 require("./eventsDatabase/index.cjs");
+require("./captchaDatabase/index.cjs");
 const eventsDatabase = require("./eventsDatabase/eventsDatabase.cjs");
+const captchaDatabase = require("./captchaDatabase/captchaDatabase.cjs");
 exports.Databases = index.Databases;
 exports.saveCaptchaEvent = eventsDatabase.saveCaptchaEvent;
+exports.saveCaptchas = captchaDatabase.saveCaptchas;

package/dist/databases/index.d.ts

@@ -1,5 +1,5 @@
-import { ProsopoDatabase as MongoDatabase } from './mongo.js';
-import { MongoMemoryDatabase } from './mongoMemory.js';
+import { ProsopoDatabase as MongoDatabase } from "./mongo.js";
+import { MongoMemoryDatabase } from "./mongoMemory.js";
 export declare const Databases: {
     mongo: typeof MongoDatabase;
     mongoMemory: typeof MongoMemoryDatabase;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/databases/index.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,eAAe,IAAI,aAAa,EAAE,MAAM,YAAY,CAAA;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AACtD,eAAO,MAAM,SAAS;;;CAGrB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/databases/index.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,eAAe,IAAI,aAAa,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,eAAO,MAAM,SAAS;;;CAGrB,CAAC"}

package/dist/databases/index.js

@@ -1,6 +1,6 @@
-import { DatabaseTypes } from '@prosopo/types';
-import { ProsopoDatabase as MongoDatabase } from './mongo.js';
-import { MongoMemoryDatabase } from './mongoMemory.js';
+import { DatabaseTypes } from "@prosopo/types";
+import { ProsopoDatabase as MongoDatabase } from "./mongo.js";
+import { MongoMemoryDatabase } from "./mongoMemory.js";
 export const Databases = {
     [DatabaseTypes.Values.mongo]: MongoDatabase,
     [DatabaseTypes.Values.mongoMemory]: MongoMemoryDatabase,

package/dist/databases/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/databases/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,eAAe,IAAI,aAAa,EAAE,MAAM,YAAY,CAAA;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AACtD,MAAM,CAAC,MAAM,SAAS,GAAG;IACrB,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,aAAa;IAC3C,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,mBAAmB;CAC1D,CAAA"}
+{"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,eAAe,IAAI,aAAa,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,MAAM,CAAC,MAAM,SAAS,GAAG;IACxB,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,aAAa;IAC3C,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,mBAAmB;CACvD,CAAC"}