@abyss-project/monitor 1.0.57 → 1.0.59

package/dist/frameworks/express/decorators.d.ts

@@ -49,4 +49,5 @@ export declare function Middlewares(middlewares: Middleware[]): any;
 export declare function Body(schema: Joi.Schema, options?: ValidationOptions): any;
 export declare function Params(schema: Joi.Schema, options?: ValidationOptions): any;
 export declare function Query(schema: Joi.Schema, options?: ValidationOptions): any;
+export declare function Killable(): any;
 export {};

package/dist/frameworks/express/decorators.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Query = exports.Params = exports.Body = exports.Middlewares = exports.Middleware = exports.Controller = exports.Patch = exports.Delete = exports.Put = exports.Post = exports.Get = void 0;
+exports.Killable = exports.Query = exports.Params = exports.Body = exports.Middlewares = exports.Middleware = exports.Controller = exports.Patch = exports.Delete = exports.Put = exports.Post = exports.Get = void 0;
 const types_1 = require("../../types");
 const _1 = require(".");
 const joi_to_swagger_1 = __importDefault(require("joi-to-swagger"));
@@ -161,3 +161,9 @@ function Query(schema, options) {
     };
 }
 exports.Query = Query;
+function Killable() {
+    return function (target, propertyKey, descriptor) {
+        Reflect.defineMetadata(_1.KILLABLE_WATERMARK, true, target, propertyKey);
+    };
+}
+exports.Killable = Killable;

package/dist/frameworks/express/metadata.d.ts

@@ -7,3 +7,4 @@ export declare const ROUTE_WATERMARK = "__route__";
 export declare const DOCS_WATERMARK = "__docs__";
 export declare const MIDDLEWARE_WATERMARK = "__middleware__";
 export declare const MIDDLEWARE_HOOK_WATERMARK = "__middleware_hook__";
+export declare const KILLABLE_WATERMARK = "__killable__";

package/dist/frameworks/express/metadata.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MIDDLEWARE_HOOK_WATERMARK = exports.MIDDLEWARE_WATERMARK = exports.DOCS_WATERMARK = exports.ROUTE_WATERMARK = exports.OPTIONS_WATERMARK = exports.METHOD_WATERMARK = exports.PATH_WATERMARK = exports.MASKED_WATERMARK = exports.CONTROLLER_WATERMARK = void 0;
+exports.KILLABLE_WATERMARK = exports.MIDDLEWARE_HOOK_WATERMARK = exports.MIDDLEWARE_WATERMARK = exports.DOCS_WATERMARK = exports.ROUTE_WATERMARK = exports.OPTIONS_WATERMARK = exports.METHOD_WATERMARK = exports.PATH_WATERMARK = exports.MASKED_WATERMARK = exports.CONTROLLER_WATERMARK = void 0;
 exports.CONTROLLER_WATERMARK = '__controller__';
 exports.MASKED_WATERMARK = '__masked__';
 exports.PATH_WATERMARK = '__path__';
@@ -10,3 +10,4 @@ exports.ROUTE_WATERMARK = '__route__';
 exports.DOCS_WATERMARK = '__docs__';
 exports.MIDDLEWARE_WATERMARK = '__middleware__';
 exports.MIDDLEWARE_HOOK_WATERMARK = '__middleware_hook__';
+exports.KILLABLE_WATERMARK = '__killable__';

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

@@ -1,3 +1,8 @@
 import { Request, Response, NextFunction } from 'express-serve-static-core';
 import { Logger } from '../models/logger.model';
-export declare const createRequestTrackerMiddleware: (logger?: Logger) => (req: Request, res: Response, next: NextFunction) => void;
+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;

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

@@ -3,8 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRequestTrackerMiddleware = void 0;
 const request_tracker_utils_1 = require("../utils/request-tracker.utils");
 const graceful_shutdown_types_1 = require("../types/graceful-shutdown.types");
-const createRequestTrackerMiddleware = (logger) => {
+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);
+        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({
                 errorCode: graceful_shutdown_types_1.GracefulShutdownErrorCode.SERVICE_UNAVAILABLE,
@@ -12,13 +16,13 @@ const createRequestTrackerMiddleware = (logger) => {
             });
             return;
         }
-        (0, request_tracker_utils_1.incrementActiveRequests)();
+        (0, request_tracker_utils_1.incrementActiveRequests)(requestIsKillable);
         let cleaned = false;
         const cleanup = () => {
             if (cleaned)
                 return;
             cleaned = true;
-            (0, request_tracker_utils_1.decrementActiveRequests)();
+            (0, request_tracker_utils_1.decrementActiveRequests)(requestIsKillable);
         };
         res.on('finish', cleanup);
         res.on('close', cleanup);

package/dist/utils/graceful-shutdown.utils.js

@@ -29,9 +29,13 @@ const setupGracefulShutdown = (config) => {
             return;
         }
         (0, request_tracker_utils_1.setIsShuttingDown)(true);
+        const totalRequests = (0, request_tracker_utils_1.getTotalRequestsCount)();
+        const killableRequests = (0, request_tracker_utils_1.getKillableRequestsCount)();
         logger.log(`Received ${signal}, starting graceful shutdown...`, {
             data: {
                 activeRequests: (0, request_tracker_utils_1.getActiveRequestsCount)(),
+                killableRequests,
+                totalRequests,
             },
         });
         const forceShutdownTimer = setTimeout(() => {

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

@@ -0,0 +1,3 @@
+import 'reflect-metadata';
+import { Request } from 'express-serve-static-core';
+export declare const isRouteKillable: (req: Request) => boolean;

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

@@ -0,0 +1,26 @@
+"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;
+};
+exports.isRouteKillable = isRouteKillable;

package/dist/utils/request-tracker.utils.d.ts

@@ -1,7 +1,9 @@
 import { Logger } from '../models/logger.model';
 export declare const getActiveRequestsCount: () => number;
+export declare const getKillableRequestsCount: () => number;
+export declare const getTotalRequestsCount: () => number;
 export declare const getIsShuttingDown: () => boolean;
 export declare const setIsShuttingDown: (value: boolean) => void;
-export declare const incrementActiveRequests: () => void;
-export declare const decrementActiveRequests: () => void;
+export declare const incrementActiveRequests: (isKillable?: boolean) => void;
+export declare const decrementActiveRequests: (isKillable?: boolean) => void;
 export declare const waitForActiveRequests: (timeout?: number, checkInterval?: number, logger?: Logger) => Promise<void>;

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

@@ -1,23 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.waitForActiveRequests = exports.decrementActiveRequests = exports.incrementActiveRequests = exports.setIsShuttingDown = exports.getIsShuttingDown = exports.getActiveRequestsCount = void 0;
+exports.waitForActiveRequests = exports.decrementActiveRequests = exports.incrementActiveRequests = exports.setIsShuttingDown = exports.getIsShuttingDown = exports.getTotalRequestsCount = exports.getKillableRequestsCount = exports.getActiveRequestsCount = void 0;
 const graceful_shutdown_types_1 = require("../types/graceful-shutdown.types");
 let activeRequests = 0;
+let killableRequests = 0;
 let isShuttingDown = false;
 const getActiveRequestsCount = () => activeRequests;
 exports.getActiveRequestsCount = getActiveRequestsCount;
+const getKillableRequestsCount = () => killableRequests;
+exports.getKillableRequestsCount = getKillableRequestsCount;
+const getTotalRequestsCount = () => activeRequests + killableRequests;
+exports.getTotalRequestsCount = getTotalRequestsCount;
 const getIsShuttingDown = () => isShuttingDown;
 exports.getIsShuttingDown = getIsShuttingDown;
 const setIsShuttingDown = (value) => {
     isShuttingDown = value;
 };
 exports.setIsShuttingDown = setIsShuttingDown;
-const incrementActiveRequests = () => {
-    activeRequests++;
+const incrementActiveRequests = (isKillable = false) => {
+    if (isKillable) {
+        killableRequests++;
+    }
+    else {
+        activeRequests++;
+    }
 };
 exports.incrementActiveRequests = incrementActiveRequests;
-const decrementActiveRequests = () => {
-    activeRequests--;
+const decrementActiveRequests = (isKillable = false) => {
+    if (isKillable) {
+        killableRequests--;
+    }
+    else {
+        activeRequests--;
+    }
 };
 exports.decrementActiveRequests = decrementActiveRequests;
 const waitForActiveRequests = async (timeout = 30000, checkInterval = 100, logger) => {

package/package.json

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