@eggjs/core 6.2.4 → 6.3.0-beta.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/egg.d.ts +2 -2
- package/dist/commonjs/egg.js +4 -4
- package/dist/commonjs/lifecycle.d.ts +5 -2
- package/dist/commonjs/lifecycle.js +36 -14
- package/dist/commonjs/loader/egg_loader.js +13 -8
- package/dist/esm/egg.d.ts +2 -2
- package/dist/esm/egg.js +4 -4
- package/dist/esm/lifecycle.d.ts +5 -2
- package/dist/esm/lifecycle.js +36 -14
- package/dist/esm/loader/egg_loader.js +13 -8
- package/dist/package.json +1 -1
- package/package.json +9 -6
- package/src/egg.ts +3 -3
- package/src/lifecycle.ts +41 -14
- package/src/loader/egg_loader.ts +12 -8
package/dist/commonjs/egg.d.ts
CHANGED
|
@@ -156,7 +156,7 @@ export declare class EggCore extends KoaApplication {
|
|
|
156
156
|
* Register a function that will be called when app close.
|
|
157
157
|
*
|
|
158
158
|
* Notice:
|
|
159
|
-
* This method is now NOT
|
|
159
|
+
* This method is now NOT recommended directly used,
|
|
160
160
|
* Developers SHOULDN'T use app.beforeClose directly now,
|
|
161
161
|
* but in the form of class to implement beforeClose instead.
|
|
162
162
|
*
|
|
@@ -164,7 +164,7 @@ export declare class EggCore extends KoaApplication {
|
|
|
164
164
|
*
|
|
165
165
|
* @param {Function} fn - the function that can be generator function or async function.
|
|
166
166
|
*/
|
|
167
|
-
beforeClose(fn: Fun): void;
|
|
167
|
+
beforeClose(fn: Fun, name?: string): void;
|
|
168
168
|
/**
|
|
169
169
|
* Close all, it will close
|
|
170
170
|
* - callbacks registered by beforeClose
|
package/dist/commonjs/egg.js
CHANGED
|
@@ -248,7 +248,7 @@ class EggCore extends koa_1.Application {
|
|
|
248
248
|
* Register a function that will be called when app close.
|
|
249
249
|
*
|
|
250
250
|
* Notice:
|
|
251
|
-
* This method is now NOT
|
|
251
|
+
* This method is now NOT recommended directly used,
|
|
252
252
|
* Developers SHOULDN'T use app.beforeClose directly now,
|
|
253
253
|
* but in the form of class to implement beforeClose instead.
|
|
254
254
|
*
|
|
@@ -256,9 +256,9 @@ class EggCore extends koa_1.Application {
|
|
|
256
256
|
*
|
|
257
257
|
* @param {Function} fn - the function that can be generator function or async function.
|
|
258
258
|
*/
|
|
259
|
-
beforeClose(fn) {
|
|
259
|
+
beforeClose(fn, name) {
|
|
260
260
|
this.deprecate('`beforeClose` was deprecated, please use "Life Cycles" instead, see https://www.eggjs.org/advanced/loader#life-cycles');
|
|
261
|
-
this.lifecycle.registerBeforeClose(fn);
|
|
261
|
+
this.lifecycle.registerBeforeClose(fn, name);
|
|
262
262
|
}
|
|
263
263
|
/**
|
|
264
264
|
* Close all, it will close
|
|
@@ -347,4 +347,4 @@ class EggCore extends koa_1.Application {
|
|
|
347
347
|
}
|
|
348
348
|
}
|
|
349
349
|
exports.EggCore = EggCore;
|
|
350
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
350
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"egg.js","sourceRoot":"","sources":["../../src/egg.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,6 +44,9 @@ export interface LifecycleOptions {
|
|
|
44
44
|
app: EggCore;
|
|
45
45
|
logger: EggConsoleLogger;
|
|
46
46
|
}
|
|
47
|
+
export type FunWithFullPath = Fun & {
|
|
48
|
+
fullPath?: string;
|
|
49
|
+
};
|
|
47
50
|
export declare class Lifecycle extends EventEmitter {
|
|
48
51
|
#private;
|
|
49
52
|
loadReady: Ready;
|
|
@@ -58,13 +61,13 @@ export declare class Lifecycle extends EventEmitter {
|
|
|
58
61
|
get timing(): import("./index.js").Timing;
|
|
59
62
|
legacyReadyCallback(name: string, opt?: object): (...args: any[]) => void;
|
|
60
63
|
addBootHook(bootHootOrBootClass: BootImplClass | ILifecycleBoot): void;
|
|
61
|
-
addFunctionAsBootHook<T = EggCore>(hook: (app: T) => void): void;
|
|
64
|
+
addFunctionAsBootHook<T = EggCore>(hook: (app: T) => void, fullPath?: string): void;
|
|
62
65
|
/**
|
|
63
66
|
* init boots and trigger config did config
|
|
64
67
|
*/
|
|
65
68
|
init(): void;
|
|
66
69
|
registerBeforeStart(scope: Fun, name: string): void;
|
|
67
|
-
registerBeforeClose(fn:
|
|
70
|
+
registerBeforeClose(fn: FunWithFullPath, fullPath?: string): void;
|
|
68
71
|
close(): Promise<void>;
|
|
69
72
|
triggerConfigWillLoad(): void;
|
|
70
73
|
triggerConfigDidLoad(): void;
|
|
@@ -12,7 +12,7 @@ const get_ready_1 = require("get-ready");
|
|
|
12
12
|
const ready_callback_1 = require("ready-callback");
|
|
13
13
|
const egg_logger_1 = require("egg-logger");
|
|
14
14
|
const index_js_1 = __importDefault(require("./utils/index.js"));
|
|
15
|
-
const debug = (0, node_util_1.debuglog)('@eggjs/core
|
|
15
|
+
const debug = (0, node_util_1.debuglog)('@eggjs/core/lifecycle');
|
|
16
16
|
class Lifecycle extends node_events_1.EventEmitter {
|
|
17
17
|
#init;
|
|
18
18
|
#readyObject;
|
|
@@ -42,10 +42,10 @@ class Lifecycle extends node_events_1.EventEmitter {
|
|
|
42
42
|
this.#initReady();
|
|
43
43
|
this
|
|
44
44
|
.on('ready_stat', data => {
|
|
45
|
-
this.logger.info('[
|
|
45
|
+
this.logger.info('[@eggjs/core/lifecycle:ready_stat] end ready task %s, remain %j', data.id, data.remain);
|
|
46
46
|
})
|
|
47
47
|
.on('ready_timeout', id => {
|
|
48
|
-
this.logger.warn('[
|
|
48
|
+
this.logger.warn('[@eggjs/core/lifecycle:ready_timeout] %s seconds later %s was still unable to finish.', this.readyTimeout / 1000, id);
|
|
49
49
|
});
|
|
50
50
|
this.ready(err => {
|
|
51
51
|
this.triggerDidReady(err);
|
|
@@ -85,11 +85,12 @@ class Lifecycle extends node_events_1.EventEmitter {
|
|
|
85
85
|
(0, node_assert_1.default)(this.#init === false, 'do not add hook when lifecycle has been initialized');
|
|
86
86
|
this.#bootHooks.push(bootHootOrBootClass);
|
|
87
87
|
}
|
|
88
|
-
addFunctionAsBootHook(hook) {
|
|
88
|
+
addFunctionAsBootHook(hook, fullPath) {
|
|
89
89
|
(0, node_assert_1.default)(this.#init === false, 'do not add hook when lifecycle has been initialized');
|
|
90
90
|
// app.js is exported as a function
|
|
91
91
|
// call this function in configDidLoad
|
|
92
|
-
|
|
92
|
+
class Boot {
|
|
93
|
+
static fullPath;
|
|
93
94
|
app;
|
|
94
95
|
constructor(app) {
|
|
95
96
|
this.app = app;
|
|
@@ -97,23 +98,31 @@ class Lifecycle extends node_events_1.EventEmitter {
|
|
|
97
98
|
configDidLoad() {
|
|
98
99
|
hook(this.app);
|
|
99
100
|
}
|
|
100
|
-
}
|
|
101
|
+
}
|
|
102
|
+
Boot.fullPath = fullPath;
|
|
103
|
+
this.#bootHooks.push(Boot);
|
|
101
104
|
}
|
|
102
105
|
/**
|
|
103
106
|
* init boots and trigger config did config
|
|
104
107
|
*/
|
|
105
108
|
init() {
|
|
109
|
+
debug('%s init lifecycle', this.app.type);
|
|
106
110
|
(0, node_assert_1.default)(this.#init === false, 'lifecycle have been init');
|
|
107
111
|
this.#init = true;
|
|
108
112
|
this.#boots = this.#bootHooks.map(BootHootOrBootClass => {
|
|
113
|
+
let instance = BootHootOrBootClass;
|
|
109
114
|
if ((0, is_type_of_1.isClass)(BootHootOrBootClass)) {
|
|
110
|
-
|
|
115
|
+
instance = new BootHootOrBootClass(this.app);
|
|
116
|
+
if (!instance.fullPath && 'fullPath' in BootHootOrBootClass) {
|
|
117
|
+
instance.fullPath = BootHootOrBootClass.fullPath;
|
|
118
|
+
}
|
|
111
119
|
}
|
|
112
|
-
|
|
120
|
+
debug('[init] add boot instance: %o', instance.fullPath);
|
|
121
|
+
return instance;
|
|
113
122
|
});
|
|
114
123
|
}
|
|
115
124
|
registerBeforeStart(scope, name) {
|
|
116
|
-
debug('add registerBeforeStart, name: %o', name);
|
|
125
|
+
debug('%s add registerBeforeStart, name: %o', this.options.app.type, name);
|
|
117
126
|
this.#registerReadyCallback({
|
|
118
127
|
scope,
|
|
119
128
|
ready: this.loadReady,
|
|
@@ -121,15 +130,21 @@ class Lifecycle extends node_events_1.EventEmitter {
|
|
|
121
130
|
scopeFullName: name,
|
|
122
131
|
});
|
|
123
132
|
}
|
|
124
|
-
registerBeforeClose(fn) {
|
|
133
|
+
registerBeforeClose(fn, fullPath) {
|
|
125
134
|
(0, node_assert_1.default)(typeof fn === 'function', 'argument should be function');
|
|
126
135
|
(0, node_assert_1.default)(this.#isClosed === false, 'app has been closed');
|
|
136
|
+
if (fullPath) {
|
|
137
|
+
fn.fullPath = fullPath;
|
|
138
|
+
}
|
|
127
139
|
this.#closeFunctionSet.add(fn);
|
|
140
|
+
debug('%s register beforeClose at %o, count: %d', this.app.type, fullPath, this.#closeFunctionSet.size);
|
|
128
141
|
}
|
|
129
142
|
async close() {
|
|
130
143
|
// close in reverse order: first created, last closed
|
|
131
144
|
const closeFns = Array.from(this.#closeFunctionSet);
|
|
145
|
+
debug('%s start trigger %d beforeClose functions', this.app.type, closeFns.length);
|
|
132
146
|
for (const fn of closeFns.reverse()) {
|
|
147
|
+
debug('%s trigger beforeClose at %o', this.app.type, fn.fullPath);
|
|
133
148
|
await index_js_1.default.callFn(fn);
|
|
134
149
|
this.#closeFunctionSet.delete(fn);
|
|
135
150
|
}
|
|
@@ -138,11 +153,13 @@ class Lifecycle extends node_events_1.EventEmitter {
|
|
|
138
153
|
this.removeAllListeners();
|
|
139
154
|
this.app.removeAllListeners();
|
|
140
155
|
this.#isClosed = true;
|
|
156
|
+
debug('%s closed', this.app.type);
|
|
141
157
|
}
|
|
142
158
|
triggerConfigWillLoad() {
|
|
143
159
|
debug('trigger configWillLoad start');
|
|
144
160
|
for (const boot of this.#boots) {
|
|
145
161
|
if (typeof boot.configWillLoad === 'function') {
|
|
162
|
+
debug('trigger configWillLoad at %o', boot.fullPath);
|
|
146
163
|
boot.configWillLoad();
|
|
147
164
|
}
|
|
148
165
|
}
|
|
@@ -153,12 +170,13 @@ class Lifecycle extends node_events_1.EventEmitter {
|
|
|
153
170
|
debug('trigger configDidLoad start');
|
|
154
171
|
for (const boot of this.#boots) {
|
|
155
172
|
if (typeof boot.configDidLoad === 'function') {
|
|
173
|
+
debug('trigger configDidLoad at %o', boot.fullPath);
|
|
156
174
|
boot.configDidLoad();
|
|
157
175
|
}
|
|
158
176
|
// function boot hook register after configDidLoad trigger
|
|
159
177
|
if (typeof boot.beforeClose === 'function') {
|
|
160
178
|
const beforeClose = boot.beforeClose.bind(boot);
|
|
161
|
-
this.registerBeforeClose(beforeClose);
|
|
179
|
+
this.registerBeforeClose(beforeClose, boot.fullPath);
|
|
162
180
|
}
|
|
163
181
|
}
|
|
164
182
|
debug('trigger configDidLoad end');
|
|
@@ -201,11 +219,13 @@ class Lifecycle extends node_events_1.EventEmitter {
|
|
|
201
219
|
return (async () => {
|
|
202
220
|
for (const boot of this.#boots) {
|
|
203
221
|
if (typeof boot.didReady === 'function') {
|
|
222
|
+
debug('trigger didReady at %o', boot.fullPath);
|
|
204
223
|
try {
|
|
205
224
|
await boot.didReady(err);
|
|
206
225
|
}
|
|
207
|
-
catch (
|
|
208
|
-
|
|
226
|
+
catch (err) {
|
|
227
|
+
debug('trigger didReady error at %o, error: %s', boot.fullPath, err);
|
|
228
|
+
this.emit('error', err);
|
|
209
229
|
}
|
|
210
230
|
}
|
|
211
231
|
}
|
|
@@ -219,10 +239,12 @@ class Lifecycle extends node_events_1.EventEmitter {
|
|
|
219
239
|
if (typeof boot.serverDidReady !== 'function') {
|
|
220
240
|
continue;
|
|
221
241
|
}
|
|
242
|
+
debug('trigger serverDidReady at %o', boot.fullPath);
|
|
222
243
|
try {
|
|
223
244
|
await boot.serverDidReady();
|
|
224
245
|
}
|
|
225
246
|
catch (err) {
|
|
247
|
+
debug('trigger serverDidReady error at %o, error: %s', boot.fullPath, err);
|
|
226
248
|
this.emit('error', err);
|
|
227
249
|
}
|
|
228
250
|
}
|
|
@@ -283,4 +305,4 @@ class Lifecycle extends node_events_1.EventEmitter {
|
|
|
283
305
|
}
|
|
284
306
|
}
|
|
285
307
|
exports.Lifecycle = Lifecycle;
|
|
286
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../src/lifecycle.ts"],"names":[],"mappings":"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"}
|
|
308
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../src/lifecycle.ts"],"names":[],"mappings":"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"}
|