@celljs/web 4.3.0 → 4.4.1
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/README.md +48 -4
- package/cell.schema.json +266 -0
- package/cell.yml +12 -17
- package/esm/common/constants.d.ts +3 -3
- package/esm/common/constants.js +3 -3
- package/esm/common/constants.js.map +1 -1
- package/esm/node/body/body-middleware.js +1 -1
- package/esm/node/body/body-middleware.js.map +1 -1
- package/esm/node/body/body-parser.d.ts +5 -0
- package/esm/node/body/body-parser.js +7 -0
- package/esm/node/body/body-parser.js.map +1 -1
- package/esm/node/body/body-protocol.d.ts +1 -1
- package/esm/node/context.d.ts +4 -0
- package/esm/node/context.js +11 -11
- package/esm/node/context.js.map +1 -1
- package/esm/node/cookies/cookies-factory.js +2 -2
- package/esm/node/cookies/cookies-factory.js.map +1 -1
- package/esm/node/cookies/cookies-protocol.d.ts +1 -1
- package/esm/node/cookies/cookies-security-check.d.ts +13 -0
- package/esm/node/cookies/cookies-security-check.js +55 -0
- package/esm/node/cookies/cookies-security-check.js.map +1 -0
- package/esm/node/cookies/cookies.d.ts +1 -1
- package/esm/node/cookies/cookies.js +1 -1
- package/esm/node/cookies/index.d.ts +1 -0
- package/esm/node/cookies/index.js +1 -0
- package/esm/node/cookies/index.js.map +1 -1
- package/esm/node/cors/cors-middleware.d.ts +1 -1
- package/esm/node/cors/cors-middleware.js +1 -1
- package/esm/node/cors/cors-middleware.js.map +1 -1
- package/esm/node/cors/cors-protocol.d.ts +1 -1
- package/esm/node/dispatcher/dispatcher.d.ts +10 -0
- package/esm/node/dispatcher/dispatcher.js +36 -3
- package/esm/node/dispatcher/dispatcher.js.map +1 -1
- package/esm/node/error/error-handler-provider.d.ts +6 -2
- package/esm/node/error/error-handler-provider.js +17 -9
- package/esm/node/error/error-handler-provider.js.map +1 -1
- package/esm/node/error/error-message-resolver.d.ts +11 -0
- package/esm/node/error/error-message-resolver.js +43 -0
- package/esm/node/error/error-message-resolver.js.map +1 -0
- package/esm/node/error/error-protocol.d.ts +12 -2
- package/esm/node/error/error-protocol.js +3 -2
- package/esm/node/error/error-protocol.js.map +1 -1
- package/esm/node/error/error-response-util.d.ts +8 -0
- package/esm/node/error/error-response-util.js +24 -0
- package/esm/node/error/error-response-util.js.map +1 -0
- package/esm/node/error/http-error.d.ts +9 -1
- package/esm/node/error/http-error.js +6 -2
- package/esm/node/error/http-error.js.map +1 -1
- package/esm/node/error/index.d.ts +2 -0
- package/esm/node/error/index.js +2 -0
- package/esm/node/error/index.js.map +1 -1
- package/esm/node/health/health-executor.js +8 -12
- package/esm/node/health/health-executor.js.map +1 -1
- package/esm/node/health/health-middleware.js +1 -1
- package/esm/node/health/health-middleware.js.map +1 -1
- package/esm/node/matcher/request-matcher.js +2 -2
- package/esm/node/matcher/request-matcher.js.map +1 -1
- package/esm/node/session/session-manager.js +2 -2
- package/esm/node/session/session-manager.js.map +1 -1
- package/esm/node/session/session-middleware.js +1 -1
- package/esm/node/session/session-middleware.js.map +1 -1
- package/esm/node/session/session-store.js +1 -1
- package/esm/node/session/session-store.js.map +1 -1
- package/esm/node/session/session-strategy.js +1 -1
- package/esm/node/session/session-strategy.js.map +1 -1
- package/esm/node/session/session.d.ts +14 -2
- package/esm/node/session/session.js +33 -4
- package/esm/node/session/session.js.map +1 -1
- package/esm/node/trace/trace-id-resolver.js +2 -2
- package/esm/node/trace/trace-id-resolver.js.map +1 -1
- package/esm/node/trace/trace-protocol.d.ts +2 -2
- package/esm/node/trace/trace-protocol.js +2 -2
- package/esm/node/trace/trace-protocol.js.map +1 -1
- package/lib/common/constants.d.ts +3 -3
- package/lib/common/constants.d.ts.map +1 -1
- package/lib/common/constants.js +3 -3
- package/lib/common/constants.js.map +1 -1
- package/lib/node/body/body-middleware.js +1 -1
- package/lib/node/body/body-middleware.js.map +1 -1
- package/lib/node/body/body-parser.d.ts +5 -0
- package/lib/node/body/body-parser.d.ts.map +1 -1
- package/lib/node/body/body-parser.js +7 -0
- package/lib/node/body/body-parser.js.map +1 -1
- package/lib/node/body/body-protocol.d.ts +1 -1
- package/lib/node/body/body-protocol.d.ts.map +1 -1
- package/lib/node/context.d.ts +4 -0
- package/lib/node/context.d.ts.map +1 -1
- package/lib/node/context.js +11 -11
- package/lib/node/context.js.map +1 -1
- package/lib/node/context.spec.d.ts +2 -0
- package/lib/node/context.spec.d.ts.map +1 -0
- package/lib/node/context.spec.js +25 -0
- package/lib/node/context.spec.js.map +1 -0
- package/lib/node/cookies/cookies-factory.js +2 -2
- package/lib/node/cookies/cookies-factory.js.map +1 -1
- package/lib/node/cookies/cookies-protocol.d.ts +1 -1
- package/lib/node/cookies/cookies-protocol.d.ts.map +1 -1
- package/lib/node/cookies/cookies-security-check.d.ts +14 -0
- package/lib/node/cookies/cookies-security-check.d.ts.map +1 -0
- package/lib/node/cookies/cookies-security-check.js +58 -0
- package/lib/node/cookies/cookies-security-check.js.map +1 -0
- package/lib/node/cookies/cookies-security-check.spec.d.ts +2 -0
- package/lib/node/cookies/cookies-security-check.spec.d.ts.map +1 -0
- package/lib/node/cookies/cookies-security-check.spec.js +21 -0
- package/lib/node/cookies/cookies-security-check.spec.js.map +1 -0
- package/lib/node/cookies/cookies.d.ts +1 -1
- package/lib/node/cookies/cookies.js +1 -1
- package/lib/node/cookies/index.d.ts +1 -0
- package/lib/node/cookies/index.d.ts.map +1 -1
- package/lib/node/cookies/index.js +1 -0
- package/lib/node/cookies/index.js.map +1 -1
- package/lib/node/cors/cors-middleware.d.ts +1 -1
- package/lib/node/cors/cors-middleware.d.ts.map +1 -1
- package/lib/node/cors/cors-middleware.js +1 -1
- package/lib/node/cors/cors-middleware.js.map +1 -1
- package/lib/node/cors/cors-protocol.d.ts +1 -1
- package/lib/node/cors/cors-protocol.d.ts.map +1 -1
- package/lib/node/dispatcher/dispatcher.d.ts +10 -0
- package/lib/node/dispatcher/dispatcher.d.ts.map +1 -1
- package/lib/node/dispatcher/dispatcher.js +36 -3
- package/lib/node/dispatcher/dispatcher.js.map +1 -1
- package/lib/node/dispatcher/dispatcher.spec.d.ts +2 -0
- package/lib/node/dispatcher/dispatcher.spec.d.ts.map +1 -0
- package/lib/node/dispatcher/dispatcher.spec.js +105 -0
- package/lib/node/dispatcher/dispatcher.spec.js.map +1 -0
- package/lib/node/error/error-handler-provider.d.ts +6 -2
- package/lib/node/error/error-handler-provider.d.ts.map +1 -1
- package/lib/node/error/error-handler-provider.js +16 -8
- package/lib/node/error/error-handler-provider.js.map +1 -1
- package/lib/node/error/error-message-resolver.d.ts +12 -0
- package/lib/node/error/error-message-resolver.d.ts.map +1 -0
- package/lib/node/error/error-message-resolver.js +46 -0
- package/lib/node/error/error-message-resolver.js.map +1 -0
- package/lib/node/error/error-message-resolver.spec.d.ts +2 -0
- package/lib/node/error/error-message-resolver.spec.d.ts.map +1 -0
- package/lib/node/error/error-message-resolver.spec.js +42 -0
- package/lib/node/error/error-message-resolver.spec.js.map +1 -0
- package/lib/node/error/error-protocol.d.ts +12 -2
- package/lib/node/error/error-protocol.d.ts.map +1 -1
- package/lib/node/error/error-protocol.js +4 -3
- package/lib/node/error/error-protocol.js.map +1 -1
- package/lib/node/error/error-response-util.d.ts +9 -0
- package/lib/node/error/error-response-util.d.ts.map +1 -0
- package/lib/node/error/error-response-util.js +27 -0
- package/lib/node/error/error-response-util.js.map +1 -0
- package/lib/node/error/http-error.d.ts +9 -1
- package/lib/node/error/http-error.d.ts.map +1 -1
- package/lib/node/error/http-error.js +6 -2
- package/lib/node/error/http-error.js.map +1 -1
- package/lib/node/error/index.d.ts +2 -0
- package/lib/node/error/index.d.ts.map +1 -1
- package/lib/node/error/index.js +2 -0
- package/lib/node/error/index.js.map +1 -1
- package/lib/node/health/health-executor.d.ts.map +1 -1
- package/lib/node/health/health-executor.js +8 -12
- package/lib/node/health/health-executor.js.map +1 -1
- package/lib/node/health/health-executor.spec.d.ts +2 -0
- package/lib/node/health/health-executor.spec.d.ts.map +1 -0
- package/lib/node/health/health-executor.spec.js +44 -0
- package/lib/node/health/health-executor.spec.js.map +1 -0
- package/lib/node/health/health-middleware.js +1 -1
- package/lib/node/health/health-middleware.js.map +1 -1
- package/lib/node/matcher/request-matcher.js +2 -2
- package/lib/node/matcher/request-matcher.js.map +1 -1
- package/lib/node/session/session-manager.js +2 -2
- package/lib/node/session/session-manager.js.map +1 -1
- package/lib/node/session/session-middleware.js +1 -1
- package/lib/node/session/session-middleware.js.map +1 -1
- package/lib/node/session/session-store.js +1 -1
- package/lib/node/session/session-store.js.map +1 -1
- package/lib/node/session/session-strategy.js +1 -1
- package/lib/node/session/session-strategy.js.map +1 -1
- package/lib/node/session/session.d.ts +14 -2
- package/lib/node/session/session.d.ts.map +1 -1
- package/lib/node/session/session.js +33 -4
- package/lib/node/session/session.js.map +1 -1
- package/lib/node/session/session.spec.js +21 -0
- package/lib/node/session/session.spec.js.map +1 -1
- package/lib/node/trace/trace-id-resolver.js +1 -1
- package/lib/node/trace/trace-id-resolver.js.map +1 -1
- package/lib/node/trace/trace-protocol.d.ts +2 -2
- package/lib/node/trace/trace-protocol.d.ts.map +1 -1
- package/lib/node/trace/trace-protocol.js +2 -2
- package/lib/node/trace/trace-protocol.js.map +1 -1
- package/package.json +5 -4
- package/src/common/constants.ts +3 -3
- package/src/node/body/body-middleware.ts +1 -1
- package/src/node/body/body-parser.ts +8 -0
- package/src/node/body/body-protocol.ts +1 -1
- package/src/node/context.spec.ts +25 -0
- package/src/node/context.ts +9 -9
- package/src/node/cookies/cookies-factory.ts +2 -2
- package/src/node/cookies/cookies-protocol.ts +1 -1
- package/src/node/cookies/cookies-security-check.spec.ts +21 -0
- package/src/node/cookies/cookies-security-check.ts +44 -0
- package/src/node/cookies/cookies.ts +1 -1
- package/src/node/cookies/index.ts +1 -1
- package/src/node/cors/cors-middleware.ts +1 -1
- package/src/node/cors/cors-protocol.ts +1 -1
- package/src/node/dispatcher/dispatcher.spec.ts +110 -0
- package/src/node/dispatcher/dispatcher.ts +37 -4
- package/src/node/error/error-handler-provider.ts +17 -11
- package/src/node/error/error-message-resolver.spec.ts +44 -0
- package/src/node/error/error-message-resolver.ts +31 -0
- package/src/node/error/error-protocol.ts +14 -3
- package/src/node/error/error-response-util.ts +24 -0
- package/src/node/error/http-error.ts +14 -2
- package/src/node/error/index.ts +1 -1
- package/src/node/health/health-executor.spec.ts +40 -0
- package/src/node/health/health-executor.ts +8 -13
- package/src/node/health/health-middleware.ts +1 -1
- package/src/node/matcher/request-matcher.ts +2 -2
- package/src/node/session/session-manager.ts +2 -2
- package/src/node/session/session-middleware.ts +1 -1
- package/src/node/session/session-store.ts +1 -1
- package/src/node/session/session-strategy.ts +1 -1
- package/src/node/session/session.spec.ts +24 -0
- package/src/node/session/session.ts +41 -7
- package/src/node/trace/trace-id-resolver.ts +2 -2
- package/src/node/trace/trace-protocol.ts +2 -2
|
@@ -0,0 +1,55 @@
|
|
|
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 { Component, SecurityCheck, Value } from '@celljs/core';
|
|
11
|
+
/** The key in the cell.yml of @celljs/web, for development only. */
|
|
12
|
+
export const DEFAULT_COOKIE_KEYS = ['abcdef'];
|
|
13
|
+
/** Shorter keys can be guessed; 32 characters of `openssl rand -base64 32` are plenty. */
|
|
14
|
+
export const MIN_COOKIE_KEY_LENGTH = 16;
|
|
15
|
+
/**
|
|
16
|
+
* `web.cookies.keys` sign the cookies, the session cookie among them: whoever knows a key can write a
|
|
17
|
+
* session (with the security context in it) that the server accepts.
|
|
18
|
+
*/
|
|
19
|
+
let CookiesSecurityCheck = class CookiesSecurityCheck {
|
|
20
|
+
check() {
|
|
21
|
+
var _a;
|
|
22
|
+
const keys = ((_a = this.keys) !== null && _a !== void 0 ? _a : []).map(String);
|
|
23
|
+
if (keys.length === 0) {
|
|
24
|
+
return [{
|
|
25
|
+
code: 'CELL_SECURITY_COOKIE_KEYS_MISSING',
|
|
26
|
+
message: 'web.cookies.keys is empty, so cookies are not signed: clients can edit the session cookie and everything in it.',
|
|
27
|
+
hint: 'Set web.cookies.keys to a random secret from the environment, e.g. keys: ["${env.COOKIE_KEY}"] with COOKIE_KEY from openssl rand -base64 32.'
|
|
28
|
+
}];
|
|
29
|
+
}
|
|
30
|
+
if (keys.some(key => DEFAULT_COOKIE_KEYS.includes(key))) {
|
|
31
|
+
return [{
|
|
32
|
+
code: 'CELL_SECURITY_DEFAULT_COOKIE_KEYS',
|
|
33
|
+
message: 'web.cookies.keys holds the development key of @celljs/web, which is public: anyone can sign a session cookie the server accepts.',
|
|
34
|
+
hint: 'Set web.cookies.keys to a random secret from the environment, e.g. keys: ["${env.COOKIE_KEY}"] with COOKIE_KEY from openssl rand -base64 32.'
|
|
35
|
+
}];
|
|
36
|
+
}
|
|
37
|
+
if (keys.some(key => key.length < MIN_COOKIE_KEY_LENGTH)) {
|
|
38
|
+
return [{
|
|
39
|
+
code: 'CELL_SECURITY_WEAK_COOKIE_KEYS',
|
|
40
|
+
message: `A key of web.cookies.keys is shorter than ${MIN_COOKIE_KEY_LENGTH} characters and can be guessed.`,
|
|
41
|
+
hint: 'Use random keys of at least 32 characters, e.g. from openssl rand -base64 32; keep the old key after the new one while sessions signed with it expire.'
|
|
42
|
+
}];
|
|
43
|
+
}
|
|
44
|
+
return [];
|
|
45
|
+
}
|
|
46
|
+
};
|
|
47
|
+
__decorate([
|
|
48
|
+
Value('web.cookies.keys'),
|
|
49
|
+
__metadata("design:type", Array)
|
|
50
|
+
], CookiesSecurityCheck.prototype, "keys", void 0);
|
|
51
|
+
CookiesSecurityCheck = __decorate([
|
|
52
|
+
Component(SecurityCheck)
|
|
53
|
+
], CookiesSecurityCheck);
|
|
54
|
+
export { CookiesSecurityCheck };
|
|
55
|
+
//# sourceMappingURL=cookies-security-check.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cookies-security-check.js","sourceRoot":"","sources":["../../../src/node/cookies/cookies-security-check.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAmB,KAAK,EAAE,MAAM,cAAc,CAAC;AAEhF,oEAAoE;AACpE,MAAM,CAAC,MAAM,mBAAmB,GAAsB,CAAC,QAAQ,CAAC,CAAC;AAEjE,0FAA0F;AAC1F,MAAM,CAAC,MAAM,qBAAqB,GAAG,EAAE,CAAC;AAExC;;;GAGG;AAEI,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAK7B,KAAK;;QACD,MAAM,IAAI,GAAG,OAAC,IAAI,CAAC,IAAI,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpB,OAAO,CAAC;oBACJ,IAAI,EAAE,mCAAmC;oBACzC,OAAO,EAAE,iHAAiH;oBAC1H,IAAI,EAAE,8IAA8I;iBACvJ,CAAC,CAAC;QACP,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YACtD,OAAO,CAAC;oBACJ,IAAI,EAAE,mCAAmC;oBACzC,OAAO,EAAE,kIAAkI;oBAC3I,IAAI,EAAE,8IAA8I;iBACvJ,CAAC,CAAC;QACP,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,GAAG,qBAAqB,CAAC,EAAE,CAAC;YACvD,OAAO,CAAC;oBACJ,IAAI,EAAE,gCAAgC;oBACtC,OAAO,EAAE,6CAA6C,qBAAqB,iCAAiC;oBAC5G,IAAI,EAAE,wJAAwJ;iBACjK,CAAC,CAAC;QACP,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;CACJ,CAAA;AA3BsB;IADlB,KAAK,CAAC,kBAAkB,CAAC;;kDACS;AAH1B,oBAAoB;IADhC,SAAS,CAAC,aAAa,CAAC;GACZ,oBAAoB,CA8BhC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { CookieGetOptions, Cookies, CookieSetOptions } from './cookies-protocol.js';
|
|
2
2
|
/**
|
|
3
|
-
* Cookies of the current request and response. Signed cookies (when `
|
|
3
|
+
* Cookies of the current request and response. Signed cookies (when `web.cookies.keys` are set) carry a
|
|
4
4
|
* `<name>.sig` cookie made with the first key; any of the keys verifies it, and a cookie signed with an
|
|
5
5
|
* older key is signed again with the first.
|
|
6
6
|
*/
|
|
@@ -18,7 +18,7 @@ function escape(name) {
|
|
|
18
18
|
return name.replace(/[\^$\\.*+?()[\]{}|]/g, '\\$&');
|
|
19
19
|
}
|
|
20
20
|
/**
|
|
21
|
-
* Cookies of the current request and response. Signed cookies (when `
|
|
21
|
+
* Cookies of the current request and response. Signed cookies (when `web.cookies.keys` are set) carry a
|
|
22
22
|
* `<name>.sig` cookie made with the first key; any of the keys verifies it, and a cookie signed with an
|
|
23
23
|
* older key is signed again with the first.
|
|
24
24
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/node/cookies/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,WAAW,CAAC;AAC1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/node/cookies/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,WAAW,CAAC;AAC1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAAA,cAAc,0BAA0B,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Middleware } from '../middleware/index.js';
|
|
2
2
|
import { Context } from '../context.js';
|
|
3
3
|
import { CorsOptions, CorsOrigin } from './cors-protocol.js';
|
|
4
|
-
/** CORS headers from `
|
|
4
|
+
/** CORS headers from `web.cors`, with the options and defaults of the `cors` package of express. */
|
|
5
5
|
export declare class CorsMiddleware implements Middleware {
|
|
6
6
|
protected readonly options?: CorsOptions;
|
|
7
7
|
protected readonly endpoint?: string;
|
|
@@ -39,7 +39,7 @@ function isAllowed(origin, allowed) {
|
|
|
39
39
|
}
|
|
40
40
|
return !!allowed;
|
|
41
41
|
}
|
|
42
|
-
/** CORS headers from `
|
|
42
|
+
/** CORS headers from `web.cors`, with the options and defaults of the `cors` package of express. */
|
|
43
43
|
let CorsMiddleware = class CorsMiddleware {
|
|
44
44
|
constructor() {
|
|
45
45
|
this.priority = CORS_MIDDLEWARE_PRIORITY;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cors-middleware.js","sourceRoot":"","sources":["../../../src/node/cors/cors-middleware.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAA2B,MAAM,iBAAiB,CAAC;AAEpF,SAAS,IAAI,CAAC,KAAoC;IAC9C,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC1D,CAAC;AAED,6CAA6C;AAC7C,SAAS,IAAI,CAAC,QAAa,EAAE,KAAa;IACtC,MAAM,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC3C,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAClC,OAAO;IACX,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IAC3E,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;QACjE,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,OAAO,KAAK,KAAK,EAAE,CAAC,CAAC;IACvD,CAAC;AACL,CAAC;AAED,SAAS,SAAS,CAAC,MAAc,EAAE,OAAmB;IAClD,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC;IACD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,MAAM,KAAK,OAAO,CAAC;IAC9B,CAAC;IACD,IAAI,OAAO,YAAY,MAAM,EAAE,CAAC;QAC5B,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,CAAC,CAAC,OAAO,CAAC;AACrB,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"cors-middleware.js","sourceRoot":"","sources":["../../../src/node/cors/cors-middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export declare const CORS_MIDDLEWARE_PRIORITY: number;
|
|
2
2
|
export type CorsOrigin = boolean | string | RegExp | (string | RegExp)[];
|
|
3
|
-
/** `
|
|
3
|
+
/** `web.cors`, with the options and defaults of the `cors` package of express. */
|
|
4
4
|
export interface CorsOptions {
|
|
5
5
|
/**
|
|
6
6
|
* `'*'` (default): any origin; a string: that origin; `true`: the origin of the request; a RegExp or a list:
|
|
@@ -11,5 +11,15 @@ export declare class DispatcherImpl implements Dispatcher<Context> {
|
|
|
11
11
|
protected errorHandlerProvider: ErrorHandlerProvider;
|
|
12
12
|
protected readonly logger: Logger;
|
|
13
13
|
dispatch(ctx: Context): Promise<void>;
|
|
14
|
+
/**
|
|
15
|
+
* Server errors with their stack at the error level. Client errors are answers, not failures, and only
|
|
16
|
+
* go to the debug level: a 4xx `HttpError` (a 404 for an unknown path), or any error a handler answered
|
|
17
|
+
* with a redirect or a 4xx (login required, access denied).
|
|
18
|
+
*/
|
|
19
|
+
protected logError(err: unknown, status?: number): void;
|
|
20
|
+
/**
|
|
21
|
+
* The handler with the highest priority that can handle the error answers; when its `handle` throws,
|
|
22
|
+
* the next one is tried. When none answers, the response ends with a bare 500, so no request hangs.
|
|
23
|
+
*/
|
|
14
24
|
protected handleError(ctx: Context, err: Error): Promise<void>;
|
|
15
25
|
}
|
|
@@ -13,6 +13,10 @@ import { ErrorHandlerProvider } from '../error/error-handler-provider.js';
|
|
|
13
13
|
import { Dispatcher } from './dispatcher-protocol.js';
|
|
14
14
|
import { Component, Autowired, Logger } from '@celljs/core';
|
|
15
15
|
import { HandlerExecutionChain, HandlerMapping } from '../handler/handler-protocol.js';
|
|
16
|
+
import { STATUS_CODES } from 'node:http';
|
|
17
|
+
import { HttpStatus } from '@celljs/http';
|
|
18
|
+
import { HttpError } from '../error/http-error.js';
|
|
19
|
+
import { ErrorResponseUtil } from '../error/error-response-util.js';
|
|
16
20
|
let DispatcherImpl = class DispatcherImpl {
|
|
17
21
|
async dispatch(ctx) {
|
|
18
22
|
try {
|
|
@@ -21,10 +25,35 @@ let DispatcherImpl = class DispatcherImpl {
|
|
|
21
25
|
await this.handlerExecutionChain.execute(middlewares, () => this.handlerMapping.handle());
|
|
22
26
|
}
|
|
23
27
|
catch (err) {
|
|
24
|
-
|
|
25
|
-
|
|
28
|
+
try {
|
|
29
|
+
await this.handleError(ctx, err);
|
|
30
|
+
}
|
|
31
|
+
finally {
|
|
32
|
+
// After the handlers: the status they answered tells a refused request from a failure.
|
|
33
|
+
this.logError(err, ctx.response.statusCode);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Server errors with their stack at the error level. Client errors are answers, not failures, and only
|
|
39
|
+
* go to the debug level: a 4xx `HttpError` (a 404 for an unknown path), or any error a handler answered
|
|
40
|
+
* with a redirect or a 4xx (login required, access denied).
|
|
41
|
+
*/
|
|
42
|
+
logError(err, status) {
|
|
43
|
+
const answered = status !== undefined && status >= 300 && status < 500;
|
|
44
|
+
if ((err instanceof HttpError && err.statusCode < 500) || answered) {
|
|
45
|
+
if (this.logger.isEnabled('debug')) {
|
|
46
|
+
this.logger.debug(`${err instanceof HttpError ? err.statusCode : status} ${err instanceof Error ? err.message : String(err)}`);
|
|
47
|
+
}
|
|
48
|
+
return;
|
|
26
49
|
}
|
|
50
|
+
// The logger writes an error with its stack and causes.
|
|
51
|
+
this.logger.error(err instanceof Error ? err : String(err));
|
|
27
52
|
}
|
|
53
|
+
/**
|
|
54
|
+
* The handler with the highest priority that can handle the error answers; when its `handle` throws,
|
|
55
|
+
* the next one is tried. When none answers, the response ends with a bare 500, so no request hangs.
|
|
56
|
+
*/
|
|
28
57
|
async handleError(ctx, err) {
|
|
29
58
|
const errorHandlers = this.errorHandlerProvider.provide();
|
|
30
59
|
for (const handler of errorHandlers) {
|
|
@@ -33,12 +62,16 @@ let DispatcherImpl = class DispatcherImpl {
|
|
|
33
62
|
await handler.handle(ctx, err);
|
|
34
63
|
}
|
|
35
64
|
catch (error) {
|
|
36
|
-
|
|
65
|
+
// A handler that gives the error back (it cannot answer it) is not a second failure.
|
|
66
|
+
if (error !== err) {
|
|
67
|
+
this.logError(error);
|
|
68
|
+
}
|
|
37
69
|
continue;
|
|
38
70
|
}
|
|
39
71
|
return;
|
|
40
72
|
}
|
|
41
73
|
}
|
|
74
|
+
ErrorResponseUtil.end(ctx, HttpStatus.INTERNAL_SERVER_ERROR, STATUS_CODES[HttpStatus.INTERNAL_SERVER_ERROR]);
|
|
42
75
|
}
|
|
43
76
|
};
|
|
44
77
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatcher.js","sourceRoot":"","sources":["../../../src/node/dispatcher/dispatcher.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"dispatcher.js","sourceRoot":"","sources":["../../../src/node/dispatcher/dispatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import { Context } from '../context.js';
|
|
2
|
-
import { ErrorHandler } from './error-protocol.js';
|
|
2
|
+
import { ErrorHandler, ErrorMessageResolver } from './error-protocol.js';
|
|
3
3
|
import { HttpError } from './http-error.js';
|
|
4
|
+
import { ValidationErrors } from '../../common/pipe/index.js';
|
|
4
5
|
export declare abstract class AbstractErrorHandler implements ErrorHandler {
|
|
5
6
|
readonly priority: number;
|
|
7
|
+
protected readonly errorMessageResolver: ErrorMessageResolver;
|
|
6
8
|
canHandle(ctx: Context, err: Error): Promise<boolean>;
|
|
9
|
+
/** The dispatcher has logged the error already; the client gets what {@link ErrorMessageResolver} decides. */
|
|
7
10
|
handle(ctx: Context, err: Error): Promise<void>;
|
|
8
11
|
doHandle(ctx: Context, err: Error): Promise<void>;
|
|
9
12
|
}
|
|
@@ -11,13 +14,14 @@ export declare class DefaultErrorHandler extends AbstractErrorHandler {
|
|
|
11
14
|
}
|
|
12
15
|
export declare class HttpErrorHandler implements ErrorHandler {
|
|
13
16
|
readonly priority: number;
|
|
17
|
+
protected readonly errorMessageResolver: ErrorMessageResolver;
|
|
14
18
|
canHandle(ctx: Context, err: Error): Promise<boolean>;
|
|
15
19
|
handle(ctx: Context, err: HttpError): Promise<void>;
|
|
16
20
|
}
|
|
17
21
|
export declare class ValidationErrorsHandler implements ErrorHandler {
|
|
18
22
|
readonly priority: number;
|
|
19
23
|
canHandle(ctx: Context, err: Error): Promise<boolean>;
|
|
20
|
-
handle(ctx: Context, err:
|
|
24
|
+
handle(ctx: Context, err: ValidationErrors): Promise<void>;
|
|
21
25
|
}
|
|
22
26
|
export declare class ErrorHandlerProvider {
|
|
23
27
|
protected readonly handlers: ErrorHandler[];
|
|
@@ -11,27 +11,32 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
11
11
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
12
12
|
};
|
|
13
13
|
import { Component, Autowired, Prioritizeable } from '@celljs/core';
|
|
14
|
-
import { ErrorHandler,
|
|
14
|
+
import { ErrorHandler, ErrorMessageResolver, DEFAULT_ERROR_HANDLER_PRIORITY, HTTP_ERROR_HANDLER_PRIORITY, VALIDATION_ERRORS_ERROR_HANDLER_PRIORITY } from './error-protocol.js';
|
|
15
15
|
import { HttpError } from './http-error.js';
|
|
16
|
+
import { ErrorResponseUtil } from './error-response-util.js';
|
|
16
17
|
import { HttpStatus } from '@celljs/http';
|
|
17
18
|
import { ValidationErrors } from '../../common/pipe/index.js';
|
|
18
19
|
export class AbstractErrorHandler {
|
|
19
20
|
constructor() {
|
|
20
|
-
this.priority =
|
|
21
|
+
this.priority = DEFAULT_ERROR_HANDLER_PRIORITY;
|
|
21
22
|
}
|
|
22
23
|
canHandle(ctx, err) {
|
|
23
24
|
return Promise.resolve(true);
|
|
24
25
|
}
|
|
26
|
+
/** The dispatcher has logged the error already; the client gets what {@link ErrorMessageResolver} decides. */
|
|
25
27
|
async handle(ctx, err) {
|
|
26
|
-
|
|
27
|
-
ctx
|
|
28
|
-
ctx.response.end(err.message);
|
|
28
|
+
const { status, message } = this.errorMessageResolver.resolve(err);
|
|
29
|
+
ErrorResponseUtil.end(ctx, status, message);
|
|
29
30
|
await this.doHandle(ctx, err);
|
|
30
31
|
}
|
|
31
32
|
doHandle(ctx, err) {
|
|
32
33
|
return Promise.resolve();
|
|
33
34
|
}
|
|
34
35
|
}
|
|
36
|
+
__decorate([
|
|
37
|
+
Autowired(ErrorMessageResolver),
|
|
38
|
+
__metadata("design:type", Object)
|
|
39
|
+
], AbstractErrorHandler.prototype, "errorMessageResolver", void 0);
|
|
35
40
|
let DefaultErrorHandler = class DefaultErrorHandler extends AbstractErrorHandler {
|
|
36
41
|
};
|
|
37
42
|
DefaultErrorHandler = __decorate([
|
|
@@ -46,10 +51,14 @@ let HttpErrorHandler = class HttpErrorHandler {
|
|
|
46
51
|
return Promise.resolve(err instanceof HttpError);
|
|
47
52
|
}
|
|
48
53
|
async handle(ctx, err) {
|
|
49
|
-
|
|
50
|
-
|
|
54
|
+
const { status, message } = this.errorMessageResolver.resolve(err);
|
|
55
|
+
ErrorResponseUtil.end(ctx, status, message);
|
|
51
56
|
}
|
|
52
57
|
};
|
|
58
|
+
__decorate([
|
|
59
|
+
Autowired(ErrorMessageResolver),
|
|
60
|
+
__metadata("design:type", Object)
|
|
61
|
+
], HttpErrorHandler.prototype, "errorMessageResolver", void 0);
|
|
53
62
|
HttpErrorHandler = __decorate([
|
|
54
63
|
Component(ErrorHandler)
|
|
55
64
|
], HttpErrorHandler);
|
|
@@ -62,8 +71,7 @@ let ValidationErrorsHandler = class ValidationErrorsHandler {
|
|
|
62
71
|
return Promise.resolve(err instanceof ValidationErrors);
|
|
63
72
|
}
|
|
64
73
|
async handle(ctx, err) {
|
|
65
|
-
ctx
|
|
66
|
-
ctx.response.end(err.message);
|
|
74
|
+
ErrorResponseUtil.end(ctx, HttpStatus.BAD_REQUEST, err.message);
|
|
67
75
|
}
|
|
68
76
|
};
|
|
69
77
|
ValidationErrorsHandler = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-handler-provider.js","sourceRoot":"","sources":["../../../src/node/error/error-handler-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,8BAA8B,EAAE,2BAA2B,EAAE,wCAAwC,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"error-handler-provider.js","sourceRoot":"","sources":["../../../src/node/error/error-handler-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,8BAA8B,EAAE,2BAA2B,EAAE,wCAAwC,EAAE,MAAM,kBAAkB,CAAC;AAC7K,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,MAAM,OAAgB,oBAAoB;IAA1C;QACa,aAAQ,GAAW,8BAA8B,CAAC;IAmB/D,CAAC;IAdG,SAAS,CAAC,GAAY,EAAE,GAAU;QAC9B,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,8GAA8G;IAC9G,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,GAAU;QACjC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACnE,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAC5C,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;IAED,QAAQ,CAAC,GAAY,EAAE,GAAU;QAC7B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;CACJ;AAhBsB;IADlB,SAAS,CAAC,oBAAoB,CAAC;;kEAC8B;AAmB3D,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,oBAAoB;CAC5D,CAAA;AADY,mBAAmB;IAD/B,SAAS,CAAC,YAAY,CAAC;GACX,mBAAmB,CAC/B;;AAGM,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAAtB;QACM,aAAQ,GAAW,2BAA2B,CAAC;IAa5D,CAAC;IARG,SAAS,CAAC,GAAY,EAAE,GAAU;QAC9B,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,YAAY,SAAS,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,GAAc;QACrC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACnE,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;CACJ,CAAA;AAVsB;IADlB,SAAS,CAAC,oBAAoB,CAAC;;8DAC8B;AAJrD,gBAAgB;IAD5B,SAAS,CAAC,YAAY,CAAC;GACX,gBAAgB,CAc5B;;AAGM,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAA7B;QACM,aAAQ,GAAW,wCAAwC,CAAC;IASzE,CAAC;IAPG,SAAS,CAAC,GAAY,EAAE,GAAU;QAC9B,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,YAAY,gBAAgB,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,GAAqB;QAC5C,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IACpE,CAAC;CACJ,CAAA;AAVY,uBAAuB;IADnC,SAAS,CAAC,YAAY,CAAC;GACX,uBAAuB,CAUnC;;AAGM,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAI7B,YAEuB,QAAwB;wBAAxB,QAAQ;IAC3B,CAAC;IAEL,OAAO;QACH,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACpB,IAAI,CAAC,WAAW,GAAG,cAAc,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACzF,CAAC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;CAEJ,CAAA;AAhBY,oBAAoB;IADhC,SAAS,EAAE;IAMH,WAAA,SAAS,CAAC,YAAY,CAAC,CAAA;;GALnB,oBAAoB,CAgBhC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { ErrorMessageResolver, ErrorResponse } from './error-protocol.js';
|
|
2
|
+
/**
|
|
3
|
+
* A 4xx `HttpError` (or one with `expose: true`) answers with its message. Any other error answers
|
|
4
|
+
* with the status text (`Internal Server Error`) in production, so that messages of internal errors
|
|
5
|
+
* (SQL, file paths, hosts) stay in the log; `web.errors.exposeMessages` decides otherwise.
|
|
6
|
+
*/
|
|
7
|
+
export declare class ErrorMessageResolverImpl implements ErrorMessageResolver {
|
|
8
|
+
protected readonly exposeMessages?: boolean;
|
|
9
|
+
resolve(error: unknown): ErrorResponse;
|
|
10
|
+
protected exposesMessages(): boolean;
|
|
11
|
+
}
|
|
@@ -0,0 +1,43 @@
|
|
|
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 { STATUS_CODES } from 'node:http';
|
|
11
|
+
import { Component, Value } from '@celljs/core';
|
|
12
|
+
import { HttpError } from './http-error.js';
|
|
13
|
+
import { ErrorMessageResolver } from './error-protocol.js';
|
|
14
|
+
/**
|
|
15
|
+
* A 4xx `HttpError` (or one with `expose: true`) answers with its message. Any other error answers
|
|
16
|
+
* with the status text (`Internal Server Error`) in production, so that messages of internal errors
|
|
17
|
+
* (SQL, file paths, hosts) stay in the log; `web.errors.exposeMessages` decides otherwise.
|
|
18
|
+
*/
|
|
19
|
+
let ErrorMessageResolverImpl = class ErrorMessageResolverImpl {
|
|
20
|
+
resolve(error) {
|
|
21
|
+
var _a;
|
|
22
|
+
const status = error instanceof HttpError ? error.statusCode : 500;
|
|
23
|
+
const statusText = (_a = STATUS_CODES[status]) !== null && _a !== void 0 ? _a : `HTTP ${status}`;
|
|
24
|
+
const exposed = (error instanceof HttpError && error.expose) || this.exposesMessages();
|
|
25
|
+
const message = error instanceof Error ? error.message : undefined;
|
|
26
|
+
return { status, message: exposed && message ? message : statusText };
|
|
27
|
+
}
|
|
28
|
+
exposesMessages() {
|
|
29
|
+
if (typeof this.exposeMessages === 'boolean') {
|
|
30
|
+
return this.exposeMessages;
|
|
31
|
+
}
|
|
32
|
+
return process.env.NODE_ENV !== 'production';
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
__decorate([
|
|
36
|
+
Value('web.errors.exposeMessages'),
|
|
37
|
+
__metadata("design:type", Boolean)
|
|
38
|
+
], ErrorMessageResolverImpl.prototype, "exposeMessages", void 0);
|
|
39
|
+
ErrorMessageResolverImpl = __decorate([
|
|
40
|
+
Component(ErrorMessageResolver)
|
|
41
|
+
], ErrorMessageResolverImpl);
|
|
42
|
+
export { ErrorMessageResolverImpl };
|
|
43
|
+
//# sourceMappingURL=error-message-resolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"error-message-resolver.js","sourceRoot":"","sources":["../../../src/node/error/error-message-resolver.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAiB,MAAM,kBAAkB,CAAC;AAEvE;;;;GAIG;AAEI,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAKjC,OAAO,CAAC,KAAc;;QAClB,MAAM,MAAM,GAAG,KAAK,YAAY,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC;QACnE,MAAM,UAAU,SAAG,YAAY,CAAC,MAAM,CAAC,mCAAI,QAAQ,MAAM,EAAE,CAAC;QAC5D,MAAM,OAAO,GAAG,CAAC,KAAK,YAAY,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;QACvF,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QACnE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;IAC1E,CAAC;IAES,eAAe;QACrB,IAAI,OAAO,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YAC3C,OAAO,IAAI,CAAC,cAAc,CAAC;QAC/B,CAAC;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;IACjD,CAAC;CACJ,CAAA;AAhBsB;IADlB,KAAK,CAAC,2BAA2B,CAAC;;gEACS;AAHnC,wBAAwB;IADpC,SAAS,CAAC,oBAAoB,CAAC;GACnB,wBAAwB,CAmBpC"}
|
|
@@ -1,13 +1,23 @@
|
|
|
1
1
|
import { Context } from '../context.js';
|
|
2
2
|
export declare const ErrorHandler: unique symbol;
|
|
3
|
-
export declare const
|
|
3
|
+
export declare const ErrorMessageResolver: unique symbol;
|
|
4
|
+
export declare const DEFAULT_ERROR_HANDLER_PRIORITY = 1;
|
|
4
5
|
export declare const HTTP_ERROR_HANDLER_PRIORITY: number;
|
|
5
6
|
export declare const VALIDATION_ERRORS_ERROR_HANDLER_PRIORITY: number;
|
|
6
7
|
export interface ErrorHandler {
|
|
7
8
|
/**
|
|
8
|
-
* The priority value must be greater than the default Error Handler's priority:
|
|
9
|
+
* The priority value must be greater than the default Error Handler's priority: DEFAULT_ERROR_HANDLER_PRIORITY, otherwise it will never be executed.
|
|
9
10
|
*/
|
|
10
11
|
readonly priority: number;
|
|
11
12
|
canHandle(ctx: Context, err: Error): Promise<boolean>;
|
|
12
13
|
handle(ctx: Context, err: Error): Promise<void>;
|
|
13
14
|
}
|
|
15
|
+
/** What the client is told about an error. */
|
|
16
|
+
export interface ErrorResponse {
|
|
17
|
+
status: number;
|
|
18
|
+
message: string;
|
|
19
|
+
}
|
|
20
|
+
/** Decides the status and the message an error answers with; error handlers and the mvc JSON view use it. */
|
|
21
|
+
export interface ErrorMessageResolver {
|
|
22
|
+
resolve(error: unknown): ErrorResponse;
|
|
23
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export const ErrorHandler = Symbol('ErrorHandler');
|
|
2
|
-
export const
|
|
3
|
-
export const
|
|
2
|
+
export const ErrorMessageResolver = Symbol('ErrorMessageResolver');
|
|
3
|
+
export const DEFAULT_ERROR_HANDLER_PRIORITY = 1;
|
|
4
|
+
export const HTTP_ERROR_HANDLER_PRIORITY = DEFAULT_ERROR_HANDLER_PRIORITY + 100;
|
|
4
5
|
export const VALIDATION_ERRORS_ERROR_HANDLER_PRIORITY = HTTP_ERROR_HANDLER_PRIORITY + 100;
|
|
5
6
|
//# sourceMappingURL=error-protocol.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-protocol.js","sourceRoot":"","sources":["../../../src/node/error/error-protocol.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"error-protocol.js","sourceRoot":"","sources":["../../../src/node/error/error-protocol.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AACnD,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,CAAC;AAChD,MAAM,CAAC,MAAM,2BAA2B,GAAG,8BAA8B,GAAG,GAAG,CAAC;AAChF,MAAM,CAAC,MAAM,wCAAwC,GAAG,2BAA2B,GAAG,GAAG,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { Context } from '../context.js';
|
|
2
|
+
export declare namespace ErrorResponseUtil {
|
|
3
|
+
/**
|
|
4
|
+
* Ends the response of a failed request with `status` and `body` (and `contentType` when given).
|
|
5
|
+
* A response the handler had already started is only ended; an ended one is left alone.
|
|
6
|
+
*/
|
|
7
|
+
function end(ctx: Context, status: number, body: string, contentType?: string): void;
|
|
8
|
+
}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
export var ErrorResponseUtil;
|
|
2
|
+
(function (ErrorResponseUtil) {
|
|
3
|
+
/**
|
|
4
|
+
* Ends the response of a failed request with `status` and `body` (and `contentType` when given).
|
|
5
|
+
* A response the handler had already started is only ended; an ended one is left alone.
|
|
6
|
+
*/
|
|
7
|
+
function end(ctx, status, body, contentType) {
|
|
8
|
+
const { response } = ctx;
|
|
9
|
+
if (response.writableEnded) {
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
12
|
+
if (response.headersSent) {
|
|
13
|
+
response.end();
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
16
|
+
response.statusCode = status;
|
|
17
|
+
if (contentType) {
|
|
18
|
+
response.setHeader('Content-Type', contentType);
|
|
19
|
+
}
|
|
20
|
+
response.end(body);
|
|
21
|
+
}
|
|
22
|
+
ErrorResponseUtil.end = end;
|
|
23
|
+
})(ErrorResponseUtil || (ErrorResponseUtil = {}));
|
|
24
|
+
//# sourceMappingURL=error-response-util.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"error-response-util.js","sourceRoot":"","sources":["../../../src/node/error/error-response-util.ts"],"names":[],"mappings":"AAEA,MAAM,KAAW,iBAAiB,CAqBjC;AArBD,WAAiB,iBAAiB;IAE9B;;;OAGG;IACH,SAAgB,GAAG,CAAC,GAAY,EAAE,MAAc,EAAE,IAAY,EAAE,WAAoB;QAChF,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC;QACzB,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;YACzB,OAAO;QACX,CAAC;QACD,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;YACvB,QAAQ,CAAC,GAAG,EAAE,CAAC;YACf,OAAO;QACX,CAAC;QACD,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC;QAC7B,IAAI,WAAW,EAAE,CAAC;YACd,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QACpD,CAAC;QACD,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAde,kBAAA,GAAG,MAclB,CAAA;AACL,CAAC,EArBgB,iBAAiB,KAAjB,iBAAiB,QAqBjC"}
|
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
import { CustomError } from '@celljs/core';
|
|
2
|
+
export interface HttpErrorOptions {
|
|
3
|
+
/** The error behind this one; logged with it, never sent. */
|
|
4
|
+
cause?: unknown;
|
|
5
|
+
/** Whether the client gets `message`; default: for 4xx, not for 5xx (see `web.errors.exposeMessages`). */
|
|
6
|
+
expose?: boolean;
|
|
7
|
+
}
|
|
8
|
+
/** An error that answers with `statusCode`. Without a message, the message is the status text (`Not Found`). */
|
|
2
9
|
export declare class HttpError extends CustomError {
|
|
3
10
|
statusCode: number;
|
|
4
|
-
|
|
11
|
+
readonly expose: boolean;
|
|
12
|
+
constructor(statusCode: number, message?: string, options?: HttpErrorOptions);
|
|
5
13
|
}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
|
+
import { STATUS_CODES } from 'node:http';
|
|
1
2
|
import { CustomError } from '@celljs/core';
|
|
3
|
+
/** An error that answers with `statusCode`. Without a message, the message is the status text (`Not Found`). */
|
|
2
4
|
export class HttpError extends CustomError {
|
|
3
|
-
constructor(statusCode, message) {
|
|
4
|
-
|
|
5
|
+
constructor(statusCode, message, options = {}) {
|
|
6
|
+
var _a, _b;
|
|
7
|
+
super((_a = message !== null && message !== void 0 ? message : STATUS_CODES[statusCode]) !== null && _a !== void 0 ? _a : `HTTP ${statusCode}`, options.cause === undefined ? undefined : { cause: options.cause });
|
|
5
8
|
this.statusCode = statusCode;
|
|
9
|
+
this.expose = (_b = options.expose) !== null && _b !== void 0 ? _b : statusCode < 500;
|
|
6
10
|
}
|
|
7
11
|
}
|
|
8
12
|
//# sourceMappingURL=http-error.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-error.js","sourceRoot":"","sources":["../../../src/node/error/http-error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"http-error.js","sourceRoot":"","sources":["../../../src/node/error/http-error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAS3C,gHAAgH;AAChH,MAAM,OAAO,SAAU,SAAQ,WAAW;IAItC,YAAmB,UAAkB,EAAE,OAAgB,EAAE,OAAO,GAAqB,EAAE;;QACnF,KAAK,OAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,YAAY,CAAC,UAAU,CAAC,mCAAI,QAAQ,UAAU,EAAE,EAAE,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;0BADxH,UAAU;QAEzB,IAAI,CAAC,MAAM,SAAG,OAAO,CAAC,MAAM,mCAAI,UAAU,GAAG,GAAG,CAAC;IACrD,CAAC;CAEJ"}
|
package/esm/node/error/index.js
CHANGED
|
@@ -2,4 +2,6 @@ export * from './http-error.js';
|
|
|
2
2
|
export * from './error-handler-provider.js';
|
|
3
3
|
export * from './error-protocol.js';
|
|
4
4
|
export * from './not-found-error.js';
|
|
5
|
+
export * from './error-message-resolver.js';
|
|
6
|
+
export * from './error-response-util.js';
|
|
5
7
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/node/error/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,0BAA0B,CAAC;AACzC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/node/error/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,0BAA0B,CAAC;AACzC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAAA,cAAc,0BAA0B,CAAC;AAAA,cAAc,uBAAuB,CAAC"}
|
|
@@ -26,19 +26,15 @@ let HealthExecutorImpl = class HealthExecutorImpl {
|
|
|
26
26
|
}
|
|
27
27
|
throw new HealthNotFoundError(indicatorName, `Health indicator ${indicatorName} not found`);
|
|
28
28
|
}
|
|
29
|
+
// Each indicator is checked once, all at the same time; the components keep the order of the indicators.
|
|
30
|
+
const named = this.healthIndicators
|
|
31
|
+
.map(indicator => ({ indicator, name: this.getHealthIndicatorName(indicator) }))
|
|
32
|
+
.filter((entry) => !!entry.name);
|
|
33
|
+
const healths = await Promise.all(named.map(({ indicator }) => indicator.health()));
|
|
29
34
|
const components = {};
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
components[name.toLowerCase().replace('healthindicator', '')] = await healthIndicator.health();
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
await Promise.all(this.healthIndicators.map(async (h) => {
|
|
37
|
-
const name = this.getHealthIndicatorName(h);
|
|
38
|
-
if (name) {
|
|
39
|
-
components[name.toLowerCase().replace('healthindicator', '')] = await h.health();
|
|
40
|
-
}
|
|
41
|
-
}));
|
|
35
|
+
named.forEach(({ name }, index) => {
|
|
36
|
+
components[name.replace('healthindicator', '')] = healths[index];
|
|
37
|
+
});
|
|
42
38
|
return {
|
|
43
39
|
status: this.healthStatusAggregator.aggregate(Object.values(components).map(c => c.status)),
|
|
44
40
|
components
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health-executor.js","sourceRoot":"","sources":["../../../src/node/health/health-executor.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAoC,cAAc,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAGvH,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAQjB,sBAAsB,CAAC,eAAgC;;QAC7D,OAAO,MAAA,MAAA,cAAc,CAAC,eAAe,CAAC,0CAAE,IAAI,0CAAE,WAAW,EAAE,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,aAAsB;QAChC,IAAI,aAAa,EAAE,CAAC;YAChB,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;gBACnD,MAAM,IAAI,GAAG,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;gBAC5C,OAAO,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CAAC,aAAa,CAAC,CAAC;YAC3C,CAAC,CAAC,CAAC;YACH,IAAI,eAAe,EAAE,CAAC;gBAClB,OAAO,eAAe,CAAC,MAAM,EAAE,CAAC;YACpC,CAAC;YACD,MAAM,IAAI,mBAAmB,CAAC,aAAa,EAAE,oBAAoB,aAAa,YAAY,CAAC,CAAC;QAChG,CAAC;QACD,MAAM,
|
|
1
|
+
{"version":3,"file":"health-executor.js","sourceRoot":"","sources":["../../../src/node/health/health-executor.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAoC,cAAc,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAGvH,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAQjB,sBAAsB,CAAC,eAAgC;;QAC7D,OAAO,MAAA,MAAA,cAAc,CAAC,eAAe,CAAC,0CAAE,IAAI,0CAAE,WAAW,EAAE,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,aAAsB;QAChC,IAAI,aAAa,EAAE,CAAC;YAChB,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;gBACnD,MAAM,IAAI,GAAG,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;gBAC5C,OAAO,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CAAC,aAAa,CAAC,CAAC;YAC3C,CAAC,CAAC,CAAC;YACH,IAAI,eAAe,EAAE,CAAC;gBAClB,OAAO,eAAe,CAAC,MAAM,EAAE,CAAC;YACpC,CAAC;YACD,MAAM,IAAI,mBAAmB,CAAC,aAAa,EAAE,oBAAoB,aAAa,YAAY,CAAC,CAAC;QAChG,CAAC;QACD,yGAAyG;QACzG,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB;aAC9B,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;aAC/E,MAAM,CAAC,CAAC,KAAK,EAAyD,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5F,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACpF,MAAM,UAAU,GAAuC,EAAE,CAAC;QAC1D,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE;YAC9B,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;QAEH,OAAwB;YACpB,MAAM,EAAE,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YAC3F,UAAU;SACb,CAAC;IACN,CAAC;CAEJ,CAAA;AApCsB;IADlB,SAAS,CAAC,eAAe,CAAC;;4DAC4B;AAGpC;IADlB,SAAS,CAAC,sBAAsB,CAAC;;kEACgC;AANzD,kBAAkB;IAD9B,SAAS,CAAC,cAAc,CAAC;GACb,kBAAkB,CAuC9B"}
|