@webtypen/webframez-core 0.3.68 → 0.3.69

package/README.md

@@ -21,6 +21,38 @@ This README reflects the current API in this repository and focuses on:
 npm i @webtypen/webframez-core
 ```
 
+## Database drivers (from 0.3.69)
+
+The core has no MongoDB/BSON dependency. HTTP routing and database-independent
+commands work without installing or registering a database driver. Database access
+requires a registered driver; missing configuration or capabilities fail explicitly.
+
+For MongoDB, use `@webtypen/webframez-dbdriver-mongodb >=0.0.11` and register
+`MongoDBDriver` with `DBDrivers.register("mongodb", MongoDBDriver)` before database
+features are used. Upgrade the driver before the core. Applications that directly
+import MongoDB must declare their own `mongodb` dependency.
+
+Driver authors implement `idAdapter` for ID creation, normalization, validation and
+comparison. ID conversion does not open a connection. `Model.objectId(...)` keeps
+its existing name and driver-defined return value for compatibility.
+
+Datatables, DataBuilder, pagination, queues and notifications use the optional
+`documentStore(client): DocumentDatabase` capability. Its filters, updates and
+aggregation stages use MongoDB-style document operators; another driver must
+translate them or report that this capability is unsupported. This is not a SQL
+query abstraction. `findOneAndUpdate` must atomically select/update one record and
+return the document or `null`, never a native result wrapper. No read-then-write
+fallback is allowed for queue or notification claims.
+
+Verification after `npm run build`:
+
+```bash
+node --test -r ts-node/register/transpile-only src/Database/DatabaseAdapter.spec.ts src/Commands/QueueWorkerCommand.spec.ts src/Notifications/NotificationService.spec.ts
+```
+
+The tests include an HTTP server with MongoDB, BSON and all database-driver imports
+blocked, and a numeric-ID test driver that never opens a database connection.
+
 ## Agent-Regeln fuer Codex und Copilot
 
 Das Paket enthaelt unter agents/webframez_rules.md empfohlene Arbeitsregeln fuer AI-Coding-Agents in Webframez-Projekten.

package/dist/Api/ApiFunctionUtils.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.instantiateApiFunction = exports.instantiateApiScope = exports.assertUniqueApiFunctionKeys = exports.createApiFrameworkRequest = exports.toApiFunctionPayload = exports.toApiFunctionHttpResult = exports.apiFunctionParamToJsonSchema = exports.apiFunctionParamsToJsonSchema = exports.coerceApiFunctionParam = exports.validateApiFunctionParams = exports.runApiScopeRegistrationMiddleware = exports.runApiScopeGroupMiddleware = exports.runApiScopesGroupMiddleware = exports.runApiScopeMiddleware = exports.collectApiScopeRegistrations = exports.instantiateApiScopesGroup = exports.isApiScopesGroupInstance = exports.normalizeApiScopesGroupProvider = exports.getApiFunctionClasses = exports.normalizeApiFunctionProvider = exports.isPlainApiObject = exports.getApiErrorMessage = exports.joinApiPath = exports.normalizeApiPath = exports.ApiFunctionRuntimeError = void 0;
+const DBConnection_1 = require("../Database/DBConnection");
 const Request_1 = require("../Router/Request");
 const ApiFunction_1 = require("./ApiFunction");
 const ApiScopesGroup_1 = require("./ApiScopesGroup");
@@ -206,12 +207,12 @@ function coerceApiFunctionParam(key, value, definition) {
         }
         throw new ApiFunctionRuntimeError(`Parameter "${key}" must be a boolean`, 400);
     }
-    if (type === "objectid") {
-        const stringValue = value.toString();
-        if (!/^[a-fA-F0-9]{24}$/.test(stringValue)) {
+    if (["objectid", "databaseid"].includes(type)) {
+        const normalizedId = DBConnection_1.DBConnection.getIdAdapter().normalize(value);
+        if (normalizedId === null) {
             throw new ApiFunctionRuntimeError(`Parameter "${key}" must be a valid ObjectId`, 400);
         }
-        return stringValue;
+        return String(normalizedId);
     }
     if (type === "option") {
         const allowedValues = Array.isArray(definition.options) ? definition.options.map((option) => option.value) : [];

package/dist/Commands/QueueWorkerCommand.js

@@ -264,8 +264,7 @@ class QueueWorkerCommand extends ConsoleCommand_1.ConsoleCommand {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
                 const connection = yield DBConnection_1.DBConnection.getConnection();
-                yield connection.client
-                    .db(null)
+                yield DBConnection_1.DBConnection.documentStore(connection)
                     .collection("queue_jobs")
                     .updateOne({
                     _id: jobId,
@@ -382,7 +381,7 @@ class QueueWorkerCommand extends ConsoleCommand_1.ConsoleCommand {
                         if (!automation || !automation.jobclass || !automation._execution || !automation._execution.key) {
                             continue;
                         }
-                        const existingJob = yield connection.client.db(null).collection("queue_jobs").findOne({
+                        const existingJob = yield DBConnection_1.DBConnection.documentStore(connection).collection("queue_jobs").findOne({
                             is_automated: true,
                             automation_key: automation._execution.key,
                         });
@@ -407,7 +406,7 @@ class QueueWorkerCommand extends ConsoleCommand_1.ConsoleCommand {
                             executions: [],
                             worker: this.workerKey,
                         };
-                        yield connection.client.db(null).collection("queue_jobs").insertOne(newJob);
+                        yield DBConnection_1.DBConnection.documentStore(connection).collection("queue_jobs").insertOne(newJob);
                     }
                     yield this.wait(5000);
                 }
@@ -430,8 +429,7 @@ class QueueWorkerCommand extends ConsoleCommand_1.ConsoleCommand {
     }
     getNextJobNumber(connection) {
         return __awaiter(this, void 0, void 0, function* () {
-            const lastJob = yield connection.client
-                .db(null)
+            const lastJob = yield DBConnection_1.DBConnection.documentStore(connection)
                 .collection("queue_jobs")
                 .findOne({}, { sort: { number: -1 } });
             return lastJob ? (lastJob.number || 0) + 1 : 1;
@@ -463,8 +461,7 @@ class QueueWorkerCommand extends ConsoleCommand_1.ConsoleCommand {
                     .tz(this.workerConfig.timezone ? this.workerConfig.timezone : "Europe/Berlin")
                     .format("YYYYMMDDHHmmss") + StringFunctions_1.StringFunctions.random(24);
                 const workerJobclasses = this.getWorkerJobclasses();
-                const jobUpdate = yield connection.client
-                    .db(null)
+                const jobUpdate = yield DBConnection_1.DBConnection.documentStore(connection)
                     .collection("queue_jobs")
                     .findOneAndUpdate({
                     status: "pending",
@@ -488,11 +485,7 @@ class QueueWorkerCommand extends ConsoleCommand_1.ConsoleCommand {
                     sort: { priority: -1, created_at: 1 },
                     returnDocument: "after",
                 });
-                const job = jobUpdate && jobUpdate.jobclass && jobUpdate._id
-                    ? jobUpdate
-                    : (jobUpdate === null || jobUpdate === void 0 ? void 0 : jobUpdate.value) && jobUpdate.ok && jobUpdate.value._id && jobUpdate.value.jobclass
-                        ? jobUpdate.value
-                        : null;
+                const job = jobUpdate;
                 if (!job || !job.jobclass || !job._id) {
                     this.currentJob = null;
                     if (job && job._id) {
@@ -518,8 +511,7 @@ class QueueWorkerCommand extends ConsoleCommand_1.ConsoleCommand {
                     { key: executionKey, worker: this.workerKey, status: "running", started_at: startedAt },
                     ...(job.executions && job.executions.length > 0 ? job.executions : []),
                 ];
-                yield connection.client
-                    .db(null)
+                yield DBConnection_1.DBConnection.documentStore(connection)
                     .collection("queue_jobs")
                     .updateOne({ _id: job._id }, {
                     $set: {
@@ -584,8 +576,7 @@ class QueueWorkerCommand extends ConsoleCommand_1.ConsoleCommand {
                     if (jobNotification) {
                         yield NotificationService_1.NotificationService.setChangingStatus(jobNotification, job.status === "pending" ? "pending" : "success");
                     }
-                    yield connection.client
-                        .db(null)
+                    yield DBConnection_1.DBConnection.documentStore(connection)
                         .collection("queue_jobs")
                         .updateOne({ _id: job._id }, {
                         $set: {
@@ -690,8 +681,7 @@ class QueueWorkerCommand extends ConsoleCommand_1.ConsoleCommand {
                     if (jobInstance) {
                         job.executions[0].log = jobInstance.getLog();
                     }
-                    yield connection.client
-                        .db(null)
+                    yield DBConnection_1.DBConnection.documentStore(connection)
                         .collection("queue_jobs")
                         .updateOne({ _id: job._id }, {
                         $set: {

package/dist/DataBuilder/DataBuilder.d.ts

@@ -1,3 +1,4 @@
+import type { DocumentDatabase } from "../Database/DatabaseAdapter";
 import { Request } from "../Router/Request";
 export type DataBuilderSchema = {
     version: string;
@@ -60,8 +61,8 @@ export declare class DataBuilder {
     getFieldTypesFrontend(): any;
     getFieldsFrontend(fields: any, payload?: any): Promise<any>;
     getTypeFromRequest(req: any): DataBuilderType;
-    validateFields(db: any, type: any, fields: any, req: Request, errors?: any, path?: string): Promise<any>;
-    handleUnique(db: any, req: any, key: string, value: any, field: any, type: any): Promise<boolean>;
+    validateFields(db: DocumentDatabase, type: any, fields: any, req: Request, errors?: any, path?: string): Promise<any>;
+    handleUnique(db: DocumentDatabase, req: any, key: string, value: any, field: any, type: any): Promise<boolean>;
     typeForFrontend(type: any, req: any): Promise<any>;
     loadType(req: Request): Promise<{
         status: string;
@@ -73,7 +74,7 @@ export declare class DataBuilder {
             [x: number]: any;
         };
     }[]>;
-    save(db: any, req: any): Promise<{
+    save(db: DocumentDatabase, req: any): Promise<{
         status: string;
         errors: any;
         data?: undefined;
@@ -82,7 +83,7 @@ export declare class DataBuilder {
         data: any;
         errors?: undefined;
     }>;
-    delete(db: any, req: any): Promise<{
+    delete(db: DocumentDatabase, req: any): Promise<{
         status: string;
         data: {
             _id: any;
@@ -91,11 +92,11 @@ export declare class DataBuilder {
     }>;
     getField(req: Request, type: DataBuilderType, path: string): Promise<any>;
     removeArrayIndicators(str: string): string;
-    details(db: any, req: any): Promise<{
+    details(db: DocumentDatabase, req: any): Promise<{
         status: string;
         data: any;
     }>;
-    detailsNewData(db: any, req: any): Promise<{
+    detailsNewData(db: DocumentDatabase, req: any): Promise<{
         status: string;
         message: string;
         data?: undefined;

package/dist/DataBuilder/DataBuilder.js

@@ -293,8 +293,8 @@ class DataBuilder {
                 else {
                     let elementVal = null;
                     if (fields[key].type === "ObjectId") {
-                        if (value && (value.toString().length === 12 || value.toString().length === 24)) {
-                            elementVal = typeof value === "string" ? yield Model_1.Model.objectId(value) : value;
+                        if (value !== undefined && value !== null && value !== "") {
+                            elementVal = yield Model_1.Model.objectId(value);
                         }
                         else {
                             elementVal = yield Model_1.Model.objectId();
@@ -605,6 +605,8 @@ class DataBuilder {
                 throw new Error("Missing schema fields ...");
             }
             const collection = type.schema && type.schema.collection ? type.schema.collection : undefined;
+            if (!collection)
+                throw new Error("Missing schema collection ...");
             let element = null;
             try {
                 element = yield db

package/dist/DataBuilder/DataBuilderController.js

@@ -25,16 +25,16 @@ class DataBuilderController extends Controller_1.Controller {
                 return res.send(yield this.builder.apiAutoComplete(req));
             }
             else if (req.body.__builder_rest_api === "details") {
-                return res.send(yield this.builder.details(db.client.db(null), req));
+                return res.send(yield this.builder.details(DBConnection_1.DBConnection.documentStore(db), req));
             }
             else if (req.body.__builder_rest_api === "details-newdata") {
-                return res.send(yield this.builder.detailsNewData(db.client.db(null), req));
+                return res.send(yield this.builder.detailsNewData(DBConnection_1.DBConnection.documentStore(db), req));
             }
             else if (req.body.__builder_rest_api === "save") {
-                return res.send(yield this.builder.save(db.client.db(null), req));
+                return res.send(yield this.builder.save(DBConnection_1.DBConnection.documentStore(db), req));
             }
             else if (req.body.__builder_rest_api === "delete") {
-                return res.send(yield this.builder.delete(db.client.db(null), req));
+                return res.send(yield this.builder.delete(DBConnection_1.DBConnection.documentStore(db), req));
             }
             else if (req.body.__builder_rest_api === "type") {
                 return res.send(yield this.builder.loadType(req));

package/dist/Database/BaseDBDriver.d.ts

@@ -1,7 +1,11 @@
+import type { DatabaseIdAdapter, DocumentDatabase } from "./DatabaseAdapter";
 import { Model } from "./Model";
 import { QueryBuilder } from "./QueryBuilder";
 export declare class BaseDBDriver {
     config?: object;
+    get idAdapter(): DatabaseIdAdapter;
+    documentStore(client: any): DocumentDatabase;
+    objectId(value?: unknown): Promise<import("./DatabaseAdapter").DatabaseId>;
     setConfig(config: object): void;
     connect(): Promise<void>;
     close(client: any): Promise<void>;

package/dist/Database/BaseDBDriver.js

@@ -11,6 +11,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseDBDriver = void 0;
 class BaseDBDriver {
+    get idAdapter() {
+        throw new Error("This database driver does not implement ID handling.");
+    }
+    documentStore(client) {
+        throw new Error("This database driver does not support document queries (required for Datatables, DataBuilder, queues and notifications).");
+    }
+    objectId(value) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.idAdapter.create(value);
+        });
+    }
     setConfig(config) {
         this.config = config;
     }

package/dist/Database/DBConnection.d.ts

@@ -1,3 +1,4 @@
+import type { DatabaseIdAdapter, DocumentDatabase } from "./DatabaseAdapter";
 import { QueryBuilder } from "./QueryBuilder";
 type ObjectIDType = {
     noExceptions?: Boolean;
@@ -6,8 +7,12 @@ declare class DBConnectionFacade {
     connections: {
         [key: string]: any;
     };
-    getConnectionConfig(connection: string): any;
-    getConnectionDriver(connection: string): any;
+    getConnectionConfig(connection?: string): any;
+    getConnectionDriver(connection?: string): any;
+    /** Resolves ID handling without opening a connection. Core import stays side-effect free. */
+    getIdAdapter(connectionName?: string): DatabaseIdAdapter;
+    documentStore(connection: any): DocumentDatabase;
+    getDocumentStore(connectionName?: string): Promise<DocumentDatabase>;
     getConnection(connectionName?: string): Promise<any>;
     runQuery(query: QueryBuilder, options?: {
         [name: string]: any;

package/dist/Database/DBConnection.js

@@ -33,13 +33,37 @@ class DBConnectionFacade {
     getConnectionDriver(connection) {
         const config = this.getConnectionConfig(connection);
         if (!config || !config["driver"]) {
-            return null;
+            throw new Error("No database driver configured.");
         }
         const driverClass = DBDrivers_1.DBDrivers.get(config["driver"]);
+        if (!driverClass)
+            throw new Error(`Database driver "${config["driver"]}" is not registered. Install and register a driver before using database features.`);
         const driver = new driverClass();
         driver.setConfig(config);
         return driver;
     }
+    /** Resolves ID handling without opening a connection. Core import stays side-effect free. */
+    getIdAdapter(connectionName) {
+        var _a, _b;
+        const name = connectionName || ((_a = Config_1.Config.get("database")) === null || _a === void 0 ? void 0 : _a.defaultConnection);
+        const driver = (name && ((_b = this.connections[name]) === null || _b === void 0 ? void 0 : _b.driver)) || this.getConnectionDriver(connectionName);
+        const adapter = driver.idAdapter;
+        if (!adapter)
+            throw new Error("This database driver does not implement ID handling.");
+        return adapter;
+    }
+    documentStore(connection) {
+        var _a;
+        if (typeof ((_a = connection === null || connection === void 0 ? void 0 : connection.driver) === null || _a === void 0 ? void 0 : _a.documentStore) !== "function") {
+            throw new Error("The configured database driver does not support document queries. Update the driver to use this feature.");
+        }
+        return connection.driver.documentStore(connection.client);
+    }
+    getDocumentStore(connectionName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.documentStore(yield this.getConnection(connectionName));
+        });
+    }
     getConnection(connectionName) {
         return __awaiter(this, void 0, void 0, function* () {
             const dbconfig = Config_1.Config.get("database");
@@ -50,7 +74,7 @@ class DBConnectionFacade {
                 connectionName = dbconfig.defaultConnection;
             }
             if (!connectionName) {
-                return null;
+                throw new Error("No default database connection configured.");
             }
             if (this.connections[connectionName] && this.connections[connectionName].driver) {
                 // Use cached connection
@@ -94,20 +118,17 @@ class DBConnectionFacade {
             return connection.driver;
         });
     }
+    // Preserve the existing driver-defined return type for Model.objectId consumers.
     objectId(val, connectionName, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (options && options.noExceptions) {
-                try {
-                    const connection = yield this.getConnection(connectionName);
-                    return yield connection.driver.objectId(val);
-                }
-                catch (e) {
-                    console.error(e);
-                }
+            try {
+                return this.getIdAdapter(connectionName).create(val);
+            }
+            catch (error) {
+                if (!(options === null || options === void 0 ? void 0 : options.noExceptions))
+                    throw error;
                 return null;
             }
-            const connection = yield this.getConnection(connectionName);
-            return yield connection.driver.objectId(val);
         });
     }
     mapDataToModel(model, data) {

package/dist/Database/DatabaseAdapter.d.ts

@@ -0,0 +1,42 @@
+/** An ID is owned by the selected driver, not by the core package. */
+export type DatabaseId = string | number | {
+    toString(): string;
+};
+export interface DatabaseIdAdapter {
+    create(value?: unknown): DatabaseId;
+    normalize(value: unknown): DatabaseId | null;
+    isValid(value: unknown): boolean;
+    equals(left: unknown, right: unknown): boolean;
+}
+export interface DocumentCursor {
+    toArray(): Promise<any[]>;
+    sort(sort: any): DocumentCursor;
+    skip(count: number): DocumentCursor;
+    limit(count: number): DocumentCursor;
+}
+/** Optional document-query capability. Filters, updates and aggregation stages use
+ * the framework's document query vocabulary. A driver implements or translates it;
+ * unsupported drivers must reject the capability rather than emulate atomicity. */
+export interface DocumentCollection {
+    find(filter?: any, options?: any): DocumentCursor;
+    findOne(filter: any, options?: any): Promise<any | null>;
+    aggregate(stages: any[], options?: any): DocumentCursor;
+    countDocuments(filter?: any, options?: any): Promise<number>;
+    insertOne(document: any, options?: any): Promise<any>;
+    insertMany(documents: any[], options?: any): Promise<any>;
+    updateOne(filter: any, update: any, options?: any): Promise<any>;
+    updateMany(filter: any, update: any, options?: any): Promise<any>;
+    replaceOne(filter: any, replacement: any, options?: any): Promise<any>;
+    deleteOne(filter: any, options?: any): Promise<any>;
+    deleteMany(filter: any, options?: any): Promise<any>;
+    /** Atomically selects and updates ONE document; returns the document or null.
+     * Never return a driver-specific result wrapper. Queue leases depend on this. */
+    findOneAndUpdate(filter: any, update: any, options?: {
+        sort?: any;
+        upsert?: boolean;
+        returnDocument?: "before" | "after";
+    }): Promise<any | null>;
+}
+export interface DocumentDatabase {
+    collection(name: string): DocumentCollection;
+}

package/dist/Database/DatabaseAdapter.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/Datatable/Datatable.d.ts

@@ -67,7 +67,7 @@ export declare class Datatable {
         max_entries: any;
         total_pages: number;
         per_page: number;
-        entries: any;
+        entries: any[];
         sums: any;
     }>;
     stats(req: Request): Promise<Array<{
@@ -75,7 +75,7 @@ export declare class Datatable {
         type: string;
         value: any;
     }>>;
-    getTotalData(req: Request): Promise<any>;
+    getTotalData(req: Request): Promise<any[]>;
     getFilter(req: Request): Promise<any>;
     getColumns(req: Request): Promise<any>;
     getOnPressLink(req: Request): Promise<any>;

package/dist/Datatable/Datatable.js

@@ -25,7 +25,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Datatable = void 0;
 const moment_1 = __importDefault(require("moment"));
-const mongodb_1 = require("mongodb");
 const DBConnection_1 = require("../Database/DBConnection");
 const NumericFunctions_1 = require("../Functions/NumericFunctions");
 class Datatable {
@@ -115,15 +114,9 @@ class Datatable {
             }
             let value = rawValue;
             if (config.value === "_id") {
-                if (rawValue instanceof mongodb_1.ObjectId) {
-                    value = rawValue;
-                }
-                else if (typeof rawValue === "string" && mongodb_1.ObjectId.isValid(rawValue)) {
-                    value = new mongodb_1.ObjectId(rawValue);
-                }
-                else {
+                value = DBConnection_1.DBConnection.getIdAdapter().normalize(rawValue);
+                if (value === null)
                     return null;
-                }
             }
             const normalizeStages = (stages) => (stages !== null && stages !== void 0 ? stages : []).map((stage) => {
                 if (!stage || typeof stage !== "object" || !Object.prototype.hasOwnProperty.call(stage, "skipStats")) {
@@ -139,8 +132,7 @@ class Datatable {
                 { $limit: 1 },
             ];
             const connection = yield DBConnection_1.DBConnection.getConnection();
-            const results = yield connection.client
-                .db(null)
+            const results = yield DBConnection_1.DBConnection.documentStore(connection)
                 .collection(yield this.getCollection(req))
                 .aggregate(aggregation, {
                 collation: {
@@ -310,8 +302,7 @@ class Datatable {
                 log("[DATATABLE_AGGREGATION" + (req.body._table ? "-" + req.body._table : "") + "]", aggr);
             }
             const connection = yield DBConnection_1.DBConnection.getConnection();
-            const results = yield connection.client
-                .db(null)
+            const results = yield DBConnection_1.DBConnection.documentStore(connection)
                 .collection(yield this.getCollection(req))
                 .aggregate(aggr, {
                 collation: {
@@ -334,8 +325,7 @@ class Datatable {
                     }
                 }
             }
-            const stats = yield connection.client
-                .db(null)
+            const stats = yield DBConnection_1.DBConnection.documentStore(connection)
                 .collection(yield this.getCollection(req))
                 .aggregate([...(aggregationStats ? aggregationStats : []), statsGroup])
                 .toArray();
@@ -417,8 +407,7 @@ class Datatable {
                 }
             }
             const connection = yield DBConnection_1.DBConnection.getConnection();
-            return yield connection.client
-                .db(null)
+            return yield DBConnection_1.DBConnection.documentStore(connection)
                 .collection(yield this.getCollection(req))
                 .aggregate([...(aggregation ? aggregation : [])])
                 .toArray();

package/dist/Functions/PaginationFunctions.js

@@ -15,7 +15,7 @@ const paginationList = (options, aggregation, aggregationOptional) => __awaiter(
     const page = options.page && parseInt(options.page) > 0 ? parseInt(options.page) : 0;
     const perPage = options.perPage && parseInt(options.perPage) > 0 ? parseInt(options.perPage) : 50;
     const connection = yield DBConnection_1.DBConnection.getConnection();
-    const collection = connection.client.db(null).collection(options.collection);
+    const collection = DBConnection_1.DBConnection.documentStore(connection).collection(options.collection);
     const promises = [];
     let total = 0;
     promises.push(new Promise((resolve) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/Notifications/Notification.d.ts

@@ -1,16 +1,16 @@
-import type { ObjectId } from "mongodb";
+import type { DatabaseId } from "../Database/DatabaseAdapter";
 import { Model } from "../Database/Model";
 import type { NotificationChangingStatus, NotificationModes, NotificationReadStatus, NotificationViewStatus } from "./NotificationService";
 export declare class Notification extends Model {
     target?: string;
-    target_id?: ObjectId;
+    target_id?: DatabaseId;
     targetModel?: any;
     key?: string;
     mode?: NotificationModes;
     changing_status?: NotificationChangingStatus;
     changing_error?: string | null;
-    _queue_job?: ObjectId;
-    _files?: ObjectId[];
+    _queue_job?: DatabaseId;
+    _files?: DatabaseId[];
     read_status?: NotificationReadStatus;
     read_at?: Date | null;
     view_status?: NotificationViewStatus;

package/dist/Notifications/NotificationService.d.ts

@@ -1,4 +1,4 @@
-import { ObjectId } from "mongodb";
+import type { DatabaseId } from "../Database/DatabaseAdapter";
 import { Request } from "../Router/Request";
 import { Notification } from "./Notification";
 export type NotificationModes = "fixed" | "changing";
@@ -13,7 +13,7 @@ export type NotificationParameterDefinition = {
 };
 export type NotificationTargetContext = {
     target: string;
-    target_id: ObjectId | string;
+    target_id: DatabaseId;
     targetModel?: any;
     request?: Request;
 };
@@ -123,8 +123,8 @@ declare class NotificationServiceFacade {
     set registy(registry: {
         [key: string]: NotificationDefinition;
     });
-    private getObjectIdString;
     private normalizeObjectId;
+    private sameId;
     private getNotificationReferenceId;
     init(): void;
     registerType(type: NotificationDefinition): this;
@@ -158,17 +158,17 @@ declare class NotificationServiceFacade {
     private getLoadAggregation;
     private enrichNotification;
     create(typeKey: string, payload: NotificationPayload, options: NotificationOptions): Promise<Notification | null>;
-    getNotification(notificationRef: Notification | ObjectId | string | null): Promise<Notification>;
-    setQueueJobFailureStatus(notificationRef: ObjectId | string | null, error?: string | null): Promise<boolean>;
-    markAsRead(notification: Notification | ObjectId | string | null): Promise<Notification>;
-    markAsViewed(notification: Notification | ObjectId | string | null): Promise<Notification>;
+    getNotification(notificationRef: Notification | DatabaseId | null): Promise<Notification>;
+    setQueueJobFailureStatus(notificationRef: DatabaseId | null, error?: string | null): Promise<boolean>;
+    markAsRead(notificationRef: Notification | DatabaseId | null): Promise<Notification>;
+    markAsViewed(notificationRef: Notification | DatabaseId | null): Promise<Notification>;
     markAllAsRead(context: NotificationTargetContext): Promise<void>;
     markAllAsViewed(context: NotificationTargetContext): Promise<void>;
-    getNotificationForTarget(notificationRef: Notification | ObjectId | string | null, context: NotificationTargetContext): Promise<Notification | null>;
+    getNotificationForTarget(notificationRef: Notification | DatabaseId | null, context: NotificationTargetContext): Promise<Notification | null>;
     private countByStatus;
     getUnreadCount(context: NotificationTargetContext): Promise<number>;
     getUnviewedCount(context: NotificationTargetContext): Promise<number>;
-    updateNotification(notification: Notification | ObjectId | string | null, updateData: {
+    updateNotification(notificationRef: Notification | DatabaseId | null, updateData: {
         payload?: NotificationPayload;
         show_at?: Date | null;
         read_status?: NotificationReadStatus;
@@ -176,10 +176,10 @@ declare class NotificationServiceFacade {
         view_status?: NotificationViewStatus;
         viewed_at?: Date | null;
     }): Promise<Notification>;
-    setChangingStatus(notification: Notification | ObjectId | string | null, status: NotificationChangingStatus, error?: string | null): Promise<Notification>;
+    setChangingStatus(notificationRef: Notification | DatabaseId | null, status: NotificationChangingStatus, error?: string | null): Promise<Notification>;
     loadNotifications(options: {
         target: string;
-        target_id: ObjectId | string;
+        target_id: DatabaseId;
         targetModel?: any;
         offset?: number;
         limit?: number;

package/dist/Notifications/NotificationService.js

@@ -21,7 +21,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotificationService = exports.NotificationTargetValidationError = exports.NotificationPayloadValidationError = void 0;
-const mongodb_1 = require("mongodb");
 const Notification_1 = require("./Notification");
 const Config_1 = require("../Config");
 const DBConnection_1 = require("../Database/DBConnection");
@@ -56,22 +55,14 @@ class NotificationServiceFacade {
     set registy(registry) {
         this.registry = registry;
     }
-    getObjectIdString(value) {
-        const objectIdString = typeof value === "string"
-            ? value
-            : value && typeof value.toString === "function"
-                ? value.toString()
-                : null;
-        return objectIdString && objectIdString.length === 24 && mongodb_1.ObjectId.isValid(objectIdString)
-            ? objectIdString
-            : null;
-    }
     normalizeObjectId(value) {
-        const objectIdString = this.getObjectIdString(value);
-        return objectIdString ? new mongodb_1.ObjectId(objectIdString) : null;
+        return DBConnection_1.DBConnection.getIdAdapter(new Notification_1.Notification().__connection).normalize(value);
+    }
+    sameId(left, right) {
+        return DBConnection_1.DBConnection.getIdAdapter(new Notification_1.Notification().__connection).equals(left, right);
     }
     getNotificationReferenceId(notificationRef) {
-        return this.getObjectIdString(notificationRef);
+        return this.normalizeObjectId(notificationRef);
     }
     init() {
         this.registry = {};
@@ -176,7 +167,7 @@ class NotificationServiceFacade {
     }
     normalizeTargetId(targetId) {
         const normalized = this.normalizeObjectId(targetId);
-        if (!normalized) {
+        if (normalized === null) {
             throw new NotificationTargetValidationError("Invalid notification target_id.");
         }
         return normalized;
@@ -189,17 +180,17 @@ class NotificationServiceFacade {
         if (!this.getTargetDefinition(target)) {
             throw new NotificationTargetValidationError(`Unknown notification target '${target}'.`);
         }
-        if (!context.target_id) {
+        if (context.target_id === null || context.target_id === undefined || context.target_id === "") {
             throw new NotificationTargetValidationError("Notification target_id required.");
         }
         return Object.assign(Object.assign({}, context), { target, target_id: this.normalizeTargetId(context.target_id) });
     }
     resolveTarget(context) {
-        var _a, _b, _c;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const normalized = this.normalizeTargetContext(context);
             if (normalized.targetModel) {
-                return ((_a = this.getModelId(normalized.targetModel)) === null || _a === void 0 ? void 0 : _a.equals(normalized.target_id)) ? normalized : null;
+                return this.sameId(this.getModelId(normalized.targetModel), normalized.target_id) ? normalized : null;
             }
             const definition = this.getTargetDefinition(normalized.target);
             let targetModel = null;
@@ -207,19 +198,18 @@ class NotificationServiceFacade {
                 targetModel = yield definition.resolve(normalized);
             }
             else if (normalized.target === "user" &&
-                ((_b = normalized.request) === null || _b === void 0 ? void 0 : _b.user) &&
-                ((_c = this.getModelId(normalized.request.user)) === null || _c === void 0 ? void 0 : _c.equals(normalized.target_id))) {
+                ((_a = normalized.request) === null || _a === void 0 ? void 0 : _a.user) &&
+                this.sameId(this.getModelId(normalized.request.user), normalized.target_id)) {
                 targetModel = normalized.request.user;
             }
             else if (definition.collection) {
                 const connection = yield DBConnection_1.DBConnection.getConnection();
-                targetModel = yield connection.client
-                    .db(null)
+                targetModel = yield DBConnection_1.DBConnection.documentStore(connection)
                     .collection(definition.collection)
                     .findOne({ _id: normalized.target_id });
             }
             const modelId = this.getModelId(targetModel);
-            return (modelId === null || modelId === void 0 ? void 0 : modelId.equals(normalized.target_id)) ? Object.assign(Object.assign({}, normalized), { targetModel }) : null;
+            return this.sameId(modelId, normalized.target_id) ? Object.assign(Object.assign({}, normalized), { targetModel }) : null;
         });
     }
     authorizeTarget(context) {
@@ -234,7 +224,7 @@ class NotificationServiceFacade {
             if (!resolved.request)
                 return resolved;
             const requestUserId = this.getModelId(resolved.request.user);
-            return (requestUserId === null || requestUserId === void 0 ? void 0 : requestUserId.equals(resolved.target_id)) ? resolved : null;
+            return this.sameId(requestUserId, resolved.target_id) ? resolved : null;
         });
     }
     attachTargetModel(notification, targetModel) {
@@ -358,8 +348,7 @@ class NotificationServiceFacade {
             }
             else if (((_a = this.getTargetDefinition(resolved.target)) === null || _a === void 0 ? void 0 : _a.collection) && owner._id) {
                 const connection = yield DBConnection_1.DBConnection.getConnection();
-                yield connection.client
-                    .db(null)
+                yield DBConnection_1.DBConnection.documentStore(connection)
                     .collection(this.getTargetDefinition(resolved.target).collection)
                     .updateOne({ _id: owner._id }, { $set: { [preferencesField]: preferences } });
             }
@@ -633,7 +622,7 @@ class NotificationServiceFacade {
                 return notificationRef;
             }
             const notificationId = this.getNotificationReferenceId(notificationRef);
-            if (notificationId && notificationId.length === 24 && mongodb_1.ObjectId.isValid(notificationId)) {
+            if (notificationId !== null) {
                 const loadNotification = yield Notification_1.Notification.where("_id", "=", yield Notification_1.Notification.objectId(notificationId)).first();
                 if (loadNotification) {
                     return loadNotification;
@@ -645,13 +634,12 @@ class NotificationServiceFacade {
     setQueueJobFailureStatus(notificationRef, error) {
         return __awaiter(this, void 0, void 0, function* () {
             const notificationId = this.getNotificationReferenceId(notificationRef);
-            if (!notificationId) {
+            if (notificationId === null) {
                 throw new Error("Invalid notification reference provided: " + (notificationRef === null || notificationRef === void 0 ? void 0 : notificationRef.toString()));
             }
             const connection = yield DBConnection_1.DBConnection.getConnection();
             const completedAt = new Date();
-            const result = yield connection.client
-                .db(null)
+            const result = yield DBConnection_1.DBConnection.documentStore(connection)
                 .collection(new Notification_1.Notification().__table)
                 .updateOne({ _id: yield Notification_1.Notification.objectId(notificationId) }, {
                 $set: {
@@ -668,9 +656,9 @@ class NotificationServiceFacade {
             return result.matchedCount > 0;
         });
     }
-    markAsRead(notification) {
+    markAsRead(notificationRef) {
         return __awaiter(this, void 0, void 0, function* () {
-            notification = yield this.getNotification(notification);
+            const notification = yield this.getNotification(notificationRef);
             if (notification.read_status === "read" && notification.view_status === "viewed") {
                 return notification;
             }
@@ -690,9 +678,9 @@ class NotificationServiceFacade {
             return notification;
         });
     }
-    markAsViewed(notification) {
+    markAsViewed(notificationRef) {
         return __awaiter(this, void 0, void 0, function* () {
-            notification = yield this.getNotification(notification);
+            const notification = yield this.getNotification(notificationRef);
             if (notification.view_status === "viewed") {
                 return notification;
             }
@@ -711,8 +699,7 @@ class NotificationServiceFacade {
         return __awaiter(this, void 0, void 0, function* () {
             const connection = yield DBConnection_1.DBConnection.getConnection();
             const now = new Date();
-            yield connection.client
-                .db(null)
+            yield DBConnection_1.DBConnection.documentStore(connection)
                 .collection(new Notification_1.Notification().__table)
                 .updateMany(Object.assign(Object.assign({}, (yield this.getLoadMatch(context))), { $or: [{ read_status: "unread" }, { view_status: "unviewed" }] }), [
                 {
@@ -729,8 +716,7 @@ class NotificationServiceFacade {
     markAllAsViewed(context) {
         return __awaiter(this, void 0, void 0, function* () {
             const connection = yield DBConnection_1.DBConnection.getConnection();
-            yield connection.client
-                .db(null)
+            yield DBConnection_1.DBConnection.documentStore(connection)
                 .collection(new Notification_1.Notification().__table)
                 .updateMany(Object.assign(Object.assign({}, (yield this.getLoadMatch(context))), { view_status: "unviewed" }), {
                 $set: {
@@ -744,7 +730,7 @@ class NotificationServiceFacade {
         return __awaiter(this, void 0, void 0, function* () {
             const notificationId = notificationRef instanceof Notification_1.Notification ? notificationRef._id : notificationRef;
             const objectId = this.normalizeObjectId(notificationId);
-            if (!objectId)
+            if (objectId === null)
                 return null;
             const notifications = yield Notification_1.Notification.aggregate([
                 {
@@ -782,9 +768,9 @@ class NotificationServiceFacade {
             return yield this.countByStatus(context, { view_status: "unviewed" });
         });
     }
-    updateNotification(notification, updateData) {
+    updateNotification(notificationRef, updateData) {
         return __awaiter(this, void 0, void 0, function* () {
-            notification = yield this.getNotification(notification);
+            const notification = yield this.getNotification(notificationRef);
             if (updateData.payload) {
                 notification.payload = Object.assign(Object.assign({}, notification.payload), updateData.payload);
             }
@@ -807,10 +793,10 @@ class NotificationServiceFacade {
             return notification;
         });
     }
-    setChangingStatus(notification, status, error) {
+    setChangingStatus(notificationRef, status, error) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            notification = yield this.getNotification(notification);
+            const notification = yield this.getNotification(notificationRef);
             if (notification.mode !== "changing") {
                 throw new Error(`Notification '${(_a = notification._id) === null || _a === void 0 ? void 0 : _a.toString()}' is not in changing mode.`);
             }

package/dist/Notifications/NotificationsOutputChannelsJob.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotificationsOutputChannelsJob = void 0;
-const mongodb_1 = require("mongodb");
+const node_crypto_1 = require("node:crypto");
 const Config_1 = require("../Config");
 const DBConnection_1 = require("../Database/DBConnection");
 const BaseQueueJob_1 = require("../Queue/BaseQueueJob");
@@ -131,7 +131,7 @@ class NotificationsOutputChannelsJob extends BaseQueueJob_1.BaseQueueJob {
         return __awaiter(this, void 0, void 0, function* () {
             const now = new Date();
             const staleClaimBefore = new Date(now.getTime() - claimTimeoutMinutes * 60 * 1000);
-            const claimToken = new mongodb_1.ObjectId().toHexString();
+            const claimToken = (0, node_crypto_1.randomUUID)();
             const claimResult = yield collection.findOneAndUpdate({
                 key: { $ne: null },
                 show_at: { $lte: eligibleBefore },
@@ -164,11 +164,7 @@ class NotificationsOutputChannelsJob extends BaseQueueJob_1.BaseQueueJob {
                 sort: { show_at: 1, created_at: 1 },
                 returnDocument: "after",
             });
-            const notificationData = claimResult && claimResult._id
-                ? claimResult
-                : (claimResult === null || claimResult === void 0 ? void 0 : claimResult.value) && claimResult.value._id
-                    ? claimResult.value
-                    : null;
+            const notificationData = claimResult;
             if (!notificationData)
                 return null;
             return DBConnection_1.DBConnection.mapDataToModel(Notification_1.Notification, notificationData);
@@ -368,7 +364,7 @@ class NotificationsOutputChannelsJob extends BaseQueueJob_1.BaseQueueJob {
             const claimTimeoutMinutes = this.positiveNumber(deliveryConfig.claim_timeout_minutes, 30);
             const delaySeconds = this.nonNegativeNumber(deliveryConfig.delay_seconds, 0);
             const connection = yield DBConnection_1.DBConnection.getConnection();
-            const collection = connection.client.db(null).collection(new Notification_1.Notification().__table);
+            const collection = DBConnection_1.DBConnection.documentStore(connection).collection(new Notification_1.Notification().__table);
             const maxNotifications = this.attempts * this.perAttempt;
             const eligibleBefore = new Date(Date.now() - delaySeconds * 1000);
             yield this.skipViewedNotifications(collection, eligibleBefore, claimTimeoutMinutes);

package/dist/Queue/Queue.js

@@ -20,7 +20,7 @@ const QueueJobsRegisty_1 = require("./QueueJobsRegisty");
  * Uses the same queue_jobs records and BaseQueueJob handlers as console workers. */
 class Queue {
     static collection() {
-        return __awaiter(this, void 0, void 0, function* () { return (yield DBConnection_1.DBConnection.getConnection()).client.db(null).collection("queue_jobs"); });
+        return __awaiter(this, void 0, void 0, function* () { return (yield DBConnection_1.DBConnection.getDocumentStore()).collection("queue_jobs"); });
     }
     static enqueue(jobclass, props = {}) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -50,7 +50,7 @@ class Queue {
             yield jobs.updateMany({ status: "running", embedded_queue: true, lease_until: { $lt: now } }, { $set: { status: "pending", worker: null, recovered: true } });
             const token = crypto_1.default.randomUUID();
             const claimed = yield jobs.findOneAndUpdate({ status: "pending", jobclass: { $in: jobclasses }, $or: [{ not_before: null }, { not_before: { $lte: now } }] }, { $set: { status: "running", worker: this.worker, embedded_queue: true, lease_token: token, lease_until: new Date(Date.now() + 60000), started_at: now } }, { sort: { priority: -1, created_at: 1 }, returnDocument: "after" });
-            const job = (claimed === null || claimed === void 0 ? void 0 : claimed._id) ? claimed : claimed === null || claimed === void 0 ? void 0 : claimed.value;
+            const job = claimed;
             if (!job)
                 return;
             const filter = { _id: job._id, lease_token: token, status: "running" };

package/dist/Queue/QueueJob.d.ts

@@ -1,9 +1,9 @@
-import type { ObjectId } from "mongodb";
+import type { DatabaseId } from "../Database/DatabaseAdapter";
 import { Model } from "../Database/Model";
 import type { Notification } from "../Notifications/Notification";
 export declare class QueueJob extends Model {
     notification_queue_job?: boolean;
-    _notification?: ObjectId;
+    _notification?: DatabaseId;
     notification?: Notification;
     __table: string;
 }

package/dist/index.d.ts

@@ -19,6 +19,7 @@ export * from "./Router/Router";
 export * from "./Router/Request";
 export * from "./Router/Response";
 export * from "./Database/BaseDBDriver";
+export * from "./Database/DatabaseAdapter";
 export * from "./Database/DBDrivers";
 export * from "./Database/QueryBuilder";
 export * from "./Facades/StorageDrivers/BaseStorageDriver";

package/dist/index.js

@@ -35,6 +35,7 @@ __exportStar(require("./Router/Router"), exports);
 __exportStar(require("./Router/Request"), exports);
 __exportStar(require("./Router/Response"), exports);
 __exportStar(require("./Database/BaseDBDriver"), exports);
+__exportStar(require("./Database/DatabaseAdapter"), exports);
 __exportStar(require("./Database/DBDrivers"), exports);
 __exportStar(require("./Database/QueryBuilder"), exports);
 __exportStar(require("./Facades/StorageDrivers/BaseStorageDriver"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webtypen/webframez-core",
-    "version": "0.3.68",
+    "version": "0.3.69",
     "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
     "homepage": "https://webtypen.de/",
     "license": "MIT",
@@ -50,7 +50,6 @@
         "lodash": "^4.17.20",
         "mime-types": "^2.1.35",
         "moment-timezone": "^0.6.0",
-        "mongodb": "^6.21.0",
         "qs": "^6.11.0",
         "querystring": "^0.2.1"
     }