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.
Files changed (86) hide show
  1. package/dist/agent.d.ts +3 -7
  2. package/dist/agent.js +6 -10
  3. package/dist/app/extend/context.d.ts +166 -193
  4. package/dist/app/extend/context.js +259 -244
  5. package/dist/app/extend/helper.d.ts +31 -36
  6. package/dist/app/extend/helper.js +41 -45
  7. package/dist/app/extend/request.d.ts +127 -140
  8. package/dist/app/extend/request.js +258 -219
  9. package/dist/app/extend/response.d.ts +22 -32
  10. package/dist/app/extend/response.js +34 -36
  11. package/dist/app/middleware/body_parser.d.ts +2 -2
  12. package/dist/app/middleware/body_parser.js +3 -7
  13. package/dist/app/middleware/meta.d.ts +8 -9
  14. package/dist/app/middleware/meta.js +19 -13
  15. package/dist/app/middleware/notfound.d.ts +5 -9
  16. package/dist/app/middleware/notfound.js +28 -25
  17. package/dist/app/middleware/override_method.d.ts +2 -2
  18. package/dist/app/middleware/override_method.js +3 -7
  19. package/dist/app/middleware/site_file.d.ts +7 -11
  20. package/dist/app/middleware/site_file.js +52 -37
  21. package/dist/config/config.default.d.ts +2 -8
  22. package/dist/config/config.default.js +376 -256
  23. package/dist/config/config.local.d.ts +5 -7
  24. package/dist/config/config.local.js +9 -6
  25. package/dist/config/config.unittest.d.ts +5 -7
  26. package/dist/config/config.unittest.js +8 -9
  27. package/dist/config/favicon.png +0 -0
  28. package/dist/config/plugin.d.ts +120 -122
  29. package/dist/config/plugin.js +121 -53
  30. package/dist/index.d.ts +66 -19
  31. package/dist/index.js +68 -19
  32. package/dist/lib/agent.d.ts +13 -16
  33. package/dist/lib/agent.js +46 -54
  34. package/dist/lib/application.d.ts +46 -61
  35. package/dist/lib/application.js +249 -197
  36. package/dist/lib/core/base_context_class.d.ts +12 -17
  37. package/dist/lib/core/base_context_class.js +15 -17
  38. package/dist/lib/core/base_context_logger.d.ts +35 -39
  39. package/dist/lib/core/base_context_logger.js +60 -58
  40. package/dist/lib/core/base_hook_class.d.ts +10 -17
  41. package/dist/lib/core/base_hook_class.js +22 -26
  42. package/dist/lib/core/context_httpclient.d.ts +16 -20
  43. package/dist/lib/core/context_httpclient.js +26 -29
  44. package/dist/lib/core/httpclient.d.ts +12 -15
  45. package/dist/lib/core/httpclient.js +37 -34
  46. package/dist/lib/core/logger.d.ts +3 -7
  47. package/dist/lib/core/logger.js +36 -30
  48. package/dist/lib/core/messenger/IMessenger.d.ts +49 -53
  49. package/dist/lib/core/messenger/IMessenger.js +2 -1
  50. package/dist/lib/core/messenger/base.d.ts +7 -11
  51. package/dist/lib/core/messenger/base.js +28 -29
  52. package/dist/lib/core/messenger/index.d.ts +4 -8
  53. package/dist/lib/core/messenger/index.js +8 -11
  54. package/dist/lib/core/messenger/ipc.d.ts +55 -59
  55. package/dist/lib/core/messenger/ipc.js +149 -120
  56. package/dist/lib/core/messenger/local.d.ts +56 -61
  57. package/dist/lib/core/messenger/local.js +126 -124
  58. package/dist/lib/core/utils.d.ts +2 -5
  59. package/dist/lib/core/utils.js +66 -44
  60. package/dist/lib/egg.d.ts +271 -292
  61. package/dist/lib/egg.js +576 -506
  62. package/dist/lib/error/CookieLimitExceedError.d.ts +4 -7
  63. package/dist/lib/error/CookieLimitExceedError.js +12 -15
  64. package/dist/lib/error/MessageUnhandledRejectionError.d.ts +4 -7
  65. package/dist/lib/error/MessageUnhandledRejectionError.js +12 -15
  66. package/dist/lib/error/index.d.ts +2 -3
  67. package/dist/lib/error/index.js +3 -4
  68. package/dist/lib/loader/AgentWorkerLoader.d.ts +7 -12
  69. package/dist/lib/loader/AgentWorkerLoader.js +18 -22
  70. package/dist/lib/loader/AppWorkerLoader.d.ts +12 -17
  71. package/dist/lib/loader/AppWorkerLoader.js +37 -35
  72. package/dist/lib/loader/EggApplicationLoader.d.ts +3 -7
  73. package/dist/lib/loader/EggApplicationLoader.js +4 -7
  74. package/dist/lib/loader/index.d.ts +3 -4
  75. package/dist/lib/loader/index.js +4 -5
  76. package/dist/lib/start.d.ts +18 -22
  77. package/dist/lib/start.js +42 -32
  78. package/dist/lib/types.d.ts +252 -230
  79. package/dist/lib/types.js +31 -14
  80. package/dist/lib/types.plugin.d.ts +12 -0
  81. package/dist/lib/types.plugin.js +14 -0
  82. package/dist/lib/utils.d.ts +2 -5
  83. package/dist/lib/utils.js +12 -12
  84. package/dist/urllib.d.ts +1 -2
  85. package/dist/urllib.js +2 -3
  86. package/package.json +31 -31
@@ -1,126 +1,128 @@
1
+ import { debuglog } from 'node:util';
1
2
  import { BaseMessenger } from "./base.js";
2
- import { debuglog } from "node:util";
3
-
4
- //#region src/lib/core/messenger/local.ts
5
- const debug = debuglog("egg/lib/core/messenger/local");
3
+ const debug = debuglog('egg/lib/core/messenger/local');
6
4
  /**
7
- * Communication between app worker and agent worker with EventEmitter
8
- */
9
- var Messenger = class extends BaseMessenger {
10
- pid;
11
- constructor(egg) {
12
- super(egg);
13
- this.pid = String(process.pid);
14
- }
15
- /**
16
- * Send message to all agent and app
17
- * @param {String} action - message key
18
- * @param {Object} data - message value
19
- * @return {Messenger} this
20
- */
21
- broadcast(action, data) {
22
- debug("[%s:%s] broadcast %s with %j", this.egg.type, this.pid, action, data);
23
- this.send(action, data, "both");
24
- return this;
25
- }
26
- /**
27
- * send message to the specified process
28
- * Notice: in single process mode, it only can send to self process,
29
- * and it will send to both agent and app's messengers.
30
- * @param {String} workerId - the workerId of the receiver
31
- * @param {String} action - message key
32
- * @param {Object} data - message value
33
- * @return {Messenger} this
34
- */
35
- sendTo(workerId, action, data) {
36
- debug("[%s:%s] send %s with %j to %s", this.egg.type, this.pid, action, data, workerId);
37
- if (String(workerId) !== this.pid) return this;
38
- this.send(action, data, "both");
39
- return this;
40
- }
41
- /**
42
- * send message to one worker by random
43
- * Notice: in single process mode, we only start one agent worker and one app worker
44
- * - if it's running in agent, it will send to one of app workers
45
- * - if it's running in app, it will send to agent
46
- * @param {String} action - message key
47
- * @param {Object} data - message value
48
- * @return {Messenger} this
49
- */
50
- sendRandom(action, data) {
51
- debug("[%s:%s] send %s with %j to opposite", this.egg.type, this.pid, action, data);
52
- this.send(action, data, "opposite");
53
- return this;
54
- }
55
- /**
56
- * send message to app
57
- * @param {String} action - message key
58
- * @param {Object} data - message value
59
- * @return {Messenger} this
60
- */
61
- sendToApp(action, data) {
62
- debug("[%s:%s] send %s with %j to all app", this.egg.type, this.pid, action, data);
63
- this.send(action, data, "application");
64
- return this;
65
- }
66
- /**
67
- * send message to agent
68
- * @param {String} action - message key
69
- * @param {Object} data - message value
70
- * @return {Messenger} this
71
- */
72
- sendToAgent(action, data) {
73
- debug("[%s:%s] send %s with %j to all agent", this.egg.type, this.pid, action, data);
74
- this.send(action, data, "agent");
75
- return this;
76
- }
77
- /**
78
- * @param {String} action - message key
79
- * @param {Object} data - message value
80
- * @param {String} to - let master know how to send message
81
- * @return {Messenger} this
82
- */
83
- send(action, data, to) {
84
- process.nextTick(() => {
85
- const { egg } = this;
86
- let application;
87
- let agent;
88
- let opposite;
89
- if (egg.type === "application") {
90
- application = egg;
91
- agent = egg.agent;
92
- opposite = agent;
93
- } else {
94
- agent = egg;
95
- application = egg.application;
96
- opposite = application;
97
- }
98
- if (!to) to = egg.type === "application" ? "agent" : "application";
99
- if (application && application.messenger && (to === "application" || to === "both")) application.messenger.onMessage({
100
- action,
101
- data
102
- });
103
- if (agent && agent.messenger && (to === "agent" || to === "both")) agent.messenger.onMessage({
104
- action,
105
- data
106
- });
107
- if (opposite && opposite.messenger && to === "opposite") opposite.messenger.onMessage({
108
- action,
109
- data
110
- });
111
- });
112
- return this;
113
- }
114
- onMessage(message) {
115
- if (typeof message?.action === "string") {
116
- debug("[%s:%s] got message %s with %j", this.egg.type, this.pid, message.action, message.data);
117
- this.emit(message.action, message.data);
118
- } else debug("[%s:%s] got an invalid message %j", this.egg.type, this.pid, message);
119
- }
120
- close() {
121
- this.removeAllListeners();
122
- }
123
- };
124
-
125
- //#endregion
126
- export { Messenger };
5
+ * Communication between app worker and agent worker with EventEmitter
6
+ */
7
+ export class Messenger extends BaseMessenger {
8
+ pid;
9
+ constructor(egg) {
10
+ super(egg);
11
+ this.pid = String(process.pid);
12
+ }
13
+ /**
14
+ * Send message to all agent and app
15
+ * @param {String} action - message key
16
+ * @param {Object} data - message value
17
+ * @return {Messenger} this
18
+ */
19
+ broadcast(action, data) {
20
+ debug('[%s:%s] broadcast %s with %j', this.egg.type, this.pid, action, data);
21
+ this.send(action, data, 'both');
22
+ return this;
23
+ }
24
+ /**
25
+ * send message to the specified process
26
+ * Notice: in single process mode, it only can send to self process,
27
+ * and it will send to both agent and app's messengers.
28
+ * @param {String} workerId - the workerId of the receiver
29
+ * @param {String} action - message key
30
+ * @param {Object} data - message value
31
+ * @return {Messenger} this
32
+ */
33
+ sendTo(workerId, action, data) {
34
+ debug('[%s:%s] send %s with %j to %s', this.egg.type, this.pid, action, data, workerId);
35
+ if (String(workerId) !== this.pid) {
36
+ return this;
37
+ }
38
+ this.send(action, data, 'both');
39
+ return this;
40
+ }
41
+ /**
42
+ * send message to one worker by random
43
+ * Notice: in single process mode, we only start one agent worker and one app worker
44
+ * - if it's running in agent, it will send to one of app workers
45
+ * - if it's running in app, it will send to agent
46
+ * @param {String} action - message key
47
+ * @param {Object} data - message value
48
+ * @return {Messenger} this
49
+ */
50
+ sendRandom(action, data) {
51
+ debug('[%s:%s] send %s with %j to opposite', this.egg.type, this.pid, action, data);
52
+ this.send(action, data, 'opposite');
53
+ return this;
54
+ }
55
+ /**
56
+ * send message to app
57
+ * @param {String} action - message key
58
+ * @param {Object} data - message value
59
+ * @return {Messenger} this
60
+ */
61
+ sendToApp(action, data) {
62
+ debug('[%s:%s] send %s with %j to all app', this.egg.type, this.pid, action, data);
63
+ this.send(action, data, 'application');
64
+ return this;
65
+ }
66
+ /**
67
+ * send message to agent
68
+ * @param {String} action - message key
69
+ * @param {Object} data - message value
70
+ * @return {Messenger} this
71
+ */
72
+ sendToAgent(action, data) {
73
+ debug('[%s:%s] send %s with %j to all agent', this.egg.type, this.pid, action, data);
74
+ this.send(action, data, 'agent');
75
+ return this;
76
+ }
77
+ /**
78
+ * @param {String} action - message key
79
+ * @param {Object} data - message value
80
+ * @param {String} to - let master know how to send message
81
+ * @return {Messenger} this
82
+ */
83
+ send(action, data, to) {
84
+ // use nextTick to keep it async as IPC messenger
85
+ process.nextTick(() => {
86
+ const { egg } = this;
87
+ let application;
88
+ let agent;
89
+ let opposite;
90
+ if (egg.type === 'application') {
91
+ application = egg;
92
+ agent = egg.agent;
93
+ opposite = agent;
94
+ }
95
+ else {
96
+ agent = egg;
97
+ application = egg.application;
98
+ opposite = application;
99
+ }
100
+ if (!to) {
101
+ to = egg.type === 'application' ? 'agent' : 'application';
102
+ }
103
+ if (application && application.messenger && (to === 'application' || to === 'both')) {
104
+ application.messenger.onMessage({ action, data });
105
+ }
106
+ if (agent && agent.messenger && (to === 'agent' || to === 'both')) {
107
+ agent.messenger.onMessage({ action, data });
108
+ }
109
+ if (opposite && opposite.messenger && to === 'opposite') {
110
+ opposite.messenger.onMessage({ action, data });
111
+ }
112
+ });
113
+ return this;
114
+ }
115
+ onMessage(message) {
116
+ if (typeof message?.action === 'string') {
117
+ debug('[%s:%s] got message %s with %j', this.egg.type, this.pid, message.action, message.data);
118
+ this.emit(message.action, message.data);
119
+ }
120
+ else {
121
+ debug('[%s:%s] got an invalid message %j', this.egg.type, this.pid, message);
122
+ }
123
+ }
124
+ close() {
125
+ this.removeAllListeners();
126
+ }
127
+ }
128
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbGliL2NvcmUvbWVzc2VuZ2VyL2xvY2FsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFJckMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUUxQyxNQUFNLEtBQUssR0FBRyxRQUFRLENBQUMsOEJBQThCLENBQUMsQ0FBQztBQUV2RDs7R0FFRztBQUNILE1BQU0sT0FBTyxTQUFVLFNBQVEsYUFBYTtJQUNqQyxHQUFHLENBQVM7SUFFckIsWUFBWSxHQUF1QjtRQUNqQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDWCxJQUFJLENBQUMsR0FBRyxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDakMsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0gsU0FBUyxDQUFDLE1BQWMsRUFBRSxJQUFjO1FBQ3RDLEtBQUssQ0FBQyw4QkFBOEIsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsR0FBRyxFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztRQUM3RSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDaEMsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSCxNQUFNLENBQUMsUUFBZ0IsRUFBRSxNQUFjLEVBQUUsSUFBYztRQUNyRCxLQUFLLENBQUMsK0JBQStCLEVBQUUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLEdBQUcsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQ3hGLElBQUksTUFBTSxDQUFDLFFBQVEsQ0FBQyxLQUFLLElBQUksQ0FBQyxHQUFHLEVBQUUs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
@@ -1,5 +1,2 @@
1
- //#region src/lib/core/utils.d.ts
2
- declare function convertObject(obj: any, ignore?: string | RegExp | (string | RegExp)[]): any;
3
- declare function safeParseURL(url: string): URL | null;
4
- //#endregion
5
- export { convertObject, safeParseURL };
1
+ export declare function convertObject(obj: any, ignore?: string | RegExp | (string | RegExp)[]): any;
2
+ export declare function safeParseURL(url: string): URL | null;
@@ -1,48 +1,70 @@
1
- import util from "node:util";
2
- import { isAsyncFunction, isClass, isFunction, isGeneratorFunction, isPrimitive, isRegExp, isSymbol } from "is-type-of";
3
-
4
- //#region src/lib/core/utils.ts
5
- function convertObject(obj, ignore = []) {
6
- if (!Array.isArray(ignore)) ignore = [ignore];
7
- for (const key of Object.keys(obj)) obj[key] = convertValue(key, obj[key], ignore);
8
- return obj;
1
+ import util from 'node:util';
2
+ import { isSymbol, isRegExp, isPrimitive, isClass, isFunction, isGeneratorFunction, isAsyncFunction } from 'is-type-of';
3
+ export function convertObject(obj, ignore = []) {
4
+ if (!Array.isArray(ignore)) {
5
+ ignore = [ignore];
6
+ }
7
+ for (const key of Object.keys(obj)) {
8
+ obj[key] = convertValue(key, obj[key], ignore);
9
+ }
10
+ return obj;
9
11
  }
10
12
  function convertValue(key, value, ignore) {
11
- if (value === null || value === void 0) return value;
12
- let hit = false;
13
- for (const matchKey of ignore) if (typeof matchKey === "string" && matchKey === key) {
14
- hit = true;
15
- break;
16
- } else if (isRegExp(matchKey) && matchKey.test(key)) {
17
- hit = true;
18
- break;
19
- }
20
- if (!hit) {
21
- if (isSymbol(value) || isRegExp(value) || value instanceof URL) return value.toString();
22
- if (isPrimitive(value) || Array.isArray(value)) return value;
23
- }
24
- if (Object.getPrototypeOf(value) === Object.prototype) return convertObject(value, ignore);
25
- const name = value.name || "anonymous";
26
- if (isClass(value)) return `<Class ${name}>`;
27
- if (isFunction(value)) {
28
- if (isGeneratorFunction(value)) return `<GeneratorFunction ${name}>`;
29
- if (isAsyncFunction(value)) return `<AsyncFunction ${name}>`;
30
- return `<Function ${name}>`;
31
- }
32
- const typeName = value.constructor.name;
33
- if (typeName) {
34
- if (Buffer.isBuffer(value) || typeof value === "string") return `<${typeName} len: ${value.length}>`;
35
- return `<${typeName}>`;
36
- }
37
- return util.format(value);
13
+ if (value === null || value === undefined) {
14
+ return value;
15
+ }
16
+ let hit = false;
17
+ for (const matchKey of ignore) {
18
+ if (typeof matchKey === 'string' && matchKey === key) {
19
+ hit = true;
20
+ break;
21
+ }
22
+ else if (isRegExp(matchKey) && matchKey.test(key)) {
23
+ hit = true;
24
+ break;
25
+ }
26
+ }
27
+ if (!hit) {
28
+ if (isSymbol(value) || isRegExp(value) || value instanceof URL) {
29
+ return value.toString();
30
+ }
31
+ if (isPrimitive(value) || Array.isArray(value)) {
32
+ return value;
33
+ }
34
+ }
35
+ // only convert recursively when it's a plain object,
36
+ // o = {}
37
+ if (Object.getPrototypeOf(value) === Object.prototype) {
38
+ return convertObject(value, ignore);
39
+ }
40
+ // support class
41
+ const name = value.name || 'anonymous';
42
+ if (isClass(value)) {
43
+ return `<Class ${name}>`;
44
+ }
45
+ // support generator function
46
+ if (isFunction(value)) {
47
+ if (isGeneratorFunction(value))
48
+ return `<GeneratorFunction ${name}>`;
49
+ if (isAsyncFunction(value))
50
+ return `<AsyncFunction ${name}>`;
51
+ return `<Function ${name}>`;
52
+ }
53
+ const typeName = value.constructor.name;
54
+ if (typeName) {
55
+ if (Buffer.isBuffer(value) || typeof value === 'string') {
56
+ return `<${typeName} len: ${value.length}>`;
57
+ }
58
+ return `<${typeName}>`;
59
+ }
60
+ return util.format(value);
38
61
  }
39
- function safeParseURL(url) {
40
- try {
41
- return new URL(url);
42
- } catch {
43
- return null;
44
- }
62
+ export function safeParseURL(url) {
63
+ try {
64
+ return new URL(url);
65
+ }
66
+ catch {
67
+ return null;
68
+ }
45
69
  }
46
-
47
- //#endregion
48
- export { convertObject, safeParseURL };
70
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL2NvcmUvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxJQUFJLE1BQU0sV0FBVyxDQUFDO0FBQzdCLE9BQU8sRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLFdBQVcsRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLG1CQUFtQixFQUFFLGVBQWUsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUV4SCxNQUFNLFVBQVUsYUFBYSxDQUFDLEdBQVEsRUFBRSxTQUFnRCxFQUFFO0lBQ3hGLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7UUFDM0IsTUFBTSxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDcEIsQ0FBQztJQUNELEtBQUssTUFBTSxHQUFHLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ25DLEdBQUcsQ0FBQyxHQUFHLENBQUMsR0FBRyxZQUFZLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxHQUFHLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBQ0QsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDO0FBRUQsU0FBUyxZQUFZLENBQUMsR0FBVyxFQUFFLEtBQVUsRUFBRSxNQUEyQjtJQUN4RSxJQUFJLEtBQUssS0FBSyxJQUFJLElBQUksS0FBSyxLQUFLLFNBQVMsRUFBRSxDQUFDO1FBQzFDLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVELElBQUksR0FBRyxHQUFHLEtBQUssQ0FBQztJQUNoQixLQUFLLE1BQU0sUUFBUSxJQUFJLE1BQU0sRUFBRSxDQUFDO1FBQzlCLElBQUksT0FBTyxRQUFRLEtBQUssUUFBUSxJQUFJLFFBQVEsS0FBSyxHQUFHLEVBQUUsQ0FBQztZQUNyRCxHQUFHLEdBQUcsSUFBSSxDQUFDO1lBQ1gsTUFBTTtRQUNSLENBQUM7YUFBTSxJQUFJLFFBQVEsQ0FBQyxRQUFRLENBQUMsSUFBSSxRQUFRLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDcEQsR0FBRyxHQUFHLElBQUksQ0FBQztZQUNYLE1BQU07UUFDUixDQUFDO0lBQ0gsQ0FBQztJQUNELElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUNULElBQUksUUFBUSxDQUFDLEtBQUssQ0FBQyxJQUFJLFFBQVEsQ0FBQyxLQUFLLENBQUMsSUFBSSxLQUFLLFlBQVksR0FBRyxFQUFFLENBQUM7WUFDL0QsT0FBTyxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDMUIsQ0FBQztRQUNELElBQUksV0FBVyxDQUFDLEtBQUssQ0FBQyxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUMvQyxPQUFPLEtBQUssQ0FBQztRQUNmLENBQUM7SUFDSCxDQUFDO0lBRUQscURBQXFEO0lBQ3JELFNBQVM7SUFDVCxJQUFJLE1BQU0sQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLEtBQUssTUFBTSxDQUFDLFNBQVMsRUFBRSxDQUFDO1FBQ3RELE9BQU8sYUFBYSxDQUFDLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQztJQUN0QyxDQUFDO0lBRUQsZ0JBQWdCO0lBQ2hCLE1BQU0sSUFBSSxHQUFHLEtBQUssQ0FBQyxJQUFJLElBQUksV0FBVyxDQUFDO0lBQ3ZDLElBQUksT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7UUFDbkIsT0FBTyxVQUFVLElBQUksR0FBRyxDQUFDO0lBQzNCLENBQUM7SUFFRCw2QkFBNkI7SUFDN0IsSUFBSSxVQUFVLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUN0QixJQUFJLG1CQUFtQixDQUFDLEtBQUssQ0FBQztZQUFFLE9BQU8sc0JBQXNCLElBQUksR0FBRyxDQUFDO1FBQ3JFLElBQUksZUFBZSxDQUFDLEtBQUssQ0FBQztZQUFFLE9BQU8sa0JBQWtCLElBQUksR0FBRyxDQUFDO1FBQzdELE9BQU8sYUFBYSxJQUFJLEdBQUcsQ0FBQztJQUM5QixDQUFDO0lBRUQsTUFBTSxRQUFRLEdBQUcsS0FBSyxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUM7SUFDeEMsSUFBSSxRQUFRLEVBQUUsQ0FBQztRQUNiLElBQUksTUFBTSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRLEVBQUUsQ0FBQztZQUN4RCxPQUFPLElBQUksUUFBUSxTQUFTLEtBQUssQ0FBQyxNQUFNLEdBQUcsQ0FBQztRQUM5QyxDQUFDO1FBQ0QsT0FBTyxJQUFJLFFBQVEsR0FBRyxDQUFDO0lBQ3pCLENBQUM7SUFFRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDNUIsQ0FBQztBQUVELE1BQU0sVUFBVSxZQUFZLENBQUMsR0FBVztJQUN0QyxJQUFJLENBQUM7UUFDSCxPQUFPLElBQUksR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3RCLENBQUM7SUFBQyxNQUFNLENBQUM7UUFDUCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7QUFDSCxDQUFDIn0=