@nsshunt/stsappframework 3.0.72 → 3.0.73

package/dist/middleware/serverNetworkMiddleware.js

@@ -0,0 +1,123 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ServerNetworkMiddleware = exports.ServerNetworkMiddlewareEventName = void 0;
+const tiny_emitter_1 = require("tiny-emitter");
+const debug_1 = __importDefault(require("debug"));
+const stsutils_1 = require("@nsshunt/stsutils");
+const debug = (0, debug_1.default)(`proc:${process.pid}`);
+var ServerNetworkMiddlewareEventName;
+(function (ServerNetworkMiddlewareEventName) {
+    ServerNetworkMiddlewareEventName["UpdateInstrument_SERVER_NET_VAL"] = "UpdateInstrument_SERVER_NET_VAL"; // request net stats
+})(ServerNetworkMiddlewareEventName || (exports.ServerNetworkMiddlewareEventName = ServerNetworkMiddlewareEventName = {}));
+class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
+    #tinyEmitter = new tiny_emitter_1.TinyEmitter();
+    #socketCollection = {};
+    #id = 0;
+    #debug;
+    constructor(options) {
+        super(options);
+        if (options.outputDebug) {
+            this.#debug = debug;
+        }
+        else {
+            this.#debug = () => { };
+        }
+    }
+    on(eventName, callBackFn) {
+        this.#tinyEmitter.on(eventName, callBackFn);
+    }
+    GetSocketRecord = (socket) => {
+        for (const [, socketRecord] of Object.entries(this.#socketCollection)) {
+            if (socketRecord.socket === socket) {
+                return socketRecord;
+            }
+        }
+        return null;
+    };
+    UpdateNetworkStats = (workingSocketRecord, eventName, req) => {
+        workingSocketRecord.originalUrl = req.originalUrl;
+        workingSocketRecord.eventName = eventName;
+        workingSocketRecord.currentBytesRead = req.socket.bytesRead;
+        workingSocketRecord.currentBytesWritten = req.socket.bytesWritten;
+        workingSocketRecord.requestBytesRead = workingSocketRecord.currentBytesRead - workingSocketRecord.lastBytesRead;
+        workingSocketRecord.requestBytesWritten = workingSocketRecord.currentBytesWritten - workingSocketRecord.lastBytesWritten;
+        //this.#debug(`totalBytesRead: [${workingSocketRecord.id}] [${workingSocketRecord.originalUrl}] [${eventName}] [${workingSocketRecord.requestBytesRead}]`.grey);
+        //this.#debug(`totalBytesWritten: [${workingSocketRecord.id}] [${workingSocketRecord.originalUrl}] [${eventName}] [${workingSocketRecord.requestBytesWritten}]`.grey);
+        const workingSocketEventRecord = { ...workingSocketRecord };
+        delete workingSocketEventRecord.socket;
+        this.#debug(`Sending event: [${JSON.stringify(workingSocketEventRecord)}]`.grey);
+        this.#tinyEmitter.emit(ServerNetworkMiddlewareEventName.UpdateInstrument_SERVER_NET_VAL, workingSocketEventRecord);
+        workingSocketRecord.lastBytesRead = workingSocketRecord.currentBytesRead;
+        workingSocketRecord.lastBytesWritten = workingSocketRecord.currentBytesWritten;
+    };
+    Middleware = (req, res, next) => {
+        let workingSocketRecord = null;
+        workingSocketRecord = this.GetSocketRecord(req.socket);
+        if (!workingSocketRecord) {
+            this.#id++;
+            workingSocketRecord = {
+                id: `${this.options.name}_${this.#id.toString()}`,
+                socket: req.socket,
+                currentBytesRead: 0,
+                currentBytesWritten: 0,
+                lastBytesRead: 0,
+                lastBytesWritten: 0,
+                requestBytesRead: 0,
+                requestBytesWritten: 0,
+                originalUrl: req.originalUrl,
+                eventName: '',
+            };
+            this.#socketCollection[workingSocketRecord.id] = workingSocketRecord;
+            this.#debug(`Adding new socket to recordset: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray);
+            workingSocketRecord.socket.on('close', () => {
+                workingSocketRecord = this.GetSocketRecord(workingSocketRecord.socket);
+                if (workingSocketRecord) {
+                    this.#debug(`Socket close event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray);
+                    this.UpdateNetworkStats(workingSocketRecord, 'socket_close', req);
+                    delete this.#socketCollection[workingSocketRecord.id];
+                    this.#debug(`Socket removed from recordset: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray);
+                }
+                else {
+                    this.#debug(`Socket close event: Could not find socket within recordset`.magenta);
+                }
+            });
+            workingSocketRecord.socket.on('end', () => {
+                workingSocketRecord = this.GetSocketRecord(workingSocketRecord.socket);
+                if (workingSocketRecord) {
+                    this.#debug(`Socket end event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray);
+                    this.UpdateNetworkStats(workingSocketRecord, 'socket_end', req);
+                }
+                else {
+                    this.#debug(`Socket end event: Could not find socket within recordset`.magenta);
+                }
+            });
+            req.on('end', () => {
+                workingSocketRecord = this.GetSocketRecord(req.socket);
+                if (workingSocketRecord) {
+                    this.#debug(`Request end event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray);
+                    this.UpdateNetworkStats(workingSocketRecord, 'req_end', req);
+                }
+                else {
+                    this.#debug(`Request end event: Could not find socket within recordset`.magenta);
+                }
+            });
+            req.on('close', () => {
+                workingSocketRecord = this.GetSocketRecord(req.socket);
+                if (workingSocketRecord) {
+                    this.#debug(`Request close event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray);
+                    this.UpdateNetworkStats(workingSocketRecord, 'req_close', req);
+                }
+                else {
+                    this.#debug(`Request close event: Could not find socket within recordset`.magenta);
+                }
+            });
+        }
+        this.UpdateNetworkStats(workingSocketRecord, 'middleware', req);
+        next();
+    };
+}
+exports.ServerNetworkMiddleware = ServerNetworkMiddleware;
+//# sourceMappingURL=serverNetworkMiddleware.js.map

package/dist/middleware/serverNetworkMiddleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serverNetworkMiddleware.js","sourceRoot":"","sources":["../../src/middleware/serverNetworkMiddleware.ts"],"names":[],"mappings":"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"}

package/dist/server.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.STSExpressServer = void 0;
-/* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
+/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
 const express_1 = __importDefault(require("express"));
 const cors_1 = __importDefault(require("cors"));
 const cookie_parser_1 = __importDefault(require("cookie-parser"));
@@ -12,15 +12,21 @@ const stspublisherserver_1 = require("@nsshunt/stspublisherserver");
 const stsconfig_1 = require("@nsshunt/stsconfig");
 const goptions = (0, stsconfig_1.$Options)();
 const stsinstrumentation_1 = require("@nsshunt/stsinstrumentation");
+const serverNetworkMiddleware_1 = require("./middleware/serverNetworkMiddleware");
 class STSExpressServer {
     #app;
-    #totalBytesRead = 0;
-    #totalBytesWritten = 0;
     constructor(options, stsApp) {
         // Standard RequestLoggerMiddleware for all STS services
         const requestLoggerMiddleware = new stspublisherserver_1.RequestLoggerMiddleware({
             ignoresocketio: goptions.ignoresocketio
         });
+        const serverNetworkMiddleware = new serverNetworkMiddleware_1.ServerNetworkMiddleware({
+            name: stsApp.options.serviceName,
+            outputDebug: false
+        });
+        serverNetworkMiddleware.on(serverNetworkMiddleware_1.ServerNetworkMiddlewareEventName.UpdateInstrument_SERVER_NET_VAL, (data) => {
+            console.log(`serverNetworkMiddleware: [${JSON.stringify(data)}]`.magenta);
+        });
         requestLoggerMiddleware.on(stspublisherserver_1.RequestLoggerMiddlewareEventName.UpdateInstrument_AR_INC, () => {
             stsApp.UpdateInstrument(stsinstrumentation_1.Gauge.ACTIVE_REQUEST_GAUGE, {
                 Inc: 1
@@ -53,31 +59,6 @@ class STSExpressServer {
                 });
             }
         });
-        requestLoggerMiddleware.on(stspublisherserver_1.RequestLoggerMiddlewareEventName.UpdateInstrument_NET_VAL, (stats) => {
-            const requestStats = stats;
-            console.log(`requestStats: [${JSON.stringify(requestStats)}]`.yellow);
-            /*
-            stsApp.UpdateInstrument(Gauge.DURATION_GAUGE, {
-                val: timeInMs
-            } as InstrumentHistogramTelemetry);
-            */
-        });
-        requestLoggerMiddleware.on(stspublisherserver_1.RequestLoggerMiddlewareEventName.UpdateInstrument_RX_VAL, (bytesRead) => {
-            console.log(`bytesRead: [${bytesRead}]`.magenta);
-            /*
-            stsApp.UpdateInstrument(Gauge.DURATION_GAUGE, {
-                val: timeInMs
-            } as InstrumentHistogramTelemetry);
-            */
-        });
-        requestLoggerMiddleware.on(stspublisherserver_1.RequestLoggerMiddlewareEventName.UpdateInstrument_TX_VAL, (bytesWritten) => {
-            console.log(`bytesWritten: [${bytesWritten}]`.cyan);
-            /*
-            stsApp.UpdateInstrument(Gauge.DURATION_GAUGE, {
-                val: timeInMs
-            } as InstrumentHistogramTelemetry);
-            */
-        });
         const app = (0, express_1.default)();
         this.#app = app;
         // https://stackoverflow.com/questions/19743396/cors-cannot-use-wildcard-in-access-control-allow-origin-when-credentials-flag-i
@@ -97,11 +78,7 @@ class STSExpressServer {
             options.expressServerRouteStaticFactory(app, stsApp);
         }
         app.use(requestLoggerMiddleware.Middleware.bind(requestLoggerMiddleware));
-        app.use(async (err, req, res, next) => {
-            this.#totalBytesRead += req.socket.bytesRead;
-            this.#totalBytesWritten += req.socket.bytesWritten;
-            next();
-        });
+        app.use(serverNetworkMiddleware.Middleware.bind(serverNetworkMiddleware));
         if (options.expressServerRouteFactory) {
             options.expressServerRouteFactory(app, stsApp);
         }

package/dist/server.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nsshunt/stsappframework",
-  "version": "3.0.72",
+  "version": "3.0.73",
   "description": "",
   "main": "dist/index.js",
   "types": "./types/index.d.ts",
@@ -51,7 +51,7 @@
     "@nsshunt/stsconfig": "^1.25.60",
     "@nsshunt/stsdatamanagement": "^1.17.130",
     "@nsshunt/stsinstrumentation": "^7.0.5",
-    "@nsshunt/stspublisherserver": "^2.0.32",
+    "@nsshunt/stspublisherserver": "^2.0.33",
     "@nsshunt/stssocketio-client": "^0.0.84",
     "@nsshunt/stsutils": "^1.16.15",
     "@socket.io/cluster-adapter": "^0.2.2",

package/src/middleware/serverNetworkMiddleware.ts

@@ -0,0 +1,155 @@
+/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */  // --> OFF
+import { Request, Response, NextFunction } from 'express'
+import { Socket } from 'node:net'
+import { TinyEmitter } from 'tiny-emitter';
+
+import debugModule from 'debug'
+import { STSOptionsBase } from '@nsshunt/stsutils';
+const debug = debugModule(`proc:${process.pid}`);
+
+export enum ServerNetworkMiddlewareEventName {
+    UpdateInstrument_SERVER_NET_VAL = 'UpdateInstrument_SERVER_NET_VAL' // request net stats
+}
+
+export interface ISocketRecord {
+    id: string
+    socket: Socket,
+    currentBytesRead: number
+    currentBytesWritten: number
+    lastBytesRead: number
+    lastBytesWritten: number
+    requestBytesRead: number
+    requestBytesWritten: number
+    originalUrl: string
+    eventName: string
+}
+
+export type ServerNetworkMiddlewareEventFunc = (data: ISocketRecord) => void;
+
+export interface IServerNetworkMiddleware {
+    name: string
+    outputDebug: boolean
+}
+
+export class ServerNetworkMiddleware extends STSOptionsBase
+{
+    #tinyEmitter: TinyEmitter = new TinyEmitter();
+    #socketCollection: Record<string, ISocketRecord> = { };
+    #id: number = 0;
+    #debug: any;
+
+    constructor(options: IServerNetworkMiddleware) {
+        super(options);
+        if (options.outputDebug) {
+            this.#debug = debug;
+        } else {
+            this.#debug = () => { };
+        }
+    }
+
+    on(eventName: ServerNetworkMiddlewareEventName, callBackFn: ServerNetworkMiddlewareEventFunc) {
+        this.#tinyEmitter.on(eventName, callBackFn);
+    }
+
+    GetSocketRecord = (socket: Socket): ISocketRecord | null => {
+        for (const [, socketRecord] of Object.entries(this.#socketCollection)) {
+            if (socketRecord.socket === socket) {
+                return socketRecord;
+            }
+        }
+        return null;
+    }
+
+    UpdateNetworkStats = (workingSocketRecord: ISocketRecord, eventName: string, req: Request) => {
+        workingSocketRecord.originalUrl = req.originalUrl;
+        workingSocketRecord.eventName = eventName;
+
+        workingSocketRecord.currentBytesRead = req.socket.bytesRead;
+        workingSocketRecord.currentBytesWritten = req.socket.bytesWritten;
+
+        workingSocketRecord.requestBytesRead = workingSocketRecord.currentBytesRead - workingSocketRecord.lastBytesRead;
+        workingSocketRecord.requestBytesWritten = workingSocketRecord.currentBytesWritten - workingSocketRecord.lastBytesWritten;
+
+        //this.#debug(`totalBytesRead: [${workingSocketRecord.id}] [${workingSocketRecord.originalUrl}] [${eventName}] [${workingSocketRecord.requestBytesRead}]`.grey);
+        //this.#debug(`totalBytesWritten: [${workingSocketRecord.id}] [${workingSocketRecord.originalUrl}] [${eventName}] [${workingSocketRecord.requestBytesWritten}]`.grey);
+
+        const workingSocketEventRecord = { ...workingSocketRecord };
+        delete (workingSocketEventRecord as any).socket;
+        this.#debug(`Sending event: [${JSON.stringify(workingSocketEventRecord)}]`.grey);
+        this.#tinyEmitter.emit(ServerNetworkMiddlewareEventName.UpdateInstrument_SERVER_NET_VAL, workingSocketEventRecord);
+
+        workingSocketRecord.lastBytesRead = workingSocketRecord.currentBytesRead;
+        workingSocketRecord.lastBytesWritten = workingSocketRecord.currentBytesWritten;
+    }
+
+    Middleware = (req: Request, res: Response, next: NextFunction) => {
+        let workingSocketRecord: ISocketRecord | null = null;
+        
+        workingSocketRecord = this.GetSocketRecord(req.socket);
+        if (!workingSocketRecord) {
+            this.#id++
+            workingSocketRecord = {
+                id: `${(this.options as IServerNetworkMiddleware).name}_${this.#id.toString()}`,
+                socket: req.socket,
+                currentBytesRead: 0,
+                currentBytesWritten: 0,
+                lastBytesRead: 0,
+                lastBytesWritten: 0,
+                requestBytesRead: 0,
+                requestBytesWritten: 0,
+                originalUrl: req.originalUrl,
+                eventName: '',
+            };
+
+            this.#socketCollection[workingSocketRecord.id] = workingSocketRecord;
+
+            this.#debug(`Adding new socket to recordset: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray)
+
+            workingSocketRecord.socket.on('close', () => {
+                workingSocketRecord = this.GetSocketRecord((workingSocketRecord as ISocketRecord).socket);
+                if (workingSocketRecord) {
+                    this.#debug(`Socket close event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray)
+                    this.UpdateNetworkStats(workingSocketRecord, 'socket_close', req);
+                    delete this.#socketCollection[workingSocketRecord.id];
+                    this.#debug(`Socket removed from recordset: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray)
+                } else {
+                    this.#debug(`Socket close event: Could not find socket within recordset`.magenta)
+                }
+            });
+
+            workingSocketRecord.socket.on('end', () => {
+                workingSocketRecord = this.GetSocketRecord((workingSocketRecord as ISocketRecord).socket);
+                if (workingSocketRecord) {
+                    this.#debug(`Socket end event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray)
+                    this.UpdateNetworkStats(workingSocketRecord, 'socket_end', req);
+                } else {
+                    this.#debug(`Socket end event: Could not find socket within recordset`.magenta)
+                }
+            });
+
+            req.on('end', () => {
+                workingSocketRecord = this.GetSocketRecord(req.socket);
+                if (workingSocketRecord) {
+                    this.#debug(`Request end event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray)
+                    this.UpdateNetworkStats(workingSocketRecord, 'req_end', req);
+                } else {
+                    this.#debug(`Request end event: Could not find socket within recordset`.magenta)
+                }
+            });
+
+            req.on('close', () => {
+                workingSocketRecord = this.GetSocketRecord(req.socket);
+                if (workingSocketRecord) {
+                    this.#debug(`Request close event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray)
+                    this.UpdateNetworkStats(workingSocketRecord, 'req_close', req);
+                } else {
+                    this.#debug(`Request close event: Could not find socket within recordset`.magenta)
+                }
+            });
+        }
+
+        this.UpdateNetworkStats(workingSocketRecord, 'middleware', req);
+
+        next();
+    }
+}

package/src/server.ts

@@ -1,10 +1,10 @@
-/* eslint @typescript-eslint/no-explicit-any: 0 */  // --> OFF
+/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */  // --> OFF
 import express, { Express, Request, Response, NextFunction } from 'express';
 
 import cors from 'cors';
 import cookieParser from 'cookie-parser';
 
-import { RequestLoggerMiddleware, RequestLoggerMiddlewareEventName, IRequestNetStats } from '@nsshunt/stspublisherserver'
+import { RequestLoggerMiddleware, RequestLoggerMiddlewareEventName } from '@nsshunt/stspublisherserver'
 
 import { ProcessOptions } from './processoptions'
 
@@ -14,12 +14,11 @@ const goptions = $Options()
 import { IProcessBase } from './commonTypes'
 import { Gauge, InstrumentGaugeTelemetry, InstrumentHistogramTelemetry, InstrumentVelocityTelemetry } from '@nsshunt/stsinstrumentation'
 
+import { ISocketRecord, ServerNetworkMiddleware, ServerNetworkMiddlewareEventName } from './middleware/serverNetworkMiddleware'
 
 export class STSExpressServer
 {
     #app: Express;
-    #totalBytesRead = 0;
-    #totalBytesWritten = 0;
 
     constructor(options: ProcessOptions, stsApp: IProcessBase)
     {
@@ -28,6 +27,15 @@ export class STSExpressServer
             ignoresocketio: goptions.ignoresocketio 
         });
 
+        const serverNetworkMiddleware = new ServerNetworkMiddleware({ 
+            name: (stsApp.options as ProcessOptions).serviceName,
+            outputDebug: false
+        });
+
+        serverNetworkMiddleware.on(ServerNetworkMiddlewareEventName.UpdateInstrument_SERVER_NET_VAL, (data: ISocketRecord) => {
+            console.log(`serverNetworkMiddleware: [${JSON.stringify(data)}]`.magenta)
+        });
+
         requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_AR_INC, () => {
             stsApp.UpdateInstrument(Gauge.ACTIVE_REQUEST_GAUGE, {
                 Inc: 1
@@ -66,34 +74,6 @@ export class STSExpressServer
             }
         });
 
-        requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_NET_VAL, (stats) => {
-            const requestStats: IRequestNetStats = stats as IRequestNetStats;
-            console.log(`requestStats: [${JSON.stringify(requestStats)}]`.yellow);
-            /*
-            stsApp.UpdateInstrument(Gauge.DURATION_GAUGE, {
-                val: timeInMs
-            } as InstrumentHistogramTelemetry);
-            */
-        });
-
-        requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_RX_VAL, (bytesRead) => {
-            console.log(`bytesRead: [${bytesRead}]`.magenta);
-            /*
-            stsApp.UpdateInstrument(Gauge.DURATION_GAUGE, {
-                val: timeInMs
-            } as InstrumentHistogramTelemetry);
-            */
-        });
-
-        requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_TX_VAL, (bytesWritten) => {
-            console.log(`bytesWritten: [${bytesWritten}]`.cyan);
-            /*
-            stsApp.UpdateInstrument(Gauge.DURATION_GAUGE, {
-                val: timeInMs
-            } as InstrumentHistogramTelemetry);
-            */
-        });
-
         const app = express();
         this.#app = app;
 
@@ -121,11 +101,7 @@ export class STSExpressServer
 
         app.use(requestLoggerMiddleware.Middleware.bind(requestLoggerMiddleware));
 
-        app.use(async (err: any, req: Request, res: Response, next: NextFunction) => {
-            this.#totalBytesRead += req.socket.bytesRead;
-            this.#totalBytesWritten += req.socket.bytesWritten;
-            next();
-        });
+        app.use(serverNetworkMiddleware.Middleware.bind(serverNetworkMiddleware));
 
         if (options.expressServerRouteFactory) {
             options.expressServerRouteFactory(app, stsApp);

package/types/middleware/serverNetworkMiddleware.d.ts

@@ -0,0 +1,33 @@
+/// <reference types="node" />
+import { Request, Response, NextFunction } from 'express';
+import { Socket } from 'node:net';
+import { STSOptionsBase } from '@nsshunt/stsutils';
+export declare enum ServerNetworkMiddlewareEventName {
+    UpdateInstrument_SERVER_NET_VAL = "UpdateInstrument_SERVER_NET_VAL"
+}
+export interface ISocketRecord {
+    id: string;
+    socket: Socket;
+    currentBytesRead: number;
+    currentBytesWritten: number;
+    lastBytesRead: number;
+    lastBytesWritten: number;
+    requestBytesRead: number;
+    requestBytesWritten: number;
+    originalUrl: string;
+    eventName: string;
+}
+export type ServerNetworkMiddlewareEventFunc = (data: ISocketRecord) => void;
+export interface IServerNetworkMiddleware {
+    name: string;
+    outputDebug: boolean;
+}
+export declare class ServerNetworkMiddleware extends STSOptionsBase {
+    #private;
+    constructor(options: IServerNetworkMiddleware);
+    on(eventName: ServerNetworkMiddlewareEventName, callBackFn: ServerNetworkMiddlewareEventFunc): void;
+    GetSocketRecord: (socket: Socket) => ISocketRecord | null;
+    UpdateNetworkStats: (workingSocketRecord: ISocketRecord, eventName: string, req: Request) => void;
+    Middleware: (req: Request, res: Response, next: NextFunction) => void;
+}
+//# sourceMappingURL=serverNetworkMiddleware.d.ts.map

package/types/middleware/serverNetworkMiddleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"serverNetworkMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware/serverNetworkMiddleware.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAIjC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,oBAAY,gCAAgC;IACxC,+BAA+B,oCAAoC;CACtE;AAED,MAAM,WAAW,aAAa;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAA;IACxB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,aAAa,EAAE,MAAM,CAAA;IACrB,gBAAgB,EAAE,MAAM,CAAA;IACxB,gBAAgB,EAAE,MAAM,CAAA;IACxB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,MAAM,gCAAgC,GAAG,CAAC,IAAI,EAAE,aAAa,KAAK,IAAI,CAAC;AAE7E,MAAM,WAAW,wBAAwB;IACrC,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,OAAO,CAAA;CACvB;AAED,qBAAa,uBAAwB,SAAQ,cAAc;;gBAO3C,OAAO,EAAE,wBAAwB;IAS7C,EAAE,CAAC,SAAS,EAAE,gCAAgC,EAAE,UAAU,EAAE,gCAAgC;IAI5F,eAAe,WAAY,MAAM,KAAG,aAAa,GAAG,IAAI,CAOvD;IAED,kBAAkB,wBAAyB,aAAa,aAAa,MAAM,OAAO,OAAO,UAoBxF;IAED,UAAU,QAAS,OAAO,OAAO,QAAQ,QAAQ,YAAY,UAqE5D;CACJ"}

package/types/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AACA,OAAgB,EAAE,OAAO,EAAmC,MAAM,SAAS,CAAC;AAO5E,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAKjD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAI5C,qBAAa,gBAAgB;;gBAMb,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY;IAkIzD,IAAI,GAAG,IAAI,OAAO,CAGjB;CACJ"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AACA,OAAgB,EAAE,OAAO,EAAmC,MAAM,SAAS,CAAC;AAO5E,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAKjD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAK5C,qBAAa,gBAAgB;;gBAIb,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY;IA2GzD,IAAI,GAAG,IAAI,OAAO,CAGjB;CACJ"}