ueberdb2 4.1.7 → 4.1.8

package/dist/databases/couch_db.js

@@ -56,20 +56,14 @@ const Database = class Couch_db extends AbstractDatabase_1.default {
         }
         const client = (0, nano_1.default)(coudhDBSettings);
         try {
-            if (this.settings.database != null) {
-                await client.db.get(this.settings.database);
-            }
+            await client.db.get(this.settings.database);
         }
         catch (err) {
             if (err.statusCode !== 404)
                 throw err;
-            if (this.settings.database != null) {
-                await client.db.create(this.settings.database);
-            }
-        }
-        if (this.settings.database != null) {
-            this.db = client.use(this.settings.database);
+            await client.db.create(this.settings.database);
         }
+        this.db = client.use(this.settings.database);
     }
     async get(key) {
         let doc;
@@ -169,7 +163,7 @@ const Database = class Couch_db extends AbstractDatabase_1.default {
                 set._deleted = true;
             setters.push(set);
         }
-        await this.db && await this.db.bulk({ docs: setters });
+        await this.db.bulk({ docs: setters });
     }
     async close() {
         this.db = null;

package/dist/databases/mongodb_db.js

@@ -18,8 +18,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Database = void 0;
 const AbstractDatabase_1 = __importDefault(require("../lib/AbstractDatabase"));
-exports.Database = class extends AbstractDatabase_1.default {
+const mongodb_1 = require("mongodb");
+const Database = class extends AbstractDatabase_1.default {
     interval;
     database;
     client;
@@ -49,23 +51,25 @@ exports.Database = class extends AbstractDatabase_1.default {
         }, 10000);
     }
     init(callback) {
-        const MongoClient = require('mongodb').MongoClient;
-        MongoClient.connect(this.settings.url, (err, client) => {
-            if (!err) {
-                this.client = client;
-                this.database = client.db(this.settings.database);
-                this.collection = this.database.collection(this.settings.collection);
-            }
-            callback(err);
+        mongodb_1.MongoClient.connect(this.settings.url).then((v) => {
+            this.client = v;
+            this.database = v.db(this.settings.database);
+            this.collection = this.database.collection(this.settings.collection);
+            callback(null);
+        })
+            .catch((v) => {
+            callback(v);
         });
         this.schedulePing();
     }
     get(key, callback) {
-        this.collection.findOne({ _id: key }, (err, document) => {
-            if (err)
-                callback(err);
-            else
-                callback(null, document ? document.value : null);
+        // @ts-ignore
+        this.collection.findOne({ _id: key })
+            .then((v) => {
+            callback(null, v && v.value);
+        }).catch(v => {
+            console.log(v);
+            callback(v);
         });
         this.schedulePing();
     }
@@ -79,15 +83,13 @@ exports.Database = class extends AbstractDatabase_1.default {
             // @ts-ignore
             selector.$and.push({ _id: { $not: { $regex: `${notKey.replace(/\*/g, '')}` } } });
         }
-        this.collection.find(selector, async (err, res) => {
-            if (err) {
-                callback(err);
-            }
-            else {
-                const data = await res.toArray();
-                callback(null, data.map((i) => i._id));
-            }
-        });
+        // @ts-ignore
+        this.collection.find(selector).map((i) => i._id)
+            .toArray()
+            .then(r => {
+            callback(null, r);
+        })
+            .catch(v => callback(v));
         this.schedulePing();
     }
     set(key, value, callback) {
@@ -95,12 +97,17 @@ exports.Database = class extends AbstractDatabase_1.default {
             callback('Your Key can only be 100 chars');
         }
         else {
-            this.collection.update({ _id: key }, { $set: { value } }, { upsert: true }, callback);
+            // @ts-ignore
+            this.collection.updateMany({ _id: key }, { $set: { value } }, { upsert: true })
+                .then(v => callback(null)).catch(v => callback(v));
         }
         this.schedulePing();
     }
     remove(key, callback) {
-        this.collection.remove({ _id: key }, callback);
+        // @ts-ignore
+        this.collection.deleteOne({ _id: key })
+            .then(r => callback(null, r))
+            .catch(v => callback(v));
         this.schedulePing();
     }
     doBulk(bulk, callback) {
@@ -122,6 +129,7 @@ exports.Database = class extends AbstractDatabase_1.default {
     }
     close(callback) {
         this.clearPing();
-        this.client.close(callback);
+        this.client.close().then(r => callback(r));
     }
 };
+exports.Database = Database;

package/package.json

@@ -26,7 +26,7 @@
     "dirty": "^1.1.3",
     "elasticsearch8": "npm:@elastic/elasticsearch@^8.8.1",
     "eslint-plugin-import": "^2.26.0",
-    "mongodb": "^3.7.3",
+    "mongodb": "^5.7.0",
     "mssql": "^9.1.1",
     "mysql": "2.18.1",
     "nano": "^10.1.2",
@@ -42,8 +42,8 @@
   "devDependencies": {
     "@types/async": "^3.2.20",
     "@types/mocha": "^10.0.1",
-    "@types/mongodb": "^4.0.7",
     "@types/mssql": "^8.1.2",
+    "@types/mongodb": "^4.0.7",
     "@types/mysql": "^2.15.21",
     "@types/node": "^20.4.0",
     "@types/pg": "^8.10.2",
@@ -63,7 +63,7 @@
     "url": "https://github.com/ether/ueberDB.git"
   },
   "main": "./dist/index",
-  "version": "4.1.7",
+  "version": "4.1.8",
   "bugs": {
     "url": "https://github.com/ether/ueberDB/issues"
   },