@spinajs/http 2.0.475 → 2.0.477
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cjs/cache.d.ts +9 -0
- package/lib/cjs/cache.d.ts.map +1 -1
- package/lib/cjs/cache.js +55 -0
- package/lib/cjs/cache.js.map +1 -1
- package/lib/cjs/controllers.d.ts +33 -3
- package/lib/cjs/controllers.d.ts.map +1 -1
- package/lib/cjs/controllers.js +97 -70
- package/lib/cjs/controllers.js.map +1 -1
- package/lib/cjs/decorators.d.ts.map +1 -1
- package/lib/cjs/decorators.js +55 -0
- package/lib/cjs/decorators.js.map +1 -1
- package/lib/cjs/index.d.ts +7 -0
- package/lib/cjs/index.d.ts.map +1 -1
- package/lib/cjs/index.js +7 -0
- package/lib/cjs/index.js.map +1 -1
- package/lib/cjs/interfaces.d.ts +27 -1
- package/lib/cjs/interfaces.d.ts.map +1 -1
- package/lib/cjs/interfaces.js.map +1 -1
- package/lib/cjs/middlewares/AccessLog.d.ts +23 -0
- package/lib/cjs/middlewares/AccessLog.d.ts.map +1 -0
- package/lib/cjs/middlewares/AccessLog.js +73 -0
- package/lib/cjs/middlewares/AccessLog.js.map +1 -0
- package/lib/cjs/middlewares/Compression.d.ts +21 -0
- package/lib/cjs/middlewares/Compression.d.ts.map +1 -0
- package/lib/cjs/middlewares/Compression.js +62 -0
- package/lib/cjs/middlewares/Compression.js.map +1 -0
- package/lib/cjs/middlewares/Cors.d.ts +25 -0
- package/lib/cjs/middlewares/Cors.d.ts.map +1 -0
- package/lib/cjs/middlewares/Cors.js +81 -0
- package/lib/cjs/middlewares/Cors.js.map +1 -0
- package/lib/cjs/middlewares/ErrorHandler.d.ts +17 -0
- package/lib/cjs/middlewares/ErrorHandler.d.ts.map +1 -0
- package/lib/cjs/middlewares/ErrorHandler.js +42 -0
- package/lib/cjs/middlewares/ErrorHandler.js.map +1 -0
- package/lib/cjs/middlewares/NotFound.d.ts +18 -0
- package/lib/cjs/middlewares/NotFound.d.ts.map +1 -0
- package/lib/cjs/middlewares/NotFound.js +48 -0
- package/lib/cjs/middlewares/NotFound.js.map +1 -0
- package/lib/cjs/middlewares/ServerTiming.d.ts +25 -0
- package/lib/cjs/middlewares/ServerTiming.d.ts.map +1 -0
- package/lib/cjs/middlewares/ServerTiming.js +78 -0
- package/lib/cjs/middlewares/ServerTiming.js.map +1 -0
- package/lib/cjs/middlewares/SlowRequestWarning.d.ts +20 -0
- package/lib/cjs/middlewares/SlowRequestWarning.d.ts.map +1 -0
- package/lib/cjs/middlewares/SlowRequestWarning.js +74 -0
- package/lib/cjs/middlewares/SlowRequestWarning.js.map +1 -0
- package/lib/cjs/server.d.ts +7 -0
- package/lib/cjs/server.d.ts.map +1 -1
- package/lib/cjs/server.js +9 -24
- package/lib/cjs/server.js.map +1 -1
- package/lib/mjs/cache.d.ts +9 -0
- package/lib/mjs/cache.d.ts.map +1 -1
- package/lib/mjs/cache.js +55 -0
- package/lib/mjs/cache.js.map +1 -1
- package/lib/mjs/controllers.d.ts +33 -3
- package/lib/mjs/controllers.d.ts.map +1 -1
- package/lib/mjs/controllers.js +99 -39
- package/lib/mjs/controllers.js.map +1 -1
- package/lib/mjs/decorators.d.ts.map +1 -1
- package/lib/mjs/decorators.js +55 -0
- package/lib/mjs/decorators.js.map +1 -1
- package/lib/mjs/index.d.ts +7 -0
- package/lib/mjs/index.d.ts.map +1 -1
- package/lib/mjs/index.js +7 -0
- package/lib/mjs/index.js.map +1 -1
- package/lib/mjs/interfaces.d.ts +27 -1
- package/lib/mjs/interfaces.d.ts.map +1 -1
- package/lib/mjs/interfaces.js.map +1 -1
- package/lib/mjs/middlewares/AccessLog.d.ts +23 -0
- package/lib/mjs/middlewares/AccessLog.d.ts.map +1 -0
- package/lib/mjs/middlewares/AccessLog.js +70 -0
- package/lib/mjs/middlewares/AccessLog.js.map +1 -0
- package/lib/mjs/middlewares/Compression.d.ts +21 -0
- package/lib/mjs/middlewares/Compression.d.ts.map +1 -0
- package/lib/mjs/middlewares/Compression.js +56 -0
- package/lib/mjs/middlewares/Compression.js.map +1 -0
- package/lib/mjs/middlewares/Cors.d.ts +25 -0
- package/lib/mjs/middlewares/Cors.d.ts.map +1 -0
- package/lib/mjs/middlewares/Cors.js +75 -0
- package/lib/mjs/middlewares/Cors.js.map +1 -0
- package/lib/mjs/middlewares/ErrorHandler.d.ts +17 -0
- package/lib/mjs/middlewares/ErrorHandler.d.ts.map +1 -0
- package/lib/mjs/middlewares/ErrorHandler.js +39 -0
- package/lib/mjs/middlewares/ErrorHandler.js.map +1 -0
- package/lib/mjs/middlewares/NotFound.d.ts +18 -0
- package/lib/mjs/middlewares/NotFound.d.ts.map +1 -0
- package/lib/mjs/middlewares/NotFound.js +45 -0
- package/lib/mjs/middlewares/NotFound.js.map +1 -0
- package/lib/mjs/middlewares/ServerTiming.d.ts +25 -0
- package/lib/mjs/middlewares/ServerTiming.d.ts.map +1 -0
- package/lib/mjs/middlewares/ServerTiming.js +75 -0
- package/lib/mjs/middlewares/ServerTiming.js.map +1 -0
- package/lib/mjs/middlewares/SlowRequestWarning.d.ts +20 -0
- package/lib/mjs/middlewares/SlowRequestWarning.d.ts.map +1 -0
- package/lib/mjs/middlewares/SlowRequestWarning.js +71 -0
- package/lib/mjs/middlewares/SlowRequestWarning.js.map +1 -0
- package/lib/mjs/server.d.ts +7 -0
- package/lib/mjs/server.d.ts.map +1 -1
- package/lib/mjs/server.js +9 -24
- package/lib/mjs/server.js.map +1 -1
- package/lib/tsconfig.cjs.tsbuildinfo +1 -1
- package/lib/tsconfig.mjs.tsbuildinfo +1 -1
- package/package.json +11 -11
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
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;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
|
+
};
|
|
10
|
+
import { Injectable } from '@spinajs/di';
|
|
11
|
+
import { Config } from '@spinajs/configuration';
|
|
12
|
+
import { ServerMiddleware } from '../interfaces.js';
|
|
13
|
+
/**
|
|
14
|
+
* Emits a `Server-Timing` response header so browsers / devtools can show
|
|
15
|
+
* internal phase durations alongside the network waterfall.
|
|
16
|
+
*
|
|
17
|
+
* By default it emits a single `total;dur=<ms>` entry. Other code can push
|
|
18
|
+
* additional entries during the request:
|
|
19
|
+
*
|
|
20
|
+
* req.storage.serverTiming.push({ name: 'db', dur: 12, desc: 'main query' });
|
|
21
|
+
*
|
|
22
|
+
* Header is written by monkey-patching `res.end` so it lands on the response
|
|
23
|
+
* regardless of how the controller flushed — Express ServerMiddleware.after()
|
|
24
|
+
* does not run for normal route responses.
|
|
25
|
+
*
|
|
26
|
+
* Config:
|
|
27
|
+
* http.serverTiming.enabled (default true)
|
|
28
|
+
*/
|
|
29
|
+
let ServerTiming = class ServerTiming extends ServerMiddleware {
|
|
30
|
+
constructor() {
|
|
31
|
+
super();
|
|
32
|
+
this.Order = 2;
|
|
33
|
+
}
|
|
34
|
+
before() {
|
|
35
|
+
if (!this.Enabled)
|
|
36
|
+
return null;
|
|
37
|
+
return (req, res, next) => {
|
|
38
|
+
const startedAt = Date.now();
|
|
39
|
+
req.storage.serverTiming = req.storage.serverTiming ?? [];
|
|
40
|
+
const originalEnd = res.end.bind(res);
|
|
41
|
+
res.end = function patchedEnd(...args) {
|
|
42
|
+
if (!res.headersSent) {
|
|
43
|
+
const entries = req.storage.serverTiming ?? [];
|
|
44
|
+
entries.push({ name: 'total', dur: Date.now() - startedAt });
|
|
45
|
+
res.setHeader('Server-Timing', entries.map(formatEntry).join(', '));
|
|
46
|
+
}
|
|
47
|
+
return originalEnd(...args);
|
|
48
|
+
};
|
|
49
|
+
next();
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
after() {
|
|
53
|
+
return null;
|
|
54
|
+
}
|
|
55
|
+
};
|
|
56
|
+
__decorate([
|
|
57
|
+
Config('http.serverTiming.enabled', { defaultValue: true }),
|
|
58
|
+
__metadata("design:type", Boolean)
|
|
59
|
+
], ServerTiming.prototype, "Enabled", void 0);
|
|
60
|
+
ServerTiming = __decorate([
|
|
61
|
+
Injectable(ServerMiddleware),
|
|
62
|
+
__metadata("design:paramtypes", [])
|
|
63
|
+
], ServerTiming);
|
|
64
|
+
export { ServerTiming };
|
|
65
|
+
function formatEntry(e) {
|
|
66
|
+
// Per the RFC each metric is "name;dur=<ms>;desc=\"...\"" — quotes are
|
|
67
|
+
// required when the description contains anything but ASCII identifiers.
|
|
68
|
+
const parts = [e.name];
|
|
69
|
+
if (typeof e.dur === 'number')
|
|
70
|
+
parts.push(`dur=${e.dur}`);
|
|
71
|
+
if (e.desc)
|
|
72
|
+
parts.push(`desc="${e.desc.replace(/"/g, '\\"')}"`);
|
|
73
|
+
return parts.join(';');
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=ServerTiming.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ServerTiming.js","sourceRoot":"","sources":["../../../src/middlewares/ServerTiming.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EAAE,gBAAgB,EAA2C,MAAM,kBAAkB,CAAC;AAE7F;;;;;;;;;;;;;;;GAeG;AAEI,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,gBAAgB;IAIhD;QACE,KAAK,EAAE,CAAC;QACR,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,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;YAE1D,MAAM,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAmB,CAAC;YACvD,GAAG,CAAC,GAAW,GAAG,SAAS,UAAU,CAAyB,GAAG,IAAW;gBAC3E,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;oBACrB,MAAM,OAAO,GAAyB,GAAG,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;oBACrE,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC;oBAC7D,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBACtE,CAAC;gBACD,OAAO,WAAW,CAAC,GAAG,IAAI,CAAC,CAAC;YAC9B,CAAC,CAAC;YAEF,IAAI,EAAE,CAAC;QACT,CAAC,CAAC;IACJ,CAAC;IAEM,KAAK;QACV,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA9BW;IADT,MAAM,CAAC,2BAA2B,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;;6CAChC;AAFjB,YAAY;IADxB,UAAU,CAAC,gBAAgB,CAAC;;GAChB,YAAY,CAgCxB;;AAED,SAAS,WAAW,CAAC,CAAqB;IACxC,uEAAuE;IACvE,yEAAyE;IACzE,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,OAAO,CAAC,CAAC,GAAG,KAAK,QAAQ;QAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC1D,IAAI,CAAC,CAAC,IAAI;QAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAChE,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import * as express from 'express';
|
|
2
|
+
import { Log } from '@spinajs/log';
|
|
3
|
+
import { ServerMiddleware, Request as sRequest } from '../interfaces.js';
|
|
4
|
+
/**
|
|
5
|
+
* Logs a warning when a request exceeds a configurable duration threshold.
|
|
6
|
+
* Cheap diagnostic visibility for performance regressions.
|
|
7
|
+
*
|
|
8
|
+
* Config:
|
|
9
|
+
* http.slowRequest.enabled (default true)
|
|
10
|
+
* http.slowRequest.thresholdMs (default 1000)
|
|
11
|
+
*/
|
|
12
|
+
export declare class SlowRequestWarning extends ServerMiddleware {
|
|
13
|
+
protected Enabled: boolean;
|
|
14
|
+
protected ThresholdMs: number;
|
|
15
|
+
protected Log: Log;
|
|
16
|
+
constructor();
|
|
17
|
+
before(): ((req: sRequest, res: express.Response, next: express.NextFunction) => void) | null;
|
|
18
|
+
after(): null;
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=SlowRequestWarning.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SlowRequestWarning.d.ts","sourceRoot":"","sources":["../../../src/middlewares/SlowRequestWarning.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAGnC,OAAO,EAAU,GAAG,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,gBAAgB,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEzE;;;;;;;GAOG;AACH,qBACa,kBAAmB,SAAQ,gBAAgB;IAEtD,SAAS,CAAC,OAAO,EAAG,OAAO,CAAC;IAG5B,SAAS,CAAC,WAAW,EAAG,MAAM,CAAC;IAG/B,SAAS,CAAC,GAAG,EAAG,GAAG,CAAC;;IAOb,MAAM,IAAI,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,YAAY,KAAK,IAAI,CAAC,GAAG,IAAI;IAuB7F,KAAK,IAAI,IAAI;CAGrB"}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
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;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
|
+
};
|
|
10
|
+
import { Injectable } from '@spinajs/di';
|
|
11
|
+
import { Config } from '@spinajs/configuration';
|
|
12
|
+
import { Logger, Log } from '@spinajs/log';
|
|
13
|
+
import { ServerMiddleware } from '../interfaces.js';
|
|
14
|
+
/**
|
|
15
|
+
* Logs a warning when a request exceeds a configurable duration threshold.
|
|
16
|
+
* Cheap diagnostic visibility for performance regressions.
|
|
17
|
+
*
|
|
18
|
+
* Config:
|
|
19
|
+
* http.slowRequest.enabled (default true)
|
|
20
|
+
* http.slowRequest.thresholdMs (default 1000)
|
|
21
|
+
*/
|
|
22
|
+
let SlowRequestWarning = class SlowRequestWarning extends ServerMiddleware {
|
|
23
|
+
constructor() {
|
|
24
|
+
super();
|
|
25
|
+
this.Order = 2;
|
|
26
|
+
}
|
|
27
|
+
before() {
|
|
28
|
+
if (!this.Enabled)
|
|
29
|
+
return null;
|
|
30
|
+
const log = this.Log;
|
|
31
|
+
const threshold = this.ThresholdMs;
|
|
32
|
+
return (req, res, next) => {
|
|
33
|
+
const startedAt = Date.now();
|
|
34
|
+
res.on('finish', () => {
|
|
35
|
+
const ms = Date.now() - startedAt;
|
|
36
|
+
if (ms >= threshold) {
|
|
37
|
+
log.warn(`Slow request: ${req.method} ${req.originalUrl} took ${ms}ms (threshold ${threshold}ms)`, {
|
|
38
|
+
method: req.method,
|
|
39
|
+
path: req.originalUrl,
|
|
40
|
+
ms,
|
|
41
|
+
threshold,
|
|
42
|
+
status: res.statusCode,
|
|
43
|
+
requestId: req.storage?.requestId,
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
});
|
|
47
|
+
next();
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
after() {
|
|
51
|
+
return null;
|
|
52
|
+
}
|
|
53
|
+
};
|
|
54
|
+
__decorate([
|
|
55
|
+
Config('http.slowRequest.enabled', { defaultValue: true }),
|
|
56
|
+
__metadata("design:type", Boolean)
|
|
57
|
+
], SlowRequestWarning.prototype, "Enabled", void 0);
|
|
58
|
+
__decorate([
|
|
59
|
+
Config('http.slowRequest.thresholdMs', { defaultValue: 1000 }),
|
|
60
|
+
__metadata("design:type", Number)
|
|
61
|
+
], SlowRequestWarning.prototype, "ThresholdMs", void 0);
|
|
62
|
+
__decorate([
|
|
63
|
+
Logger('http'),
|
|
64
|
+
__metadata("design:type", Log)
|
|
65
|
+
], SlowRequestWarning.prototype, "Log", void 0);
|
|
66
|
+
SlowRequestWarning = __decorate([
|
|
67
|
+
Injectable(ServerMiddleware),
|
|
68
|
+
__metadata("design:paramtypes", [])
|
|
69
|
+
], SlowRequestWarning);
|
|
70
|
+
export { SlowRequestWarning };
|
|
71
|
+
//# sourceMappingURL=SlowRequestWarning.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SlowRequestWarning.js","sourceRoot":"","sources":["../../../src/middlewares/SlowRequestWarning.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,gBAAgB,EAAuB,MAAM,kBAAkB,CAAC;AAEzE;;;;;;;GAOG;AAEI,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,gBAAgB;IAUtD;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IACjB,CAAC;IAEM,MAAM;QACX,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC;QACnC,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACxB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7B,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACpB,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;gBAClC,IAAI,EAAE,IAAI,SAAS,EAAE,CAAC;oBACpB,GAAG,CAAC,IAAI,CAAC,iBAAiB,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,WAAW,SAAS,EAAE,iBAAiB,SAAS,KAAK,EAAE;wBACjG,MAAM,EAAE,GAAG,CAAC,MAAM;wBAClB,IAAI,EAAE,GAAG,CAAC,WAAW;wBACrB,EAAE;wBACF,SAAS;wBACT,MAAM,EAAE,GAAG,CAAC,UAAU;wBACtB,SAAS,EAAE,GAAG,CAAC,OAAO,EAAE,SAAS;qBAClC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CAAC;YACH,IAAI,EAAE,CAAC;QACT,CAAC,CAAC;IACJ,CAAC;IAEM,KAAK;QACV,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAvCW;IADT,MAAM,CAAC,0BAA0B,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;;mDAC/B;AAGlB;IADT,MAAM,CAAC,8BAA8B,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;;uDAChC;AAGrB;IADT,MAAM,CAAC,MAAM,CAAC;8BACC,GAAG;+CAAC;AART,kBAAkB;IAD9B,UAAU,CAAC,gBAAgB,CAAC;;GAChB,kBAAkB,CAyC9B"}
|
package/lib/mjs/server.d.ts
CHANGED
|
@@ -11,6 +11,13 @@ import './middlewares/ResponseTime.js';
|
|
|
11
11
|
import './middlewares/RequestId.js';
|
|
12
12
|
import './middlewares/RealIp.js';
|
|
13
13
|
import './middlewares/ReqStorage.js';
|
|
14
|
+
import './middlewares/NotFound.js';
|
|
15
|
+
import './middlewares/ErrorHandler.js';
|
|
16
|
+
import './middlewares/AccessLog.js';
|
|
17
|
+
import './middlewares/Compression.js';
|
|
18
|
+
import './middlewares/Cors.js';
|
|
19
|
+
import './middlewares/SlowRequestWarning.js';
|
|
20
|
+
import './middlewares/ServerTiming.js';
|
|
14
21
|
export declare class HttpServer extends AsyncService {
|
|
15
22
|
protected Configuration: Configuration;
|
|
16
23
|
protected Container: IContainer;
|
package/lib/mjs/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAiD,MAAM,aAAa,CAAC;AACtG,OAAO,EAAU,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAU,GAAG,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,wBAAwB,CAAC;AAEhC,OAAO,EAAE,MAAM,IAAI,IAAI,EAAoC,MAAM,MAAM,CAAC;AACxE,OAAO,EAAE,MAAM,IAAI,KAAK,EAAqC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAiD,MAAM,aAAa,CAAC;AACtG,OAAO,EAAU,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAU,GAAG,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,wBAAwB,CAAC;AAEhC,OAAO,EAAE,MAAM,IAAI,IAAI,EAAoC,MAAM,MAAM,CAAC;AACxE,OAAO,EAAE,MAAM,IAAI,KAAK,EAAqC,MAAM,OAAO,CAAC;AAE3E,OAAO,OAAO,EAAE,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAIvE,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC7E,OAAO,yBAAyB,CAAC;AACjC,OAAO,+BAA+B,CAAC;AACvC,OAAO,4BAA4B,CAAC;AACpC,OAAO,yBAAyB,CAAC;AACjC,OAAO,6BAA6B,CAAC;AACrC,OAAO,2BAA2B,CAAC;AACnC,OAAO,+BAA+B,CAAC;AACvC,OAAO,4BAA4B,CAAC;AACpC,OAAO,8BAA8B,CAAC;AACtC,OAAO,uBAAuB,CAAC;AAC/B,OAAO,qCAAqC,CAAC;AAC7C,OAAO,+BAA+B,CAAC;AAEvC,qBAEa,UAAW,SAAQ,YAAY;IAE1C,SAAS,CAAC,aAAa,EAAG,aAAa,CAAC;IAGxC,SAAS,CAAC,SAAS,EAAG,UAAU,CAAC;IAGjC,SAAS,CAAC,WAAW,EAAG,gBAAgB,EAAE,CAAC;IAG3C,SAAS,CAAC,UAAU,EAAG,wBAAwB,CAAC;IAGhD,SAAS,CAAC,YAAY,EAAG,OAAO,CAAC;IAKjC,SAAS,CAAC,MAAM,EAAG,MAAM,CAAC;IAE1B;;OAEG;IACH,SAAS,CAAC,OAAO,EAAG,OAAO,CAAC,OAAO,CAAC;IAEpC;;OAEG;IACH,SAAS,CAAC,WAAW,EAAG,IAAI,CAAC;IAC7B,SAAS,CAAC,YAAY,EAAG,KAAK,CAAC;IAE/B;;OAEG;IACH,SAAS,CAAC,YAAY,WAAkB;IAExC,IAAW,MAAM,IAAI,IAAI,GAAG,KAAK,CAEhC;IAED;;OAEG;IAEH,SAAS,CAAC,GAAG,EAAG,GAAG,CAAC;;IAMP,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAsCrC;;OAEG;IACH,OAAO,CAAC,aAAa;IAuCrB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAc1B;;OAEG;IACI,KAAK;IAwBL,IAAI;IAMX;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA4CrC;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAW9B;;;;OAIG;IACI,GAAG,CAAC,UAAU,EAAE,cAAc,GAAG,mBAAmB,GAAG,IAAI;CAGnE"}
|
package/lib/mjs/server.js
CHANGED
|
@@ -15,7 +15,6 @@ import '@spinajs/templates-pug';
|
|
|
15
15
|
import { createServer as HttpCreateServer } from 'http';
|
|
16
16
|
import { createServer as HttpsCreateServer } from 'https';
|
|
17
17
|
import { existsSync } from 'fs';
|
|
18
|
-
import cors from 'cors';
|
|
19
18
|
import Express from 'express';
|
|
20
19
|
import _ from 'lodash';
|
|
21
20
|
import fs from 'fs';
|
|
@@ -25,6 +24,13 @@ import './middlewares/ResponseTime.js';
|
|
|
25
24
|
import './middlewares/RequestId.js';
|
|
26
25
|
import './middlewares/RealIp.js';
|
|
27
26
|
import './middlewares/ReqStorage.js';
|
|
27
|
+
import './middlewares/NotFound.js';
|
|
28
|
+
import './middlewares/ErrorHandler.js';
|
|
29
|
+
import './middlewares/AccessLog.js';
|
|
30
|
+
import './middlewares/Compression.js';
|
|
31
|
+
import './middlewares/Cors.js';
|
|
32
|
+
import './middlewares/SlowRequestWarning.js';
|
|
33
|
+
import './middlewares/ServerTiming.js';
|
|
28
34
|
let HttpServer = class HttpServer extends AsyncService {
|
|
29
35
|
get Server() {
|
|
30
36
|
return this.HttpsEnabled ? this._httpsServer : this._httpServer;
|
|
@@ -54,29 +60,8 @@ let HttpServer = class HttpServer extends AsyncService {
|
|
|
54
60
|
this.Log.info(`Using server middleware::before() - ${m.constructor.name}`);
|
|
55
61
|
this.use(m);
|
|
56
62
|
});
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
*/
|
|
60
|
-
const cOptions = this.Configuration.get('http.cors', undefined);
|
|
61
|
-
if (!cOptions) {
|
|
62
|
-
this.Log.warn(`CORS options not set, server may be unavaible from outside ! Please set http.cors configuration option.`);
|
|
63
|
-
}
|
|
64
|
-
else {
|
|
65
|
-
const corsOptions = {
|
|
66
|
-
origin(origin, callback) {
|
|
67
|
-
if (!cOptions || cOptions.origins.length === 0 || cOptions.origins.indexOf(origin) !== -1) {
|
|
68
|
-
callback(null, true);
|
|
69
|
-
}
|
|
70
|
-
else {
|
|
71
|
-
callback(new Error('cors not allowed'));
|
|
72
|
-
}
|
|
73
|
-
},
|
|
74
|
-
exposedHeaders: cOptions.exposedHeaders,
|
|
75
|
-
allowedHeaders: cOptions.allowedHeaders,
|
|
76
|
-
credentials: true,
|
|
77
|
-
};
|
|
78
|
-
this.use(cors(corsOptions));
|
|
79
|
-
}
|
|
63
|
+
// CORS is now provided by CorsMiddleware (registered as ServerMiddleware,
|
|
64
|
+
// applied through the standard `Middlewares.before()` loop below).
|
|
80
65
|
// register other server middlewares
|
|
81
66
|
this.Middlewares.forEach((m) => {
|
|
82
67
|
const f = m.before();
|
package/lib/mjs/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,YAAY,EAAc,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACtG,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,wBAAwB,CAAC;AAEhC,OAAO,EAAkB,YAAY,IAAI,gBAAgB,EAAE,MAAM,MAAM,CAAC;AACxE,OAAO,EAAmB,YAAY,IAAI,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"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"}
|