egg 4.1.0-beta.2 → 4.1.0-beta.21
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/agent.d.ts +3 -7
- package/dist/agent.js +6 -10
- package/dist/app/extend/context.d.ts +166 -193
- package/dist/app/extend/context.js +259 -244
- package/dist/app/extend/helper.d.ts +31 -36
- package/dist/app/extend/helper.js +41 -45
- package/dist/app/extend/request.d.ts +127 -140
- package/dist/app/extend/request.js +258 -219
- package/dist/app/extend/response.d.ts +22 -32
- package/dist/app/extend/response.js +34 -36
- package/dist/app/middleware/body_parser.d.ts +2 -2
- package/dist/app/middleware/body_parser.js +3 -7
- package/dist/app/middleware/meta.d.ts +8 -9
- package/dist/app/middleware/meta.js +19 -13
- package/dist/app/middleware/notfound.d.ts +5 -9
- package/dist/app/middleware/notfound.js +28 -25
- package/dist/app/middleware/override_method.d.ts +2 -2
- package/dist/app/middleware/override_method.js +3 -7
- package/dist/app/middleware/site_file.d.ts +7 -11
- package/dist/app/middleware/site_file.js +52 -37
- package/dist/config/config.default.d.ts +2 -8
- package/dist/config/config.default.js +376 -256
- package/dist/config/config.local.d.ts +5 -7
- package/dist/config/config.local.js +9 -6
- package/dist/config/config.unittest.d.ts +5 -7
- package/dist/config/config.unittest.js +8 -9
- package/dist/config/favicon.png +0 -0
- package/dist/config/plugin.d.ts +120 -122
- package/dist/config/plugin.js +121 -53
- package/dist/index.d.ts +66 -19
- package/dist/index.js +68 -19
- package/dist/lib/agent.d.ts +13 -16
- package/dist/lib/agent.js +46 -54
- package/dist/lib/application.d.ts +46 -61
- package/dist/lib/application.js +249 -197
- package/dist/lib/core/base_context_class.d.ts +12 -17
- package/dist/lib/core/base_context_class.js +15 -17
- package/dist/lib/core/base_context_logger.d.ts +35 -39
- package/dist/lib/core/base_context_logger.js +60 -58
- package/dist/lib/core/base_hook_class.d.ts +10 -17
- package/dist/lib/core/base_hook_class.js +22 -26
- package/dist/lib/core/context_httpclient.d.ts +16 -20
- package/dist/lib/core/context_httpclient.js +26 -29
- package/dist/lib/core/httpclient.d.ts +12 -15
- package/dist/lib/core/httpclient.js +37 -34
- package/dist/lib/core/logger.d.ts +3 -7
- package/dist/lib/core/logger.js +36 -30
- package/dist/lib/core/messenger/IMessenger.d.ts +49 -53
- package/dist/lib/core/messenger/IMessenger.js +2 -1
- package/dist/lib/core/messenger/base.d.ts +7 -11
- package/dist/lib/core/messenger/base.js +28 -29
- package/dist/lib/core/messenger/index.d.ts +4 -8
- package/dist/lib/core/messenger/index.js +8 -11
- package/dist/lib/core/messenger/ipc.d.ts +55 -59
- package/dist/lib/core/messenger/ipc.js +149 -120
- package/dist/lib/core/messenger/local.d.ts +56 -61
- package/dist/lib/core/messenger/local.js +126 -124
- package/dist/lib/core/utils.d.ts +2 -5
- package/dist/lib/core/utils.js +66 -44
- package/dist/lib/egg.d.ts +271 -292
- package/dist/lib/egg.js +576 -506
- package/dist/lib/error/CookieLimitExceedError.d.ts +4 -7
- package/dist/lib/error/CookieLimitExceedError.js +12 -15
- package/dist/lib/error/MessageUnhandledRejectionError.d.ts +4 -7
- package/dist/lib/error/MessageUnhandledRejectionError.js +12 -15
- package/dist/lib/error/index.d.ts +2 -3
- package/dist/lib/error/index.js +3 -4
- package/dist/lib/loader/AgentWorkerLoader.d.ts +7 -12
- package/dist/lib/loader/AgentWorkerLoader.js +18 -22
- package/dist/lib/loader/AppWorkerLoader.d.ts +12 -17
- package/dist/lib/loader/AppWorkerLoader.js +37 -35
- package/dist/lib/loader/EggApplicationLoader.d.ts +3 -7
- package/dist/lib/loader/EggApplicationLoader.js +4 -7
- package/dist/lib/loader/index.d.ts +3 -4
- package/dist/lib/loader/index.js +4 -5
- package/dist/lib/start.d.ts +18 -22
- package/dist/lib/start.js +42 -32
- package/dist/lib/types.d.ts +252 -230
- package/dist/lib/types.js +31 -14
- package/dist/lib/types.plugin.d.ts +12 -0
- package/dist/lib/types.plugin.js +14 -0
- package/dist/lib/utils.d.ts +2 -5
- package/dist/lib/utils.js +12 -12
- package/dist/urllib.d.ts +1 -2
- package/dist/urllib.js +2 -3
- package/package.json +31 -31
|
@@ -1,58 +1,60 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
1
|
+
export class BaseContextLogger {
|
|
2
|
+
#ctx;
|
|
3
|
+
#pathName;
|
|
4
|
+
/**
|
|
5
|
+
* @class
|
|
6
|
+
* @param {Context} ctx - context instance
|
|
7
|
+
* @param {String} pathName - class path name
|
|
8
|
+
* @since 1.0.0
|
|
9
|
+
*/
|
|
10
|
+
constructor(ctx, pathName) {
|
|
11
|
+
/**
|
|
12
|
+
* @member {Context} BaseContextLogger#ctx
|
|
13
|
+
* @since 1.2.0
|
|
14
|
+
*/
|
|
15
|
+
this.#ctx = ctx;
|
|
16
|
+
this.#pathName = pathName;
|
|
17
|
+
}
|
|
18
|
+
_log(method, args) {
|
|
19
|
+
// add `[${pathName}]` in log
|
|
20
|
+
if (this.#pathName && typeof args[0] === 'string') {
|
|
21
|
+
args[0] = `[${this.#pathName}] ${args[0]}`;
|
|
22
|
+
}
|
|
23
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
24
|
+
// @ts-ignore
|
|
25
|
+
this.#ctx.app.logger[method](...args);
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* @member {Function} BaseContextLogger#debug
|
|
29
|
+
* @param {...any} args - log msg
|
|
30
|
+
* @since 1.2.0
|
|
31
|
+
*/
|
|
32
|
+
debug(...args) {
|
|
33
|
+
this._log('debug', args);
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* @member {Function} BaseContextLogger#info
|
|
37
|
+
* @param {...any} args - log msg
|
|
38
|
+
* @since 1.2.0
|
|
39
|
+
*/
|
|
40
|
+
info(...args) {
|
|
41
|
+
this._log('info', args);
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* @member {Function} BaseContextLogger#warn
|
|
45
|
+
* @param {...any} args - log msg
|
|
46
|
+
* @since 1.2.0
|
|
47
|
+
*/
|
|
48
|
+
warn(...args) {
|
|
49
|
+
this._log('warn', args);
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* @member {Function} BaseContextLogger#error
|
|
53
|
+
* @param {...any} args - log msg
|
|
54
|
+
* @since 1.2.0
|
|
55
|
+
*/
|
|
56
|
+
error(...args) {
|
|
57
|
+
this._log('error', args);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZV9jb250ZXh0X2xvZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9saWIvY29yZS9iYXNlX2NvbnRleHRfbG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE1BQU0sT0FBTyxpQkFBaUI7SUFDbkIsSUFBSSxDQUFhO0lBQ2pCLFNBQVMsQ0FBVTtJQUU1Qjs7Ozs7T0FLRztJQUNILFlBQVksR0FBZSxFQUFFLFFBQWlCO1FBQzVDOzs7V0FHRztRQUNILElBQUksQ0FBQyxJQUFJLEdBQUcsR0FBRyxDQUFDO1FBQ2hCLElBQUksQ0FBQyxTQUFTLEdBQUcsUUFBUSxDQUFDO0lBQzVCLENBQUM7SUFFUyxJQUFJLENBQUMsTUFBMkMsRUFBRSxJQUFXO1FBQ3JFLDZCQUE2QjtRQUM3QixJQUFJLElBQUksQ0FBQyxTQUFTLElBQUksT0FBTyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDbEQsSUFBSSxDQUFDLENBQUMsQ0FBQyxHQUFHLElBQUksSUFBSSxDQUFDLFNBQVMsS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUM3QyxDQUFDO1FBQ0QsNkRBQTZEO1FBQzdELGFBQWE7UUFDYixJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQztJQUN4QyxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNILEtBQUssQ0FBQyxHQUFHLElBQVc7UUFDbEIsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDM0IsQ0FBQztJQUVEOzs7O09BSUc7SUFDSCxJQUFJLENBQUMsR0FBRyxJQUFXO1FBQ2pCLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzFCLENBQUM7SUFFRDs7OztPQUlHO0lBQ0gsSUFBSSxDQUFDLEdBQUcsSUFBVztRQUNqQixJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztJQUMxQixDQUFDO0lBRUQ7Ozs7T0FJRztJQUNILEtBQUssQ0FBQyxHQUFHLElBQVc7UUFDbEIsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDM0IsQ0FBQztDQUNGIn0=
|
|
@@ -1,18 +1,11 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { Application } from
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
constructor(instance: Application | Agent);
|
|
12
|
-
get logger(): egg_logger0.EggLogger;
|
|
13
|
-
get config(): EggAppConfig$1;
|
|
14
|
-
get app(): Application;
|
|
15
|
-
get agent(): Agent;
|
|
1
|
+
import type { ILifecycleBoot } from '@eggjs/core';
|
|
2
|
+
import type { Application, Agent } from '../../index.ts';
|
|
3
|
+
export declare class BaseHookClass implements ILifecycleBoot {
|
|
4
|
+
#private;
|
|
5
|
+
fullPath?: string;
|
|
6
|
+
constructor(instance: Application | Agent);
|
|
7
|
+
get logger(): import("egg-logger").EggLogger;
|
|
8
|
+
get config(): import("egg").EggAppConfig;
|
|
9
|
+
get app(): Application;
|
|
10
|
+
get agent(): Agent;
|
|
16
11
|
}
|
|
17
|
-
//#endregion
|
|
18
|
-
export { BaseHookClass };
|
|
@@ -1,26 +1,22 @@
|
|
|
1
|
-
import assert from
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
};
|
|
24
|
-
|
|
25
|
-
//#endregion
|
|
26
|
-
export { BaseHookClass };
|
|
1
|
+
import assert from 'node:assert';
|
|
2
|
+
export class BaseHookClass {
|
|
3
|
+
#instance;
|
|
4
|
+
constructor(instance) {
|
|
5
|
+
this.#instance = instance;
|
|
6
|
+
}
|
|
7
|
+
get logger() {
|
|
8
|
+
return this.#instance.logger;
|
|
9
|
+
}
|
|
10
|
+
get config() {
|
|
11
|
+
return this.#instance.config;
|
|
12
|
+
}
|
|
13
|
+
get app() {
|
|
14
|
+
assert(this.#instance.type === 'application', 'agent boot should not use app instance');
|
|
15
|
+
return this.#instance;
|
|
16
|
+
}
|
|
17
|
+
get agent() {
|
|
18
|
+
assert(this.#instance.type === 'agent', 'app boot should not use agent instance');
|
|
19
|
+
return this.#instance;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZV9ob29rX2NsYXNzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9jb3JlL2Jhc2VfaG9va19jbGFzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLE1BQU0sTUFBTSxhQUFhLENBQUM7QUFNakMsTUFBTSxPQUFPLGFBQWE7SUFFeEIsU0FBUyxDQUFzQjtJQUUvQixZQUFZLFFBQTZCO1FBQ3ZDLElBQUksQ0FBQyxTQUFTLEdBQUcsUUFBUSxDQUFDO0lBQzVCLENBQUM7SUFFRCxJQUFJLE1BQU07UUFDUixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDO0lBQy9CLENBQUM7SUFFRCxJQUFJLE1BQU07UUFDUixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDO0lBQy9CLENBQUM7SUFFRCxJQUFJLEdBQUc7UUFDTCxNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEtBQUssYUFBYSxFQUFFLHdDQUF3QyxDQUFDLENBQUM7UUFDeEYsT0FBTyxJQUFJLENBQUMsU0FBd0IsQ0FBQztJQUN2QyxDQUFDO0lBRUQsSUFBSSxLQUFLO1FBQ1AsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxLQUFLLE9BQU8sRUFBRSx3Q0FBd0MsQ0FBQyxDQUFDO1FBQ2xGLE9BQU8sSUFBSSxDQUFDLFNBQWtCLENBQUM7SUFDakMsQ0FBQztDQUNGIn0=
|
|
@@ -1,21 +1,17 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
curl<T = any>(url: HttpClientRequestURL, options?: HttpClientRequestOptions): Promise<HttpClientResponse<T>>;
|
|
18
|
-
request<T = any>(url: HttpClientRequestURL, options?: HttpClientRequestOptions): Promise<HttpClientResponse<T>>;
|
|
1
|
+
import type { Context } from '../egg.ts';
|
|
2
|
+
import type { Application } from '../application.ts';
|
|
3
|
+
import type { HttpClientRequestURL, HttpClientRequestOptions } from './httpclient.ts';
|
|
4
|
+
export declare class ContextHttpClient {
|
|
5
|
+
ctx: Context;
|
|
6
|
+
app: Application;
|
|
7
|
+
constructor(ctx: Context);
|
|
8
|
+
/**
|
|
9
|
+
* http request helper base on {@link HttpClient}, it will auto save httpclient log.
|
|
10
|
+
* Keep the same api with {@link Application#curl}.
|
|
11
|
+
*
|
|
12
|
+
* @param {String|Object} url - request url address.
|
|
13
|
+
* @param {Object} [options] - options for request.
|
|
14
|
+
*/
|
|
15
|
+
curl<T = any>(url: HttpClientRequestURL, options?: HttpClientRequestOptions): Promise<import("node_modules/urllib/dist/esm/Response.js").HttpClientResponse<T>>;
|
|
16
|
+
request<T = any>(url: HttpClientRequestURL, options?: HttpClientRequestOptions): Promise<import("node_modules/urllib/dist/esm/Response.js").HttpClientResponse<T>>;
|
|
19
17
|
}
|
|
20
|
-
//#endregion
|
|
21
|
-
export { ContextHttpClient };
|
|
@@ -1,29 +1,26 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
//#endregion
|
|
29
|
-
export { ContextHttpClient };
|
|
1
|
+
export class ContextHttpClient {
|
|
2
|
+
ctx;
|
|
3
|
+
app;
|
|
4
|
+
constructor(ctx) {
|
|
5
|
+
this.ctx = ctx;
|
|
6
|
+
this.app = ctx.app;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* http request helper base on {@link HttpClient}, it will auto save httpclient log.
|
|
10
|
+
* Keep the same api with {@link Application#curl}.
|
|
11
|
+
*
|
|
12
|
+
* @param {String|Object} url - request url address.
|
|
13
|
+
* @param {Object} [options] - options for request.
|
|
14
|
+
*/
|
|
15
|
+
async curl(url, options) {
|
|
16
|
+
options = {
|
|
17
|
+
...options,
|
|
18
|
+
ctx: this.ctx,
|
|
19
|
+
};
|
|
20
|
+
return await this.app.curl(url, options);
|
|
21
|
+
}
|
|
22
|
+
async request(url, options) {
|
|
23
|
+
return await this.curl(url, options);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dF9odHRwY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9jb3JlL2NvbnRleHRfaHR0cGNsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxNQUFNLE9BQU8saUJBQWlCO0lBQzVCLEdBQUcsQ0FBVTtJQUNiLEdBQUcsQ0FBYztJQUVqQixZQUFZLEdBQVk7UUFDdEIsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDZixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUM7SUFDckIsQ0FBQztJQUVEOzs7Ozs7T0FNRztJQUNILEtBQUssQ0FBQyxJQUFJLENBQVUsR0FBeUIsRUFBRSxPQUFrQztRQUMvRSxPQUFPLEdBQUc7WUFDUixHQUFHLE9BQU87WUFDVixHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUc7U0FDZCxDQUFDO1FBQ0YsT0FBTyxNQUFNLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFJLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUM5QyxDQUFDO0lBRUQsS0FBSyxDQUFDLE9BQU8sQ0FBVSxHQUF5QixFQUFFLE9BQWtDO1FBQ2xGLE9BQU8sTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFJLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUMxQyxDQUFDO0NBQ0YifQ==
|
|
@@ -1,17 +1,14 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
ctx?: any;
|
|
8
|
-
tracer?: any;
|
|
1
|
+
import { HttpClient as RawHttpClient, type RequestURL as HttpClientRequestURL, type RequestOptions, type ClientOptions as HttpClientOptions } from 'urllib';
|
|
2
|
+
import type { EggApplicationCore } from '../egg.ts';
|
|
3
|
+
export { type HttpClientResponse, type RequestURL as HttpClientRequestURL, type ClientOptions as HttpClientOptions, } from 'urllib';
|
|
4
|
+
export interface HttpClientRequestOptions extends RequestOptions {
|
|
5
|
+
ctx?: any;
|
|
6
|
+
tracer?: any;
|
|
9
7
|
}
|
|
10
|
-
declare class HttpClient extends
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
8
|
+
export declare class HttpClient extends RawHttpClient {
|
|
9
|
+
#private;
|
|
10
|
+
constructor(app: EggApplicationCore, options?: HttpClientOptions);
|
|
11
|
+
request<T = any>(url: HttpClientRequestURL, options?: HttpClientRequestOptions): Promise<import("urllib").HttpClientResponse<T>>;
|
|
12
|
+
curl<T = any>(url: HttpClientRequestURL, options?: HttpClientRequestOptions): Promise<import("urllib").HttpClientResponse<T>>;
|
|
15
13
|
}
|
|
16
|
-
|
|
17
|
-
export { type HttpClient as EggContextHttpClient, type HttpClient as EggHttpClient, HttpClient, type HttpClientOptions, HttpClientRequestOptions, type HttpClientRequestURL, type HttpClientResponse };
|
|
14
|
+
export type { HttpClient as EggHttpClient, HttpClient as EggContextHttpClient };
|
|
@@ -1,36 +1,39 @@
|
|
|
1
|
-
import { HttpClient as
|
|
2
|
-
import { ms } from
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
1
|
+
import { HttpClient as RawHttpClient, } from 'urllib';
|
|
2
|
+
import { ms } from 'humanize-ms';
|
|
3
|
+
export {} from 'urllib';
|
|
4
|
+
export class HttpClient extends RawHttpClient {
|
|
5
|
+
#app;
|
|
6
|
+
constructor(app, options = {}) {
|
|
7
|
+
normalizeConfig(app);
|
|
8
|
+
const config = app.config.httpclient;
|
|
9
|
+
const initOptions = {
|
|
10
|
+
...options,
|
|
11
|
+
defaultArgs: {
|
|
12
|
+
...config.request,
|
|
13
|
+
...options.defaultArgs,
|
|
14
|
+
},
|
|
15
|
+
};
|
|
16
|
+
super(initOptions);
|
|
17
|
+
this.#app = app;
|
|
18
|
+
}
|
|
19
|
+
async request(url, options) {
|
|
20
|
+
options = options ?? {};
|
|
21
|
+
if (options.ctx?.tracer) {
|
|
22
|
+
options.tracer = options.ctx.tracer;
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
options.tracer = options.tracer ?? this.#app.tracer;
|
|
26
|
+
}
|
|
27
|
+
return await super.request(url, options);
|
|
28
|
+
}
|
|
29
|
+
async curl(url, options) {
|
|
30
|
+
return await this.request(url, options);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
30
33
|
function normalizeConfig(app) {
|
|
31
|
-
|
|
32
|
-
|
|
34
|
+
const config = app.config.httpclient;
|
|
35
|
+
if (typeof config.request?.timeout === 'string') {
|
|
36
|
+
config.request.timeout = ms(config.request.timeout);
|
|
37
|
+
}
|
|
33
38
|
}
|
|
34
|
-
|
|
35
|
-
//#endregion
|
|
36
|
-
export { HttpClient };
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cGNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9saWIvY29yZS9odHRwY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxVQUFVLElBQUksYUFBYSxHQUk1QixNQUFNLFFBQVEsQ0FBQztBQUNoQixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBSWpDLE9BQU8sRUFJTixNQUFNLFFBQVEsQ0FBQztBQU9oQixNQUFNLE9BQU8sVUFBVyxTQUFRLGFBQWE7SUFDbEMsSUFBSSxDQUF3QztJQUVyRCxZQUFZLEdBQXVCLEVBQUUsVUFBNkIsRUFBRTtRQUNsRSxlQUFlLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDckIsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUM7UUFDckMsTUFBTSxXQUFXLEdBQXNCO1lBQ3JDLEdBQUcsT0FBTztZQUNWLFdBQVcsRUFBRTtnQkFDWCxHQUFHLE1BQU0sQ0FBQyxPQUFPO2dCQUNqQixHQUFHLE9BQU8sQ0FBQyxXQUFXO2FBQ3ZCO1NBQ0YsQ0FBQztRQUNGLEtBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNuQixJQUFJLENBQUMsSUFBSSxHQUFHLEdBQUcsQ0FBQztJQUNsQixDQUFDO0lBRUQsS0FBSyxDQUFDLE9BQU8sQ0FBVSxHQUF5QixFQUFFLE9BQWtDO1FBQ2xGLE9BQU8sR0FBRyxPQUFPLElBQUksRUFBRSxDQUFDO1FBQ3hCLElBQUksT0FBTyxDQUFDLEdBQUcsRUFBRSxNQUFNLEVBQUUsQ0FBQztZQUN4QixPQUFPLENBQUMsTUFBTSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDO1FBQ3RDLENBQUM7YUFBTSxDQUFDO1lBQ04sT0FBTyxDQUFDLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQ3RELENBQUM7UUFDRCxPQUFPLE1BQU0sS0FBSyxDQUFDLE9BQU8sQ0FBSSxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDOUMsQ0FBQztJQUVELEtBQUssQ0FBQyxJQUFJLENBQVUsR0FBeUIsRUFBRSxPQUFrQztRQUMvRSxPQUFPLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBSSxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDN0MsQ0FBQztDQUNGO0FBS0QsU0FBUyxlQUFlLENBQUMsR0FBdUI7SUFDOUMsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUM7SUFDckMsSUFBSSxPQUFPLE1BQU0sQ0FBQyxPQUFPLEVBQUUsT0FBTyxLQUFLLFFBQVEsRUFBRSxDQUFDO1FBQ2hELE1BQU0sQ0FBQyxPQUFPLENBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3RELENBQUM7QUFDSCxDQUFDIn0=
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
//#region src/lib/core/logger.d.ts
|
|
5
|
-
declare function createLoggers(app: EggApplicationCore): EggLoggers;
|
|
6
|
-
//#endregion
|
|
7
|
-
export { createLoggers };
|
|
1
|
+
import { EggLoggers } from 'egg-logger';
|
|
2
|
+
import type { EggApplicationCore } from '../egg.ts';
|
|
3
|
+
export declare function createLoggers(app: EggApplicationCore): EggLoggers;
|
package/dist/lib/core/logger.js
CHANGED
|
@@ -1,31 +1,37 @@
|
|
|
1
|
-
import { EggLoggers } from
|
|
2
|
-
import { setCustomLogger } from
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
1
|
+
import { EggLoggers } from 'egg-logger';
|
|
2
|
+
import { setCustomLogger } from 'onelogger';
|
|
3
|
+
export function createLoggers(app) {
|
|
4
|
+
const loggerOptions = {
|
|
5
|
+
...app.config.logger,
|
|
6
|
+
type: app.type,
|
|
7
|
+
localStorage: app.ctxStorage,
|
|
8
|
+
};
|
|
9
|
+
// set DEBUG level into INFO on prod env
|
|
10
|
+
if (app.config.env === 'prod' && loggerOptions.level === 'DEBUG' && !app.config.logger.allowDebugAtProd) {
|
|
11
|
+
loggerOptions.level = 'INFO';
|
|
12
|
+
}
|
|
13
|
+
const loggers = new EggLoggers({
|
|
14
|
+
logger: loggerOptions,
|
|
15
|
+
customLogger: app.config.customLogger,
|
|
16
|
+
});
|
|
17
|
+
// won't print to console after started, except for local and unittest
|
|
18
|
+
app.ready(() => {
|
|
19
|
+
if (app.config.logger.disableConsoleAfterReady) {
|
|
20
|
+
loggers.disableConsole();
|
|
21
|
+
loggers.coreLogger.info('[egg:lib:core:logger] disable console log after app ready');
|
|
22
|
+
}
|
|
23
|
+
});
|
|
24
|
+
// set global logger
|
|
25
|
+
for (const loggerName of Object.keys(loggers)) {
|
|
26
|
+
setCustomLogger(loggerName, loggers[loggerName]);
|
|
27
|
+
}
|
|
28
|
+
// reset global logger on beforeClose hook
|
|
29
|
+
app.lifecycle.registerBeforeClose(() => {
|
|
30
|
+
for (const loggerName of Object.keys(loggers)) {
|
|
31
|
+
setCustomLogger(loggerName, undefined);
|
|
32
|
+
}
|
|
33
|
+
});
|
|
34
|
+
loggers.coreLogger.info('[egg:lib:core:logger] init all loggers with options: %j', loggerOptions);
|
|
35
|
+
return loggers;
|
|
28
36
|
}
|
|
29
|
-
|
|
30
|
-
//#endregion
|
|
31
|
-
export { createLoggers };
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9jb3JlL2xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUEwQixNQUFNLFlBQVksQ0FBQztBQUNoRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBSTVDLE1BQU0sVUFBVSxhQUFhLENBQUMsR0FBdUI7SUFDbkQsTUFBTSxhQUFhLEdBQUc7UUFDcEIsR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLE1BQU07UUFDcEIsSUFBSSxFQUFFLEdBQUcsQ0FBQyxJQUFJO1FBQ2QsWUFBWSxFQUFFLEdBQUcsQ0FBQyxVQUFVO0tBQ1IsQ0FBQztJQUV2Qix3Q0FBd0M7SUFDeEMsSUFBSSxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsS0FBSyxNQUFNLElBQUksYUFBYSxDQUFDLEtBQUssS0FBSyxPQUFPLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1FBQ3hHLGFBQWEsQ0FBQyxLQUFLLEdBQUcsTUFBTSxDQUFDO0lBQy9CLENBQUM7SUFFRCxNQUFNLE9BQU8sR0FBRyxJQUFJLFVBQVUsQ0FBQztRQUM3QixNQUFNLEVBQUUsYUFBYTtRQUNyQixZQUFZLEVBQUUsR0FBRyxDQUFDLE1BQU0sQ0FBQyxZQUFZO0tBQ3RDLENBQUMsQ0FBQztJQUVILHNFQUFzRTtJQUN0RSxHQUFHLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRTtRQUNiLElBQUksR0FBRyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsd0JBQXdCLEVBQUUsQ0FBQztZQUMvQyxPQUFPLENBQUMsY0FBYyxFQUFFLENBQUM7WUFDekIsT0FBTyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsMkRBQTJELENBQUMsQ0FBQztRQUN2RixDQUFDO0lBQ0gsQ0FBQyxDQUFDLENBQUM7SUFFSCxvQkFBb0I7SUFDcEIsS0FBSyxNQUFNLFVBQVUsSUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7UUFDOUMsZUFBZSxDQUFDLFVBQVUsRUFBRSxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBQ0QsMENBQTBDO0lBQzFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsbUJBQW1CLENBQUMsR0FBRyxFQUFFO1FBQ3JDLEtBQUssTUFBTSxVQUFVLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1lBQzlDLGVBQWUsQ0FBQyxVQUFVLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDekMsQ0FBQztJQUNILENBQUMsQ0FBQyxDQUFDO0lBQ0gsT0FBTyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMseURBQXlELEVBQUUsYUFBYSxDQUFDLENBQUM7SUFDbEcsT0FBTyxPQUFPLENBQUM7QUFDakIsQ0FBQyJ9
|
|
@@ -1,54 +1,50 @@
|
|
|
1
|
-
import { EventEmitter } from
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
close(): void;
|
|
51
|
-
onMessage(message: any): void;
|
|
1
|
+
import type { EventEmitter } from 'node:events';
|
|
2
|
+
export interface IMessenger extends EventEmitter {
|
|
3
|
+
/**
|
|
4
|
+
* Send message to all agent and app
|
|
5
|
+
* @param {String} action - message key
|
|
6
|
+
* @param {Object} data - message value
|
|
7
|
+
* @return {Messenger} this
|
|
8
|
+
*/
|
|
9
|
+
broadcast(action: string, data?: unknown): IMessenger;
|
|
10
|
+
/**
|
|
11
|
+
* send message to the specified process
|
|
12
|
+
* @param {String} workerId - the workerId of the receiver
|
|
13
|
+
* @param {String} action - message key
|
|
14
|
+
* @param {Object} data - message value
|
|
15
|
+
* @return {Messenger} this
|
|
16
|
+
*/
|
|
17
|
+
sendTo(workerId: string, action: string, data?: unknown): IMessenger;
|
|
18
|
+
/**
|
|
19
|
+
* send message to one app worker by random
|
|
20
|
+
* - if it's running in agent, it will send to one of app workers
|
|
21
|
+
* - if it's running in app, it will send to agent
|
|
22
|
+
* @param {String} action - message key
|
|
23
|
+
* @param {Object} data - message value
|
|
24
|
+
* @return {Messenger} this
|
|
25
|
+
*/
|
|
26
|
+
sendRandom(action: string, data?: unknown): IMessenger;
|
|
27
|
+
/**
|
|
28
|
+
* send message to app
|
|
29
|
+
* @param {String} action - message key
|
|
30
|
+
* @param {Object} data - message value
|
|
31
|
+
* @return {Messenger} this
|
|
32
|
+
*/
|
|
33
|
+
sendToApp(action: string, data?: unknown): IMessenger;
|
|
34
|
+
/**
|
|
35
|
+
* send message to agent
|
|
36
|
+
* @param {String} action - message key
|
|
37
|
+
* @param {Object} data - message value
|
|
38
|
+
* @return {Messenger} this
|
|
39
|
+
*/
|
|
40
|
+
sendToAgent(action: string, data?: unknown): IMessenger;
|
|
41
|
+
/**
|
|
42
|
+
* @param {String} action - message key
|
|
43
|
+
* @param {Object} data - message value
|
|
44
|
+
* @param {String} to - let master know how to send message
|
|
45
|
+
* @return {Messenger} this
|
|
46
|
+
*/
|
|
47
|
+
send(action: string, data: unknown, to?: string): IMessenger;
|
|
48
|
+
close(): void;
|
|
49
|
+
onMessage(message: any): void;
|
|
52
50
|
}
|
|
53
|
-
//#endregion
|
|
54
|
-
export { IMessenger };
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
export {
|
|
1
|
+
export {};
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSU1lc3Nlbmdlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9saWIvY29yZS9tZXNzZW5nZXIvSU1lc3Nlbmdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=
|
|
@@ -1,12 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
[captureRejectionSymbol](err: Error, event: string | symbol, ...args: any[]): void;
|
|
9
|
-
emit(eventName: string | symbol, ...args: any[]): boolean;
|
|
1
|
+
import { EventEmitter, captureRejectionSymbol } from 'node:events';
|
|
2
|
+
import { EggApplicationCore } from '../../egg.ts';
|
|
3
|
+
export declare class BaseMessenger extends EventEmitter {
|
|
4
|
+
protected readonly egg: EggApplicationCore;
|
|
5
|
+
constructor(egg: EggApplicationCore);
|
|
6
|
+
[captureRejectionSymbol](err: Error, event: string | symbol, ...args: any[]): void;
|
|
7
|
+
emit(eventName: string | symbol, ...args: any[]): boolean;
|
|
10
8
|
}
|
|
11
|
-
//#endregion
|
|
12
|
-
export { BaseMessenger };
|