@prosopo/database 2.0.2 → 2.1.0

package/dist/cjs/databases/{mongo.cjs → provider.cjs}

@@ -4,28 +4,84 @@ const is = require("@polkadot/util/is");
 const common = require("@prosopo/common");
 const types = require("@prosopo/types");
 const typesDatabase = require("@prosopo/types-database");
-const mongodb = require("mongodb");
-const mongoose = require("mongoose");
-mongoose.set("strictQuery", false);
-const DEFAULT_ENDPOINT = "mongodb://127.0.0.1:27017";
-class ProsopoDatabase extends common.AsyncFactory {
-  constructor() {
-    super();
-    this.url = "";
-    this.dbname = "";
-    this.logger = common.getLoggerDefault();
-  }
-  async init(url, dbname, logger, authSource) {
-    const baseEndpoint = url || DEFAULT_ENDPOINT;
-    const parsedUrl = new URL(baseEndpoint);
-    parsedUrl.pathname = dbname;
-    if (authSource) {
-      parsedUrl.searchParams.set("authSource", authSource);
-    }
-    this.url = parsedUrl.toString();
-    this.dbname = dbname;
-    this.logger = logger;
-    return this;
+const mongo = require("../base/mongo.cjs");
+var TableNames = /* @__PURE__ */ ((TableNames2) => {
+  TableNames2["captcha"] = "captcha";
+  TableNames2["dataset"] = "dataset";
+  TableNames2["solution"] = "solution";
+  TableNames2["commitment"] = "commitment";
+  TableNames2["usersolution"] = "usersolution";
+  TableNames2["pending"] = "pending";
+  TableNames2["scheduler"] = "scheduler";
+  TableNames2["powcaptcha"] = "powcaptcha";
+  TableNames2["client"] = "client";
+  return TableNames2;
+})(TableNames || {});
+const PROVIDER_TABLES = [
+  {
+    collectionName: "captcha",
+    modelName: "Captcha",
+    schema: typesDatabase.CaptchaRecordSchema
+  },
+  {
+    collectionName: "powcaptcha",
+    modelName: "PowCaptcha",
+    schema: typesDatabase.PoWCaptchaRecordSchema
+  },
+  {
+    collectionName: "dataset",
+    modelName: "Dataset",
+    schema: typesDatabase.DatasetRecordSchema
+  },
+  {
+    collectionName: "solution",
+    modelName: "Solution",
+    schema: typesDatabase.SolutionRecordSchema
+  },
+  {
+    collectionName: "commitment",
+    modelName: "UserCommitment",
+    schema: typesDatabase.UserCommitmentRecordSchema
+  },
+  {
+    collectionName: "usersolution",
+    modelName: "UserSolution",
+    schema: typesDatabase.UserSolutionRecordSchema
+  },
+  {
+    collectionName: "pending",
+    modelName: "Pending",
+    schema: typesDatabase.PendingRecordSchema
+  },
+  {
+    collectionName: "scheduler",
+    modelName: "Scheduler",
+    schema: typesDatabase.ScheduledTaskRecordSchema
+  },
+  {
+    collectionName: "client",
+    modelName: "Client",
+    schema: typesDatabase.ClientRecordSchema
+  }
+];
+class ProviderDatabase extends mongo.MongoDatabase {
+  constructor(url, dbname, authSource, logger) {
+    super(url, dbname, authSource, logger);
+    this.tables = {};
+    this.tables = {};
+  }
+  async connect() {
+    await super.connect();
+    this.loadTables();
+  }
+  loadTables() {
+    const tables = {};
+    PROVIDER_TABLES.map(({ collectionName, modelName, schema }) => {
+      if (this.connection) {
+        tables[collectionName] = this.connection.model(modelName, schema);
+      }
+    });
+    this.tables = tables;
   }
   getTables() {
     if (!this.tables) {
@@ -36,79 +92,6 @@ class ProsopoDatabase extends common.AsyncFactory {
     }
     return this.tables;
   }
-  getConnection() {
-    if (!this.connection) {
-      throw new common.ProsopoDBError("DATABASE.CONNECTION_UNDEFINED", {
-        context: { failedFuncName: this.getConnection.name },
-        logger: this.logger
-      });
-    }
-    return this.connection;
-  }
-  /**
-   * @description Connect to the database and set the various tables
-   */
-  async connect() {
-    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,
-        serverApi: mongodb.ServerApiVersion.v1
-      });
-      connection.on("open", () => {
-        this.logger.info(`Database connection to ${this.url} opened`);
-        resolve(connection);
-      });
-      connection.on("error", (err) => {
-        this.logger.error(`Database error: ${err}`);
-        reject(err);
-      });
-      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}`);
-      });
-      connection.on("close", () => {
-        this.logger.info(`Database connection to ${this.url} closed`);
-      });
-      connection.on("fullsetup", () => {
-        this.logger.info(`Database connection to ${this.url} is fully setup`);
-        resolve(connection);
-      });
-    });
-    this.tables = {
-      captcha: this.connection.model("Captcha", typesDatabase.CaptchaRecordSchema),
-      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
-      ),
-      pending: this.connection.model("Pending", typesDatabase.PendingRecordSchema),
-      scheduler: this.connection.model("Scheduler", typesDatabase.ScheduledTaskRecordSchema)
-    };
-  }
-  /** Close connection to the database */
-  async close() {
-    this.logger.debug(`Closing connection to ${this.url}`);
-    await this.connection?.close();
-  }
   /**
    * @description Load a dataset to the database
    * @param {Dataset}  dataset
@@ -124,7 +107,7 @@ class ProsopoDatabase extends common.AsyncFactory {
         contentTree: parsedDataset.contentTree,
         solutionTree: parsedDataset.solutionTree
       };
-      await this.tables?.dataset.updateOne(
+      await this.tables.dataset?.updateOne(
         { datasetId: parsedDataset.datasetId },
         { $set: datasetDoc },
         { upsert: true }
@@ -374,12 +357,13 @@ class ProsopoDatabase extends common.AsyncFactory {
    * @param userSignature
    * @returns {Promise<void>} A promise that resolves when the record is added.
    */
-  async storePowCaptchaRecord(challenge, components, difficulty, providerSignature, ipAddress, serverChecked = false, userSubmitted = false, storedStatus = typesDatabase.StoredStatusNames.notStored, userSignature) {
+  async storePowCaptchaRecord(challenge, components, difficulty, providerSignature, ipAddress, headers, serverChecked = false, userSubmitted = false, storedStatus = typesDatabase.StoredStatusNames.notStored, userSignature) {
     const tables = this.getTables();
     const powCaptchaRecord = {
       challenge,
       ...components,
       ipAddress,
+      headers,
       result: { status: types.CaptchaStatus.pending },
       userSubmitted,
       serverChecked,
@@ -389,7 +373,7 @@ class ProsopoDatabase extends common.AsyncFactory {
       lastUpdatedTimestamp: Date.now()
     };
     try {
-      await tables.powCaptcha.create(powCaptchaRecord);
+      await tables.powcaptcha.create(powCaptchaRecord);
       this.logger.info("PowCaptcha record added successfully", {
         challenge,
         userSubmitted,
@@ -419,7 +403,7 @@ class ProsopoDatabase extends common.AsyncFactory {
   /**
    * @description Retrieves a PoW Captcha record by its challenge string.
    * @param {string} challenge The challenge string to search for.
-   * @returns {Promise<PoWCaptchaStored | null>} A promise that resolves with the found record or null if not found.
+   * @returns {Promise<PoWCaptchaRecord | null>} A promise that resolves with the found record or null if not found.
    */
   async getPowCaptchaRecordByChallenge(challenge) {
     if (!this.tables) {
@@ -429,7 +413,7 @@ class ProsopoDatabase extends common.AsyncFactory {
       });
     }
     try {
-      const record = await this.tables.powCaptcha.findOne({ challenge }).lean();
+      const record = await this.tables.powcaptcha.findOne({ challenge }).lean();
       if (record) {
         this.logger.info("PowCaptcha record retrieved successfully", {
           challenge
@@ -455,7 +439,6 @@ class ProsopoDatabase extends common.AsyncFactory {
    * @param result
    * @param serverChecked
    * @param userSubmitted
-   * @param storedStatus
    * @param userSignature
    * @returns {Promise<void>} A promise that resolves when the record is updated.
    */
@@ -470,7 +453,7 @@ class ProsopoDatabase extends common.AsyncFactory {
       lastUpdatedTimestamp: timestamp
     };
     try {
-      const updateResult = await tables.powCaptcha.updateOne(
+      const updateResult = await tables.powcaptcha.updateOne(
         { challenge },
         {
           $set: update
@@ -567,7 +550,7 @@ class ProsopoDatabase extends common.AsyncFactory {
   /** @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({
+    const docs = await this.tables?.powcaptcha.find({
       $or: [
         { storedStatus: { $ne: typesDatabase.StoredStatusNames.stored } },
         { storedStatus: { $exists: false } }
@@ -581,7 +564,7 @@ class ProsopoDatabase extends common.AsyncFactory {
     const updateDoc = {
       storedAtTimestamp: Date.now()
     };
-    await this.tables?.powCaptcha.updateMany(
+    await this.tables?.powcaptcha.updateMany(
       { challenge: { $in: challenges } },
       { $set: updateDoc },
       { upsert: false }
@@ -594,7 +577,7 @@ class ProsopoDatabase extends common.AsyncFactory {
       [typesDatabase.StoredStatusNames.serverChecked]: true,
       lastUpdatedTimestamp: Date.now()
     };
-    await this.tables?.powCaptcha.updateMany(
+    await this.tables?.powcaptcha.updateMany(
       { challenge: { $in: challenges } },
       {
         $set: updateDoc
@@ -605,7 +588,7 @@ 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({
+    return this.tables?.usersolution.deleteMany({
       processed: true,
       commitmentId: { $in: commitmentIds }
     });
@@ -613,7 +596,7 @@ class ProsopoDatabase extends common.AsyncFactory {
   /** @description Remove processed Dapp User captcha commitments from the user commitments table
    */
   async removeProcessedDappUserCommitments(commitmentIds) {
-    return await this.tables?.commitment.deleteMany({
+    return this.tables?.commitment.deleteMany({
       processed: true,
       id: { $in: commitmentIds }
     });
@@ -901,7 +884,7 @@ class ProsopoDatabase extends common.AsyncFactory {
     if (status) {
       lookup.status = status;
     }
-    const cursor = await this.tables?.scheduler?.findOne(lookup).sort({ datetime: -1 }).lean();
+    const cursor = await this.tables?.scheduler?.findOne(lookup).sort({ datetime: -1 }).limit(1).lean();
     return cursor ? cursor : void 0;
   }
   /**
@@ -934,5 +917,26 @@ class ProsopoDatabase extends common.AsyncFactory {
       }
     );
   }
+  /**
+   * @description Update the client records
+   */
+  async updateClientRecords(clientRecords) {
+    const ops = clientRecords.map((record) => {
+      const clientRecord = {
+        account: record.account,
+        settings: record.settings
+      };
+      return {
+        updateOne: {
+          filter: { account: record.account },
+          update: {
+            $set: clientRecord
+          },
+          upsert: true
+        }
+      };
+    });
+    await this.tables?.client.bulkWrite(ops);
+  }
 }
-exports.ProsopoDatabase = ProsopoDatabase;
+exports.ProviderDatabase = ProviderDatabase;

package/dist/cjs/index.cjs

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+require("./base/index.cjs");
 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");
+const mongo = require("./base/mongo.cjs");
+const mongoMemory = require("./base/mongoMemory.cjs");
+const provider = require("./databases/provider.cjs");
+const captcha = require("./databases/captcha.cjs");
+const client = require("./databases/client.cjs");
 exports.Databases = index.Databases;
-exports.saveCaptchaEvent = eventsDatabase.saveCaptchaEvent;
-exports.saveCaptchas = captchaDatabase.saveCaptchas;
+exports.MongoDatabase = mongo.MongoDatabase;
+exports.MongoMemoryDatabase = mongoMemory.MongoMemoryDatabase;
+exports.ProviderDatabase = provider.ProviderDatabase;
+exports.CaptchaDatabase = captcha.CaptchaDatabase;
+exports.ClientDatabase = client.ClientDatabase;

package/dist/databases/captcha.d.ts

@@ -0,0 +1,16 @@
+import { type Logger } from "@prosopo/common";
+import { type ICaptchaDatabase, type PoWCaptchaRecord, type Tables, type UserCommitmentRecord } from "@prosopo/types-database";
+import { MongoDatabase } from "../base/index.js";
+declare enum TableNames {
+    commitment = "commitment",
+    powcaptcha = "powcaptcha"
+}
+export declare class CaptchaDatabase extends MongoDatabase implements ICaptchaDatabase {
+    tables: Tables<TableNames>;
+    constructor(url: string, dbname?: string, authSource?: string, logger?: Logger);
+    connect(): Promise<void>;
+    getTables(): Tables<TableNames>;
+    saveCaptchas(imageCaptchaEvents: UserCommitmentRecord[], powCaptchaEvents: PoWCaptchaRecord[]): Promise<void>;
+}
+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,EAAoC,MAAM,iBAAiB,CAAC;AAChF,OAAO,EACN,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EAErB,KAAK,MAAM,EACX,KAAK,oBAAoB,EAEzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,aAAK,UAAU;IACd,UAAU,eAAe;IACzB,UAAU,eAAe;CACzB;AAeD,qBAAa,eAAgB,SAAQ,aAAc,YAAW,gBAAgB;IAC7E,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,YAAY,CACjB,kBAAkB,EAAE,oBAAoB,EAAE,EAC1C,gBAAgB,EAAE,gBAAgB,EAAE;CAsCrC"}

package/dist/databases/captcha.js

@@ -0,0 +1,75 @@
+import { ProsopoDBError, getLoggerDefault } from "@prosopo/common";
+import { PoWCaptchaRecordSchema, UserCommitmentRecordSchema, } from "@prosopo/types-database";
+import { MongoDatabase } from "../base/index.js";
+const logger = getLoggerDefault();
+var TableNames;
+(function (TableNames) {
+    TableNames["commitment"] = "commitment";
+    TableNames["powcaptcha"] = "powcaptcha";
+})(TableNames || (TableNames = {}));
+const CAPTCHA_TABLES = [
+    {
+        collectionName: TableNames.powcaptcha,
+        modelName: "PowCaptcha",
+        schema: PoWCaptchaRecordSchema,
+    },
+    {
+        collectionName: TableNames.commitment,
+        modelName: "UserCommitment",
+        schema: UserCommitmentRecordSchema,
+    },
+];
+export class CaptchaDatabase extends MongoDatabase {
+    constructor(url, dbname, authSource, logger) {
+        super(url, dbname, authSource, logger);
+        this.tables = {};
+    }
+    async connect() {
+        await super.connect();
+        CAPTCHA_TABLES.map(({ collectionName, modelName, schema }) => {
+            if (this.connection) {
+                this.tables[collectionName] = this.connection.model(modelName, schema);
+            }
+        });
+    }
+    getTables() {
+        if (!this.tables) {
+            throw new ProsopoDBError("DATABASE.TABLES_UNDEFINED", {
+                context: { failedFuncName: this.getTables.name },
+                logger: this.logger,
+            });
+        }
+        return this.tables;
+    }
+    async saveCaptchas(imageCaptchaEvents, powCaptchaEvents) {
+        await this.connect();
+        if (imageCaptchaEvents.length) {
+            const result = await this.tables.commitment.bulkWrite(imageCaptchaEvents.map((doc) => {
+                const { _id, ...safeDoc } = doc;
+                return {
+                    updateOne: {
+                        filter: { id: safeDoc.id },
+                        update: { $set: safeDoc },
+                        upsert: true,
+                    },
+                };
+            }));
+            logger.info("Mongo Saved Image Events", result);
+        }
+        if (powCaptchaEvents.length) {
+            const result = await this.tables.powcaptcha.bulkWrite(powCaptchaEvents.map((doc) => {
+                const { _id, ...safeDoc } = doc;
+                return {
+                    updateOne: {
+                        filter: { challenge: safeDoc.challenge },
+                        update: { $set: safeDoc },
+                        upsert: true,
+                    },
+                };
+            }));
+            logger.info("Mongo Saved PoW Events", result);
+        }
+        await this.close();
+    }
+}
+//# sourceMappingURL=captcha.js.map

package/dist/databases/captcha.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"captcha.js","sourceRoot":"","sources":["../../src/databases/captcha.ts"],"names":[],"mappings":"AAcA,OAAO,EAAe,cAAc,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAChF,OAAO,EAGN,sBAAsB,EAGtB,0BAA0B,GAC1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;AAElC,IAAK,UAGJ;AAHD,WAAK,UAAU;IACd,uCAAyB,CAAA;IACzB,uCAAyB,CAAA;AAC1B,CAAC,EAHI,UAAU,KAAV,UAAU,QAGd;AAED,MAAM,cAAc,GAAG;IACtB;QACC,cAAc,EAAE,UAAU,CAAC,UAAU;QACrC,SAAS,EAAE,YAAY;QACvB,MAAM,EAAE,sBAAsB;KAC9B;IACD;QACC,cAAc,EAAE,UAAU,CAAC,UAAU;QACrC,SAAS,EAAE,gBAAgB;QAC3B,MAAM,EAAE,0BAA0B;KAClC;CACD,CAAC;AAEF,MAAM,OAAO,eAAgB,SAAQ,aAAa;IAGjD,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,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE;YAC5D,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,YAAY,CACjB,kBAA0C,EAC1C,gBAAoC;QAEpC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,IAAI,kBAAkB,CAAC,MAAM,EAAE,CAAC;YAC/B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CACpD,kBAAkB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBAE9B,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,GAAG,CAAC;gBAChC,OAAO;oBACN,SAAS,EAAE;wBACV,MAAM,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE;wBAC1B,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;wBACzB,MAAM,EAAE,IAAI;qBACZ;iBACD,CAAC;YACH,CAAC,CAAC,CACF,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,0BAA0B,EAAE,MAAM,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,gBAAgB,CAAC,MAAM,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CACpD,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBAE5B,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,GAAG,CAAC;gBAChC,OAAO;oBACN,SAAS,EAAE;wBACV,MAAM,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE;wBACxC,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;wBACzB,MAAM,EAAE,IAAI;qBACZ;iBACD,CAAC;YACH,CAAC,CAAC,CACF,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC;QAED,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACpB,CAAC;CACD"}

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,EACN,KAAK,YAAY,EACjB,KAAK,eAAe,EACpB,UAAU,EACV,KAAK,MAAM,EAEX,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;CAY1B"}

package/dist/databases/client.js

@@ -0,0 +1,42 @@
+import { ProsopoDBError } from "@prosopo/common";
+import { TableNames, UserDataSchema, } from "@prosopo/types-database";
+import { MongoDatabase } from "../base/index.js";
+const CLIENT_TABLES = [
+    {
+        collectionName: TableNames.emails,
+        modelName: "Email",
+        schema: UserDataSchema,
+    },
+];
+export class ClientDatabase extends MongoDatabase {
+    constructor(url, dbname, authSource, logger) {
+        super(url, dbname, authSource, logger);
+        this.tables = {};
+    }
+    async connect() {
+        await super.connect();
+        CLIENT_TABLES.map(({ collectionName, modelName, schema }) => {
+            if (this.connection) {
+                this.tables[collectionName] = this.connection.model(modelName, schema);
+            }
+        });
+    }
+    getTables() {
+        if (!this.tables) {
+            throw new ProsopoDBError("DATABASE.TABLES_UNDEFINED", {
+                context: { failedFuncName: this.getTables.name },
+                logger: this.logger,
+            });
+        }
+        return this.tables;
+    }
+    async getUpdatedClients(updatedAtTimestamp) {
+        await this.connect();
+        const newClientRecords = await this.tables.emails
+            .find({ updatedAtTimestamp: { $gt: updatedAtTimestamp }, activated: true }, { account: 1, settings: 1 })
+            .lean();
+        await this.close();
+        return newClientRecords;
+    }
+}
+//# sourceMappingURL=client.js.map

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,EAGN,UAAU,EAEV,cAAc,GACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,aAAa,GAAG;IACrB;QACC,cAAc,EAAE,UAAU,CAAC,MAAM;QACjC,SAAS,EAAE,OAAO;QAClB,MAAM,EAAE,cAAc;KACtB;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,MAAM;aAC/C,IAAI,CACJ,EAAE,kBAAkB,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,EACpE,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAC3B;aACA,IAAI,EAAkB,CAAC;QACzB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,gBAAgB,CAAC;IACzB,CAAC;CACD"}

package/dist/databases/index.d.ts

@@ -1,7 +1,16 @@
-import { ProsopoDatabase as MongoDatabase } from "./mongo.js";
-import { MongoMemoryDatabase } from "./mongoMemory.js";
+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

@@ -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,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,eAAO,MAAM,SAAS;;;CAGrB,CAAC"}
+{"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

@@ -1,8 +1,17 @@
 import { DatabaseTypes } from "@prosopo/types";
-import { ProsopoDatabase as MongoDatabase } from "./mongo.js";
-import { MongoMemoryDatabase } from "./mongoMemory.js";
+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 const Databases = {
     [DatabaseTypes.Values.mongo]: MongoDatabase,
+    [DatabaseTypes.Values.provider]: ProviderDatabase,
+    [DatabaseTypes.Values.client]: ClientDatabase,
+    [DatabaseTypes.Values.captcha]: CaptchaDatabase,
     [DatabaseTypes.Values.mongoMemory]: MongoMemoryDatabase,
 };
 //# sourceMappingURL=index.js.map

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,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"}
+{"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"}

package/dist/databases/{mongo.d.ts → provider.d.ts}

@@ -1,21 +1,27 @@
-import { AsyncFactory, type Logger, TranslationKey } from "@prosopo/common";
-import { type Captcha, CaptchaResult, type CaptchaSolution, CaptchaStates, type DatasetBase, type DatasetWithIds, type DatasetWithIdsAndTree, type Hash, type PendingCaptchaRequest, PoWChallengeComponents, PoWChallengeId, ScheduledTaskNames, type ScheduledTaskResult, ScheduledTaskStatus } from "@prosopo/types";
-import { type Database, type PoWCaptchaStored, type ScheduledTaskRecord, type SolutionRecord, StoredStatus, type Tables, type UserCommitmentRecord, type UserSolutionRecord } from "@prosopo/types-database";
-import { type DeleteResult } from "mongodb";
-import mongoose, { type Connection, ObjectId } from "mongoose";
-export declare class ProsopoDatabase extends AsyncFactory implements Database {
-    url: string;
-    tables?: Tables;
-    dbname: string;
-    connection?: Connection;
-    logger: Logger;
-    constructor();
-    init(url: string, dbname: string, logger: Logger, authSource?: string): Promise<this>;
-    getTables(): Tables;
-    getConnection(): mongoose.Connection;
+import { type Logger, type TranslationKey } from "@prosopo/common";
+import { type Captcha, type CaptchaResult, type CaptchaSolution, CaptchaStates, type Dataset, type DatasetBase, type DatasetWithIds, type DatasetWithIdsAndTree, type Hash, type PendingCaptchaRequest, type PoWChallengeComponents, type PoWChallengeId, type RequestHeaders, type ScheduledTaskNames, type ScheduledTaskResult, type ScheduledTaskStatus } from "@prosopo/types";
+import { type ClientRecord, type IDatabase, type PoWCaptchaRecord, type ScheduledTaskRecord, type SolutionRecord, type StoredStatus, type Tables, type UserCommitment, type UserCommitmentRecord, type UserSolutionRecord } from "@prosopo/types-database";
+import type { DeleteResult } from "mongodb";
+import type { ObjectId } from "mongoose";
+import { MongoDatabase } from "../base/mongo.js";
+declare enum TableNames {
+    captcha = "captcha",
+    dataset = "dataset",
+    solution = "solution",
+    commitment = "commitment",
+    usersolution = "usersolution",
+    pending = "pending",
+    scheduler = "scheduler",
+    powcaptcha = "powcaptcha",
+    client = "client"
+}
+export declare class ProviderDatabase extends MongoDatabase implements IDatabase {
+    tables: Tables<TableNames>;
+    constructor(url: string, dbname?: string, authSource?: string, logger?: Logger);
     connect(): Promise<void>;
-    close(): Promise<void>;
-    storeDataset(dataset: DatasetWithIdsAndTree): Promise<void>;
+    loadTables(): void;
+    getTables(): Tables<TableNames>;
+    storeDataset(dataset: Dataset | DatasetWithIdsAndTree): Promise<void>;
     getSolutions(datasetId: string): Promise<SolutionRecord[]>;
     getDataset(datasetId: string): Promise<DatasetWithIds>;
     getRandomCaptcha(solved: boolean, datasetId: Hash, size?: number): Promise<Captcha[] | undefined>;
@@ -23,9 +29,9 @@ export declare class ProsopoDatabase extends AsyncFactory implements Database {
     updateCaptcha(captcha: Captcha, datasetId: Hash): Promise<void>;
     removeCaptchas(captchaIds: string[]): Promise<void>;
     getDatasetDetails(datasetId: Hash): Promise<DatasetBase>;
-    storeDappUserSolution(captchas: CaptchaSolution[], commit: UserCommitmentRecord): Promise<void>;
-    storePowCaptchaRecord(challenge: PoWChallengeId, components: PoWChallengeComponents, difficulty: number, providerSignature: string, ipAddress: string, serverChecked?: boolean, userSubmitted?: boolean, storedStatus?: StoredStatus, userSignature?: string): Promise<void>;
-    getPowCaptchaRecordByChallenge(challenge: string): Promise<PoWCaptchaStored | null>;
+    storeDappUserSolution(captchas: CaptchaSolution[], commit: UserCommitment): Promise<void>;
+    storePowCaptchaRecord(challenge: PoWChallengeId, components: PoWChallengeComponents, difficulty: number, providerSignature: string, ipAddress: string, headers: RequestHeaders, serverChecked?: boolean, userSubmitted?: boolean, storedStatus?: StoredStatus, userSignature?: string): Promise<void>;
+    getPowCaptchaRecordByChallenge(challenge: string): Promise<PoWCaptchaRecord | null>;
     updatePowCaptchaRecord(challenge: PoWChallengeId, result: CaptchaResult, serverChecked?: boolean, userSubmitted?: boolean, userSignature?: string): Promise<void>;
     getProcessedDappUserSolutions(): Promise<UserSolutionRecord[]>;
     getProcessedDappUserCommitments(): Promise<UserCommitmentRecord[]>;
@@ -33,7 +39,7 @@ export declare class ProsopoDatabase extends AsyncFactory implements Database {
     getUnstoredDappUserCommitments(): Promise<UserCommitmentRecord[]>;
     markDappUserCommitmentsStored(commitmentIds: Hash[]): Promise<void>;
     markDappUserCommitmentsChecked(commitmentIds: Hash[]): Promise<void>;
-    getUnstoredDappUserPoWCommitments(): Promise<PoWCaptchaStored[]>;
+    getUnstoredDappUserPoWCommitments(): Promise<PoWCaptchaRecord[]>;
     markDappUserPoWCommitmentsStored(challenges: string[]): Promise<void>;
     markDappUserPoWCommitmentsChecked(challenges: string[]): Promise<void>;
     removeProcessedDappUserSolutions(commitmentIds: string[]): Promise<DeleteResult | undefined>;
@@ -56,5 +62,7 @@ export declare class ProsopoDatabase extends AsyncFactory implements Database {
     getLastScheduledTaskStatus(task: ScheduledTaskNames, status?: ScheduledTaskStatus): Promise<ScheduledTaskRecord | undefined>;
     createScheduledTaskStatus(taskName: ScheduledTaskNames, status: ScheduledTaskStatus): Promise<ObjectId>;
     updateScheduledTaskStatus(taskId: ObjectId, status: ScheduledTaskStatus, result?: ScheduledTaskResult): Promise<void>;
+    updateClientRecords(clientRecords: ClientRecord[]): Promise<void>;
 }
-//# sourceMappingURL=mongo.d.ts.map
+export {};
+//# sourceMappingURL=provider.d.ts.map