@prosopo/database 0.2.29 → 0.2.32

package/dist/cjs/contracts/captcha/dist/types-returns/captcha.cjs

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+exports.Error = void 0;
+(function(Error) {
+  Error["notAuthorised"] = "NotAuthorised";
+  Error["transferFailed"] = "TransferFailed";
+  Error["setCodeHashFailed"] = "SetCodeHashFailed";
+  Error["invalidDestination"] = "InvalidDestination";
+  Error["unknownMessage"] = "UnknownMessage";
+  Error["providerAccountExists"] = "ProviderAccountExists";
+  Error["providerExists"] = "ProviderExists";
+  Error["providerAccountDoesNotExist"] = "ProviderAccountDoesNotExist";
+  Error["providerDoesNotExist"] = "ProviderDoesNotExist";
+  Error["providerInsufficientFunds"] = "ProviderInsufficientFunds";
+  Error["providerInactive"] = "ProviderInactive";
+  Error["providerUrlUsed"] = "ProviderUrlUsed";
+  Error["dappExists"] = "DappExists";
+  Error["dappDoesNotExist"] = "DappDoesNotExist";
+  Error["dappInactive"] = "DappInactive";
+  Error["dappInsufficientFunds"] = "DappInsufficientFunds";
+  Error["captchaDataDoesNotExist"] = "CaptchaDataDoesNotExist";
+  Error["commitDoesNotExist"] = "CommitDoesNotExist";
+  Error["dappUserDoesNotExist"] = "DappUserDoesNotExist";
+  Error["noActiveProviders"] = "NoActiveProviders";
+  Error["datasetIdSolutionsSame"] = "DatasetIdSolutionsSame";
+  Error["codeNotFound"] = "CodeNotFound";
+  Error["unknown"] = "Unknown";
+  Error["invalidContract"] = "InvalidContract";
+  Error["invalidPayee"] = "InvalidPayee";
+  Error["invalidCaptchaStatus"] = "InvalidCaptchaStatus";
+  Error["noCorrectCaptcha"] = "NoCorrectCaptcha";
+  Error["notEnoughActiveProviders"] = "NotEnoughActiveProviders";
+  Error["providerFeeTooHigh"] = "ProviderFeeTooHigh";
+  Error["commitAlreadyExists"] = "CommitAlreadyExists";
+  Error["notAuthor"] = "NotAuthor";
+})(exports.Error || (exports.Error = {}));
+exports.LangError = void 0;
+(function(LangError) {
+  LangError["couldNotReadInput"] = "CouldNotReadInput";
+})(exports.LangError || (exports.LangError = {}));
+exports.Payee = void 0;
+(function(Payee) {
+  Payee["provider"] = "Provider";
+  Payee["dapp"] = "Dapp";
+})(exports.Payee || (exports.Payee = {}));
+exports.DappPayee = void 0;
+(function(DappPayee) {
+  DappPayee["provider"] = "Provider";
+  DappPayee["dapp"] = "Dapp";
+  DappPayee["any"] = "Any";
+})(exports.DappPayee || (exports.DappPayee = {}));
+exports.GovernanceStatus = void 0;
+(function(GovernanceStatus) {
+  GovernanceStatus["active"] = "Active";
+  GovernanceStatus["inactive"] = "Inactive";
+})(exports.GovernanceStatus || (exports.GovernanceStatus = {}));
+exports.CaptchaStatus = void 0;
+(function(CaptchaStatus) {
+  CaptchaStatus["pending"] = "Pending";
+  CaptchaStatus["approved"] = "Approved";
+  CaptchaStatus["disapproved"] = "Disapproved";
+})(exports.CaptchaStatus || (exports.CaptchaStatus = {}));

package/dist/cjs/databases/mongo.cjs

@@ -3,7 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 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 captcha = require("../contracts/captcha/dist/types-returns/captcha.cjs");
 const mongodb = require("mongodb");
 const is = require("@polkadot/util/is");
 const mongoose = require("mongoose");
@@ -56,13 +56,10 @@ class ProsopoDatabase extends common.AsyncFactory {
           };
           this.connection.once("open", resolve).on("error", (e) => {
             var _a;
+            this.logger.warn(`mongoose connection error`);
+            this.logger.error(e);
             if (attempt === MAX_RETRIES) {
-              reject(
-                new common.ProsopoDBError("DATABASE.CONNECT_ERROR", {
-                  context: { url: this.url, error: e, attempt },
-                  logger: this.logger
-                })
-              );
+              reject(new common.ProsopoEnvError(e, "DATABASE.CONNECT_ERROR", {}, this.url));
             } else {
               (_a = this.connection) == null ? void 0 : _a.removeAllListeners("error");
             }
@@ -81,10 +78,10 @@ class ProsopoDatabase extends common.AsyncFactory {
   }
   /** Close connection to the database */
   async close() {
-    this.logger.debug(`Closing connection to ${this.url}`);
+    this.logger.info(`Closing connection to ${this.url}`);
     await new Promise(async (resolve, reject) => {
       mongoose.connection.close().then(() => {
-        this.logger.debug(`Connection to ${this.url} closed`);
+        this.logger.info(`Connection to ${this.url} closed`);
         resolve();
       }).catch(reject);
     });
@@ -96,7 +93,7 @@ class ProsopoDatabase extends common.AsyncFactory {
   async storeDataset(dataset) {
     var _a, _b, _c;
     try {
-      this.logger.debug(`Storing dataset in database`);
+      this.logger.info(`Storing dataset in database`);
       const parsedDataset = types.DatasetWithIdsAndTreeSchema.parse(dataset);
       const datasetDoc = {
         datasetId: parsedDataset.datasetId,
@@ -110,14 +107,14 @@ class ProsopoDatabase extends common.AsyncFactory {
         { $set: datasetDoc },
         { upsert: true }
       ));
-      const captchaDocs = parsedDataset.captchas.map(({ solution, ...captcha }, index) => ({
-        ...captcha,
+      const captchaDocs = parsedDataset.captchas.map(({ solution, ...captcha2 }, index) => ({
+        ...captcha2,
         datasetId: parsedDataset.datasetId,
         datasetContentId: parsedDataset.datasetContentId,
         index,
         solved: !!(solution == null ? void 0 : solution.length)
       }));
-      this.logger.debug(`Inserting captcha records`);
+      this.logger.info(`Inserting captcha records`);
       if (captchaDocs.length) {
         await ((_b = this.tables) == null ? void 0 : _b.captcha.bulkWrite(
           captchaDocs.map((captchaDoc) => ({
@@ -129,15 +126,15 @@ class ProsopoDatabase extends common.AsyncFactory {
           }))
         ));
       }
-      const captchaSolutionDocs = parsedDataset.captchas.filter(({ solution }) => solution == null ? void 0 : solution.length).map((captcha) => ({
-        captchaId: captcha.captchaId,
-        captchaContentId: captcha.captchaContentId,
-        solution: captcha.solution,
-        salt: captcha.salt,
+      const captchaSolutionDocs = parsedDataset.captchas.filter(({ solution }) => solution == null ? void 0 : solution.length).map((captcha2) => ({
+        captchaId: captcha2.captchaId,
+        captchaContentId: captcha2.captchaContentId,
+        solution: captcha2.solution,
+        salt: captcha2.salt,
         datasetId: parsedDataset.datasetId,
         datasetContentId: parsedDataset.datasetContentId
       }));
-      this.logger.debug(`Inserting solution records`);
+      this.logger.info(`Inserting solution records`);
       if (captchaSolutionDocs.length) {
         await ((_c = this.tables) == null ? void 0 : _c.solution.bulkWrite(
           captchaSolutionDocs.map((captchaSolutionDoc) => ({
@@ -149,22 +146,11 @@ class ProsopoDatabase extends common.AsyncFactory {
           }))
         ));
       }
-      this.logger.debug(`Dataset stored in database`);
+      this.logger.info(`Dataset stored in database`);
     } catch (err) {
-      throw new common.ProsopoDBError("DATABASE.DATASET_LOAD_FAILED", {
-        context: { failedFuncName: this.storeDataset.name, error: err },
-        logger: this.logger
-      });
+      throw new common.ProsopoEnvError(err, "DATABASE.DATASET_LOAD_FAILED");
     }
   }
-  /** @description Get solutions for a dataset
-   * @param {string} datasetId
-   */
-  async getSolutions(datasetId) {
-    var _a;
-    const docs = await ((_a = this.tables) == null ? void 0 : _a.solution.find({ datasetId }).lean());
-    return docs ? docs : [];
-  }
   /** @description Get a dataset from the database
    * @param {string} datasetId
    */
@@ -200,9 +186,7 @@ class ProsopoDatabase extends common.AsyncFactory {
         })
       };
     }
-    throw new common.ProsopoDBError("DATABASE.DATASET_GET_FAILED", {
-      context: { failedFuncName: this.getDataset.name, datasetId }
-    });
+    throw new common.ProsopoEnvError("DATABASE.DATASET_GET_FAILED", void 0, {}, datasetId);
   }
   /**
    * @description Get random captchas that are solved or not solved
@@ -213,9 +197,7 @@ class ProsopoDatabase extends common.AsyncFactory {
   async getRandomCaptcha(solved, datasetId, size) {
     var _a;
     if (!is.isHex(datasetId)) {
-      throw new common.ProsopoDBError("DATABASE.INVALID_HASH", {
-        context: { failedFuncName: this.getRandomCaptcha.name, datasetId }
-      });
+      throw new common.ProsopoEnvError("DATABASE.INVALID_HASH", this.getRandomCaptcha.name, {}, datasetId);
     }
     const sampleSize = size ? Math.abs(Math.trunc(size)) : 1;
     const cursor = (_a = this.tables) == null ? void 0 : _a.captcha.aggregate([
@@ -236,9 +218,16 @@ class ProsopoDatabase extends common.AsyncFactory {
     if (docs && docs.length) {
       return docs.map(({ _id, ...keepAttrs }) => keepAttrs);
     }
-    throw new common.ProsopoDBError("DATABASE.CAPTCHA_GET_FAILED", {
-      context: { failedFuncName: this.getRandomCaptcha.name, solved, datasetId, size }
-    });
+    throw new common.ProsopoEnvError(
+      "DATABASE.CAPTCHA_GET_FAILED",
+      this.getRandomCaptcha.name,
+      {},
+      {
+        solved,
+        datasetId,
+        size
+      }
+    );
   }
   /**
    * @description Get captchas by id
@@ -251,28 +240,22 @@ class ProsopoDatabase extends common.AsyncFactory {
     if (docs && docs.length) {
       return docs.map(({ _id, ...keepAttrs }) => keepAttrs);
     }
-    throw new common.ProsopoDBError("DATABASE.CAPTCHA_GET_FAILED", {
-      context: { failedFuncName: this.getCaptchaById.name, captchaId }
-    });
+    throw new common.ProsopoEnvError("DATABASE.CAPTCHA_GET_FAILED", this.getCaptchaById.name, {}, captchaId);
   }
   /**
    * @description Update a captcha
    * @param {Captcha}  captcha
    * @param {string}   datasetId  the id of the data set
    */
-  async updateCaptcha(captcha, datasetId) {
+  async updateCaptcha(captcha2, datasetId) {
     var _a;
     if (!is.isHex(datasetId)) {
-      throw new common.ProsopoDBError("DATABASE.INVALID_HASH", {
-        context: { failedFuncName: this.updateCaptcha.name, datasetId }
-      });
+      throw new common.ProsopoEnvError("DATABASE.INVALID_HASH", this.updateCaptcha.name, {}, datasetId);
     }
     try {
-      await ((_a = this.tables) == null ? void 0 : _a.captcha.updateOne({ datasetId }, { $set: captcha }, { upsert: false }));
+      await ((_a = this.tables) == null ? void 0 : _a.captcha.updateOne({ datasetId }, { $set: captcha2 }, { upsert: false }));
     } catch (err) {
-      throw new common.ProsopoDBError("DATABASE.CAPTCHA_UPDATE_FAILED", {
-        context: { failedFuncName: this.getDatasetDetails.name, error: err }
-      });
+      throw new common.ProsopoEnvError(err);
     }
   }
   /**
@@ -288,17 +271,13 @@ class ProsopoDatabase extends common.AsyncFactory {
   async getDatasetDetails(datasetId) {
     var _a;
     if (!is.isHex(datasetId)) {
-      throw new common.ProsopoDBError("DATABASE.INVALID_HASH", {
-        context: { failedFuncName: this.getDatasetDetails.name, datasetId }
-      });
+      throw new common.ProsopoEnvError("DATABASE.INVALID_HASH", this.getDatasetDetails.name, {}, datasetId);
     }
     const doc = await ((_a = this.tables) == null ? void 0 : _a.dataset.findOne({ datasetId }).lean());
     if (doc) {
       return doc;
     }
-    throw new common.ProsopoDBError("DATABASE.DATASET_GET_FAILED", {
-      context: { failedFuncName: this.getDatasetDetails.name, datasetId }
-    });
+    throw new common.ProsopoEnvError("DATABASE.DATASET_GET_FAILED", this.getDatasetDetails.name, {}, datasetId);
   }
   /**
    * @description Store a Dapp User's captcha solution commitment
@@ -314,15 +293,15 @@ class ProsopoDatabase extends common.AsyncFactory {
         commitmentRecord,
         { upsert: true }
       ));
-      const ops = captchas.map((captcha) => ({
+      const ops = captchas.map((captcha2) => ({
         updateOne: {
-          filter: { commitmentId: commit.id, captchaId: captcha.captchaId },
+          filter: { commitmentId: commit.id, captchaId: captcha2.captchaId },
           update: {
             $set: {
-              captchaId: captcha.captchaId,
-              captchaContentId: captcha.captchaContentId,
-              salt: captcha.salt,
-              solution: captcha.solution,
+              captchaId: captcha2.captchaId,
+              captchaContentId: captcha2.captchaContentId,
+              salt: captcha2.salt,
+              solution: captcha2.solution,
               commitmentId: commit.id,
               processed: false
             }
@@ -379,9 +358,7 @@ class ProsopoDatabase extends common.AsyncFactory {
   async storeDappUserPending(userAccount, requestHash, salt, deadlineTimestamp, requestedAtBlock) {
     var _a;
     if (!is.isHex(requestHash)) {
-      throw new common.ProsopoDBError("DATABASE.INVALID_HASH", {
-        context: { failedFuncName: this.storeDappUserPending.name, requestHash }
-      });
+      throw new common.ProsopoEnvError("DATABASE.INVALID_HASH", this.storeDappUserPending.name, {}, requestHash);
     }
     const pendingRecord = {
       accountId: userAccount,
@@ -399,17 +376,13 @@ class ProsopoDatabase extends common.AsyncFactory {
   async getDappUserPending(requestHash) {
     var _a;
     if (!is.isHex(requestHash)) {
-      throw new common.ProsopoEnvError("DATABASE.INVALID_HASH", {
-        context: { failedFuncName: this.getDappUserPending.name, requestHash }
-      });
+      throw new common.ProsopoEnvError("DATABASE.INVALID_HASH", this.getDappUserPending.name, {}, requestHash);
     }
     const doc = await ((_a = this.tables) == null ? void 0 : _a.pending.findOne({ requestHash }).lean());
     if (doc) {
       return doc;
     }
-    throw new common.ProsopoEnvError("DATABASE.PENDING_RECORD_NOT_FOUND", {
-      context: { failedFuncName: this.getDappUserPending.name, requestHash }
-    });
+    throw new common.ProsopoEnvError("DATABASE.PENDING_RECORD_NOT_FOUND", this.getDappUserPending.name);
   }
   /**
    * @description Update a Dapp User's pending record
@@ -417,9 +390,7 @@ class ProsopoDatabase extends common.AsyncFactory {
   async updateDappUserPendingStatus(userAccount, requestHash, approve) {
     var _a;
     if (!is.isHex(requestHash)) {
-      throw new common.ProsopoEnvError("DATABASE.INVALID_HASH", {
-        context: { failedFuncName: this.updateDappUserPendingStatus.name, requestHash }
-      });
+      throw new common.ProsopoEnvError("DATABASE.INVALID_HASH", this.updateDappUserPendingStatus.name, {}, requestHash);
     }
     await ((_a = this.tables) == null ? void 0 : _a.pending.updateOne(
       { requestHash },
@@ -486,14 +457,17 @@ class ProsopoDatabase extends common.AsyncFactory {
     if (docs && docs.length) {
       return docs[0]._id;
     }
-    throw new common.ProsopoDBError("DATABASE.DATASET_WITH_SOLUTIONS_GET_FAILED");
+    throw new common.ProsopoEnvError("DATABASE.DATASET_WITH_SOLUTIONS_GET_FAILED");
   }
   async getRandomSolvedCaptchasFromSingleDataset(datasetId, size) {
     var _a;
     if (!is.isHex(datasetId)) {
-      throw new common.ProsopoDBError("DATABASE.INVALID_HASH", {
-        context: { failedFuncName: this.getRandomSolvedCaptchasFromSingleDataset.name, datasetId }
-      });
+      throw new common.ProsopoEnvError(
+        "DATABASE.INVALID_HASH",
+        this.getRandomSolvedCaptchasFromSingleDataset.name,
+        {},
+        datasetId
+      );
     }
     const sampleSize = size ? Math.abs(Math.trunc(size)) : 1;
     const cursor = (_a = this.tables) == null ? void 0 : _a.solution.aggregate([
@@ -511,9 +485,7 @@ class ProsopoDatabase extends common.AsyncFactory {
     if (docs && docs.length) {
       return docs;
     }
-    throw new common.ProsopoDBError("DATABASE.SOLUTION_GET_FAILED", {
-      context: { failedFuncName: this.getRandomSolvedCaptchasFromSingleDataset.name, datasetId, size }
-    });
+    throw new common.ProsopoEnvError("DATABASE.SOLUTION_GET_FAILED");
   }
   /**
    * @description Get dapp user solution by ID
@@ -531,9 +503,7 @@ class ProsopoDatabase extends common.AsyncFactory {
     if (doc) {
       return doc;
     }
-    throw new common.ProsopoDBError("DATABASE.SOLUTION_GET_FAILED", {
-      context: { failedFuncName: this.getCaptchaById.name, commitmentId }
-    });
+    throw new common.ProsopoEnvError("DATABASE.SOLUTION_GET_FAILED", this.getCaptchaById.name, {}, commitmentId);
   }
   /**
    * @description Get dapp user commitment by user account
@@ -563,11 +533,11 @@ class ProsopoDatabase extends common.AsyncFactory {
     try {
       await ((_b = (_a = this.tables) == null ? void 0 : _a.commitment) == null ? void 0 : _b.findOneAndUpdate(
         { id: commitmentId },
-        { $set: { status: typesReturns.CaptchaStatus.approved } },
+        { $set: { status: captcha.CaptchaStatus.approved } },
         { upsert: false }
       ).lean());
     } catch (err) {
-      throw new common.ProsopoDBError("DATABASE.SOLUTION_APPROVE_FAILED", { context: { error: err, commitmentId } });
+      throw new common.ProsopoEnvError(err, "DATABASE.SOLUTION_APPROVE_FAILED", {}, commitmentId);
     }
   }
   /**
@@ -579,7 +549,7 @@ class ProsopoDatabase extends common.AsyncFactory {
     try {
       await ((_b = (_a = this.tables) == null ? void 0 : _a.usersolution) == null ? void 0 : _b.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.ProsopoEnvError(err, "DATABASE.SOLUTION_FLAG_FAILED", {}, captchaIds);
     }
   }
   /**
@@ -592,7 +562,7 @@ class ProsopoDatabase extends common.AsyncFactory {
       const distinctCommitmentIds = [...new Set(commitmentIds)];
       await ((_b = (_a = this.tables) == null ? void 0 : _a.commitment) == null ? void 0 : _b.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.ProsopoEnvError(err, "DATABASE.COMMITMENT_FLAG_FAILED", {}, commitmentIds);
     }
   }
   /**
@@ -605,7 +575,7 @@ class ProsopoDatabase extends common.AsyncFactory {
       const distinctCommitmentIds = [...new Set(commitmentIds)];
       await ((_b = (_a = this.tables) == null ? void 0 : _a.commitment) == null ? void 0 : _b.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.ProsopoEnvError(err, "DATABASE.COMMITMENT_FLAG_FAILED", {}, commitmentIds);
     }
   }
   /**

package/dist/cjs/index.cjs

@@ -1,7 +1,4 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const index = require("./databases/index.cjs");
-require("./eventsDatabase/index.cjs");
-const eventsDatabase = require("./eventsDatabase/eventsDatabase.cjs");
 exports.Databases = index.Databases;
-exports.saveCaptchaEvent = eventsDatabase.saveCaptchaEvent;

package/dist/eventsDatabase/eventsDatabase.d.ts

@@ -1,3 +1,3 @@
 import { StoredEvents } from '@prosopo/types';
-export declare const saveCaptchaEvent: (events: StoredEvents, accountId: string, atlasUri: string) => Promise<void>;
+export declare const saveCaptchaEvent: (events: StoredEvents, accountId: string, atlasUri: string) => Promise<unknown>;
 //# sourceMappingURL=eventsDatabase.d.ts.map

package/dist/eventsDatabase/eventsDatabase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eventsDatabase.d.ts","sourceRoot":"","sources":["../../src/eventsDatabase/eventsDatabase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AA8C7C,eAAO,MAAM,gBAAgB,WAAkB,YAAY,aAAa,MAAM,YAAY,MAAM,kBAc/F,CAAA"}
+{"version":3,"file":"eventsDatabase.d.ts","sourceRoot":"","sources":["../../src/eventsDatabase/eventsDatabase.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,YAAY,EAAE,MAAM,gBAAgB,CAAA;AA+ChE,eAAO,MAAM,gBAAgB,WAAkB,YAAY,aAAa,MAAM,YAAY,MAAM,qBAiC/F,CAAA"}

package/dist/eventsDatabase/eventsDatabase.js

@@ -1,4 +1,7 @@
+import { ProsopoDBError, getLoggerDefault } from '@prosopo/common';
 import mongoose from 'mongoose';
+const logger = getLoggerDefault();
+const MAX_RETRIES = 3;
 const captchaEventSchema = new mongoose.Schema({
     touchEvents: [
         {
@@ -18,34 +21,55 @@ const captchaEventSchema = new mongoose.Schema({
         {
             key: String,
             timestamp: Number,
-            isShiftKey: Boolean,
-            isCtrlKey: Boolean,
+            isShiftKey: { type: Boolean, required: false },
+            isCtrlKey: { type: Boolean, required: false },
         },
     ],
     accountId: String,
 });
-const CaptchaEvent = mongoose.model('CaptchaEvent', captchaEventSchema);
+let CaptchaEvent;
+try {
+    CaptchaEvent = mongoose.model('CaptchaEvent');
+}
+catch (error) {
+    CaptchaEvent = mongoose.model('CaptchaEvent', captchaEventSchema);
+}
 const addCaptchaEventRecord = async (record) => {
     try {
         const newRecord = new CaptchaEvent(record);
         await newRecord.save();
-        console.log('Record added successfully');
+        logger.info('Record added successfully');
     }
     catch (error) {
-        console.error('Error adding record to the database:', error);
+        logger.error('Error adding record to the database:', error);
     }
 };
 export const saveCaptchaEvent = async (events, accountId, atlasUri) => {
-    await mongoose
-        .connect(atlasUri)
-        .then(() => console.log('Connected to MongoDB Atlas'))
-        .catch((err) => console.error('Error connecting to MongoDB:', err));
-    const captchaEventData = {
-        ...events,
-        accountId,
-    };
-    addCaptchaEventRecord(captchaEventData)
-        .then(() => console.log('Captcha event data saved'))
-        .catch((error) => console.error('Error saving captcha event data:', error));
+    return new Promise((resolve, reject) => {
+        const connection = mongoose.createConnection(atlasUri);
+        for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
+            connection.once('open', resolve).on('error', (e) => {
+                logger.warn(`Mongoose connection error`);
+                logger.error(e);
+                if (attempt === MAX_RETRIES) {
+                    reject(new ProsopoDBError('DATABASE.CONNECT_ERROR', {
+                        context: { failedFuncName: saveCaptchaEvent.name, db: 'events database' },
+                        logger: logger,
+                    }));
+                }
+                else {
+                    connection?.removeAllListeners('error');
+                }
+            });
+        }
+        const captchaEventData = {
+            ...events,
+            accountId,
+        };
+        addCaptchaEventRecord(captchaEventData)
+            .then(() => logger.info('Captcha event data saved'))
+            .catch((error) => logger.error('Error saving captcha event data:', error))
+            .finally(() => connection.close());
+    });
 };
 //# sourceMappingURL=eventsDatabase.js.map

package/dist/eventsDatabase/eventsDatabase.js.map

@@ -1 +1 @@
-{"version":3,"file":"eventsDatabase.js","sourceRoot":"","sources":["../../src/eventsDatabase/eventsDatabase.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAE/B,MAAM,kBAAkB,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC;IAC3C,WAAW,EAAE;QACT;YACI,CAAC,EAAE,MAAM;YACT,CAAC,EAAE,MAAM;YACT,SAAS,EAAE,MAAM;SACpB;KACJ;IACD,WAAW,EAAE;QACT;YACI,CAAC,EAAE,MAAM;YACT,CAAC,EAAE,MAAM;YACT,SAAS,EAAE,MAAM;SACpB;KACJ;IACD,cAAc,EAAE;QACZ;YACI,GAAG,EAAE,MAAM;YACX,SAAS,EAAE,MAAM;YACjB,UAAU,EAAE,OAAO;YACnB,SAAS,EAAE,OAAO;SACrB;KACJ;IACD,SAAS,EAAE,MAAM;CACpB,CAAC,CAAA;AAEF,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;AAEvE,MAAM,qBAAqB,GAAG,KAAK,EAAE,MAKpC,EAAiB,EAAE;IAChB,IAAI;QACA,MAAM,SAAS,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,CAAA;QAC1C,MAAM,SAAS,CAAC,IAAI,EAAE,CAAA;QACtB,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAA;KAC3C;IAAC,OAAO,KAAK,EAAE;QACZ,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAA;KAC/D;AACL,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,MAAoB,EAAE,SAAiB,EAAE,QAAgB,EAAE,EAAE;IAChG,MAAM,QAAQ;SACT,OAAO,CAAC,QAAQ,CAAC;SACjB,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;SACrD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,GAAG,CAAC,CAAC,CAAA;IAEvE,MAAM,gBAAgB,GAAG;QACrB,GAAG,MAAM;QACT,SAAS;KACZ,CAAA;IAED,qBAAqB,CAAC,gBAAgB,CAAC;SAClC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;SACnD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,KAAK,CAAC,CAAC,CAAA;AACnF,CAAC,CAAA"}
+{"version":3,"file":"eventsDatabase.js","sourceRoot":"","sources":["../../src/eventsDatabase/eventsDatabase.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@prosopo/database",
-    "version": "0.2.29",
+    "version": "0.2.32",
     "description": "Prosopo database plugins for provider",
     "main": "dist/index.js",
     "type": "module",
@@ -37,11 +37,11 @@
     "homepage": "https://github.com/prosopo/captcha#readme",
     "dependencies": {
         "@polkadot/util": "^12.5.1",
-        "@prosopo/captcha-contract": "0.2.29",
-        "@prosopo/common": "0.2.29",
-        "@prosopo/config": "0.2.29",
-        "@prosopo/types": "0.2.29",
-        "@prosopo/types-database": "0.2.29",
+        "@prosopo/captcha-contract": "0.2.32",
+        "@prosopo/common": "0.2.32",
+        "@prosopo/config": "0.2.32",
+        "@prosopo/types": "0.2.32",
+        "@prosopo/types-database": "0.2.32",
         "mongodb": "5.8.0",
         "mongodb-memory-server": "^8.7.2",
         "mongoose": "^7.3.3"

package/dist/cjs/eventsDatabase/eventsDatabase.cjs

@@ -1,47 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const mongoose = require("mongoose");
-const captchaEventSchema = new mongoose.Schema({
-  touchEvents: [
-    {
-      x: Number,
-      y: Number,
-      timestamp: Number
-    }
-  ],
-  mouseEvents: [
-    {
-      x: Number,
-      y: Number,
-      timestamp: Number
-    }
-  ],
-  keyboardEvents: [
-    {
-      key: String,
-      timestamp: Number,
-      isShiftKey: Boolean,
-      isCtrlKey: Boolean
-    }
-  ],
-  accountId: String
-});
-const CaptchaEvent = mongoose.model("CaptchaEvent", captchaEventSchema);
-const addCaptchaEventRecord = async (record) => {
-  try {
-    const newRecord = new CaptchaEvent(record);
-    await newRecord.save();
-    console.log("Record added successfully");
-  } catch (error) {
-    console.error("Error adding record to the database:", error);
-  }
-};
-const saveCaptchaEvent = async (events, accountId, atlasUri) => {
-  await mongoose.connect(atlasUri).then(() => console.log("Connected to MongoDB Atlas")).catch((err) => console.error("Error connecting to MongoDB:", err));
-  const captchaEventData = {
-    ...events,
-    accountId
-  };
-  addCaptchaEventRecord(captchaEventData).then(() => console.log("Captcha event data saved")).catch((error) => console.error("Error saving captcha event data:", error));
-};
-exports.saveCaptchaEvent = saveCaptchaEvent;

package/dist/cjs/eventsDatabase/index.cjs

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