@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.
Files changed (220) hide show
  1. package/README.md +48 -4
  2. package/cell.schema.json +266 -0
  3. package/cell.yml +12 -17
  4. package/esm/common/constants.d.ts +3 -3
  5. package/esm/common/constants.js +3 -3
  6. package/esm/common/constants.js.map +1 -1
  7. package/esm/node/body/body-middleware.js +1 -1
  8. package/esm/node/body/body-middleware.js.map +1 -1
  9. package/esm/node/body/body-parser.d.ts +5 -0
  10. package/esm/node/body/body-parser.js +7 -0
  11. package/esm/node/body/body-parser.js.map +1 -1
  12. package/esm/node/body/body-protocol.d.ts +1 -1
  13. package/esm/node/context.d.ts +4 -0
  14. package/esm/node/context.js +11 -11
  15. package/esm/node/context.js.map +1 -1
  16. package/esm/node/cookies/cookies-factory.js +2 -2
  17. package/esm/node/cookies/cookies-factory.js.map +1 -1
  18. package/esm/node/cookies/cookies-protocol.d.ts +1 -1
  19. package/esm/node/cookies/cookies-security-check.d.ts +13 -0
  20. package/esm/node/cookies/cookies-security-check.js +55 -0
  21. package/esm/node/cookies/cookies-security-check.js.map +1 -0
  22. package/esm/node/cookies/cookies.d.ts +1 -1
  23. package/esm/node/cookies/cookies.js +1 -1
  24. package/esm/node/cookies/index.d.ts +1 -0
  25. package/esm/node/cookies/index.js +1 -0
  26. package/esm/node/cookies/index.js.map +1 -1
  27. package/esm/node/cors/cors-middleware.d.ts +1 -1
  28. package/esm/node/cors/cors-middleware.js +1 -1
  29. package/esm/node/cors/cors-middleware.js.map +1 -1
  30. package/esm/node/cors/cors-protocol.d.ts +1 -1
  31. package/esm/node/dispatcher/dispatcher.d.ts +10 -0
  32. package/esm/node/dispatcher/dispatcher.js +36 -3
  33. package/esm/node/dispatcher/dispatcher.js.map +1 -1
  34. package/esm/node/error/error-handler-provider.d.ts +6 -2
  35. package/esm/node/error/error-handler-provider.js +17 -9
  36. package/esm/node/error/error-handler-provider.js.map +1 -1
  37. package/esm/node/error/error-message-resolver.d.ts +11 -0
  38. package/esm/node/error/error-message-resolver.js +43 -0
  39. package/esm/node/error/error-message-resolver.js.map +1 -0
  40. package/esm/node/error/error-protocol.d.ts +12 -2
  41. package/esm/node/error/error-protocol.js +3 -2
  42. package/esm/node/error/error-protocol.js.map +1 -1
  43. package/esm/node/error/error-response-util.d.ts +8 -0
  44. package/esm/node/error/error-response-util.js +24 -0
  45. package/esm/node/error/error-response-util.js.map +1 -0
  46. package/esm/node/error/http-error.d.ts +9 -1
  47. package/esm/node/error/http-error.js +6 -2
  48. package/esm/node/error/http-error.js.map +1 -1
  49. package/esm/node/error/index.d.ts +2 -0
  50. package/esm/node/error/index.js +2 -0
  51. package/esm/node/error/index.js.map +1 -1
  52. package/esm/node/health/health-executor.js +8 -12
  53. package/esm/node/health/health-executor.js.map +1 -1
  54. package/esm/node/health/health-middleware.js +1 -1
  55. package/esm/node/health/health-middleware.js.map +1 -1
  56. package/esm/node/matcher/request-matcher.js +2 -2
  57. package/esm/node/matcher/request-matcher.js.map +1 -1
  58. package/esm/node/session/session-manager.js +2 -2
  59. package/esm/node/session/session-manager.js.map +1 -1
  60. package/esm/node/session/session-middleware.js +1 -1
  61. package/esm/node/session/session-middleware.js.map +1 -1
  62. package/esm/node/session/session-store.js +1 -1
  63. package/esm/node/session/session-store.js.map +1 -1
  64. package/esm/node/session/session-strategy.js +1 -1
  65. package/esm/node/session/session-strategy.js.map +1 -1
  66. package/esm/node/session/session.d.ts +14 -2
  67. package/esm/node/session/session.js +33 -4
  68. package/esm/node/session/session.js.map +1 -1
  69. package/esm/node/trace/trace-id-resolver.js +2 -2
  70. package/esm/node/trace/trace-id-resolver.js.map +1 -1
  71. package/esm/node/trace/trace-protocol.d.ts +2 -2
  72. package/esm/node/trace/trace-protocol.js +2 -2
  73. package/esm/node/trace/trace-protocol.js.map +1 -1
  74. package/lib/common/constants.d.ts +3 -3
  75. package/lib/common/constants.d.ts.map +1 -1
  76. package/lib/common/constants.js +3 -3
  77. package/lib/common/constants.js.map +1 -1
  78. package/lib/node/body/body-middleware.js +1 -1
  79. package/lib/node/body/body-middleware.js.map +1 -1
  80. package/lib/node/body/body-parser.d.ts +5 -0
  81. package/lib/node/body/body-parser.d.ts.map +1 -1
  82. package/lib/node/body/body-parser.js +7 -0
  83. package/lib/node/body/body-parser.js.map +1 -1
  84. package/lib/node/body/body-protocol.d.ts +1 -1
  85. package/lib/node/body/body-protocol.d.ts.map +1 -1
  86. package/lib/node/context.d.ts +4 -0
  87. package/lib/node/context.d.ts.map +1 -1
  88. package/lib/node/context.js +11 -11
  89. package/lib/node/context.js.map +1 -1
  90. package/lib/node/context.spec.d.ts +2 -0
  91. package/lib/node/context.spec.d.ts.map +1 -0
  92. package/lib/node/context.spec.js +25 -0
  93. package/lib/node/context.spec.js.map +1 -0
  94. package/lib/node/cookies/cookies-factory.js +2 -2
  95. package/lib/node/cookies/cookies-factory.js.map +1 -1
  96. package/lib/node/cookies/cookies-protocol.d.ts +1 -1
  97. package/lib/node/cookies/cookies-protocol.d.ts.map +1 -1
  98. package/lib/node/cookies/cookies-security-check.d.ts +14 -0
  99. package/lib/node/cookies/cookies-security-check.d.ts.map +1 -0
  100. package/lib/node/cookies/cookies-security-check.js +58 -0
  101. package/lib/node/cookies/cookies-security-check.js.map +1 -0
  102. package/lib/node/cookies/cookies-security-check.spec.d.ts +2 -0
  103. package/lib/node/cookies/cookies-security-check.spec.d.ts.map +1 -0
  104. package/lib/node/cookies/cookies-security-check.spec.js +21 -0
  105. package/lib/node/cookies/cookies-security-check.spec.js.map +1 -0
  106. package/lib/node/cookies/cookies.d.ts +1 -1
  107. package/lib/node/cookies/cookies.js +1 -1
  108. package/lib/node/cookies/index.d.ts +1 -0
  109. package/lib/node/cookies/index.d.ts.map +1 -1
  110. package/lib/node/cookies/index.js +1 -0
  111. package/lib/node/cookies/index.js.map +1 -1
  112. package/lib/node/cors/cors-middleware.d.ts +1 -1
  113. package/lib/node/cors/cors-middleware.d.ts.map +1 -1
  114. package/lib/node/cors/cors-middleware.js +1 -1
  115. package/lib/node/cors/cors-middleware.js.map +1 -1
  116. package/lib/node/cors/cors-protocol.d.ts +1 -1
  117. package/lib/node/cors/cors-protocol.d.ts.map +1 -1
  118. package/lib/node/dispatcher/dispatcher.d.ts +10 -0
  119. package/lib/node/dispatcher/dispatcher.d.ts.map +1 -1
  120. package/lib/node/dispatcher/dispatcher.js +36 -3
  121. package/lib/node/dispatcher/dispatcher.js.map +1 -1
  122. package/lib/node/dispatcher/dispatcher.spec.d.ts +2 -0
  123. package/lib/node/dispatcher/dispatcher.spec.d.ts.map +1 -0
  124. package/lib/node/dispatcher/dispatcher.spec.js +105 -0
  125. package/lib/node/dispatcher/dispatcher.spec.js.map +1 -0
  126. package/lib/node/error/error-handler-provider.d.ts +6 -2
  127. package/lib/node/error/error-handler-provider.d.ts.map +1 -1
  128. package/lib/node/error/error-handler-provider.js +16 -8
  129. package/lib/node/error/error-handler-provider.js.map +1 -1
  130. package/lib/node/error/error-message-resolver.d.ts +12 -0
  131. package/lib/node/error/error-message-resolver.d.ts.map +1 -0
  132. package/lib/node/error/error-message-resolver.js +46 -0
  133. package/lib/node/error/error-message-resolver.js.map +1 -0
  134. package/lib/node/error/error-message-resolver.spec.d.ts +2 -0
  135. package/lib/node/error/error-message-resolver.spec.d.ts.map +1 -0
  136. package/lib/node/error/error-message-resolver.spec.js +42 -0
  137. package/lib/node/error/error-message-resolver.spec.js.map +1 -0
  138. package/lib/node/error/error-protocol.d.ts +12 -2
  139. package/lib/node/error/error-protocol.d.ts.map +1 -1
  140. package/lib/node/error/error-protocol.js +4 -3
  141. package/lib/node/error/error-protocol.js.map +1 -1
  142. package/lib/node/error/error-response-util.d.ts +9 -0
  143. package/lib/node/error/error-response-util.d.ts.map +1 -0
  144. package/lib/node/error/error-response-util.js +27 -0
  145. package/lib/node/error/error-response-util.js.map +1 -0
  146. package/lib/node/error/http-error.d.ts +9 -1
  147. package/lib/node/error/http-error.d.ts.map +1 -1
  148. package/lib/node/error/http-error.js +6 -2
  149. package/lib/node/error/http-error.js.map +1 -1
  150. package/lib/node/error/index.d.ts +2 -0
  151. package/lib/node/error/index.d.ts.map +1 -1
  152. package/lib/node/error/index.js +2 -0
  153. package/lib/node/error/index.js.map +1 -1
  154. package/lib/node/health/health-executor.d.ts.map +1 -1
  155. package/lib/node/health/health-executor.js +8 -12
  156. package/lib/node/health/health-executor.js.map +1 -1
  157. package/lib/node/health/health-executor.spec.d.ts +2 -0
  158. package/lib/node/health/health-executor.spec.d.ts.map +1 -0
  159. package/lib/node/health/health-executor.spec.js +44 -0
  160. package/lib/node/health/health-executor.spec.js.map +1 -0
  161. package/lib/node/health/health-middleware.js +1 -1
  162. package/lib/node/health/health-middleware.js.map +1 -1
  163. package/lib/node/matcher/request-matcher.js +2 -2
  164. package/lib/node/matcher/request-matcher.js.map +1 -1
  165. package/lib/node/session/session-manager.js +2 -2
  166. package/lib/node/session/session-manager.js.map +1 -1
  167. package/lib/node/session/session-middleware.js +1 -1
  168. package/lib/node/session/session-middleware.js.map +1 -1
  169. package/lib/node/session/session-store.js +1 -1
  170. package/lib/node/session/session-store.js.map +1 -1
  171. package/lib/node/session/session-strategy.js +1 -1
  172. package/lib/node/session/session-strategy.js.map +1 -1
  173. package/lib/node/session/session.d.ts +14 -2
  174. package/lib/node/session/session.d.ts.map +1 -1
  175. package/lib/node/session/session.js +33 -4
  176. package/lib/node/session/session.js.map +1 -1
  177. package/lib/node/session/session.spec.js +21 -0
  178. package/lib/node/session/session.spec.js.map +1 -1
  179. package/lib/node/trace/trace-id-resolver.js +1 -1
  180. package/lib/node/trace/trace-id-resolver.js.map +1 -1
  181. package/lib/node/trace/trace-protocol.d.ts +2 -2
  182. package/lib/node/trace/trace-protocol.d.ts.map +1 -1
  183. package/lib/node/trace/trace-protocol.js +2 -2
  184. package/lib/node/trace/trace-protocol.js.map +1 -1
  185. package/package.json +5 -4
  186. package/src/common/constants.ts +3 -3
  187. package/src/node/body/body-middleware.ts +1 -1
  188. package/src/node/body/body-parser.ts +8 -0
  189. package/src/node/body/body-protocol.ts +1 -1
  190. package/src/node/context.spec.ts +25 -0
  191. package/src/node/context.ts +9 -9
  192. package/src/node/cookies/cookies-factory.ts +2 -2
  193. package/src/node/cookies/cookies-protocol.ts +1 -1
  194. package/src/node/cookies/cookies-security-check.spec.ts +21 -0
  195. package/src/node/cookies/cookies-security-check.ts +44 -0
  196. package/src/node/cookies/cookies.ts +1 -1
  197. package/src/node/cookies/index.ts +1 -1
  198. package/src/node/cors/cors-middleware.ts +1 -1
  199. package/src/node/cors/cors-protocol.ts +1 -1
  200. package/src/node/dispatcher/dispatcher.spec.ts +110 -0
  201. package/src/node/dispatcher/dispatcher.ts +37 -4
  202. package/src/node/error/error-handler-provider.ts +17 -11
  203. package/src/node/error/error-message-resolver.spec.ts +44 -0
  204. package/src/node/error/error-message-resolver.ts +31 -0
  205. package/src/node/error/error-protocol.ts +14 -3
  206. package/src/node/error/error-response-util.ts +24 -0
  207. package/src/node/error/http-error.ts +14 -2
  208. package/src/node/error/index.ts +1 -1
  209. package/src/node/health/health-executor.spec.ts +40 -0
  210. package/src/node/health/health-executor.ts +8 -13
  211. package/src/node/health/health-middleware.ts +1 -1
  212. package/src/node/matcher/request-matcher.ts +2 -2
  213. package/src/node/session/session-manager.ts +2 -2
  214. package/src/node/session/session-middleware.ts +1 -1
  215. package/src/node/session/session-store.ts +1 -1
  216. package/src/node/session/session-strategy.ts +1 -1
  217. package/src/node/session/session.spec.ts +24 -0
  218. package/src/node/session/session.ts +41 -7
  219. package/src/node/trace/trace-id-resolver.ts +2 -2
  220. package/src/node/trace/trace-protocol.ts +2 -2
@@ -0,0 +1,14 @@
1
+ import { SecurityCheck, SecurityWarning } from '@celljs/core';
2
+ /** The key in the cell.yml of @celljs/web, for development only. */
3
+ export declare const DEFAULT_COOKIE_KEYS: readonly string[];
4
+ /** Shorter keys can be guessed; 32 characters of `openssl rand -base64 32` are plenty. */
5
+ export declare const MIN_COOKIE_KEY_LENGTH = 16;
6
+ /**
7
+ * `web.cookies.keys` sign the cookies, the session cookie among them: whoever knows a key can write a
8
+ * session (with the security context in it) that the server accepts.
9
+ */
10
+ export declare class CookiesSecurityCheck implements SecurityCheck {
11
+ protected readonly keys?: string[];
12
+ check(): SecurityWarning[];
13
+ }
14
+ //# sourceMappingURL=cookies-security-check.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cookies-security-check.d.ts","sourceRoot":"","sources":["../../../src/node/cookies/cookies-security-check.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,aAAa,EAAE,eAAe,EAAS,MAAM,cAAc,CAAC;AAEhF,oEAAoE;AACpE,eAAO,MAAM,mBAAmB,EAAE,SAAS,MAAM,EAAe,CAAC;AAEjE,0FAA0F;AAC1F,eAAO,MAAM,qBAAqB,KAAK,CAAC;AAExC;;;GAGG;AACH,qBACa,oBAAqB,YAAW,aAAa;IAGtD,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnC,KAAK,IAAI,eAAe,EAAE,CAwBzB;CACJ"}
@@ -0,0 +1,58 @@
1
+ "use strict";
2
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
+ 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;
6
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
7
+ };
8
+ var __metadata = (this && this.__metadata) || function (k, v) {
9
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
+ };
11
+ Object.defineProperty(exports, "__esModule", { value: true });
12
+ exports.CookiesSecurityCheck = exports.MIN_COOKIE_KEY_LENGTH = exports.DEFAULT_COOKIE_KEYS = void 0;
13
+ const core_1 = require("@celljs/core");
14
+ /** The key in the cell.yml of @celljs/web, for development only. */
15
+ exports.DEFAULT_COOKIE_KEYS = ['abcdef'];
16
+ /** Shorter keys can be guessed; 32 characters of `openssl rand -base64 32` are plenty. */
17
+ exports.MIN_COOKIE_KEY_LENGTH = 16;
18
+ /**
19
+ * `web.cookies.keys` sign the cookies, the session cookie among them: whoever knows a key can write a
20
+ * session (with the security context in it) that the server accepts.
21
+ */
22
+ let CookiesSecurityCheck = class CookiesSecurityCheck {
23
+ check() {
24
+ var _a;
25
+ const keys = ((_a = this.keys) !== null && _a !== void 0 ? _a : []).map(String);
26
+ if (keys.length === 0) {
27
+ return [{
28
+ code: 'CELL_SECURITY_COOKIE_KEYS_MISSING',
29
+ message: 'web.cookies.keys is empty, so cookies are not signed: clients can edit the session cookie and everything in it.',
30
+ 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.'
31
+ }];
32
+ }
33
+ if (keys.some(key => exports.DEFAULT_COOKIE_KEYS.includes(key))) {
34
+ return [{
35
+ code: 'CELL_SECURITY_DEFAULT_COOKIE_KEYS',
36
+ message: 'web.cookies.keys holds the development key of @celljs/web, which is public: anyone can sign a session cookie the server accepts.',
37
+ 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.'
38
+ }];
39
+ }
40
+ if (keys.some(key => key.length < exports.MIN_COOKIE_KEY_LENGTH)) {
41
+ return [{
42
+ code: 'CELL_SECURITY_WEAK_COOKIE_KEYS',
43
+ message: `A key of web.cookies.keys is shorter than ${exports.MIN_COOKIE_KEY_LENGTH} characters and can be guessed.`,
44
+ 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.'
45
+ }];
46
+ }
47
+ return [];
48
+ }
49
+ };
50
+ exports.CookiesSecurityCheck = CookiesSecurityCheck;
51
+ __decorate([
52
+ (0, core_1.Value)('web.cookies.keys'),
53
+ __metadata("design:type", Array)
54
+ ], CookiesSecurityCheck.prototype, "keys", void 0);
55
+ exports.CookiesSecurityCheck = CookiesSecurityCheck = __decorate([
56
+ (0, core_1.Component)(core_1.SecurityCheck)
57
+ ], CookiesSecurityCheck);
58
+ //# 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,uCAAgF;AAEhF,oEAAoE;AACvD,QAAA,mBAAmB,GAAsB,CAAC,QAAQ,CAAC,CAAC;AAEjE,0FAA0F;AAC7E,QAAA,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,QAAA,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,QAAA,qBAAqB,CAAC,EAAE,CAAC;YACvD,OAAO,CAAC;oBACJ,IAAI,EAAE,gCAAgC;oBACtC,OAAO,EAAE,6CAA6C,QAAA,qBAAqB,iCAAiC;oBAC5G,IAAI,EAAE,wJAAwJ;iBACjK,CAAC,CAAC;QACP,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;CACJ,CAAA;;AA3BsB;IADlB,IAAA,YAAK,EAAC,kBAAkB,CAAC;;kDACS;+BAH1B,oBAAoB;IADhC,IAAA,gBAAS,EAAC,oBAAa,CAAC;GACZ,oBAAoB,CA8BhC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=cookies-security-check.spec.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cookies-security-check.spec.d.ts","sourceRoot":"","sources":["../../../src/node/cookies/cookies-security-check.spec.ts"],"names":[],"mappings":""}
@@ -0,0 +1,21 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const bun_test_1 = require("bun:test");
4
+ const chai_1 = require("chai");
5
+ const cookies_security_check_1 = require("./cookies-security-check");
6
+ function codes(keys) {
7
+ return Object.assign(new cookies_security_check_1.CookiesSecurityCheck(), { keys }).check().map(warning => warning.code);
8
+ }
9
+ (0, bun_test_1.describe)('CookiesSecurityCheck', () => {
10
+ (0, bun_test_1.it)('warns about missing, default and short keys', () => {
11
+ (0, chai_1.expect)(codes(undefined)).to.deep.equal(['CELL_SECURITY_COOKIE_KEYS_MISSING']);
12
+ (0, chai_1.expect)(codes([])).to.deep.equal(['CELL_SECURITY_COOKIE_KEYS_MISSING']);
13
+ (0, chai_1.expect)(codes(['abcdef'])).to.deep.equal(['CELL_SECURITY_DEFAULT_COOKIE_KEYS']);
14
+ (0, chai_1.expect)(codes(['a-new-random-key-of-32-chars-xyz', 'abcdef'])).to.deep.equal(['CELL_SECURITY_DEFAULT_COOKIE_KEYS']);
15
+ (0, chai_1.expect)(codes(['short'])).to.deep.equal(['CELL_SECURITY_WEAK_COOKIE_KEYS']);
16
+ });
17
+ (0, bun_test_1.it)('accepts long random keys', () => {
18
+ (0, chai_1.expect)(codes(['q8Yx0lJr6S1v4m3Wz7Nc2Bp9Kd5Hf0Ta'])).to.deep.equal([]);
19
+ });
20
+ });
21
+ //# sourceMappingURL=cookies-security-check.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cookies-security-check.spec.js","sourceRoot":"","sources":["../../../src/node/cookies/cookies-security-check.spec.ts"],"names":[],"mappings":";;AAAA,uCAAwC;AACxC,+BAA8B;AAC9B,qEAAgE;AAEhE,SAAS,KAAK,CAAC,IAAgB;IAC3B,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,6CAAoB,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACpG,CAAC;AAED,IAAA,mBAAQ,EAAC,sBAAsB,EAAE,GAAG,EAAE;IAClC,IAAA,aAAE,EAAC,6CAA6C,EAAE,GAAG,EAAE;QACnD,IAAA,aAAM,EAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,mCAAmC,CAAC,CAAC,CAAC;QAC9E,IAAA,aAAM,EAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,mCAAmC,CAAC,CAAC,CAAC;QACvE,IAAA,aAAM,EAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,mCAAmC,CAAC,CAAC,CAAC;QAC/E,IAAA,aAAM,EAAC,KAAK,CAAC,CAAC,kCAAkC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,mCAAmC,CAAC,CAAC,CAAC;QACnH,IAAA,aAAM,EAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,0BAA0B,EAAE,GAAG,EAAE;QAChC,IAAA,aAAM,EAAC,KAAK,CAAC,CAAC,kCAAkC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
@@ -1,6 +1,6 @@
1
1
  import { CookieGetOptions, Cookies, CookieSetOptions } from './cookies-protocol';
2
2
  /**
3
- * Cookies of the current request and response. Signed cookies (when `cell.cookies.keys` are set) carry a
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
  */
@@ -21,7 +21,7 @@ function escape(name) {
21
21
  return name.replace(/[\^$\\.*+?()[\]{}|]/g, '\\$&');
22
22
  }
23
23
  /**
24
- * Cookies of the current request and response. Signed cookies (when `cell.cookies.keys` are set) carry a
24
+ * Cookies of the current request and response. Signed cookies (when `web.cookies.keys` are set) carry a
25
25
  * `<name>.sig` cookie made with the first key; any of the keys verifies it, and a cookie signed with an
26
26
  * older key is signed again with the first.
27
27
  */
@@ -2,4 +2,5 @@ export * from './cookies-protocol';
2
2
  export * from './cookies';
3
3
  export * from './cookies-middleware';
4
4
  export * from './cookies-factory';
5
+ export * from './cookies-security-check';
5
6
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","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.d.ts","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"}
@@ -18,4 +18,5 @@ __exportStar(require("./cookies-protocol"), exports);
18
18
  __exportStar(require("./cookies"), exports);
19
19
  __exportStar(require("./cookies-middleware"), exports);
20
20
  __exportStar(require("./cookies-factory"), exports);
21
+ __exportStar(require("./cookies-security-check"), exports);
21
22
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/node/cookies/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,4CAA0B;AAC1B,uDAAqC;AACrC,oDAAkC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/node/cookies/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,4CAA0B;AAC1B,uDAAqC;AACrC,oDAAkC;AAAA,2DAAyC"}
@@ -1,7 +1,7 @@
1
1
  import { Middleware } from '../middleware';
2
2
  import { Context } from '../context';
3
3
  import { CorsOptions, CorsOrigin } from './cors-protocol';
4
- /** CORS headers from `cell.web.cors`, with the options and defaults of the `cors` package of express. */
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;
@@ -1 +1 @@
1
- {"version":3,"file":"cors-middleware.d.ts","sourceRoot":"","sources":["../../../src/node/cors/cors-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAIrC,OAAO,EAA4B,WAAW,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAgCpF,yGAAyG;AACzG,qBACa,cAAe,YAAW,UAAU;IAG7C,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC;IAGzC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAErC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAG1B,SAAS,CAAC,IAAI,IAAI,IAAI,CAMrB;IAEK,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAgCnE;IAED,SAAS,CAAC,aAAa,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,UAAU,CAM3F;IAED,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAW9F;IAED,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAW9E;IAED,QAAQ,CAAC,QAAQ,SAA4B;CAEhD"}
1
+ {"version":3,"file":"cors-middleware.d.ts","sourceRoot":"","sources":["../../../src/node/cors/cors-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAIrC,OAAO,EAA4B,WAAW,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAgCpF,oGAAoG;AACpG,qBACa,cAAe,YAAW,UAAU;IAG7C,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC;IAGzC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAErC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAG1B,SAAS,CAAC,IAAI,IAAI,IAAI,CAMrB;IAEK,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAgCnE;IAED,SAAS,CAAC,aAAa,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,UAAU,CAM3F;IAED,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAW9F;IAED,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAW9E;IAED,QAAQ,CAAC,QAAQ,SAA4B;CAEhD"}
@@ -42,7 +42,7 @@ function isAllowed(origin, allowed) {
42
42
  }
43
43
  return !!allowed;
44
44
  }
45
- /** CORS headers from `cell.web.cors`, with the options and defaults of the `cors` package of express. */
45
+ /** CORS headers from `web.cors`, with the options and defaults of the `cors` package of express. */
46
46
  let CorsMiddleware = class CorsMiddleware {
47
47
  constructor() {
48
48
  this.priority = cors_protocol_1.CORS_MIDDLEWARE_PRIORITY;
@@ -1 +1 @@
1
- {"version":3,"file":"cors-middleware.js","sourceRoot":"","sources":["../../../src/node/cors/cors-middleware.ts"],"names":[],"mappings":"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"}
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
- /** `cell.web.cors`, with the options and defaults of the `cors` package of express. */
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:
@@ -1 +1 @@
1
- {"version":3,"file":"cors-protocol.d.ts","sourceRoot":"","sources":["../../../src/node/cors/cors-protocol.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,wBAAwB,QAAkC,CAAC;AAExE,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;AAEzE,uFAAuF;AACvF,MAAM,WAAW,WAAW;IACxB;;;OAGG;IACH,MAAM,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,UAAU,KAAK,IAAI,KAAK,IAAI,CAAC,CAAC;IACzH,gDAAgD;IAChD,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B,2DAA2D;IAC3D,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACnC,iCAAiC;IACjC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACnC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,eAAe;IACf,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,qFAAqF;IACrF,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,mBAAmB;IACnB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CACjC"}
1
+ {"version":3,"file":"cors-protocol.d.ts","sourceRoot":"","sources":["../../../src/node/cors/cors-protocol.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,wBAAwB,QAAkC,CAAC;AAExE,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;AAEzE,kFAAkF;AAClF,MAAM,WAAW,WAAW;IACxB;;;OAGG;IACH,MAAM,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,UAAU,KAAK,IAAI,KAAK,IAAI,CAAC,CAAC;IACzH,gDAAgD;IAChD,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B,2DAA2D;IAC3D,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACnC,iCAAiC;IACjC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACnC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,eAAe;IACf,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,qFAAqF;IACrF,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,mBAAmB;IACnB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CACjC"}
@@ -11,6 +11,16 @@ 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
  }
16
26
  //# sourceMappingURL=dispatcher.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"dispatcher.d.ts","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,EAAwB,MAAM,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAEpF,qBACa,cAAe,YAAW,UAAU,CAAC,OAAO,CAAC;IAGtD,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAGjD,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAGrD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAE5B,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAS1C;IAED,UAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAanE;CACJ"}
1
+ {"version":3,"file":"dispatcher.d.ts","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,EAAwB,MAAM,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAMpF,qBACa,cAAe,YAAW,UAAU,CAAC,OAAO,CAAC;IAGtD,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAGjD,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAGrD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAE5B,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAa1C;IAED;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAUtD;IAED;;;OAGG;IACH,UAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBnE;CACJ"}
@@ -16,6 +16,10 @@ const error_handler_provider_1 = require("../error/error-handler-provider");
16
16
  const dispatcher_protocol_1 = require("./dispatcher-protocol");
17
17
  const core_1 = require("@celljs/core");
18
18
  const handler_protocol_1 = require("../handler/handler-protocol");
19
+ const node_http_1 = require("node:http");
20
+ const http_1 = require("@celljs/http");
21
+ const http_error_1 = require("../error/http-error");
22
+ const error_response_util_1 = require("../error/error-response-util");
19
23
  let DispatcherImpl = class DispatcherImpl {
20
24
  async dispatch(ctx) {
21
25
  try {
@@ -24,10 +28,35 @@ let DispatcherImpl = class DispatcherImpl {
24
28
  await this.handlerExecutionChain.execute(middlewares, () => this.handlerMapping.handle());
25
29
  }
26
30
  catch (err) {
27
- this.logger.error(err);
28
- await this.handleError(ctx, err);
31
+ try {
32
+ await this.handleError(ctx, err);
33
+ }
34
+ finally {
35
+ // After the handlers: the status they answered tells a refused request from a failure.
36
+ this.logError(err, ctx.response.statusCode);
37
+ }
38
+ }
39
+ }
40
+ /**
41
+ * Server errors with their stack at the error level. Client errors are answers, not failures, and only
42
+ * go to the debug level: a 4xx `HttpError` (a 404 for an unknown path), or any error a handler answered
43
+ * with a redirect or a 4xx (login required, access denied).
44
+ */
45
+ logError(err, status) {
46
+ const answered = status !== undefined && status >= 300 && status < 500;
47
+ if ((err instanceof http_error_1.HttpError && err.statusCode < 500) || answered) {
48
+ if (this.logger.isEnabled('debug')) {
49
+ this.logger.debug(`${err instanceof http_error_1.HttpError ? err.statusCode : status} ${err instanceof Error ? err.message : String(err)}`);
50
+ }
51
+ return;
29
52
  }
53
+ // The logger writes an error with its stack and causes.
54
+ this.logger.error(err instanceof Error ? err : String(err));
30
55
  }
56
+ /**
57
+ * The handler with the highest priority that can handle the error answers; when its `handle` throws,
58
+ * the next one is tried. When none answers, the response ends with a bare 500, so no request hangs.
59
+ */
31
60
  async handleError(ctx, err) {
32
61
  const errorHandlers = this.errorHandlerProvider.provide();
33
62
  for (const handler of errorHandlers) {
@@ -36,12 +65,16 @@ let DispatcherImpl = class DispatcherImpl {
36
65
  await handler.handle(ctx, err);
37
66
  }
38
67
  catch (error) {
39
- this.logger.error(error);
68
+ // A handler that gives the error back (it cannot answer it) is not a second failure.
69
+ if (error !== err) {
70
+ this.logError(error);
71
+ }
40
72
  continue;
41
73
  }
42
74
  return;
43
75
  }
44
76
  }
77
+ error_response_util_1.ErrorResponseUtil.end(ctx, http_1.HttpStatus.INTERNAL_SERVER_ERROR, node_http_1.STATUS_CODES[http_1.HttpStatus.INTERNAL_SERVER_ERROR]);
45
78
  }
46
79
  };
47
80
  exports.DispatcherImpl = DispatcherImpl;
@@ -1 +1 @@
1
- {"version":3,"file":"dispatcher.js","sourceRoot":"","sources":["../../../src/node/dispatcher/dispatcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAqC;AACrC,8CAAmD;AACnD,4EAAuE;AACvE,+DAAmD;AACnD,uCAA4D;AAC5D,kEAAoF;AAG7E,IAAM,cAAc,GAApB,MAAM,cAAc;IAiBvB,KAAK,CAAC,QAAQ,CAAC,GAAY;QACvB,IAAI,CAAC;YACD,iBAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACxB,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;YACtD,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC;QAC9F,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACvB,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACrC,CAAC;IACL,CAAC;IAES,KAAK,CAAC,WAAW,CAAC,GAAY,EAAE,GAAU;QAChD,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC;QAC1D,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE,CAAC;YAClC,IAAI,MAAM,OAAO,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;gBACpC,IAAI,CAAC;oBACD,MAAM,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACnC,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACzB,SAAS;gBACb,CAAC;gBACD,OAAO;YACX,CAAC;QACL,CAAC;IACL,CAAC;CACJ,CAAA;;AAvCa;IADT,IAAA,gBAAS,EAAC,wCAAqB,CAAC;;6DACsB;AAGpC;IADlB,IAAA,gBAAS,EAAC,iCAAc,CAAC;;sDACwB;AAGxC;IADT,IAAA,gBAAS,EAAC,+BAAkB,CAAC;8BACA,+BAAkB;0DAAC;AAGvC;IADT,IAAA,gBAAS,EAAC,6CAAoB,CAAC;8BACA,6CAAoB;4DAAC;AAGlC;IADlB,IAAA,gBAAS,EAAC,aAAM,CAAC;;8CACgB;yBAfzB,cAAc;IAD1B,IAAA,gBAAS,EAAC,gCAAU,CAAC;GACT,cAAc,CA0C1B"}
1
+ {"version":3,"file":"dispatcher.js","sourceRoot":"","sources":["../../../src/node/dispatcher/dispatcher.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=dispatcher.spec.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"dispatcher.spec.d.ts","sourceRoot":"","sources":["../../../src/node/dispatcher/dispatcher.spec.ts"],"names":[],"mappings":""}
@@ -0,0 +1,105 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const bun_test_1 = require("bun:test");
4
+ const chai_1 = require("chai");
5
+ const mock_logger_1 = require("@celljs/core/lib/common/test/mock-logger");
6
+ const dispatcher_1 = require("./dispatcher");
7
+ const error_1 = require("../error");
8
+ const error_handler_provider_1 = require("../error/error-handler-provider");
9
+ const error_message_resolver_1 = require("../error/error-message-resolver");
10
+ class RecordingLogger extends mock_logger_1.MockLogger {
11
+ constructor() {
12
+ super(...arguments);
13
+ this.lines = [];
14
+ }
15
+ error(message) {
16
+ this.lines.push(['error', message]);
17
+ }
18
+ debug(message) {
19
+ this.lines.push(['debug', String(message)]);
20
+ }
21
+ isEnabled() {
22
+ return true;
23
+ }
24
+ }
25
+ function dispatcher() {
26
+ const logger = new RecordingLogger();
27
+ return { dispatcher: Object.assign(new dispatcher_1.DispatcherImpl(), { logger }), logger };
28
+ }
29
+ (0, bun_test_1.describe)('DispatcherImpl', () => {
30
+ (0, bun_test_1.it)('logs a server error with its stack, a client error only at the debug level', () => {
31
+ const { dispatcher: d, logger } = dispatcher();
32
+ d['logError'](new Error('boom'));
33
+ d['logError'](new error_1.NotFoundError('/favicon.ico'));
34
+ d['logError'](new error_1.HttpError(503, 'unavailable'));
35
+ (0, chai_1.expect)(logger.lines.map(([level]) => level)).to.deep.equal(['error', 'debug', 'error']);
36
+ // The Error itself goes to the logger, which writes its stack and causes.
37
+ (0, chai_1.expect)(logger.lines[0][1]).to.be.instanceOf(Error);
38
+ (0, chai_1.expect)(logger.lines[0][1].message).to.equal('boom');
39
+ (0, chai_1.expect)(logger.lines[1][1]).to.equal('404 /favicon.ico');
40
+ });
41
+ (0, bun_test_1.it)('logs an error a handler answered with a redirect or a 4xx at the debug level', () => {
42
+ const { dispatcher: d, logger } = dispatcher();
43
+ d['logError'](new Error('Unauthorized'), 401);
44
+ d['logError'](new Error('login required'), 302);
45
+ d['logError'](new Error('boom'), 500);
46
+ d['logError'](new Error('wrapped by a template'), 200);
47
+ (0, chai_1.expect)(logger.lines.map(([level]) => level)).to.deep.equal(['debug', 'debug', 'error', 'error']);
48
+ (0, chai_1.expect)(logger.lines[0][1]).to.equal('401 Unauthorized');
49
+ });
50
+ });
51
+ (0, bun_test_1.describe)('error handlers', () => {
52
+ function handler(type, exposeMessages) {
53
+ return Object.assign(new type(), { errorMessageResolver: Object.assign(new error_message_resolver_1.ErrorMessageResolverImpl(), { exposeMessages }) });
54
+ }
55
+ function response(headersSent) {
56
+ const calls = [];
57
+ return {
58
+ calls,
59
+ statusCode: 200,
60
+ headersSent,
61
+ writableEnded: false,
62
+ end(...args) {
63
+ calls.push(args);
64
+ this.writableEnded = true;
65
+ }
66
+ };
67
+ }
68
+ (0, bun_test_1.it)('answer with the status and message of an HttpError', async () => {
69
+ const res = response(false);
70
+ await handler(error_handler_provider_1.HttpErrorHandler).handle({ response: res }, new error_1.HttpError(409, 'conflict'));
71
+ (0, chai_1.expect)(res.statusCode).to.equal(409);
72
+ (0, chai_1.expect)(res.calls).to.deep.equal([['conflict']]);
73
+ });
74
+ (0, bun_test_1.it)('only end a response whose headers were sent, and leave an ended one alone', async () => {
75
+ const started = response(true);
76
+ await handler(error_handler_provider_1.HttpErrorHandler).handle({ response: started }, new error_1.HttpError(409, 'conflict'));
77
+ (0, chai_1.expect)(started.statusCode).to.equal(200);
78
+ (0, chai_1.expect)(started.calls).to.deep.equal([[]]);
79
+ await handler(error_handler_provider_1.HttpErrorHandler).handle({ response: started }, new error_1.HttpError(409, 'again'));
80
+ (0, chai_1.expect)(started.calls).to.have.length(1);
81
+ });
82
+ (0, bun_test_1.it)('answer a 500 with the status text unless messages are exposed', async () => {
83
+ const hidden = response(false);
84
+ await handler(error_handler_provider_1.DefaultErrorHandler, false).handle({ response: hidden }, new Error('password authentication failed for user "app"'));
85
+ (0, chai_1.expect)(hidden.statusCode).to.equal(500);
86
+ (0, chai_1.expect)(hidden.calls).to.deep.equal([['Internal Server Error']]);
87
+ const shown = response(false);
88
+ await handler(error_handler_provider_1.DefaultErrorHandler, true).handle({ response: shown }, new Error('boom'));
89
+ (0, chai_1.expect)(shown.calls).to.deep.equal([['boom']]);
90
+ });
91
+ });
92
+ (0, bun_test_1.describe)('DispatcherImpl.handleError', () => {
93
+ (0, bun_test_1.it)('ends the response with 500 when no handler answers, and does not log an error a handler gives back twice', async () => {
94
+ const logger = new RecordingLogger();
95
+ const failure = new Error('boom');
96
+ const rethrowing = { priority: 1, canHandle: async () => true, handle: async (_, err) => { throw err; } };
97
+ const d = Object.assign(new dispatcher_1.DispatcherImpl(), { logger, errorHandlerProvider: { provide: () => [rethrowing] } });
98
+ const res = { statusCode: 200, headersSent: false, writableEnded: false, body: undefined, end(body) { this.body = body; this.writableEnded = true; } };
99
+ await d['handleError']({ response: res }, failure);
100
+ (0, chai_1.expect)(res.statusCode).to.equal(500);
101
+ (0, chai_1.expect)(res.body).to.equal('Internal Server Error');
102
+ (0, chai_1.expect)(logger.lines).to.have.length(0);
103
+ });
104
+ });
105
+ //# sourceMappingURL=dispatcher.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"dispatcher.spec.js","sourceRoot":"","sources":["../../../src/node/dispatcher/dispatcher.spec.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,12 @@
1
1
  import { Context } from '../context';
2
- import { ErrorHandler } from './error-protocol';
2
+ import { ErrorHandler, ErrorMessageResolver } from './error-protocol';
3
3
  import { HttpError } from './http-error';
4
+ import { ValidationErrors } from '../../common/pipe';
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: HttpError): Promise<void>;
24
+ handle(ctx: Context, err: ValidationErrors): Promise<void>;
21
25
  }
22
26
  export declare class ErrorHandlerProvider {
23
27
  protected readonly handlers: ErrorHandler[];
@@ -1 +1 @@
1
- {"version":3,"file":"error-handler-provider.d.ts","sourceRoot":"","sources":["../../../src/node/error/error-handler-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EAAE,YAAY,EAAyG,MAAM,kBAAkB,CAAC;AACvJ,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC,8BAAsB,oBAAqB,YAAW,YAAY;IAC9D,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAkC;IAE3D,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAEpD;IAEK,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAKpD;IAED,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAEhD;CACJ;AAED,qBACa,mBAAoB,SAAQ,oBAAoB;CAC5D;AAED,qBACa,gBAAiB,YAAW,YAAY;IACjD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAA+B;IAExD,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAEpD;IAEK,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAGxD;CACJ;AAED,qBACa,uBAAwB,YAAW,YAAY;IACxD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAA4C;IAErE,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAEpD;IAEK,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAGxD;CACJ;AAED,qBACa,oBAAoB;IAMzB,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,EAAE;IAJ/C,SAAS,CAAC,WAAW,EAAE,YAAY,EAAE,CAAC;IAEtC,YAEuB,QAAQ,EAAE,YAAY,EAAE,EAC1C;IAEL,OAAO,IAAI,YAAY,EAAE,CAKxB;CAEJ"}
1
+ {"version":3,"file":"error-handler-provider.d.ts","sourceRoot":"","sources":["../../../src/node/error/error-handler-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAyG,MAAM,kBAAkB,CAAC;AAC7K,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,8BAAsB,oBAAqB,YAAW,YAAY;IAC9D,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAkC;IAG3D,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAE9D,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAEpD;IAED,8GAA8G;IACxG,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAIpD;IAED,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAEhD;CACJ;AAED,qBACa,mBAAoB,SAAQ,oBAAoB;CAC5D;AAED,qBACa,gBAAiB,YAAW,YAAY;IACjD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAA+B;IAGxD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAE9D,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAEpD;IAEK,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAGxD;CACJ;AAED,qBACa,uBAAwB,YAAW,YAAY;IACxD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAA4C;IAErE,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAEpD;IAEK,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/D;CACJ;AAED,qBACa,oBAAoB;IAMzB,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,EAAE;IAJ/C,SAAS,CAAC,WAAW,EAAE,YAAY,EAAE,CAAC;IAEtC,YAEuB,QAAQ,EAAE,YAAY,EAAE,EAC1C;IAEL,OAAO,IAAI,YAAY,EAAE,CAKxB;CAEJ"}
@@ -16,19 +16,20 @@ exports.ErrorHandlerProvider = exports.ValidationErrorsHandler = exports.HttpErr
16
16
  const core_1 = require("@celljs/core");
17
17
  const error_protocol_1 = require("./error-protocol");
18
18
  const http_error_1 = require("./http-error");
19
+ const error_response_util_1 = require("./error-response-util");
19
20
  const http_1 = require("@celljs/http");
20
21
  const pipe_1 = require("../../common/pipe");
21
22
  class AbstractErrorHandler {
22
23
  constructor() {
23
- this.priority = error_protocol_1.DEFALUT_ERROR_HANDLER_PRIORITY;
24
+ this.priority = error_protocol_1.DEFAULT_ERROR_HANDLER_PRIORITY;
24
25
  }
25
26
  canHandle(ctx, err) {
26
27
  return Promise.resolve(true);
27
28
  }
29
+ /** The dispatcher has logged the error already; the client gets what {@link ErrorMessageResolver} decides. */
28
30
  async handle(ctx, err) {
29
- console.error(err);
30
- ctx.response.statusCode = http_1.HttpStatus.INTERNAL_SERVER_ERROR;
31
- ctx.response.end(err.message);
31
+ const { status, message } = this.errorMessageResolver.resolve(err);
32
+ error_response_util_1.ErrorResponseUtil.end(ctx, status, message);
32
33
  await this.doHandle(ctx, err);
33
34
  }
34
35
  doHandle(ctx, err) {
@@ -36,6 +37,10 @@ class AbstractErrorHandler {
36
37
  }
37
38
  }
38
39
  exports.AbstractErrorHandler = AbstractErrorHandler;
40
+ __decorate([
41
+ (0, core_1.Autowired)(error_protocol_1.ErrorMessageResolver),
42
+ __metadata("design:type", Object)
43
+ ], AbstractErrorHandler.prototype, "errorMessageResolver", void 0);
39
44
  let DefaultErrorHandler = class DefaultErrorHandler extends AbstractErrorHandler {
40
45
  };
41
46
  exports.DefaultErrorHandler = DefaultErrorHandler;
@@ -50,11 +55,15 @@ let HttpErrorHandler = class HttpErrorHandler {
50
55
  return Promise.resolve(err instanceof http_error_1.HttpError);
51
56
  }
52
57
  async handle(ctx, err) {
53
- ctx.response.statusCode = err.statusCode;
54
- ctx.response.end(err.message);
58
+ const { status, message } = this.errorMessageResolver.resolve(err);
59
+ error_response_util_1.ErrorResponseUtil.end(ctx, status, message);
55
60
  }
56
61
  };
57
62
  exports.HttpErrorHandler = HttpErrorHandler;
63
+ __decorate([
64
+ (0, core_1.Autowired)(error_protocol_1.ErrorMessageResolver),
65
+ __metadata("design:type", Object)
66
+ ], HttpErrorHandler.prototype, "errorMessageResolver", void 0);
58
67
  exports.HttpErrorHandler = HttpErrorHandler = __decorate([
59
68
  (0, core_1.Component)(error_protocol_1.ErrorHandler)
60
69
  ], HttpErrorHandler);
@@ -66,8 +75,7 @@ let ValidationErrorsHandler = class ValidationErrorsHandler {
66
75
  return Promise.resolve(err instanceof pipe_1.ValidationErrors);
67
76
  }
68
77
  async handle(ctx, err) {
69
- ctx.response.statusCode = http_1.HttpStatus.BAD_REQUEST;
70
- ctx.response.end(err.message);
78
+ error_response_util_1.ErrorResponseUtil.end(ctx, http_1.HttpStatus.BAD_REQUEST, err.message);
71
79
  }
72
80
  };
73
81
  exports.ValidationErrorsHandler = ValidationErrorsHandler;
@@ -1 +1 @@
1
- {"version":3,"file":"error-handler-provider.js","sourceRoot":"","sources":["../../../src/node/error/error-handler-provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,uCAAoE;AACpE,qDAAuJ;AACvJ,6CAAyC;AACzC,uCAA0C;AAC1C,4CAAqD;AAErD;IAAA;QACa,aAAQ,GAAW,+CAA8B,CAAC;IAgB/D,CAAC;IAdG,SAAS,CAAC,GAAY,EAAE,GAAU;QAC9B,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,GAAU;QACjC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,GAAG,CAAC,QAAQ,CAAC,UAAU,GAAG,iBAAU,CAAC,qBAAqB,CAAC;QAC3D,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC9B,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;;AAGM,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,oBAAoB;CAC5D,CAAA;;8BADY,mBAAmB;IAD/B,IAAA,gBAAS,EAAC,6BAAY,CAAC;GACX,mBAAmB,CAC/B;AAGM,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAAtB;QACM,aAAQ,GAAW,4CAA2B,CAAC;IAU5D,CAAC;IARG,SAAS,CAAC,GAAY,EAAE,GAAU;QAC9B,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,YAAY,sBAAS,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,GAAc;QACrC,GAAG,CAAC,QAAQ,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;QACzC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;CACJ,CAAA;;2BAXY,gBAAgB;IAD5B,IAAA,gBAAS,EAAC,6BAAY,CAAC;GACX,gBAAgB,CAW5B;AAGM,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAA7B;QACM,aAAQ,GAAW,yDAAwC,CAAC;IAUzE,CAAC;IARG,SAAS,CAAC,GAAY,EAAE,GAAU;QAC9B,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,YAAY,uBAAgB,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAY,EAAE,GAAc;QACrC,GAAG,CAAC,QAAQ,CAAC,UAAU,GAAG,iBAAU,CAAC,WAAW,CAAC;QACjD,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;CACJ,CAAA;;kCAXY,uBAAuB;IADnC,IAAA,gBAAS,EAAC,6BAAY,CAAC;GACX,uBAAuB,CAWnC;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,qBAAc,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;;+BAhBY,oBAAoB;IADhC,IAAA,gBAAS,GAAE;IAMH,WAAA,IAAA,gBAAS,EAAC,6BAAY,CAAC,CAAA;;GALnB,oBAAoB,CAgBhC"}
1
+ {"version":3,"file":"error-handler-provider.js","sourceRoot":"","sources":["../../../src/node/error/error-handler-provider.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,12 @@
1
+ import { ErrorMessageResolver, ErrorResponse } from './error-protocol';
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
+ }
12
+ //# sourceMappingURL=error-message-resolver.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"error-message-resolver.d.ts","sourceRoot":"","sources":["../../../src/node/error/error-message-resolver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEvE;;;;GAIG;AACH,qBACa,wBAAyB,YAAW,oBAAoB;IAGjE,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAE5C,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,aAAa,CAMrC;IAED,SAAS,CAAC,eAAe,IAAI,OAAO,CAKnC;CACJ"}