@google/gemini-cli-core 0.69.0-nightly.20261109.g62bab5b23 → 0.69.0-preview.0
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/docs/cli/trusted-folders.md +13 -0
- package/dist/src/agent/legacy-agent-session.js +9 -0
- package/dist/src/agent/legacy-agent-session.js.map +1 -1
- package/dist/src/agents/agentLoader.d.ts +1 -1
- package/dist/src/agents/memory-leak-regression.test.js +185 -0
- package/dist/src/agents/memory-leak-regression.test.js.map +1 -1
- package/dist/src/confirmation-bus/message-bus.d.ts +1 -0
- package/dist/src/confirmation-bus/message-bus.js +33 -3
- package/dist/src/confirmation-bus/message-bus.js.map +1 -1
- package/dist/src/confirmation-bus/message-bus.test.js +225 -1
- package/dist/src/confirmation-bus/message-bus.test.js.map +1 -1
- package/dist/src/context/chatCompressionService.d.ts +1 -0
- package/dist/src/context/chatCompressionService.js +66 -24
- package/dist/src/context/chatCompressionService.js.map +1 -1
- package/dist/src/core/client.js +4 -1
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/geminiChat.d.ts +1 -1
- package/dist/src/core/geminiChat.js +29 -0
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +37 -0
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/loggingContentGenerator.d.ts +1 -0
- package/dist/src/core/loggingContentGenerator.js +28 -18
- package/dist/src/core/loggingContentGenerator.js.map +1 -1
- package/dist/src/core/loggingContentGenerator.test.js +58 -0
- package/dist/src/core/loggingContentGenerator.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/services/chatRecordingService.js +24 -10
- package/dist/src/services/chatRecordingService.js.map +1 -1
- package/dist/src/services/chatRecordingService.test.js +59 -0
- package/dist/src/services/chatRecordingService.test.js.map +1 -1
- package/dist/src/services/shellExecutionService.d.ts +4 -0
- package/dist/src/services/shellExecutionService.js +31 -1
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +37 -0
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/telemetry/loggers.js +47 -47
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/sdk.d.ts +1 -1
- package/dist/src/telemetry/sdk.js +23 -5
- package/dist/src/telemetry/sdk.js.map +1 -1
- package/dist/src/telemetry/sdk.test.js +29 -0
- package/dist/src/telemetry/sdk.test.js.map +1 -1
- package/dist/src/telemetry/trace.d.ts +0 -22
- package/dist/src/telemetry/trace.js +75 -68
- package/dist/src/telemetry/trace.js.map +1 -1
- package/dist/src/telemetry/trace.test.js +19 -0
- package/dist/src/telemetry/trace.test.js.map +1 -1
- package/dist/src/tools/read-many-files.d.ts +7 -0
- package/dist/src/tools/read-many-files.js +42 -4
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/read-many-files.test.js +116 -1
- package/dist/src/tools/read-many-files.test.js.map +1 -1
- package/dist/src/tools/shell.js +14 -1
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +68 -0
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/utils/errors.d.ts +1 -1
- package/dist/src/utils/errors.js +2 -2
- package/dist/src/utils/errors.js.map +1 -1
- package/dist/src/utils/gitUtils.js +1 -1
- package/dist/src/utils/gitUtils.js.map +1 -1
- package/dist/src/utils/gitUtils.test.js +50 -0
- package/dist/src/utils/gitUtils.test.js.map +1 -1
- package/dist/src/utils/sessionUtils.js +12 -0
- package/dist/src/utils/sessionUtils.js.map +1 -1
- package/dist/src/utils/sessionUtils.test.js +70 -0
- package/dist/src/utils/sessionUtils.test.js.map +1 -1
- package/dist/src/utils/shell-utils.d.ts +11 -0
- package/dist/src/utils/shell-utils.js +328 -0
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/shell-utils.test.js +37 -1
- package/dist/src/utils/shell-utils.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/google-gemini-cli-core-0.69.0-nightly.20261104.g89e9d25d6.tgz +0 -0
|
@@ -38,6 +38,19 @@ dialog will automatically appear, prompting you to make a choice:
|
|
|
38
38
|
Your choice is saved in a central file (`~/.gemini/trustedFolders.json`), so you
|
|
39
39
|
will only be asked once per folder.
|
|
40
40
|
|
|
41
|
+
### Trust prompt in the macOS Seatbelt sandbox
|
|
42
|
+
|
|
43
|
+
When you run Gemini CLI in the [macOS Seatbelt sandbox](./sandbox.md), Gemini
|
|
44
|
+
CLI can't read or write `~/.gemini/trustedFolders.json` from inside the sandbox.
|
|
45
|
+
Instead, it resolves folder trust before it starts the sandbox:
|
|
46
|
+
|
|
47
|
+
- If the folder already has a trust decision, Gemini CLI applies it to the
|
|
48
|
+
sandboxed session without asking again.
|
|
49
|
+
- If the folder doesn't have a trust decision yet, Gemini CLI asks you in the
|
|
50
|
+
terminal before the sandbox starts. The prompt offers the same choices and
|
|
51
|
+
discovery results as the trust dialog, and it saves your choice to
|
|
52
|
+
`~/.gemini/trustedFolders.json`.
|
|
53
|
+
|
|
41
54
|
## Understanding folder contents: The discovery phase
|
|
42
55
|
|
|
43
56
|
Before you make a choice, Gemini CLI performs a **discovery phase** to scan the
|
|
@@ -187,6 +187,15 @@ export class LegacyAgentProtocol {
|
|
|
187
187
|
}
|
|
188
188
|
const completedToolCalls = await this._scheduler.schedule(toolCallRequests, this._abortController.signal);
|
|
189
189
|
if (this._abortController.signal.aborted) {
|
|
190
|
+
try {
|
|
191
|
+
const currentModel = this._client.getCurrentSequenceModel() ?? this._config.getModel();
|
|
192
|
+
this._client
|
|
193
|
+
.getChat()
|
|
194
|
+
.recordCompletedToolCalls(currentModel, completedToolCalls);
|
|
195
|
+
}
|
|
196
|
+
catch (error) {
|
|
197
|
+
debugLogger.error(`Error recording completed tool call information: ${error}`);
|
|
198
|
+
}
|
|
190
199
|
this._finishStream('aborted');
|
|
191
200
|
return;
|
|
192
201
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legacy-agent-session.js","sourceRoot":"","sources":["../../../src/agent/legacy-agent-session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"legacy-agent-session.js","sourceRoot":"","sources":["../../../src/agent/legacy-agent-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -198,8 +198,8 @@ declare const localAgentSchema: z.ZodObject<{
|
|
|
198
198
|
}, {
|
|
199
199
|
name: string;
|
|
200
200
|
description: string;
|
|
201
|
-
kind?: "local" | undefined;
|
|
202
201
|
model?: string | undefined;
|
|
202
|
+
kind?: "local" | undefined;
|
|
203
203
|
tools?: string[] | undefined;
|
|
204
204
|
temperature?: number | undefined;
|
|
205
205
|
max_turns?: number | undefined;
|
|
@@ -7,7 +7,11 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
|
7
7
|
import fs from 'node:fs';
|
|
8
8
|
import os from 'node:os';
|
|
9
9
|
import path from 'node:path';
|
|
10
|
+
import v8 from 'node:v8';
|
|
11
|
+
import vm from 'node:vm';
|
|
10
12
|
import { MAX_STORED_TOOL_OUTPUT_BYTES } from '../utils/constants.js';
|
|
13
|
+
import { LoggingContentGenerator } from '../core/loggingContentGenerator.js';
|
|
14
|
+
import { LlmRole } from '../telemetry/types.js';
|
|
11
15
|
import { truncateToolOutput, truncateFunctionResponsePart, } from '../utils/tool-utils.js';
|
|
12
16
|
import { calculateHistoryByteSize, collapseOlderFunctionResponses, COLLAPSED_FUNCTION_RESPONSE_MAX_BYTES, ChatCompressionService, } from '../context/chatCompressionService.js';
|
|
13
17
|
import { ToolOutputMaskingService } from '../context/toolOutputMaskingService.js';
|
|
@@ -553,5 +557,186 @@ describe('GH-28537 / b/561554750 Memory Leak Regression Tests', () => {
|
|
|
553
557
|
expect(totalByteSize).toBeLessThan(350 * 1024);
|
|
554
558
|
});
|
|
555
559
|
});
|
|
560
|
+
describe('GH-29591 PDF Ingestion & Telemetry Buffer Heap OOM Regression Tests', () => {
|
|
561
|
+
it('does not retain evicted PDF inlineData or leak serialized requestText in telemetryBuffer across turns when telemetry is disabled', async () => {
|
|
562
|
+
v8.setFlagsFromString('--expose_gc');
|
|
563
|
+
const gc = vm.runInNewContext('gc');
|
|
564
|
+
const config = makeFakeConfig();
|
|
565
|
+
vi.spyOn(config, 'getTelemetryEnabled').mockReturnValue(false);
|
|
566
|
+
vi.spyOn(config, 'getTelemetryLogPromptsEnabled').mockReturnValue(false);
|
|
567
|
+
vi.spyOn(config, 'getTelemetryTracesEnabled').mockReturnValue(false);
|
|
568
|
+
const wrappedGenerator = {
|
|
569
|
+
generateContent: async () => ({
|
|
570
|
+
candidates: [],
|
|
571
|
+
text: undefined,
|
|
572
|
+
functionCalls: undefined,
|
|
573
|
+
executableCode: undefined,
|
|
574
|
+
codeExecutionResult: undefined,
|
|
575
|
+
data: undefined,
|
|
576
|
+
}),
|
|
577
|
+
generateContentStream: async () => (async function* () {
|
|
578
|
+
yield {
|
|
579
|
+
candidates: [
|
|
580
|
+
{
|
|
581
|
+
content: {
|
|
582
|
+
role: 'model',
|
|
583
|
+
parts: [{ text: 'Created wiki page.' }],
|
|
584
|
+
},
|
|
585
|
+
},
|
|
586
|
+
],
|
|
587
|
+
usageMetadata: {
|
|
588
|
+
promptTokenCount: 52000,
|
|
589
|
+
candidatesTokenCount: 25,
|
|
590
|
+
totalTokenCount: 52025,
|
|
591
|
+
},
|
|
592
|
+
text: undefined,
|
|
593
|
+
functionCalls: undefined,
|
|
594
|
+
executableCode: undefined,
|
|
595
|
+
codeExecutionResult: undefined,
|
|
596
|
+
data: undefined,
|
|
597
|
+
};
|
|
598
|
+
})(),
|
|
599
|
+
countTokens: async () => ({ totalTokens: 52000 }),
|
|
600
|
+
embedContent: async () => ({ embeddings: [] }),
|
|
601
|
+
};
|
|
602
|
+
const loggingGenerator = new LoggingContentGenerator(wrappedGenerator, config);
|
|
603
|
+
gc();
|
|
604
|
+
const baselineHeapBytes = process.memoryUsage().heapUsed;
|
|
605
|
+
// Allocate two 2 MB base64 PDF payloads inside an isolated scope so only
|
|
606
|
+
// conversation history (and any internal leaks) can hold references to them.
|
|
607
|
+
const createInitialPdfSession = () => {
|
|
608
|
+
const pdf1Part = {
|
|
609
|
+
inlineData: {
|
|
610
|
+
mimeType: 'application/pdf',
|
|
611
|
+
data: Buffer.alloc(1.5 * 1024 * 1024, 'A').toString('base64'),
|
|
612
|
+
},
|
|
613
|
+
};
|
|
614
|
+
const pdf2Part = {
|
|
615
|
+
inlineData: {
|
|
616
|
+
mimeType: 'application/pdf',
|
|
617
|
+
data: Buffer.alloc(1.5 * 1024 * 1024, 'B').toString('base64'),
|
|
618
|
+
},
|
|
619
|
+
};
|
|
620
|
+
return {
|
|
621
|
+
history: [
|
|
622
|
+
{
|
|
623
|
+
role: 'user',
|
|
624
|
+
parts: [
|
|
625
|
+
pdf1Part,
|
|
626
|
+
pdf2Part,
|
|
627
|
+
{ text: 'Ingest these two 80-slide PDFs into wiki pages.' },
|
|
628
|
+
],
|
|
629
|
+
},
|
|
630
|
+
],
|
|
631
|
+
pdfPartRef: new WeakRef(pdf1Part),
|
|
632
|
+
};
|
|
633
|
+
};
|
|
634
|
+
let { history, pdfPartRef } = createInitialPdfSession();
|
|
635
|
+
// Simulate 6 agent tool turns (3 protected turns + 3 turns after collapse)
|
|
636
|
+
for (let turn = 1; turn <= 6; turn++) {
|
|
637
|
+
history.push({
|
|
638
|
+
role: 'model',
|
|
639
|
+
parts: [
|
|
640
|
+
{
|
|
641
|
+
functionCall: {
|
|
642
|
+
name: 'write_file',
|
|
643
|
+
args: {
|
|
644
|
+
path: `wiki/page-${turn}.md`,
|
|
645
|
+
content: `# Page ${turn}`,
|
|
646
|
+
},
|
|
647
|
+
},
|
|
648
|
+
},
|
|
649
|
+
],
|
|
650
|
+
}, {
|
|
651
|
+
role: 'user',
|
|
652
|
+
parts: [
|
|
653
|
+
{
|
|
654
|
+
functionResponse: {
|
|
655
|
+
name: 'write_file',
|
|
656
|
+
response: { output: 'Successfully wrote file.' },
|
|
657
|
+
},
|
|
658
|
+
},
|
|
659
|
+
],
|
|
660
|
+
});
|
|
661
|
+
history = collapseOlderFunctionResponses(history);
|
|
662
|
+
const stream = await loggingGenerator.generateContentStream({
|
|
663
|
+
model: 'gemini-3-flash-preview',
|
|
664
|
+
contents: history,
|
|
665
|
+
}, `prompt-gh-29591########${turn}`, LlmRole.MAIN);
|
|
666
|
+
for await (const _chunk of stream) {
|
|
667
|
+
// consume stream
|
|
668
|
+
}
|
|
669
|
+
}
|
|
670
|
+
// Active history has already evicted the PDF inlineData (< 2 KB remaining)
|
|
671
|
+
expect(calculateHistoryByteSize(history)).toBeLessThan(2 * 1024);
|
|
672
|
+
// Allow microtasks/finalizers to settle and run V8 garbage collection
|
|
673
|
+
await new Promise((resolve) => setTimeout(resolve, 10));
|
|
674
|
+
gc();
|
|
675
|
+
const retainedHeapDeltaBytes = process.memoryUsage().heapUsed - baselineHeapBytes;
|
|
676
|
+
// The evicted PDF Part must be eligible for garbage collection (not pinned in telemetryBuffer)
|
|
677
|
+
expect(pdfPartRef.deref() === undefined).toBe(true);
|
|
678
|
+
// Heap growth after PDF eviction must remain bounded (< 4 MB), not ~16+ MB of leaked JSON.stringify copies
|
|
679
|
+
expect(retainedHeapDeltaBytes).toBeLessThan(4 * 1024 * 1024);
|
|
680
|
+
});
|
|
681
|
+
it('truncates older multimodal inlineData in ChatCompressionService.compress budget truncation path', async () => {
|
|
682
|
+
const compressionService = new ChatCompressionService();
|
|
683
|
+
const base64Pdf = 'P'.repeat(512 * 1024); // 512 KB base64 PDF payload each
|
|
684
|
+
// Simulate 2 PDF tool turns (2 * 25,800 = 51,600 tokens > COMPRESSION_FUNCTION_RESPONSE_TOKEN_BUDGET of 30,000)
|
|
685
|
+
const history = [
|
|
686
|
+
{ role: 'user', parts: [{ text: 'Ingest deck1.pdf and deck2.pdf' }] },
|
|
687
|
+
{
|
|
688
|
+
role: 'model',
|
|
689
|
+
parts: [
|
|
690
|
+
{
|
|
691
|
+
functionCall: {
|
|
692
|
+
name: 'read_file',
|
|
693
|
+
args: { file_path: 'deck1.pdf' },
|
|
694
|
+
id: 'call-pdf-1',
|
|
695
|
+
},
|
|
696
|
+
},
|
|
697
|
+
],
|
|
698
|
+
},
|
|
699
|
+
{
|
|
700
|
+
role: 'user',
|
|
701
|
+
parts: convertToFunctionResponse('read_file', 'call-pdf-1', [{ inlineData: { mimeType: 'application/pdf', data: base64Pdf } }], 'gemini-3-flash-preview'),
|
|
702
|
+
},
|
|
703
|
+
{ role: 'model', parts: [{ text: 'Read deck1.pdf.' }] },
|
|
704
|
+
{
|
|
705
|
+
role: 'model',
|
|
706
|
+
parts: [
|
|
707
|
+
{
|
|
708
|
+
functionCall: {
|
|
709
|
+
name: 'read_file',
|
|
710
|
+
args: { file_path: 'deck2.pdf' },
|
|
711
|
+
id: 'call-pdf-2',
|
|
712
|
+
},
|
|
713
|
+
},
|
|
714
|
+
],
|
|
715
|
+
},
|
|
716
|
+
{
|
|
717
|
+
role: 'user',
|
|
718
|
+
parts: convertToFunctionResponse('read_file', 'call-pdf-2', [{ inlineData: { mimeType: 'application/pdf', data: base64Pdf } }], 'gemini-3-flash-preview'),
|
|
719
|
+
},
|
|
720
|
+
{ role: 'model', parts: [{ text: 'Read deck2.pdf.' }] },
|
|
721
|
+
];
|
|
722
|
+
const mockChat = {
|
|
723
|
+
getHistory: vi.fn().mockReturnValue(history),
|
|
724
|
+
getLastPromptTokenCount: vi.fn().mockReturnValue(600_000),
|
|
725
|
+
};
|
|
726
|
+
vi.mocked(tokenLimit).mockReturnValue(1_000_000);
|
|
727
|
+
const mockConfig = makeFakeConfig();
|
|
728
|
+
mockConfig.getCompressionThreshold = vi.fn().mockResolvedValue(0.5);
|
|
729
|
+
// When summarization has previously failed (e.g. 429 quota exhausted), compress() relies on truncateHistoryToBudget
|
|
730
|
+
const result = await compressionService.compress(mockChat, 'gh-29591-compress-test', false, 'gemini-3-flash-preview', mockConfig, true);
|
|
731
|
+
expect(result.info.compressionStatus).toBe(CompressionStatus.CONTENT_TRUNCATED);
|
|
732
|
+
expect(result.newHistory).not.toBeNull();
|
|
733
|
+
// The older PDF (turn index 2) exceeds the 30,000 token budget and must have its 512 KB inlineData stripped
|
|
734
|
+
const olderPdfTurn = result.newHistory[2];
|
|
735
|
+
const hasOlderInlineData = olderPdfTurn.parts?.some((p) => p.inlineData !== undefined ||
|
|
736
|
+
p.functionResponse?.parts?.some((fp) => fp.inlineData !== undefined)) ?? false;
|
|
737
|
+
expect(hasOlderInlineData).toBe(false);
|
|
738
|
+
expect(calculateHistoryByteSize(result.newHistory)).toBeLessThan(600 * 1024);
|
|
739
|
+
});
|
|
740
|
+
});
|
|
556
741
|
});
|
|
557
742
|
//# sourceMappingURL=memory-leak-regression.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-leak-regression.test.js","sourceRoot":"","sources":["../../../src/agents/memory-leak-regression.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"memory-leak-regression.test.js","sourceRoot":"","sources":["../../../src/agents/memory-leak-regression.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAE7E,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EACL,kBAAkB,EAClB,4BAA4B,GAC7B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,wBAAwB,EACxB,8BAA8B,EAC9B,qCAAqC,EACrC,sBAAsB,GACvB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EACL,kBAAkB,GAEnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAItD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,EAAE,CAAC,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC;CAC/C,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,qDAAqD,EAAE,GAAG,EAAE;IACnE,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAC1C,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;YAC/E,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS;YACrD,MAAM,SAAS,GAAG,kBAAkB,CAClC,WAAW,EACX,4BAA4B,CAC7B,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,mBAAmB,CAC9D,4BAA4B,CAC7B,CAAC;YACF,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,4CAA4C,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;YACpE,MAAM,WAAW,GAAG,aAAa,CAAC;YAClC,MAAM,MAAM,GAAG,kBAAkB,CAC/B,WAAW,EACX,4BAA4B,CAC7B,CAAC;YACF,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;YAC/E,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;YAC1C,MAAM,IAAI,GAAS;gBACjB,gBAAgB,EAAE;oBAChB,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE;wBACR,MAAM,EAAE,WAAW;qBACpB;iBACF;aACF,CAAC;YAEF,MAAM,aAAa,GAAG,4BAA4B,CAChD,IAAI,EACJ,4BAA4B,CAC7B,CAAC;YACF,MAAM,QAAQ,GAAG,aAAa,CAAC,gBAAgB,EAAE,QAEhD,CAAC;YACF,MAAM,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC/B,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,SAAS,CAC/B,4CAA4C,CAC7C,CAAC;YACF,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,mBAAmB,CACpE,4BAA4B,CAC7B,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,8CAA8C,EAAE,GAAG,EAAE;QAC5D,EAAE,CAAC,iHAAiH,EAAE,GAAG,EAAE;YACzH,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;YAEvD,+CAA+C;YAC/C,MAAM,OAAO,GAAc;gBACzB,SAAS;gBACT,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC,EAAE;gBAC1D;oBACE,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;qBACjE;iBACF;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE;wBACL;4BACE,gBAAgB,EAAE;gCAChB,IAAI,EAAE,OAAO;gCACb,QAAQ,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE;6BACtC;yBACF;qBACF;iBACF;gBACD,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,EAAE;gBAEvD,SAAS;gBACT,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC,EAAE;gBAC1D;oBACE,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;qBACjE;iBACF;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE;wBACL;4BACE,gBAAgB,EAAE;gCAChB,IAAI,EAAE,OAAO;gCACb,QAAQ,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE;6BACtC;yBACF;qBACF;iBACF;gBACD,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,EAAE;gBAEvD,SAAS;gBACT,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC,EAAE;gBAC1D;oBACE,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;qBACjE;iBACF;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE;wBACL;4BACE,gBAAgB,EAAE;gCAChB,IAAI,EAAE,OAAO;gCACb,QAAQ,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE;6BACtC;yBACF;qBACF;iBACF;gBACD,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,EAAE;gBAEvD,SAAS;gBACT,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC,EAAE;gBAC1D;oBACE,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;qBACjE;iBACF;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE;wBACL;4BACE,gBAAgB,EAAE;gCAChB,IAAI,EAAE,OAAO;gCACb,QAAQ,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE;6BACtC;yBACF;qBACF;iBACF;gBACD,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,EAAE;gBAEvD,SAAS;gBACT,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC,EAAE;gBAC1D;oBACE,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;qBACjE;iBACF;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE;wBACL;4BACE,gBAAgB,EAAE;gCAChB,IAAI,EAAE,OAAO;gCACb,QAAQ,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE;6BACtC;yBACF;qBACF;iBACF;aACF,CAAC;YAEF,MAAM,SAAS,GAAG,8BAA8B,CAC9C,OAAO,EACP,qCAAqC,CACtC,CAAC;YAEF,qDAAqD;YACrD,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,KAAM,CAAC,CAAC,CAAC,CAAC,gBAAgB,EAAE,QAE1D,CAAC;YACF,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,SAAS,CAChC,4CAA4C,CAC7C,CAAC;YACF,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,mBAAmB,CACrE,qCAAqC,GAAG,GAAG,CAC5C,CAAC;YAEF,qDAAqD;YACrD,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,KAAM,CAAC,CAAC,CAAC,CAAC,gBAAgB,EAAE,QAE1D,CAAC;YACF,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,SAAS,CAChC,4CAA4C,CAC7C,CAAC;YAEF,2EAA2E;YAC3E,MAAM,SAAS,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC,KAAM,CAAC,CAAC,CAAC,CAAC,gBAAgB,EAAE,QAE3D,CAAC;YACF,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAE/C,MAAM,SAAS,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC,KAAM,CAAC,CAAC,CAAC,CAAC,gBAAgB,EAAE,QAE3D,CAAC;YACF,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAE/C,MAAM,SAAS,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC,KAAM,CAAC,CAAC,CAAC,CAAC,gBAAgB,EAAE,QAE3D,CAAC;YACF,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;YAC1E,IAAI,cAAc,GAAc,EAAE,CAAC;YACnC,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,wBAAwB;YAEvE,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC;gBACtC,uBAAuB;gBACvB,cAAc,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL;4BACE,YAAY,EAAE;gCACZ,IAAI,EAAE,OAAO;gCACb,IAAI,EAAE,EAAE,OAAO,EAAE,YAAY,IAAI,EAAE,EAAE;6BACtC;yBACF;qBACF;iBACF,CAAC,CAAC;gBAEH,sDAAsD;gBACtD,MAAM,UAAU,GAAG,4BAA4B,CAAC;oBAC9C,gBAAgB,EAAE;wBAChB,IAAI,EAAE,OAAO;wBACb,QAAQ,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE;qBACtC;iBACF,CAAC,CAAC;gBACH,cAAc,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE,CAAC,UAAU,CAAC;iBACpB,CAAC,CAAC;gBAEH,2BAA2B;gBAC3B,cAAc,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,IAAI,aAAa,EAAE,CAAC;iBAC7C,CAAC,CAAC;gBAEH,kEAAkE;gBAClE,cAAc,GAAG,8BAA8B,CAAC,cAAc,CAAC,CAAC;YAClE,CAAC;YAED,MAAM,aAAa,GAAG,wBAAwB,CAAC,cAAc,CAAC,CAAC;YAE/D,4DAA4D;YAC5D,kFAAkF;YAClF,4DAA4D;YAC5D,MAAM,CAAC,aAAa,CAAC,CAAC,YAAY,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;YAE/C,gDAAgD;YAChD,MAAM,SAAS,GAAG,cAAc,CAAC,MAAM,CACrC,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,KAAK,MAAM;gBACjB,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,EAAE,IAAI,KAAK,OAAO,CAAC,CAC7D,CAAC;YACF,MAAM,cAAc,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACvD,MAAM,UAAU,GAAG,cAAc,CAAC,KAAM,CAAC,CAAC,CAAC,CAAC,gBAAgB;gBAC1D,EAAE,QAEH,CAAC;YACF,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAEhD,2EAA2E;YAC3E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC9C,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,KAAM,CAAC,CAAC,CAAC,CAAC,gBAAgB,EAAE,QAExD,CAAC;gBACF,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAC9B,4CAA4C,CAC7C,CAAC;YACJ,CAAC;YAED,uDAAuD;YACvD,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC7D,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,KAAM,CAAC,CAAC,CAAC,CAAC,gBAAgB;oBACxD,EAAE,QAEH,CAAC;gBACF,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAClD,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,sDAAsD,EAAE,GAAG,EAAE;QACpE,IAAI,kBAA0C,CAAC;QAC/C,IAAI,QAAoB,CAAC;QAEzB,UAAU,CAAC,GAAG,EAAE;YACd,kBAAkB,GAAG,IAAI,sBAAsB,EAAE,CAAC;YAClD,QAAQ,GAAG;gBACT,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE;gBACnB,uBAAuB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC;aAC7B,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mHAAmH,EAAE,KAAK,IAAI,EAAE;YACjI,6FAA6F;YAC7F,+EAA+E;YAC/E,MAAM,OAAO,GAAc;gBACzB,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,EAAE;gBAClD,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,EAAE;aACtD,CAAC;YAEF,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YACxD,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YACrE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAEjD,MAAM,UAAU,GAAG,cAAc,EAAE,CAAC;YACpC,UAAU,CAAC,uBAAuB,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YAEpE,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAC9C,QAAQ,EACR,yBAAyB,EACzB,KAAK,EACL,gBAAgB,EAChB,UAAU,EACV,KAAK,CACN,CAAC;YAEF,gDAAgD;YAChD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACnE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4FAA4F,EAAE,KAAK,IAAI,EAAE;YAC1G,MAAM,OAAO,GAAc;gBACzB,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,EAAE;gBAClD,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,EAAE;aACtD,CAAC;YAEF,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YACxD,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YACpE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAEjD,MAAM,UAAU,GAAG,cAAc,EAAE,CAAC;YACpC,UAAU,CAAC,uBAAuB,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YAEpE,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAC9C,QAAQ,EACR,gBAAgB,EAChB,KAAK,EACL,kBAAkB,EAClB,UAAU,EACV,KAAK,CACN,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACnE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kFAAkF,EAAE,KAAK,IAAI,EAAE;YAChG,MAAM,OAAO,GAAc;gBACzB,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,EAAE;gBACjD,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,EAAE;aACvD,CAAC;YAEF,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YACxD,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;YACjE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAEjD,MAAM,UAAU,GAAG,cAAc,EAAE,CAAC;YACpC,UAAU,CAAC,uBAAuB,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YAEpE,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAC9C,QAAQ,EACR,WAAW,EACX,KAAK,EACL,gBAAgB,EAChB,UAAU,EACV,KAAK,CACN,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACnE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;QACvC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;YAC3D,MAAM,OAAO,GAAG,aAAa,CAAC;YAC9B,MAAM,OAAO,GAAG,aAAa,CAAC;YAC9B,MAAM,aAAa,GAAG;gBACpB,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE;gBACtE,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE;aACxE,CAAC;YAEF,sEAAsE;YACtE,MAAM,WAAW,GAAc;gBAC7B,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE;gBAC5C,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE;aAC9C,CAAC;YAEF,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;gBAC/C,EAAE,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,eAAe;gBAC7C,OAAO,EAAE,CAAC;aACX,CAAC,CAAC,CAAC;YAEJ,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACxC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACzC,EAAE,CAAC,sEAAsE,EAAE,GAAG,EAAE;YAC9E,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;YAC3C,MAAM,SAAS,GAAG,wCAAwC,CAAC;YAC3D,MAAM,SAAS,GAAG,kBAAkB,CAClC,WAAW,EACX,4BAA4B,EAC5B,SAAS,CACV,CAAC;YAEF,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CACzB,mEAAmE,SAAS,GAAG,CAChF,CAAC;YACF,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,mBAAmB,CAC9D,4BAA4B,CAC7B,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,8CAA8C,EAAE,GAAG,EAAE;QAC5D,EAAE,CAAC,8GAA8G,EAAE,KAAK,IAAI,EAAE;YAC5H,MAAM,MAAM,GAAG,cAAc,EAAE,CAAC;YAChC,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YACtE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC,eAAe,CAC3D,EAAE,CAAC,MAAM,EAAE,CACZ,CAAC;YACF,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC;YAE1C,6FAA6F;YAC7F,yFAAyF;YACzF,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;YAC1C,MAAM,cAAc,GAAW,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBACnE,IAAI,EAAE,YAAY,CAAC,cAAc,WAAW,EAAE;aAC/C,CAAC,CAAC,CAAC;YAEJ,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC;gBAC5B,IAAI,EAAE,iBAAiB;gBACvB,WAAW,EAAE,sBAAsB;gBACnC,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;oBACpB,UAAU,EAAE,cAAc;oBAC1B,aAAa,EAAE,eAAe;iBAC/B,CAAC;aACH,CAAC,CAAC;YACH,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAEtC,MAAM,aAAa,GAAsB;gBACvC,MAAM,EAAE,kBAAkB,CAAC,SAAS;gBACpC,OAAO,EAAE;oBACP,MAAM,EAAE,gBAAgB;oBACxB,IAAI,EAAE,iBAAiB;oBACvB,IAAI,EAAE,EAAE;oBACR,iBAAiB,EAAE,KAAK;oBACxB,SAAS,EAAE,kBAAkB;iBAC9B;gBACD,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE,UAA0C;gBACtD,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC;YAEF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC;gBACpC,IAAI,EAAE,aAAa;gBACnB,MAAM,EAAE,IAAI,eAAe,EAAE,CAAC,MAAM;gBACpC,gBAAgB,EAAE,EAAE,CAAC,EAAE,EAAE;aAC1B,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;YACvD,IAAI,MAAM,CAAC,MAAM,KAAK,kBAAkB,CAAC,OAAO,EAAE,CAAC;gBACjD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,gBAAgB;oBACjE,EAAE,QAA8B,CAAC;gBACnC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;gBACvC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,mBAAmB,CACpE,4BAA4B,CAC7B,CAAC;gBACF,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjD,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;oBAC/B,MAAM,gBAAgB,GAAG,EAAE,CAAC,YAAY,CACtC,MAAM,CAAC,QAAQ,CAAC,UAAU,EAC1B,MAAM,CACP,CAAC;oBACF,MAAM,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;oBAC1D,MAAM,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gHAAgH,EAAE,KAAK,IAAI,EAAE;YAC9H,MAAM,MAAM,GAAG,cAAc,EAAE,CAAC;YAChC,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YACtE,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC;YAE1C,8EAA8E;YAC9E,0DAA0D;YAC1D,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAC;YAClE,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;YAE3C,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC;gBAC5B,IAAI,EAAE,iBAAiB;gBACvB,WAAW,EAAE,oCAAoC;gBACjD,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;oBACpB,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;oBAC3D,aAAa,EAAE,cAAc;iBAC9B,CAAC;aACH,CAAC,CAAC;YACH,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAEtC,MAAM,aAAa,GAAsB;gBACvC,MAAM,EAAE,kBAAkB,CAAC,SAAS;gBACpC,OAAO,EAAE;oBACP,MAAM,EAAE,yBAAyB;oBACjC,IAAI,EAAE,iBAAiB;oBACvB,IAAI,EAAE,EAAE;oBACR,iBAAiB,EAAE,KAAK;oBACxB,SAAS,EAAE,2BAA2B;iBACvC;gBACD,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE,UAA0C;gBACtD,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC;YAEF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC;gBACpC,IAAI,EAAE,aAAa;gBACnB,MAAM,EAAE,IAAI,eAAe,EAAE,CAAC,MAAM;gBACpC,gBAAgB,EAAE,EAAE,CAAC,EAAE,EAAE;aAC1B,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;YACvD,IAAI,MAAM,CAAC,MAAM,KAAK,kBAAkB,CAAC,OAAO,EAAE,CAAC;gBACjD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,gBAAgB;oBACjE,EAAE,QAA8B,CAAC;gBACnC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;gBACvC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,mBAAmB,CACpE,4BAA4B,CAC7B,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mHAAmH,EAAE,GAAG,EAAE;YAC3H,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,wBAAwB;YACpE,MAAM,oBAAoB,GAAG,yBAAyB,CACpD,WAAW,EACX,YAAY,EACZ,CAAC,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC,EAC9D,cAAc,CACf,CAAC;YAEF,MAAM,OAAO,GAAc;gBACzB,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,oBAAoB,EAAE;aAC9C,CAAC;YACF,MAAM,eAAe,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;YAE1D,MAAM,CAAC,eAAe,CAAC,CAAC,sBAAsB,CAC5C,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,MAAM,CAAC,CACvC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2IAA2I,EAAE,GAAG,EAAE;YACnJ,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,mBAAmB;YAC/D,MAAM,OAAO,GAAc,EAAE,CAAC;YAE9B,oGAAoG;YACpG,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC;gBACrC,OAAO,CAAC,IAAI,CACV,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,IAAI,UAAU,EAAE,CAAC,EAAE,EAC3D;oBACE,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL;4BACE,YAAY,EAAE;gCACZ,IAAI,EAAE,OAAO;gCACb,IAAI,EAAE,EAAE,OAAO,EAAE,WAAW,IAAI,EAAE,EAAE;gCACpC,EAAE,EAAE,QAAQ,IAAI,EAAE;6BACnB;yBACF;qBACF;iBACF,EACD;oBACE,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE;wBACL;4BACE,gBAAgB,EAAE;gCAChB,IAAI,EAAE,OAAO;gCACb,EAAE,EAAE,QAAQ,IAAI,EAAE;gCAClB,QAAQ,EAAE,EAAE,MAAM,EAAE,sCAAsC,EAAE;gCAC5D,KAAK,EAAE;oCACL;wCACE,UAAU,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE;qCACzD;iCACF;6BACF;yBACF;wBACD,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE;qBAC7D;iBACF,EACD,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,IAAI,WAAW,EAAE,CAAC,EAAE,CAC9D,CAAC;YACJ,CAAC;YAED,MAAM,SAAS,GAAG,8BAA8B,CAC9C,OAAO,EACP,qCAAqC,CACtC,CAAC;YAEF,6GAA6G;YAC7G,KAAK,MAAM,OAAO,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;gBACjC,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC7C,MAAM,mBAAmB,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC3C,CAAC,CAAC,gBAAgB,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,KAAK,SAAS,CAAC,CACrE,CAAC;gBACF,MAAM,oBAAoB,GAAG,KAAK,CAAC,IAAI,CACrC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,SAAS,CAClC,CAAC;gBACF,MAAM,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACxC,MAAM,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3C,CAAC;YAED,oGAAoG;YACpG,KAAK,MAAM,OAAO,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;gBACnC,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC7C,MAAM,mBAAmB,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC3C,CAAC,CAAC,gBAAgB,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,KAAK,SAAS,CAAC,CACrE,CAAC;gBACF,MAAM,oBAAoB,GAAG,KAAK,CAAC,IAAI,CACrC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,SAAS,CAClC,CAAC;gBACF,MAAM,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACvC,MAAM,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4HAA4H,EAAE,KAAK,IAAI,EAAE;YAC1I,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CACvC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,mBAAmB,CAAC,CAC5C,CAAC;YACF,IAAI,CAAC;gBACH,MAAM,cAAc,GAAG,IAAI,wBAAwB,EAAE,CAAC;gBACtD,MAAM,UAAU,GAAG,cAAc,EAAE,CAAC;gBACpC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,eAAe,CAC3D,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAC9B,CAAC;gBACF,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC,eAAe,CAC/D,OAAO,CACR,CAAC;gBACF,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,4BAA4B,CAAC,CAAC,iBAAiB,CAAC;oBACnE,yBAAyB,EAAE,IAAI,EAAE,oBAAoB;oBACrD,0BAA0B,EAAE,IAAI,EAAE,4BAA4B;oBAC9D,iBAAiB,EAAE,IAAI;iBACxB,CAAC,CAAC;gBAEH,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;gBAC3C,MAAM,OAAO,GAAc,EAAE,CAAC;gBAC9B,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC;oBACrC,MAAM,UAAU,GAAG,yBAAyB,CAC1C,WAAW,EACX,YAAY,IAAI,EAAE,EAClB,CAAC,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC,EAC9D,cAAc,CACf,CAAC;oBACF,OAAO,CAAC,IAAI,CACV;wBACE,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE;4BACL;gCACE,YAAY,EAAE;oCACZ,IAAI,EAAE,WAAW;oCACjB,IAAI,EAAE,EAAE,SAAS,EAAE,OAAO,IAAI,MAAM,EAAE;oCACtC,EAAE,EAAE,YAAY,IAAI,EAAE;iCACvB;6BACF;yBACF;qBACF,EACD,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,CACpC,CAAC;gBACJ,CAAC;gBAED,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;gBAE9D,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;gBAC9C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;gBAC9C,MAAM,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;gBAC5C,MAAM,gBAAgB,GACpB,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,KAAK,EAAE,IAAI,CACtD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,SAAS,CAClC,IAAI,KAAK,CAAC;gBACb,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvC,CAAC;oBAAS,CAAC;gBACT,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAClE,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8FAA8F,EAAE,GAAG,EAAE;YACtG,IAAI,cAAc,GAAc,EAAE,CAAC;YACnC,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,iBAAiB;YAEhE,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC;gBACtC,cAAc,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL;4BACE,YAAY,EAAE;gCACZ,IAAI,EAAE,iBAAiB;gCACvB,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,iBAAiB,IAAI,OAAO,CAAC,EAAE;6BAChD;yBACF;qBACF;iBACF,CAAC,CAAC;gBAEH,MAAM,UAAU,GAAG,4BAA4B,CAAC;oBAC9C,gBAAgB,EAAE;wBAChB,IAAI,EAAE,iBAAiB;wBACvB,QAAQ,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE;qBACtC;iBACF,CAAC,CAAC;gBACH,cAAc,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE,CAAC,UAAU,CAAC;iBACpB,CAAC,CAAC;gBAEH,cAAc,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,IAAI,aAAa,EAAE,CAAC;iBAC7C,CAAC,CAAC;gBAEH,cAAc,GAAG,8BAA8B,CAAC,cAAc,CAAC,CAAC;YAClE,CAAC;YAED,MAAM,aAAa,GAAG,wBAAwB,CAAC,cAAc,CAAC,CAAC;YAE/D,0EAA0E;YAC1E,mGAAmG;YACnG,MAAM,CAAC,aAAa,CAAC,CAAC,YAAY,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qEAAqE,EAAE,GAAG,EAAE;QACnF,EAAE,CAAC,kIAAkI,EAAE,KAAK,IAAI,EAAE;YAChJ,EAAE,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;YACrC,MAAM,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,IAAI,CAAe,CAAC;YAElD,MAAM,MAAM,GAAG,cAAc,EAAE,CAAC;YAChC,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAC/D,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,+BAA+B,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YACzE,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAErE,MAAM,gBAAgB,GAAqB;gBACzC,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;oBAC5B,UAAU,EAAE,EAAE;oBACd,IAAI,EAAE,SAAS;oBACf,aAAa,EAAE,SAAS;oBACxB,cAAc,EAAE,SAAS;oBACzB,mBAAmB,EAAE,SAAS;oBAC9B,IAAI,EAAE,SAAS;iBAChB,CAAC;gBACF,qBAAqB,EAAE,KAAK,IAAI,EAAE,CAChC,CAAC,KAAK,SAAS,CAAC;oBACd,MAAM;wBACJ,UAAU,EAAE;4BACV;gCACE,OAAO,EAAE;oCACP,IAAI,EAAE,OAAO;oCACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,CAAC;iCACxC;6BACF;yBACF;wBACD,aAAa,EAAE;4BACb,gBAAgB,EAAE,KAAK;4BACvB,oBAAoB,EAAE,EAAE;4BACxB,eAAe,EAAE,KAAK;yBACvB;wBACD,IAAI,EAAE,SAAS;wBACf,aAAa,EAAE,SAAS;wBACxB,cAAc,EAAE,SAAS;wBACzB,mBAAmB,EAAE,SAAS;wBAC9B,IAAI,EAAE,SAAS;qBAChB,CAAC;gBACJ,CAAC,CAAC,EAAE;gBACN,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;gBACjD,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;aAC/C,CAAC;YAEF,MAAM,gBAAgB,GAAG,IAAI,uBAAuB,CAClD,gBAAgB,EAChB,MAAM,CACP,CAAC;YAEF,EAAE,EAAE,CAAC;YACL,MAAM,iBAAiB,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;YAEzD,yEAAyE;YACzE,6EAA6E;YAC7E,MAAM,uBAAuB,GAAG,GAG9B,EAAE;gBACF,MAAM,QAAQ,GAAS;oBACrB,UAAU,EAAE;wBACV,QAAQ,EAAE,iBAAiB;wBAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;qBAC9D;iBACF,CAAC;gBACF,MAAM,QAAQ,GAAS;oBACrB,UAAU,EAAE;wBACV,QAAQ,EAAE,iBAAiB;wBAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;qBAC9D;iBACF,CAAC;gBACF,OAAO;oBACL,OAAO,EAAE;wBACP;4BACE,IAAI,EAAE,MAAM;4BACZ,KAAK,EAAE;gCACL,QAAQ;gCACR,QAAQ;gCACR,EAAE,IAAI,EAAE,iDAAiD,EAAE;6BAC5D;yBACF;qBACF;oBACD,UAAU,EAAE,IAAI,OAAO,CAAC,QAAQ,CAAC;iBAClC,CAAC;YACJ,CAAC,CAAC;YAEF,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,uBAAuB,EAAE,CAAC;YAExD,2EAA2E;YAC3E,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC;gBACrC,OAAO,CAAC,IAAI,CACV;oBACE,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL;4BACE,YAAY,EAAE;gCACZ,IAAI,EAAE,YAAY;gCAClB,IAAI,EAAE;oCACJ,IAAI,EAAE,aAAa,IAAI,KAAK;oCAC5B,OAAO,EAAE,UAAU,IAAI,EAAE;iCAC1B;6BACF;yBACF;qBACF;iBACF,EACD;oBACE,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE;wBACL;4BACE,gBAAgB,EAAE;gCAChB,IAAI,EAAE,YAAY;gCAClB,QAAQ,EAAE,EAAE,MAAM,EAAE,0BAA0B,EAAE;6BACjD;yBACF;qBACF;iBACF,CACF,CAAC;gBAEF,OAAO,GAAG,8BAA8B,CAAC,OAAO,CAAC,CAAC;gBAElD,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,qBAAqB,CACzD;oBACE,KAAK,EAAE,wBAAwB;oBAC/B,QAAQ,EAAE,OAAO;iBAClB,EACD,0BAA0B,IAAI,EAAE,EAChC,OAAO,CAAC,IAAI,CACb,CAAC;gBACF,IAAI,KAAK,EAAE,MAAM,MAAM,IAAI,MAAM,EAAE,CAAC;oBAClC,iBAAiB;gBACnB,CAAC;YACH,CAAC;YAED,2EAA2E;YAC3E,MAAM,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YAEjE,sEAAsE;YACtE,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;YACxD,EAAE,EAAE,CAAC;YAEL,MAAM,sBAAsB,GAC1B,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,GAAG,iBAAiB,CAAC;YAErD,+FAA+F;YAC/F,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACpD,2GAA2G;YAC3G,MAAM,CAAC,sBAAsB,CAAC,CAAC,YAAY,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iGAAiG,EAAE,KAAK,IAAI,EAAE;YAC/G,MAAM,kBAAkB,GAAG,IAAI,sBAAsB,EAAE,CAAC;YACxD,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,iCAAiC;YAE3E,gHAAgH;YAChH,MAAM,OAAO,GAAc;gBACzB,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,gCAAgC,EAAE,CAAC,EAAE;gBACrE;oBACE,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL;4BACE,YAAY,EAAE;gCACZ,IAAI,EAAE,WAAW;gCACjB,IAAI,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE;gCAChC,EAAE,EAAE,YAAY;6BACjB;yBACF;qBACF;iBACF;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE,yBAAyB,CAC9B,WAAW,EACX,YAAY,EACZ,CAAC,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,EAClE,wBAAwB,CACzB;iBACF;gBACD,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,EAAE;gBACvD;oBACE,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL;4BACE,YAAY,EAAE;gCACZ,IAAI,EAAE,WAAW;gCACjB,IAAI,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE;gCAChC,EAAE,EAAE,YAAY;6BACjB;yBACF;qBACF;iBACF;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE,yBAAyB,CAC9B,WAAW,EACX,YAAY,EACZ,CAAC,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,EAClE,wBAAwB,CACzB;iBACF;gBACD,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,EAAE;aACxD,CAAC;YAEF,MAAM,QAAQ,GAAG;gBACf,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC;gBAC5C,uBAAuB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC;aACjC,CAAC;YAE3B,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YACjD,MAAM,UAAU,GAAG,cAAc,EAAE,CAAC;YACpC,UAAU,CAAC,uBAAuB,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YAEpE,oHAAoH;YACpH,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAC9C,QAAQ,EACR,wBAAwB,EACxB,KAAK,EACL,wBAAwB,EACxB,UAAU,EACV,IAAI,CACL,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,CACxC,iBAAiB,CAAC,iBAAiB,CACpC,CAAC;YACF,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YACzC,4GAA4G;YAC5G,MAAM,YAAY,GAAG,MAAM,CAAC,UAAW,CAAC,CAAC,CAAC,CAAC;YAC3C,MAAM,kBAAkB,GACtB,YAAY,CAAC,KAAK,EAAE,IAAI,CACtB,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,UAAU,KAAK,SAAS;gBAC1B,CAAC,CAAC,gBAAgB,EAAE,KAAK,EAAE,IAAI,CAC7B,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,KAAK,SAAS,CACpC,CACJ,IAAI,KAAK,CAAC;YACb,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvC,MAAM,CAAC,wBAAwB,CAAC,MAAM,CAAC,UAAW,CAAC,CAAC,CAAC,YAAY,CAC/D,GAAG,GAAG,IAAI,CACX,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -11,6 +11,7 @@ export declare class MessageBus extends EventEmitter {
|
|
|
11
11
|
private readonly debug;
|
|
12
12
|
private readonly isTrusted;
|
|
13
13
|
private listenerToAbortCleanup;
|
|
14
|
+
private pendingRequests;
|
|
14
15
|
constructor(policyEngine: PolicyEngine, debug?: boolean, isTrusted?: boolean);
|
|
15
16
|
private isValidMessage;
|
|
16
17
|
private emitMessage;
|
|
@@ -14,6 +14,8 @@ export class MessageBus extends EventEmitter {
|
|
|
14
14
|
debug;
|
|
15
15
|
isTrusted;
|
|
16
16
|
listenerToAbortCleanup = new WeakMap();
|
|
17
|
+
// State of pending request() calls by correlationId, updated by publish().
|
|
18
|
+
pendingRequests = new Map();
|
|
17
19
|
constructor(policyEngine, debug = false, isTrusted = true) {
|
|
18
20
|
super();
|
|
19
21
|
this.policyEngine = policyEngine;
|
|
@@ -64,6 +66,8 @@ export class MessageBus extends EventEmitter {
|
|
|
64
66
|
bus.once = this.once.bind(this);
|
|
65
67
|
bus.removeListener = this.removeListener.bind(this);
|
|
66
68
|
bus.listenerCount = this.listenerCount.bind(this);
|
|
69
|
+
// Share pending request state so the parent's publish() can update it
|
|
70
|
+
bus.pendingRequests = this.pendingRequests;
|
|
67
71
|
return bus;
|
|
68
72
|
}
|
|
69
73
|
async publish(message) {
|
|
@@ -126,6 +130,16 @@ export class MessageBus extends EventEmitter {
|
|
|
126
130
|
}
|
|
127
131
|
}
|
|
128
132
|
catch (error) {
|
|
133
|
+
// Record the failure for a pending request() with this correlationId
|
|
134
|
+
if (message &&
|
|
135
|
+
typeof message === 'object' &&
|
|
136
|
+
'correlationId' in message) {
|
|
137
|
+
const pending = this.pendingRequests.get(message.correlationId);
|
|
138
|
+
if (pending) {
|
|
139
|
+
pending.failed = true;
|
|
140
|
+
pending.error = error;
|
|
141
|
+
}
|
|
142
|
+
}
|
|
129
143
|
this.emit('error', error);
|
|
130
144
|
}
|
|
131
145
|
}
|
|
@@ -187,6 +201,11 @@ export class MessageBus extends EventEmitter {
|
|
|
187
201
|
const cleanup = () => {
|
|
188
202
|
clearTimeout(timeoutId);
|
|
189
203
|
this.unsubscribe(responseType, responseHandler);
|
|
204
|
+
this.pendingRequests.delete(correlationId);
|
|
205
|
+
};
|
|
206
|
+
const fail = (error) => {
|
|
207
|
+
cleanup();
|
|
208
|
+
reject(error);
|
|
190
209
|
};
|
|
191
210
|
const responseHandler = (response) => {
|
|
192
211
|
// Check if this response matches our request
|
|
@@ -198,9 +217,20 @@ export class MessageBus extends EventEmitter {
|
|
|
198
217
|
};
|
|
199
218
|
// Subscribe to responses
|
|
200
219
|
this.subscribe(responseType, responseHandler);
|
|
201
|
-
//
|
|
202
|
-
|
|
203
|
-
|
|
220
|
+
// Track the request so publish() can record a failure for it
|
|
221
|
+
this.pendingRequests.set(correlationId, { failed: false });
|
|
222
|
+
// Publish the request with correlation ID and reject if publishing fails
|
|
223
|
+
try {
|
|
224
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
|
|
225
|
+
this.publish({ ...request, correlationId }).then(() => {
|
|
226
|
+
const pending = this.pendingRequests.get(correlationId);
|
|
227
|
+
if (pending?.failed)
|
|
228
|
+
fail(pending.error);
|
|
229
|
+
}, fail);
|
|
230
|
+
}
|
|
231
|
+
catch (error) {
|
|
232
|
+
fail(error);
|
|
233
|
+
}
|
|
204
234
|
});
|
|
205
235
|
}
|
|
206
236
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-bus.js","sourceRoot":"","sources":["../../../src/confirmation-bus/message-bus.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAgB,MAAM,YAAY,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,MAAM,OAAO,UAAW,SAAQ,YAAY;
|
|
1
|
+
{"version":3,"file":"message-bus.js","sourceRoot":"","sources":["../../../src/confirmation-bus/message-bus.ts"],"names":[],"mappings":"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"}
|