@abyss-project/monitor 1.0.59 → 1.0.61

package/dist/frameworks/express/decorators.js

@@ -90,8 +90,7 @@ exports.Middleware = Middleware;
 function Middlewares(middlewares) {
     return function (target, propertyKey) {
         const existingMiddlewares = Reflect.getMetadata(_1.MIDDLEWARE_HOOK_WATERMARK, target) || [];
-        Reflect.defineMetadata(_1.MIDDLEWARE_HOOK_WATERMARK, [...existingMiddlewares, ...((middlewares === null || middlewares === void 0 ? void 0 : middlewares.map((middleware) => middleware.name)) || [])] ||
-            existingMiddlewares, target, propertyKey);
+        Reflect.defineMetadata(_1.MIDDLEWARE_HOOK_WATERMARK, [...existingMiddlewares, ...((middlewares === null || middlewares === void 0 ? void 0 : middlewares.map((middleware) => middleware.name)) || [])], target, propertyKey);
     };
 }
 exports.Middlewares = Middlewares;

package/dist/frameworks/express/index.js

@@ -110,27 +110,27 @@ const controllerLoader = async (app, options) => {
                     case types_1.APIMethod.DELETE:
                         routerToUse.delete(path, ...(routeOptions.shouldSkipController
                             ? []
-                            : middlewaresToUseOnController.map((middleware) => middleware.run)), setLocalsMiddleware(controller, options, fullPath, null), ...middlewaresToUseOnRoute.map((middleware) => middleware.run), instance[method]);
+                            : middlewaresToUseOnController.map((middleware) => middleware.run)), setLocalsMiddleware(controller, options, fullPath, null, undefined, method), ...middlewaresToUseOnRoute.map((middleware) => middleware.run), instance[method]);
                         break;
                     case types_1.APIMethod.GET:
                         routerToUse.get(path, ...(routeOptions.shouldSkipController
                             ? []
-                            : middlewaresToUseOnController.map((middleware) => middleware.run)), setLocalsMiddleware(controller, options, fullPath, null), ...middlewaresToUseOnRoute.map((middleware) => middleware.run), instance[method]);
+                            : middlewaresToUseOnController.map((middleware) => middleware.run)), setLocalsMiddleware(controller, options, fullPath, null, undefined, method), ...middlewaresToUseOnRoute.map((middleware) => middleware.run), instance[method]);
                         break;
                     case types_1.APIMethod.POST:
                         routerToUse.post(path, ...(routeOptions.shouldSkipController
                             ? []
-                            : middlewaresToUseOnController.map((middleware) => middleware.run)), setLocalsMiddleware(controller, options, fullPath, null), ...middlewaresToUseOnRoute.map((middleware) => middleware.run), instance[method]);
+                            : middlewaresToUseOnController.map((middleware) => middleware.run)), setLocalsMiddleware(controller, options, fullPath, null, undefined, method), ...middlewaresToUseOnRoute.map((middleware) => middleware.run), instance[method]);
                         break;
                     case types_1.APIMethod.PUT:
                         routerToUse.put(path, ...(routeOptions.shouldSkipController
                             ? []
-                            : middlewaresToUseOnController.map((middleware) => middleware.run)), setLocalsMiddleware(controller, options, fullPath, null), ...middlewaresToUseOnRoute.map((middleware) => middleware.run), instance[method]);
+                            : middlewaresToUseOnController.map((middleware) => middleware.run)), setLocalsMiddleware(controller, options, fullPath, null, undefined, method), ...middlewaresToUseOnRoute.map((middleware) => middleware.run), instance[method]);
                         break;
                     case types_1.APIMethod.PATCH:
                         routerToUse.patch(path, ...(routeOptions.shouldSkipController
                             ? []
-                            : middlewaresToUseOnController.map((middleware) => middleware.run)), setLocalsMiddleware(controller, options, fullPath, null), ...middlewaresToUseOnRoute.map((middleware) => middleware.run), instance[method]);
+                            : middlewaresToUseOnController.map((middleware) => middleware.run)), setLocalsMiddleware(controller, options, fullPath, null, undefined, method), ...middlewaresToUseOnRoute.map((middleware) => middleware.run), instance[method]);
                         break;
                     default:
                         console.error(`Method ${apiMethod} on route ${path} of controller ${controller} do not exist`);
@@ -166,8 +166,12 @@ const isRoute = (target, propertyKey) => {
         return false;
     }
 };
-const setLocalsMiddleware = (controller, options = { prefix: '/' }, controllerPrefix, path) => (req, res, next) => {
+const setLocalsMiddleware = (controller, options = { prefix: '/' }, controllerPrefix, path, method, propertyKey) => (req, res, next) => {
     res.locals.controller = controller.name;
     res.locals.path = `${options.prefix}${controllerPrefix}${path !== null ? path || req.path : ''}`;
+    if (propertyKey) {
+        const isKillable = Reflect.getMetadata(metadata_1.KILLABLE_WATERMARK, controller.prototype, propertyKey);
+        res.locals.isKillable = !!isKillable;
+    }
     next();
 };

package/dist/middlewares/request-tracker.middleware.d.ts

@@ -1,8 +1,9 @@
 import { Request, Response, NextFunction } from 'express-serve-static-core';
 import { Logger } from '../models/logger.model';
+import { IMonitorLocals } from '../types';
 export type IsKillableFn = (req: Request) => boolean;
 export interface RequestTrackerOptions {
     logger?: Logger;
     isKillable?: IsKillableFn;
 }
-export declare const createRequestTrackerMiddleware: (options?: RequestTrackerOptions) => (req: Request, res: Response, next: NextFunction) => void;
+export declare const createRequestTrackerMiddleware: (options?: RequestTrackerOptions) => (req: Request, res: Response<unknown, IMonitorLocals>, next: NextFunction) => void;

package/dist/middlewares/request-tracker.middleware.js

@@ -7,7 +7,7 @@ const killable_route_utils_1 = require("../utils/killable-route.utils");
 const createRequestTrackerMiddleware = (options) => {
     const { logger, isKillable } = options || {};
     return (req, res, next) => {
-        const requestIsKillable = isKillable ? isKillable(req) : (0, killable_route_utils_1.isRouteKillable)(req);
+        const requestIsKillable = isKillable ? isKillable(req) : (0, killable_route_utils_1.isRouteKillable)(res);
         logger === null || logger === void 0 ? void 0 : logger.info(`Incoming request ${req.method} ${req.url} killable: ${requestIsKillable}`);
         if ((0, request_tracker_utils_1.getIsShuttingDown)()) {
             res.status(503).json({

package/dist/types/index.d.ts

@@ -16,4 +16,5 @@ export type IMonitorLocals = {
     path?: string;
     error?: any;
     timer: IMonitorTimerLocals;
+    isKillable?: boolean;
 };

package/dist/utils/killable-route.utils.d.ts

@@ -1,3 +1,3 @@
-import 'reflect-metadata';
-import { Request } from 'express-serve-static-core';
-export declare const isRouteKillable: (req: Request) => boolean;
+import { Response } from 'express-serve-static-core';
+import { IMonitorLocals } from '../types';
+export declare const isRouteKillable: (res: Response<unknown, IMonitorLocals>) => boolean;

package/dist/utils/killable-route.utils.js

@@ -1,26 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isRouteKillable = void 0;
-require("reflect-metadata");
-const metadata_1 = require("../frameworks/express/metadata");
-const isRouteKillable = (req) => {
-    const route = req.route;
-    if (!route || !route.stack || route.stack.length === 0) {
-        return false;
-    }
-    for (const layer of route.stack) {
-        const handler = layer.handle;
-        if (!handler)
-            continue;
-        const prototype = Object.getPrototypeOf(handler);
-        if (prototype && prototype.constructor) {
-            const propertyKey = handler.name;
-            const isKillable = Reflect.getMetadata(metadata_1.KILLABLE_WATERMARK, prototype.constructor.prototype, propertyKey);
-            if (isKillable) {
-                return true;
-            }
-        }
-    }
-    return false;
+const isRouteKillable = (res) => {
+    return res.locals.isKillable === true;
 };
 exports.isRouteKillable = isRouteKillable;

package/dist/utils/request-tracker.utils.js

@@ -37,8 +37,10 @@ const decrementActiveRequests = (isKillable = false) => {
 exports.decrementActiveRequests = decrementActiveRequests;
 const waitForActiveRequests = async (timeout = 30000, checkInterval = 100, logger) => {
     const startTime = Date.now();
+    let checkCount = 0;
     return new Promise((resolve, reject) => {
         const check = () => {
+            checkCount++;
             if (activeRequests === 0) {
                 logger === null || logger === void 0 ? void 0 : logger.log('All active requests completed');
                 resolve();
@@ -56,12 +58,14 @@ const waitForActiveRequests = async (timeout = 30000, checkInterval = 100, logge
                 reject(new Error(errorMessage));
                 return;
             }
-            logger === null || logger === void 0 ? void 0 : logger.debug(`Waiting for ${activeRequests} active requests to complete...`, {
-                data: {
-                    activeRequests,
-                    elapsedMs: Date.now() - startTime,
-                },
-            });
+            if (checkCount % 10 === 0) {
+                logger === null || logger === void 0 ? void 0 : logger.debug(`Waiting for ${activeRequests} active requests to complete...`, {
+                    data: {
+                        activeRequests,
+                        elapsedMs: Date.now() - startTime,
+                    },
+                });
+            }
             setTimeout(check, checkInterval);
         };
         check();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abyss-project/monitor",
-  "version": "1.0.59",
+  "version": "1.0.61",
   "description": "Core package to interact with Abyss-Monitor",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",