@social-mail/social-mail-web-server 1.9.48 → 1.9.49
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/WebCluster.d.ts.map +1 -1
- package/dist/WebCluster.js +0 -2
- package/dist/WebCluster.js.map +1 -1
- package/dist/server/workflows/smtp/DispatchEmailToMX.d.ts.map +1 -1
- package/dist/server/workflows/smtp/DispatchEmailToMX.js +9 -7
- package/dist/server/workflows/smtp/DispatchEmailToMX.js.map +1 -1
- package/dist/server/workflows/smtp/DispatchNotificationToMX.d.ts.map +1 -1
- package/dist/server/workflows/smtp/DispatchNotificationToMX.js +6 -8
- package/dist/server/workflows/smtp/DispatchNotificationToMX.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/src/WebCluster.ts +0 -3
- package/src/server/workflows/smtp/DispatchEmailToMX.ts +9 -7
- package/src/server/workflows/smtp/DispatchNotificationToMX.ts +6 -8
- package/dist/Tracer.d.ts +0 -30
- package/dist/Tracer.d.ts.map +0 -1
- package/dist/Tracer.js +0 -79
- package/dist/Tracer.js.map +0 -1
- package/src/Tracer.ts +0 -105
package/dist/WebCluster.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebCluster.d.ts","sourceRoot":"","sources":["../src/WebCluster.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,eAAmC,MAAM,qDAAqD,CAAC;
|
|
1
|
+
{"version":3,"file":"WebCluster.d.ts","sourceRoot":"","sources":["../src/WebCluster.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,eAAmC,MAAM,qDAAqD,CAAC;AAKtG,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,eAAe,CAAC,OAAO,SAAS,CAAC;WAEvD,KAAK,CAAC,GAAG,GAAE,OAAO,SAAqB;cAKrC,UAAU,CAAC,GAAG,EAAE,OAAO,SAAS;cAwBhC,SAAS,CAAC,GAAG,EAAE,OAAO,SAAS;CAMlD"}
|
package/dist/WebCluster.js
CHANGED
|
@@ -3,7 +3,6 @@ import sleep from './common/sleep.js';
|
|
|
3
3
|
import WebServer from './WebServer.js';
|
|
4
4
|
import ClusterInstance from "@entity-access/server-pages/dist/ClusterInstance.js";
|
|
5
5
|
import { globalEnv } from './common/globalEnv.js';
|
|
6
|
-
import Tracer from './Tracer.js';
|
|
7
6
|
const numCPUs = globalEnv.numCPUs;
|
|
8
7
|
export default class WebCluster extends ClusterInstance {
|
|
9
8
|
static start(arg = WebServer) {
|
|
@@ -11,7 +10,6 @@ export default class WebCluster extends ClusterInstance {
|
|
|
11
10
|
c.run(arg);
|
|
12
11
|
}
|
|
13
12
|
async runPrimary(arg) {
|
|
14
|
-
Tracer.instance.bindConsole();
|
|
15
13
|
// seed...
|
|
16
14
|
const ws = new arg();
|
|
17
15
|
await ws.create(true, false);
|
package/dist/WebCluster.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebCluster.js","sourceRoot":"","sources":["../src/WebCluster.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,eAAmC,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"WebCluster.js","sourceRoot":"","sources":["../src/WebCluster.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,eAAmC,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;AAElC,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,eAAiC;IAE9D,MAAM,CAAC,KAAK,CAAC,MAAwB,SAAS;QACjD,MAAM,CAAC,GAAG,IAAI,UAAU,EAAE,CAAC;QAC3B,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;IAES,KAAK,CAAC,UAAU,CAAC,GAAqB;QAE5C,UAAU;QACV,MAAM,EAAE,GAAG,IAAI,GAAG,EAAE,CAAC;QACrB,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAE7B,OAAM,IAAI,EAAE,CAAC;YACT,MAAM,OAAO,GAAG,EAAsB,CAAC;YACvC,OAAO,CAAC,GAAG,CAAC,oBAAoB,OAAO,UAAU,CAAC,CAAC;YACnD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC;gBAC3C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YAC5C,CAAC;YAED,oBAAoB;YACpB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC;gBACtC,MAAM,KAAK,CAAC,EAAE,GAAC,EAAE,GAAC,EAAE,GAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;YAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC3B,MAAM,CAAC,OAAO,EAAE,CAAC;YACrB,CAAC;QACL,CAAC;IACL,CAAC;IAES,KAAK,CAAC,SAAS,CAAC,GAAqB;QAC3C,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9B,MAAM,EAAE,GAAG,IAAI,GAAG,EAAE,CAAC;QACrB,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;IACtB,CAAC;CAEJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DispatchEmailToMX.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/DispatchEmailToMX.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,wDAAwD,CAAC;AAIzF,OAAO,QAA4B,MAAM,yDAAyD,CAAC;
|
|
1
|
+
{"version":3,"file":"DispatchEmailToMX.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/DispatchEmailToMX.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,wDAAwD,CAAC;AAIzF,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AACnG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,UAAU,EAAE,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAE5E,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAC/D,OAAO,eAAe,MAAM,8CAA8C,CAAC;AAC3E,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AAGxE,OAAO,iBAAiB,MAAM,gDAAgD,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,sBAAsB,MAAM,+CAA+C,CAAC;AAGnF,eAAO,MAAM,QAAQ,6BASlB,CAAC;AAEJ,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,QAAQ,CAAC,gBAAgB,CAAC;IAErE,OAAO,CAAC,QAAQ,CAAgB;IAEhC,OAAO,CAAC,eAAe,CAAS;IAE1B,GAAG;IAoCH,SAAS,CACH,GAAG,CAAC,EAAE,qBAAqB;IAMjC,gBAAgB,CAClB,OAAO,EAAE,MAAM,EACP,GAAG,CAAC,EAAE,eAAe,EACrB,EAAE,CAAC,EAAE,iBAAiB,EACtB,EAAE,CAAC,EAAE,iBAAiB;;;;;IA8D5B,QAAQ,CACV,OAAO,EAAE,MAAM,EACP,GAAG,CAAC,EAAE,eAAe,EACrB,GAAG,CAAC,EAAE,mBAAmB,EACzB,GAAG,CAAC,EAAE,sBAAsB;IA+ClC,UAAU,CACJ,EAAE,CAAC,EAAE,iBAAiB,EACtB,GAAG,CAAC,EAAE,eAAe;CAyEpC"}
|
|
@@ -68,7 +68,6 @@ import Inject from "@entity-access/entity-access/dist/di/di.js";
|
|
|
68
68
|
import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
69
69
|
import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
|
|
70
70
|
import Workflow, { UniqueActivity } from "@entity-access/entity-access/dist/workflows/Workflow.js";
|
|
71
|
-
import Tracer from "../../../Tracer.js";
|
|
72
71
|
import SocialMailContext from "../../model/SocialMailContext.js";
|
|
73
72
|
import SMTPClient from "../../smtp/client/SMTPClient.js";
|
|
74
73
|
import { SmtpStatusCodes } from "../../smtp/client/SmtpStatusCodes.js";
|
|
@@ -79,6 +78,7 @@ import EmailAddressService from "../../services/EmailAddressService.js";
|
|
|
79
78
|
import ESmtpClient from "../../../protocols/smtp/ESmtpClient.js";
|
|
80
79
|
import EncryptionService from "../../services/encryption/EncryptionService.js";
|
|
81
80
|
import EmailSerializerService from "../../smtp/services/EmailSerializerService.js";
|
|
81
|
+
import ServerLogger from "@entity-access/server-pages/dist/core/ServerLogger.js";
|
|
82
82
|
export const smtpPool = new NamedObjectPool((host) => ({
|
|
83
83
|
asyncFactory: () => new SMTPClient({ host }).connect(),
|
|
84
84
|
destroy: (item) => item.dispose(),
|
|
@@ -163,9 +163,10 @@ export default class DispatchEmailToMX extends Workflow {
|
|
|
163
163
|
// since remote file might be compressed
|
|
164
164
|
const status = await client.sendRequest(from, [recipientAddress], file);
|
|
165
165
|
if (Number(status.statusCode) >= 400) {
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
host
|
|
166
|
+
ServerLogger.reportError({
|
|
167
|
+
error: status.logs,
|
|
168
|
+
host,
|
|
169
|
+
route: recipientAddress,
|
|
169
170
|
});
|
|
170
171
|
}
|
|
171
172
|
return status;
|
|
@@ -209,9 +210,10 @@ export default class DispatchEmailToMX extends Workflow {
|
|
|
209
210
|
// since remote file might be compressed
|
|
210
211
|
const status = await client.send({ ...this.input, to: [recipientAddress] }, file);
|
|
211
212
|
if (Number(status.statusCode) >= 400) {
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
213
|
+
ServerLogger.reportError({
|
|
214
|
+
error: status.logs,
|
|
215
|
+
route: recipientAddress,
|
|
216
|
+
host,
|
|
215
217
|
});
|
|
216
218
|
}
|
|
217
219
|
return status;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DispatchEmailToMX.js","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/DispatchEmailToMX.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,EAAE,eAAe,EAAE,MAAM,wDAAwD,CAAC;AACzF,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,QAAQ,EAAE,EAAE,cAAc,EAAE,MAAM,yDAAyD,CAAC;AACnG,OAAO,
|
|
1
|
+
{"version":3,"file":"DispatchEmailToMX.js","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/DispatchEmailToMX.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DispatchNotificationToMX.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/DispatchNotificationToMX.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,wDAAwD,CAAC;AAIzF,OAAO,QAA4B,MAAM,yDAAyD,CAAC;
|
|
1
|
+
{"version":3,"file":"DispatchNotificationToMX.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/DispatchNotificationToMX.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,wDAAwD,CAAC;AAIzF,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AACnG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,UAAU,EAAE,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAE5E,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAC/D,OAAO,eAAe,MAAM,8CAA8C,CAAC;AAC3E,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AAExE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,iBAAiB,MAAM,gDAAgD,CAAC;AAK/E,eAAO,MAAM,QAAQ,6BASlB,CAAC;AAEJ,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,QAAQ,CAAC,kBAAkB,CAAC;IAE9E,OAAO,CAAC,QAAQ,CAAgB;IAE1B,GAAG;IAiCH,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAC1B,GAAG,CAAC,EAAE,qBAAqB,EAC3B,GAAG,CAAC,EAAE,eAAe,EACrB,GAAG,CAAC,EAAE,mBAAmB,EACzB,EAAE,CAAC,EAAE,iBAAiB,EACtB,EAAE,CAAC,EAAE,iBAAiB;;;;;IAgD5B,QAAQ,CACV,OAAO,EAAE,MAAM,EACP,GAAG,CAAC,EAAE,eAAe,EACrB,GAAG,CAAC,EAAE,mBAAmB,EACzB,EAAE,CAAC,EAAE,iBAAiB,EACtB,GAAG,CAAC,EAAE,qBAAqB;CAyG1C"}
|
|
@@ -68,7 +68,6 @@ import Inject from "@entity-access/entity-access/dist/di/di.js";
|
|
|
68
68
|
import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
69
69
|
import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
|
|
70
70
|
import Workflow, { UniqueActivity } from "@entity-access/entity-access/dist/workflows/Workflow.js";
|
|
71
|
-
import Tracer from "../../../Tracer.js";
|
|
72
71
|
import SocialMailContext from "../../model/SocialMailContext.js";
|
|
73
72
|
import SMTPClient from "../../smtp/client/SMTPClient.js";
|
|
74
73
|
import { SmtpStatusCodes } from "../../smtp/client/SmtpStatusCodes.js";
|
|
@@ -77,6 +76,7 @@ import EmailLogService from "../../services/email-logs/EmailLogService.js";
|
|
|
77
76
|
import EmailAddressService from "../../services/EmailAddressService.js";
|
|
78
77
|
import EncryptionService from "../../services/encryption/EncryptionService.js";
|
|
79
78
|
import ESmtpClient from "../../../protocols/smtp/ESmtpClient.js";
|
|
79
|
+
import ServerLogger from "@entity-access/server-pages/dist/core/ServerLogger.js";
|
|
80
80
|
// import EmailReferenceService from "../../smtp/services/EmailReferenceService.js";
|
|
81
81
|
export const smtpPool = new NamedObjectPool((host) => ({
|
|
82
82
|
asyncFactory: () => new SMTPClient({ host }).connect(),
|
|
@@ -150,10 +150,7 @@ export default class DispatchNotificationToMX extends Workflow {
|
|
|
150
150
|
// since remote file might be compressed
|
|
151
151
|
const status = await client.sendRequest(from, [to], signedFile);
|
|
152
152
|
if (Number(status.statusCode) >= 400) {
|
|
153
|
-
|
|
154
|
-
path: this.input.to,
|
|
155
|
-
host
|
|
156
|
-
});
|
|
153
|
+
ServerLogger.reportError({ error: status.logs, info: { path: this.input.to, host } });
|
|
157
154
|
}
|
|
158
155
|
return status;
|
|
159
156
|
}
|
|
@@ -257,9 +254,10 @@ export default class DispatchNotificationToMX extends Workflow {
|
|
|
257
254
|
to: [this.input.to]
|
|
258
255
|
}, signedFile);
|
|
259
256
|
if (Number(status.statusCode) >= 400) {
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
257
|
+
ServerLogger.reportError({
|
|
258
|
+
error: status.logs,
|
|
259
|
+
route: this.input.to,
|
|
260
|
+
host,
|
|
263
261
|
});
|
|
264
262
|
}
|
|
265
263
|
return status;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DispatchNotificationToMX.js","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/DispatchNotificationToMX.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,EAAE,eAAe,EAAE,MAAM,wDAAwD,CAAC;AACzF,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,QAAQ,EAAE,EAAE,cAAc,EAAE,MAAM,yDAAyD,CAAC;AACnG,OAAO,
|
|
1
|
+
{"version":3,"file":"DispatchNotificationToMX.js","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/DispatchNotificationToMX.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,EAAE,eAAe,EAAE,MAAM,wDAAwD,CAAC;AACzF,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,QAAQ,EAAE,EAAE,cAAc,EAAE,MAAM,yDAAyD,CAAC;AACnG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,UAA6B,MAAM,iCAAiC,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAC/D,OAAO,eAAe,MAAM,8CAA8C,CAAC;AAC3E,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AAGxE,OAAO,iBAAiB,MAAM,gDAAgD,CAAC;AAC/E,OAAO,WAAW,MAAM,wCAAwC,CAAC;AACjE,OAAO,YAAY,MAAM,uDAAuD,CAAC;AACjF,oFAAoF;AAEpF,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAa,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC/D,YAAY,EAAE,GAAG,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE;IACtD,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE;IACjC,mBAAmB,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE;QAC/B,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;YACjC,KAAK,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,QAA4B;IAI9E,KAAK,CAAC,GAAG;QAEL,IAAI,EAAE,GAAG,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAElC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;YAErC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ;gBAC9C,CAAC,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;gBACpC,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAEjC,QAAO,MAAM,CAAC,UAAU,EAAE,CAAC;gBACvB,KAAK,eAAe,CAAC,EAAE;oBACnB,OAAO,IAAI,CAAC;gBAChB,KAAK,eAAe,CAAC,yBAAyB,CAAC;gBAC/C,KAAK,eAAe,CAAC,WAAW,CAAC;gBACjC,KAAK,eAAe,CAAC,iBAAiB,CAAC;gBACvC,KAAK,eAAe,CAAC,mBAAmB;oBACpC,MAAM;gBACV;oBACI,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACvC,CAAC;YAED,MAAM,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACrB,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACpB,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC;QAClC,IAAI,GAAG,EAAE,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB,CAAC,OAAe,EAC1B,GAA2B,EAC3B,GAAqB,EACrB,GAAyB,EACzB,EAAsB,EACtB,EAAsB;;;YAG9B,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAE5D,MAAM,QAAQ,GAAG,aAAa,CAAC,SAAS,CAAC;YAEzC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC;gBAChC,QAAQ;gBACR,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;gBACzB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;gBACzB,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;gBAC/B,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;gBAC5B,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;gBAC3B,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;aACpB,CAAC,CAAC;YAEH,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,kBAAkB;iBACjC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,KAAK,CAAC,CAAC,IAAI;mBACxE,CAAC,CAAC,CAAC,SAAS,KAAK,KAAK,IAAI,CAAC,CAAC,QAAQ,KAAK,MAAM,CAAC;mBAChD,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC;iBAC5B,KAAK,EAAE,CAAC;YAET,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,EAAE,CAAC;YAE3D,MAAM,QAAQ,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAGtD,MAAY,MAAM,kCAAG,MAAM,WAAW,CAAC,OAAO,CAAC;gBAC3C,IAAI;gBACJ,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE;oBACF,KAAK,EAAE;wBACH,QAAQ;wBACR,QAAQ;qBACX;iBACJ;aACJ,CAAC,OAAA,CAAC;YACH,MAAM,EAAE,IAAI,EAAG,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACjC,wCAAwC;YACxC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;YAChE,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,GAAG,EAAE,CAAC;gBACnC,YAAY,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAG,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,EAAC,CAAC,CAAC;YAC1F,CAAC;YACD,OAAO,MAAM,CAAC;;;;;;;;;;;KACjB;IAGK,AAAN,KAAK,CAAC,QAAQ,CACV,OAAe,EACP,GAAqB,EACrB,GAAyB,EACzB,EAAsB,EACtB,GAA2B;;;YAGnC,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAE5D,MAAM,QAAQ,GAAG,aAAa,CAAC,SAAS,CAAC;YAEzC,oBAAoB;YACpB,8CAA8C;YAC9C,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAE9D,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC;gBAChC,QAAQ;gBACR,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;gBACzB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;gBACzB,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;gBAC/B,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;gBAC5B,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;gBAC3B,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;aACpB,CAAC,CAAC;YAEH,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;YAEzB,IAAI,SAAS,EAAE,CAAC;;;oBAEZ,MAAY,EAAE,kCAAG,MAAM,EAAE,CAAC,UAAU,CAAC,iBAAiB,EAAE,OAAA,CAAC;oBAEzD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;wBAClD,QAAQ;wBACR,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;wBAC/B,WAAW,EAAE,GAAG;wBAChB,YAAY,EAAE,GAAG;wBACjB,QAAQ,EAAE,GAAG;wBACb,QAAQ,EAAE,IAAI;wBACd,MAAM,EAAE,UAAU;qBACrB,CAAC,CAAC;oBAEH,MAAM,EAAE,CAAC,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC;wBACvC,OAAO;wBACP,cAAc,EAAE,SAAS;wBACzB,IAAI,EAAE,IAAI;qBACb,CAAC,CAAC;oBAGH,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;oBAElB,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;oBAEvE,MAAM,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,eAAe,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;oBAEhF,qGAAqG;oBAErG,qCAAqC;oBACrC,qDAAqD;oBACrD,iBAAiB;oBACjB,cAAc;oBACd,MAAM;oBACN,+CAA+C;oBAC/C,iBAAiB;oBACjB,gCAAgC;oBAChC,iCAAiC;oBACjC,iCAAiC;oBACjC,2BAA2B;oBAC3B,MAAM;oBAEN,oDAAoD;oBACpD,iBAAiB;oBACjB,gCAAgC;oBAChC,eAAe;oBACf,uBAAuB;oBACvB,mBAAmB;oBACnB,MAAM;oBAEN,kDAAkD;oBAClD,gBAAgB;oBAChB,eAAe;oBACf,8BAA8B;oBAC9B,kBAAkB;oBAClB,MAAM;oBAEN,OAAO;wBACH,UAAU,EAAE,eAAe,CAAC,EAAE;wBAC9B,MAAM,EAAE,IAAI;wBACZ,IAAI,EAAE,oBAAoB;qBAC7B,CAAC;;;;;;;;;;;aACL;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,EAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,iBAAiB,EAAE,CAAC;YACzE,MAAY,MAAM,kCAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,OAAA,CAAC;YAClD,wCAAwC;YACxC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC;gBAC7B,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;gBACrB,IAAI;gBACJ,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;aACtB,EAAE,UAAU,CAAC,CAAC;YACf,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,GAAG,EAAE,CAAC;gBACnC,YAAY,CAAC,WAAW,CAAC;oBACrB,KAAK,EAAE,MAAM,CAAC,IAAI;oBAClB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;oBACpB,IAAI;iBACP,CAAC,CAAC;YACP,CAAC;YACD,OAAO,MAAM,CAAC;;;;;;;;;;;KACjB;CAEJ;AAnKS;IADL,cAAc;IAEV,WAAA,MAAM,CAAA;IACN,WAAA,MAAM,CAAA;IACN,WAAA,MAAM,CAAA;IACN,WAAA,MAAM,CAAA;IACN,WAAA,MAAM,CAAA;;6CAJO,qBAAqB;QACrB,eAAe;QACf,mBAAmB;QACpB,iBAAiB;QACjB,iBAAiB;;gEA6CjC;AAGK;IADL,cAAc;IAGV,WAAA,MAAM,CAAA;IACN,WAAA,MAAM,CAAA;IACN,WAAA,MAAM,CAAA;IACN,WAAA,MAAM,CAAA;;6CAHO,eAAe;QACf,mBAAmB;QACpB,iBAAiB;QAChB,qBAAqB;;wDAuGtC"}
|