@eggjs/koa 2.21.0 → 2.22.0
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 +8 -8
- package/dist/commonjs/application.d.ts +12 -12
- package/dist/commonjs/application.js +60 -22
- package/dist/commonjs/context.d.ts +6 -10
- package/dist/commonjs/context.js +21 -10
- package/dist/commonjs/index.d.ts +1 -1
- package/dist/commonjs/index.js +1 -2
- package/dist/commonjs/request.d.ts +3 -2
- package/dist/commonjs/request.js +35 -64
- package/dist/commonjs/response.d.ts +3 -2
- package/dist/commonjs/response.js +26 -19
- package/dist/commonjs/types.d.ts +3 -2
- package/dist/esm/application.d.ts +12 -12
- package/dist/esm/application.js +25 -20
- package/dist/esm/context.d.ts +6 -10
- package/dist/esm/context.js +21 -10
- package/dist/esm/index.d.ts +1 -1
- package/dist/esm/index.js +1 -2
- package/dist/esm/request.d.ts +3 -2
- package/dist/esm/request.js +35 -64
- package/dist/esm/response.d.ts +3 -2
- package/dist/esm/response.js +26 -19
- package/dist/esm/types.d.ts +3 -2
- package/dist/package.json +1 -1
- package/package.json +18 -8
- package/src/application.ts +48 -30
- package/src/context.ts +73 -29
- package/src/index.ts +1 -1
- package/src/request.ts +73 -54
- package/src/response.ts +53 -27
- package/src/types.ts +4 -2
package/dist/esm/response.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import util from 'node:util';
|
|
2
2
|
import Stream from 'node:stream';
|
|
3
3
|
import type { IncomingMessage, ServerResponse } from 'node:http';
|
|
4
|
+
import { type Options as ContentDispositionOptions } from 'content-disposition';
|
|
4
5
|
import type { Application } from './application.js';
|
|
5
6
|
import type { Context } from './context.js';
|
|
6
7
|
import type { Request } from './request.js';
|
|
@@ -87,7 +88,7 @@ export declare class Response {
|
|
|
87
88
|
/**
|
|
88
89
|
* Set Content-Disposition header to "attachment" with optional `filename`.
|
|
89
90
|
*/
|
|
90
|
-
attachment(filename?: string, options?:
|
|
91
|
+
attachment(filename?: string, options?: ContentDispositionOptions): void;
|
|
91
92
|
/**
|
|
92
93
|
* Set Content-Type response header with `type` through `mime.lookup()`
|
|
93
94
|
* when it does not contain a charset.
|
|
@@ -173,7 +174,7 @@ export declare class Response {
|
|
|
173
174
|
* this.set('Accept', 'application/json');
|
|
174
175
|
* this.set({ Accept: 'text/plain', 'X-API-Key': 'tobi' });
|
|
175
176
|
*/
|
|
176
|
-
set(field: string | Record<string, string>, val?: string | number |
|
|
177
|
+
set(field: string | Record<string, string>, val?: string | number | unknown[]): void;
|
|
177
178
|
/**
|
|
178
179
|
* Append additional header `field` with value `val`.
|
|
179
180
|
*
|
package/dist/esm/response.js
CHANGED
|
@@ -58,17 +58,18 @@ export class Response {
|
|
|
58
58
|
assert(code >= 100 && code <= 999, `invalid status code: ${code}`);
|
|
59
59
|
this._explicitStatus = true;
|
|
60
60
|
this.res.statusCode = code;
|
|
61
|
-
if (this.req.httpVersionMajor < 2) {
|
|
61
|
+
if (this.req.httpVersionMajor < 2 && statuses.message[code]) {
|
|
62
62
|
this.res.statusMessage = statuses.message[code];
|
|
63
63
|
}
|
|
64
|
-
if (this.body && statuses.empty[code])
|
|
64
|
+
if (this.body && statuses.empty[code]) {
|
|
65
65
|
this.body = null;
|
|
66
|
+
}
|
|
66
67
|
}
|
|
67
68
|
/**
|
|
68
69
|
* Get response status message
|
|
69
70
|
*/
|
|
70
71
|
get message() {
|
|
71
|
-
return this.res.statusMessage
|
|
72
|
+
return this.res.statusMessage ?? statuses.message[this.status];
|
|
72
73
|
}
|
|
73
74
|
/**
|
|
74
75
|
* Set response status message
|
|
@@ -76,6 +77,7 @@ export class Response {
|
|
|
76
77
|
set message(msg) {
|
|
77
78
|
this.res.statusMessage = msg;
|
|
78
79
|
}
|
|
80
|
+
// oxlint-disable-next-line typescript/no-explicit-any
|
|
79
81
|
_body;
|
|
80
82
|
_explicitNullBody;
|
|
81
83
|
/**
|
|
@@ -91,11 +93,13 @@ export class Response {
|
|
|
91
93
|
const original = this._body;
|
|
92
94
|
this._body = val;
|
|
93
95
|
// no content
|
|
94
|
-
if (val
|
|
95
|
-
if (!statuses.empty[this.status])
|
|
96
|
+
if (val === null || val === undefined) {
|
|
97
|
+
if (!statuses.empty[this.status]) {
|
|
96
98
|
this.status = 204;
|
|
97
|
-
|
|
99
|
+
}
|
|
100
|
+
if (val === null) {
|
|
98
101
|
this._explicitNullBody = true;
|
|
102
|
+
}
|
|
99
103
|
this.remove('Content-Type');
|
|
100
104
|
this.remove('Content-Length');
|
|
101
105
|
this.remove('Transfer-Encoding');
|
|
@@ -123,15 +127,17 @@ export class Response {
|
|
|
123
127
|
// stream
|
|
124
128
|
if (val instanceof Stream) {
|
|
125
129
|
onFinish(this.res, destroy.bind(null, val));
|
|
126
|
-
//
|
|
130
|
+
// oxlint-disable-next-line eqeqeq
|
|
127
131
|
if (original != val) {
|
|
128
132
|
val.once('error', err => this.ctx.onerror(err));
|
|
129
133
|
// overwriting
|
|
130
|
-
if (original
|
|
134
|
+
if (original !== null && original !== undefined) {
|
|
131
135
|
this.remove('Content-Length');
|
|
136
|
+
}
|
|
132
137
|
}
|
|
133
|
-
if (setType)
|
|
138
|
+
if (setType) {
|
|
134
139
|
this.type = 'bin';
|
|
140
|
+
}
|
|
135
141
|
return;
|
|
136
142
|
}
|
|
137
143
|
// json
|
|
@@ -155,7 +161,7 @@ export class Response {
|
|
|
155
161
|
*/
|
|
156
162
|
get length() {
|
|
157
163
|
if (this.has('Content-Length')) {
|
|
158
|
-
return parseInt(this.get('Content-Length')
|
|
164
|
+
return Number.parseInt(this.get('Content-Length')) || 0;
|
|
159
165
|
}
|
|
160
166
|
const { body } = this;
|
|
161
167
|
if (!body || body instanceof Stream) {
|
|
@@ -268,8 +274,10 @@ export class Response {
|
|
|
268
274
|
* this.response.is('html', 'json')
|
|
269
275
|
*/
|
|
270
276
|
is(type, ...types) {
|
|
271
|
-
|
|
272
|
-
|
|
277
|
+
let testTypes = [];
|
|
278
|
+
if (type) {
|
|
279
|
+
testTypes = Array.isArray(type) ? type : [type];
|
|
280
|
+
}
|
|
273
281
|
return typeis(this.type, [...testTypes, ...types]);
|
|
274
282
|
}
|
|
275
283
|
/**
|
|
@@ -355,15 +363,16 @@ export class Response {
|
|
|
355
363
|
if (this.headerSent)
|
|
356
364
|
return;
|
|
357
365
|
if (typeof field === 'string') {
|
|
366
|
+
let value = val;
|
|
358
367
|
if (Array.isArray(val)) {
|
|
359
|
-
|
|
368
|
+
value = val.map(v => {
|
|
360
369
|
return typeof v === 'string' ? v : String(v);
|
|
361
370
|
});
|
|
362
371
|
}
|
|
363
372
|
else if (typeof val !== 'string') {
|
|
364
|
-
|
|
373
|
+
value = String(val);
|
|
365
374
|
}
|
|
366
|
-
this.res.setHeader(field,
|
|
375
|
+
this.res.setHeader(field, value);
|
|
367
376
|
}
|
|
368
377
|
else {
|
|
369
378
|
for (const key in field) {
|
|
@@ -385,9 +394,7 @@ export class Response {
|
|
|
385
394
|
const prev = this.get(field);
|
|
386
395
|
let value = val;
|
|
387
396
|
if (prev) {
|
|
388
|
-
value = Array.isArray(prev)
|
|
389
|
-
? prev.concat(value)
|
|
390
|
-
: [prev].concat(val);
|
|
397
|
+
value = Array.isArray(prev) ? prev.concat(value) : [prev].concat(val);
|
|
391
398
|
}
|
|
392
399
|
return this.set(field, value);
|
|
393
400
|
}
|
|
@@ -449,4 +456,4 @@ export class Response {
|
|
|
449
456
|
this.res.flushHeaders();
|
|
450
457
|
}
|
|
451
458
|
}
|
|
452
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"response.js","sourceRoot":"","sources":["../../src/response.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,OAAO,kBAAkB,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,SAAS,MAAM,WAAW,CAAC;AAKlC,MAAM,OAAO,QAAQ;IAEnB,GAAG,CAAc;IACjB,GAAG,CAAkB;IACrB,GAAG,CAAiB;IACpB,GAAG,CAAU;IACb,OAAO,CAAU;IAEjB,YAAY,GAAgB,EAAE,GAAY,EAAE,GAAoB,EAAE,GAAmB;QACnF,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;IACrC,CAAC;IAED;;OAEG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,eAAe,CAAU;IAEzB;;OAEG;IACH,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,IAAI,MAAM,CAAC,IAAY;QACrB,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO;QAC5B,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,8BAA8B,CAAC,CAAC;QAC/D,MAAM,CAAC,IAAI,IAAI,GAAG,IAAI,IAAI,IAAI,GAAG,EAAE,wBAAwB,IAAI,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC;QAC3B,IAAI,IAAI,CAAC,GAAG,CAAC,gBAAgB,GAAG,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,GAAG,CAAC,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAE,CAAC;QACnD,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAC1D,CAAC;IAED;;OAEG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,GAAG,CAAC,aAAa,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAE,CAAC;IAClE,CAAC;IAED;;OAEG;IACH,IAAI,OAAO,CAAC,GAAW;QACrB,IAAI,CAAC,GAAG,CAAC,aAAa,GAAG,GAAG,CAAC;IAC/B,CAAC;IAED,KAAK,CAAM;IACX,iBAAiB,CAAU;IAE3B;;OAEG;IACH,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED;;OAEG;IACH,IAAI,IAAI,CAAC,GAAmE;QAC1E,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;QAC5B,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC;QAEjB,aAAa;QACb,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;YAChB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;gBAAE,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;YACpD,IAAI,GAAG,KAAK,IAAI;gBAAE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAChD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;YACjC,OAAO;QACT,CAAC;QAED,iBAAiB;QACjB,IAAI,CAAC,IAAI,CAAC,eAAe;YAAE,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;QAE7C,2CAA2C;QAC3C,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAE1C,SAAS;QACT,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC5B,IAAI,OAAO;gBAAE,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;YAC9D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACrC,OAAO;QACT,CAAC;QAED,SAAS;QACT,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACzB,IAAI,OAAO;gBAAE,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;YAC/B,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;YACzB,OAAO;QACT,CAAC;QAED,SAAS;QACT,IAAI,GAAG,YAAY,MAAM,EAAE,CAAC;YAC1B,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;YAC5C,kCAAkC;YAClC,IAAI,QAAQ,IAAI,GAAG,EAAE,CAAC;gBACpB,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;gBAChD,cAAc;gBACd,IAAI,QAAQ,IAAI,IAAI;oBAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YACtD,CAAC;YAED,IAAI,OAAO;gBAAE,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;YAC/B,OAAO;QACT,CAAC;QAED,OAAO;QACP,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAC9B,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,IAAI,MAAM,CAAC,CAA8B;QACvC,IAAI,CAAC,KAAK,SAAS;YAAE,OAAO;QAC5B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,IAAI,MAAM;QACR,IAAI,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC/B,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,IAAI,IAAI,IAAI,YAAY,MAAM,EAAE,CAAC;YACpC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;QACD,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;QACD,OAAO,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACjD,CAAC;IAED;;OAEG;IACH,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC;IAC9B,CAAC;IAED;;OAEG;IACH,IAAI,CAAC,KAAa;QAChB,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO;QAC5B,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACxB,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,QAAQ,CAAC,GAAW,EAAE,GAAY;QAChC,WAAW;QACX,IAAI,GAAG,KAAK,MAAM;YAAE,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAS,UAAU,CAAC,IAAI,GAAG,IAAI,GAAG,CAAC;QACzE,IAAI,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5D,8CAA8C;YAC9C,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QAErC,SAAS;QACT,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YAAE,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;QAEvD,OAAO;QACP,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAClB,IAAI,CAAC,IAAI,GAAG,0BAA0B,CAAC;YACvC,IAAI,CAAC,IAAI,GAAG,2BAA2B,GAAG,KAAK,GAAG,OAAO,CAAC;YAC1D,OAAO;QACT,CAAC;QAED,OAAO;QACP,IAAI,CAAC,IAAI,GAAG,2BAA2B,CAAC;QACxC,IAAI,CAAC,IAAI,GAAG,kBAAkB,GAAG,GAAG,CAAC;IACvC,CAAC;IAED;;OAEG;IACH,UAAU,CAAC,QAAiB,EAAE,OAAa;QACzC,IAAI,QAAQ;YAAE,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,CAAC,GAAG,CAAC,qBAAqB,EAAE,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;IACzE,CAAC;IAED;;;;;;;;;;;OAWG;IACH,IAAI,IAAI,CAAC,IAA+B;QACtC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YAC5B,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,IAAI,IAAI;QACN,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAS,cAAc,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC;IAED;;;;;;OAMG;IACH,EAAE,CAAC,IAAwB,EAAE,GAAG,KAAe;QAC7C,MAAM,SAAS,GAAa,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACtD,CAAC,IAAI,CAAC,CAAC,CAAC,CAAE,IAAI,CAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACzB,OAAO,MAAM,CAAC,IAAI,CAAC,IAAc,EAAE,CAAE,GAAG,SAAS,EAAE,GAAG,KAAK,CAAE,CAAC,CAAC;IACjE,CAAC;IAED;;;;;OAKG;IACH,IAAI,YAAY,CAAC,GAA8B;QAC7C,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,GAAG,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,GAAG,EAAE,CAAC;YACR,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED;;OAEG;IACH,IAAI,YAAY;QACd,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAS,eAAe,CAAC,CAAC;QAC/C,IAAI,IAAI;YAAE,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED;;;;;;;OAOG;IACH,IAAI,IAAI,CAAC,GAAW;QAClB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,GAAG,GAAG,IAAI,GAAG,GAAG,CAAC;QAC5C,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACxB,CAAC;IAED;;OAEG;IACH,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IAED;;;;;;;;;;OAUG;IACH,GAAG,CAAiC,KAAa;QAC/C,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAM,CAAC;IACvD,CAAC;IAED;;;;;;;;;;;OAWG;IACH,GAAG,CAAC,KAAa;QACf,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAED;;;;;;;;;OASG;IACH,GAAG,CAAC,KAAsC,EAAE,GAA6B;QACvE,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO;QAC5B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvB,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;oBAChB,OAAO,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC/C,CAAC,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;gBACnC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YACpB,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACjC,CAAC;aAAM,CAAC;YACN,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;gBACxB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;;;;;;OASG;IACH,MAAM,CAAC,KAAa,EAAE,GAAsB;QAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAE7B,IAAI,KAAK,GAAgB,GAAG,CAAC;QAC7B,IAAI,IAAI,EAAE,CAAC;YACT,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;gBACzB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;gBACpB,CAAC,CAAC,CAAE,IAAI,CAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;QAED,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAa;QAClB,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO;QAC5B,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED;;;;OAIG;IACH,IAAI,QAAQ;QACV,+CAA+C;QAC/C,wDAAwD;QACxD,+DAA+D;QAC/D,sEAAsE;QACtE,yFAAyF;QACzF,IAAI,IAAI,CAAC,GAAG,CAAC,aAAa,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ;YAAE,OAAO,KAAK,CAAC;QAE9D,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;QAC/B,6DAA6D;QAC7D,sEAAsE;QACtE,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QACzB,OAAO,MAAM,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,OAAO;QACL,IAAI,CAAC,IAAI,CAAC,GAAG;YAAE,OAAO;QACtB,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QACxB,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,OAAO,CAAC,CAAC;IACX,CAAC;IAED,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QACnB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED;;OAEG;IACH,MAAM;QACJ,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,YAAY;QACV,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;IAC1B,CAAC;CACF"}
|
|
459
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"response.js","sourceRoot":"","sources":["../../src/response.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/types.d.ts
CHANGED
package/dist/package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eggjs/koa",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.22.0",
|
|
4
4
|
"engines": {
|
|
5
5
|
"node": ">= 18.19.0"
|
|
6
6
|
},
|
|
@@ -14,9 +14,17 @@
|
|
|
14
14
|
"preci": "npm run lint",
|
|
15
15
|
"ci": "egg-bin cov",
|
|
16
16
|
"postci": "npm run prepublishOnly && attw --pack",
|
|
17
|
-
"lint": "
|
|
17
|
+
"lint": "oxlint",
|
|
18
18
|
"authors": "git log --format='%aN <%aE>' | sort -u > AUTHORS",
|
|
19
|
-
"prepublishOnly": "tshy && tshy-after"
|
|
19
|
+
"prepublishOnly": "tshy && tshy-after",
|
|
20
|
+
"prepare": "husky"
|
|
21
|
+
},
|
|
22
|
+
"lint-staged": {
|
|
23
|
+
"*": "prettier --write --ignore-unknown --cache",
|
|
24
|
+
"*.{ts,js,json,md,yml}": [
|
|
25
|
+
"prettier --ignore-unknown --write",
|
|
26
|
+
"oxlint --fix"
|
|
27
|
+
]
|
|
20
28
|
},
|
|
21
29
|
"repository": {
|
|
22
30
|
"type": "git",
|
|
@@ -33,6 +41,7 @@
|
|
|
33
41
|
],
|
|
34
42
|
"license": "MIT",
|
|
35
43
|
"dependencies": {
|
|
44
|
+
"@types/content-disposition": "^0.5.8",
|
|
36
45
|
"accepts": "^1.3.8",
|
|
37
46
|
"cache-content-type": "^2.0.0",
|
|
38
47
|
"content-disposition": "~0.5.4",
|
|
@@ -53,11 +62,10 @@
|
|
|
53
62
|
"vary": "^1.1.2"
|
|
54
63
|
},
|
|
55
64
|
"devDependencies": {
|
|
56
|
-
"@arethetypeswrong/cli": "^0.17.
|
|
65
|
+
"@arethetypeswrong/cli": "^0.17.4",
|
|
57
66
|
"@eggjs/bin": "^7.0.1",
|
|
58
|
-
"@eggjs/tsconfig": "
|
|
67
|
+
"@eggjs/tsconfig": "2",
|
|
59
68
|
"@types/accepts": "^1.3.7",
|
|
60
|
-
"@types/content-disposition": "^0.5.8",
|
|
61
69
|
"@types/content-type": "^1.1.8",
|
|
62
70
|
"@types/cookies": "^0.9.0",
|
|
63
71
|
"@types/destroy": "^1.0.3",
|
|
@@ -74,8 +82,10 @@
|
|
|
74
82
|
"@types/supertest": "^6.0.2",
|
|
75
83
|
"@types/type-is": "^1.6.6",
|
|
76
84
|
"@types/vary": "^1.1.3",
|
|
77
|
-
"
|
|
78
|
-
"
|
|
85
|
+
"husky": "9",
|
|
86
|
+
"lint-staged": "15",
|
|
87
|
+
"oxlint": "^0.16.2",
|
|
88
|
+
"prettier": "3",
|
|
79
89
|
"mm": "^4.0.1",
|
|
80
90
|
"supertest": "^3.1.0",
|
|
81
91
|
"tsd": "^0.31.0",
|
package/src/application.ts
CHANGED
|
@@ -1,15 +1,16 @@
|
|
|
1
|
-
import { debuglog } from 'node:util';
|
|
1
|
+
import util, { debuglog } from 'node:util';
|
|
2
2
|
import Emitter from 'node:events';
|
|
3
|
-
import util from 'node:util';
|
|
4
3
|
import Stream from 'node:stream';
|
|
5
4
|
import http from 'node:http';
|
|
6
5
|
import type { AsyncLocalStorage } from 'node:async_hooks';
|
|
7
6
|
import type { IncomingMessage, ServerResponse } from 'node:http';
|
|
7
|
+
|
|
8
8
|
import { getAsyncLocalStorage } from 'gals';
|
|
9
9
|
import { isGeneratorFunction } from 'is-type-of';
|
|
10
10
|
import onFinished from 'on-finished';
|
|
11
11
|
import statuses from 'statuses';
|
|
12
12
|
import compose from 'koa-compose';
|
|
13
|
+
|
|
13
14
|
import { HttpError } from 'http-errors';
|
|
14
15
|
import { Context } from './context.js';
|
|
15
16
|
import { Request } from './request.js';
|
|
@@ -18,10 +19,13 @@ import type { CustomError, AnyProto } from './types.js';
|
|
|
18
19
|
|
|
19
20
|
const debug = debuglog('@eggjs/koa/application');
|
|
20
21
|
|
|
21
|
-
|
|
22
|
+
// oxlint-disable-next-line typescript/no-explicit-any
|
|
23
|
+
export type ProtoImplClass<T = object> = new (...args: any[]) => T;
|
|
22
24
|
export type Next = () => Promise<void>;
|
|
23
25
|
type _MiddlewareFunc<T> = (ctx: T, next: Next) => Promise<void> | void;
|
|
24
|
-
export type MiddlewareFunc<T = Context> = _MiddlewareFunc<T> & {
|
|
26
|
+
export type MiddlewareFunc<T extends Context = Context> = _MiddlewareFunc<T> & {
|
|
27
|
+
_name?: string;
|
|
28
|
+
};
|
|
25
29
|
|
|
26
30
|
/**
|
|
27
31
|
* Expose `Application` class.
|
|
@@ -53,15 +57,15 @@ export class Application extends Emitter {
|
|
|
53
57
|
|
|
54
58
|
/**
|
|
55
59
|
* Initialize a new `Application`.
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
60
|
+
*
|
|
61
|
+
* @param {object} [options] Application options
|
|
62
|
+
* @param {string} [options.env] Environment, default is `development`
|
|
63
|
+
* @param {string[]} [options.keys] Signed cookie keys
|
|
64
|
+
* @param {boolean} [options.proxy] Trust proxy headers
|
|
65
|
+
* @param {number} [options.subdomainOffset] Subdomain offset
|
|
66
|
+
* @param {string} [options.proxyIpHeader] Proxy IP header, defaults to X-Forwarded-For
|
|
67
|
+
* @param {number} [options.maxIpsCount] Max IPs read from proxy IP header, default to 0 (means infinity)
|
|
68
|
+
*/
|
|
65
69
|
|
|
66
70
|
constructor(options?: {
|
|
67
71
|
proxy?: boolean;
|
|
@@ -84,11 +88,14 @@ export class Application extends Emitter {
|
|
|
84
88
|
this.middleware = [];
|
|
85
89
|
this.ctxStorage = getAsyncLocalStorage();
|
|
86
90
|
this.silent = false;
|
|
87
|
-
this.ContextClass =
|
|
91
|
+
this.ContextClass =
|
|
92
|
+
class ApplicationContext extends Context {} as ProtoImplClass<Context>;
|
|
88
93
|
this.context = this.ContextClass.prototype;
|
|
89
|
-
this.RequestClass =
|
|
94
|
+
this.RequestClass =
|
|
95
|
+
class ApplicationRequest extends Request {} as ProtoImplClass<Request>;
|
|
90
96
|
this.request = this.RequestClass.prototype;
|
|
91
|
-
this.ResponseClass =
|
|
97
|
+
this.ResponseClass =
|
|
98
|
+
class ApplicationResponse extends Response {} as ProtoImplClass<Response>;
|
|
92
99
|
this.response = this.ResponseClass.prototype;
|
|
93
100
|
}
|
|
94
101
|
|
|
@@ -119,6 +126,7 @@ export class Application extends Emitter {
|
|
|
119
126
|
*
|
|
120
127
|
* http.createServer(app.callback()).listen(...)
|
|
121
128
|
*/
|
|
129
|
+
// oxlint-disable-next-line typescript/no-explicit-any
|
|
122
130
|
listen(...args: any[]) {
|
|
123
131
|
debug('listen with args: %o', args);
|
|
124
132
|
const server = http.createServer(this.callback());
|
|
@@ -151,16 +159,19 @@ export class Application extends Emitter {
|
|
|
151
159
|
/**
|
|
152
160
|
* Use the given middleware `fn`.
|
|
153
161
|
*/
|
|
154
|
-
use(fn: MiddlewareFunc) {
|
|
155
|
-
if (typeof fn !== 'function')
|
|
162
|
+
use<T extends Context = Context>(fn: MiddlewareFunc<T>) {
|
|
163
|
+
if (typeof fn !== 'function')
|
|
164
|
+
throw new TypeError('middleware must be a function!');
|
|
156
165
|
const name = fn._name || fn.name || '-';
|
|
157
166
|
if (isGeneratorFunction(fn)) {
|
|
158
|
-
throw new TypeError(
|
|
159
|
-
|
|
160
|
-
|
|
167
|
+
throw new TypeError(
|
|
168
|
+
`Support for generators was removed, middleware: ${name}. ` +
|
|
169
|
+
'See the documentation for examples of how to convert old middleware ' +
|
|
170
|
+
'https://github.com/koajs/koa/blob/master/docs/migration.md'
|
|
171
|
+
);
|
|
161
172
|
}
|
|
162
173
|
debug('use %o #%d', name, this.middleware.length);
|
|
163
|
-
this.middleware.push(fn);
|
|
174
|
+
this.middleware.push(fn as MiddlewareFunc<Context>);
|
|
164
175
|
return this;
|
|
165
176
|
}
|
|
166
177
|
|
|
@@ -196,12 +207,16 @@ export class Application extends Emitter {
|
|
|
196
207
|
* Handle request in callback.
|
|
197
208
|
* @private
|
|
198
209
|
*/
|
|
199
|
-
protected async handleRequest(
|
|
210
|
+
protected async handleRequest(
|
|
211
|
+
ctx: Context,
|
|
212
|
+
fnMiddleware: (ctx: Context) => Promise<void>
|
|
213
|
+
) {
|
|
200
214
|
this.emit('request', ctx);
|
|
201
215
|
const res = ctx.res;
|
|
202
216
|
res.statusCode = 404;
|
|
203
|
-
const onerror = (err:
|
|
204
|
-
|
|
217
|
+
const onerror = (err: CustomError) => ctx.onerror(err);
|
|
218
|
+
// oxlint-disable-next-line promise/prefer-await-to-callbacks
|
|
219
|
+
onFinished(res, (err: CustomError | null) => {
|
|
205
220
|
if (err) {
|
|
206
221
|
onerror(err);
|
|
207
222
|
}
|
|
@@ -211,7 +226,7 @@ export class Application extends Emitter {
|
|
|
211
226
|
await fnMiddleware(ctx);
|
|
212
227
|
return this._respond(ctx);
|
|
213
228
|
} catch (err) {
|
|
214
|
-
return onerror(err);
|
|
229
|
+
return onerror(err as CustomError);
|
|
215
230
|
}
|
|
216
231
|
}
|
|
217
232
|
|
|
@@ -232,15 +247,18 @@ export class Application extends Emitter {
|
|
|
232
247
|
// When dealing with cross-globals a normal `instanceof` check doesn't work properly.
|
|
233
248
|
// See https://github.com/koajs/koa/issues/1466
|
|
234
249
|
// We can probably remove it once jest fixes https://github.com/facebook/jest/issues/2549.
|
|
235
|
-
const isNativeError =
|
|
250
|
+
const isNativeError =
|
|
251
|
+
err instanceof Error ||
|
|
236
252
|
Object.prototype.toString.call(err) === '[object Error]';
|
|
237
|
-
if (!isNativeError)
|
|
253
|
+
if (!isNativeError)
|
|
254
|
+
throw new TypeError(util.format('non-error thrown: %j', err));
|
|
238
255
|
|
|
239
256
|
if (err.status === 404 || err.expose) return;
|
|
240
257
|
if (this.silent) return;
|
|
241
258
|
|
|
242
259
|
const msg = err.stack || err.toString();
|
|
243
|
-
console
|
|
260
|
+
// oxlint-disable-next-line no-console
|
|
261
|
+
console.error(`\n${msg.replaceAll(/^/gm, ' ')}\n`);
|
|
244
262
|
}
|
|
245
263
|
|
|
246
264
|
/**
|
|
@@ -272,7 +290,7 @@ export class Application extends Emitter {
|
|
|
272
290
|
}
|
|
273
291
|
|
|
274
292
|
// status body
|
|
275
|
-
if (body
|
|
293
|
+
if (body === null || body === undefined) {
|
|
276
294
|
if (ctx.response._explicitNullBody) {
|
|
277
295
|
ctx.response.remove('Content-Type');
|
|
278
296
|
ctx.response.remove('Transfer-Encoding');
|
package/src/context.ts
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import util from 'node:util';
|
|
2
2
|
import type { IncomingMessage, ServerResponse } from 'node:http';
|
|
3
|
-
import { ParsedUrlQuery } from 'node:querystring';
|
|
3
|
+
import type { ParsedUrlQuery } from 'node:querystring';
|
|
4
|
+
|
|
4
5
|
import createError from 'http-errors';
|
|
5
6
|
import statuses from 'statuses';
|
|
6
7
|
import Cookies from 'cookies';
|
|
7
|
-
import {
|
|
8
|
+
import type { Accepts } from 'accepts';
|
|
9
|
+
|
|
8
10
|
import type { Application } from './application.js';
|
|
9
11
|
import type { Request } from './request.js';
|
|
10
12
|
import type { Response } from './response.js';
|
|
@@ -19,6 +21,7 @@ export class Context {
|
|
|
19
21
|
response: Response & AnyProto;
|
|
20
22
|
originalUrl: string;
|
|
21
23
|
respond?: boolean;
|
|
24
|
+
// oxlint-disable-next-line typescript/no-explicit-any
|
|
22
25
|
#state: Record<string, any> = {};
|
|
23
26
|
|
|
24
27
|
constructor(app: Application, req: IncomingMessage, res: ServerResponse) {
|
|
@@ -26,10 +29,10 @@ export class Context {
|
|
|
26
29
|
this.req = req;
|
|
27
30
|
this.res = res;
|
|
28
31
|
this.request = new app.RequestClass(app, this, req, res);
|
|
29
|
-
this.response = new app.ResponseClass(app, this
|
|
32
|
+
this.response = new app.ResponseClass(app, this, req, res);
|
|
30
33
|
this.request.response = this.response;
|
|
31
34
|
this.response.request = this.request;
|
|
32
|
-
this.originalUrl = req.url
|
|
35
|
+
this.originalUrl = req.url ?? '/';
|
|
33
36
|
}
|
|
34
37
|
|
|
35
38
|
/**
|
|
@@ -74,15 +77,24 @@ export class Context {
|
|
|
74
77
|
* ```ts
|
|
75
78
|
* this.assert(this.user, 401, 'Please login!');
|
|
76
79
|
* ```
|
|
77
|
-
*
|
|
78
|
-
* @param {Mixed} value
|
|
79
|
-
* @param {Number} status
|
|
80
|
-
* @param {String} errorMessage
|
|
81
|
-
* @param {Object} errorProps
|
|
82
80
|
*/
|
|
83
|
-
assert(
|
|
84
|
-
|
|
85
|
-
|
|
81
|
+
assert(
|
|
82
|
+
value: unknown,
|
|
83
|
+
status?: number,
|
|
84
|
+
errorProps?: Record<string, unknown>
|
|
85
|
+
): void;
|
|
86
|
+
assert(
|
|
87
|
+
value: unknown,
|
|
88
|
+
status?: number,
|
|
89
|
+
errorMessage?: string,
|
|
90
|
+
errorProps?: Record<string, unknown>
|
|
91
|
+
): void;
|
|
92
|
+
assert(
|
|
93
|
+
value: unknown,
|
|
94
|
+
status?: number,
|
|
95
|
+
errorMessageOrProps?: string | Record<string, unknown>,
|
|
96
|
+
errorProps?: Record<string, unknown>
|
|
97
|
+
) {
|
|
86
98
|
if (value) {
|
|
87
99
|
return;
|
|
88
100
|
}
|
|
@@ -131,7 +143,12 @@ export class Context {
|
|
|
131
143
|
throw(error: Error, errorProps: object): void;
|
|
132
144
|
throw(error: Error, status: number): void;
|
|
133
145
|
throw(error: Error, status: number, errorProps: object): void;
|
|
134
|
-
throw(
|
|
146
|
+
throw(
|
|
147
|
+
arg1: number | string | Error,
|
|
148
|
+
arg2?: number | string | Error | object,
|
|
149
|
+
errorProps?: object
|
|
150
|
+
) {
|
|
151
|
+
// oxlint-disable-next-line typescript/no-explicit-any
|
|
135
152
|
const args: any[] = [];
|
|
136
153
|
if (typeof arg2 === 'number') {
|
|
137
154
|
// throw(error, status)
|
|
@@ -163,7 +180,8 @@ export class Context {
|
|
|
163
180
|
// When dealing with cross-globals a normal `instanceof` check doesn't work properly.
|
|
164
181
|
// See https://github.com/koajs/koa/issues/1466
|
|
165
182
|
// We can probably remove it once jest fixes https://github.com/facebook/jest/issues/2549.
|
|
166
|
-
const isNativeError =
|
|
183
|
+
const isNativeError =
|
|
184
|
+
err instanceof Error ||
|
|
167
185
|
Object.prototype.toString.call(err) === '[object Error]';
|
|
168
186
|
if (!isNativeError) {
|
|
169
187
|
err = new Error(util.format('non-error thrown: %j', err));
|
|
@@ -171,7 +189,8 @@ export class Context {
|
|
|
171
189
|
|
|
172
190
|
let headerSent = false;
|
|
173
191
|
if (this.response.headerSent || !this.response.writable) {
|
|
174
|
-
headerSent =
|
|
192
|
+
headerSent = true;
|
|
193
|
+
err.headerSent = true;
|
|
175
194
|
}
|
|
176
195
|
|
|
177
196
|
// delegate
|
|
@@ -187,10 +206,14 @@ export class Context {
|
|
|
187
206
|
const { res } = this;
|
|
188
207
|
|
|
189
208
|
// first unset all headers
|
|
190
|
-
|
|
209
|
+
for (const name of res.getHeaderNames()) {
|
|
210
|
+
res.removeHeader(name);
|
|
211
|
+
}
|
|
191
212
|
|
|
192
213
|
// then set those specified
|
|
193
|
-
if (err.headers)
|
|
214
|
+
if (err.headers) {
|
|
215
|
+
this.response.set(err.headers);
|
|
216
|
+
}
|
|
194
217
|
|
|
195
218
|
// force text/plain
|
|
196
219
|
this.response.type = 'text';
|
|
@@ -198,15 +221,20 @@ export class Context {
|
|
|
198
221
|
let statusCode = err.status || err.statusCode;
|
|
199
222
|
|
|
200
223
|
// ENOENT support
|
|
201
|
-
if (err.code === 'ENOENT')
|
|
224
|
+
if (err.code === 'ENOENT') {
|
|
225
|
+
statusCode = 404;
|
|
226
|
+
}
|
|
202
227
|
|
|
203
228
|
// default to 500
|
|
204
|
-
if (typeof statusCode !== 'number' || !statuses.message[statusCode])
|
|
229
|
+
if (typeof statusCode !== 'number' || !statuses.message[statusCode]) {
|
|
230
|
+
statusCode = 500;
|
|
231
|
+
}
|
|
205
232
|
|
|
206
233
|
// respond
|
|
207
234
|
const statusMessage = statuses.message[statusCode] as string;
|
|
208
235
|
const msg = err.expose ? err.message : statusMessage;
|
|
209
|
-
|
|
236
|
+
err.status = statusCode;
|
|
237
|
+
this.response.status = statusCode;
|
|
210
238
|
this.response.length = Buffer.byteLength(msg);
|
|
211
239
|
res.end(msg);
|
|
212
240
|
}
|
|
@@ -238,29 +266,43 @@ export class Context {
|
|
|
238
266
|
acceptsLanguages(): string[];
|
|
239
267
|
acceptsLanguages(languages: string[]): string | false;
|
|
240
268
|
acceptsLanguages(...languages: string[]): string | false;
|
|
241
|
-
acceptsLanguages(
|
|
242
|
-
|
|
269
|
+
acceptsLanguages(
|
|
270
|
+
languages?: string | string[],
|
|
271
|
+
...others: string[]
|
|
272
|
+
): string | string[] | false {
|
|
273
|
+
return this.request.acceptsLanguages(languages as string, ...others);
|
|
243
274
|
}
|
|
244
275
|
|
|
245
276
|
acceptsEncodings(): string[];
|
|
246
277
|
acceptsEncodings(encodings: string[]): string | false;
|
|
247
278
|
acceptsEncodings(...encodings: string[]): string | false;
|
|
248
|
-
acceptsEncodings(
|
|
249
|
-
|
|
279
|
+
acceptsEncodings(
|
|
280
|
+
encodings?: string | string[],
|
|
281
|
+
...others: string[]
|
|
282
|
+
): string[] | string | false {
|
|
283
|
+
return this.request.acceptsEncodings(encodings as string, ...others);
|
|
250
284
|
}
|
|
251
285
|
|
|
252
286
|
acceptsCharsets(): string[];
|
|
253
287
|
acceptsCharsets(charsets: string[]): string | false;
|
|
254
288
|
acceptsCharsets(...charsets: string[]): string | false;
|
|
255
|
-
acceptsCharsets(
|
|
256
|
-
|
|
289
|
+
acceptsCharsets(
|
|
290
|
+
charsets?: string | string[],
|
|
291
|
+
...others: string[]
|
|
292
|
+
): string[] | string | false {
|
|
293
|
+
return this.request.acceptsCharsets(charsets as string, ...others);
|
|
257
294
|
}
|
|
258
295
|
|
|
259
|
-
accepts(
|
|
260
|
-
|
|
296
|
+
accepts(args: string[]): string | string[] | false;
|
|
297
|
+
accepts(...args: string[]): string | string[] | false;
|
|
298
|
+
accepts(
|
|
299
|
+
args?: string | string[],
|
|
300
|
+
...others: string[]
|
|
301
|
+
): string | string[] | false {
|
|
302
|
+
return this.request.accepts(args as string, ...others);
|
|
261
303
|
}
|
|
262
304
|
|
|
263
|
-
get<T = string | string
|
|
305
|
+
get<T = string | string[]>(field: string): T {
|
|
264
306
|
return this.request.get(field);
|
|
265
307
|
}
|
|
266
308
|
|
|
@@ -440,10 +482,12 @@ export class Context {
|
|
|
440
482
|
this.response.message = msg;
|
|
441
483
|
}
|
|
442
484
|
|
|
485
|
+
// oxlint-disable-next-line typescript/no-explicit-any
|
|
443
486
|
get body(): any {
|
|
444
487
|
return this.response.body;
|
|
445
488
|
}
|
|
446
489
|
|
|
490
|
+
// oxlint-disable-next-line typescript/no-explicit-any
|
|
447
491
|
set body(val: any) {
|
|
448
492
|
this.response.body = val;
|
|
449
493
|
}
|