egg 4.0.0-beta.0 → 4.0.0-beta.11

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.
Files changed (117) hide show
  1. package/README.md +1 -0
  2. package/README.zh-CN.md +1 -0
  3. package/dist/commonjs/app/extend/context.d.ts +154 -0
  4. package/dist/commonjs/app/extend/context.js +261 -0
  5. package/dist/commonjs/app/extend/context.types.d.ts +16 -0
  6. package/dist/commonjs/app/extend/context.types.js +3 -0
  7. package/dist/commonjs/app/extend/helper.d.ts +37 -0
  8. package/dist/commonjs/app/extend/helper.js +49 -0
  9. package/dist/commonjs/app/extend/request.d.ts +128 -0
  10. package/dist/commonjs/app/extend/request.js +270 -0
  11. package/dist/commonjs/app/extend/response.d.ts +25 -0
  12. package/dist/commonjs/app/extend/response.js +37 -0
  13. package/dist/commonjs/app/middleware/meta.d.ts +2 -3
  14. package/dist/commonjs/app/middleware/meta.js +1 -1
  15. package/dist/commonjs/app/middleware/notfound.d.ts +2 -3
  16. package/dist/commonjs/app/middleware/notfound.js +1 -1
  17. package/dist/commonjs/app/middleware/site_file.d.ts +5 -3
  18. package/dist/commonjs/app/middleware/site_file.js +21 -3
  19. package/dist/commonjs/config/config.default.js +5 -4
  20. package/dist/commonjs/config/plugin.js +3 -3
  21. package/dist/commonjs/index.d.ts +3 -1
  22. package/dist/commonjs/index.js +8 -6
  23. package/dist/commonjs/lib/application.d.ts +5 -12
  24. package/dist/commonjs/lib/application.js +9 -20
  25. package/dist/commonjs/lib/core/base_context_class.d.ts +2 -2
  26. package/dist/commonjs/lib/core/base_hook_class.d.ts +1 -1
  27. package/dist/commonjs/lib/core/context_httpclient.d.ts +3 -3
  28. package/dist/commonjs/lib/core/context_httpclient.js +1 -1
  29. package/dist/commonjs/lib/core/httpclient.d.ts +2 -3
  30. package/dist/commonjs/lib/core/httpclient.js +3 -6
  31. package/dist/commonjs/lib/core/messenger/IMessenger.d.ts +3 -3
  32. package/dist/commonjs/lib/core/messenger/index.js +2 -2
  33. package/dist/commonjs/lib/core/messenger/ipc.d.ts +6 -4
  34. package/dist/commonjs/lib/core/messenger/ipc.js +31 -20
  35. package/dist/commonjs/lib/core/messenger/local.d.ts +3 -3
  36. package/dist/commonjs/lib/core/messenger/local.js +14 -11
  37. package/dist/commonjs/lib/egg.d.ts +25 -16
  38. package/dist/commonjs/lib/egg.js +44 -22
  39. package/dist/commonjs/lib/egg.types.d.ts +6 -0
  40. package/dist/commonjs/lib/egg.types.js +3 -0
  41. package/dist/commonjs/lib/type.d.ts +3 -5
  42. package/dist/commonjs/lib/utils.d.ts +2 -0
  43. package/dist/commonjs/lib/utils.js +21 -0
  44. package/dist/commonjs/urllib.d.ts +1 -0
  45. package/dist/commonjs/urllib.js +18 -0
  46. package/dist/esm/app/extend/context.d.ts +154 -0
  47. package/dist/esm/app/extend/context.js +255 -0
  48. package/dist/esm/app/extend/context.types.d.ts +16 -0
  49. package/dist/esm/app/extend/context.types.js +2 -0
  50. package/dist/esm/app/extend/helper.d.ts +37 -0
  51. package/dist/esm/app/extend/helper.js +43 -0
  52. package/dist/esm/app/extend/request.d.ts +128 -0
  53. package/dist/esm/app/extend/request.js +264 -0
  54. package/dist/esm/app/extend/response.d.ts +25 -0
  55. package/dist/esm/app/extend/response.js +34 -0
  56. package/dist/esm/app/middleware/meta.d.ts +2 -3
  57. package/dist/esm/app/middleware/meta.js +1 -1
  58. package/dist/esm/app/middleware/notfound.d.ts +2 -3
  59. package/dist/esm/app/middleware/notfound.js +1 -1
  60. package/dist/esm/app/middleware/site_file.d.ts +5 -3
  61. package/dist/esm/app/middleware/site_file.js +21 -3
  62. package/dist/esm/config/config.default.js +5 -4
  63. package/dist/esm/config/plugin.js +3 -3
  64. package/dist/esm/index.d.ts +3 -1
  65. package/dist/esm/index.js +5 -4
  66. package/dist/esm/lib/application.d.ts +5 -12
  67. package/dist/esm/lib/application.js +9 -20
  68. package/dist/esm/lib/core/base_context_class.d.ts +2 -2
  69. package/dist/esm/lib/core/base_hook_class.d.ts +1 -1
  70. package/dist/esm/lib/core/context_httpclient.d.ts +3 -3
  71. package/dist/esm/lib/core/context_httpclient.js +1 -1
  72. package/dist/esm/lib/core/httpclient.d.ts +2 -3
  73. package/dist/esm/lib/core/httpclient.js +2 -2
  74. package/dist/esm/lib/core/messenger/IMessenger.d.ts +3 -3
  75. package/dist/esm/lib/core/messenger/index.js +2 -2
  76. package/dist/esm/lib/core/messenger/ipc.d.ts +6 -4
  77. package/dist/esm/lib/core/messenger/ipc.js +29 -18
  78. package/dist/esm/lib/core/messenger/local.d.ts +3 -3
  79. package/dist/esm/lib/core/messenger/local.js +14 -11
  80. package/dist/esm/lib/egg.d.ts +25 -16
  81. package/dist/esm/lib/egg.js +24 -15
  82. package/dist/esm/lib/egg.types.d.ts +6 -0
  83. package/dist/esm/lib/egg.types.js +2 -0
  84. package/dist/esm/lib/type.d.ts +3 -5
  85. package/dist/esm/lib/utils.d.ts +2 -0
  86. package/dist/esm/lib/utils.js +14 -0
  87. package/dist/esm/urllib.d.ts +1 -0
  88. package/dist/esm/urllib.js +2 -0
  89. package/dist/package.json +1 -1
  90. package/package.json +44 -29
  91. package/src/app/extend/context.ts +303 -0
  92. package/src/app/extend/context.types.ts +24 -0
  93. package/src/app/extend/{helper.js → helper.ts} +14 -13
  94. package/src/app/extend/{request.js → request.ts} +81 -79
  95. package/src/app/extend/response.ts +36 -0
  96. package/src/app/middleware/meta.ts +2 -3
  97. package/src/app/middleware/notfound.ts +2 -3
  98. package/src/app/middleware/site_file.ts +26 -7
  99. package/src/config/config.default.ts +4 -3
  100. package/src/config/plugin.ts +2 -2
  101. package/src/index.ts +5 -3
  102. package/src/lib/application.ts +14 -21
  103. package/src/lib/core/base_context_class.ts +2 -2
  104. package/src/lib/core/base_hook_class.ts +1 -1
  105. package/src/lib/core/context_httpclient.ts +3 -3
  106. package/src/lib/core/httpclient.ts +4 -5
  107. package/src/lib/core/messenger/IMessenger.ts +3 -3
  108. package/src/lib/core/messenger/index.ts +1 -1
  109. package/src/lib/core/messenger/ipc.ts +31 -20
  110. package/src/lib/core/messenger/local.ts +13 -11
  111. package/src/lib/egg.ts +60 -28
  112. package/src/lib/egg.types.ts +6 -0
  113. package/src/lib/type.ts +6 -6
  114. package/src/lib/utils.ts +16 -0
  115. package/src/urllib.ts +1 -0
  116. package/src/app/extend/context.js +0 -285
  117. package/src/app/extend/response.js +0 -101
@@ -7,14 +7,12 @@ exports.Application = void 0;
7
7
  const node_path_1 = __importDefault(require("node:path"));
8
8
  const node_fs_1 = __importDefault(require("node:fs"));
9
9
  const node_http_1 = __importDefault(require("node:http"));
10
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
11
- // @ts-ignore
12
- const graceful_1 = __importDefault(require("graceful"));
10
+ const graceful_1 = require("graceful");
13
11
  const utility_1 = require("utility");
14
12
  const core_1 = require("@eggjs/core");
15
13
  const egg_js_1 = require("./egg.js");
16
14
  const index_js_1 = require("./loader/index.js");
17
- const base_context_class_js_1 = require("./core/base_context_class.js");
15
+ const helper_js_1 = __importDefault(require("../app/extend/helper.js"));
18
16
  const EGG_LOADER = Symbol.for('egg#loader');
19
17
  // client error => 400 Bad Request
20
18
  // Refs: https://nodejs.org/dist/latest-v8.x/docs/api/http.html#http_event_clienterror
@@ -34,13 +32,6 @@ function escapeHeaderValue(value) {
34
32
  // minimize the performance impact in the common case.
35
33
  return /[\r\n]/.test(value) ? value.replace(/[\r\n]+[ \t]*/g, '') : value;
36
34
  }
37
- /**
38
- * The Helper class which can be used as utility function.
39
- * We support developers to extend Helper through ${baseDir}/app/extend/helper.js ,
40
- * then you can use all method on `ctx.helper` that is a instance of Helper.
41
- */
42
- class HelperClass extends base_context_class_js_1.BaseContextClass {
43
- }
44
35
  /**
45
36
  * Singleton instance in App Worker, extend {@link EggApplicationCore}
46
37
  * @augments EggApplicationCore
@@ -53,7 +44,7 @@ class Application extends egg_js_1.EggApplicationCore {
53
44
  * reference to {@link Helper}
54
45
  * @member {Helper} Application#Helper
55
46
  */
56
- Helper = HelperClass;
47
+ Helper = helper_js_1.default;
57
48
  /**
58
49
  * @class
59
50
  * @param {Object} options - see {@link EggApplicationCore}
@@ -73,8 +64,7 @@ class Application extends egg_js_1.EggApplicationCore {
73
64
  return index_js_1.AppWorkerLoader;
74
65
  }
75
66
  #responseRaw(socket, raw) {
76
- /* istanbul ignore next */
77
- if (!socket.writable)
67
+ if (!socket?.writable)
78
68
  return;
79
69
  if (!raw) {
80
70
  return socket.end(DEFAULT_BAD_REQUEST_RESPONSE);
@@ -136,8 +126,7 @@ class Application extends egg_js_1.EggApplicationCore {
136
126
  this.server = server;
137
127
  // set ignore code
138
128
  const serverGracefulIgnoreCode = this.config.serverGracefulIgnoreCode || [];
139
- /* istanbul ignore next */
140
- (0, graceful_1.default)({
129
+ (0, graceful_1.graceful)({
141
130
  server: [server],
142
131
  error: (err, throwErrorCount) => {
143
132
  const originMessage = err.message;
@@ -206,13 +195,13 @@ class Application extends egg_js_1.EggApplicationCore {
206
195
  * @see Context#runInBackground
207
196
  * @param {Function} scope - the first args is an anonymous ctx
208
197
  */
209
- runInBackground(scope) {
210
- const ctx = this.createAnonymousContext();
198
+ runInBackground(scope, req) {
199
+ const ctx = this.createAnonymousContext(req);
211
200
  if (!scope.name) {
212
201
  Reflect.set(scope, '_name', core_1.utils.getCalleeFromStack(true));
213
202
  }
214
203
  this.ctxStorage.run(ctx, () => {
215
- ctx.runInBackground(scope);
204
+ return ctx.runInBackground(scope);
216
205
  });
217
206
  }
218
207
  /**
@@ -278,4 +267,4 @@ class Application extends egg_js_1.EggApplicationCore {
278
267
  }
279
268
  }
280
269
  exports.Application = Application;
281
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../src/lib/application.ts"],"names":[],"mappings":"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"}
270
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../src/lib/application.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { BaseContextClass as EggCoreBaseContextClass } from '@eggjs/core';
2
- import type { EggContext } from '../egg.js';
2
+ import type { ContextDelegation } from '../egg.js';
3
3
  import { BaseContextLogger } from './base_context_logger.js';
4
4
  /**
5
5
  * BaseContextClass is a base class that can be extended,
@@ -8,7 +8,7 @@ import { BaseContextLogger } from './base_context_logger.js';
8
8
  */
9
9
  export declare class BaseContextClass extends EggCoreBaseContextClass {
10
10
  #private;
11
- ctx: EggContext;
11
+ ctx: ContextDelegation;
12
12
  protected pathName?: string;
13
13
  get logger(): BaseContextLogger;
14
14
  }
@@ -4,7 +4,7 @@ export declare class BaseHookClass implements ILifecycleBoot {
4
4
  #private;
5
5
  fullPath?: string;
6
6
  constructor(instance: Application | Agent);
7
- get logger(): import("egg-logger").EggLogger;
7
+ get logger(): any;
8
8
  get config(): import("../type.js").EggAppConfig;
9
9
  get app(): Application;
10
10
  get agent(): Agent;
@@ -1,9 +1,9 @@
1
- import type { EggContext, EggApplicationCore } from '../egg.js';
1
+ import type { ContextDelegation, EggApplicationCore } from '../egg.js';
2
2
  import type { HttpClientRequestURL, HttpClientRequestOptions } from './httpclient.js';
3
3
  export declare class ContextHttpClient {
4
- ctx: EggContext;
4
+ ctx: ContextDelegation;
5
5
  app: EggApplicationCore;
6
- constructor(ctx: EggContext);
6
+ constructor(ctx: ContextDelegation);
7
7
  /**
8
8
  * http request helper base on {@link HttpClient}, it will auto save httpclient log.
9
9
  * Keep the same api with {@link Application#curl}.
@@ -27,4 +27,4 @@ class ContextHttpClient {
27
27
  }
28
28
  }
29
29
  exports.ContextHttpClient = ContextHttpClient;
30
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dF9odHRwY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2xpYi9jb3JlL2NvbnRleHRfaHR0cGNsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFLQSxNQUFhLGlCQUFpQjtJQUM1QixHQUFHLENBQWE7SUFDaEIsR0FBRyxDQUFxQjtJQUV4QixZQUFZLEdBQWU7UUFDekIsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDZixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUM7SUFDckIsQ0FBQztJQUVEOzs7Ozs7T0FNRztJQUNILEtBQUssQ0FBQyxJQUFJLENBQVUsR0FBeUIsRUFBRSxPQUFrQztRQUMvRSxPQUFPLEdBQUc7WUFDUixHQUFHLE9BQU87WUFDVixHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUc7U0FDZCxDQUFDO1FBQ0YsT0FBTyxNQUFNLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFJLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUM5QyxDQUFDO0lBRUQsS0FBSyxDQUFDLE9BQU8sQ0FBVSxHQUF5QixFQUFFLE9BQWtDO1FBQ2xGLE9BQU8sTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFJLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUMxQyxDQUFDO0NBQ0Y7QUEzQkQsOENBMkJDIn0=
30
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dF9odHRwY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2xpYi9jb3JlL2NvbnRleHRfaHR0cGNsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFLQSxNQUFhLGlCQUFpQjtJQUM1QixHQUFHLENBQW9CO0lBQ3ZCLEdBQUcsQ0FBcUI7SUFFeEIsWUFBWSxHQUFzQjtRQUNoQyxJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztRQUNmLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQztJQUNyQixDQUFDO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsS0FBSyxDQUFDLElBQUksQ0FBVSxHQUF5QixFQUFFLE9BQWtDO1FBQy9FLE9BQU8sR0FBRztZQUNSLEdBQUcsT0FBTztZQUNWLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztTQUNkLENBQUM7UUFDRixPQUFPLE1BQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUksR0FBRyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzlDLENBQUM7SUFFRCxLQUFLLENBQUMsT0FBTyxDQUFVLEdBQXlCLEVBQUUsT0FBa0M7UUFDbEYsT0FBTyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUksR0FBRyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzFDLENBQUM7Q0FDRjtBQTNCRCw4Q0EyQkMifQ==
@@ -1,9 +1,8 @@
1
- import { EggCoreContext } from '@eggjs/core';
2
1
  import { HttpClient as RawHttpClient, RequestURL as HttpClientRequestURL, RequestOptions } from 'urllib';
3
- import type { EggApplicationCore } from '../egg.js';
2
+ import type { EggApplicationCore, ContextDelegation } from '../egg.js';
4
3
  export type { HttpClientResponse, RequestURL as HttpClientRequestURL, } from 'urllib';
5
4
  export interface HttpClientRequestOptions extends RequestOptions {
6
- ctx?: EggCoreContext;
5
+ ctx?: ContextDelegation;
7
6
  tracer?: unknown;
8
7
  }
9
8
  export declare class HttpClient extends RawHttpClient {
@@ -1,11 +1,8 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
3
  exports.HttpClient = void 0;
7
4
  const urllib_1 = require("urllib");
8
- const ms_1 = __importDefault(require("ms"));
5
+ const humanize_ms_1 = require("humanize-ms");
9
6
  class HttpClient extends urllib_1.HttpClient {
10
7
  #app;
11
8
  constructor(app) {
@@ -34,7 +31,7 @@ exports.HttpClient = HttpClient;
34
31
  function normalizeConfig(app) {
35
32
  const config = app.config.httpclient;
36
33
  if (typeof config.request?.timeout === 'string') {
37
- config.request.timeout = (0, ms_1.default)(config.request.timeout);
34
+ config.request.timeout = (0, humanize_ms_1.ms)(config.request.timeout);
38
35
  }
39
36
  }
40
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cGNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9saWIvY29yZS9odHRwY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUNBLG1DQUlnQjtBQUNoQiw0Q0FBb0I7QUFhcEIsTUFBYSxVQUFXLFNBQVEsbUJBQWE7SUFDbEMsSUFBSSxDQUE0QztJQUV6RCxZQUFZLEdBQXVCO1FBQ2pDLGVBQWUsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNyQixNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQztRQUNyQyxLQUFLLENBQUM7WUFDSixXQUFXLEVBQUUsTUFBTSxDQUFDLE9BQU87U0FDNUIsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLElBQUksR0FBRyxHQUFHLENBQUM7SUFDbEIsQ0FBQztJQUVELEtBQUssQ0FBQyxPQUFPLENBQVUsR0FBeUIsRUFBRSxPQUFrQztRQUNsRixPQUFPLEdBQUcsT0FBTyxJQUFJLEVBQUUsQ0FBQztRQUN4QixJQUFJLE9BQU8sQ0FBQyxHQUFHLEVBQUUsTUFBTSxFQUFFLENBQUM7WUFDeEIsT0FBTyxDQUFDLE1BQU0sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQztRQUN0QyxDQUFDO2FBQU0sQ0FBQztZQUNOLE9BQU8sQ0FBQyxNQUFNLEdBQUcsT0FBTyxDQUFDLE1BQU0sSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUN0RCxDQUFDO1FBQ0QsT0FBTyxNQUFNLEtBQUssQ0FBQyxPQUFPLENBQUksR0FBRyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzlDLENBQUM7SUFFRCxLQUFLLENBQUMsSUFBSSxDQUFVLEdBQXlCLEVBQUUsT0FBa0M7UUFDL0UsT0FBTyxNQUFNLElBQUksQ0FBQyxPQUFPLENBQUksR0FBRyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzdDLENBQUM7Q0FDRjtBQXpCRCxnQ0F5QkM7QUFFRCxTQUFTLGVBQWUsQ0FBQyxHQUF1QjtJQUM5QyxNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQztJQUNyQyxJQUFJLE9BQU8sTUFBTSxDQUFDLE9BQU8sRUFBRSxPQUFPLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDaEQsTUFBTSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsSUFBQSxZQUFFLEVBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxPQUFpQixDQUFDLENBQUM7SUFDaEUsQ0FBQztBQUNILENBQUMifQ==
37
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cGNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9saWIvY29yZS9odHRwY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLG1DQUlnQjtBQUNoQiw2Q0FBaUM7QUFhakMsTUFBYSxVQUFXLFNBQVEsbUJBQWE7SUFDbEMsSUFBSSxDQUE0QztJQUV6RCxZQUFZLEdBQXVCO1FBQ2pDLGVBQWUsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNyQixNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQztRQUNyQyxLQUFLLENBQUM7WUFDSixXQUFXLEVBQUUsTUFBTSxDQUFDLE9BQU87U0FDNUIsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLElBQUksR0FBRyxHQUFHLENBQUM7SUFDbEIsQ0FBQztJQUVELEtBQUssQ0FBQyxPQUFPLENBQVUsR0FBeUIsRUFBRSxPQUFrQztRQUNsRixPQUFPLEdBQUcsT0FBTyxJQUFJLEVBQUUsQ0FBQztRQUN4QixJQUFJLE9BQU8sQ0FBQyxHQUFHLEVBQUUsTUFBTSxFQUFFLENBQUM7WUFDeEIsT0FBTyxDQUFDLE1BQU0sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQztRQUN0QyxDQUFDO2FBQU0sQ0FBQztZQUNOLE9BQU8sQ0FBQyxNQUFNLEdBQUcsT0FBTyxDQUFDLE1BQU0sSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUN0RCxDQUFDO1FBQ0QsT0FBTyxNQUFNLEtBQUssQ0FBQyxPQUFPLENBQUksR0FBRyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzlDLENBQUM7SUFFRCxLQUFLLENBQUMsSUFBSSxDQUFVLEdBQXlCLEVBQUUsT0FBa0M7UUFDL0UsT0FBTyxNQUFNLElBQUksQ0FBQyxPQUFPLENBQUksR0FBRyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzdDLENBQUM7Q0FDRjtBQXpCRCxnQ0F5QkM7QUFFRCxTQUFTLGVBQWUsQ0FBQyxHQUF1QjtJQUM5QyxNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQztJQUNyQyxJQUFJLE9BQU8sTUFBTSxDQUFDLE9BQU8sRUFBRSxPQUFPLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDaEQsTUFBTSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEdBQUcsSUFBQSxnQkFBRSxFQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDdEQsQ0FBQztBQUNILENBQUMifQ==
@@ -9,12 +9,12 @@ export interface IMessenger extends EventEmitter {
9
9
  broadcast(action: string, data?: unknown): IMessenger;
10
10
  /**
11
11
  * send message to the specified process
12
- * @param {String} pid - the process id of the receiver
12
+ * @param {String} workerId - the workerId of the receiver
13
13
  * @param {String} action - message key
14
14
  * @param {Object} data - message value
15
15
  * @return {Messenger} this
16
16
  */
17
- sendTo(pid: string, action: string, data?: unknown): IMessenger;
17
+ sendTo(workerId: string, action: string, data?: unknown): IMessenger;
18
18
  /**
19
19
  * send message to one app worker by random
20
20
  * - if it's running in agent, it will send to one of app workers
@@ -44,7 +44,7 @@ export interface IMessenger extends EventEmitter {
44
44
  * @param {String} to - let master know how to send message
45
45
  * @return {Messenger} this
46
46
  */
47
- send(action: string, data: unknown | undefined, to: string): IMessenger;
47
+ send(action: string, data: unknown | undefined, to?: string): IMessenger;
48
48
  close(): void;
49
49
  onMessage(message: any): void;
50
50
  }
@@ -9,6 +9,6 @@ const ipc_js_1 = require("./ipc.js");
9
9
  function create(egg) {
10
10
  return egg.options.mode === 'single'
11
11
  ? new local_js_1.Messenger(egg)
12
- : new ipc_js_1.Messenger();
12
+ : new ipc_js_1.Messenger(egg);
13
13
  }
14
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbGliL2NvcmUvbWVzc2VuZ2VyL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBVUEsd0JBSUM7QUFkRCx5Q0FBeUQ7QUFDekQscUNBQXFEO0FBTXJEOztHQUVHO0FBQ0gsU0FBZ0IsTUFBTSxDQUFDLEdBQXVCO0lBQzVDLE9BQU8sR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEtBQUssUUFBUTtRQUNsQyxDQUFDLENBQUMsSUFBSSxvQkFBYyxDQUFDLEdBQUcsQ0FBQztRQUN6QixDQUFDLENBQUMsSUFBSSxrQkFBWSxFQUFFLENBQUM7QUFDekIsQ0FBQyJ9
14
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbGliL2NvcmUvbWVzc2VuZ2VyL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBVUEsd0JBSUM7QUFkRCx5Q0FBeUQ7QUFDekQscUNBQXFEO0FBTXJEOztHQUVHO0FBQ0gsU0FBZ0IsTUFBTSxDQUFDLEdBQXVCO0lBQzVDLE9BQU8sR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEtBQUssUUFBUTtRQUNsQyxDQUFDLENBQUMsSUFBSSxvQkFBYyxDQUFDLEdBQUcsQ0FBQztRQUN6QixDQUFDLENBQUMsSUFBSSxrQkFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQzVCLENBQUMifQ==
@@ -1,12 +1,14 @@
1
1
  import { EventEmitter } from 'node:events';
2
2
  import type { IMessenger } from './IMessenger.js';
3
+ import type { EggApplicationCore } from '../../egg.js';
3
4
  /**
4
5
  * Communication between app worker and agent worker by IPC channel
5
6
  */
6
7
  export declare class Messenger extends EventEmitter implements IMessenger {
7
8
  readonly pid: string;
9
+ readonly egg: EggApplicationCore;
8
10
  opids: string[];
9
- constructor();
11
+ constructor(egg: EggApplicationCore);
10
12
  /**
11
13
  * Send message to all agent and app
12
14
  * @param {String} action - message key
@@ -16,12 +18,12 @@ export declare class Messenger extends EventEmitter implements IMessenger {
16
18
  broadcast(action: string, data?: unknown): Messenger;
17
19
  /**
18
20
  * send message to the specified process
19
- * @param {String} pid - the process id of the receiver
21
+ * @param {String} workerId - the workerId of the receiver
20
22
  * @param {String} action - message key
21
23
  * @param {Object} data - message value
22
24
  * @return {Messenger} this
23
25
  */
24
- sendTo(pid: string, action: string, data?: unknown): Messenger;
26
+ sendTo(workerId: string, action: string, data?: unknown): Messenger;
25
27
  /**
26
28
  * send message to one app worker by random
27
29
  * - if it's running in agent, it will send to one of app workers
@@ -51,7 +53,7 @@ export declare class Messenger extends EventEmitter implements IMessenger {
51
53
  * @param {String} to - let master know how to send message
52
54
  * @return {Messenger} this
53
55
  */
54
- send(action: string, data: unknown | undefined, to: string): Messenger;
56
+ send(action: string, data: unknown | undefined, to?: string): Messenger;
55
57
  onMessage(message: any): void;
56
58
  close(): void;
57
59
  }
@@ -7,22 +7,25 @@ exports.Messenger = void 0;
7
7
  const node_events_1 = require("node:events");
8
8
  const node_util_1 = require("node:util");
9
9
  const node_worker_threads_1 = __importDefault(require("node:worker_threads"));
10
- const sendmessage_1 = __importDefault(require("sendmessage"));
11
- const debug = (0, node_util_1.debuglog)('egg:lib:core:messenger:ipc');
10
+ const sendmessage_1 = require("sendmessage");
11
+ const debug = (0, node_util_1.debuglog)('egg/lib/core/messenger/ipc');
12
12
  /**
13
13
  * Communication between app worker and agent worker by IPC channel
14
14
  */
15
15
  class Messenger extends node_events_1.EventEmitter {
16
16
  pid;
17
+ egg;
17
18
  opids = [];
18
- constructor() {
19
+ constructor(egg) {
19
20
  super();
20
21
  this.pid = String(process.pid);
22
+ this.egg = egg;
21
23
  // pids of agent or app managed by master
22
24
  // - retrieve app worker pids when it's an agent worker
23
25
  // - retrieve agent worker pids when it's an app worker
24
- this.on('egg-pids', pids => {
25
- this.opids = pids;
26
+ this.on('egg-pids', workerIds => {
27
+ debug('[%s:%s] got egg-pids %j', this.egg.type, this.pid, workerIds);
28
+ this.opids = workerIds.map((workerId) => String(workerId));
26
29
  });
27
30
  this.onMessage = this.onMessage.bind(this);
28
31
  process.on('message', this.onMessage);
@@ -37,24 +40,28 @@ class Messenger extends node_events_1.EventEmitter {
37
40
  * @return {Messenger} this
38
41
  */
39
42
  broadcast(action, data) {
40
- debug('[%s] broadcast %s with %j', this.pid, action, data);
43
+ debug('[%s:%s] broadcast %s with %j', this.egg.type, this.pid, action, data);
41
44
  this.send(action, data, 'app');
42
45
  this.send(action, data, 'agent');
43
46
  return this;
44
47
  }
45
48
  /**
46
49
  * send message to the specified process
47
- * @param {String} pid - the process id of the receiver
50
+ * @param {String} workerId - the workerId of the receiver
48
51
  * @param {String} action - message key
49
52
  * @param {Object} data - message value
50
53
  * @return {Messenger} this
51
54
  */
52
- sendTo(pid, action, data) {
53
- debug('[%s] send %s with %j to %s', this.pid, action, data, pid);
54
- (0, sendmessage_1.default)(process, {
55
+ sendTo(workerId, action, data) {
56
+ debug('[%s:%s] send %s with %j to workerId:%s', this.egg.type, this.pid, action, data, workerId);
57
+ (0, sendmessage_1.sendmessage)(process, {
55
58
  action,
56
59
  data,
57
- receiverPid: String(pid),
60
+ /**
61
+ * @deprecated Keep compatible, please use receiverWorkerId instead
62
+ */
63
+ receiverPid: String(workerId),
64
+ receiverWorkerId: String(workerId),
58
65
  });
59
66
  return this;
60
67
  }
@@ -67,12 +74,13 @@ class Messenger extends node_events_1.EventEmitter {
67
74
  * @return {Messenger} this
68
75
  */
69
76
  sendRandom(action, data) {
70
- /* istanbul ignore if */
71
- if (this.opids.length === 0)
77
+ if (this.opids.length === 0) {
78
+ debug('[%s:%s] no pids, ignore sendRandom %s with %j', this.egg.type, this.pid, action, data);
72
79
  return this;
80
+ }
73
81
  const index = Math.floor(Math.random() * this.opids.length);
74
- const pid = this.opids[index];
75
- this.sendTo(String(pid), action, data);
82
+ const workerId = this.opids[index];
83
+ this.sendTo(workerId, action, data);
76
84
  return this;
77
85
  }
78
86
  /**
@@ -82,7 +90,7 @@ class Messenger extends node_events_1.EventEmitter {
82
90
  * @return {Messenger} this
83
91
  */
84
92
  sendToApp(action, data) {
85
- debug('[%s] send %s with %j to all app', this.pid, action, data);
93
+ debug('[%s:%s] send %s with %j to all app', this.egg.type, this.pid, action, data);
86
94
  this.send(action, data, 'app');
87
95
  return this;
88
96
  }
@@ -93,7 +101,7 @@ class Messenger extends node_events_1.EventEmitter {
93
101
  * @return {Messenger} this
94
102
  */
95
103
  sendToAgent(action, data) {
96
- debug('[%s] send %s with %j to all agent', this.pid, action, data);
104
+ debug('[%s:%s] send %s with %j to all agent', this.egg.type, this.pid, action, data);
97
105
  this.send(action, data, 'agent');
98
106
  return this;
99
107
  }
@@ -104,7 +112,7 @@ class Messenger extends node_events_1.EventEmitter {
104
112
  * @return {Messenger} this
105
113
  */
106
114
  send(action, data, to) {
107
- (0, sendmessage_1.default)(process, {
115
+ (0, sendmessage_1.sendmessage)(process, {
108
116
  action,
109
117
  data,
110
118
  to,
@@ -113,9 +121,12 @@ class Messenger extends node_events_1.EventEmitter {
113
121
  }
114
122
  onMessage(message) {
115
123
  if (typeof message?.action === 'string') {
116
- debug('[%s] got message %s with %j, receiverPid: %s', this.pid, message.action, message.data, message.receiverPid);
124
+ debug('[%s:%s] got message %s with %j, receiverWorkerId: %s', this.egg.type, this.pid, message.action, message.data, message.receiverWorkerId ?? message.receiverPid);
117
125
  this.emit(message.action, message.data);
118
126
  }
127
+ else {
128
+ debug('[%s:%s] got an invalid message %j', this.egg.type, this.pid, message);
129
+ }
119
130
  }
120
131
  close() {
121
132
  process.removeListener('message', this.onMessage);
@@ -123,4 +134,4 @@ class Messenger extends node_events_1.EventEmitter {
123
134
  }
124
135
  }
125
136
  exports.Messenger = Messenger;
126
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXBjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL2xpYi9jb3JlL21lc3Nlbmdlci9pcGMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQ0EsNkNBQTJDO0FBQzNDLHlDQUFxQztBQUNyQyw4RUFBZ0Q7QUFDaEQsOERBQXNDO0FBR3RDLE1BQU0sS0FBSyxHQUFHLElBQUEsb0JBQVEsRUFBQyw0QkFBNEIsQ0FBQyxDQUFDO0FBRXJEOztHQUVHO0FBQ0gsTUFBYSxTQUFVLFNBQVEsMEJBQVk7SUFDaEMsR0FBRyxDQUFTO0lBQ3JCLEtBQUssR0FBYSxFQUFFLENBQUM7SUFFckI7UUFDRSxLQUFLLEVBQUUsQ0FBQztRQUNSLElBQUksQ0FBQyxHQUFHLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUMvQix5Q0FBeUM7UUFDekMsdURBQXVEO1FBQ3ZELHVEQUF1RDtRQUN2RCxJQUFJLENBQUMsRUFBRSxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsRUFBRTtZQUN6QixJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksQ0FBQztRQUNwQixDQUFDLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDM0MsT0FBTyxDQUFDLEVBQUUsQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3RDLElBQUksQ0FBQyw2QkFBYSxDQUFDLFlBQVksRUFBRSxDQUFDO1lBQ2hDLDZCQUFhLENBQUMsVUFBVyxDQUFDLEVBQUUsQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQzFELENBQUM7SUFDSCxDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSCxTQUFTLENBQUMsTUFBYyxFQUFFLElBQWM7UUFDdEMsS0FBSyxDQUFDLDJCQUEyQixFQUFFLElBQUksQ0FBQyxH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
137
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXBjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL2xpYi9jb3JlL21lc3Nlbmdlci9pcGMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsNkNBQTJDO0FBQzNDLHlDQUFxQztBQUNyQyw4RUFBZ0Q7QUFDaEQsNkNBQTBDO0FBSTFDLE1BQU0sS0FBSyxHQUFHLElBQUEsb0JBQVEsRUFBQyw0QkFBNEIsQ0FBQyxDQUFDO0FBRXJEOztHQUVHO0FBQ0gsTUFBYSxTQUFVLFNBQVEsMEJBQVk7SUFDaEMsR0FBRyxDQUFTO0lBQ1osR0FBRyxDQUFxQjtJQUNqQyxLQUFLLEdBQWEsRUFBRSxDQUFDO0lBRXJCLFlBQVksR0FBdUI7UUFDakMsS0FBSyxFQUFFLENBQUM7UUFDUixJQUFJLENBQUMsR0FBRyxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDL0IsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDZix5Q0FBeUM7UUFDekMsdURBQXVEO1FBQ3ZELHVEQUF1RDtRQUN2RCxJQUFJLENBQUMsRUFBRSxDQUFDLFVBQVUsRUFBRSxTQUFTLENBQUMsRUFBRTtZQUM5QixLQUFLLENBQUMseUJBQXlCLEVBQUUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLEdBQUcsRUFBRSxTQUFTLENBQUMsQ0FBQztZQUNyRSxJQUFJLENBQUMsS0FBSyxHQUFHLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxRQUFnQixFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUNyRSxDQUFDLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDM0MsT0FBTyxDQUFDLEVBQUUsQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxD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
@@ -19,12 +19,12 @@ export declare class Messenger extends EventEmitter implements IMessenger {
19
19
  * send message to the specified process
20
20
  * Notice: in single process mode, it only can send to self process,
21
21
  * and it will send to both agent and app's messengers.
22
- * @param {String} pid - the process id of the receiver
22
+ * @param {String} workerId - the workerId of the receiver
23
23
  * @param {String} action - message key
24
24
  * @param {Object} data - message value
25
25
  * @return {Messenger} this
26
26
  */
27
- sendTo(pid: string, action: string, data?: unknown): Messenger;
27
+ sendTo(workerId: string, action: string, data?: unknown): Messenger;
28
28
  /**
29
29
  * send message to one worker by random
30
30
  * Notice: in single process mode, we only start one agent worker and one app worker
@@ -55,7 +55,7 @@ export declare class Messenger extends EventEmitter implements IMessenger {
55
55
  * @param {String} to - let master know how to send message
56
56
  * @return {Messenger} this
57
57
  */
58
- send(action: string, data: unknown | undefined, to: string): Messenger;
58
+ send(action: string, data: unknown | undefined, to?: string): Messenger;
59
59
  onMessage(message: any): void;
60
60
  close(): void;
61
61
  }
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.Messenger = void 0;
7
7
  const node_util_1 = require("node:util");
8
8
  const node_events_1 = __importDefault(require("node:events"));
9
- const debug = (0, node_util_1.debuglog)('egg:lib:core:messenger:local');
9
+ const debug = (0, node_util_1.debuglog)('egg/lib/core/messenger/local');
10
10
  /**
11
11
  * Communication between app worker and agent worker with EventEmitter
12
12
  */
@@ -25,7 +25,7 @@ class Messenger extends node_events_1.default {
25
25
  * @return {Messenger} this
26
26
  */
27
27
  broadcast(action, data) {
28
- debug('[%s] broadcast %s with %j', this.pid, action, data);
28
+ debug('[%s:%s] broadcast %s with %j', this.egg.type, this.pid, action, data);
29
29
  this.send(action, data, 'both');
30
30
  return this;
31
31
  }
@@ -33,14 +33,14 @@ class Messenger extends node_events_1.default {
33
33
  * send message to the specified process
34
34
  * Notice: in single process mode, it only can send to self process,
35
35
  * and it will send to both agent and app's messengers.
36
- * @param {String} pid - the process id of the receiver
36
+ * @param {String} workerId - the workerId of the receiver
37
37
  * @param {String} action - message key
38
38
  * @param {Object} data - message value
39
39
  * @return {Messenger} this
40
40
  */
41
- sendTo(pid, action, data) {
42
- debug('[%s] send %s with %j to %s', this.pid, action, data, pid);
43
- if (String(pid) !== this.pid) {
41
+ sendTo(workerId, action, data) {
42
+ debug('[%s:%s] send %s with %j to %s', this.egg.type, this.pid, action, data, workerId);
43
+ if (String(workerId) !== this.pid) {
44
44
  return this;
45
45
  }
46
46
  this.send(action, data, 'both');
@@ -56,7 +56,7 @@ class Messenger extends node_events_1.default {
56
56
  * @return {Messenger} this
57
57
  */
58
58
  sendRandom(action, data) {
59
- debug('[%s] send %s with %j to opposite', this.pid, action, data);
59
+ debug('[%s:%s] send %s with %j to opposite', this.egg.type, this.pid, action, data);
60
60
  this.send(action, data, 'opposite');
61
61
  return this;
62
62
  }
@@ -67,7 +67,7 @@ class Messenger extends node_events_1.default {
67
67
  * @return {Messenger} this
68
68
  */
69
69
  sendToApp(action, data) {
70
- debug('[%s] send %s with %j to all app', this.pid, action, data);
70
+ debug('[%s:%s] send %s with %j to all app', this.egg.type, this.pid, action, data);
71
71
  this.send(action, data, 'application');
72
72
  return this;
73
73
  }
@@ -78,7 +78,7 @@ class Messenger extends node_events_1.default {
78
78
  * @return {Messenger} this
79
79
  */
80
80
  sendToAgent(action, data) {
81
- debug('[%s] send %s with %j to all agent', this.pid, action, data);
81
+ debug('[%s:%s] send %s with %j to all agent', this.egg.type, this.pid, action, data);
82
82
  this.send(action, data, 'agent');
83
83
  return this;
84
84
  }
@@ -122,13 +122,16 @@ class Messenger extends node_events_1.default {
122
122
  }
123
123
  onMessage(message) {
124
124
  if (typeof message?.action === 'string') {
125
- debug('[%s] got message %s with %j', this.pid, message.action, message.data);
125
+ debug('[%s:%s] got message %s with %j', this.egg.type, this.pid, message.action, message.data);
126
126
  this.emit(message.action, message.data);
127
127
  }
128
+ else {
129
+ debug('[%s:%s] got an invalid message %j', this.egg.type, this.pid, message);
130
+ }
128
131
  }
129
132
  close() {
130
133
  this.removeAllListeners();
131
134
  }
132
135
  }
133
136
  exports.Messenger = Messenger;
134
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbGliL2NvcmUvbWVzc2VuZ2VyL2xvY2FsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLHlDQUFxQztBQUNyQyw4REFBdUM7QUFJdkMsTUFBTSxLQUFLLEdBQUcsSUFBQSxvQkFBUSxFQUFDLDhCQUE4QixDQUFDLENBQUM7QUFFdkQ7O0dBRUc7QUFDSCxNQUFhLFNBQVUsU0FBUSxxQkFBWTtJQUNoQyxHQUFHLENBQVM7SUFDWixHQUFHLENBQXFCO0lBRWpDLFlBQVksR0FBdUI7UUFDakMsS0FBSyxFQUFFLENBQUM7UUFDUixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztRQUNmLElBQUksQ0FBQyxHQUFHLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSCxTQUFTLENBQUMsTUFBYyxFQUFFLElBQWM7UUFDdEMsS0FBSyxDQUFDLDJCQUEyQixFQUFFLElBQUksQ0FBQyxHQUFHLEVBQUUsTUFBTSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzNELElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUNoQyxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRDs7Ozs7Ozs7T0FRRztJQUNILE1BQU0sQ0FBQyxHQUFXLEVBQUUsTUFBYyxFQUFFLElBQWM7UUFDaEQsS0FBSyxDQUFDLDRCQUE0QixFQUFFLElBQUksQ0FBQyxHQUFHLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQztRQUNqRSxJQUFJLE1BQU0sQ0FBQyxHQUFHLENBQUMsS0FBSyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7WUFDN0IsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDO1FBQ0QsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFN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
137
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbGliL2NvcmUvbWVzc2VuZ2VyL2xvY2FsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLHlDQUFxQztBQUNyQyw4REFBdUM7QUFJdkMsTUFBTSxLQUFLLEdBQUcsSUFBQSxvQkFBUSxFQUFDLDhCQUE4QixDQUFDLENBQUM7QUFFdkQ7O0dBRUc7QUFDSCxNQUFhLFNBQVUsU0FBUSxxQkFBWTtJQUNoQyxHQUFHLENBQVM7SUFDWixHQUFHLENBQXFCO0lBRWpDLFlBQVksR0FBdUI7UUFDakMsS0FBSyxFQUFFLENBQUM7UUFDUixJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztRQUNmLElBQUksQ0FBQyxHQUFHLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSCxTQUFTLENBQUMsTUFBYyxFQUFFLElBQWM7UUFDdEMsS0FBSyxDQUFDLDhCQUE4QixFQUFFLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxHQUFHLEVBQUUsTUFBTSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzdFLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUNoQyxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRDs7Ozs7Ozs7T0FRRztJQUNILE1BQU0sQ0FBQyxRQUFnQixFQUFFLE1BQWMsRUFBRSxJQUFjO1FBQ3JELEtBQUssQ0FBQywrQkFBK0IsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsR0FBRyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDeEYsSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLEtBQUssSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFD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