@spinajs/http 2.0.481 → 2.0.482

package/lib/mjs/interfaces.d.ts

@@ -3,6 +3,7 @@ import { Constructor, AsyncService, Class } from '@spinajs/di';
 import { fs, IFileInfo } from '@spinajs/fs';
 import formidable from 'formidable';
 import { CookieOptions } from 'express';
+import { IPerfScope } from '@spinajs/log';
 /**
  * Accept header enum
  */
@@ -37,6 +38,16 @@ export declare enum HttpAcceptHeaders {
      */
     ALL = 7
 }
+/**
+ * Lifecycle state of the HttpServer. Drives start() / stop() / dispose() and is
+ * emitted on the DI bus as `http.server.listening` / `.closing` / `.closed`.
+ */
+export declare enum LifecycleState {
+    Created = 0,
+    Listening = 1,
+    Closing = 2,
+    Closed = 3
+}
 export interface IHttpServerConfiguration {
     /**
      * Https server configuration
@@ -62,6 +73,12 @@ export interface IHttpServerConfiguration {
      */
     AcceptHeaders: HttpAcceptHeaders;
     FatalTemplate: string;
+    /**
+     * Grace period ( ms ) for a graceful shutdown before still-open connections
+     * are force-closed. Idle keep-alive sockets are released immediately; only
+     * genuinely in-flight requests use this window. Default 10000.
+     */
+    shutdownTimeout?: number;
 }
 /**
  * Config options for static files
@@ -127,6 +144,13 @@ export interface FileValidationRules {
     };
     proportions?: FileProportions[];
     types?: FileTypeEnum[];
+    /**
+     * File size bounds in bytes. `min`/`max` are inclusive.
+     */
+    size?: {
+        min?: number;
+        max?: number;
+    };
 }
 export type UploadFileMiddlewareDescriptor = string | Class<FileUploadMiddleware> | {
     options: any;
@@ -173,6 +197,12 @@ export interface IUploadedFile<T = any> {
 }
 export interface Request extends express.Request {
     storage: IActionLocalStoregeContext;
+    /**
+     * Raw request body bytes, captured by the express.json `verify` hook for
+     * JSON requests. Consumed by the {@link ParameterType.RawBody} route arg for
+     * webhook signature verification. Undefined for non-JSON requests.
+     */
+    rawBody?: Buffer;
 }
 /**
  * File upload provider, used to copy incoming formidable
@@ -193,6 +223,16 @@ export interface IServerTimingEntry {
 }
 export interface IActionLocalStoregeContext {
     requestId: string;
+    /**
+     * W3C trace id shared across services for one distributed trace. Seeded by
+     * {@link RequestId} from an inbound `traceparent` header ( or freshly minted )
+     * and merged into every log line by the ambient log context.
+     */
+    traceId?: string;
+    /**
+     * W3C span id identifying this service's span within the trace.
+     */
+    spanId?: string;
     responseStart: Date;
     responseEnd: Date;
     responseTime: number;
@@ -202,6 +242,11 @@ export interface IActionLocalStoregeContext {
      * `Server-Timing` response header when {@link ServerTiming} is enabled.
      */
     serverTiming?: IServerTimingEntry[];
+    /**
+     * Per-request perf accumulator ( query counts, span totals ) populated by the
+     * Perf facade during the action and flushed by {@link PerfRollup} at finish.
+     */
+    perf?: IPerfScope;
 }
 export interface IResponseHeader {
     Name: string;
@@ -254,10 +299,30 @@ export declare enum HTTP_STATUS_CODE {
      * interrupted downloads, or split a download into multiple simultaneous streams.
      */
     PARTIAL_CONTENT = 206,
+    /**
+     * Resource has moved permanently to a new URL.
+     */
+    MOVED_PERMANENTLY = 301,
+    /**
+     * Resource found at a different URL (temporary redirect, method may change).
+     */
+    FOUND = 302,
+    /**
+     * Response to the request can be found at another URL using GET.
+     */
+    SEE_OTHER = 303,
     /**
      * Resource is not modified
      */
     NOT_MODIFIED = 304,
+    /**
+     * Temporary redirect preserving the request method and body.
+     */
+    TEMPORARY_REDIRECT = 307,
+    /**
+     * Permanent redirect preserving the request method and body.
+     */
+    PERMANENT_REDIRECT = 308,
     /**
      * Invalid request, eg. invalid parameters
      */
@@ -297,7 +362,12 @@ export declare enum HTTP_STATUS_CODE {
     /**
      * Method not implemented
      */
-    NOT_IMPLEMENTED = 501
+    NOT_IMPLEMENTED = 501,
+    /**
+     * The server is not ready to handle the request — a dependency is down or the
+     * app is still starting up. Used by the telemetry readiness endpoint.
+     */
+    SERVICE_UNAVAILABLE = 503
 }
 /**
  * Avaible route types, match HTTP methods
@@ -406,6 +476,30 @@ export declare enum ParameterType {
      * From http header
      */
     FromHeader = "FromHeader",
+    /**
+     * Client IP resolved by the RealIp middleware (X-Forwarded-For aware)
+     */
+    Ip = "IpRouteArgs",
+    /**
+     * Per-request id (matches the x-request-id response header)
+     */
+    RequestId = "RequestIdRouteArgs",
+    /**
+     * User-Agent request header
+     */
+    UserAgent = "UserAgentRouteArgs",
+    /**
+     * Referer / Referrer request header
+     */
+    Referer = "RefererRouteArgs",
+    /**
+     * Raw request body Buffer (captured for JSON requests)
+     */
+    RawBody = "RawBodyRouteArgs",
+    /**
+     * Parsed XML request body
+     */
+    FromXml = "FromXmlRouteArgs",
     /**
      * Req from express
      */

package/lib/mjs/interfaces.d.ts.map

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

package/lib/mjs/interfaces.js

@@ -1,5 +1,4 @@
 import { AsyncService, isPromise } from '@spinajs/di';
-import { httpResponse } from './responses.js';
 /**
  * Accept header enum
  */
@@ -35,6 +34,17 @@ export var HttpAcceptHeaders;
      */
     HttpAcceptHeaders[HttpAcceptHeaders["ALL"] = 7] = "ALL";
 })(HttpAcceptHeaders || (HttpAcceptHeaders = {}));
+/**
+ * Lifecycle state of the HttpServer. Drives start() / stop() / dispose() and is
+ * emitted on the DI bus as `http.server.listening` / `.closing` / `.closed`.
+ */
+export var LifecycleState;
+(function (LifecycleState) {
+    LifecycleState[LifecycleState["Created"] = 0] = "Created";
+    LifecycleState[LifecycleState["Listening"] = 1] = "Listening";
+    LifecycleState[LifecycleState["Closing"] = 2] = "Closing";
+    LifecycleState[LifecycleState["Closed"] = 3] = "Closed";
+})(LifecycleState || (LifecycleState = {}));
 export var FileTypeEnum;
 (function (FileTypeEnum) {
     FileTypeEnum["jpeg"] = "image/jpeg";
@@ -116,10 +126,30 @@ export var HTTP_STATUS_CODE;
      * interrupted downloads, or split a download into multiple simultaneous streams.
      */
     HTTP_STATUS_CODE[HTTP_STATUS_CODE["PARTIAL_CONTENT"] = 206] = "PARTIAL_CONTENT";
+    /**
+     * Resource has moved permanently to a new URL.
+     */
+    HTTP_STATUS_CODE[HTTP_STATUS_CODE["MOVED_PERMANENTLY"] = 301] = "MOVED_PERMANENTLY";
+    /**
+     * Resource found at a different URL (temporary redirect, method may change).
+     */
+    HTTP_STATUS_CODE[HTTP_STATUS_CODE["FOUND"] = 302] = "FOUND";
+    /**
+     * Response to the request can be found at another URL using GET.
+     */
+    HTTP_STATUS_CODE[HTTP_STATUS_CODE["SEE_OTHER"] = 303] = "SEE_OTHER";
     /**
      * Resource is not modified
      */
     HTTP_STATUS_CODE[HTTP_STATUS_CODE["NOT_MODIFIED"] = 304] = "NOT_MODIFIED";
+    /**
+     * Temporary redirect preserving the request method and body.
+     */
+    HTTP_STATUS_CODE[HTTP_STATUS_CODE["TEMPORARY_REDIRECT"] = 307] = "TEMPORARY_REDIRECT";
+    /**
+     * Permanent redirect preserving the request method and body.
+     */
+    HTTP_STATUS_CODE[HTTP_STATUS_CODE["PERMANENT_REDIRECT"] = 308] = "PERMANENT_REDIRECT";
     /**
      * Invalid request, eg. invalid parameters
      */
@@ -160,6 +190,11 @@ export var HTTP_STATUS_CODE;
      * Method not implemented
      */
     HTTP_STATUS_CODE[HTTP_STATUS_CODE["NOT_IMPLEMENTED"] = 501] = "NOT_IMPLEMENTED";
+    /**
+     * The server is not ready to handle the request — a dependency is down or the
+     * app is still starting up. Used by the telemetry readiness endpoint.
+     */
+    HTTP_STATUS_CODE[HTTP_STATUS_CODE["SERVICE_UNAVAILABLE"] = 503] = "SERVICE_UNAVAILABLE";
 })(HTTP_STATUS_CODE || (HTTP_STATUS_CODE = {}));
 /**
  * Avaible route types, match HTTP methods
@@ -271,6 +306,30 @@ export var ParameterType;
      * From http header
      */
     ParameterType["FromHeader"] = "FromHeader";
+    /**
+     * Client IP resolved by the RealIp middleware (X-Forwarded-For aware)
+     */
+    ParameterType["Ip"] = "IpRouteArgs";
+    /**
+     * Per-request id (matches the x-request-id response header)
+     */
+    ParameterType["RequestId"] = "RequestIdRouteArgs";
+    /**
+     * User-Agent request header
+     */
+    ParameterType["UserAgent"] = "UserAgentRouteArgs";
+    /**
+     * Referer / Referrer request header
+     */
+    ParameterType["Referer"] = "RefererRouteArgs";
+    /**
+     * Raw request body Buffer (captured for JSON requests)
+     */
+    ParameterType["RawBody"] = "RawBodyRouteArgs";
+    /**
+     * Parsed XML request body
+     */
+    ParameterType["FromXml"] = "FromXmlRouteArgs";
     /**
      * Req from express
      */
@@ -295,9 +354,13 @@ export class Response {
     }
     async execute(_req, _res, _next) {
         const response = await this.prepareResponse();
+        const { httpResponse } = await import('./responses.js');
         return await httpResponse(response, this._template, {
             ...this.options,
-            StatusCode: this._errorCode,
+            // Honor an explicit caller-supplied StatusCode; fall back to the
+            // response type's semantic default (_errorCode). Previously _errorCode
+            // always won, silently ignoring options.StatusCode.
+            StatusCode: this.options?.StatusCode ?? this._errorCode,
         });
     }
     async prepareResponse() {

package/lib/mjs/interfaces.js.map

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

package/lib/mjs/middlewares/PerfRollup.d.ts

@@ -0,0 +1,19 @@
+import * as express from 'express';
+import { ServerMiddleware, Request as sRequest } from '../interfaces.js';
+/**
+ * Emits one perf rollup per request ( eg. "orm.query x14 240ms" ). Creates the
+ * accumulator on `req.storage.perf` in `before()` — which is the SAME object the
+ * action's `AsyncLocalStorage.run(req.storage, …)` exposes, so measurements taken
+ * during the request land in it — then flushes it to every PerfSink on the
+ * response `finish` event.
+ *
+ * Config:
+ *   http.perf.enabled  (default true)
+ */
+export declare class PerfRollup extends ServerMiddleware {
+    protected Enabled: boolean;
+    constructor();
+    before(): ((req: sRequest, res: express.Response, next: express.NextFunction) => void) | null;
+    after(): null;
+}
+//# sourceMappingURL=PerfRollup.d.ts.map

package/lib/mjs/middlewares/PerfRollup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PerfRollup.d.ts","sourceRoot":"","sources":["../../../src/middlewares/PerfRollup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAKnC,OAAO,EAAE,gBAAgB,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEzE;;;;;;;;;GASG;AACH,qBACa,UAAW,SAAQ,gBAAgB;IAE9C,SAAS,CAAC,OAAO,EAAG,OAAO,CAAC;;IAQrB,MAAM,IAAI,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,YAAY,KAAK,IAAI,CAAC,GAAG,IAAI;IAe7F,KAAK,IAAI,IAAI;CAGrB"}

package/lib/mjs/middlewares/PerfRollup.js

@@ -0,0 +1,58 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { Injectable } from '@spinajs/di';
+import { Config } from '@spinajs/configuration';
+import { Perf } from '@spinajs/log';
+import { ServerMiddleware } from '../interfaces.js';
+/**
+ * Emits one perf rollup per request ( eg. "orm.query x14 240ms" ). Creates the
+ * accumulator on `req.storage.perf` in `before()` — which is the SAME object the
+ * action's `AsyncLocalStorage.run(req.storage, …)` exposes, so measurements taken
+ * during the request land in it — then flushes it to every PerfSink on the
+ * response `finish` event.
+ *
+ * Config:
+ *   http.perf.enabled  (default true)
+ */
+let PerfRollup = class PerfRollup extends ServerMiddleware {
+    constructor() {
+        super();
+        // Needs req.storage ( ReqStorage = -2 ); sits alongside AccessLog ( Order 2 ).
+        this.Order = 2;
+    }
+    before() {
+        if (!this.Enabled)
+            return null;
+        return (req, res, next) => {
+            const startedAt = Date.now();
+            req.storage.perf = { requestId: req.storage.requestId, byName: {} };
+            res.on('finish', () => {
+                Perf.flushScope(req.storage.perf, {
+                    labels: { method: req.method, route: req.route?.path ?? req.originalUrl, status: res.statusCode },
+                    totalMs: Date.now() - startedAt,
+                });
+            });
+            next();
+        };
+    }
+    after() {
+        return null;
+    }
+};
+__decorate([
+    Config('http.perf.enabled', { defaultValue: true }),
+    __metadata("design:type", Boolean)
+], PerfRollup.prototype, "Enabled", void 0);
+PerfRollup = __decorate([
+    Injectable(ServerMiddleware),
+    __metadata("design:paramtypes", [])
+], PerfRollup);
+export { PerfRollup };
+//# sourceMappingURL=PerfRollup.js.map

package/lib/mjs/middlewares/PerfRollup.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PerfRollup.js","sourceRoot":"","sources":["../../../src/middlewares/PerfRollup.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,OAAO,EAAE,gBAAgB,EAAuB,MAAM,kBAAkB,CAAC;AAEzE;;;;;;;;;GASG;AAEI,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,gBAAgB;IAI9C;QACE,KAAK,EAAE,CAAC;QACR,+EAA+E;QAC/E,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IACjB,CAAC;IAEM,MAAM;QACX,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAC/B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACxB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7B,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,EAAE,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;YACpE,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACpB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE;oBAChC,MAAM,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,EAAG,GAAG,CAAC,KAA2B,EAAE,IAAI,IAAI,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,CAAC,UAAU,EAAE;oBACxH,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;iBAChC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACH,IAAI,EAAE,CAAC;QACT,CAAC,CAAC;IACJ,CAAC;IAEM,KAAK;QACV,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA1BW;IADT,MAAM,CAAC,mBAAmB,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;;2CACxB;AAFjB,UAAU;IADtB,UAAU,CAAC,gBAAgB,CAAC;;GAChB,UAAU,CA4BtB"}

package/lib/mjs/middlewares/RequestId.d.ts

@@ -1,9 +1,8 @@
 import { Response, NextFunction } from 'express';
 import { ServerMiddleware, Request as sRequest } from '../interfaces.js';
-import * as express from 'express';
 export declare class RequestId extends ServerMiddleware {
     constructor();
-    after(): (_req: sRequest, _res: express.Response, next: express.NextFunction) => void;
+    after(): null;
     before(): (req: sRequest, res: Response<any, Record<string, any>>, next: NextFunction) => void;
 }
 //# sourceMappingURL=RequestId.d.ts.map

package/lib/mjs/middlewares/RequestId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RequestId.d.ts","sourceRoot":"","sources":["../../../src/middlewares/RequestId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAInC,qBACa,SAAU,SAAQ,gBAAgB;;IAMtC,KAAK,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,YAAY,KAAK,IAAI;IAOrF,MAAM,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI;CAMtG"}
+{"version":3,"file":"RequestId.d.ts","sourceRoot":"","sources":["../../../src/middlewares/RequestId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAMzE,qBACa,SAAU,SAAQ,gBAAgB;;IAMtC,KAAK,IAAI,IAAI;IAQb,MAAM,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI;CAqBtG"}

package/lib/mjs/middlewares/RequestId.js

@@ -10,20 +10,34 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 import { ServerMiddleware } from '../interfaces.js';
 import { v4 as uuidv4 } from 'uuid';
 import { Injectable } from '@spinajs/di';
+import { newTraceContext, formatTraceparent } from '@spinajs/log';
 let RequestId = class RequestId extends ServerMiddleware {
     constructor() {
         super();
         this.Order = 1;
     }
     after() {
-        return (req, res, next) => {
-            res.header('x-request-id', req.storage.requestId);
-            next();
-        };
+        // The x-request-id header is set in before() instead. ServerMiddleware
+        // after() handlers do NOT run for matched controller routes (the response
+        // is flushed inside the controllers router without calling next()), so
+        // setting the header here would silently drop it on every real response.
+        return null;
     }
     before() {
-        return (req, _res, next) => {
+        return (req, res, next) => {
             req.storage.requestId = uuidv4();
+            // Continue an inbound W3C traceparent ( or start a new trace ) and seed
+            // traceId / spanId onto req.storage so the ambient log context merges them
+            // into every log line — trace ids are shared across services.
+            const tc = newTraceContext(req.headers['traceparent']);
+            req.storage.traceId = tc.traceId;
+            req.storage.spanId = tc.spanId;
+            // Emit the outbound traceparent here ( not in after() ) because the
+            // `sampled` flag lives on this freshly-computed context and req.storage —
+            // typed as the public IActionLocalStoregeContext — deliberately does not
+            // carry it. Setting a response header before next() is safe as long as the
+            // response has not been sent, mirroring x-request-id.
+            res.header('traceparent', formatTraceparent(tc));
             next();
         };
     }

package/lib/mjs/middlewares/RequestId.js.map

@@ -1 +1 @@
-{"version":3,"file":"RequestId.js","sourceRoot":"","sources":["../../../src/middlewares/RequestId.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,gBAAgB,EAAuB,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGlC,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,gBAAgB;IAC7C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IACjB,CAAC;IAEM,KAAK;QACV,OAAO,CAAC,GAAa,EAAE,GAAqB,EAAE,IAA0B,EAAE,EAAE;YAC1E,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAClD,IAAI,EAAE,CAAC;QACT,CAAC,CAAC;IACJ,CAAC;IAEM,MAAM;QACX,OAAO,CAAC,GAAa,EAAE,IAAsB,EAAE,IAA0B,EAAE,EAAE;YAC3E,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,MAAM,EAAE,CAAC;YACjC,IAAI,EAAE,CAAC;QACT,CAAC,CAAC;IACJ,CAAC;CACF,CAAA;AAnBY,SAAS;IADrB,UAAU,CAAC,gBAAgB,CAAC;;GAChB,SAAS,CAmBrB"}
+{"version":3,"file":"RequestId.js","sourceRoot":"","sources":["../../../src/middlewares/RequestId.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,gBAAgB,EAAuB,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAiB,MAAM,cAAc,CAAC;AAG1E,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,gBAAgB;IAC7C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IACjB,CAAC;IAEM,KAAK;QACV,uEAAuE;QACvE,0EAA0E;QAC1E,uEAAuE;QACvE,yEAAyE;QACzE,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,MAAM;QACX,OAAO,CAAC,GAAa,EAAE,GAAqB,EAAE,IAA0B,EAAE,EAAE;YAC1E,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,MAAM,EAAE,CAAC;YAEjC,wEAAwE;YACxE,2EAA2E;YAC3E,8DAA8D;YAC9D,MAAM,EAAE,GAAkB,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAuB,CAAC,CAAC;YAC5F,GAAG,CAAC,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC;YACjC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;YAE/B,oEAAoE;YACpE,0EAA0E;YAC1E,yEAAyE;YACzE,2EAA2E;YAC3E,sDAAsD;YACtD,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;YAEjD,IAAI,EAAE,CAAC;QACT,CAAC,CAAC;IACJ,CAAC;CACF,CAAA;AAnCY,SAAS;IADrB,UAAU,CAAC,gBAAgB,CAAC;;GAChB,SAAS,CAmCrB"}

package/lib/mjs/middlewares/ResponseTime.d.ts

@@ -2,10 +2,9 @@ import { Request, Response, NextFunction } from 'express';
 import { ParamsDictionary } from 'express-serve-static-core';
 import { ParsedQs } from 'qs';
 import { ServerMiddleware } from '../interfaces.js';
-import * as express from 'express';
 export declare class ResponseTime extends ServerMiddleware {
     constructor();
-    after(): (req: express.Request, _res: express.Response, _next: express.NextFunction) => void;
+    after(): null;
     before(): (_req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: NextFunction) => void;
 }
 //# sourceMappingURL=ResponseTime.d.ts.map

package/lib/mjs/middlewares/ResponseTime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ResponseTime.d.ts","sourceRoot":"","sources":["../../../src/middlewares/ResponseTime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAuB,MAAM,kBAAkB,CAAC;AACzE,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAGnC,qBACa,YAAa,SAAQ,gBAAgB;;IAMzC,KAAK,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,YAAY,KAAK,IAAI;IAY5F,MAAM,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI;CAMjK"}
+{"version":3,"file":"ResponseTime.d.ts","sourceRoot":"","sources":["../../../src/middlewares/ResponseTime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAuB,MAAM,kBAAkB,CAAC;AAIzE,qBACa,YAAa,SAAQ,gBAAgB;;IAazC,KAAK,IAAI,IAAI;IAQb,MAAM,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI;CAsBjK"}

package/lib/mjs/middlewares/ResponseTime.js

@@ -12,21 +12,39 @@ import { Injectable } from '@spinajs/di';
 let ResponseTime = class ResponseTime extends ServerMiddleware {
     constructor() {
         super();
-        this.Order = -1;
+        // Must sit ABOVE Compression (Order 0): the timing header is written from a
+        // res.end patch, and compression also patches res.end and flushes the
+        // headers. Whichever patch is applied last runs first (outermost), so we
+        // need a higher Order than compression to set our header before compression
+        // sends it. Same tier as the other end-of-response instrumentation
+        // (ServerTiming / AccessLog). The sub-millisecond difference in when the
+        // start timestamp is taken is irrelevant for a response-time metric.
+        this.Order = 2;
     }
     after() {
-        return (req, res, next) => {
-            const end = new Date();
-            const diff = end.getTime() - req.storage.responseStart.getTime();
-            req.storage.responseEnd = end;
-            req.storage.responseTime = diff;
-            res.header('x-response-time', diff.toString());
-            next();
-        };
+        // Timing is finalised via a res.end patch in before() instead. After()
+        // handlers do NOT run for matched controller routes (the response is
+        // flushed inside the controllers router without calling next()), so the
+        // x-response-time header set here would be dropped on every real response.
+        return null;
     }
     before() {
-        return (req, _res, next) => {
-            req.storage.responseStart = new Date();
+        return (req, res, next) => {
+            const start = new Date();
+            req.storage.responseStart = start;
+            // Finalise timing and write the header just before the response is
+            // flushed, regardless of how the controller ended it. Headers are still
+            // mutable here because the original res.end hasn't run yet.
+            const originalEnd = res.end.bind(res);
+            res.end = function patchedEnd(...args) {
+                const end = new Date();
+                req.storage.responseEnd = end;
+                req.storage.responseTime = end.getTime() - start.getTime();
+                if (!res.headersSent) {
+                    res.setHeader('x-response-time', String(req.storage.responseTime));
+                }
+                return originalEnd(...args);
+            };
             next();
         };
     }

package/lib/mjs/middlewares/ResponseTime.js.map

@@ -1 +1 @@
-{"version":3,"file":"ResponseTime.js","sourceRoot":"","sources":["../../../src/middlewares/ResponseTime.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,EAAE,gBAAgB,EAAuB,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGlC,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,gBAAgB;IAChD;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IAClB,CAAC;IAEM,KAAK;QACV,OAAO,CAAC,GAAa,EAAE,GAAqB,EAAE,IAA0B,EAAE,EAAE;YAC1E,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;YAEjE,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,CAAC;YAC9B,GAAG,CAAC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;YAChC,GAAG,CAAC,MAAM,CAAC,iBAAiB,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC/C,IAAI,EAAE,CAAC;QACT,CAAC,CAAC;IACJ,CAAC;IAEM,MAAM;QACX,OAAO,CAAC,GAAa,EAAE,IAAsB,EAAE,IAA0B,EAAE,EAAE;YAC3E,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,IAAI,IAAI,EAAE,CAAC;YACvC,IAAI,EAAE,CAAC;QACT,CAAC,CAAC;IACJ,CAAC;CACF,CAAA;AAxBY,YAAY;IADxB,UAAU,CAAC,gBAAgB,CAAC;;GAChB,YAAY,CAwBxB"}
+{"version":3,"file":"ResponseTime.js","sourceRoot":"","sources":["../../../src/middlewares/ResponseTime.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,EAAE,gBAAgB,EAAuB,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGlC,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,gBAAgB;IAChD;QACE,KAAK,EAAE,CAAC;QACR,4EAA4E;QAC5E,sEAAsE;QACtE,yEAAyE;QACzE,4EAA4E;QAC5E,mEAAmE;QACnE,yEAAyE;QACzE,qEAAqE;QACrE,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IACjB,CAAC;IAEM,KAAK;QACV,uEAAuE;QACvE,qEAAqE;QACrE,wEAAwE;QACxE,2EAA2E;QAC3E,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,MAAM;QACX,OAAO,CAAC,GAAa,EAAE,GAAqB,EAAE,IAA0B,EAAE,EAAE;YAC1E,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC;YACzB,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC;YAElC,mEAAmE;YACnE,wEAAwE;YACxE,4DAA4D;YAC5D,MAAM,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAmB,CAAC;YACvD,GAAG,CAAC,GAAW,GAAG,SAAS,UAAU,CAAyB,GAAG,IAAW;gBAC3E,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,CAAC;gBAC9B,GAAG,CAAC,OAAO,CAAC,YAAY,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC;gBAC3D,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;oBACrB,GAAG,CAAC,SAAS,CAAC,iBAAiB,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;gBACrE,CAAC;gBACD,OAAO,WAAW,CAAC,GAAG,IAAI,CAAC,CAAC;YAC9B,CAAC,CAAC;YAEF,IAAI,EAAE,CAAC;QACT,CAAC,CAAC;IACJ,CAAC;CACF,CAAA;AA3CY,YAAY;IADxB,UAAU,CAAC,gBAAgB,CAAC;;GAChB,YAAY,CA2CxB"}

package/lib/mjs/response-methods/file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../../src/response-methods/file.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAGnC,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAItF,qBAAa,WAAY,SAAQ,QAAQ;IAK3B,SAAS,CAAC,OAAO,EAAE,oBAAoB;IAAE,SAAS,CAAC,eAAe,CAAC,EAAE,gBAAgB;IAJjG;;;OAGG;gBACmB,OAAO,EAAE,oBAAoB,EAAY,eAAe,CAAC,EAAE,gBAAgB,YAAA;IAOpF,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CA+BlF;AAED,qBAAa,YAAa,SAAQ,QAAQ;IAK5B,SAAS,CAAC,OAAO,EAAE,oBAAoB;IAAE,SAAS,CAAC,eAAe,CAAC,EAAE,gBAAgB;IAJjG;;;OAGG;gBACmB,OAAO,EAAE,oBAAoB,EAAY,eAAe,CAAC,EAAE,gBAAgB,YAAA;IAOpF,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAyClF;AAED,qBAAa,gBAAiB,SAAQ,QAAQ;IAChC,SAAS,CAAC,IAAI,EAAE,GAAG;IAAE,SAAS,CAAC,QAAQ,EAAE,MAAM;IAAE,SAAS,CAAC,eAAe,CAAC,EAAE,gBAAgB;gBAAnF,IAAI,EAAE,GAAG,EAAY,QAAQ,EAAE,MAAM,EAAY,eAAe,CAAC,EAAE,gBAAgB,YAAA;IAI5F,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAyBlF"}
+{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../../src/response-methods/file.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAInC,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAMtF,qBAAa,WAAY,SAAQ,QAAQ;IAK3B,SAAS,CAAC,OAAO,EAAE,oBAAoB;IAAE,SAAS,CAAC,eAAe,CAAC,EAAE,gBAAgB;IAJjG;;;OAGG;gBACmB,OAAO,EAAE,oBAAoB,EAAY,eAAe,CAAC,EAAE,gBAAgB,YAAA;IAUpF,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CA+BlF;AAED,qBAAa,YAAa,SAAQ,QAAQ;IAK5B,SAAS,CAAC,OAAO,EAAE,oBAAoB;IAAE,SAAS,CAAC,eAAe,CAAC,EAAE,gBAAgB;IAJjG;;;OAGG;gBACmB,OAAO,EAAE,oBAAoB,EAAY,eAAe,CAAC,EAAE,gBAAgB,YAAA;IAWpF,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CA2DlF;AAED,qBAAa,gBAAiB,SAAQ,QAAQ;IAChC,SAAS,CAAC,IAAI,EAAE,GAAG;IAAE,SAAS,CAAC,QAAQ,EAAE,MAAM;IAAE,SAAS,CAAC,eAAe,CAAC,EAAE,gBAAgB;gBAAnF,IAAI,EAAE,GAAG,EAAY,QAAQ,EAAE,MAAM,EAAY,eAAe,CAAC,EAAE,gBAAgB,YAAA;IAI5F,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BlF"}