egg 4.0.0 → 4.0.2
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 +6 -7
- package/dist/commonjs/index.d.ts +1 -0
- package/dist/commonjs/index.js +2 -1
- package/dist/commonjs/lib/core/httpclient.d.ts +3 -3
- package/dist/commonjs/lib/core/httpclient.js +10 -5
- package/dist/commonjs/lib/core/singleton.d.ts +16 -10
- package/dist/commonjs/lib/core/singleton.js +8 -3
- package/dist/commonjs/lib/egg.d.ts +21 -2
- package/dist/commonjs/lib/egg.js +9 -3
- package/dist/commonjs/lib/types.d.ts +17 -73
- package/dist/commonjs/lib/types.js +7 -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 +6 -7
- package/dist/esm/index.d.ts +1 -0
- package/dist/esm/index.js +2 -1
- package/dist/esm/lib/core/httpclient.d.ts +3 -3
- package/dist/esm/lib/core/httpclient.js +10 -5
- package/dist/esm/lib/core/singleton.d.ts +16 -10
- package/dist/esm/lib/core/singleton.js +8 -3
- package/dist/esm/lib/egg.d.ts +21 -2
- package/dist/esm/lib/egg.js +9 -3
- package/dist/esm/lib/types.d.ts +17 -73
- package/dist/esm/lib/types.js +7 -1
- package/dist/package.json +1 -1
- package/package.json +6 -6
- 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 +5 -7
- package/src/index.ts +1 -0
- package/src/lib/core/httpclient.ts +11 -4
- package/src/lib/core/singleton.ts +17 -12
- package/src/lib/egg.ts +30 -5
- package/src/lib/types.ts +18 -104
- 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
|
@@ -7,7 +7,6 @@ import type { BaseContextClass } from '../../lib//core/base_context_class.js';
|
|
|
7
7
|
import type Request from './request.js';
|
|
8
8
|
import type Response from './response.js';
|
|
9
9
|
import type Helper from './helper.js';
|
|
10
|
-
import './context.types.js';
|
|
11
10
|
interface Cookies extends ContextCookies {
|
|
12
11
|
request: any;
|
|
13
12
|
response: any;
|
|
@@ -178,4 +177,18 @@ export default class Context extends EggCoreContext {
|
|
|
178
177
|
get realStatus(): number;
|
|
179
178
|
set realStatus(val: number);
|
|
180
179
|
}
|
|
180
|
+
declare module '@eggjs/core' {
|
|
181
|
+
interface Context {
|
|
182
|
+
curl(url: HttpClientRequestURL, options?: HttpClientRequestOptions): ReturnType<HttpClient['request']>;
|
|
183
|
+
get router(): Router;
|
|
184
|
+
set router(val: Router);
|
|
185
|
+
get helper(): Helper;
|
|
186
|
+
get httpclient(): HttpClient;
|
|
187
|
+
get httpClient(): HttpClient;
|
|
188
|
+
getLogger(name: string): EggLogger;
|
|
189
|
+
get logger(): EggLogger;
|
|
190
|
+
get coreLogger(): EggLogger;
|
|
191
|
+
get locals(): Record<string, any>;
|
|
192
|
+
}
|
|
193
|
+
}
|
|
181
194
|
export {};
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const utility_1 = require("utility");
|
|
4
4
|
const performance_ms_1 = require("performance-ms");
|
|
5
5
|
const core_1 = require("@eggjs/core");
|
|
6
|
-
require("./context.types.js");
|
|
7
6
|
const HELPER = Symbol('ctx helper');
|
|
8
7
|
const LOCALS = Symbol('ctx locals');
|
|
9
8
|
const LOCALS_LIST = Symbol('ctx localsList');
|
|
@@ -260,4 +259,4 @@ class Context extends core_1.Context {
|
|
|
260
259
|
}
|
|
261
260
|
}
|
|
262
261
|
exports.default = Context;
|
|
263
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
262
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hcHAvZXh0ZW5kL2NvbnRleHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxxQ0FBaUM7QUFDakMsbURBQTJDO0FBQzNDLHNDQUVxQjtBQVlyQixNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUM7QUFDcEMsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFDO0FBQ3BDLE1BQU0sV0FBVyxHQUFHLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0FBQzdDLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQztBQUN0QyxNQUFNLGtCQUFrQixHQUFHLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0FBQ3BELE1BQU0sY0FBYyxHQUFHLE1BQU0sQ0FBQyxZQUFZLENBQUMsQ0FBQztBQU81QyxNQUFxQixPQUFRLFNBQVEsY0FBYztJQU9qRDs7O09BR0c7SUFDSCxTQUFTLENBQVM7SUFDbEI7OztPQUdHO0lBQ0gsb0JBQW9CLENBQVM7SUFFN0I7O09BRUc7SUFDSCxJQUFJLE9BQU87UUFDVCxJQUFJLE9BQU8sR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDNUIsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLE9BQU8sR0FBRyxJQUFJLElBQUksQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUN0RyxDQUFDO1FBQ0QsT0FBTyxPQUFrQixDQUFDO0lBQzVCLENBQUM7SUFFRDs7OztPQUlHO0lBQ0gsSUFBSSxVQUFVO1FBQ1osSUFBSSxDQUFDLElBQUksQ0FBQyxrQkFBa0IsQ0FB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
|
|
@@ -2,7 +2,6 @@ import { Request as EggCoreRequest } from '@eggjs/core';
|
|
|
2
2
|
import type { Application } from '../../lib/application.js';
|
|
3
3
|
import type Context from './context.js';
|
|
4
4
|
import Response from './response.js';
|
|
5
|
-
import './request.types.js';
|
|
6
5
|
export default class Request extends EggCoreRequest {
|
|
7
6
|
app: Application;
|
|
8
7
|
ctx: Context;
|
|
@@ -131,3 +130,12 @@ export default class Request extends EggCoreRequest {
|
|
|
131
130
|
*/
|
|
132
131
|
set query(obj: Record<string, string>);
|
|
133
132
|
}
|
|
133
|
+
declare module '@eggjs/core' {
|
|
134
|
+
interface Request {
|
|
135
|
+
body: any;
|
|
136
|
+
get acceptJSON(): boolean;
|
|
137
|
+
get query(): Record<string, string>;
|
|
138
|
+
set query(obj: Record<string, string>);
|
|
139
|
+
get queries(): Record<string, string[]>;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
@@ -11,7 +11,6 @@ const PROTOCOL = Symbol('request protocol');
|
|
|
11
11
|
const HOST = Symbol('request host');
|
|
12
12
|
const IPS = Symbol('request ips');
|
|
13
13
|
const RE_ARRAY_KEY = /[^\[\]]+\[\]$/;
|
|
14
|
-
require("./request.types.js");
|
|
15
14
|
class Request extends core_1.Request {
|
|
16
15
|
/**
|
|
17
16
|
* Parse the "Host" header field host
|
|
@@ -268,4 +267,4 @@ function getFromHeaders(request, names) {
|
|
|
268
267
|
}
|
|
269
268
|
return '';
|
|
270
269
|
}
|
|
271
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
270
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVxdWVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hcHAvZXh0ZW5kL3JlcXVlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSx3RUFBMkM7QUFDM0Msc0NBQXdEO0FBS3hELE1BQU0sV0FBVyxHQUFHLE1BQU0sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO0FBQ2xELE1BQU0sYUFBYSxHQUFHLE1BQU0sQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO0FBQ3RELE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0FBQzVDLE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxjQUFjLENBQUMsQ0FBQztBQUNwQyxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUM7QUFDbEMsTUFBTSxZQUFZLEdBQUcsZUFBZSxDQUFDO0FBRXJDLE1BQXFCLE9BQVEsU0FBUSxjQUFjO0lBVWpEOzs7Ozs7Ozs7Ozs7Ozs7O09BZ0JHO0lBQ0gsSUFBSSxJQUFJO1FBQ04sSUFBSSxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBdUIsQ0FBQztRQUM1QyxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ1QsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDO1FBRUQsSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUMxQixJQUFJLEdBQUcsY0FBYyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUMzRCxDQUFDO1FBQ0QsSUFBSSxHQUFHLElBQUksSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUN0QyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMs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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
|
+
}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const core_1 = require("@eggjs/core");
|
|
4
4
|
const REAL_STATUS = Symbol('response realStatus');
|
|
5
|
-
require("./response.types.js");
|
|
6
5
|
class Response extends core_1.Response {
|
|
7
6
|
/**
|
|
8
7
|
* Get or set a real status code.
|
|
@@ -35,4 +34,4 @@ class Response extends core_1.Response {
|
|
|
35
34
|
}
|
|
36
35
|
}
|
|
37
36
|
exports.default = Response;
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzcG9uc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYXBwL2V4dGVuZC9yZXNwb25zZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHNDQUFzRDtBQUV0RCxNQUFNLFdBQVcsR0FBRyxNQUFNLENBQUMscUJBQXFCLENBQUMsQ0FBQztBQUVsRCxNQUFxQixRQUFTLFNBQVEsZUFBVztJQUMvQzs7Ozs7Ozs7O09BU0c7SUFDSCxJQUFJLFVBQVU7UUFDWixJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDO1lBQ3RCLE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBVyxDQUFDO1FBQ3JDLENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDckIsQ0FBQztJQUVEOzs7Ozs7Ozs7T0FTRztJQUNILElBQUksVUFBVSxDQUFDLE1BQWM7UUFDM0IsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLE1BQU0sQ0FBQztJQUM3QixDQUFDO0NBQ0Y7QUEvQkQsMkJBK0JDIn0=
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.default = {
|
|
4
|
-
// enable plugins
|
|
5
4
|
/**
|
|
6
5
|
* app global Error Handling
|
|
7
6
|
* @member {Object} Plugin#onerror
|
|
@@ -19,7 +18,7 @@ exports.default = {
|
|
|
19
18
|
*/
|
|
20
19
|
session: {
|
|
21
20
|
enable: true,
|
|
22
|
-
package: '
|
|
21
|
+
package: '@eggjs/session',
|
|
23
22
|
},
|
|
24
23
|
/**
|
|
25
24
|
* i18n
|
|
@@ -29,7 +28,7 @@ exports.default = {
|
|
|
29
28
|
*/
|
|
30
29
|
i18n: {
|
|
31
30
|
enable: true,
|
|
32
|
-
package: '
|
|
31
|
+
package: '@eggjs/i18n',
|
|
33
32
|
},
|
|
34
33
|
/**
|
|
35
34
|
* file and dir watcher
|
|
@@ -59,7 +58,7 @@ exports.default = {
|
|
|
59
58
|
*/
|
|
60
59
|
security: {
|
|
61
60
|
enable: true,
|
|
62
|
-
package: '
|
|
61
|
+
package: '@eggjs/security',
|
|
63
62
|
},
|
|
64
63
|
/**
|
|
65
64
|
* local development helper
|
|
@@ -99,7 +98,7 @@ exports.default = {
|
|
|
99
98
|
*/
|
|
100
99
|
static: {
|
|
101
100
|
enable: true,
|
|
102
|
-
package: '
|
|
101
|
+
package: '@eggjs/static',
|
|
103
102
|
},
|
|
104
103
|
/**
|
|
105
104
|
* jsonp support for egg
|
|
@@ -109,7 +108,7 @@ exports.default = {
|
|
|
109
108
|
*/
|
|
110
109
|
jsonp: {
|
|
111
110
|
enable: true,
|
|
112
|
-
package: '
|
|
111
|
+
package: '@eggjs/jsonp',
|
|
113
112
|
},
|
|
114
113
|
/**
|
|
115
114
|
* view plugin
|
|
@@ -122,4 +121,4 @@ exports.default = {
|
|
|
122
121
|
package: 'egg-view',
|
|
123
122
|
},
|
|
124
123
|
};
|
|
125
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
124
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbmZpZy9wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxrQkFBZTtJQUNiOzs7O09BSUc7SUFDSCxPQUFPLEVBQUU7UUFDUCxNQUFNLEVBQUUsSUFBSTtRQUNaLE9BQU8sRUFBRSxhQUFhO0tBQ3ZCO0lBRUQ7Ozs7O09BS0c7SUFDSCxPQUFPLEVBQUU7UUFDUCxNQUFNLEVBQUUsSUFBSTtRQUNaLE9BQU8sRUFBRSxnQkFBZ0I7S0FDMUI7SUFFRDs7Ozs7T0FLRztJQUNILElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLGFBQWE7S0FDdkI7SUFFRDs7Ozs7T0FLRztJQUNILE9BQU8sRUFBRTtRQUNQLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLGdCQUFnQjtLQUMxQjtJQUVEOzs7OztPQUtHO0lBQ0gsU0FBUyxFQUFFO1FBQ1QsTUFBTSxFQUFFLElBQUk7UUFDWixPQUFPLEVBQUUsZUFBZTtLQUN6QjtJQUVEOzs7OztPQUtHO0lBQ0gsUUFBUSxFQUFFO1FBQ1IsTUFBTSxFQUFFLElBQUk7UUFDWixPQUFPLEVBQUUsaUJBQWlCO0tBQzNCO0lBRUQ7Ozs7O09BS0c7SUFDSCxXQUFXLEVBQUU7UUFDWCxNQUFNLEVBQUUsSUFBSTtRQUNaLE9BQU8sRUFBRSxvQkFBb0I7S0FDOUI7SUFFRDs7Ozs7T0FLRztJQUNILFVBQVUsRUFBRTtRQUNWLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLGdCQUFnQjtLQUMxQjtJQUVEOzs7OztPQUtHO0lBQ0gsUUFBUSxFQUFFO1FBQ1IsTUFBTSxFQUFFLElBQUk7UUFDWixPQUFPLEVBQUUsaUJBQWlCO0tBQzNCO0lBRUQ7Ozs7O09BS0c7SUFDSCxNQUFNLEVBQUU7UUFDTixNQUFNLEVBQUUsSUFBSTtRQUNaLE9BQU8sRUFBRSxlQUFlO0tBQ3pCO0lBRUQ7Ozs7O09BS0c7SUFDSCxLQUFLLEVBQUU7UUFDTCxNQUFNLEVBQUUsSUFBSTtRQUNaLE9BQU8sRUFBRSxjQUFjO0tBQ3hCO0lBRUQ7Ozs7O09BS0c7SUFDSCxJQUFJLEVBQUU7UUFDSixNQUFNLEVBQUUsSUFBSTtRQUNaLE9BQU8sRUFBRSxVQUFVO0tBQ3BCO0NBQ0YsQ0FBQyJ9
|
package/dist/commonjs/index.d.ts
CHANGED
|
@@ -9,6 +9,7 @@ export type { Helper as IHelper, };
|
|
|
9
9
|
export * from './lib/egg.js';
|
|
10
10
|
export * from './lib/types.js';
|
|
11
11
|
export * from './lib/start.js';
|
|
12
|
+
export * from './lib/core/singleton.js';
|
|
12
13
|
export * from './lib/error/index.js';
|
|
13
14
|
export type { LoggerLevel, EggLogger, } from 'egg-logger';
|
|
14
15
|
export * from './lib/core/httpclient.js';
|
package/dist/commonjs/index.js
CHANGED
|
@@ -33,6 +33,7 @@ exports.Helper = helper_js_1.default;
|
|
|
33
33
|
__exportStar(require("./lib/egg.js"), exports);
|
|
34
34
|
__exportStar(require("./lib/types.js"), exports);
|
|
35
35
|
__exportStar(require("./lib/start.js"), exports);
|
|
36
|
+
__exportStar(require("./lib/core/singleton.js"), exports);
|
|
36
37
|
// export errors
|
|
37
38
|
__exportStar(require("./lib/error/index.js"), exports);
|
|
38
39
|
// export httpClients
|
|
@@ -77,4 +78,4 @@ Object.defineProperty(exports, "BaseContextClass", { enumerable: true, get: func
|
|
|
77
78
|
*/
|
|
78
79
|
var base_hook_class_js_1 = require("./lib/core/base_hook_class.js");
|
|
79
80
|
Object.defineProperty(exports, "Boot", { enumerable: true, get: function () { return base_hook_class_js_1.BaseHookClass; } });
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOztHQUVHOzs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVILDRFQUFvRTtBQWlGOUMsMkZBakZiLHdDQUFnQixPQWlGTztBQVFWLHdGQXpGYix3Q0FBZ0IsT0F5Rkk7QUFRUCw2RkFqR2Isd0NBQWdCLE9BaUdTO0FBaEdsQyw2Q0FJd0I7QUEwQ1Ysc0ZBN0NaLG1CQUFRLE9BNkNTO0FBekNuQix1RUFBNEM7QUFJMUMsaUJBSkssbUJBQU0sQ0FJTDtBQU9SLGVBQWU7QUFDZiwrQ0FBNkI7QUFDN0IsaURBQStCO0FBQy9CLGlEQUErQjtBQUMvQiwwREFBd0M7QUFFeEMsZ0JBQWdCO0FBQ2hCLHVEQUFxQztBQVFyQyxxQkFBcUI7QUFDckIsMkRBQXlDO0FBQ3pDLG1FQUFpRDtBQUVqRDs7O0dBR0c7QUFDSCxpREFBK0I7QUFZL0I7OztHQUdHO0FBQ0gsdURBQW1EO0FBQTFDLDZHQUFBLFdBQVcsT0FBQTtBQUVwQjs7O0dBR0c7QUFDSCwyQ0FBdUM7QUFBOUIsaUdBQUEsS0FBSyxPQUFBO0FBRWQ7OztHQUdHO0FBRUg7OztHQUdHO0FBRUgsa0RBQTJFO0FBQWxFLDJHQUFBLGVBQWUsT0FBQTtBQUFFLDZHQUFBLGlCQUFpQixPQUFBO0FBMEIzQzs7O0dBR0c7QUFDSCwwRUFBb0U7QUFBM0QseUhBQUEsZ0JBQWdCLE9BQUE7QUFFekI7O0dBRUc7QUFDSCxvRUFBc0U7QUFBN0QsMEdBQUEsYUFBYSxPQUFRIn0=
|
|
@@ -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
|
}
|
|
@@ -5,12 +5,17 @@ const urllib_1 = require("urllib");
|
|
|
5
5
|
const humanize_ms_1 = require("humanize-ms");
|
|
6
6
|
class HttpClient extends urllib_1.HttpClient {
|
|
7
7
|
#app;
|
|
8
|
-
constructor(app) {
|
|
8
|
+
constructor(app, options = {}) {
|
|
9
9
|
normalizeConfig(app);
|
|
10
10
|
const config = app.config.httpclient;
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
const initOptions = {
|
|
12
|
+
...options,
|
|
13
|
+
defaultArgs: {
|
|
14
|
+
...config.request,
|
|
15
|
+
...options.defaultArgs,
|
|
16
|
+
},
|
|
17
|
+
};
|
|
18
|
+
super(initOptions);
|
|
14
19
|
this.#app = app;
|
|
15
20
|
}
|
|
16
21
|
async request(url, options) {
|
|
@@ -34,4 +39,4 @@ function normalizeConfig(app) {
|
|
|
34
39
|
config.request.timeout = (0, humanize_ms_1.ms)(config.request.timeout);
|
|
35
40
|
}
|
|
36
41
|
}
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cGNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9saWIvY29yZS9odHRwY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLG1DQUtnQjtBQUNoQiw2Q0FBaUM7QUFjakMsTUFBYSxVQUFXLFNBQVEsbUJBQWE7SUFDbEMsSUFBSSxDQUF3QztJQUVyRCxZQUFZLEdBQXVCLEVBQUUsVUFBNkIsRUFBRTtRQUNsRSxlQUFlLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDckIsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUM7UUFDckMsTUFBTSxXQUFXLEdBQXNCO1lBQ3JDLEdBQUcsT0FBTztZQUNWLFdBQVcsRUFBRTtnQkFDWCxHQUFHLE1BQU0sQ0FBQyxPQUFPO2dCQUNqQixHQUFHLE9BQU8sQ0FBQyxXQUFXO2FBQ3ZCO1NBQ0YsQ0FBQztRQUNGLEtBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNuQixJQUFJLENBQUMsSUFBSSxHQUFHLEdBQUcsQ0FBQztJQUNsQixDQUFDO0lBRUQsS0FBSyxDQUFDLE9BQU8sQ0FBVSxHQUF5QixFQUFFLE9BQWtDO1FBQ2xGLE9BQU8sR0FBRyxPQUFPLElBQUksRUFBRSxDQUFDO1FBQ3hCLElBQUksT0FBTyxDQUFDLEdBQUcsRUFBRSxNQUFNLEVBQUUsQ0FBQztZQUN4QixPQUFPLENBQUMsTUFBTSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDO1FBQ3RDLENBQUM7YUFBTSxDQUFDO1lBQ04sT0FBTyxDQUFDLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQ3RELENBQUM7UUFDRCxPQUFPLE1BQU0sS0FBSyxDQUFDLE9BQU8sQ0FBSSxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDOUMsQ0FBQztJQUVELEtBQUssQ0FBQyxJQUFJLENBQVUsR0FBeUIsRUFBRSxPQUFrQztRQUMvRSxPQUFPLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBSSxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDN0MsQ0FBQztDQUNGO0FBOUJELGdDQThCQztBQVFELFNBQVMsZUFBZSxDQUFDLEdBQXVCO0lBQzlDLE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDO0lBQ3JDLElBQUksT0FBTyxNQUFNLENBQUMsT0FBTyxFQUFFLE9BQU8sS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUNoRCxNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sR0FBRyxJQUFBLGdCQUFFLEVBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUN0RCxDQUFDO0FBQ0gsQ0FBQyJ9
|
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export type SingletonCreateMethod = (config: Record<string, any>, app:
|
|
1
|
+
import type { EggCore } from '@eggjs/core';
|
|
2
|
+
export type SingletonCreateMethod = (config: Record<string, any>, app: EggCore, clientName: string) => unknown | Promise<unknown>;
|
|
3
3
|
export interface SingletonOptions {
|
|
4
4
|
name: string;
|
|
5
|
-
app:
|
|
5
|
+
app: EggCore;
|
|
6
6
|
create: SingletonCreateMethod;
|
|
7
7
|
}
|
|
8
|
-
export declare class Singleton {
|
|
8
|
+
export declare class Singleton<T = any> {
|
|
9
9
|
#private;
|
|
10
|
-
readonly clients: Map<string,
|
|
11
|
-
readonly app:
|
|
10
|
+
readonly clients: Map<string, T>;
|
|
11
|
+
readonly app: EggCore;
|
|
12
12
|
readonly create: SingletonCreateMethod;
|
|
13
13
|
readonly name: string;
|
|
14
14
|
readonly options: Record<string, any>;
|
|
@@ -16,8 +16,14 @@ export declare class Singleton {
|
|
|
16
16
|
init(): void | Promise<void>;
|
|
17
17
|
initSync(): void;
|
|
18
18
|
initAsync(): Promise<void>;
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
19
|
+
/**
|
|
20
|
+
* @deprecated please use `getSingletonInstance(id)` instead
|
|
21
|
+
*/
|
|
22
|
+
get(id: string): NonNullable<T>;
|
|
23
|
+
/**
|
|
24
|
+
* Get singleton instance by id
|
|
25
|
+
*/
|
|
26
|
+
getSingletonInstance(id: string): NonNullable<T>;
|
|
27
|
+
createInstance(config: Record<string, any>, clientName: string): T;
|
|
28
|
+
createInstanceAsync(config: Record<string, any>, clientName: string): Promise<T>;
|
|
23
29
|
}
|
|
@@ -35,7 +35,7 @@ class Singleton {
|
|
|
35
35
|
this.#extendDynamicMethods(client);
|
|
36
36
|
return;
|
|
37
37
|
}
|
|
38
|
-
// multi client, use app[name].
|
|
38
|
+
// multi client, use app[name].getSingletonInstance(id)
|
|
39
39
|
if (options.clients) {
|
|
40
40
|
Object.keys(options.clients).forEach(id => {
|
|
41
41
|
const client = this.createInstance(options.clients[id], id);
|
|
@@ -72,10 +72,15 @@ class Singleton {
|
|
|
72
72
|
#setClientToApp(client) {
|
|
73
73
|
Reflect.set(this.app, this.name, client);
|
|
74
74
|
}
|
|
75
|
+
/**
|
|
76
|
+
* @deprecated please use `getSingletonInstance(id)` instead
|
|
77
|
+
*/
|
|
75
78
|
get(id) {
|
|
76
79
|
return this.clients.get(id);
|
|
77
80
|
}
|
|
78
|
-
|
|
81
|
+
/**
|
|
82
|
+
* Get singleton instance by id
|
|
83
|
+
*/
|
|
79
84
|
getSingletonInstance(id) {
|
|
80
85
|
return this.clients.get(id);
|
|
81
86
|
}
|
|
@@ -117,4 +122,4 @@ class Singleton {
|
|
|
117
122
|
}
|
|
118
123
|
}
|
|
119
124
|
exports.Singleton = Singleton;
|
|
120
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
125
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2luZ2xldG9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2xpYi9jb3JlL3NpbmdsZXRvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSw4REFBaUM7QUFDakMsMkNBQTZDO0FBWTdDLE1BQWEsU0FBUztJQUNYLE9BQU8sR0FBRyxJQUFJLEdBQUcsRUFBYSxDQUFDO0lBQy9CLEdBQUcsQ0FBVTtJQUNiLE1BQU0sQ0FBd0I7SUFDOUIsSUFBSSxDQUFTO0lBQ2IsT0FBTyxDQUFzQjtJQUV0QyxZQUFZLE9BQXlCO1FBQ25DLElBQUEscUJBQU0sRUFBQyxPQUFPLENBQUMsSUFBSSxFQUFFLGdFQUFnRSxDQUFDLENBQUM7UUFDdkYsSUFBQSxxQkFBTSxFQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsK0RBQStELENBQUMsQ0FBQztRQUNyRixJQUFBLHFCQUFNLEVBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxrRUFBa0UsQ0FBQyxDQUFDO1FBQzNGLElBQUEscUJBQU0sRUFBQyxDQUFDLENBQUMsT0FBTyxDQUFDLElBQUksSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsbUJBQW1CLE9BQU8sQ0FBQyxJQUFJLDJCQUEyQixDQUFDLENBQUM7UUFDbkcsSUFBSSxDQUFDLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxJQUFJLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQztRQUN6QixJQUFJLENBQUMsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUM7UUFDN0IsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ3JELENBQUM7SUFFRCxJQUFJO1FBQ0YsT0FBTyxJQUFBLDRCQUFlLEVBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENB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
|
|
@@ -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,18 @@ 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
|
+
addSingleton(name: string, create: SingletonCreateMethod): void;
|
|
300
|
+
}
|
|
301
|
+
}
|
package/dist/commonjs/lib/egg.js
CHANGED
|
@@ -64,7 +64,6 @@ const utils_js_1 = require("./core/utils.js");
|
|
|
64
64
|
const base_context_class_js_1 = require("./core/base_context_class.js");
|
|
65
65
|
const base_hook_class_js_1 = require("./core/base_hook_class.js");
|
|
66
66
|
const utils_js_2 = require("./utils.js");
|
|
67
|
-
require("./egg.types.js");
|
|
68
67
|
const EGG_PATH = Symbol.for('egg#eggPath');
|
|
69
68
|
class Request extends core_1.Request {
|
|
70
69
|
}
|
|
@@ -344,6 +343,13 @@ class EggApplicationCore extends core_1.EggCore {
|
|
|
344
343
|
async curl(url, options) {
|
|
345
344
|
return await this.httpClient.request(url, options);
|
|
346
345
|
}
|
|
346
|
+
/**
|
|
347
|
+
* Create a new HttpClient instance with custom options
|
|
348
|
+
* @param {Object} [options] HttpClient init options
|
|
349
|
+
*/
|
|
350
|
+
createHttpClient(options) {
|
|
351
|
+
return new this.HttpClient(this, options);
|
|
352
|
+
}
|
|
347
353
|
/**
|
|
348
354
|
* HttpClient instance
|
|
349
355
|
* @see https://github.com/node-modules/urllib
|
|
@@ -351,7 +357,7 @@ class EggApplicationCore extends core_1.EggCore {
|
|
|
351
357
|
*/
|
|
352
358
|
get httpClient() {
|
|
353
359
|
if (!this.#httpClient) {
|
|
354
|
-
this.#httpClient =
|
|
360
|
+
this.#httpClient = this.createHttpClient();
|
|
355
361
|
}
|
|
356
362
|
return this.#httpClient;
|
|
357
363
|
}
|
|
@@ -623,4 +629,4 @@ class EggApplicationCore extends core_1.EggCore {
|
|
|
623
629
|
}
|
|
624
630
|
}
|
|
625
631
|
exports.EggApplicationCore = EggApplicationCore;
|
|
626
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"egg.js","sourceRoot":"","sources":["../../../src/lib/egg.ts"],"names":[],"mappings":"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"}
|
|
632
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"egg.js","sourceRoot":"","sources":["../../../src/lib/egg.ts"],"names":[],"mappings":"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"}
|