ueberdb2 4.2.98 → 4.2.100

package/dist/databases/rusty_db.d.ts

@@ -1,13 +1,12 @@
 import AbstractDatabase from "../lib/AbstractDatabase";
-import { KeyValueDB } from "rusty-store-kv";
 export default class Rusty_db extends AbstractDatabase {
-    db: KeyValueDB | null;
+    db: any | null | undefined;
     constructor(settings: {
         filename: string;
     });
     get isAsync(): boolean;
-    findKeys(key: string, notKey?: string): string[];
-    get(key: string): string | null;
+    findKeys(key: string, notKey?: string): any;
+    get(key: string): any;
     init(): Promise<void>;
     close(): void;
     remove(key: string): 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;AACvD,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,gBAAgB;IAClD,EAAE,EAAE,UAAU,GAAC,IAAI,CAAA;gBAGP,QAAQ,EAAE;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC;IAUxC,IAAI,OAAO,YAEV;IAED,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAC,MAAM;IAIpC,GAAG,CAAC,GAAG,EAAE,MAAM;IAIT,IAAI;IAIV,KAAK;IAIL,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAI9B,OAAO;CAGV"}
+{"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"}

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;AAyBnE,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;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"}

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'),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
+'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
 /**
  * 2011 Peter 'Pita' Martischka
  *
@@ -335339,7 +335339,6 @@ class SurrealDB extends AbstractDatabase {
     db;
     constructor(settings) {
         super(settings);
-        this.db = new rustyStoreKv.KeyValueDB(this.settings.filename);
         // set default settings
         this.settings.cache = 0;
         this.settings.writeInterval = 0;
@@ -335352,18 +335351,44 @@ class SurrealDB extends AbstractDatabase {
         return this.db.findKeys(key, notKey);
     }
     get(key) {
-        return this.db.get(key);
+        const val = this.db.get(key);
+        if (!val) {
+            return val;
+        }
+        try {
+            return JSON.parse(val);
+        }
+        catch (e) {
+            return val;
+        }
     }
     async init() {
-        console.log("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 ' +
+                '"npm install better-sqlite3" in your etherpad-lite ./src directory.');
+        }
+        this.db = new RUSTY_DB.KeyValueDB(this.settings.filename);
     }
     close() {
+        this.db?.close();
+        this.db = null;
     }
     remove(key) {
         this.db.remove(key);
     }
     set(key, value) {
-        this.db.set(key, value);
+        if (typeof value === "object") {
+            const valStr = JSON.stringify(value);
+            this.db.set(key, valStr);
+        }
+        else {
+            this.db.set(key, value.toString());
+        }
     }
     destroy() {
         this.db.destroy();

package/package.json

@@ -30,7 +30,7 @@
     "@types/async": "^3.2.24",
     "@types/better-sqlite3": "^7.6.11",
     "@types/mssql": "^9.1.5",
-    "@types/node": "^22.5.2",
+    "@types/node": "^22.5.3",
     "@types/pg": "^8.11.8",
     "@types/rethinkdb": "^2.3.21",
     "@types/wtfnode": "^0.7.3",
@@ -53,7 +53,7 @@
     "rethinkdb": "^2.4.2",
     "rollup": "^4.21.2",
     "rollup-plugin-typescript2": "^0.36.0",
-    "rusty-store-kv": "^1.1.2",
+    "rusty-store-kv": "^1.1.4",
     "semver": "^7.6.3",
     "simple-git": "^3.26.0",
     "surrealdb.js": "^0.11.1",
@@ -67,7 +67,7 @@
     "url": "https://github.com/ether/ueberDB.git"
   },
   "main": "./dist/index.js",
-  "version": "4.2.98",
+  "version": "4.2.100",
   "bugs": {
     "url": "https://github.com/ether/ueberDB/issues"
   },