ueberdb2 4.2.102 → 4.2.103

package/dist/databases/rusty_db.d.ts

@@ -1,11 +1,12 @@
 import AbstractDatabase from "../lib/AbstractDatabase";
+import { KeyValueDB } from 'rusty-store-kv';
 export default class Rusty_db extends AbstractDatabase {
-    db: any | null | undefined;
+    db: KeyValueDB | null | undefined;
     constructor(settings: {
         filename: string;
     });
     get isAsync(): boolean;
-    findKeys(key: string, notKey?: string): any;
+    findKeys(key: string, notKey?: string): string[];
     get(key: string): any;
     init(): Promise<void>;
     close(): void;

package/dist/databases/rusty_db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rusty_db.d.ts","sourceRoot":"","sources":["../../databases/rusty_db.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,yBAAyB,CAAC;AAEvD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,gBAAgB;IAClD,EAAE,EAAE,GAAG,GAAG,IAAI,GAAG,SAAS,CAAA;gBAGd,QAAQ,EAAE;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC;IASxC,IAAI,OAAO,YAEV;IAED,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAC,MAAM;IAIpC,GAAG,CAAC,GAAG,EAAE,MAAM;IAYT,IAAI;IAaV,KAAK;IAKL,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAS9B,OAAO;CAGV"}
+{"version":3,"file":"rusty_db.d.ts","sourceRoot":"","sources":["../../databases/rusty_db.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAA;AAEzC,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,gBAAgB;IAClD,EAAE,EAAE,UAAU,GAAE,IAAI,GAAE,SAAS,CAAA;gBAEnB,QAAQ,EAAE;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC;IASxC,IAAI,OAAO,YAEV;IAED,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAC,MAAM;IAIpC,GAAG,CAAC,GAAG,EAAE,MAAM;IAYT,IAAI;IAIV,KAAK;IAKL,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAS9B,OAAO;CAGV"}

package/dist/databases/sqlite_db.d.ts

@@ -1,15 +1,14 @@
 import { BulkObject } from "./cassandra_db";
 import AbstractDatabase, { Settings } from "../lib/AbstractDatabase";
+import { SQLite } from 'rusty-store-kv';
 export default class SQLiteDB extends AbstractDatabase {
-    db: any | null;
+    db: SQLite | null;
     constructor(settings: Settings);
     init(callback: Function): void;
-    _query(sql: string, params?: never[]): Promise<any>;
     get(key: string, callback: Function): void;
     findKeys(key: string, notKey: string, callback: Function): void;
     set(key: string, value: string, callback: Function): void;
     remove(key: string, callback: Function): void;
-    handleBulk(bulk: BulkObject): string;
     doBulk(bulk: BulkObject[], callback: Function): void;
     close(callback: Function): void;
 }

package/dist/databases/sqlite_db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sqlite_db.d.ts","sourceRoot":"","sources":["../../databases/sqlite_db.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAC1C,OAAO,gBAAgB,EAAE,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AAwBnE,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,gBAAgB;IAC7C,EAAE,EAAE,GAAG,GAAC,IAAI,CAAC;gBACR,QAAQ,EAAC,QAAQ;IAsB7B,IAAI,CAAC,QAAQ,EAAE,QAAQ;IAejB,MAAM,CAAC,GAAG,EAAC,MAAM,EAAE,MAAM,UAAK;IAYpC,GAAG,CAAC,GAAG,EAAC,MAAM,EAAE,QAAQ,EAAC,QAAQ;IAKjC,QAAQ,CAAC,GAAG,EAAC,MAAM,EAAE,MAAM,EAAC,MAAM,EAAE,QAAQ,EAAC,QAAQ;IAkBrD,GAAG,CAAC,GAAG,EAAC,MAAM,EAAE,KAAK,EAAC,MAAM,EAAE,QAAQ,EAAC,QAAQ;IAK/C,MAAM,CAAC,GAAG,EAAC,MAAM,EAAE,QAAQ,EAAC,QAAQ;IAKpC,UAAU,CAAC,IAAI,EAAC,UAAU;IAS1B,MAAM,CAAC,IAAI,EAAC,UAAU,EAAE,EAAE,QAAQ,EAAC,QAAQ;IAW3C,KAAK,CAAC,QAAQ,EAAE,QAAQ;CAIzB"}
+{"version":3,"file":"sqlite_db.d.ts","sourceRoot":"","sources":["../../databases/sqlite_db.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAC1C,OAAO,gBAAgB,EAAE,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAA;AAwBrC,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,gBAAgB;IAC7C,EAAE,EAAE,MAAM,GAAC,IAAI,CAAC;gBACX,QAAQ,EAAC,QAAQ;IAsB7B,IAAI,CAAC,QAAQ,EAAE,QAAQ;IAMvB,GAAG,CAAC,GAAG,EAAC,MAAM,EAAE,QAAQ,EAAC,QAAQ;IAKjC,QAAQ,CAAC,GAAG,EAAC,MAAM,EAAE,MAAM,EAAC,MAAM,EAAE,QAAQ,EAAC,QAAQ;IAMrD,GAAG,CAAC,GAAG,EAAC,MAAM,EAAE,KAAK,EAAC,MAAM,EAAE,QAAQ,EAAC,QAAQ;IAK/C,MAAM,CAAC,GAAG,EAAC,MAAM,EAAE,QAAQ,EAAC,QAAQ;IAMpC,MAAM,CAAC,IAAI,EAAC,UAAU,EAAE,EAAE,QAAQ,EAAC,QAAQ;IAgB3C,KAAK,CAAC,QAAQ,EAAE,QAAQ;CAIzB"}

package/dist/index.js

@@ -1,4 +1,4 @@
-'use strict';Object.defineProperty(exports,'__esModule',{value:true});var require$$0$6=require('util'),require$$1$6=require('console'),require$$0$p=require('process'),require$$0$9=require('dns'),require$$0$7=require('net'),require$$0$8=require('events'),require$$0$a=require('crypto'),require$$0$b=require('stream'),require$$1$2=require('tls'),require$$0$c=require('os'),require$$1$3=require('path'),require$$0$d=require('fs'),require$$2$2=require('https'),require$$0$e=require('zlib'),require$$0$f=require('url'),require$$0$g=require('vm'),http$5=require('http'),require$$0$i=require('assert'),require$$0$h=require('tty'),node_path=require('node:path'),child_process=require('child_process'),require$$0$j=require('node:events'),require$$0$k=require('buffer'),require$$1$4=require('querystring'),require$$13=require('stream/web'),require$$0$l=require('node:stream'),require$$1$5=require('node:util'),require$$0$m=require('worker_threads'),require$$2$3=require('perf_hooks'),require$$5$2=require('util/types'),require$$4$1=require('async_hooks'),require$$1$7=require('string_decoder'),require$$0$n=require('diagnostics_channel'),require$$0$o=require('timers'),require$$0$q=require('fs/promises'),require$$0$r=require('timers/promises'),require$$5$3=require('constants'),os$3=require('node:os'),process$4=require('node:process'),http$6=require('node:http'),https$6=require('node:https'),zlib$2=require('node:zlib'),fs$9=require('node:fs'),require$$0$s=require('dgram'),require$$2$4=require('node:url');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var child_process__namespace=/*#__PURE__*/_interopNamespaceDefault(child_process);var os__namespace=/*#__PURE__*/_interopNamespaceDefault(os$3);var process__namespace=/*#__PURE__*/_interopNamespaceDefault(process$4);var http__namespace=/*#__PURE__*/_interopNamespaceDefault(http$6);var https__namespace=/*#__PURE__*/_interopNamespaceDefault(https$6);var zlib__namespace=/*#__PURE__*/_interopNamespaceDefault(zlib$2);// @ts-nocheck
+'use strict';Object.defineProperty(exports,'__esModule',{value:true});var require$$0$6=require('util'),require$$1$6=require('console'),require$$0$p=require('process'),require$$0$9=require('dns'),require$$0$7=require('net'),require$$0$8=require('events'),require$$0$a=require('crypto'),require$$0$b=require('stream'),require$$1$2=require('tls'),require$$0$c=require('os'),require$$1$3=require('path'),require$$0$d=require('fs'),require$$2$2=require('https'),require$$0$e=require('zlib'),require$$0$f=require('url'),require$$0$g=require('vm'),http$5=require('http'),require$$0$i=require('assert'),require$$0$h=require('tty'),node_path=require('node:path'),child_process=require('child_process'),require$$0$j=require('node:events'),require$$0$k=require('buffer'),require$$1$4=require('querystring'),require$$13=require('stream/web'),require$$0$l=require('node:stream'),require$$1$5=require('node:util'),require$$0$m=require('worker_threads'),require$$2$3=require('perf_hooks'),require$$5$2=require('util/types'),require$$4$1=require('async_hooks'),require$$1$7=require('string_decoder'),require$$0$n=require('diagnostics_channel'),require$$0$o=require('timers'),require$$0$q=require('fs/promises'),require$$0$r=require('timers/promises'),require$$5$3=require('constants'),os$3=require('node:os'),process$4=require('node:process'),http$6=require('node:http'),https$6=require('node:https'),zlib$2=require('node:zlib'),fs$9=require('node:fs'),require$$0$s=require('dgram'),require$$2$4=require('node:url'),rustyStoreKv=require('rusty-store-kv');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var child_process__namespace=/*#__PURE__*/_interopNamespaceDefault(child_process);var os__namespace=/*#__PURE__*/_interopNamespaceDefault(os$3);var process__namespace=/*#__PURE__*/_interopNamespaceDefault(process$4);var http__namespace=/*#__PURE__*/_interopNamespaceDefault(http$6);var https__namespace=/*#__PURE__*/_interopNamespaceDefault(https$6);var zlib__namespace=/*#__PURE__*/_interopNamespaceDefault(zlib$2);// @ts-nocheck
 /**
  * 2011 Peter 'Pita' Martischka
  *
@@ -326132,23 +326132,7 @@ class Rethink_db extends AbstractDatabase {
             this.connection.close(callback);
         }
     }
-}/**
- * 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.
- */
-const escape$1 = (val) => `'${val.replace(/'/g, "''")}'`;
-class SQLiteDB extends AbstractDatabase {
+}class SQLiteDB extends AbstractDatabase {
     db;
     constructor(settings) {
         super(settings);
@@ -326170,73 +326154,38 @@ class SQLiteDB extends AbstractDatabase {
         }
     }
     init(callback) {
-        let SQLITEDB;
-        try {
-            SQLITEDB = require('better-sqlite3');
-        }
-        catch (err) {
-            throw new Error('better-sqlite3 not found. It was removed from ueberdb\'s dependencies because it requires ' +
-                'compilation which fails on several systems. If you still want to use sqlite, run ' +
-                '"pnpm install better-sqlite3" in your etherpad-lite ./src directory.');
-        }
-        this.db = new SQLITEDB(this.settings.filename);
-        this._query('CREATE TABLE IF NOT EXISTS store (key TEXT PRIMARY KEY, value TEXT)');
+        this.db = new rustyStoreKv.SQLite(this.settings.filename);
         callback();
     }
-    async _query(sql, params = []) {
-        // It is unclear how util.promisify() deals with variadic functions, so it is not used here.
-        // According to sqlite3's documentation, .run() method (and maybe .all() and .get(); the
-        // documentation is unclear) might call the callback multiple times. That's OK -- ECMAScript
-        // 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.
-        return this.db.prepare(sql).run(params);
-    }
     get(key, callback) {
-        const res = this.db.prepare('SELECT value FROM store WHERE key = ?').get(key);
-        callback(null, res ? res.value : null);
+        const res = this.db.get(key);
+        callback(null, res ? res : null);
     }
     findKeys(key, notKey, callback) {
-        let query = 'SELECT key FROM store WHERE key LIKE ?';
-        const params = [];
-        // desired keys are %key:%, e.g. pad:%
-        key = key.replace(/\*/g, '%');
-        params.push(key);
-        if (notKey != null) {
-            // not desired keys are notKey:%, e.g. %:%:%
-            notKey = notKey.replace(/\*/g, '%');
-            query += ' AND key NOT LIKE ?';
-            params.push(notKey);
-        }
-        const res = this.db.prepare(query).all(params).map((row) => row.key);
+        const res = this.db?.findKeys(key, notKey);
         callback(null, res);
     }
     set(key, value, callback) {
-        const res = this.db.prepare('REPLACE INTO store VALUES (?,?)').run(key, value);
-        res.changes === 0 ? callback(null, null) : callback(null, res.lastInsertRowid);
+        const res = this.db.set(key, value);
+        res ? callback(null, null) : callback(null, res);
     }
     remove(key, callback) {
-        this.db.prepare('DELETE FROM store WHERE key = ?').run(key);
+        this.db.remove(key);
         callback(null, null);
     }
-    handleBulk(bulk) {
-        let statement = '';
-        if (bulk.type === 'set') {
-            statement = `REPLACE INTO store VALUES (${escape$1(bulk.key)}, ${escape$1(bulk.value)});`;
-        }
-        else if (bulk.type === 'remove') {
-            statement = `DELETE FROM store WHERE key = ${escape$1(bulk.key)};\n`;
-        }
-        return statement;
-    }
     doBulk(bulk, callback) {
-        const transaction = this.db.transaction((bulk) => {
-            bulk.forEach(b => {
-                let sql = this.handleBulk(b);
-                this.db.prepare(sql).run();
-            });
+        const convertedBulk = bulk.map(b => {
+            if (b.value === null) {
+                return {
+                    key: b.key,
+                    type: b.type
+                };
+            }
+            else {
+                return b;
+            }
         });
-        transaction(bulk);
+        this.db.doBulk(convertedBulk);
         callback();
     }
     close(callback) {
@@ -335363,16 +335312,7 @@ class SurrealDB extends AbstractDatabase {
         }
     }
     async init() {
-        let RUSTY_DB;
-        try {
-            RUSTY_DB = await import('rusty-store-kv');
-        }
-        catch (err) {
-            throw new Error('better-sqlite3 not found. It was removed from ueberdb\'s dependencies because it requires ' +
-                'compilation which fails on several systems. If you still want to use sqlite, run ' +
-                '"pnpm install rusty-store-kv" in your etherpad-lite ./src directory.');
-        }
-        this.db = new RUSTY_DB.KeyValueDB(this.settings.filename);
+        this.db = new rustyStoreKv.KeyValueDB(this.settings.filename);
     }
     close() {
         this.db?.close();

package/package.json

@@ -28,14 +28,12 @@
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
     "@types/async": "^3.2.24",
-    "@types/better-sqlite3": "^7.6.11",
     "@types/mssql": "^9.1.5",
     "@types/node": "^22.5.4",
     "@types/pg": "^8.11.8",
     "@types/rethinkdb": "^2.3.21",
     "@types/wtfnode": "^0.7.3",
     "async": "^3.2.6",
-    "better-sqlite3": "^11.2.1",
     "cassandra-driver": "^4.7.2",
     "cli-table3": "^0.6.5",
     "dirty-ts": "^1.1.8",
@@ -53,7 +51,7 @@
     "rethinkdb": "^2.4.2",
     "rollup": "^4.21.2",
     "rollup-plugin-typescript2": "^0.36.0",
-    "rusty-store-kv": "^1.1.4",
+    "rusty-store-kv": "^1.2.0",
     "semver": "^7.6.3",
     "simple-git": "^3.26.0",
     "surrealdb.js": "^0.11.1",
@@ -67,7 +65,7 @@
     "url": "https://github.com/ether/ueberDB.git"
   },
   "main": "./dist/index.js",
-  "version": "4.2.102",
+  "version": "4.2.103",
   "bugs": {
     "url": "https://github.com/ether/ueberDB/issues"
   },