ueberdb2 6.1.9 → 6.1.11

package/dist/databases/mongodb_db.d.ts

@@ -17,14 +17,15 @@ import AbstractDatabase, { type Settings } from "../lib/AbstractDatabase";
 import type { BulkObject } from "./cassandra_db";
 import { MongoClient } from "mongodb";
 import type { Collection, Db } from "mongodb";
+type UeberDoc = {
+    _id: string;
+    value: string;
+};
 export default class extends AbstractDatabase {
-    interval: NodeJS.Timer | undefined;
     database: Db | undefined;
     client: MongoClient | undefined;
-    collection: Collection | undefined;
+    collection: Collection<UeberDoc> | undefined;
     constructor(settings: Settings);
-    clearPing(): void;
-    schedulePing(): void;
     init(callback: Function): void;
     get(key: string, callback: Function): void;
     findKeys(key: string, notKey: string, callback: Function): void;
@@ -33,4 +34,5 @@ export default class extends AbstractDatabase {
     doBulk(bulk: BulkObject[], callback: Function): void;
     close(callback: any): void;
 }
+export {};
 //# sourceMappingURL=mongodb_db.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mongodb_db.d.ts","sourceRoot":"","sources":["../../databases/mongodb_db.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,gBAAgB,EAAE,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAE9C,MAAM,CAAC,OAAO,MAAO,SAAQ,gBAAgB;IACpC,QAAQ,EAAE,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC;IACnC,QAAQ,EAAE,EAAE,GAAG,SAAS,CAAC;IACzB,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;IAChC,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC;gBAC9B,QAAQ,EAAE,QAAQ;IAW9B,SAAS;IAMT,YAAY;IASZ,IAAI,CAAC,QAAQ,EAAE,QAAQ;IAcvB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAcnC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAsBxD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAalD,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAStC,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,QAAQ;IA0B7C,KAAK,CAAC,QAAQ,EAAE,GAAG;CAIpB"}
+{"version":3,"file":"mongodb_db.d.ts","sourceRoot":"","sources":["../../databases/mongodb_db.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,gBAAgB,EAAE,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,KAAK,EAAE,UAAU,EAAE,EAAE,EAAU,MAAM,SAAS,CAAC;AAItD,KAAK,QAAQ,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/C,MAAM,CAAC,OAAO,MAAO,SAAQ,gBAAgB;IACpC,QAAQ,EAAE,EAAE,GAAG,SAAS,CAAC;IACzB,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;IAChC,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC;gBACxC,QAAQ,EAAE,QAAQ;IAW9B,IAAI,CAAC,QAAQ,EAAE,QAAQ;IAavB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAWnC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAiBxD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAUlD,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAMtC,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,QAAQ;IAwB7C,KAAK,CAAC,QAAQ,EAAE,GAAG;CAGpB"}

package/dist/databases/postgres_db.d.ts

@@ -29,7 +29,7 @@ export default class extends AbstractDatabase {
     }, callback: (err: Error | null, value: string[]) => void): void;
     set(key: string, value: string, callback: (err: Error, result: pg.QueryResult) => void): void;
     remove(key: string, callback: () => {}): void;
-    doBulk(bulk: BulkObject[], callback: () => {}): void;
+    doBulk(bulk: BulkObject[], callback: (err?: Error | null) => void): void;
     close(callback: () => {}): void;
 }
 //# sourceMappingURL=postgres_db.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"postgres_db.d.ts","sourceRoot":"","sources":["../../databases/postgres_db.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,gBAAgB,EAAE,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAE1E,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,MAAM,CAAC,OAAO,MAAO,SAAQ,gBAAgB;IACpC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;IACZ,eAAe,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;gBACtC,QAAQ,EAAE,QAAQ,GAAG,MAAM;IA0CvC,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,EAAE;IA4EjC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAYhE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IA0BrF,aAAa,CACX,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACjC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,EAC1C,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI;IA2BxD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,WAAW,KAAK,IAAI;IAStF,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE;IAItC,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE;IAyC7C,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE;CAGzB"}
+{"version":3,"file":"postgres_db.d.ts","sourceRoot":"","sources":["../../databases/postgres_db.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,gBAAgB,EAAE,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAE1E,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,MAAM,CAAC,OAAO,MAAO,SAAQ,gBAAgB;IACpC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;IACZ,eAAe,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;gBACtC,QAAQ,EAAE,QAAQ,GAAG,MAAM;IA0CvC,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,EAAE;IA4EjC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAehE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IA0BrF,aAAa,CACX,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACjC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,EAC1C,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI;IA2BxD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,WAAW,KAAK,IAAI;IAiBtF,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE;IAOtC,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI;IA2DjE,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE;CAGzB"}

package/dist/index.js

@@ -81,9 +81,10 @@ var Database$1 = class {
 	_flushPaused = null;
 	_flushPausedCount = 0;
 	_locks = /* @__PURE__ */ new Map();
+	_dirtyKeys = /* @__PURE__ */ new Set();
 	_flushDone = null;
 	metrics;
-	flushInterval;
+	_flushTimer = null;
 	constructor(wrappedDB, settings, logger) {
 		if (wrappedDB.isAsync) this.wrappedDB = wrappedDB;
 		else {
@@ -131,9 +132,6 @@ var Database$1 = class {
 			writesToDbFinished: 0,
 			writesToDbRetried: 0
 		};
-		this.flushInterval = this.settings.writeInterval > 0 ? setInterval(() => {
-			this.flush();
-		}, this.settings.writeInterval) : null;
 	}
 	async _lock(key) {
 		while (true) {
@@ -150,6 +148,23 @@ var Database$1 = class {
 		this._locks.get(key).done();
 		this._locks.delete(key);
 	}
+	_scheduleFlush() {
+		if (this._flushTimer != null) return;
+		if (this._flushDone != null) return;
+		if (this.settings.writeInterval <= 0) return;
+		if (this._dirtyKeys.size === 0) return;
+		this._flushTimer = setTimeout(() => {
+			this._flushTimer = null;
+			this.flush();
+		}, this.settings.writeInterval);
+		this._flushTimer.unref?.();
+	}
+	_cancelFlushTimer() {
+		if (this._flushTimer != null) {
+			clearTimeout(this._flushTimer);
+			this._flushTimer = null;
+		}
+	}
 	_pauseFlush() {
 		if (this._flushPaused == null) {
 			this._flushPaused = new SelfContainedPromise();
@@ -166,12 +181,22 @@ var Database$1 = class {
 		await this.wrappedDB.init();
 	}
 	async close() {
-		clearInterval(this.flushInterval ?? void 0);
+		this._cancelFlushTimer();
 		await this.flush();
 		await this.wrappedDB.close();
 		this.wrappedDB = null;
 	}
 	async get(key) {
+		if (!this._locks.has(key)) {
+			const entry = this.buffer.get(key);
+			if (entry != null) {
+				++this.metrics.reads;
+				++this.metrics.readsFromCache;
+				++this.metrics.readsFinished;
+				if (this.logger.isDebugEnabled()) this.logger.debug(`GET    - ${key} - ${JSON.stringify(entry.value)} - from ${entry.dirty ? "dirty buffer" : "cache"}`);
+				return cloneOut(entry.value);
+			}
+		}
 		let v;
 		await this._lock(key);
 		try {
@@ -179,7 +204,7 @@ var Database$1 = class {
 		} finally {
 			this._unlock(key);
 		}
-		return clone(v);
+		return cloneOut(v);
 	}
 	async _getLocked(key) {
 		++this.metrics.reads;
@@ -224,7 +249,7 @@ var Database$1 = class {
 		await this.flush();
 		const keyValues = await this.wrappedDB.findKeys(key, notKey);
 		if (this.logger.isDebugEnabled()) this.logger.debug(`GET    - ${key}-${notKey} - ${JSON.stringify(keyValues)} - from database `);
-		return clone(keyValues);
+		return cloneOut(keyValues);
 	}
 	async findKeysPaged(key, notKey, options) {
 		if (!options || !Number.isInteger(options.limit) || options.limit <= 0) throw new Error("findKeysPaged requires a positive integer limit");
@@ -241,18 +266,18 @@ var Database$1 = class {
 				}
 				return lo;
 			})();
-			return clone(all.slice(start, start + options.limit));
+			return cloneOut(all.slice(start, start + options.limit));
 		}
 		const keys = await this.wrappedDB.findKeysPaged(key, notKey, options);
 		if (this.logger.isDebugEnabled()) this.logger.debug(`GET    - ${key}-${notKey} (paged limit=${options.limit} after=${options.after ?? ""}) - ${JSON.stringify(keys)} - from database `);
-		return clone(keys);
+		return cloneOut(keys);
 	}
 	async remove(key) {
 		if (this.logger.isDebugEnabled()) this.logger.debug(`DELETE - ${key} - from database `);
 		await this.set(key, null);
 	}
 	async set(key, value) {
-		value = clone(value);
+		value = cloneIn(value);
 		let p;
 		this._pauseFlush();
 		try {
@@ -280,6 +305,8 @@ var Database$1 = class {
 			entry.value = value;
 			if (!entry.dirty) entry.dirty = new SelfContainedPromise();
 			this.buffer.set(key, entry);
+			this._dirtyKeys.add(key);
+			this._scheduleFlush();
 			const buffered = this.settings.writeInterval > 0;
 			if (this.logger.isDebugEnabled()) this.logger.debug(`SET    - ${key} - ${JSON.stringify(value)} - to ${buffered ? "buffer" : "database"}`);
 			if (!buffered) this._write([[key, entry]]);
@@ -292,7 +319,7 @@ var Database$1 = class {
 		}
 	}
 	async setSub(key, sub, value) {
-		value = clone(value);
+		value = cloneIn(value);
 		if (this.logger.isDebugEnabled()) this.logger.debug(`SETSUB - ${key}${JSON.stringify(sub)} - ${JSON.stringify(value)}`);
 		let p;
 		this._pauseFlush();
@@ -342,18 +369,21 @@ var Database$1 = class {
 				v = v[k];
 			}
 			if (this.logger.isDebugEnabled()) this.logger.debug(`GETSUB - ${key}${JSON.stringify(sub)} - ${JSON.stringify(v)}`);
-			return clone(v);
+			return cloneOut(v);
 		} finally {
 			this._unlock(key);
 		}
 	}
 	async flush() {
+		this._cancelFlushTimer();
 		if (this._flushDone == null) this._flushDone = (async () => {
 			while (true) {
 				while (this._flushPaused != null) await this._flushPaused;
 				const dirtyEntries = [];
-				for (const entry of this.buffer) if (entry[1].dirty && !entry[1].writingInProgress) {
-					dirtyEntries.push(entry);
+				for (const key of this._dirtyKeys) {
+					const entry = this.buffer.get(key, false);
+					if (!entry || !entry.dirty || entry.writingInProgress) continue;
+					dirtyEntries.push([key, entry]);
 					if (this.settings.bulkLimit && dirtyEntries.length >= this.settings.bulkLimit) break;
 				}
 				if (dirtyEntries.length === 0) return;
@@ -362,14 +392,16 @@ var Database$1 = class {
 		})();
 		await this._flushDone;
 		this._flushDone = null;
+		if (this._dirtyKeys.size > 0) this._scheduleFlush();
 	}
 	async _write(dirtyEntries) {
-		const markDone = (entry, err) => {
+		const markDone = (key, entry, err) => {
 			if (entry.writingInProgress) {
 				entry.writingInProgress = false;
 				if (err != null) ++this.metrics.writesToDbFailed;
 				++this.metrics.writesToDbFinished;
 			}
+			if (this.buffer.get(key, false) === entry) this._dirtyKeys.delete(key);
 			entry.dirty.done(err);
 			entry.dirty = null;
 		};
@@ -379,9 +411,9 @@ var Database$1 = class {
 			let serialized;
 			try {
 				if (this.settings.json && entry.value != null) serialized = JSON.stringify(entry.value);
-				else serialized = clone(entry.value);
+				else serialized = cloneOut(entry.value);
 			} catch (err) {
-				markDone(entry, err);
+				markDone(key, entry, err);
 				continue;
 			}
 			entry.writingInProgress = true;
@@ -402,7 +434,7 @@ var Database$1 = class {
 			} catch (err) {
 				writeErr = err instanceof Error ? err : new Error(String(err));
 			}
-			markDone(entry, writeErr);
+			markDone(op.key, entry, writeErr);
 		};
 		if (ops.length === 1) await writeOneOp(ops[0], entries[0]);
 		else if (typeof this.wrappedDB.doBulk !== "function") await Promise.all(ops.map(async (op, i) => writeOneOp(op, entries[i])));
@@ -416,27 +448,35 @@ var Database$1 = class {
 				this.metrics.writesToDbRetried += ops.length;
 				await Promise.all(ops.map(async (op, i) => writeOneOp(op, entries[i])));
 			}
-			if (success) entries.forEach((entry) => markDone(entry, null));
+			if (success) for (let i = 0; i < entries.length; i++) markDone(ops[i].key, entries[i], null);
 		}
 		this.buffer.evictOld();
 	}
 };
-const clone = (obj, key = "") => {
+const cloneIn = (obj, key = "") => {
 	if (obj == null || typeof obj !== "object") return obj;
-	if (typeof obj.toJSON === "function") return clone(obj.toJSON(key));
+	if (typeof obj.toJSON === "function") return cloneIn(obj.toJSON(key));
 	if (obj instanceof Date) {
 		const copy = /* @__PURE__ */ new Date();
 		copy.setTime(obj.getTime());
 		return copy;
 	}
-	if (Array.isArray(obj)) return obj.map((item, i) => clone(item, String(i)));
+	if (Array.isArray(obj)) return obj.map((item, i) => cloneIn(item, String(i)));
 	if (obj instanceof Object) {
 		const copy = {};
-		for (const attr of Object.keys(obj)) copy[attr] = clone(obj[attr], attr);
+		for (const attr of Object.keys(obj)) copy[attr] = cloneIn(obj[attr], attr);
 		return copy;
 	}
 	throw new Error("Unable to copy obj! Its type isn't supported.");
 };
+const cloneOut = (v) => {
+	if (v == null || typeof v !== "object") return v;
+	try {
+		return structuredClone(v);
+	} catch {
+		return cloneIn(v);
+	}
+};
 //#endregion
 //#region index.ts
 /**
@@ -489,10 +529,10 @@ var Database = class {
 	async initDB() {
 		switch (this.type) {
 			case "mysql": return new (await (import("./mysql_db-DIXEbML4.js"))).default(this.dbSettings);
-			case "postgres": return new (await (import("./postgres_db-DFplUUa_.js"))).default(this.dbSettings);
+			case "postgres": return new (await (import("./postgres_db-BlGpklXj.js"))).default(this.dbSettings);
 			case "sqlite": return new (await (import("./sqlite_db-Bp4nZn-c.js"))).default(this.dbSettings);
 			case "rustydb": return new (await (import("./rusty_db-90_S-z-w.js"))).default(this.dbSettings);
-			case "mongodb": return new (await (import("./mongodb_db-DJVvvNTo.js"))).default(this.dbSettings);
+			case "mongodb": return new (await (import("./mongodb_db-DfViPvX4.js"))).default(this.dbSettings);
 			case "redis": return new (await (import("./redis_db-501GYkb7.js"))).default(this.dbSettings);
 			case "cassandra": return new (await (import("./cassandra_db-B96_l9V7.js"))).default(this.dbSettings);
 			case "dirty": return new (await (import("./dirty_db-BGvHB8ud.js"))).default(this.dbSettings);
@@ -501,7 +541,7 @@ var Database = class {
 			case "memory": return new (await (import("./memory_db-BQaHRpkv.js"))).default(this.dbSettings);
 			case "mock": return new (await (import("./mock_db-CgEDPTpF.js"))).default(this.dbSettings);
 			case "mssql": return new (await (import("./mssql_db-BqtTYXk9.js"))).default(this.dbSettings);
-			case "postgrespool": return new (await (import("./postgrespool_db-Kh9HhRsG.js"))).default(this.dbSettings);
+			case "postgrespool": return new (await (import("./postgrespool_db-DuODGBuR.js"))).default(this.dbSettings);
 			case "rethink": return new (await (import("./rethink_db-BklcFMyp.js"))).default(this.dbSettings);
 			case "couch": return new (await (import("./couch_db-DZ6MLt5j.js"))).default(this.dbSettings);
 			case "surrealdb": return new (await (import("./surrealdb_db-K8QAySpG.js"))).default(this.dbSettings);

package/dist/lib/CacheAndBufferLayer.d.ts

@@ -79,12 +79,15 @@ export declare class Database {
     private _flushPaused;
     private _flushPausedCount;
     private readonly _locks;
+    private readonly _dirtyKeys;
     private _flushDone;
     metrics: Metrics;
-    private readonly flushInterval;
+    private _flushTimer;
     constructor(wrappedDB: LegacyWrappedDB, settings: Partial<CacheSettings> | null | undefined, logger: Logger);
     private _lock;
     private _unlock;
+    private _scheduleFlush;
+    private _cancelFlushTimer;
     private _pauseFlush;
     private _resumeFlush;
     init(): Promise<void>;

package/dist/lib/CacheAndBufferLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CacheAndBufferLayer.d.ts","sourceRoot":"","sources":["../../lib/CacheAndBufferLayer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CacheAndBufferLayer.d.ts","sourceRoot":"","sources":["../../lib/CacheAndBufferLayer.ts"],"names":[],"mappings":"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"}

package/dist/{mongodb_db-DJVvvNTo.js → mongodb_db-DfViPvX4.js}

@@ -17,7 +17,6 @@ import { MongoClient } from "mongodb";
 * limitations under the License.
 */
 var mongodb_db_default = class extends AbstractDatabase {
-	interval;
 	database;
 	client;
 	collection;
@@ -28,20 +27,10 @@ var mongodb_db_default = class extends AbstractDatabase {
 		if (this.settings.database == null) this.settings.database = this.settings.dbName;
 		if (!this.settings.collection) this.settings.collection = "ueberdb";
 	}
-	clearPing() {
-		if (this.interval) clearInterval(this.interval[Symbol.toPrimitive]());
-	}
-	schedulePing() {
-		this.clearPing();
-		this.interval = setInterval(() => {
-			this.database.command({ ping: 1 });
-		}, 1e4);
-	}
 	init(callback) {
 		MongoClient.connect(this.settings.url).then((v) => {
 			this.client = v;
 			this.database = v.db(this.settings.database);
-			this.schedulePing();
 			this.collection = this.database.collection(this.settings.collection);
 			callback(null);
 		}).catch((v) => {
@@ -55,27 +44,22 @@ var mongodb_db_default = class extends AbstractDatabase {
 			console.log(v);
 			callback(v);
 		});
-		this.schedulePing();
 	}
 	findKeys(key, notKey, callback) {
-		const selector = { $and: [{ _id: { $regex: `${key.replace(/\*/g, "")}` } }] };
-		if (notKey) selector.$and.push({ _id: { $not: { $regex: `${notKey.replace(/\*/g, "")}` } } });
-		this.collection.find(selector).map((i) => i._id).toArray().then((r) => {
-			callback(null, r);
-		}).catch((v) => callback(v));
-		this.schedulePing();
+		const escape = (s) => s.replace(/[.+?^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*");
+		const selector = { $and: [{ _id: { $regex: `^${escape(key)}$` } }] };
+		if (notKey) selector.$and.push({ _id: { $not: { $regex: `^${escape(notKey)}$` } } });
+		this.collection.find(selector).map((i) => i._id).toArray().then((r) => callback(null, r)).catch((v) => callback(v));
 	}
 	set(key, value, callback) {
 		if (key.length > 100) callback("Your Key can only be 100 chars");
 		else this.collection.updateMany({ _id: key }, { $set: { value } }, { upsert: true }).then(() => callback(null)).catch((v) => callback(v));
-		this.schedulePing();
 	}
 	remove(key, callback) {
 		this.collection.deleteOne({ _id: key }).then((r) => callback(null, r)).catch((v) => callback(v));
-		this.schedulePing();
 	}
 	doBulk(bulk, callback) {
-		const bulkMongo = this.collection.initializeOrderedBulkOp();
+		const bulkMongo = this.collection.initializeUnorderedBulkOp();
 		for (const i in bulk) if (bulk[i].type === "set") bulkMongo.find({ _id: bulk[i].key }).upsert().updateOne({ $set: { value: bulk[i].value } });
 		else if (bulk[i].type === "remove") bulkMongo.find({ _id: bulk[i].key }).deleteOne();
 		bulkMongo.execute().then((res) => {
@@ -83,10 +67,8 @@ var mongodb_db_default = class extends AbstractDatabase {
 		}).catch((error) => {
 			callback(error);
 		});
-		this.schedulePing();
 	}
 	close(callback) {
-		this.clearPing();
 		this.client.close().then((r) => callback(r));
 	}
 };

package/dist/{postgres_db-DFplUUa_.js → postgres_db-BlGpklXj.js}

@@ -66,7 +66,11 @@ var postgres_db_default = class extends AbstractDatabase {
 		});
 	}
 	get(key, callback) {
-		this.db.query("SELECT value FROM store WHERE key=$1", [key], (err, results) => {
+		this.db.query({
+			name: "ueberdb_get",
+			text: "SELECT value FROM store WHERE key=$1",
+			values: [key]
+		}, (err, results) => {
 			let value = null;
 			if (!err && results.rows.length === 1) value = results.rows[0].value;
 			callback(err, value);
@@ -113,32 +117,55 @@ var postgres_db_default = class extends AbstractDatabase {
 	}
 	set(key, value, callback) {
 		if (key.length > 100) callback(Error("Your Key can only be 100 chars"), "");
-		else if (this.upsertStatement != null) this.db.query(this.upsertStatement, [key, value], callback);
+		else if (this.upsertStatement != null) {
+			const name = this.upsertStatement.startsWith("INSERT INTO store(key, value) VALUES") ? "ueberdb_set_native" : "ueberdb_set_function";
+			this.db.query({
+				name,
+				text: this.upsertStatement,
+				values: [key, value]
+			}, callback);
+		} else callback(Error("PostgreSQL driver not initialised: call init() before set()"), null);
 	}
 	remove(key, callback) {
-		this.db.query("DELETE FROM store WHERE key=$1", [key], callback);
+		this.db.query({
+			name: "ueberdb_remove",
+			text: "DELETE FROM store WHERE key=$1",
+			values: [key]
+		}, callback);
 	}
 	doBulk(bulk, callback) {
-		const replaceVALs = [];
-		let removeSQL = "DELETE FROM store WHERE key IN (";
-		const removeVALs = [];
-		let removeCount = 0;
-		for (const i in bulk) if (bulk[i].type === "set") replaceVALs.push([bulk[i].key, bulk[i].value]);
-		else if (bulk[i].type === "remove") {
-			if (removeCount !== 0) removeSQL += ",";
-			removeCount += 1;
-			removeSQL += `$${removeCount}`;
-			removeVALs.push(bulk[i].key);
+		if (!this.upsertStatement) {
+			callback(Error("PostgreSQL driver not initialised: call init() before doBulk()"));
+			return;
 		}
-		removeSQL += ");";
-		if (!this.upsertStatement) return;
-		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();
-		};
-		functions.push(removeFunction);
-		async.parallel(functions, callback);
+		const setOps = [];
+		const removeKeys = [];
+		for (const op of bulk) if (op.type === "set") setOps.push([op.key, op.value]);
+		else if (op.type === "remove") removeKeys.push(op.key);
+		const isNativeUpsert = this.upsertStatement.startsWith("INSERT INTO store(key, value) VALUES");
+		const tasks = [];
+		if (setOps.length > 0) if (isNativeUpsert && setOps.length > 1) {
+			const valuesSql = [];
+			const params = [];
+			let i = 1;
+			for (const [k, v] of setOps) {
+				valuesSql.push(`($${i++},$${i++})`);
+				params.push(k, v);
+			}
+			const sql = `INSERT INTO store(key, value) VALUES ${valuesSql.join(",")} ON CONFLICT (key) DO UPDATE SET value = excluded.value`;
+			tasks.push((cb) => {
+				this.db.query(sql, params, (err) => cb(err));
+			});
+		} else for (const [k, v] of setOps) tasks.push((cb) => {
+			this.db.query(this.upsertStatement, [k, v], (err) => cb(err));
+		});
+		if (removeKeys.length > 0) {
+			const sql = `DELETE FROM store WHERE key IN (${removeKeys.map((_, idx) => `$${idx + 1}`).join(",")})`;
+			tasks.push((cb) => {
+				this.db.query(sql, removeKeys, (err) => cb(err));
+			});
+		}
+		async.parallel(tasks, callback);
 	}
 	close(callback) {
 		this.db.end(callback);

package/dist/{postgrespool_db-Kh9HhRsG.js → postgrespool_db-DuODGBuR.js}

@@ -1,4 +1,4 @@
-import postgres_db_default from "./postgres_db-DFplUUa_.js";
+import postgres_db_default from "./postgres_db-BlGpklXj.js";
 //#region databases/postgrespool_db.ts
 var PostgresDB = class extends postgres_db_default {
 	constructor(settings) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ueberdb2",
-  "version": "6.1.9",
+  "version": "6.1.11",
   "description": "Transform every database into a object key value store",
   "keywords": [
     "database",
@@ -53,24 +53,24 @@
     "@elastic/elasticsearch": "^9.4.2",
     "@types/async": "^3.2.25",
     "@types/mssql": "^12.3.0",
-    "@types/node": "^25.9.2",
+    "@types/node": "^25.9.3",
     "@types/pg": "^8.20.0",
     "@types/rethinkdb": "^2.3.21",
     "@types/wtfnode": "^0.10.0",
     "cassandra-driver": "^4.9.0",
     "cli-table3": "^0.6.5",
-    "mongodb": "^7.2.0",
+    "mongodb": "^7.3.0",
     "mssql": "^12.5.5",
     "mysql2": "^3.22.5",
     "nano": "^11.0.5",
-    "oxfmt": "^0.53.0",
+    "oxfmt": "^0.54.0",
     "oxlint": "^1.69.0",
     "pg": "^8.21.0",
     "randexp-ts": "^1.0.5",
     "redis": "^6.0.0",
     "rethinkdb": "^2.4.2",
-    "rolldown": "^1.1.0",
-    "semver": "^7.8.3",
+    "rolldown": "^1.1.1",
+    "semver": "^7.8.4",
     "surrealdb": "^2.0.3",
     "testcontainers": "^12.0.1",
     "typescript": "^6.0.3",