egg 4.0.0 → 4.0.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/dist/commonjs/app/extend/context.d.ts +14 -1
- package/dist/commonjs/app/extend/context.js +1 -2
- package/dist/commonjs/app/extend/request.d.ts +9 -1
- package/dist/commonjs/app/extend/request.js +1 -2
- package/dist/commonjs/app/extend/response.d.ts +6 -1
- package/dist/commonjs/app/extend/response.js +1 -2
- package/dist/commonjs/config/plugin.js +4 -5
- package/dist/commonjs/lib/core/httpclient.d.ts +3 -3
- package/dist/commonjs/lib/core/httpclient.js +10 -5
- package/dist/commonjs/lib/egg.d.ts +20 -2
- package/dist/commonjs/lib/egg.js +9 -3
- package/dist/commonjs/lib/types.d.ts +14 -49
- package/dist/commonjs/lib/types.js +4 -1
- package/dist/esm/app/extend/context.d.ts +14 -1
- package/dist/esm/app/extend/context.js +1 -2
- package/dist/esm/app/extend/request.d.ts +9 -1
- package/dist/esm/app/extend/request.js +1 -2
- package/dist/esm/app/extend/response.d.ts +6 -1
- package/dist/esm/app/extend/response.js +1 -2
- package/dist/esm/config/plugin.js +4 -5
- package/dist/esm/lib/core/httpclient.d.ts +3 -3
- package/dist/esm/lib/core/httpclient.js +10 -5
- package/dist/esm/lib/egg.d.ts +20 -2
- package/dist/esm/lib/egg.js +9 -3
- package/dist/esm/lib/types.d.ts +14 -49
- package/dist/esm/lib/types.js +4 -1
- package/dist/package.json +1 -1
- package/package.json +4 -4
- package/src/app/extend/context.ts +16 -2
- package/src/app/extend/request.ts +11 -2
- package/src/app/extend/response.ts +8 -2
- package/src/config/plugin.ts +3 -5
- package/src/lib/core/httpclient.ts +11 -4
- package/src/lib/egg.ts +29 -5
- package/src/lib/types.ts +15 -82
- package/dist/commonjs/app/extend/context.types.d.ts +0 -18
- package/dist/commonjs/app/extend/context.types.js +0 -3
- package/dist/commonjs/app/extend/request.types.d.ts +0 -10
- package/dist/commonjs/app/extend/request.types.js +0 -3
- package/dist/commonjs/app/extend/response.types.d.ts +0 -7
- package/dist/commonjs/app/extend/response.types.js +0 -3
- package/dist/commonjs/lib/egg.types.d.ts +0 -13
- package/dist/commonjs/lib/egg.types.js +0 -3
- package/dist/esm/app/extend/context.types.d.ts +0 -18
- package/dist/esm/app/extend/context.types.js +0 -2
- package/dist/esm/app/extend/request.types.d.ts +0 -10
- package/dist/esm/app/extend/request.types.js +0 -2
- package/dist/esm/app/extend/response.types.d.ts +0 -7
- package/dist/esm/app/extend/response.types.js +0 -2
- package/dist/esm/lib/egg.types.d.ts +0 -13
- package/dist/esm/lib/egg.types.js +0 -2
- package/src/app/extend/context.types.ts +0 -24
- package/src/app/extend/request.types.ts +0 -10
- package/src/app/extend/response.types.ts +0 -7
- package/src/lib/egg.types.ts +0 -15
|
@@ -6,7 +6,6 @@ const PROTOCOL = Symbol('request protocol');
|
|
|
6
6
|
const HOST = Symbol('request host');
|
|
7
7
|
const IPS = Symbol('request ips');
|
|
8
8
|
const RE_ARRAY_KEY = /[^\[\]]+\[\]$/;
|
|
9
|
-
import './request.types.js';
|
|
10
9
|
export default class Request extends EggCoreRequest {
|
|
11
10
|
/**
|
|
12
11
|
* Parse the "Host" header field host
|
|
@@ -262,4 +261,4 @@ function getFromHeaders(request, names) {
|
|
|
262
261
|
}
|
|
263
262
|
return '';
|
|
264
263
|
}
|
|
265
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
264
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVxdWVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hcHAvZXh0ZW5kL3JlcXVlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxXQUFXLE1BQU0sa0JBQWtCLENBQUM7QUFDM0MsT0FBTyxFQUFFLE9BQU8sSUFBSSxjQUFjLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFLeEQsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFDLHFCQUFxQixDQUFDLENBQUM7QUFDbEQsTUFBTSxhQUFhLEdBQUcsTUFBTSxDQUFDLHVCQUF1QixDQUFDLENBQUM7QUFDdEQsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUM7QUFDNUMsTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLGNBQWMsQ0FBQyxDQUFDO0FBQ3BDLE1BQU0sR0FBRyxHQUFHLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQztBQUNsQyxNQUFNLFlBQVksR0FBRyxlQUFlLENBQUM7QUFFckMsTUFBTSxDQUFDLE9BQU8sT0FBTyxPQUFRLFNBQVEsY0FBYztJQVVqRDs7Ozs7Ozs7Ozs7Ozs7OztPQWdCRztJQUNILElBQUksSUFBSTtRQUNOLElBQUksSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQXVCLENBQUM7UUFDNUMsSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUNULE9BQU8sSUFBSSxDQUFDO1FBQ2QsQ0FBQztRQUVELElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDMUIsSUFBSSxHQUFHLGNBQWMsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDM0QsQ0FBQztRQUNELElBQUksR0FBRyxJQUFJLElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDdEMsSUFBSSxDQUFDLElBQUksQ0FB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
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { Response as KoaResponse } from '@eggjs/core';
|
|
2
|
-
import './response.types.js';
|
|
3
2
|
export default class Response extends KoaResponse {
|
|
4
3
|
/**
|
|
5
4
|
* Get or set a real status code.
|
|
@@ -24,3 +23,9 @@ export default class Response extends KoaResponse {
|
|
|
24
23
|
*/
|
|
25
24
|
set realStatus(status: number);
|
|
26
25
|
}
|
|
26
|
+
declare module '@eggjs/core' {
|
|
27
|
+
interface Response {
|
|
28
|
+
get realStatus(): number;
|
|
29
|
+
set realStatus(status: number);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Response as KoaResponse } from '@eggjs/core';
|
|
2
2
|
const REAL_STATUS = Symbol('response realStatus');
|
|
3
|
-
import './response.types.js';
|
|
4
3
|
export default class Response extends KoaResponse {
|
|
5
4
|
/**
|
|
6
5
|
* Get or set a real status code.
|
|
@@ -32,4 +31,4 @@ export default class Response extends KoaResponse {
|
|
|
32
31
|
this[REAL_STATUS] = status;
|
|
33
32
|
}
|
|
34
33
|
}
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzcG9uc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYXBwL2V4dGVuZC9yZXNwb25zZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxJQUFJLFdBQVcsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUV0RCxNQUFNLFdBQVcsR0FBRyxNQUFNLENBQUMscUJBQXFCLENBQUMsQ0FBQztBQUVsRCxNQUFNLENBQUMsT0FBTyxPQUFPLFFBQVMsU0FBUSxXQUFXO0lBQy9DOzs7Ozs7Ozs7T0FTRztJQUNILElBQUksVUFBVTtRQUNaLElBQUksSUFBSSxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUM7WUFDdEIsT0FBTyxJQUFJLENBQUMsV0FBVyxDQUFXLENBQUM7UUFDckMsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQztJQUNyQixDQUFDO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ0gsSUFBSSxVQUFVLENBQUMsTUFBYztRQUMzQixJQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsTUFBTSxDQUFDO0lBQzdCLENBQUM7Q0FDRiJ9
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
export default {
|
|
2
|
-
// enable plugins
|
|
3
2
|
/**
|
|
4
3
|
* app global Error Handling
|
|
5
4
|
* @member {Object} Plugin#onerror
|
|
@@ -27,7 +26,7 @@ export default {
|
|
|
27
26
|
*/
|
|
28
27
|
i18n: {
|
|
29
28
|
enable: true,
|
|
30
|
-
package: '
|
|
29
|
+
package: '@eggjs/i18n',
|
|
31
30
|
},
|
|
32
31
|
/**
|
|
33
32
|
* file and dir watcher
|
|
@@ -97,7 +96,7 @@ export default {
|
|
|
97
96
|
*/
|
|
98
97
|
static: {
|
|
99
98
|
enable: true,
|
|
100
|
-
package: '
|
|
99
|
+
package: '@eggjs/static',
|
|
101
100
|
},
|
|
102
101
|
/**
|
|
103
102
|
* jsonp support for egg
|
|
@@ -107,7 +106,7 @@ export default {
|
|
|
107
106
|
*/
|
|
108
107
|
jsonp: {
|
|
109
108
|
enable: true,
|
|
110
|
-
package: '
|
|
109
|
+
package: '@eggjs/jsonp',
|
|
111
110
|
},
|
|
112
111
|
/**
|
|
113
112
|
* view plugin
|
|
@@ -120,4 +119,4 @@ export default {
|
|
|
120
119
|
package: 'egg-view',
|
|
121
120
|
},
|
|
122
121
|
};
|
|
123
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
122
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbmZpZy9wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsZUFBZTtJQUNiOzs7O09BSUc7SUFDSCxPQUFPLEVBQUU7UUFDUCxNQUFNLEVBQUUsSUFBSTtRQUNaLE9BQU8sRUFBRSxhQUFhO0tBQ3ZCO0lBRUQ7Ozs7O09BS0c7SUFDSCxPQUFPLEVBQUU7UUFDUCxNQUFNLEVBQUUsSUFBSTtRQUNaLE9BQU8sRUFBRSxhQUFhO0tBQ3ZCO0lBRUQ7Ozs7O09BS0c7SUFDSCxJQUFJLEVBQUU7UUFDSixNQUFNLEVBQUUsSUFBSTtRQUNaLE9BQU8sRUFBRSxhQUFhO0tBQ3ZCO0lBRUQ7Ozs7O09BS0c7SUFDSCxPQUFPLEVBQUU7UUFDUCxNQUFNLEVBQUUsSUFBSTtRQUNaLE9BQU8sRUFBRSxnQkFBZ0I7S0FDMUI7SUFFRDs7Ozs7T0FLRztJQUNILFNBQVMsRUFBRTtRQUNULE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLGVBQWU7S0FDekI7SUFFRDs7Ozs7T0FLRztJQUNILFFBQVEsRUFBRTtRQUNSLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLGNBQWM7S0FDeEI7SUFFRDs7Ozs7T0FLRztJQUNILFdBQVcsRUFBRTtRQUNYLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLG9CQUFvQjtLQUM5QjtJQUVEOzs7OztPQUtHO0lBQ0gsVUFBVSxFQUFFO1FBQ1YsTUFBTSxFQUFFLElBQUk7UUFDWixPQUFPLEVBQUUsZ0JBQWdCO0tBQzFCO0lBRUQ7Ozs7O09BS0c7SUFDSCxRQUFRLEVBQUU7UUFDUixNQUFNLEVBQUUsSUFBSTtRQUNaLE9BQU8sRUFBRSxpQkFBaUI7S0FDM0I7SUFFRDs7Ozs7T0FLRztJQUNILE1BQU0sRUFBRTtRQUNOLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLGVBQWU7S0FDekI7SUFFRDs7Ozs7T0FLRztJQUNILEtBQUssRUFBRTtRQUNMLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLGNBQWM7S0FDeEI7SUFFRDs7Ozs7T0FLRztJQUNILElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLFVBQVU7S0FDcEI7Q0FDRixDQUFDIn0=
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { HttpClient as RawHttpClient, RequestURL as HttpClientRequestURL, RequestOptions } from 'urllib';
|
|
1
|
+
import { HttpClient as RawHttpClient, RequestURL as HttpClientRequestURL, RequestOptions, ClientOptions as HttpClientOptions } from 'urllib';
|
|
2
2
|
import type { EggApplicationCore } from '../egg.js';
|
|
3
|
-
export type { HttpClientResponse, RequestURL as HttpClientRequestURL, } from 'urllib';
|
|
3
|
+
export type { HttpClientResponse, RequestURL as HttpClientRequestURL, ClientOptions as HttpClientOptions, } from 'urllib';
|
|
4
4
|
export interface HttpClientRequestOptions extends RequestOptions {
|
|
5
5
|
ctx?: any;
|
|
6
6
|
tracer?: any;
|
|
7
7
|
}
|
|
8
8
|
export declare class HttpClient extends RawHttpClient {
|
|
9
9
|
#private;
|
|
10
|
-
constructor(app: EggApplicationCore);
|
|
10
|
+
constructor(app: EggApplicationCore, options?: HttpClientOptions);
|
|
11
11
|
request<T = any>(url: HttpClientRequestURL, options?: HttpClientRequestOptions): Promise<import("urllib").HttpClientResponse<T>>;
|
|
12
12
|
curl<T = any>(url: HttpClientRequestURL, options?: HttpClientRequestOptions): Promise<import("urllib").HttpClientResponse<T>>;
|
|
13
13
|
}
|
|
@@ -2,12 +2,17 @@ import { HttpClient as RawHttpClient, } from 'urllib';
|
|
|
2
2
|
import { ms } from 'humanize-ms';
|
|
3
3
|
export class HttpClient extends RawHttpClient {
|
|
4
4
|
#app;
|
|
5
|
-
constructor(app) {
|
|
5
|
+
constructor(app, options = {}) {
|
|
6
6
|
normalizeConfig(app);
|
|
7
7
|
const config = app.config.httpclient;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
const initOptions = {
|
|
9
|
+
...options,
|
|
10
|
+
defaultArgs: {
|
|
11
|
+
...config.request,
|
|
12
|
+
...options.defaultArgs,
|
|
13
|
+
},
|
|
14
|
+
};
|
|
15
|
+
super(initOptions);
|
|
11
16
|
this.#app = app;
|
|
12
17
|
}
|
|
13
18
|
async request(url, options) {
|
|
@@ -30,4 +35,4 @@ function normalizeConfig(app) {
|
|
|
30
35
|
config.request.timeout = ms(config.request.timeout);
|
|
31
36
|
}
|
|
32
37
|
}
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cGNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9saWIvY29yZS9odHRwY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxVQUFVLElBQUksYUFBYSxHQUk1QixNQUFNLFFBQVEsQ0FBQztBQUNoQixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBY2pDLE1BQU0sT0FBTyxVQUFXLFNBQVEsYUFBYTtJQUNsQyxJQUFJLENBQXdDO0lBRXJELFlBQVksR0FBdUIsRUFBRSxVQUE2QixFQUFFO1FBQ2xFLGVBQWUsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNyQixNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQztRQUNyQyxNQUFNLFdBQVcsR0FBc0I7WUFDckMsR0FBRyxPQUFPO1lBQ1YsV0FBVyxFQUFFO2dCQUNYLEdBQUcsTUFBTSxDQUFDLE9BQU87Z0JBQ2pCLEdBQUcsT0FBTyxDQUFDLFdBQVc7YUFDdkI7U0FDRixDQUFDO1FBQ0YsS0FBSyxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ25CLElBQUksQ0FBQyxJQUFJLEdBQUcsR0FBRyxDQUFDO0lBQ2xCLENBQUM7SUFFRCxLQUFLLENBQUMsT0FBTyxDQUFVLEdBQXlCLEVBQUUsT0FBa0M7UUFDbEYsT0FBTyxHQUFHLE9BQU8sSUFBSSxFQUFFLENBQUM7UUFDeEIsSUFBSSxPQUFPLENBQUMsR0FBRyxFQUFFLE1BQU0sRUFBRSxDQUFDO1lBQ3hCLE9BQU8sQ0FBQyxNQUFNLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUM7UUFDdEMsQ0FBQzthQUFNLENBQUM7WUFDTixPQUFPLENBQUMsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUM7UUFDdEQsQ0FBQztRQUNELE9BQU8sTUFBTSxLQUFLLENBQUMsT0FBTyxDQUFJLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUM5QyxDQUFDO0lBRUQsS0FBSyxDQUFDLElBQUksQ0FBVSxHQUF5QixFQUFFLE9BQWtDO1FBQy9FLE9BQU8sTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFJLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUM3QyxDQUFDO0NBQ0Y7QUFRRCxTQUFTLGVBQWUsQ0FBQyxHQUF1QjtJQUM5QyxNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQztJQUNyQyxJQUFJLE9BQU8sTUFBTSxDQUFDLE9BQU8sRUFBRSxPQUFPLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDaEQsTUFBTSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsRUFBRSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDdEQsQ0FBQztBQUNILENBQUMifQ==
|
package/dist/esm/lib/egg.d.ts
CHANGED
|
@@ -10,12 +10,11 @@ import Context from '../app/extend/context.js';
|
|
|
10
10
|
import type { EggAppConfig } from './types.js';
|
|
11
11
|
import { IMessenger } from './core/messenger/index.js';
|
|
12
12
|
import { ContextHttpClient } from './core/context_httpclient.js';
|
|
13
|
-
import { HttpClient, type HttpClientRequestOptions, type HttpClientRequestURL, type HttpClientResponse } from './core/httpclient.js';
|
|
13
|
+
import { HttpClient, type HttpClientRequestOptions, type HttpClientRequestURL, type HttpClientResponse, type HttpClientOptions } from './core/httpclient.js';
|
|
14
14
|
import { type SingletonCreateMethod } from './core/singleton.js';
|
|
15
15
|
import { BaseContextClass } from './core/base_context_class.js';
|
|
16
16
|
import { BaseHookClass } from './core/base_hook_class.js';
|
|
17
17
|
import type { EggApplicationLoader } from './loader/index.js';
|
|
18
|
-
import './egg.types.js';
|
|
19
18
|
declare const EGG_PATH: unique symbol;
|
|
20
19
|
export interface EggApplicationCoreOptions extends Omit<EggCoreOptions, 'baseDir'> {
|
|
21
20
|
mode?: 'cluster' | 'single';
|
|
@@ -191,6 +190,11 @@ export declare class EggApplicationCore extends EggCore {
|
|
|
191
190
|
* ```
|
|
192
191
|
*/
|
|
193
192
|
curl<T = any>(url: HttpClientRequestURL, options?: HttpClientRequestOptions): Promise<HttpClientResponse<T>>;
|
|
193
|
+
/**
|
|
194
|
+
* Create a new HttpClient instance with custom options
|
|
195
|
+
* @param {Object} [options] HttpClient init options
|
|
196
|
+
*/
|
|
197
|
+
createHttpClient(options?: HttpClientOptions): HttpClient;
|
|
194
198
|
/**
|
|
195
199
|
* HttpClient instance
|
|
196
200
|
* @see https://github.com/node-modules/urllib
|
|
@@ -280,3 +284,17 @@ export declare class EggApplicationCore extends EggCore {
|
|
|
280
284
|
*/
|
|
281
285
|
createContext(req: IncomingMessage, res: ServerResponse): Context;
|
|
282
286
|
}
|
|
287
|
+
declare module '@eggjs/core' {
|
|
288
|
+
interface EggCore {
|
|
289
|
+
inspect(): any;
|
|
290
|
+
get currentContext(): EggContext | undefined;
|
|
291
|
+
ctxStorage: AsyncLocalStorage<EggContext>;
|
|
292
|
+
get logger(): EggLogger;
|
|
293
|
+
get coreLogger(): EggLogger;
|
|
294
|
+
getLogger(name: string): EggLogger;
|
|
295
|
+
createHttpClient(options?: HttpClientOptions): HttpClient;
|
|
296
|
+
HttpClient: typeof HttpClient;
|
|
297
|
+
get httpClient(): HttpClient;
|
|
298
|
+
curl<T = any>(url: HttpClientRequestURL, options?: HttpClientRequestOptions): Promise<HttpClientResponse<T>>;
|
|
299
|
+
}
|
|
300
|
+
}
|
package/dist/esm/lib/egg.js
CHANGED
|
@@ -23,7 +23,6 @@ import { convertObject } from './core/utils.js';
|
|
|
23
23
|
import { BaseContextClass } from './core/base_context_class.js';
|
|
24
24
|
import { BaseHookClass } from './core/base_hook_class.js';
|
|
25
25
|
import { getSourceDirname } from './utils.js';
|
|
26
|
-
import './egg.types.js';
|
|
27
26
|
const EGG_PATH = Symbol.for('egg#eggPath');
|
|
28
27
|
export class Request extends EggCoreRequest {
|
|
29
28
|
}
|
|
@@ -303,6 +302,13 @@ export class EggApplicationCore extends EggCore {
|
|
|
303
302
|
async curl(url, options) {
|
|
304
303
|
return await this.httpClient.request(url, options);
|
|
305
304
|
}
|
|
305
|
+
/**
|
|
306
|
+
* Create a new HttpClient instance with custom options
|
|
307
|
+
* @param {Object} [options] HttpClient init options
|
|
308
|
+
*/
|
|
309
|
+
createHttpClient(options) {
|
|
310
|
+
return new this.HttpClient(this, options);
|
|
311
|
+
}
|
|
306
312
|
/**
|
|
307
313
|
* HttpClient instance
|
|
308
314
|
* @see https://github.com/node-modules/urllib
|
|
@@ -310,7 +316,7 @@ export class EggApplicationCore extends EggCore {
|
|
|
310
316
|
*/
|
|
311
317
|
get httpClient() {
|
|
312
318
|
if (!this.#httpClient) {
|
|
313
|
-
this.#httpClient =
|
|
319
|
+
this.#httpClient = this.createHttpClient();
|
|
314
320
|
}
|
|
315
321
|
return this.#httpClient;
|
|
316
322
|
}
|
|
@@ -581,4 +587,4 @@ export class EggApplicationCore extends EggCore {
|
|
|
581
587
|
return context;
|
|
582
588
|
}
|
|
583
589
|
}
|
|
584
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"egg.js","sourceRoot":"","sources":["../../../src/lib/egg.ts"],"names":[],"mappings":"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"}
|
|
590
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"egg.js","sourceRoot":"","sources":["../../../src/lib/egg.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/lib/types.d.ts
CHANGED
|
@@ -8,6 +8,9 @@ import type { NotFoundMiddlewareOptions } from '../app/middleware/notfound.js';
|
|
|
8
8
|
import type { SiteFileMiddlewareOptions } from '../app/middleware/site_file.js';
|
|
9
9
|
import '@eggjs/watcher';
|
|
10
10
|
import '@eggjs/development';
|
|
11
|
+
import '@eggjs/jsonp';
|
|
12
|
+
import '@eggjs/i18n';
|
|
13
|
+
import '@eggjs/static';
|
|
11
14
|
export type { EggAppInfo, } from '@eggjs/core';
|
|
12
15
|
type IgnoreItem = string | RegExp | ((ctx: Context) => boolean);
|
|
13
16
|
type IgnoreOrMatch = IgnoreItem | IgnoreItem[];
|
|
@@ -44,6 +47,16 @@ export interface CustomLoaderConfig extends Omit<FileLoaderOptions, 'inject' | '
|
|
|
44
47
|
*/
|
|
45
48
|
loadunit?: boolean;
|
|
46
49
|
}
|
|
50
|
+
export interface HttpClientConfig {
|
|
51
|
+
/** Request timeout */
|
|
52
|
+
timeout?: number;
|
|
53
|
+
/** Default request args for httpclient */
|
|
54
|
+
request?: HttpClientRequestOptions;
|
|
55
|
+
/**
|
|
56
|
+
* @deprecated keep compatible with egg 3.x, no more used
|
|
57
|
+
*/
|
|
58
|
+
useHttpClientNext?: boolean;
|
|
59
|
+
}
|
|
47
60
|
export interface EggAppConfig extends EggCoreAppConfig {
|
|
48
61
|
workerStartTimeout: number;
|
|
49
62
|
baseDir: string;
|
|
@@ -115,16 +128,7 @@ export interface EggAppConfig extends EggCoreAppConfig {
|
|
|
115
128
|
[key: string]: EggLoggerOptions;
|
|
116
129
|
};
|
|
117
130
|
/** Configuration of httpclient in egg. */
|
|
118
|
-
httpclient:
|
|
119
|
-
/** Request timeout */
|
|
120
|
-
timeout?: number;
|
|
121
|
-
/** Default request args for httpclient */
|
|
122
|
-
request?: HttpClientRequestOptions;
|
|
123
|
-
/**
|
|
124
|
-
* @deprecated keep compatible with egg 3.x, no more used
|
|
125
|
-
*/
|
|
126
|
-
useHttpClientNext?: boolean;
|
|
127
|
-
};
|
|
131
|
+
httpclient: HttpClientConfig;
|
|
128
132
|
/**
|
|
129
133
|
* customLoader config
|
|
130
134
|
*/
|
|
@@ -146,31 +150,6 @@ export interface EggAppConfig extends EggCoreAppConfig {
|
|
|
146
150
|
*/
|
|
147
151
|
HOME: string;
|
|
148
152
|
hostHeaders: string;
|
|
149
|
-
/**
|
|
150
|
-
* I18n options
|
|
151
|
-
*/
|
|
152
|
-
i18n: {
|
|
153
|
-
/**
|
|
154
|
-
* default value EN_US
|
|
155
|
-
*/
|
|
156
|
-
defaultLocale: string;
|
|
157
|
-
/**
|
|
158
|
-
* i18n resource file dir, not recommend to change default value
|
|
159
|
-
*/
|
|
160
|
-
dirs: string[];
|
|
161
|
-
/**
|
|
162
|
-
* custom the locale value field, default `query.locale`, you can modify this config, such as `query.lang`
|
|
163
|
-
*/
|
|
164
|
-
queryField: string;
|
|
165
|
-
/**
|
|
166
|
-
* The locale value key in the cookie, default is locale.
|
|
167
|
-
*/
|
|
168
|
-
cookieField: string;
|
|
169
|
-
/**
|
|
170
|
-
* Locale cookie expire time, default `1y`, If pass number value, the unit will be ms
|
|
171
|
-
*/
|
|
172
|
-
cookieMaxAge: string | number;
|
|
173
|
-
};
|
|
174
153
|
/**
|
|
175
154
|
* Detect request' ip from specified headers, not case-sensitive. Only worked when config.proxy set to true.
|
|
176
155
|
*/
|
|
@@ -183,20 +162,6 @@ export interface EggAppConfig extends EggCoreAppConfig {
|
|
|
183
162
|
sameSite?: string;
|
|
184
163
|
httpOnly?: boolean;
|
|
185
164
|
};
|
|
186
|
-
/**
|
|
187
|
-
* jsonp options
|
|
188
|
-
* @member Config#jsonp
|
|
189
|
-
* @property {String} callback - jsonp callback method key, default to `_callback`
|
|
190
|
-
* @property {Number} limit - callback method name's max length, default to `50`
|
|
191
|
-
* @property {Boolean} csrf - enable csrf check or not. default to false
|
|
192
|
-
* @property {String|RegExp|Array} whiteList - referrer white list
|
|
193
|
-
*/
|
|
194
|
-
jsonp: {
|
|
195
|
-
limit: number;
|
|
196
|
-
callback: string;
|
|
197
|
-
csrf: boolean;
|
|
198
|
-
whiteList: string | RegExp | Array<string | RegExp>;
|
|
199
|
-
};
|
|
200
165
|
/**
|
|
201
166
|
* The key that signing cookies. It can contain multiple keys separated by .
|
|
202
167
|
*/
|
package/dist/esm/lib/types.js
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
// import plugins types
|
|
2
2
|
import '@eggjs/watcher';
|
|
3
3
|
import '@eggjs/development';
|
|
4
|
-
|
|
4
|
+
import '@eggjs/jsonp';
|
|
5
|
+
import '@eggjs/i18n';
|
|
6
|
+
import '@eggjs/static';
|
|
7
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQWtCQSx1QkFBdUI7QUFDdkIsT0FBTyxnQkFBZ0IsQ0FBQztBQUN4QixPQUFPLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sY0FBYyxDQUFDO0FBQ3RCLE9BQU8sYUFBYSxDQUFDO0FBQ3JCLE9BQU8sZUFBZSxDQUFDIn0=
|
package/dist/package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "egg",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.1",
|
|
4
4
|
"engines": {
|
|
5
5
|
"node": ">= 18.19.0"
|
|
6
6
|
},
|
|
@@ -23,21 +23,21 @@
|
|
|
23
23
|
"@eggjs/cookies": "^3.0.0",
|
|
24
24
|
"@eggjs/core": "^6.2.13",
|
|
25
25
|
"@eggjs/development": "^4.0.0",
|
|
26
|
+
"@eggjs/i18n": "^3.0.1",
|
|
27
|
+
"@eggjs/jsonp": "^3.0.0",
|
|
26
28
|
"@eggjs/schedule": "^5.0.2",
|
|
29
|
+
"@eggjs/static": "^3.0.0",
|
|
27
30
|
"@eggjs/utils": "^4.2.4",
|
|
28
31
|
"@eggjs/watcher": "^4.0.3",
|
|
29
32
|
"circular-json-for-egg": "^1.0.0",
|
|
30
33
|
"cluster-client": "^3.7.0",
|
|
31
34
|
"egg-errors": "^2.3.1",
|
|
32
|
-
"egg-i18n": "^2.1.1",
|
|
33
|
-
"egg-jsonp": "^2.0.0",
|
|
34
35
|
"egg-logger": "^3.6.0",
|
|
35
36
|
"egg-logrotator": "^3.1.0",
|
|
36
37
|
"egg-multipart": "^3.1.0",
|
|
37
38
|
"egg-onerror": "^2.1.1",
|
|
38
39
|
"egg-security": "^3.0.0",
|
|
39
40
|
"egg-session": "^3.3.0",
|
|
40
|
-
"egg-static": "^2.2.0",
|
|
41
41
|
"egg-view": "^2.1.3",
|
|
42
42
|
"extend2": "^4.0.0",
|
|
43
43
|
"graceful": "^2.0.0",
|
|
@@ -14,8 +14,6 @@ import type Request from './request.js';
|
|
|
14
14
|
import type Response from './response.js';
|
|
15
15
|
import type Helper from './helper.js';
|
|
16
16
|
|
|
17
|
-
import './context.types.js';
|
|
18
|
-
|
|
19
17
|
const HELPER = Symbol('ctx helper');
|
|
20
18
|
const LOCALS = Symbol('ctx locals');
|
|
21
19
|
const LOCALS_LIST = Symbol('ctx localsList');
|
|
@@ -306,3 +304,19 @@ export default class Context extends EggCoreContext {
|
|
|
306
304
|
this.response.realStatus = val;
|
|
307
305
|
}
|
|
308
306
|
}
|
|
307
|
+
|
|
308
|
+
declare module '@eggjs/core' {
|
|
309
|
+
// add Context overrides types
|
|
310
|
+
interface Context {
|
|
311
|
+
curl(url: HttpClientRequestURL, options?: HttpClientRequestOptions): ReturnType<HttpClient['request']>;
|
|
312
|
+
get router(): Router;
|
|
313
|
+
set router(val: Router);
|
|
314
|
+
get helper(): Helper;
|
|
315
|
+
get httpclient(): HttpClient;
|
|
316
|
+
get httpClient(): HttpClient;
|
|
317
|
+
getLogger(name: string): EggLogger;
|
|
318
|
+
get logger(): EggLogger;
|
|
319
|
+
get coreLogger(): EggLogger;
|
|
320
|
+
get locals(): Record<string, any>;
|
|
321
|
+
}
|
|
322
|
+
}
|
|
@@ -11,8 +11,6 @@ const HOST = Symbol('request host');
|
|
|
11
11
|
const IPS = Symbol('request ips');
|
|
12
12
|
const RE_ARRAY_KEY = /[^\[\]]+\[\]$/;
|
|
13
13
|
|
|
14
|
-
import './request.types.js';
|
|
15
|
-
|
|
16
14
|
export default class Request extends EggCoreRequest {
|
|
17
15
|
declare app: Application;
|
|
18
16
|
declare ctx: Context;
|
|
@@ -266,6 +264,17 @@ export default class Request extends EggCoreRequest {
|
|
|
266
264
|
}
|
|
267
265
|
}
|
|
268
266
|
|
|
267
|
+
declare module '@eggjs/core' {
|
|
268
|
+
// add Request overrides types
|
|
269
|
+
interface Request {
|
|
270
|
+
body: any;
|
|
271
|
+
get acceptJSON(): boolean;
|
|
272
|
+
get query(): Record<string, string>;
|
|
273
|
+
set query(obj: Record<string, string>);
|
|
274
|
+
get queries(): Record<string, string[]>;
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
|
|
269
278
|
function firstValue(value: string | string[]) {
|
|
270
279
|
if (Array.isArray(value)) {
|
|
271
280
|
value = value[0];
|
|
@@ -2,8 +2,6 @@ import { Response as KoaResponse } from '@eggjs/core';
|
|
|
2
2
|
|
|
3
3
|
const REAL_STATUS = Symbol('response realStatus');
|
|
4
4
|
|
|
5
|
-
import './response.types.js';
|
|
6
|
-
|
|
7
5
|
export default class Response extends KoaResponse {
|
|
8
6
|
/**
|
|
9
7
|
* Get or set a real status code.
|
|
@@ -36,3 +34,11 @@ export default class Response extends KoaResponse {
|
|
|
36
34
|
this[REAL_STATUS] = status;
|
|
37
35
|
}
|
|
38
36
|
}
|
|
37
|
+
|
|
38
|
+
declare module '@eggjs/core' {
|
|
39
|
+
// add Response overrides types
|
|
40
|
+
interface Response {
|
|
41
|
+
get realStatus(): number;
|
|
42
|
+
set realStatus(status: number);
|
|
43
|
+
}
|
|
44
|
+
}
|
package/src/config/plugin.ts
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
export default {
|
|
2
|
-
// enable plugins
|
|
3
|
-
|
|
4
2
|
/**
|
|
5
3
|
* app global Error Handling
|
|
6
4
|
* @member {Object} Plugin#onerror
|
|
@@ -30,7 +28,7 @@ export default {
|
|
|
30
28
|
*/
|
|
31
29
|
i18n: {
|
|
32
30
|
enable: true,
|
|
33
|
-
package: '
|
|
31
|
+
package: '@eggjs/i18n',
|
|
34
32
|
},
|
|
35
33
|
|
|
36
34
|
/**
|
|
@@ -107,7 +105,7 @@ export default {
|
|
|
107
105
|
*/
|
|
108
106
|
static: {
|
|
109
107
|
enable: true,
|
|
110
|
-
package: '
|
|
108
|
+
package: '@eggjs/static',
|
|
111
109
|
},
|
|
112
110
|
|
|
113
111
|
/**
|
|
@@ -118,7 +116,7 @@ export default {
|
|
|
118
116
|
*/
|
|
119
117
|
jsonp: {
|
|
120
118
|
enable: true,
|
|
121
|
-
package: '
|
|
119
|
+
package: '@eggjs/jsonp',
|
|
122
120
|
},
|
|
123
121
|
|
|
124
122
|
/**
|
|
@@ -2,6 +2,7 @@ import {
|
|
|
2
2
|
HttpClient as RawHttpClient,
|
|
3
3
|
RequestURL as HttpClientRequestURL,
|
|
4
4
|
RequestOptions,
|
|
5
|
+
ClientOptions as HttpClientOptions,
|
|
5
6
|
} from 'urllib';
|
|
6
7
|
import { ms } from 'humanize-ms';
|
|
7
8
|
import type { EggApplicationCore } from '../egg.js';
|
|
@@ -9,6 +10,7 @@ import type { EggApplicationCore } from '../egg.js';
|
|
|
9
10
|
export type {
|
|
10
11
|
HttpClientResponse,
|
|
11
12
|
RequestURL as HttpClientRequestURL,
|
|
13
|
+
ClientOptions as HttpClientOptions,
|
|
12
14
|
} from 'urllib';
|
|
13
15
|
|
|
14
16
|
export interface HttpClientRequestOptions extends RequestOptions {
|
|
@@ -19,12 +21,17 @@ export interface HttpClientRequestOptions extends RequestOptions {
|
|
|
19
21
|
export class HttpClient extends RawHttpClient {
|
|
20
22
|
readonly #app: EggApplicationCore & { tracer?: any };
|
|
21
23
|
|
|
22
|
-
constructor(app: EggApplicationCore) {
|
|
24
|
+
constructor(app: EggApplicationCore, options: HttpClientOptions = {}) {
|
|
23
25
|
normalizeConfig(app);
|
|
24
26
|
const config = app.config.httpclient;
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
27
|
+
const initOptions: HttpClientOptions = {
|
|
28
|
+
...options,
|
|
29
|
+
defaultArgs: {
|
|
30
|
+
...config.request,
|
|
31
|
+
...options.defaultArgs,
|
|
32
|
+
},
|
|
33
|
+
};
|
|
34
|
+
super(initOptions);
|
|
28
35
|
this.#app = app;
|
|
29
36
|
}
|
|
30
37
|
|