@webtypen/webframez-core 0.3.62 → 0.3.64

package/dist/Notifications/NotificationService.d.ts

@@ -123,6 +123,8 @@ declare class NotificationServiceFacade {
     set registy(registry: {
         [key: string]: NotificationDefinition;
     });
+    private getObjectIdString;
+    private normalizeObjectId;
     private getNotificationReferenceId;
     init(): void;
     registerType(type: NotificationDefinition): this;

package/dist/Notifications/NotificationService.js

@@ -56,16 +56,23 @@ class NotificationServiceFacade {
     set registy(registry) {
         this.registry = registry;
     }
-    getNotificationReferenceId(notificationRef) {
-        const notificationId = typeof notificationRef === "string"
-            ? notificationRef
-            : notificationRef && typeof notificationRef.toString === "function"
-                ? notificationRef.toString()
+    getObjectIdString(value) {
+        const objectIdString = typeof value === "string"
+            ? value
+            : value && typeof value.toString === "function"
+                ? value.toString()
                 : null;
-        return notificationId && notificationId.length === 24 && mongodb_1.ObjectId.isValid(notificationId)
-            ? notificationId
+        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;
+    }
+    getNotificationReferenceId(notificationRef) {
+        return this.getObjectIdString(notificationRef);
+    }
     init() {
         this.registry = {};
         this.notificationsConfig = Config_1.Config.get("notifications") || {};
@@ -168,14 +175,11 @@ class NotificationServiceFacade {
         return this.targetRegistry[target] || null;
     }
     normalizeTargetId(targetId) {
-        var _a;
-        if (targetId instanceof mongodb_1.ObjectId)
-            return targetId;
-        const value = typeof targetId === "string" ? targetId : (_a = targetId === null || targetId === void 0 ? void 0 : targetId.toString) === null || _a === void 0 ? void 0 : _a.call(targetId);
-        if (typeof value !== "string" || value.length !== 24 || !mongodb_1.ObjectId.isValid(value)) {
+        const normalized = this.normalizeObjectId(targetId);
+        if (!normalized) {
             throw new NotificationTargetValidationError("Invalid notification target_id.");
         }
-        return new mongodb_1.ObjectId(value);
+        return normalized;
     }
     normalizeTargetContext(context) {
         if (!context || typeof context.target !== "string" || context.target.trim() === "") {
@@ -243,15 +247,8 @@ class NotificationServiceFacade {
         return notification;
     }
     getModelId(model) {
-        var _a, _b;
-        const value = (_a = model === null || model === void 0 ? void 0 : model._id) !== null && _a !== void 0 ? _a : model === null || model === void 0 ? void 0 : model.id;
-        if (value instanceof mongodb_1.ObjectId)
-            return value;
-        const stringValue = typeof value === "string" ? value : (_b = value === null || value === void 0 ? void 0 : value.toString) === null || _b === void 0 ? void 0 : _b.call(value);
-        if (typeof stringValue === "string" && stringValue.length === 24 && mongodb_1.ObjectId.isValid(stringValue)) {
-            return new mongodb_1.ObjectId(stringValue);
-        }
-        return null;
+        var _a;
+        return this.normalizeObjectId((_a = model === null || model === void 0 ? void 0 : model._id) !== null && _a !== void 0 ? _a : model === null || model === void 0 ? void 0 : model.id);
     }
     getPreferencesField(target) {
         var _a;
@@ -746,18 +743,9 @@ class NotificationServiceFacade {
     getNotificationForTarget(notificationRef, context) {
         return __awaiter(this, void 0, void 0, function* () {
             const notificationId = notificationRef instanceof Notification_1.Notification ? notificationRef._id : notificationRef;
-            if (!notificationId)
+            const objectId = this.normalizeObjectId(notificationId);
+            if (!objectId)
                 return null;
-            let objectId;
-            if (notificationId instanceof mongodb_1.ObjectId) {
-                objectId = notificationId;
-            }
-            else if (typeof notificationId === "string" && mongodb_1.ObjectId.isValid(notificationId)) {
-                objectId = new mongodb_1.ObjectId(notificationId);
-            }
-            else {
-                return null;
-            }
             const notifications = yield Notification_1.Notification.aggregate([
                 {
                     $match: Object.assign(Object.assign({}, (yield this.getLoadMatch(context))), { _id: objectId }),

package/dist/Notifications/NotificationsOutputChannelsJob.js

@@ -219,9 +219,6 @@ class NotificationsOutputChannelsJob extends BaseQueueJob_1.BaseQueueJob {
                     target: notification.target,
                     target_id: notification.target_id,
                 });
-                if (targetContext === null || targetContext === void 0 ? void 0 : targetContext.targetModel) {
-                    NotificationService_1.NotificationService.attachTargetModel(notification, targetContext.targetModel);
-                }
                 if (targetContext) {
                     const loadedNotification = yield NotificationService_1.NotificationService.getNotificationForTarget(notification._id, targetContext);
                     if (!loadedNotification) {
@@ -229,6 +226,9 @@ class NotificationsOutputChannelsJob extends BaseQueueJob_1.BaseQueueJob {
                     }
                     notification = loadedNotification;
                 }
+                if (targetContext === null || targetContext === void 0 ? void 0 : targetContext.targetModel) {
+                    NotificationService_1.NotificationService.attachTargetModel(notification, targetContext.targetModel);
+                }
                 effectivePreference = targetContext
                     ? yield NotificationService_1.NotificationService.getEffectiveTargetPreference(notType.key, targetContext)
                     : { enabled: false, output_channels: [], owner_exists: false };

package/dist/Router/Router.d.ts

@@ -134,6 +134,12 @@ declare class RouterFacade {
         };
     } | undefined>;
     handleMiddleware(route: RouteObject, request: Request, response: Response): Promise<void>;
+    /**
+     * Runs registered kernel middleware outside a regular route definition.
+     * Package-provided multiplexing endpoints can use this while preserving
+     * the router's existing next/reject behavior.
+     */
+    runMiddleware(middlewareKeys: string[], request: Request, response: Response): Promise<void>;
     mapRequest(req: null | IncomingMessage, options?: any): Promise<Request>;
     parseRequestBody(req: IncomingMessage): Promise<unknown>;
     handleReturn(request: Request, response: Response, body: any): {

package/dist/Router/Router.js

@@ -676,6 +676,20 @@ class RouterFacade {
             }
         });
     }
+    /**
+     * Runs registered kernel middleware outside a regular route definition.
+     * Package-provided multiplexing endpoints can use this while preserving
+     * the router's existing next/reject behavior.
+     */
+    runMiddleware(middlewareKeys, request, response) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const middleware = Array.from(new Set((middlewareKeys || []).filter((key) => typeof key === "string" && key.trim() !== "")));
+            yield this.handleMiddleware({
+                path: request.pathname || request.url || "",
+                options: { middleware },
+            }, request, response);
+        });
+    }
     mapRequest(req, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const request = new Request_1.Request();

package/dist/index.d.ts

@@ -15,6 +15,7 @@ export * from "./BuildApplication";
 export * from "./LambdaApplication";
 export * from "./WebApplication";
 export * from "./Router/Route";
+export * from "./Router/Router";
 export * from "./Router/Request";
 export * from "./Router/Response";
 export * from "./Database/BaseDBDriver";

package/dist/index.js

@@ -31,6 +31,7 @@ __exportStar(require("./BuildApplication"), exports);
 __exportStar(require("./LambdaApplication"), exports);
 __exportStar(require("./WebApplication"), exports);
 __exportStar(require("./Router/Route"), exports);
+__exportStar(require("./Router/Router"), exports);
 __exportStar(require("./Router/Request"), exports);
 __exportStar(require("./Router/Response"), exports);
 __exportStar(require("./Database/BaseDBDriver"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webtypen/webframez-core",
-    "version": "0.3.62",
+    "version": "0.3.64",
     "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
     "homepage": "https://webtypen.de/",
     "license": "MIT",