ueberdb2 4.1.21 → 4.1.23

package/dist/databases/elasticsearch_db.js

@@ -1,10 +1,10 @@
 'use strict';
 
 var AbstractDatabase = require('../lib/AbstractDatabase.js');
-var assert$0 = require('assert');
+var assert = require('assert');
 var buffer = require('buffer');
 var crypto = require('crypto');
-var es = require('elasticsearch8');
+var elasticsearch8 = require('elasticsearch8');
 
 /**
  * 2015 Visionist, Inc.
@@ -117,7 +117,7 @@ const Database = class extends AbstractDatabase {
      */
     async init() {
         // create elasticsearch client
-        const client = new es.Client({
+        const client = new elasticsearch8.Client({
             node: `http://${this.settings.host}:${this.settings.port}`,
         });
         await client.ping();
@@ -141,9 +141,9 @@ const Database = class extends AbstractDatabase {
             await client.indices.putAlias({ index: tmpIndex, name: this._index });
         }
         const indices = Object.values((await client.indices.get({ index: this._index })));
-        assert$0.equal(indices.length, 1);
+        assert.equal(indices.length, 1);
         try {
-            assert$0.deepEqual(indices[0].mappings, mappings);
+            assert.deepEqual(indices[0].mappings, mappings);
         }
         catch (err) {
             this.logger.warn(`Index ${this._index} mappings does not match expected; ` +

package/dist/databases/mock_db.js

@@ -4,6 +4,7 @@ var events = require('events');
 
 const Database = class extends events.EventEmitter {
     settings;
+    mock;
     constructor(settings) {
         super();
         this.settings = {
@@ -11,6 +12,8 @@ const Database = class extends events.EventEmitter {
             ...settings,
         };
         settings.mock = this;
+        this.settings = settings;
+        console.log("Initialized");
     }
     close(cb) {
         this.emit('close', cb);
@@ -24,8 +27,8 @@ const Database = class extends events.EventEmitter {
     get(key, cb) {
         this.emit('get', key, cb);
     }
-    init(cb) {
-        this.emit('init', cb);
+    async init(cb) {
+        this.emit('init', cb());
     }
     remove(key, cb) {
         this.emit('remove', key, cb);

package/dist/databases/mongodb_db.js

@@ -36,7 +36,7 @@ const Database = class extends AbstractDatabase {
     }
     clearPing() {
         if (this.interval) {
-            clearInterval(this.interval);
+            clearInterval(this.interval[Symbol.toPrimitive]());
         }
     }
     schedulePing() {

package/dist/databases/mysql_db.js

@@ -43,7 +43,6 @@ const Database = class extends AbstractDatabase {
         try {
             return await new Promise((resolve, reject) => {
                 options = { timeout: this.settings.queryTimeout, ...options };
-                // @ts-ignore
                 this._pool && this._pool.query(options, (err, ...args) => err != null ? reject(err) : resolve(args));
             });
         }

package/dist/index.js

@@ -52,23 +52,19 @@ const Database = class {
         }
         // saves all settings and require the db module
         this.type = type;
-        this.dbModule = require(`./databases/${type}_db`);
         this.dbSettings = dbSettings;
         this.wrapperSettings = wrapperSettings;
         this.logger = logging.normalizeLogger(logger);
-        const db = new this.dbModule.Database(this.dbSettings);
-        db.logger = this.logger;
-        this.db = new CacheAndBufferLayer.Database(db, this.wrapperSettings, this.logger);
-        // Expose the cache wrapper's metrics to the user. See lib/CacheAndBufferLayer.js for details.
-        //
-        // WARNING: This feature is EXPERIMENTAL -- do not assume it will continue to exist in its
-        // current form in a future version.
-        this.metrics = this.db.metrics;
     }
     /**
      * @param callback - Deprecated. Node-style callback. If null, a Promise is returned.
      */
-    init(callback = null) {
+    async init(callback = null) {
+        this.dbModule = await import(`./databases/${this.type}_db`);
+        const db = new this.dbModule.Database(this.dbSettings);
+        db.logger = this.logger;
+        this.db = new CacheAndBufferLayer.Database(db, this.wrapperSettings, this.logger);
+        this.metrics = this.db.metrics;
         if (callback != null) {
             return cbDb.init.call(this.db);
         }

package/dist/lib/CacheAndBufferLayer.js

@@ -652,11 +652,7 @@ const clone = (obj, key = '') => {
         return copy;
     }
     throw new Error("Unable to copy obj! Its type isn't supported.");
-};
-const exportedForTesting = {
-    LRU,
 };
 
 exports.Database = Database$1;
 exports.LRU = LRU;
-exports.exportedForTesting = exportedForTesting;

package/dist/lib/logging.js

@@ -1,15 +1,8 @@
 'use strict';
 
-var console = require('console');
-var process = require('process');
+require('console');
+require('process');
 
-class ConsoleLogger extends console.Console {
-    constructor(opts = {}) { super({ stdout: process.stdout, stderr: process.stderr, inspectOptions: { depth: Infinity }, ...opts }); }
-    isDebugEnabled() { return false; }
-    isInfoEnabled() { return true; }
-    isWarnEnabled() { return true; }
-    isErrorEnabled() { return true; }
-}
 const normalizeLogger = (logger) => {
     const logLevelsUsed = ['debug', 'info', 'warn', 'error'];
     logger = Object.create(logger || {});
@@ -31,5 +24,4 @@ const normalizeLogger = (logger) => {
     return logger;
 };
 
-exports.ConsoleLogger = ConsoleLogger;
 exports.normalizeLogger = normalizeLogger;

package/package.json

@@ -27,12 +27,12 @@
     "dirty": "^1.1.3",
     "elasticsearch8": "npm:@elastic/elasticsearch@^8.8.1",
     "eslint-plugin-import": "^2.28.1",
-    "mongodb": "^5.7.0",
-    "mssql": "^9.1.3",
+    "mongodb": "^6.0.0",
+    "mssql": "^9.2.0",
     "mysql": "2.18.1",
     "nano": "^10.1.2",
     "pg": "^8.11.3",
-    "redis": "^4.6.7",
+    "redis": "^4.6.8",
     "rethinkdb": "^2.4.2",
     "semver": "^7.5.4",
     "simple-git": "^3.19.1"
@@ -42,22 +42,21 @@
   },
   "devDependencies": {
     "@types/async": "^3.2.20",
-    "@types/mocha": "^10.0.1",
     "@types/mssql": "^8.1.2",
     "@types/mysql": "^2.15.21",
-    "@types/node": "^20.4.9",
+    "@types/node": "^20.5.7",
     "@types/pg": "^8.10.2",
     "@types/rethinkdb": "^2.3.17",
     "cli-table": "^0.3.11",
-    "eslint": "^8.47.0",
-    "eslint-config-etherpad": "^3.0.21",
-    "mocha": "^10.2.0",
-    "randexp": "^0.5.3",
+    "eslint": "^8.48.0",
+    "eslint-config-etherpad": "^3.0.22",
+    "randexp-ts": "^1.0.5",
+    "vitest": "^0.34.3",
     "typescript": "^4.9.5",
     "wtfnode": "^0.9.1",
-    "rollup": "^3.28.0",
+    "rollup": "^3.28.1",
     "rollup-plugin-typescript2": "^0.35.0",
-    "@rollup/plugin-node-resolve": "^15.2.0",
+    "@rollup/plugin-node-resolve": "^15.2.1",
     "glob": "^10.3.3"
   },
   "repository": {
@@ -65,7 +64,7 @@
     "url": "https://github.com/ether/ueberDB.git"
   },
   "main": "./dist/index",
-  "version": "4.1.21",
+  "version": "4.1.23",
   "bugs": {
     "url": "https://github.com/ether/ueberDB/issues"
   },
@@ -78,10 +77,8 @@
   "scripts": {
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
-    "test": "mocha ./dist/test/test*.js",
-    "test:watch": "mocha ./dist/test/test*.js --watch",
-    "test-debug": "npx rollup -c rollup.config.cjs && mocha --inspect-brk ./dist/test/test*.js",
-    "build": "npx rollup -c rollup.config.cjs"
+    "build": "npx rollup -c rollup.config.cjs",
+    "test": "vitest"
   },
   "_npmUser": {
     "name": "johnyma22",