@prosopo/database 0.3.1 → 0.3.2

package/dist/cjs/eventsDatabase/eventsDatabase.cjs

@@ -35,39 +35,13 @@ try {
 } catch (error) {
   CaptchaEvent = mongoose.model("CaptchaEvent", captchaEventSchema);
 }
-const addCaptchaEventRecord = async (record) => {
-  try {
-    const newRecord = new CaptchaEvent(record);
-    await newRecord.save();
-    logger.info("Record added successfully");
-  } catch (error) {
-    logger.error("Error adding record to the database:", error);
-  }
-};
 const saveCaptchaEvent = async (events, accountId, atlasUri) => {
-  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 common.ProsopoDBError("DATABASE.CONNECT_ERROR", {
-              context: { failedFuncName: saveCaptchaEvent.name, db: "events database" },
-              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());
-  });
+  await mongoose.connect(atlasUri).then(() => console.log("Connected to MongoDB Atlas"));
+  const captchaEventData = {
+    ...events,
+    accountId
+  };
+  await CaptchaEvent.create(captchaEventData);
+  logger.info("Mongo Saved Events");
 };
 exports.saveCaptchaEvent = 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<unknown>;
+export declare const saveCaptchaEvent: (events: StoredEvents, accountId: string, atlasUri: string) => Promise<void>;
 //# 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":"AACA,OAAO,EAAqB,YAAY,EAAE,MAAM,gBAAgB,CAAA;AA+ChE,eAAO,MAAM,gBAAgB,WAAkB,YAAY,aAAa,MAAM,YAAY,MAAM,qBAiC/F,CAAA"}
+{"version":3,"file":"eventsDatabase.d.ts","sourceRoot":"","sources":["../../src/eventsDatabase/eventsDatabase.ts"],"names":[],"mappings":"AAaA,OAAO,EAAqB,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAsChE,eAAO,MAAM,gBAAgB,WAAkB,YAAY,aAAa,MAAM,YAAY,MAAM,kBAU/F,CAAA"}

package/dist/eventsDatabase/eventsDatabase.js

@@ -1,4 +1,4 @@
-import { ProsopoDBError, getLoggerDefault } from '@prosopo/common';
+import { getLoggerDefault } from '@prosopo/common';
 import mongoose from 'mongoose';
 const logger = getLoggerDefault();
 const MAX_RETRIES = 3;
@@ -34,42 +34,13 @@ try {
 catch (error) {
     CaptchaEvent = mongoose.model('CaptchaEvent', captchaEventSchema);
 }
-const addCaptchaEventRecord = async (record) => {
-    try {
-        const newRecord = new CaptchaEvent(record);
-        await newRecord.save();
-        logger.info('Record added successfully');
-    }
-    catch (error) {
-        logger.error('Error adding record to the database:', error);
-    }
-};
 export const saveCaptchaEvent = async (events, accountId, atlasUri) => {
-    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());
-    });
+    await mongoose.connect(atlasUri).then(() => console.log('Connected to MongoDB Atlas'));
+    const captchaEventData = {
+        ...events,
+        accountId,
+    };
+    await CaptchaEvent.create(captchaEventData);
+    logger.info('Mongo Saved Events');
 };
 //# 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":"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"}
+{"version":3,"file":"eventsDatabase.js","sourceRoot":"","sources":["../../src/eventsDatabase/eventsDatabase.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,QAAmB,MAAM,UAAU,CAAA;AAC1C,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAA;AACjC,MAAM,WAAW,GAAG,CAAC,CAAA;AAErB,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,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE;YAC9C,SAAS,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE;SAChD;KACJ;IACD,SAAS,EAAE,MAAM;CACpB,CAAC,CAAA;AACF,IAAI,YAA6C,CAAA;AACjD,IAAI;IACA,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;CAChD;AAAC,OAAO,KAAK,EAAE;IACZ,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;CACpE;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,MAAoB,EAAE,SAAiB,EAAE,QAAgB,EAAE,EAAE;IAChG,MAAM,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC,CAAA;IAEtF,MAAM,gBAAgB,GAAG;QACrB,GAAG,MAAM;QACT,SAAS;KACZ,CAAA;IAED,MAAM,YAAY,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;IAC3C,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;AACrC,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@prosopo/database",
-    "version": "0.3.1",
+    "version": "0.3.2",
     "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.6.1",
-        "@prosopo/captcha-contract": "0.3.1",
-        "@prosopo/common": "0.3.1",
-        "@prosopo/config": "0.3.1",
-        "@prosopo/types": "0.3.1",
-        "@prosopo/types-database": "0.3.1",
+        "@prosopo/captcha-contract": "0.3.2",
+        "@prosopo/common": "0.3.2",
+        "@prosopo/config": "0.3.2",
+        "@prosopo/types": "0.3.2",
+        "@prosopo/types-database": "0.3.2",
         "mongodb": "5.8.0",
         "mongodb-memory-server": "^8.7.2",
         "mongoose": "^7.3.3"

package/typedoc.config.js

@@ -1,3 +1,16 @@
+// Copyright 2021-2024 Prosopo (UK) Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 export default {
     entryPoints: ['src/**/*.ts', 'src/**/*.tsx', 'src/**/*.js', 'src/**/*.jsx', 'src/**/*.json'],
     includes: 'src',

package/vite.cjs.config.ts

@@ -1,3 +1,16 @@
+// Copyright 2021-2024 Prosopo (UK) Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 import { ViteCommonJSConfig } from '@prosopo/config'
 import path from 'path'