ueberdb2 4.0.10 → 4.0.15

package/databases/{postgres_db.js → postgres_db.ts}

@@ -1,4 +1,3 @@
-'use strict';
 /**
  * 2011 Peter 'Pita' Martischka
  *
@@ -15,12 +14,15 @@
  * limitations under the License.
  */
 
-const AbstractDatabase = require('../lib/AbstractDatabase');
-const async = require('async');
-const pg = require('pg');
+import AbstractDatabase, {Settings} from '../lib/AbstractDatabase';
+import async from 'async';
+import pg, {Pool, QueryResult} from 'pg';
+import {BulkObject} from './cassandra_db';
 
-exports.Database = class extends AbstractDatabase {
-  constructor(settings) {
+export const Database = class extends AbstractDatabase {
+  private db: Pool;
+  private upsertStatement: string | null | undefined;
+  constructor(settings:Settings | string) {
     super();
     if (typeof settings === 'string') settings = {connectionString: settings};
     this.settings = settings;
@@ -34,10 +36,11 @@ exports.Database = class extends AbstractDatabase {
     this.settings.min = this.settings.min || 4;
     this.settings.idleTimeoutMillis = this.settings.idleTimeoutMillis || 1000;
 
+    // @ts-ignore
     this.db = new pg.Pool(this.settings);
   }
 
-  init(callback) {
+  init(callback: (err: Error)=>{}) {
     const testTableExists = "SELECT 1 as exists FROM pg_tables WHERE tablename = 'store'";
 
     const createTable = 'CREATE TABLE IF NOT EXISTS store (' +
@@ -58,7 +61,7 @@ exports.Database = class extends AbstractDatabase {
      *   statement that needs to be used, based on the detection result
      * - calls the callback
      */
-    const detectUpsertMethod = (callback) => {
+    const detectUpsertMethod = (callback: (err?: Error) => {}) => {
       const upsertViaFunction = 'SELECT ueberdb_insert_or_update($1,$2)';
       const upsertNatively =
           'INSERT INTO store(key, value) VALUES ($1, $2) ' +
@@ -102,15 +105,17 @@ exports.Database = class extends AbstractDatabase {
       if (result.rows.length === 0) {
         this.db.query(createTable, (err) => {
           if (err != null) return callback(err);
+          // @ts-ignore
           detectUpsertMethod(callback);
         });
       } else {
+        // @ts-ignore
         detectUpsertMethod(callback);
       }
     });
   }
 
-  get(key, callback) {
+  get(key:string, callback: (err: Error | null, value: any)=>{}) {
     this.db.query('SELECT value FROM store WHERE key=$1', [key], (err, results) => {
       let value = null;
 
@@ -122,7 +127,7 @@ exports.Database = class extends AbstractDatabase {
     });
   }
 
-  findKeys(key, notKey, callback) {
+  findKeys(key:string, notKey:string, callback: (err: Error | null, value: any)=>{}) {
     let query = 'SELECT key FROM store WHERE key LIKE $1';
     const params = [];
     // desired keys are %key:%, e.g. pad:%
@@ -136,7 +141,7 @@ exports.Database = class extends AbstractDatabase {
       params.push(notKey);
     }
     this.db.query(query, params, (err, results) => {
-      const value = [];
+      const value:string[] = [];
 
       if (!err && results.rows.length > 0) {
         results.rows.forEach((val) => {
@@ -148,22 +153,23 @@ exports.Database = class extends AbstractDatabase {
     });
   }
 
-  set(key, value, callback) {
+  set(key:string, value:string, callback:(err: Error, result: QueryResult<any>) => void) {
     if (key.length > 100) {
-      callback('Your Key can only be 100 chars');
-    } else {
+      const val = '' as any;
+      callback(Error('Your Key can only be 100 chars'), val);
+    } else if (this.upsertStatement != null) {
       this.db.query(this.upsertStatement, [key, value], callback);
     }
   }
 
-  remove(key, callback) {
+  remove(key:string, callback:()=>{}) {
     this.db.query('DELETE FROM store WHERE key=$1', [key], callback);
   }
 
-  doBulk(bulk, callback) {
+  doBulk(bulk:BulkObject[], callback:()=>{}) {
     const replaceVALs = [];
     let removeSQL = 'DELETE FROM store WHERE key IN (';
-    const removeVALs = [];
+    const removeVALs: string[] = [];
 
     let removeCount = 0;
 
@@ -181,18 +187,27 @@ exports.Database = class extends AbstractDatabase {
 
     removeSQL += ');';
 
-    const functions = replaceVALs.map((v) => (cb) => this.db.query(this.upsertStatement, v, cb));
+    if (!this.upsertStatement) {
+      return;
+    }
+
+
+    // @ts-ignore
+    const functions = replaceVALs.map((v) => (cb:()=>{}) => this.db.query(this.upsertStatement, v, cb));
 
-    const removeFunction = (callback) => {
-      if (!removeVALs.length < 1) this.db.query(removeSQL, removeVALs, callback);
-      else callback();
+    const removeFunction = (callback: ()=>{}) => {
+      // @ts-ignore
+      if (!(removeVALs.length) > 1) {
+        this.db.query(removeSQL, removeVALs, callback);
+      } else { callback(); }
     };
     functions.push(removeFunction);
 
+    // @ts-ignore
     async.parallel(functions, callback);
   }
 
-  close(callback) {
+  close(callback:()=>{}) {
     this.db.end(callback);
   }
 };

package/databases/{postgrespool_db.js → postgrespool_db.ts}

@@ -1,9 +1,9 @@
-'use strict';
+import {Settings} from '../lib/AbstractDatabase';
 
 const postgres = require('./postgres_db');
 
-exports.Database = class extends postgres.Database {
-  constructor(settings) {
+export const Database = class PostgresDB extends postgres.Database {
+  constructor(settings:Settings) {
     console.warn('ueberdb: The postgrespool database driver is deprecated ' +
                  'and will be removed in a future version. Use postgres instead.');
     super(settings);

package/databases/redis_db.ts

@@ -0,0 +1,129 @@
+/**
+ * 2011 Peter 'Pita' Martischka
+ *
+ * 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 AbstractDatabase, {Settings} from '../lib/AbstractDatabase';
+import {createClient, RedisScripts, RedisFunctions, RedisModules} from 'redis';
+import {BulkObject} from './cassandra_db';
+import {RedisClientType} from '@redis/client';
+
+export const Database = class RedisDB extends AbstractDatabase {
+  private _client: RedisClientType<{graph:
+  {CONFIG_GET: typeof import('@redis/graph/dist/commands/CONFIG_GET');
+    configGet: typeof import('@redis/graph/dist/commands/CONFIG_GET');
+    CONFIG_SET: typeof import('@redis/graph/dist/commands/CONFIG_SET');
+    configSet: typeof import('@redis/graph/dist/commands/CONFIG_SET');
+    DELETE: typeof import('@redis/graph/dist/commands/DELETE');
+    delete: typeof import('@redis/graph/dist/commands/DELETE');
+    EXPLAIN: typeof import('@redis/graph/dist/commands/EXPLAIN');
+    explain: typeof import('@redis/graph/dist/commands/EXPLAIN');
+    LIST: typeof import('@redis/graph/dist/commands/LIST');
+    list: typeof import('@redis/graph/dist/commands/LIST');
+    PROFILE: typeof import('@redis/graph/dist/commands/PROFILE');
+    profile: typeof import('@redis/graph/dist/commands/PROFILE');
+    QUERY: typeof import('@redis/graph/dist/commands/QUERY');
+    query: typeof import('@redis/graph/dist/commands/QUERY');
+    RO_QUERY: typeof import('@redis/graph/dist/commands/RO_QUERY');
+    roQuery: typeof import('@redis/graph/dist/commands/RO_QUERY');
+    SLOWLOG: typeof import('@redis/graph/dist/commands/SLOWLOG');
+    slowLog: typeof import('@redis/graph/dist/commands/SLOWLOG');};
+  json: {ARRAPPEND: typeof import('@redis/json/dist/commands/ARRAPPEND');
+    arrAppend: typeof import('@redis/json/dist/commands/ARRAPPEND');
+    ARRINDEX: typeof import('@redis/json/dist/commands/ARRINDEX');
+    arrIndex: typeof import('@redis/json/dist/commands/ARRINDEX');
+    ARRINSERT: typeof import('@redis/json/dist/commands/ARRINSERT');
+    arrInsert: typeof import('@redis/json/dist/commands/ARRINSERT'); ARRLEN: typeof import('@redis/json/dist/commands/ARRLEN'); arrLen: typeof import('@redis/json/dist/commands/ARRLEN'); ARRPOP: typeof import('@redis/json/dist/commands/ARRPOP'); arrPop: typeof import('@redis/json/dist/commands/ARRPOP'); ARRTRIM: typeof import('@redis/json/dist/commands/ARRTRIM'); arrTrim: typeof import('@redis/json/dist/commands/ARRTRIM'); DEBUG_MEMORY: typeof import('@redis/json/dist/commands/DEBUG_MEMORY'); debugMemory: typeof import('@redis/json/dist/commands/DEBUG_MEMORY'); DEL: typeof import('@redis/json/dist/commands/DEL'); del: typeof import('@redis/json/dist/commands/DEL'); FORGET: typeof import('@redis/json/dist/commands/FORGET'); forget: typeof import('@redis/json/dist/commands/FORGET'); GET: typeof import('@redis/json/dist/commands/GET'); get: typeof import('@redis/json/dist/commands/GET'); MGET: typeof import('@redis/json/dist/commands/MGET'); mGet: typeof import('@redis/json/dist/commands/MGET'); NUMINCRBY: typeof import('@redis/json/dist/commands/NUMINCRBY'); numIncrBy: typeof import('@redis/json/dist/commands/NUMINCRBY'); NUMMULTBY: typeof import('@redis/json/dist/commands/NUMMULTBY'); numMultBy: typeof import('@redis/json/dist/commands/NUMMULTBY'); OBJKEYS: typeof import('@redis/json/dist/commands/OBJKEYS'); objKeys: typeof import('@redis/json/dist/commands/OBJKEYS'); OBJLEN: typeof import('@redis/json/dist/commands/OBJLEN'); objLen: typeof import('@redis/json/dist/commands/OBJLEN'); RESP: typeof import('@redis/json/dist/commands/RESP'); resp: typeof import('@redis/json/dist/commands/RESP'); SET: typeof import('@redis/json/dist/commands/SET'); set: typeof import('@redis/json/dist/commands/SET'); STRAPPEND: typeof import('@redis/json/dist/commands/STRAPPEND'); strAppend: typeof import('@redis/json/dist/commands/STRAPPEND'); STRLEN: typeof import('@redis/json/dist/commands/STRLEN'); strLen: typeof import('@redis/json/dist/commands/STRLEN'); TYPE: typeof import('@redis/json/dist/commands/TYPE'); type: typeof import('@redis/json/dist/commands/TYPE');}; ft: {_LIST: typeof import('@redis/search/dist/commands/_LIST'); _list: typeof import('@redis/search/dist/commands/_LIST'); ALTER: typeof import('@redis/search/dist/commands/ALTER'); alter: typeof import('@redis/search/dist/commands/ALTER'); AGGREGATE_WITHCURSOR: typeof import('@redis/search/dist/commands/AGGREGATE_WITHCURSOR'); aggregateWithCursor: typeof import('@redis/search/dist/commands/AGGREGATE_WITHCURSOR'); AGGREGATE: typeof import('@redis/search/dist/commands/AGGREGATE'); aggregate: typeof import('@redis/search/dist/commands/AGGREGATE'); ALIASADD: typeof import('@redis/search/dist/commands/ALIASADD'); aliasAdd: typeof import('@redis/search/dist/commands/ALIASADD'); ALIASDEL: typeof import('@redis/search/dist/commands/ALIASDEL'); aliasDel: typeof import('@redis/search/dist/commands/ALIASDEL'); ALIASUPDATE: typeof import('@redis/search/dist/commands/ALIASUPDATE'); aliasUpdate: typeof import('@redis/search/dist/commands/ALIASUPDATE'); CONFIG_GET: typeof import('@redis/search/dist/commands/CONFIG_GET'); configGet: typeof import('@redis/search/dist/commands/CONFIG_GET'); CONFIG_SET: typeof import('@redis/search/dist/commands/CONFIG_SET'); configSet: typeof import('@redis/search/dist/commands/CONFIG_SET'); CREATE: typeof import('@redis/search/dist/commands/CREATE'); create: typeof import('@redis/search/dist/commands/CREATE'); CURSOR_DEL: typeof import('@redis/search/dist/commands/CURSOR_DEL'); cursorDel: typeof import('@redis/search/dist/commands/CURSOR_DEL'); CURSOR_READ: typeof import('@redis/search/dist/commands/CURSOR_READ'); cursorRead: typeof import('@redis/search/dist/commands/CURSOR_READ'); DICTADD: typeof import('@redis/search/dist/commands/DICTADD'); dictAdd: typeof import('@redis/search/dist/commands/DICTADD'); DICTDEL: typeof import('@redis/search/dist/commands/DICTDEL'); dictDel: typeof import('@redis/search/dist/commands/DICTDEL'); DICTDUMP: typeof import('@redis/search/dist/commands/DICTDUMP'); dictDump: typeof import('@redis/search/dist/commands/DICTDUMP'); DROPINDEX: typeof import('@redis/search/dist/commands/DROPINDEX'); dropIndex: typeof import('@redis/search/dist/commands/DROPINDEX'); EXPLAIN: typeof import('@redis/search/dist/commands/EXPLAIN'); explain: typeof import('@redis/search/dist/commands/EXPLAIN'); EXPLAINCLI: typeof import('@redis/search/dist/commands/EXPLAINCLI'); explainCli: typeof import('@redis/search/dist/commands/EXPLAINCLI'); INFO: typeof import('@redis/search/dist/commands/INFO'); info: typeof import('@redis/search/dist/commands/INFO'); PROFILESEARCH: typeof import('@redis/search/dist/commands/PROFILE_SEARCH'); profileSearch: typeof import('@redis/search/dist/commands/PROFILE_SEARCH'); PROFILEAGGREGATE: typeof import('@redis/search/dist/commands/PROFILE_AGGREGATE'); profileAggregate: typeof import('@redis/search/dist/commands/PROFILE_AGGREGATE'); SEARCH: typeof import('@redis/search/dist/commands/SEARCH'); search: typeof import('@redis/search/dist/commands/SEARCH'); SPELLCHECK: typeof import('@redis/search/dist/commands/SPELLCHECK'); spellCheck: typeof import('@redis/search/dist/commands/SPELLCHECK'); SUGADD: typeof import('@redis/search/dist/commands/SUGADD'); sugAdd: typeof import('@redis/search/dist/commands/SUGADD'); SUGDEL: typeof import('@redis/search/dist/commands/SUGDEL'); sugDel: typeof import('@redis/search/dist/commands/SUGDEL'); SUGGET_WITHPAYLOADS: typeof import('@redis/search/dist/commands/SUGGET_WITHPAYLOADS'); sugGetWithPayloads: typeof import('@redis/search/dist/commands/SUGGET_WITHPAYLOADS'); SUGGET_WITHSCORES_WITHPAYLOADS: typeof import('@redis/search/dist/commands/SUGGET_WITHSCORES_WITHPAYLOADS'); sugGetWithScoresWithPayloads: typeof import('@redis/search/dist/commands/SUGGET_WITHSCORES_WITHPAYLOADS'); SUGGET_WITHSCORES: typeof import('@redis/search/dist/commands/SUGGET_WITHSCORES'); sugGetWithScores: typeof import('@redis/search/dist/commands/SUGGET_WITHSCORES'); SUGGET: typeof import('@redis/search/dist/commands/SUGGET'); sugGet: typeof import('@redis/search/dist/commands/SUGGET'); SUGLEN: typeof import('@redis/search/dist/commands/SUGLEN'); sugLen: typeof import('@redis/search/dist/commands/SUGLEN'); SYNDUMP: typeof import('@redis/search/dist/commands/SYNDUMP'); synDump: typeof import('@redis/search/dist/commands/SYNDUMP'); SYNUPDATE: typeof import('@redis/search/dist/commands/SYNUPDATE'); synUpdate: typeof import('@redis/search/dist/commands/SYNUPDATE'); TAGVALS: typeof import('@redis/search/dist/commands/TAGVALS'); tagVals: typeof import('@redis/search/dist/commands/TAGVALS');}; ts: {ADD: typeof import('@redis/time-series/dist/commands/ADD'); add: typeof import('@redis/time-series/dist/commands/ADD'); ALTER: typeof import('@redis/time-series/dist/commands/ALTER'); alter: typeof import('@redis/time-series/dist/commands/ALTER'); CREATE: typeof import('@redis/time-series/dist/commands/CREATE'); create: typeof import('@redis/time-series/dist/commands/CREATE'); CREATERULE: typeof import('@redis/time-series/dist/commands/CREATERULE'); createRule: typeof import('@redis/time-series/dist/commands/CREATERULE'); DECRBY: typeof import('@redis/time-series/dist/commands/DECRBY'); decrBy: typeof import('@redis/time-series/dist/commands/DECRBY'); DEL: typeof import('@redis/time-series/dist/commands/DEL'); del: typeof import('@redis/time-series/dist/commands/DEL'); DELETERULE: typeof import('@redis/time-series/dist/commands/DELETERULE'); deleteRule: typeof import('@redis/time-series/dist/commands/DELETERULE'); GET: typeof import('@redis/time-series/dist/commands/GET'); get: typeof import('@redis/time-series/dist/commands/GET'); INCRBY: typeof import('@redis/time-series/dist/commands/INCRBY'); incrBy: typeof import('@redis/time-series/dist/commands/INCRBY'); INFO_DEBUG: typeof import('@redis/time-series/dist/commands/INFO_DEBUG'); infoDebug: typeof import('@redis/time-series/dist/commands/INFO_DEBUG'); INFO: typeof import('@redis/time-series/dist/commands/INFO'); info: typeof import('@redis/time-series/dist/commands/INFO'); MADD: typeof import('@redis/time-series/dist/commands/MADD'); mAdd: typeof import('@redis/time-series/dist/commands/MADD'); MGET: typeof import('@redis/time-series/dist/commands/MGET'); mGet: typeof import('@redis/time-series/dist/commands/MGET'); MGET_WITHLABELS: typeof import('@redis/time-series/dist/commands/MGET_WITHLABELS'); mGetWithLabels: typeof import('@redis/time-series/dist/commands/MGET_WITHLABELS'); QUERYINDEX: typeof import('@redis/time-series/dist/commands/QUERYINDEX'); queryIndex: typeof import('@redis/time-series/dist/commands/QUERYINDEX'); RANGE: typeof import('@redis/time-series/dist/commands/RANGE'); range: typeof import('@redis/time-series/dist/commands/RANGE'); REVRANGE: typeof import('@redis/time-series/dist/commands/REVRANGE'); revRange: typeof import('@redis/time-series/dist/commands/REVRANGE'); MRANGE: typeof import('@redis/time-series/dist/commands/MRANGE'); mRange: typeof import('@redis/time-series/dist/commands/MRANGE'); MRANGE_WITHLABELS: typeof import('@redis/time-series/dist/commands/MRANGE_WITHLABELS'); mRangeWithLabels: typeof import('@redis/time-series/dist/commands/MRANGE_WITHLABELS'); MREVRANGE: typeof import('@redis/time-series/dist/commands/MREVRANGE'); mRevRange: typeof import('@redis/time-series/dist/commands/MREVRANGE'); MREVRANGE_WITHLABELS: typeof import('@redis/time-series/dist/commands/MREVRANGE_WITHLABELS'); mRevRangeWithLabels: typeof import('@redis/time-series/dist/commands/MREVRANGE_WITHLABELS');}; bf: {ADD: typeof import('@redis/bloom/dist/commands/bloom/ADD'); add: typeof import('@redis/bloom/dist/commands/bloom/ADD'); CARD: typeof import('@redis/bloom/dist/commands/bloom/CARD'); card: typeof import('@redis/bloom/dist/commands/bloom/CARD'); EXISTS: typeof import('@redis/bloom/dist/commands/bloom/EXISTS'); exists: typeof import('@redis/bloom/dist/commands/bloom/EXISTS'); INFO: typeof import('@redis/bloom/dist/commands/bloom/INFO'); info: typeof import('@redis/bloom/dist/commands/bloom/INFO'); INSERT: typeof import('@redis/bloom/dist/commands/bloom/INSERT'); insert: typeof import('@redis/bloom/dist/commands/bloom/INSERT'); LOADCHUNK: typeof import('@redis/bloom/dist/commands/bloom/LOADCHUNK'); loadChunk: typeof import('@redis/bloom/dist/commands/bloom/LOADCHUNK'); MADD: typeof import('@redis/bloom/dist/commands/bloom/MADD'); mAdd: typeof import('@redis/bloom/dist/commands/bloom/MADD'); MEXISTS: typeof import('@redis/bloom/dist/commands/bloom/MEXISTS'); mExists: typeof import('@redis/bloom/dist/commands/bloom/MEXISTS'); RESERVE: typeof import('@redis/bloom/dist/commands/bloom/RESERVE'); reserve: typeof import('@redis/bloom/dist/commands/bloom/RESERVE'); SCANDUMP: typeof import('@redis/bloom/dist/commands/bloom/SCANDUMP'); scanDump: typeof import('@redis/bloom/dist/commands/bloom/SCANDUMP');}; cms: {INCRBY: typeof import('@redis/bloom/dist/commands/count-min-sketch/INCRBY'); incrBy: typeof import('@redis/bloom/dist/commands/count-min-sketch/INCRBY'); INFO: typeof import('@redis/bloom/dist/commands/count-min-sketch/INFO'); info: typeof import('@redis/bloom/dist/commands/count-min-sketch/INFO'); INITBYDIM: typeof import('@redis/bloom/dist/commands/count-min-sketch/INITBYDIM'); initByDim: typeof import('@redis/bloom/dist/commands/count-min-sketch/INITBYDIM'); INITBYPROB: typeof import('@redis/bloom/dist/commands/count-min-sketch/INITBYPROB'); initByProb: typeof import('@redis/bloom/dist/commands/count-min-sketch/INITBYPROB'); MERGE: typeof import('@redis/bloom/dist/commands/count-min-sketch/MERGE'); merge: typeof import('@redis/bloom/dist/commands/count-min-sketch/MERGE'); QUERY: typeof import('@redis/bloom/dist/commands/count-min-sketch/QUERY'); query: typeof import('@redis/bloom/dist/commands/count-min-sketch/QUERY');}; cf: {ADD: typeof import('@redis/bloom/dist/commands/cuckoo/ADD'); add: typeof import('@redis/bloom/dist/commands/cuckoo/ADD'); ADDNX: typeof import('@redis/bloom/dist/commands/cuckoo/ADDNX'); addNX: typeof import('@redis/bloom/dist/commands/cuckoo/ADDNX'); COUNT: typeof import('@redis/bloom/dist/commands/cuckoo/COUNT'); count: typeof import('@redis/bloom/dist/commands/cuckoo/COUNT'); DEL: typeof import('@redis/bloom/dist/commands/cuckoo/DEL'); del: typeof import('@redis/bloom/dist/commands/cuckoo/DEL'); EXISTS: typeof import('@redis/bloom/dist/commands/cuckoo/EXISTS'); exists: typeof import('@redis/bloom/dist/commands/cuckoo/EXISTS'); INFO: typeof import('@redis/bloom/dist/commands/cuckoo/INFO'); info: typeof import('@redis/bloom/dist/commands/cuckoo/INFO'); INSERT: typeof import('@redis/bloom/dist/commands/cuckoo/INSERT'); insert: typeof import('@redis/bloom/dist/commands/cuckoo/INSERT'); INSERTNX: typeof import('@redis/bloom/dist/commands/cuckoo/INSERTNX'); insertNX: typeof import('@redis/bloom/dist/commands/cuckoo/INSERTNX'); LOADCHUNK: typeof import('@redis/bloom/dist/commands/cuckoo/LOADCHUNK'); loadChunk: typeof import('@redis/bloom/dist/commands/cuckoo/LOADCHUNK'); RESERVE: typeof import('@redis/bloom/dist/commands/cuckoo/RESERVE'); reserve: typeof import('@redis/bloom/dist/commands/cuckoo/RESERVE'); SCANDUMP: typeof import('@redis/bloom/dist/commands/cuckoo/SCANDUMP'); scanDump: typeof import('@redis/bloom/dist/commands/cuckoo/SCANDUMP');}; tDigest: {ADD: typeof import('@redis/bloom/dist/commands/t-digest/ADD'); add: typeof import('@redis/bloom/dist/commands/t-digest/ADD'); BYRANK: typeof import('@redis/bloom/dist/commands/t-digest/BYRANK'); byRank: typeof import('@redis/bloom/dist/commands/t-digest/BYRANK'); BYREVRANK: typeof import('@redis/bloom/dist/commands/t-digest/BYREVRANK'); byRevRank: typeof import('@redis/bloom/dist/commands/t-digest/BYREVRANK'); CDF: typeof import('@redis/bloom/dist/commands/t-digest/CDF'); cdf: typeof import('@redis/bloom/dist/commands/t-digest/CDF'); CREATE: typeof import('@redis/bloom/dist/commands/t-digest/CREATE'); create: typeof import('@redis/bloom/dist/commands/t-digest/CREATE'); INFO: typeof import('@redis/bloom/dist/commands/t-digest/INFO'); info: typeof import('@redis/bloom/dist/commands/t-digest/INFO'); MAX: typeof import('@redis/bloom/dist/commands/t-digest/MAX'); max: typeof import('@redis/bloom/dist/commands/t-digest/MAX'); MERGE: typeof import('@redis/bloom/dist/commands/t-digest/MERGE'); merge: typeof import('@redis/bloom/dist/commands/t-digest/MERGE'); MIN: typeof import('@redis/bloom/dist/commands/t-digest/MIN'); min: typeof import('@redis/bloom/dist/commands/t-digest/MIN'); QUANTILE: typeof import('@redis/bloom/dist/commands/t-digest/QUANTILE'); quantile: typeof import('@redis/bloom/dist/commands/t-digest/QUANTILE'); RANK: typeof import('@redis/bloom/dist/commands/t-digest/RANK'); rank: typeof import('@redis/bloom/dist/commands/t-digest/RANK'); RESET: typeof import('@redis/bloom/dist/commands/t-digest/RESET'); reset: typeof import('@redis/bloom/dist/commands/t-digest/RESET'); REVRANK: typeof import('@redis/bloom/dist/commands/t-digest/REVRANK'); revRank: typeof import('@redis/bloom/dist/commands/t-digest/REVRANK'); TRIMMED_MEAN: typeof import('@redis/bloom/dist/commands/t-digest/TRIMMED_MEAN'); trimmedMean: typeof import('@redis/bloom/dist/commands/t-digest/TRIMMED_MEAN');}; topK: {ADD: typeof import('@redis/bloom/dist/commands/top-k/ADD'); add: typeof import('@redis/bloom/dist/commands/top-k/ADD'); COUNT: typeof import('@redis/bloom/dist/commands/top-k/COUNT'); count: typeof import('@redis/bloom/dist/commands/top-k/COUNT'); INCRBY: typeof import('@redis/bloom/dist/commands/top-k/INCRBY'); incrBy: typeof import('@redis/bloom/dist/commands/top-k/INCRBY'); INFO: typeof import('@redis/bloom/dist/commands/top-k/INFO'); info: typeof import('@redis/bloom/dist/commands/top-k/INFO'); LIST_WITHCOUNT: typeof import('@redis/bloom/dist/commands/top-k/LIST_WITHCOUNT'); listWithCount: typeof import('@redis/bloom/dist/commands/top-k/LIST_WITHCOUNT'); LIST: typeof import('@redis/bloom/dist/commands/top-k/LIST'); list: typeof import('@redis/bloom/dist/commands/top-k/LIST'); QUERY: typeof import('@redis/bloom/dist/commands/top-k/QUERY'); query: typeof import('@redis/bloom/dist/commands/top-k/QUERY'); RESERVE: typeof import('@redis/bloom/dist/commands/top-k/RESERVE'); reserve: typeof import('@redis/bloom/dist/commands/top-k/RESERVE');};} & RedisModules, RedisFunctions, RedisScripts> | null;
+  constructor(settings:Settings) {
+    super();
+    this._client = null;
+    this.settings = settings || {};
+  }
+
+  get isAsync() { return true; }
+
+  async init() {
+    this._client = createClient({url: this.settings.url});
+    if (this._client) {
+      await this._client.connect();
+      await this._client.ping();
+    }
+  }
+
+  async get(key:string) {
+    if (this._client == null) return null;
+    return await this._client.get(key);
+  }
+
+  async findKeys(key:string, notKey:string) {
+    if (this._client == null) return null;
+    const [type] = /^([^:*]+):\*$/.exec(key) || [];
+    if (type != null && ['*:*:*', `${key}:*`].includes(notKey)) {
+      // Performance optimization for a common Etherpad case.
+      return await this._client.sMembers(`ueberDB:keys:${type}`);
+    }
+    let keys = await this._client.keys(key.replace(/[?[\]\\]/g, '\\$&'));
+    if (notKey != null) {
+      const regex = this.createFindRegex(key, notKey);
+      keys = keys.filter((k:string) => regex.test(k));
+    }
+    return keys;
+  }
+
+  async set(key:string, value:string) {
+    if (this._client == null) return null;
+    const matches = /^([^:]+):([^:]+)$/.exec(key);
+    await Promise.all([
+      matches && this._client.sAdd(`ueberDB:keys:${matches[1]}`, matches[0]),
+      this._client.set(key, value),
+    ]);
+  }
+
+  async remove(key:string) {
+    if (this._client == null) return null;
+    const matches = /^([^:]+):([^:]+)$/.exec(key);
+    await Promise.all([
+      matches && this._client.sRem(`ueberDB:keys:${matches[1]}`, matches[0]),
+      this._client.del(key),
+    ]);
+  }
+
+  async doBulk(bulk: BulkObject[]) {
+    if (this._client == null) return null;
+    const multi = this._client.multi();
+
+    for (const {key, type, value} of bulk) {
+      const matches = /^([^:]+):([^:]+)$/.exec(key);
+      if (type === 'set') {
+        if (matches) {
+          multi.sAdd(`ueberDB:keys:${matches[1]}`, matches[0]);
+        }
+        multi.set(key, value as string);
+      } else if (type === 'remove') {
+        if (matches) {
+          multi.sRem(`ueberDB:keys:${matches[1]}`, matches[0]);
+        }
+        multi.del(key);
+      }
+    }
+
+    await multi.exec();
+  }
+
+  async close() {
+    if (this._client == null) return null;
+    await this._client.quit();
+    this._client = null;
+  }
+};

package/databases/{rethink_db.js → rethink_db.ts}

@@ -1,4 +1,3 @@
-'use strict';
 /**
  * 2016 Remi Arnaud
  *
@@ -15,12 +14,18 @@
  * limitations under the License.
  */
 
-const AbstractDatabase = require('../lib/AbstractDatabase');
-const r = require('rethinkdb');
-const async = require('async');
+import AbstractDatabase, {Settings} from '../lib/AbstractDatabase';
+import r from 'rethinkdb';
+import async from 'async';
+import {BulkObject} from './cassandra_db';
 
-exports.Database = class extends AbstractDatabase {
-  constructor(settings) {
+export const Database = class extends AbstractDatabase {
+  private host: string;
+  private db: string;
+  private port: number | string;
+  private table: string;
+  private connection: r.Connection | null;
+  constructor(settings:Settings) {
     super();
     if (!settings) settings = {};
     if (!settings.host) { settings.host = 'localhost'; }
@@ -35,7 +40,8 @@ exports.Database = class extends AbstractDatabase {
     this.connection = null;
   }
 
-  init(callback) {
+  init(callback: (p: any, cursor: any)=>{}) {
+    // @ts-ignore
     r.connect(this, (err, conn) => {
       if (err) throw err;
       this.connection = conn;
@@ -43,21 +49,25 @@ exports.Database = class extends AbstractDatabase {
       r.table(this.table).run(this.connection, (err, cursor) => {
         if (err) {
           // assuming table does not exists
+          // @ts-ignore
           r.tableCreate(this.table).run(this.connection, callback);
         } else if (callback) { callback(null, cursor); }
       });
     });
   }
 
-  get(key, callback) {
+  get(key:string, callback: (err: Error, p: any)=>{}) {
+    // @ts-ignore
     r.table(this.table).get(key).run(this.connection, (err, item) => {
+      // @ts-ignore
       callback(err, (item ? item.content : item));
     });
   }
 
-  findKeys(key, notKey, callback) {
+  findKeys(key:string, notKey:string, callback:()=>{}) {
     const keys = [];
     const regex = this.createFindRegex(key, notKey);
+    // @ts-ignore
     r.filter((item) => {
       if (item.id.search(regex) !== -1) {
         keys.push(item.id);
@@ -65,15 +75,15 @@ exports.Database = class extends AbstractDatabase {
     }).run(this.connection, callback);
   }
 
-  set(key, value, callback) {
+  set(key:string, value:string, callback:()=>{}) {
     r.table(this.table)
         .insert({id: key, content: value}, {conflict: 'replace'})
-        .run(this.connection, callback);
+        .run(this.connection as r.Connection, callback);
   }
 
-  doBulk(bulk, callback) {
-    const _in = [];
-    const _out = [];
+  doBulk(bulk: BulkObject[], callback: ()=>{}) {
+    const _in: any[] = [];
+    const _out: string | string[] | r.Expression<any> = [];
 
     for (const i in bulk) {
       if (bulk[i].type === 'set') {
@@ -82,17 +92,23 @@ exports.Database = class extends AbstractDatabase {
         _out.push(bulk[i].key);
       }
     }
+
     async.parallel([
-      (cb) => { r.table(this.table).insert(_in, {conflict: 'replace'}).run(this.connection, cb); },
-      (cb) => { r.table(this.table).getAll(_out).delete().run(this.connection, cb); },
+      (cb) => { // @ts-ignore
+        r.table(this.table).insert(_in, {conflict: 'replace'}).run(this.connection, cb);
+      },
+      (cb) => { // @ts-ignore
+        r.table(this.table).getAll(_out).delete().run(this.connection, cb);
+      },
     ], callback);
   }
 
-  remove(key, callback) {
+  remove(key:string, callback:()=>{}) {
+    // @ts-ignore
     r.table(this.table).get(key).delete().run(this.connection, callback);
   }
 
-  close(callback) {
-    this.connection.close(callback);
+  close(callback:()=>{}) {
+    if (this.connection) { this.connection.close(callback); }
   }
 };

package/databases/{sqlite_db.js → sqlite_db.ts}

@@ -1,4 +1,7 @@
 'use strict';
+import {BulkObject} from "./cassandra_db";
+import {Settings} from "../lib/AbstractDatabase";
+
 /**
  * 2011 Peter 'Pita' Martischka
  *
@@ -15,9 +18,9 @@
  * limitations under the License.
  */
 
-let sqlite3;
+let SQDB: any;
 try {
-  sqlite3 = require('sqlite3');
+  SQDB = require('sqlite3').Database;
 } catch (err) {
   throw new Error(
       'sqlite3 not found. It was removed from ueberdb\'s dependencies because it requires ' +
@@ -25,13 +28,14 @@ try {
       '"npm install sqlite3" in your etherpad-lite ./src directory.');
 }
 
-const AbstractDatabase = require('../lib/AbstractDatabase');
-const util = require('util');
+import AbstractDatabase from '../lib/AbstractDatabase';
+import util from 'util';
 
-const escape = (val) => `'${val.replace(/'/g, "''")}'`;
+const escape = (val:string) => `'${val.replace(/'/g, "''")}'`;
 
-exports.Database = class extends AbstractDatabase {
-  constructor(settings) {
+export const Database = class SQLiteDB extends AbstractDatabase {
+  private db: typeof SQDB|null;
+  constructor(settings:Settings) {
     super();
     this.db = null;
 
@@ -53,7 +57,15 @@ exports.Database = class extends AbstractDatabase {
     }
   }
 
-  async _query(sql, params = []) {
+  init(callback:Function) {
+    util.callbackify(async () => {
+      this.db = new SQDB(this.settings.filename as string)
+      await this._query('CREATE TABLE IF NOT EXISTS store (key TEXT PRIMARY KEY, value TEXT)');
+      // @ts-ignore
+    })(callback);
+  }
+
+  async _query(sql:string, params = []) {
     // It is unclear how util.promisify() deals with variadic functions, so it is not used here.
     return await new Promise((resolve, reject) => {
       // According to sqlite3's documentation, .run() method (and maybe .all() and .get(); the
@@ -61,7 +73,7 @@ exports.Database = class extends AbstractDatabase {
       // guarantees that it is safe to call a Promise executor's resolve and reject functions
       // multiple times. The subsequent calls are ignored, except Node.js's 'process' object emits a
       // 'multipleResolves' event to aid in debugging.
-      this.db.all(sql, params, (err, rows) => {
+      this.db&&this.db.all(sql, params, (err:Error, rows:any) => {
         if (err != null) return reject(err);
         resolve(rows);
       });
@@ -70,33 +82,21 @@ exports.Database = class extends AbstractDatabase {
 
   // Temporary callbackified version of _query. This will be removed once all database objects are
   // asyncified.
-  _queryCb(sql, params, callback) {
+  _queryCb(sql: string, params: string[], callback: Function) {
     // It is unclear how util.callbackify() handles optional parameters, so it is not used here.
-    const p = this._query(sql, params);
+    const p = this._query(sql, params as []);
     if (callback) p.then((rows) => callback(null, rows), (err) => callback(err || new Error(err)));
   }
 
-  init(callback) {
-    util.callbackify(async () => {
-      this.db = await new Promise((resolve, reject) => {
-        new sqlite3.Database(this.settings.filename, function (err) {
-          if (err != null) return reject(err);
-          // The use of `this` relies on an undocumented feature of sqlite3:
-          // https://github.com/mapbox/node-sqlite3/issues/1408
-          resolve(this);
-        });
-      });
-      await this._query('CREATE TABLE IF NOT EXISTS store (key TEXT PRIMARY KEY, value TEXT)');
-    })(callback);
-  }
 
-  get(key, callback) {
+
+  get(key:string, callback:Function) {
     this._queryCb(
         'SELECT value FROM store WHERE key = ?', [key],
-        (err, rows) => callback(err, err == null && rows && rows.length ? rows[0].value : null));
+        (err:Error, rows:any) => callback(err, err == null && rows && rows.length ? rows[0].value : null));
   }
 
-  findKeys(key, notKey, callback) {
+  findKeys(key:string, notKey:string, callback:Function) {
     let query = 'SELECT key FROM store WHERE key LIKE ?';
     const params = [];
     // desired keys are %key:%, e.g. pad:%
@@ -110,8 +110,8 @@ exports.Database = class extends AbstractDatabase {
       params.push(notKey);
     }
 
-    this._queryCb(query, params, (err, results) => {
-      const value = [];
+    this._queryCb(query, params, (err: Error, results: { val: string, key: string }[]) => {
+      const value: string[] = [];
 
       if (!err && Object.keys(results).length > 0) {
         results.forEach((val) => {
@@ -123,26 +123,26 @@ exports.Database = class extends AbstractDatabase {
     });
   }
 
-  set(key, value, callback) {
+  set(key:string, value:string, callback:Function) {
     this._queryCb('REPLACE INTO store VALUES (?,?)', [key, value], callback);
   }
 
-  remove(key, callback) {
+  remove(key:string, callback:Function) {
     this._queryCb('DELETE FROM store WHERE key = ?', [key], callback);
   }
 
-  doBulk(bulk, callback) {
+  doBulk(bulk:BulkObject[], callback:Function) {
     let sql = 'BEGIN TRANSACTION;\n';
     for (const i in bulk) {
       if (bulk[i].type === 'set') {
-        sql += `REPLACE INTO store VALUES (${escape(bulk[i].key)}, ${escape(bulk[i].value)});\n`;
+        sql += `REPLACE INTO store VALUES (${escape(bulk[i].key)}, ${escape(bulk[i].value as string)});\n`;
       } else if (bulk[i].type === 'remove') {
         sql += `DELETE FROM store WHERE key = ${escape(bulk[i].key)};\n`;
       }
     }
     sql += 'END TRANSACTION;';
 
-    this.db.exec(sql, (err) => {
+    this.db&&this.db.exec(sql, (err:any) => {
       if (err) {
         console.error('ERROR WITH SQL: ');
         console.error(sql);
@@ -152,7 +152,8 @@ exports.Database = class extends AbstractDatabase {
     });
   }
 
-  close(callback) {
-    this.db.close(callback);
+  close(callback: Function) {
+    callback()
+    this.db&&this.db.close((err:any) => callback(err));
   }
 };

package/docker-compose.yml

@@ -0,0 +1,44 @@
+# Docker compose setup for testing with multiple databases
+version: '3.8'
+services:
+    couchdb:
+        image: couchdb
+        ports:
+        - "5984:5984"
+        environment:
+          COUCHDB_USER: ueberdb
+          COUCHDB_PASSWORD: ueberdb
+    elasticsearch:
+        image: elasticsearch:7.17.3
+        ports:
+        - 9200:9200
+        environment:
+          discovery.type: single-node
+    mongo:
+        image: mongo
+        ports:
+        - 27017:27017
+        environment:
+          MONGO_INITDB_DATABASE: mydb_test
+    mysql:
+      image: mariadb
+      ports:
+        - 3306:3306
+      environment:
+        MYSQL_ROOT_PASSWORD: password
+        MYSQL_USER: ueberdb
+        MYSQL_PASSWORD: ueberdb
+        MYSQL_DATABASE: ueberdb
+    postgres:
+      image: postgres:14-alpine
+      ports:
+        - 5432:5432
+      environment:
+        POSTGRES_USER: ueberdb
+        POSTGRES_PASSWORD: ueberdb
+        POSTGRES_DB: ueberdb
+        POSTGRES_HOST_AUTH_METHOD: "trust"
+    redis:
+      image: redis
+      ports:
+        - "6379:6379"