@stanleysun233/oneproxy-cli 1.0.11 → 1.0.12
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/commands.js +1 -0
- package/dist/commands.js.map +1 -1
- package/dist/control-plane.d.ts +1 -0
- package/dist/control-plane.js +43 -7
- package/dist/control-plane.js.map +1 -1
- package/dist/daemon/http-proxy.d.ts +2 -1
- package/dist/daemon/http-proxy.js +14 -8
- package/dist/daemon/http-proxy.js.map +1 -1
- package/dist/daemon/lifecycle.d.ts +1 -0
- package/dist/daemon/lifecycle.js +2 -1
- package/dist/daemon/lifecycle.js.map +1 -1
- package/dist/daemon/router.d.ts +2 -1
- package/dist/daemon/router.js +3 -0
- package/dist/daemon/router.js.map +1 -1
- package/dist/main.js +18 -4
- package/dist/main.js.map +1 -1
- package/dist/run-isolation.d.ts +22 -0
- package/dist/run-isolation.js +249 -0
- package/dist/run-isolation.js.map +1 -0
- package/dist/session-env.d.ts +7 -5
- package/dist/session-env.js +109 -101
- package/dist/session-env.js.map +1 -1
- package/dist/shell-detect.d.ts +8 -0
- package/dist/shell-detect.js +69 -0
- package/dist/shell-detect.js.map +1 -0
- package/dist/shell.js +9 -21
- package/dist/shell.js.map +1 -1
- package/dist/storage.d.ts +2 -0
- package/dist/storage.js.map +1 -1
- package/dist/update-check.d.ts +2 -0
- package/dist/update-check.js +141 -0
- package/dist/update-check.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import * as fsSync from 'node:fs';
|
|
2
|
+
export function detectShellPath(input = {}) {
|
|
3
|
+
const env = input.env ?? process.env;
|
|
4
|
+
const platform = input.platform ?? process.platform;
|
|
5
|
+
const explicit = firstNonEmpty(env.ONEPROXY_SHELL);
|
|
6
|
+
if (explicit) {
|
|
7
|
+
return explicit;
|
|
8
|
+
}
|
|
9
|
+
const parentShell = input.parentShell ?? readParentShellName(platform);
|
|
10
|
+
if (parentShell && shellFamilyFrom(parentShell)) {
|
|
11
|
+
return parentShell;
|
|
12
|
+
}
|
|
13
|
+
if (platform === 'win32') {
|
|
14
|
+
return firstNonEmpty(env.ComSpec, env.SHELL) ?? 'cmd.exe';
|
|
15
|
+
}
|
|
16
|
+
return firstNonEmpty(env.SHELL, env.ComSpec) ?? '/bin/sh';
|
|
17
|
+
}
|
|
18
|
+
export function detectShellFamily(input = {}) {
|
|
19
|
+
return shellFamilyFrom(detectShellPath(input)) ?? 'posix';
|
|
20
|
+
}
|
|
21
|
+
function readParentShellName(platform) {
|
|
22
|
+
if (platform !== 'linux' || !process.ppid) {
|
|
23
|
+
return '';
|
|
24
|
+
}
|
|
25
|
+
return firstRecognizedProcValue(`/proc/${process.ppid}/comm`, `/proc/${process.ppid}/cmdline`);
|
|
26
|
+
}
|
|
27
|
+
function firstRecognizedProcValue(...files) {
|
|
28
|
+
for (const file of files) {
|
|
29
|
+
const value = readProcValue(file);
|
|
30
|
+
if (value && shellFamilyFrom(value)) {
|
|
31
|
+
return value;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
return '';
|
|
35
|
+
}
|
|
36
|
+
function readProcValue(file) {
|
|
37
|
+
try {
|
|
38
|
+
const body = fsSync.readFileSync(file, 'utf8').trim();
|
|
39
|
+
return body.split('\0')[0] ?? '';
|
|
40
|
+
}
|
|
41
|
+
catch {
|
|
42
|
+
return '';
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
function shellFamilyFrom(value) {
|
|
46
|
+
const shell = shellName(value);
|
|
47
|
+
if (shell === 'fish') {
|
|
48
|
+
return 'fish';
|
|
49
|
+
}
|
|
50
|
+
if (shell === 'powershell' || shell === 'pwsh' || shell === 'powershell_ise') {
|
|
51
|
+
return 'powershell';
|
|
52
|
+
}
|
|
53
|
+
if (shell === 'cmd') {
|
|
54
|
+
return 'cmd';
|
|
55
|
+
}
|
|
56
|
+
if (['sh', 'bash', 'zsh', 'dash', 'ksh', 'ash'].includes(shell)) {
|
|
57
|
+
return 'posix';
|
|
58
|
+
}
|
|
59
|
+
return null;
|
|
60
|
+
}
|
|
61
|
+
function shellName(value) {
|
|
62
|
+
const normalized = value.trim().replace(/\\/g, '/').split(/\s+/)[0] ?? '';
|
|
63
|
+
const base = normalized.split('/').filter(Boolean).pop() ?? normalized;
|
|
64
|
+
return base.toLowerCase().replace(/\.exe$/, '');
|
|
65
|
+
}
|
|
66
|
+
function firstNonEmpty(...values) {
|
|
67
|
+
return values.map((value) => value?.trim()).find(Boolean);
|
|
68
|
+
}
|
|
69
|
+
//# sourceMappingURL=shell-detect.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shell-detect.js","sourceRoot":"","sources":["../src/shell-detect.ts"],"names":[],"mappings":"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"}
|
package/dist/shell.js
CHANGED
|
@@ -1,17 +1,9 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
|
-
import {
|
|
2
|
+
import { sessionProxyEnv } from "./session-env.js";
|
|
3
3
|
import { startDaemonSession } from "./daemon/lifecycle.js";
|
|
4
4
|
import { runTuiCommand } from "./tui/runtime.js";
|
|
5
5
|
import { buildTuiStatusSnapshot } from "./tui/status.js";
|
|
6
|
-
|
|
7
|
-
if (process.env.ONEPROXY_SHELL) {
|
|
8
|
-
return process.env.ONEPROXY_SHELL;
|
|
9
|
-
}
|
|
10
|
-
if (process.platform === 'win32') {
|
|
11
|
-
return process.env.ComSpec || 'cmd.exe';
|
|
12
|
-
}
|
|
13
|
-
return process.env.SHELL || '/bin/sh';
|
|
14
|
-
}
|
|
6
|
+
import { detectShellPath } from "./shell-detect.js";
|
|
15
7
|
function shellArgs(shell) {
|
|
16
8
|
const normalized = shell.toLowerCase();
|
|
17
9
|
if (process.platform === 'win32' || normalized.includes('cmd.exe') || normalized.includes('powershell') || normalized.includes('pwsh')) {
|
|
@@ -20,7 +12,7 @@ function shellArgs(shell) {
|
|
|
20
12
|
return ['-i'];
|
|
21
13
|
}
|
|
22
14
|
export async function startActivatedShell() {
|
|
23
|
-
const shell =
|
|
15
|
+
const shell = detectShellPath();
|
|
24
16
|
const session = await startDaemonSession();
|
|
25
17
|
process.stdout.write(`OneProxy shell active: ${shell}\n`);
|
|
26
18
|
process.stdout.write('Exit this shell to turn it off.\n');
|
|
@@ -28,7 +20,7 @@ export async function startActivatedShell() {
|
|
|
28
20
|
stdio: 'inherit',
|
|
29
21
|
env: {
|
|
30
22
|
...process.env,
|
|
31
|
-
...
|
|
23
|
+
...(await sessionProxyEnv(session.metadata.bindings))
|
|
32
24
|
}
|
|
33
25
|
});
|
|
34
26
|
return new Promise((resolve, reject) => {
|
|
@@ -47,7 +39,7 @@ export async function startActivatedShell() {
|
|
|
47
39
|
});
|
|
48
40
|
}
|
|
49
41
|
export async function shellCommand(_args, _context) {
|
|
50
|
-
|
|
42
|
+
parseShellCommandArgs(_args);
|
|
51
43
|
if (!_context.json) {
|
|
52
44
|
const tuiExitCode = await tryStartActivatedShellTui();
|
|
53
45
|
if (tuiExitCode !== null) {
|
|
@@ -57,23 +49,19 @@ export async function shellCommand(_args, _context) {
|
|
|
57
49
|
return startActivatedShell();
|
|
58
50
|
}
|
|
59
51
|
export function parseShellCommandArgs(argv) {
|
|
60
|
-
return stripTuiFlag(argv);
|
|
61
|
-
}
|
|
62
|
-
function stripTuiFlag(argv) {
|
|
63
52
|
const args = [];
|
|
64
53
|
let tui = false;
|
|
65
54
|
for (const value of argv) {
|
|
66
55
|
if (value === '--tui') {
|
|
67
56
|
tui = true;
|
|
57
|
+
continue;
|
|
68
58
|
}
|
|
69
|
-
|
|
70
|
-
args.push(value);
|
|
71
|
-
}
|
|
59
|
+
throw Object.assign(new Error(`Unknown shell option: ${value}`), { code: 'SYNTAX_ERROR', exitCode: 2 });
|
|
72
60
|
}
|
|
73
61
|
return { args, tui };
|
|
74
62
|
}
|
|
75
63
|
async function tryStartActivatedShellTui() {
|
|
76
|
-
const shell =
|
|
64
|
+
const shell = detectShellPath();
|
|
77
65
|
const session = await startDaemonSession();
|
|
78
66
|
try {
|
|
79
67
|
const result = await runTuiCommand({
|
|
@@ -81,7 +69,7 @@ async function tryStartActivatedShellTui() {
|
|
|
81
69
|
args: shellArgs(shell),
|
|
82
70
|
env: {
|
|
83
71
|
...process.env,
|
|
84
|
-
...
|
|
72
|
+
...(await sessionProxyEnv(session.metadata.bindings))
|
|
85
73
|
},
|
|
86
74
|
status: await buildTuiStatusSnapshot()
|
|
87
75
|
});
|
package/dist/shell.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../src/shell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../src/shell.ts"],"names":[],"mappings":"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"}
|
package/dist/storage.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ export type OneProxyConfig = {
|
|
|
8
8
|
controlPlaneUrl?: string;
|
|
9
9
|
activeTenantId?: string;
|
|
10
10
|
activeGroupId?: string;
|
|
11
|
+
ignoredCliVersion?: string;
|
|
11
12
|
overrides: LocalOverrides;
|
|
12
13
|
};
|
|
13
14
|
export type Account = {
|
|
@@ -59,6 +60,7 @@ export type DaemonBindings = {
|
|
|
59
60
|
httpPort: number;
|
|
60
61
|
httpsPort: number;
|
|
61
62
|
ipcPort?: number;
|
|
63
|
+
proxyOnlyPort?: number;
|
|
62
64
|
};
|
|
63
65
|
export type DaemonMetadata = {
|
|
64
66
|
schemaVersion: number;
|
package/dist/storage.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,SAAS,CAAC;AAClC,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,141 @@
|
|
|
1
|
+
import { spawn } from 'node:child_process';
|
|
2
|
+
import { emitKeypressEvents } from 'node:readline';
|
|
3
|
+
import { readConfig, writeConfig } from "./storage.js";
|
|
4
|
+
const packageName = '@stanleysun233/oneproxy-cli';
|
|
5
|
+
const latestUrl = `https://registry.npmjs.org/${encodeURIComponent(packageName)}/latest`;
|
|
6
|
+
const timeoutMs = 1500;
|
|
7
|
+
export async function maybeHandleCliUpdate(command, context, currentVersion) {
|
|
8
|
+
if (!shouldOfferUpdate(command, context)) {
|
|
9
|
+
return false;
|
|
10
|
+
}
|
|
11
|
+
const latestVersion = await latestCliVersion().catch(() => '');
|
|
12
|
+
if (!latestVersion || compareVersions(latestVersion, currentVersion) <= 0) {
|
|
13
|
+
return false;
|
|
14
|
+
}
|
|
15
|
+
const config = await readConfig();
|
|
16
|
+
if (config.ignoredCliVersion === latestVersion) {
|
|
17
|
+
return false;
|
|
18
|
+
}
|
|
19
|
+
const choice = await promptUpdateChoice(currentVersion, latestVersion);
|
|
20
|
+
if (choice === 'ignore') {
|
|
21
|
+
await writeConfig({ ...config, ignoredCliVersion: latestVersion });
|
|
22
|
+
return false;
|
|
23
|
+
}
|
|
24
|
+
if (choice !== 'update') {
|
|
25
|
+
return false;
|
|
26
|
+
}
|
|
27
|
+
const code = await installVersion(latestVersion);
|
|
28
|
+
if (code !== 0) {
|
|
29
|
+
process.stderr.write(`Update failed with exit code ${code}.\n`);
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
process.stderr.write(`Updated OneProxy CLI to ${latestVersion}. Re-run your command.\n`);
|
|
33
|
+
return true;
|
|
34
|
+
}
|
|
35
|
+
function shouldOfferUpdate(command, context) {
|
|
36
|
+
if (context.json || process.env.ONEPROXY_DAEMON_CHILD === '1' || process.env.ONEPROXY_SKIP_UPDATE_CHECK === '1') {
|
|
37
|
+
return false;
|
|
38
|
+
}
|
|
39
|
+
if (!process.stdin.isTTY || !process.stderr.isTTY) {
|
|
40
|
+
return false;
|
|
41
|
+
}
|
|
42
|
+
return !new Set(['daemon', 'env', 'version', 'help', '--help', '-h']).has(command);
|
|
43
|
+
}
|
|
44
|
+
async function latestCliVersion() {
|
|
45
|
+
const controller = new AbortController();
|
|
46
|
+
const timer = setTimeout(() => controller.abort(), timeoutMs);
|
|
47
|
+
try {
|
|
48
|
+
const response = await fetch(latestUrl, { signal: controller.signal });
|
|
49
|
+
if (!response.ok) {
|
|
50
|
+
return '';
|
|
51
|
+
}
|
|
52
|
+
const metadata = await response.json();
|
|
53
|
+
return metadata.version || '';
|
|
54
|
+
}
|
|
55
|
+
finally {
|
|
56
|
+
clearTimeout(timer);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
function compareVersions(left, right) {
|
|
60
|
+
const leftParts = versionParts(left);
|
|
61
|
+
const rightParts = versionParts(right);
|
|
62
|
+
for (let index = 0; index < Math.max(leftParts.length, rightParts.length); index += 1) {
|
|
63
|
+
const delta = (leftParts[index] ?? 0) - (rightParts[index] ?? 0);
|
|
64
|
+
if (delta !== 0) {
|
|
65
|
+
return delta;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
return 0;
|
|
69
|
+
}
|
|
70
|
+
function versionParts(value) {
|
|
71
|
+
return value.split('-', 1)[0].split('.').map((part) => Number(part)).map((part) => Number.isFinite(part) ? part : 0);
|
|
72
|
+
}
|
|
73
|
+
async function promptUpdateChoice(currentVersion, latestVersion) {
|
|
74
|
+
const input = process.stdin;
|
|
75
|
+
const output = process.stderr;
|
|
76
|
+
const choices = [
|
|
77
|
+
{ label: 'Update Now', value: 'update' },
|
|
78
|
+
{ label: 'Later', value: 'later' },
|
|
79
|
+
{ label: 'This version ignore', value: 'ignore' }
|
|
80
|
+
];
|
|
81
|
+
let index = 0;
|
|
82
|
+
let handler;
|
|
83
|
+
const wasRaw = input.isRaw;
|
|
84
|
+
emitKeypressEvents(input);
|
|
85
|
+
input.setRawMode(true);
|
|
86
|
+
input.resume();
|
|
87
|
+
output.write(`\nOneProxy CLI ${latestVersion} is available. Current version: ${currentVersion}.\n`);
|
|
88
|
+
for (const choice of choices) {
|
|
89
|
+
output.write(` ${choice.label}\n`);
|
|
90
|
+
}
|
|
91
|
+
const render = () => {
|
|
92
|
+
output.write('\x1b[?25l');
|
|
93
|
+
output.write(`\x1b[${choices.length}F`);
|
|
94
|
+
for (let i = 0; i < choices.length; i += 1) {
|
|
95
|
+
output.write(`${i === index ? '>' : ' '} ${i + 1}. ${choices[i].label}\x1b[K\n`);
|
|
96
|
+
}
|
|
97
|
+
};
|
|
98
|
+
render();
|
|
99
|
+
const selected = await new Promise((resolve) => {
|
|
100
|
+
handler = (_chunk, key) => {
|
|
101
|
+
if (key.ctrl && key.name === 'c') {
|
|
102
|
+
resolve('later');
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
105
|
+
if (key.name === 'up') {
|
|
106
|
+
index = index === 0 ? choices.length - 1 : index - 1;
|
|
107
|
+
render();
|
|
108
|
+
}
|
|
109
|
+
if (key.name === 'down') {
|
|
110
|
+
index = index === choices.length - 1 ? 0 : index + 1;
|
|
111
|
+
render();
|
|
112
|
+
}
|
|
113
|
+
if (key.name === 'return') {
|
|
114
|
+
resolve(choices[index].value);
|
|
115
|
+
}
|
|
116
|
+
const numeric = Number(key.name);
|
|
117
|
+
if (Number.isInteger(numeric) && numeric >= 1 && numeric <= choices.length) {
|
|
118
|
+
resolve(choices[numeric - 1].value);
|
|
119
|
+
}
|
|
120
|
+
};
|
|
121
|
+
input.on('keypress', handler);
|
|
122
|
+
});
|
|
123
|
+
if (handler) {
|
|
124
|
+
input.off('keypress', handler);
|
|
125
|
+
}
|
|
126
|
+
input.setRawMode(wasRaw);
|
|
127
|
+
if (!wasRaw) {
|
|
128
|
+
input.pause();
|
|
129
|
+
}
|
|
130
|
+
output.write('\x1b[?25h\n');
|
|
131
|
+
return selected;
|
|
132
|
+
}
|
|
133
|
+
function installVersion(version) {
|
|
134
|
+
const executable = process.platform === 'win32' ? 'npm.cmd' : 'npm';
|
|
135
|
+
const child = spawn(executable, ['install', '-g', `${packageName}@${version}`], { stdio: 'inherit' });
|
|
136
|
+
return new Promise((resolve, reject) => {
|
|
137
|
+
child.once('error', reject);
|
|
138
|
+
child.once('exit', (code, signal) => resolve(signal ? 1 : code ?? 0));
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
//# sourceMappingURL=update-check.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-check.js","sourceRoot":"","sources":["../src/update-check.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGvD,MAAM,WAAW,GAAG,6BAA6B,CAAC;AAClD,MAAM,SAAS,GAAG,8BAA8B,kBAAkB,CAAC,WAAW,CAAC,SAAS,CAAC;AACzF,MAAM,SAAS,GAAG,IAAI,CAAC;AAQvB,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,OAAe,EAAE,OAAmB,EAAE,cAAsB;IACrG,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;QACzC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,aAAa,GAAG,MAAM,gBAAgB,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IAC/D,IAAI,CAAC,aAAa,IAAI,eAAe,CAAC,aAAa,EAAE,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1E,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;IAClC,IAAI,MAAM,CAAC,iBAAiB,KAAK,aAAa,EAAE,CAAC;QAC/C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IACvE,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;QACxB,MAAM,WAAW,CAAC,EAAE,GAAG,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE,CAAC,CAAC;QACnE,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,CAAC;IACjD,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;QACf,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,IAAI,KAAK,CAAC,CAAC;QAChE,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,aAAa,0BAA0B,CAAC,CAAC;IACzF,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAe,EAAE,OAAmB;IAC7D,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,KAAK,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,0BAA0B,KAAK,GAAG,EAAE,CAAC;QAChH,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACrF,CAAC;AAED,KAAK,UAAU,gBAAgB;IAC7B,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,SAAS,CAAC,CAAC;IAC9D,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QACvE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAoB,CAAC;QACzD,OAAO,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC;IAChC,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,IAAY,EAAE,KAAa;IAClD,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IACvC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACtF,MAAM,KAAK,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACjE,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAAS,YAAY,CAAC,KAAa;IACjC,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACvH,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,cAAsB,EAAE,aAAqB;IAC7E,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAC5B,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC9B,MAAM,OAAO,GAAkD;QAC7D,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE;QACxC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE;QAClC,EAAE,KAAK,EAAE,qBAAqB,EAAE,KAAK,EAAE,QAAQ,EAAE;KAClD,CAAC;IACF,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,OAAsF,CAAC;IAC3F,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC;IAC3B,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC1B,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACvB,KAAK,CAAC,MAAM,EAAE,CAAC;IACf,MAAM,CAAC,KAAK,CAAC,kBAAkB,aAAa,mCAAmC,cAAc,KAAK,CAAC,CAAC;IACpG,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,MAAM,GAAG,GAAG,EAAE;QAClB,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC1B,MAAM,CAAC,KAAK,CAAC,QAAQ,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;QACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3C,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC;QACnF,CAAC;IACH,CAAC,CAAC;IACF,MAAM,EAAE,CAAC;IACT,MAAM,QAAQ,GAAG,MAAM,IAAI,OAAO,CAAe,CAAC,OAAO,EAAE,EAAE;QAC3D,OAAO,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YACxB,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE,CAAC;gBACjC,OAAO,CAAC,OAAO,CAAC,CAAC;gBACjB,OAAO;YACT,CAAC;YACD,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;gBACtB,KAAK,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;gBACrD,MAAM,EAAE,CAAC;YACX,CAAC;YACD,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACxB,KAAK,GAAG,KAAK,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;gBACrD,MAAM,EAAE,CAAC;YACX,CAAC;YACD,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC1B,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC;YAChC,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,CAAC,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBAC3E,OAAO,CAAC,OAAO,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACtC,CAAC;QACH,CAAC,CAAC;QACF,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IACH,IAAI,OAAO,EAAE,CAAC;QACZ,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC;IACD,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACzB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,KAAK,CAAC,KAAK,EAAE,CAAC;IAChB,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAC5B,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,cAAc,CAAC,OAAe;IACrC,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;IACpE,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,WAAW,IAAI,OAAO,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACtG,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5B,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;AACL,CAAC"}
|