@toon-protocol/connector 3.6.3 → 3.7.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/config/config-loader.d.ts.map +1 -1
- package/dist/config/config-loader.js +6 -0
- package/dist/config/config-loader.js.map +1 -1
- package/dist/config/types.d.ts +4 -0
- package/dist/config/types.d.ts.map +1 -1
- package/dist/config/types.js.map +1 -1
- package/dist/core/connector-node.d.ts.map +1 -1
- package/dist/core/connector-node.js +10 -0
- package/dist/core/connector-node.js.map +1 -1
- package/dist/core/packet-handler.d.ts +4 -1
- package/dist/core/packet-handler.d.ts.map +1 -1
- package/dist/core/packet-handler.js +30 -6
- package/dist/core/packet-handler.js.map +1 -1
- package/dist/http/admin-api.d.ts +5 -0
- package/dist/http/admin-api.d.ts.map +1 -1
- package/dist/http/admin-api.js +19 -2
- package/dist/http/admin-api.js.map +1 -1
- package/dist/http/admin-server.d.ts +1 -0
- package/dist/http/admin-server.d.ts.map +1 -1
- package/dist/http/admin-server.js +2 -1
- package/dist/http/admin-server.js.map +1 -1
- package/dist/observability/metrics-registry.d.ts +4 -0
- package/dist/observability/metrics-registry.d.ts.map +1 -1
- package/dist/observability/metrics-registry.js +18 -1
- package/dist/observability/metrics-registry.js.map +1 -1
- package/package.json +1 -1
|
@@ -20,7 +20,7 @@ class AdminServer {
|
|
|
20
20
|
}
|
|
21
21
|
async _initApp() {
|
|
22
22
|
const { default: express } = await (0, optional_require_1.requireOptional)('express', 'HTTP admin/health APIs');
|
|
23
|
-
const { routingTable, btpClientManager, nodeId, config, settlementPeers, channelManager, paymentChannelSDK, accountManager, settlementMonitor, claimReceiver, sentClaimsQueries, defaultSettlementTokenId, packetSender, isReady, metricsRegistry, managedAnonClient, resolveTokenMetadata, connectorFeePercentage, } = this._options;
|
|
23
|
+
const { routingTable, btpClientManager, nodeId, config, settlementPeers, channelManager, paymentChannelSDK, accountManager, settlementMonitor, claimReceiver, sentClaimsQueries, defaultSettlementTokenId, packetSender, isReady, metricsRegistry, managedAnonClient, resolveTokenMetadata, connectorFeePercentage, setPeerRelation, } = this._options;
|
|
24
24
|
this._app = express();
|
|
25
25
|
const adminRouter = await (0, admin_api_1.createAdminRouter)({
|
|
26
26
|
routingTable,
|
|
@@ -45,6 +45,7 @@ class AdminServer {
|
|
|
45
45
|
resolveTokenMetadata,
|
|
46
46
|
connectorFeePercentage,
|
|
47
47
|
transportType: this._transportType,
|
|
48
|
+
setPeerRelation,
|
|
48
49
|
});
|
|
49
50
|
this._app.use('/admin', adminRouter);
|
|
50
51
|
this._app.get('/health', (_req, res) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin-server.js","sourceRoot":"","sources":["../../src/http/admin-server.ts"],"names":[],"mappings":";;;AAkBA,2CAAgD;AAWhD,gEAA4D;AAuB5D,MAAa,WAAW;IACd,IAAI,CAAW;IACf,OAAO,GAAkB,IAAI,CAAC;IACrB,OAAO,CAAS;IAChB,OAAO,CAAiB;IACxB,OAAO,CAAS;IAChB,QAAQ,
|
|
1
|
+
{"version":3,"file":"admin-server.js","sourceRoot":"","sources":["../../src/http/admin-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ export declare class IlpMetricsRegistry {
|
|
|
12
12
|
readonly bytesReceivedTotal: Counter<'peer'>;
|
|
13
13
|
readonly lastPacketTimestampSeconds: Gauge<'peer'>;
|
|
14
14
|
readonly packetsRejectedPreRoutingTotal: Counter<'reason'>;
|
|
15
|
+
readonly packetsLocallyDeliveredTotal: Counter<'peer'>;
|
|
15
16
|
private readonly knownPeers;
|
|
16
17
|
constructor(options?: IlpMetricsRegistryOptions);
|
|
17
18
|
registerPeer(peerId: string): void;
|
|
@@ -21,6 +22,7 @@ export declare class IlpMetricsRegistry {
|
|
|
21
22
|
recordForwardFulfill(peerId: string, bytes: number): void;
|
|
22
23
|
recordForwardReject(peerId: string, bytes: number): void;
|
|
23
24
|
recordPreRoutingReject(reason: PreRoutingRejectReason): void;
|
|
25
|
+
recordLocalDeliver(peerId: string): void;
|
|
24
26
|
createMetricsMiddleware(): RequestHandler;
|
|
25
27
|
snapshotPeers(): Promise<Array<{
|
|
26
28
|
peerId: string;
|
|
@@ -29,11 +31,13 @@ export declare class IlpMetricsRegistry {
|
|
|
29
31
|
bytesSent: number;
|
|
30
32
|
bytesReceived: number;
|
|
31
33
|
lastPacketAtUnixSeconds: number;
|
|
34
|
+
packetsLocallyDelivered: number;
|
|
32
35
|
}>>;
|
|
33
36
|
snapshotAggregate(): Promise<{
|
|
34
37
|
packetsForwarded: number;
|
|
35
38
|
packetsRejected: number;
|
|
36
39
|
bytesSent: number;
|
|
40
|
+
packetsLocallyDelivered: number;
|
|
37
41
|
}>;
|
|
38
42
|
}
|
|
39
43
|
//# sourceMappingURL=metrics-registry.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics-registry.d.ts","sourceRoot":"","sources":["../../src/observability/metrics-registry.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAyB,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAe,MAAM,aAAa,CAAC;AAC3F,OAAO,KAAK,EAAW,cAAc,EAAY,MAAM,SAAS,CAAC;AAUjE,MAAM,MAAM,sBAAsB,GAC9B,mBAAmB,GACnB,UAAU,GACV,kBAAkB,GAClB,uBAAuB,GACvB,yBAAyB,GACzB,6BAA6B,CAAC;AAElC,MAAM,WAAW,yBAAyB;IAMxC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;
|
|
1
|
+
{"version":3,"file":"metrics-registry.d.ts","sourceRoot":"","sources":["../../src/observability/metrics-registry.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAyB,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAe,MAAM,aAAa,CAAC;AAC3F,OAAO,KAAK,EAAW,cAAc,EAAY,MAAM,SAAS,CAAC;AAUjE,MAAM,MAAM,sBAAsB,GAC9B,mBAAmB,GACnB,UAAU,GACV,kBAAkB,GAClB,uBAAuB,GACvB,yBAAyB,GACzB,6BAA6B,CAAC;AAElC,MAAM,WAAW,yBAAyB;IAMxC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAqBD,qBAAa,kBAAkB;IAC7B,SAAgB,QAAQ,EAAE,QAAQ,CAAC;IAEnC,SAAgB,qBAAqB,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACvD,SAAgB,oBAAoB,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACtD,SAAgB,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAChD,SAAgB,kBAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACpD,SAAgB,0BAA0B,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1D,SAAgB,8BAA8B,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClE,SAAgB,4BAA4B,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAQ9D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;gBAEpC,OAAO,GAAE,yBAA8B;IAgEnD,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAmBlC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAIpC,aAAa,IAAI,MAAM,EAAE;IAQzB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IASlD,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAWzD,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAYxD,sBAAsB,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI;IAQ5D,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAWxC,uBAAuB,IAAI,cAAc;IAsBnC,aAAa,IAAI,OAAO,CAC5B,KAAK,CAAC;QACJ,MAAM,EAAE,MAAM,CAAC;QACf,gBAAgB,EAAE,MAAM,CAAC;QACzB,eAAe,EAAE,MAAM,CAAC;QACxB,SAAS,EAAE,MAAM,CAAC;QAClB,aAAa,EAAE,MAAM,CAAC;QACtB,uBAAuB,EAAE,MAAM,CAAC;QAChC,uBAAuB,EAAE,MAAM,CAAC;KACjC,CAAC,CACH;IA8CK,iBAAiB,IAAI,OAAO,CAAC;QACjC,gBAAgB,EAAE,MAAM,CAAC;QACzB,eAAe,EAAE,MAAM,CAAC;QACxB,SAAS,EAAE,MAAM,CAAC;QAClB,uBAAuB,EAAE,MAAM,CAAC;KACjC,CAAC;CAYH"}
|
|
@@ -10,6 +10,7 @@ class IlpMetricsRegistry {
|
|
|
10
10
|
bytesReceivedTotal;
|
|
11
11
|
lastPacketTimestampSeconds;
|
|
12
12
|
packetsRejectedPreRoutingTotal;
|
|
13
|
+
packetsLocallyDeliveredTotal;
|
|
13
14
|
knownPeers = new Set();
|
|
14
15
|
constructor(options = {}) {
|
|
15
16
|
this.register = new prom_client_1.Registry();
|
|
@@ -49,6 +50,12 @@ class IlpMetricsRegistry {
|
|
|
49
50
|
labelNames: ['reason'],
|
|
50
51
|
registers: [this.register],
|
|
51
52
|
});
|
|
53
|
+
this.packetsLocallyDeliveredTotal = new prom_client_1.Counter({
|
|
54
|
+
name: 'toon_packets_locally_delivered_total',
|
|
55
|
+
help: 'Count of ILP PREPARE packets fulfilled via the local-delivery branch (self-route, nextHop === nodeId). peer = inbound source peer.',
|
|
56
|
+
labelNames: ['peer'],
|
|
57
|
+
registers: [this.register],
|
|
58
|
+
});
|
|
52
59
|
if (options.collectDefaults !== false) {
|
|
53
60
|
(0, prom_client_1.collectDefaultMetrics)({ register: this.register });
|
|
54
61
|
}
|
|
@@ -62,6 +69,7 @@ class IlpMetricsRegistry {
|
|
|
62
69
|
this.bytesSentTotal.inc({ peer: peerId }, 0);
|
|
63
70
|
this.bytesReceivedTotal.inc({ peer: peerId }, 0);
|
|
64
71
|
this.lastPacketTimestampSeconds.set({ peer: peerId }, 0);
|
|
72
|
+
this.packetsLocallyDeliveredTotal.inc({ peer: peerId }, 0);
|
|
65
73
|
}
|
|
66
74
|
unregisterPeer(peerId) {
|
|
67
75
|
this.knownPeers.delete(peerId);
|
|
@@ -88,6 +96,11 @@ class IlpMetricsRegistry {
|
|
|
88
96
|
recordPreRoutingReject(reason) {
|
|
89
97
|
this.packetsRejectedPreRoutingTotal.inc({ reason }, 1);
|
|
90
98
|
}
|
|
99
|
+
recordLocalDeliver(peerId) {
|
|
100
|
+
if (!peerId || peerId === 'unknown')
|
|
101
|
+
return;
|
|
102
|
+
this.packetsLocallyDeliveredTotal.inc({ peer: peerId }, 1);
|
|
103
|
+
}
|
|
91
104
|
createMetricsMiddleware() {
|
|
92
105
|
return async (_req, res) => {
|
|
93
106
|
try {
|
|
@@ -110,6 +123,7 @@ class IlpMetricsRegistry {
|
|
|
110
123
|
this.packetsRejectedTotal,
|
|
111
124
|
this.bytesSentTotal,
|
|
112
125
|
this.bytesReceivedTotal,
|
|
126
|
+
this.packetsLocallyDeliveredTotal,
|
|
113
127
|
]) {
|
|
114
128
|
const snapshot = await metric.get();
|
|
115
129
|
for (const value of snapshot.values) {
|
|
@@ -123,6 +137,7 @@ class IlpMetricsRegistry {
|
|
|
123
137
|
const sent = await this.bytesSentTotal.get();
|
|
124
138
|
const received = await this.bytesReceivedTotal.get();
|
|
125
139
|
const last = await this.lastPacketTimestampSeconds.get();
|
|
140
|
+
const locallyDelivered = await this.packetsLocallyDeliveredTotal.get();
|
|
126
141
|
const readPeer = (snapshot, peerId) => {
|
|
127
142
|
const entry = snapshot.values.find((v) => v.labels?.peer === peerId);
|
|
128
143
|
return entry?.value ?? 0;
|
|
@@ -136,6 +151,7 @@ class IlpMetricsRegistry {
|
|
|
136
151
|
bytesSent: readPeer(sent, peerId),
|
|
137
152
|
bytesReceived: readPeer(received, peerId),
|
|
138
153
|
lastPacketAtUnixSeconds: readPeer(last, peerId),
|
|
154
|
+
packetsLocallyDelivered: readPeer(locallyDelivered, peerId),
|
|
139
155
|
}));
|
|
140
156
|
}
|
|
141
157
|
async snapshotAggregate() {
|
|
@@ -144,7 +160,8 @@ class IlpMetricsRegistry {
|
|
|
144
160
|
packetsForwarded: acc.packetsForwarded + p.packetsForwarded,
|
|
145
161
|
packetsRejected: acc.packetsRejected + p.packetsRejected,
|
|
146
162
|
bytesSent: acc.bytesSent + p.bytesSent,
|
|
147
|
-
|
|
163
|
+
packetsLocallyDelivered: acc.packetsLocallyDelivered + p.packetsLocallyDelivered,
|
|
164
|
+
}), { packetsForwarded: 0, packetsRejected: 0, bytesSent: 0, packetsLocallyDelivered: 0 });
|
|
148
165
|
}
|
|
149
166
|
}
|
|
150
167
|
exports.IlpMetricsRegistry = IlpMetricsRegistry;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics-registry.js","sourceRoot":"","sources":["../../src/observability/metrics-registry.ts"],"names":[],"mappings":";;;AAkBA,6CAA2F;
|
|
1
|
+
{"version":3,"file":"metrics-registry.js","sourceRoot":"","sources":["../../src/observability/metrics-registry.ts"],"names":[],"mappings":";;;AAkBA,6CAA2F;AA+C3F,MAAa,kBAAkB;IACb,QAAQ,CAAW;IAEnB,qBAAqB,CAAkB;IACvC,oBAAoB,CAAkB;IACtC,cAAc,CAAkB;IAChC,kBAAkB,CAAkB;IACpC,0BAA0B,CAAgB;IAC1C,8BAA8B,CAAoB;IAClD,4BAA4B,CAAkB;IAQ7C,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IAEhD,YAAY,UAAqC,EAAE;QACjD,IAAI,CAAC,QAAQ,GAAG,IAAI,sBAAQ,EAAE,CAAC;QAE/B,IAAI,CAAC,qBAAqB,GAAG,IAAI,qBAAO,CAAC;YACvC,IAAI,EAAE,8BAA8B;YACpC,IAAI,EAAE,iGAAiG;YACvG,UAAU,EAAE,CAAC,MAAM,CAAU;YAC7B,SAAS,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;SAC3B,CAAC,CAAC;QAEH,IAAI,CAAC,oBAAoB,GAAG,IAAI,qBAAO,CAAC;YACtC,IAAI,EAAE,6BAA6B;YACnC,IAAI,EAAE,6IAA6I;YACnJ,UAAU,EAAE,CAAC,MAAM,CAAU;YAC7B,SAAS,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;SAC3B,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,GAAG,IAAI,qBAAO,CAAC;YAChC,IAAI,EAAE,uBAAuB;YAC7B,IAAI,EAAE,8FAA8F;YACpG,UAAU,EAAE,CAAC,MAAM,CAAU;YAC7B,SAAS,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;SAC3B,CAAC,CAAC;QAEH,IAAI,CAAC,kBAAkB,GAAG,IAAI,qBAAO,CAAC;YACpC,IAAI,EAAE,2BAA2B;YACjC,IAAI,EAAE,+FAA+F;YACrG,UAAU,EAAE,CAAC,MAAM,CAAU;YAC7B,SAAS,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;SAC3B,CAAC,CAAC;QAEH,IAAI,CAAC,0BAA0B,GAAG,IAAI,mBAAK,CAAC;YAC1C,IAAI,EAAE,oCAAoC;YAC1C,IAAI,EAAE,6GAA6G;YACnH,UAAU,EAAE,CAAC,MAAM,CAAU;YAC7B,SAAS,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;SAC3B,CAAC,CAAC;QAEH,IAAI,CAAC,8BAA8B,GAAG,IAAI,qBAAO,CAAC;YAChD,IAAI,EAAE,yCAAyC;YAC/C,IAAI,EAAE,4JAA4J;YAClK,UAAU,EAAE,CAAC,QAAQ,CAAU;YAC/B,SAAS,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;SAC3B,CAAC,CAAC;QAEH,IAAI,CAAC,4BAA4B,GAAG,IAAI,qBAAO,CAAC;YAC9C,IAAI,EAAE,sCAAsC;YAC5C,IAAI,EAAE,oIAAoI;YAC1I,UAAU,EAAE,CAAC,MAAM,CAAU;YAC7B,SAAS,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;SAC3B,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,eAAe,KAAK,KAAK,EAAE,CAAC;YACtC,IAAA,mCAAqB,EAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IASD,YAAY,CAAC,MAAc;QACzB,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC;YAAE,OAAO;QACxC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAI5B,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;QACpD,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;QACnD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;QAC7C,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;QACjD,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;IAC7D,CAAC;IAOD,cAAc,CAAC,MAAc;QAC3B,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,aAAa;QACX,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;IAMD,aAAa,CAAC,MAAc,EAAE,KAAa;QACzC,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO;QAC5C,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,CAAC;QACrD,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IAC3E,CAAC;IAKD,oBAAoB,CAAC,MAAc,EAAE,KAAa;QAChD,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;QACpD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,CAAC;QACjD,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IAC3E,CAAC;IAOD,mBAAmB,CAAC,MAAc,EAAE,KAAa;QAC/C,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;QACnD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,CAAC;QACjD,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IAC3E,CAAC;IAQD,sBAAsB,CAAC,MAA8B;QACnD,IAAI,CAAC,8BAA8B,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;IAMD,kBAAkB,CAAC,MAAc;QAC/B,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO;QAC5C,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;IAC7D,CAAC;IAQD,uBAAuB;QACrB,OAAO,KAAK,EAAE,IAAa,EAAE,GAAa,EAAiB,EAAE;YAC3D,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;gBAC3C,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBACnD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAGf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACnB,KAAK,EAAE,gBAAgB;oBACvB,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;iBAChE,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC;IACJ,CAAC;IAOD,KAAK,CAAC,aAAa;QAWjB,MAAM,OAAO,GAAG,IAAI,GAAG,CAAS,IAAI,CAAC,UAAU,CAAC,CAAC;QAGjD,KAAK,MAAM,MAAM,IAAI;YACnB,IAAI,CAAC,qBAAqB;YAC1B,IAAI,CAAC,oBAAoB;YACzB,IAAI,CAAC,cAAc;YACnB,IAAI,CAAC,kBAAkB;YACvB,IAAI,CAAC,4BAA4B;SACjB,EAAE,CAAC;YACnB,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC;YACpC,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACpC,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC;gBAChC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;oBAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,CAAC;QACzD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAAC;QACvD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC;QACrD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,GAAG,EAAE,CAAC;QACzD,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,GAAG,EAAE,CAAC;QAEvE,MAAM,QAAQ,GAAG,CAAC,QAA6C,EAAE,MAAc,EAAU,EAAE;YACzF,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,KAAK,MAAM,CAAC,CAAC;YACrE,OAAO,KAAK,EAAE,KAAK,IAAI,CAAC,CAAC;QAC3B,CAAC,CAAC;QAEF,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;aACvB,IAAI,EAAE;aACN,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAChB,MAAM;YACN,gBAAgB,EAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;YAC7C,eAAe,EAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;YAC3C,SAAS,EAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;YACjC,aAAa,EAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;YACzC,uBAAuB,EAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;YAC/C,uBAAuB,EAAE,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;SAC5D,CAAC,CAAC,CAAC;IACR,CAAC;IAKD,KAAK,CAAC,iBAAiB;QAMrB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QACzC,OAAO,KAAK,CAAC,MAAM,CACjB,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACX,gBAAgB,EAAE,GAAG,CAAC,gBAAgB,GAAG,CAAC,CAAC,gBAAgB;YAC3D,eAAe,EAAE,GAAG,CAAC,eAAe,GAAG,CAAC,CAAC,eAAe;YACxD,SAAS,EAAE,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS;YACtC,uBAAuB,EAAE,GAAG,CAAC,uBAAuB,GAAG,CAAC,CAAC,uBAAuB;SACjF,CAAC,EACF,EAAE,gBAAgB,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,uBAAuB,EAAE,CAAC,EAAE,CACtF,CAAC;IACJ,CAAC;CACF;AApQD,gDAoQC"}
|