@ai-support-agent/cli 0.0.14 → 0.0.15-beta.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/README.md +159 -95
- package/dist/agent-runner.d.ts.map +1 -1
- package/dist/agent-runner.js +25 -30
- package/dist/agent-runner.js.map +1 -1
- package/dist/agent-transport.d.ts +3 -0
- package/dist/agent-transport.d.ts.map +1 -1
- package/dist/agent-transport.js +13 -0
- package/dist/agent-transport.js.map +1 -1
- package/dist/child-process-manager.d.ts +5 -0
- package/dist/child-process-manager.d.ts.map +1 -1
- package/dist/child-process-manager.js +41 -1
- package/dist/child-process-manager.js.map +1 -1
- package/dist/commands/index.d.ts +2 -0
- package/dist/commands/index.d.ts.map +1 -1
- package/dist/commands/index.js +12 -0
- package/dist/commands/index.js.map +1 -1
- package/dist/config-watcher.d.ts +23 -0
- package/dist/config-watcher.d.ts.map +1 -0
- package/dist/config-watcher.js +70 -0
- package/dist/config-watcher.js.map +1 -0
- package/dist/constants.d.ts +2 -0
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +3 -1
- package/dist/constants.js.map +1 -1
- package/dist/ipc-types.d.ts +1 -0
- package/dist/ipc-types.d.ts.map +1 -1
- package/dist/ipc-types.js.map +1 -1
- package/dist/project-agent.d.ts +2 -0
- package/dist/project-agent.d.ts.map +1 -1
- package/dist/project-agent.js +28 -1
- package/dist/project-agent.js.map +1 -1
- package/dist/project-worker.d.ts.map +1 -1
- package/dist/project-worker.js +3 -0
- package/dist/project-worker.js.map +1 -1
- package/dist/token-watcher.d.ts +4 -4
- package/dist/token-watcher.d.ts.map +1 -1
- package/dist/token-watcher.js +6 -32
- package/dist/token-watcher.js.map +1 -1
- package/dist/types/command.d.ts +7 -1
- package/dist/types/command.d.ts.map +1 -1
- package/dist/types/command.js.map +1 -1
- package/dist/vscode/vscode-server.d.ts +7 -1
- package/dist/vscode/vscode-server.d.ts.map +1 -1
- package/dist/vscode/vscode-server.js +39 -1
- package/dist/vscode/vscode-server.js.map +1 -1
- package/dist/vscode/vscode-tunnel-websocket.d.ts +8 -2
- package/dist/vscode/vscode-tunnel-websocket.d.ts.map +1 -1
- package/dist/vscode/vscode-tunnel-websocket.js +67 -8
- package/dist/vscode/vscode-tunnel-websocket.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/types/command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAEzC,MAAM,MAAM,gBAAgB,GACxB,iBAAiB,GACjB,WAAW,GACX,YAAY,GACZ,WAAW,GACX,aAAa,GACb,aAAa,GACb,YAAY,GACZ,cAAc,GACd,cAAc,GACd,MAAM,GACN,aAAa,GACb,OAAO,GACP,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/types/command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAEzC,MAAM,MAAM,gBAAgB,GACxB,iBAAiB,GACjB,WAAW,GACX,YAAY,GACZ,WAAW,GACX,aAAa,GACb,aAAa,GACb,YAAY,GACZ,cAAc,GACd,cAAc,GACd,MAAM,GACN,aAAa,GACb,OAAO,GACP,aAAa,GACb,QAAQ,GACR,QAAQ,CAAA;AAEZ,MAAM,MAAM,kBAAkB,GAC1B,SAAS,GACT,SAAS,GACT,WAAW,GACX,QAAQ,GACR,SAAS,CAAA;AAEb,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,gBAAgB,CAAA;IACtB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC,MAAM,EAAE,kBAAkB,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,gBAAgB,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,MAAM,aAAa,GACrB;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,GAChC;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AAErD,wBAAgB,aAAa,CAAC,IAAI,EAAE,OAAO,GAAG,aAAa,CAE1D;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,aAAa,CAExE;AAMD,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,GAAG,CAAC,EAAE,OAAO,CAAA;CACd;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,OAAO,CAAA;CAC1B;AAGD,MAAM,MAAM,eAAe,GACvB;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,OAAO,EAAE,mBAAmB,CAAA;CAAE,GACzD;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,eAAe,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,OAAO,EAAE,gBAAgB,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,eAAe,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,OAAO,EAAE,iBAAiB,CAAA;CAAE,GACnD;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,OAAO,EAAE,iBAAiB,CAAA;CAAE,GACnD;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,OAAO,EAAE,gBAAgB,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;CAAE,GACxD;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,OAAO,EAAE,kBAAkB,CAAA;CAAE,GACrD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,WAAW,CAAA;CAAE,GACtC;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,OAAO,EAAE,iBAAiB,CAAA;CAAE,GACnD;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;CAAE,GACvD;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;CAAE,GAClD;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;CAAE,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/types/command.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/types/command.ts"],"names":[],"mappings":";;AA4CA,sCAEC;AAED,kCAEC;AAND,SAAgB,aAAa,CAAC,IAAa;IACzC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;AAChC,CAAC;AAED,SAAgB,WAAW,CAAC,KAAa,EAAE,IAAc;IACvD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAA;AACvE,CAAC"}
|
|
@@ -11,7 +11,8 @@ export interface VsCodeServerOptions {
|
|
|
11
11
|
*/
|
|
12
12
|
export declare class VsCodeServer {
|
|
13
13
|
private process;
|
|
14
|
-
private
|
|
14
|
+
private port;
|
|
15
|
+
private readonly requestedPort;
|
|
15
16
|
private readonly projectDir;
|
|
16
17
|
private idleTimer;
|
|
17
18
|
private healthTimer;
|
|
@@ -36,6 +37,11 @@ export declare class VsCodeServer {
|
|
|
36
37
|
private stopTimers;
|
|
37
38
|
private checkHealth;
|
|
38
39
|
private waitForReady;
|
|
40
|
+
/**
|
|
41
|
+
* ポートが使用可能かチェックし、使用中なら空きポートを自動取得する
|
|
42
|
+
*/
|
|
43
|
+
private resolveAvailablePort;
|
|
44
|
+
private checkPortAvailable;
|
|
39
45
|
/**
|
|
40
46
|
* code-server のターミナルにサンドボックスを適用する。
|
|
41
47
|
* - bash/zsh 用の rc ファイルを生成し、サンドボックススクリプトを注入
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vscode-server.d.ts","sourceRoot":"","sources":["../../src/vscode/vscode-server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"vscode-server.d.ts","sourceRoot":"","sources":["../../src/vscode/vscode-server.ts"],"names":[],"mappings":"AAwBA,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED;;;;;;GAMG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,IAAI,CAAQ;IACpB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAQ;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAQ;IACnC,OAAO,CAAC,SAAS,CAA6C;IAC9D,OAAO,CAAC,WAAW,CAA8C;IACjE,OAAO,CAAC,OAAO,CAAQ;gBAEX,OAAO,EAAE,mBAAmB;IAMxC,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,OAAO,IAAI,MAAM;IAIjB;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAoE5B;;OAEG;IACH,IAAI,IAAI,IAAI;IAsBZ;;OAEG;IACH,KAAK,IAAI,IAAI;IAIb,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,UAAU;YAWJ,WAAW;YAkBX,YAAY;IAa1B;;OAEG;YACW,oBAAoB;IAqBlC,OAAO,CAAC,kBAAkB;IAU1B;;;;;;OAMG;IACH,OAAO,CAAC,oBAAoB;IAc5B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAM3B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IA+B5B;;OAEG;IACH,OAAO,CAAC,eAAe;CA6BxB"}
|
|
@@ -37,6 +37,7 @@ exports.VsCodeServer = void 0;
|
|
|
37
37
|
const child_process_1 = require("child_process");
|
|
38
38
|
const fs = __importStar(require("fs"));
|
|
39
39
|
const http = __importStar(require("http"));
|
|
40
|
+
const net = __importStar(require("net"));
|
|
40
41
|
const path = __importStar(require("path"));
|
|
41
42
|
const logger_1 = require("../logger");
|
|
42
43
|
const sandbox_init_script_1 = require("../terminal/sandbox-init-script");
|
|
@@ -52,12 +53,14 @@ const constants_1 = require("./constants");
|
|
|
52
53
|
class VsCodeServer {
|
|
53
54
|
process = null;
|
|
54
55
|
port;
|
|
56
|
+
requestedPort;
|
|
55
57
|
projectDir;
|
|
56
58
|
idleTimer = null;
|
|
57
59
|
healthTimer = null;
|
|
58
60
|
running = false;
|
|
59
61
|
constructor(options) {
|
|
60
|
-
this.
|
|
62
|
+
this.requestedPort = options.port ?? constants_1.VSCODE_DEFAULT_PORT;
|
|
63
|
+
this.port = this.requestedPort;
|
|
61
64
|
this.projectDir = options.projectDir;
|
|
62
65
|
}
|
|
63
66
|
get isRunning() {
|
|
@@ -74,6 +77,8 @@ class VsCodeServer {
|
|
|
74
77
|
logger_1.logger.debug('[vscode-server] Already running');
|
|
75
78
|
return;
|
|
76
79
|
}
|
|
80
|
+
// 要求ポートが使用中なら空きポートを自動取得
|
|
81
|
+
this.port = await this.resolveAvailablePort(this.requestedPort);
|
|
77
82
|
logger_1.logger.info(`[vscode-server] Starting code-server on ${constants_1.VSCODE_BIND_HOST}:${this.port}`);
|
|
78
83
|
try {
|
|
79
84
|
this.setupTerminalSandbox();
|
|
@@ -208,6 +213,39 @@ class VsCodeServer {
|
|
|
208
213
|
}
|
|
209
214
|
throw new Error(`code-server failed to start within ${constants_1.STARTUP_TIMEOUT_MS}ms`);
|
|
210
215
|
}
|
|
216
|
+
/**
|
|
217
|
+
* ポートが使用可能かチェックし、使用中なら空きポートを自動取得する
|
|
218
|
+
*/
|
|
219
|
+
async resolveAvailablePort(preferredPort) {
|
|
220
|
+
const isAvailable = await this.checkPortAvailable(preferredPort);
|
|
221
|
+
if (isAvailable)
|
|
222
|
+
return preferredPort;
|
|
223
|
+
// ポート 0 で OS に空きポートを割り当てさせる
|
|
224
|
+
logger_1.logger.info(`[vscode-server] Port ${preferredPort} is in use, finding available port...`);
|
|
225
|
+
return new Promise((resolve, reject) => {
|
|
226
|
+
const server = net.createServer();
|
|
227
|
+
server.listen(0, constants_1.VSCODE_BIND_HOST, () => {
|
|
228
|
+
const addr = server.address();
|
|
229
|
+
if (addr && typeof addr === 'object') {
|
|
230
|
+
const port = addr.port;
|
|
231
|
+
server.close(() => resolve(port));
|
|
232
|
+
}
|
|
233
|
+
else {
|
|
234
|
+
server.close(() => reject(new Error('Failed to get assigned port')));
|
|
235
|
+
}
|
|
236
|
+
});
|
|
237
|
+
server.on('error', reject);
|
|
238
|
+
});
|
|
239
|
+
}
|
|
240
|
+
checkPortAvailable(port) {
|
|
241
|
+
return new Promise((resolve) => {
|
|
242
|
+
const server = net.createServer();
|
|
243
|
+
server.once('error', () => resolve(false));
|
|
244
|
+
server.listen(port, constants_1.VSCODE_BIND_HOST, () => {
|
|
245
|
+
server.close(() => resolve(true));
|
|
246
|
+
});
|
|
247
|
+
});
|
|
248
|
+
}
|
|
211
249
|
/**
|
|
212
250
|
* code-server のターミナルにサンドボックスを適用する。
|
|
213
251
|
* - bash/zsh 用の rc ファイルを生成し、サンドボックススクリプトを注入
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vscode-server.js","sourceRoot":"","sources":["../../src/vscode/vscode-server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAmD;AACnD,uCAAwB;AACxB,2CAA4B;AAC5B,2CAA4B;AAE5B,sCAAkC;AAClC,yEAMwC;AACxC,oCAA0C;AAE1C,2CAMoB;AAOpB;;;;;;GAMG;AACH,MAAa,YAAY;IACf,OAAO,GAAwB,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"vscode-server.js","sourceRoot":"","sources":["../../src/vscode/vscode-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,11 +4,12 @@ import { BaseWebSocketConnection } from '../base-websocket';
|
|
|
4
4
|
* API Server → Agent メッセージ
|
|
5
5
|
*/
|
|
6
6
|
export interface VsCodeServerMessage {
|
|
7
|
-
type: 'vscode_open' | 'vscode_close' | 'http_request' | 'ws_frame' | 'auth_success' | 'error';
|
|
7
|
+
type: 'vscode_open' | 'vscode_close' | 'port_forward_open' | 'port_forward_close' | 'http_request' | 'ws_frame' | 'auth_success' | 'error';
|
|
8
8
|
sessionId?: string;
|
|
9
9
|
requestId?: string;
|
|
10
10
|
subSocketId?: string;
|
|
11
11
|
projectDir?: string;
|
|
12
|
+
targetPort?: number;
|
|
12
13
|
method?: string;
|
|
13
14
|
path?: string;
|
|
14
15
|
headers?: Record<string, string>;
|
|
@@ -22,11 +23,13 @@ export interface VsCodeServerMessage {
|
|
|
22
23
|
* Agent → API Server メッセージ
|
|
23
24
|
*/
|
|
24
25
|
export interface VsCodeAgentMessage {
|
|
25
|
-
type: 'vscode_ready' | 'vscode_stopped' | 'http_response' | 'ws_frame' | 'error';
|
|
26
|
+
type: 'vscode_ready' | 'vscode_stopped' | 'port_forward_ready' | 'port_forward_stopped' | 'http_response' | 'ws_frame' | 'error';
|
|
26
27
|
sessionId?: string;
|
|
28
|
+
targetPort?: number;
|
|
27
29
|
requestId?: string;
|
|
28
30
|
subSocketId?: string;
|
|
29
31
|
port?: number;
|
|
32
|
+
projectDir?: string;
|
|
30
33
|
statusCode?: number;
|
|
31
34
|
headers?: Record<string, string>;
|
|
32
35
|
body?: string;
|
|
@@ -50,6 +53,7 @@ export declare class VsCodeTunnelWebSocket extends BaseWebSocketConnection<VsCod
|
|
|
50
53
|
private readonly wsUrl;
|
|
51
54
|
private vsCodeServer;
|
|
52
55
|
private wsProxy;
|
|
56
|
+
private readonly portForwardSessions;
|
|
53
57
|
constructor(apiUrl: string, token: string, agentId: string, projectDir?: string | undefined);
|
|
54
58
|
protected createWebSocket(): WebSocket;
|
|
55
59
|
protected onOpen(_ws: WebSocket, resolve: (value: void) => void): void;
|
|
@@ -59,6 +63,8 @@ export declare class VsCodeTunnelWebSocket extends BaseWebSocketConnection<VsCod
|
|
|
59
63
|
private handleVsCodeClose;
|
|
60
64
|
private handleHttpRequest;
|
|
61
65
|
private handleWsFrame;
|
|
66
|
+
private handlePortForwardOpen;
|
|
67
|
+
private handlePortForwardClose;
|
|
62
68
|
private cleanup;
|
|
63
69
|
private send;
|
|
64
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vscode-tunnel-websocket.d.ts","sourceRoot":"","sources":["../../src/vscode/vscode-tunnel-websocket.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAA;AAE1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AAa3D;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,IAAI,EACA,aAAa,GACb,cAAc,GACd,cAAc,GACd,UAAU,GACV,cAAc,GACd,OAAO,CAAA;IACX,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EACA,cAAc,GACd,gBAAgB,GAChB,eAAe,GACf,UAAU,GACV,OAAO,CAAA;IACX,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED;;;;;GAKG;AACH,qBAAa,qBAAsB,SAAQ,uBAAuB,CAAC,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"vscode-tunnel-websocket.d.ts","sourceRoot":"","sources":["../../src/vscode/vscode-tunnel-websocket.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,7 @@ class VsCodeTunnelWebSocket extends base_websocket_1.BaseWebSocketConnection {
|
|
|
25
25
|
wsUrl;
|
|
26
26
|
vsCodeServer = null;
|
|
27
27
|
wsProxy = null;
|
|
28
|
+
portForwardSessions = new Map();
|
|
28
29
|
constructor(apiUrl, token, agentId, projectDir) {
|
|
29
30
|
super({
|
|
30
31
|
maxReconnectRetries: constants_1.VSCODE_WS_MAX_RECONNECT_RETRIES,
|
|
@@ -57,6 +58,12 @@ class VsCodeTunnelWebSocket extends base_websocket_1.BaseWebSocketConnection {
|
|
|
57
58
|
case 'vscode_close':
|
|
58
59
|
this.handleVsCodeClose(msg);
|
|
59
60
|
break;
|
|
61
|
+
case 'port_forward_open':
|
|
62
|
+
this.handlePortForwardOpen(msg);
|
|
63
|
+
break;
|
|
64
|
+
case 'port_forward_close':
|
|
65
|
+
this.handlePortForwardClose(msg);
|
|
66
|
+
break;
|
|
60
67
|
case 'http_request':
|
|
61
68
|
this.handleHttpRequest(msg);
|
|
62
69
|
break;
|
|
@@ -95,6 +102,7 @@ class VsCodeTunnelWebSocket extends base_websocket_1.BaseWebSocketConnection {
|
|
|
95
102
|
type: 'vscode_ready',
|
|
96
103
|
sessionId,
|
|
97
104
|
port: this.vsCodeServer.getPort(),
|
|
105
|
+
projectDir,
|
|
98
106
|
});
|
|
99
107
|
return;
|
|
100
108
|
}
|
|
@@ -106,6 +114,7 @@ class VsCodeTunnelWebSocket extends base_websocket_1.BaseWebSocketConnection {
|
|
|
106
114
|
type: 'vscode_ready',
|
|
107
115
|
sessionId,
|
|
108
116
|
port: this.vsCodeServer.getPort(),
|
|
117
|
+
projectDir,
|
|
109
118
|
});
|
|
110
119
|
}
|
|
111
120
|
catch (error) {
|
|
@@ -124,7 +133,10 @@ class VsCodeTunnelWebSocket extends base_websocket_1.BaseWebSocketConnection {
|
|
|
124
133
|
}
|
|
125
134
|
}
|
|
126
135
|
async handleHttpRequest(msg) {
|
|
127
|
-
|
|
136
|
+
// ポートフォワードセッションの場合はそちらのポートを使用
|
|
137
|
+
const pfSession = msg.sessionId ? this.portForwardSessions.get(msg.sessionId) : undefined;
|
|
138
|
+
const targetPort = pfSession?.targetPort;
|
|
139
|
+
if (!targetPort && !this.vsCodeServer?.isRunning) {
|
|
128
140
|
this.send({
|
|
129
141
|
type: 'error',
|
|
130
142
|
requestId: msg.requestId,
|
|
@@ -132,9 +144,12 @@ class VsCodeTunnelWebSocket extends base_websocket_1.BaseWebSocketConnection {
|
|
|
132
144
|
});
|
|
133
145
|
return;
|
|
134
146
|
}
|
|
135
|
-
|
|
147
|
+
if (!targetPort) {
|
|
148
|
+
this.vsCodeServer.touch();
|
|
149
|
+
}
|
|
150
|
+
const port = targetPort ?? this.vsCodeServer.getPort();
|
|
136
151
|
try {
|
|
137
|
-
const response = await (0, vscode_http_proxy_1.proxyHttpRequest)(
|
|
152
|
+
const response = await (0, vscode_http_proxy_1.proxyHttpRequest)(port, {
|
|
138
153
|
method: msg.method ?? 'GET',
|
|
139
154
|
path: msg.path ?? '/',
|
|
140
155
|
headers: msg.headers ?? {},
|
|
@@ -179,16 +194,23 @@ class VsCodeTunnelWebSocket extends base_websocket_1.BaseWebSocketConnection {
|
|
|
179
194
|
}
|
|
180
195
|
}
|
|
181
196
|
handleWsFrame(msg) {
|
|
182
|
-
|
|
197
|
+
// ポートフォワードセッションの場合は専用wsProxyを使用
|
|
198
|
+
const pfSession = msg.sessionId ? this.portForwardSessions.get(msg.sessionId) : undefined;
|
|
199
|
+
const proxy = pfSession?.wsProxy ?? this.wsProxy;
|
|
200
|
+
if (!pfSession && (!this.vsCodeServer?.isRunning || !this.wsProxy)) {
|
|
183
201
|
return;
|
|
184
202
|
}
|
|
185
|
-
|
|
203
|
+
if (!proxy)
|
|
204
|
+
return;
|
|
205
|
+
if (!pfSession) {
|
|
206
|
+
this.vsCodeServer.touch();
|
|
207
|
+
}
|
|
186
208
|
const subSocketId = msg.subSocketId;
|
|
187
209
|
if (!subSocketId)
|
|
188
210
|
return;
|
|
189
211
|
if (msg.isOpen && msg.path) {
|
|
190
212
|
// 新しい WebSocket 接続を開く
|
|
191
|
-
|
|
213
|
+
proxy.openConnection(subSocketId, msg.path, () => {
|
|
192
214
|
this.send({
|
|
193
215
|
type: 'ws_frame',
|
|
194
216
|
sessionId: msg.sessionId,
|
|
@@ -212,13 +234,50 @@ class VsCodeTunnelWebSocket extends base_websocket_1.BaseWebSocketConnection {
|
|
|
212
234
|
});
|
|
213
235
|
}
|
|
214
236
|
else if (msg.isClosed) {
|
|
215
|
-
|
|
237
|
+
proxy.closeConnection(subSocketId);
|
|
216
238
|
}
|
|
217
239
|
else if (msg.data) {
|
|
218
|
-
|
|
240
|
+
proxy.sendFrame(subSocketId, msg.data);
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
handlePortForwardOpen(msg) {
|
|
244
|
+
const sessionId = msg.sessionId;
|
|
245
|
+
if (!sessionId) {
|
|
246
|
+
this.send({ type: 'error', message: 'Missing sessionId' });
|
|
247
|
+
return;
|
|
248
|
+
}
|
|
249
|
+
const targetPort = msg.targetPort;
|
|
250
|
+
if (!targetPort) {
|
|
251
|
+
this.send({ type: 'error', sessionId, message: 'Missing targetPort' });
|
|
252
|
+
return;
|
|
253
|
+
}
|
|
254
|
+
const wsProxy = new vscode_ws_proxy_1.VsCodeWsProxy(targetPort);
|
|
255
|
+
this.portForwardSessions.set(sessionId, { targetPort, wsProxy });
|
|
256
|
+
logger_1.logger.info(`[vscode-ws] Port forward session opened: ${sessionId} → port ${targetPort}`);
|
|
257
|
+
this.send({
|
|
258
|
+
type: 'port_forward_ready',
|
|
259
|
+
sessionId,
|
|
260
|
+
targetPort,
|
|
261
|
+
});
|
|
262
|
+
}
|
|
263
|
+
handlePortForwardClose(msg) {
|
|
264
|
+
const sessionId = msg.sessionId;
|
|
265
|
+
logger_1.logger.info(`[vscode-ws] Port forward close requested (session=${sessionId})`);
|
|
266
|
+
if (sessionId) {
|
|
267
|
+
const pfSession = this.portForwardSessions.get(sessionId);
|
|
268
|
+
if (pfSession) {
|
|
269
|
+
pfSession.wsProxy.closeAll();
|
|
270
|
+
this.portForwardSessions.delete(sessionId);
|
|
271
|
+
}
|
|
272
|
+
this.send({ type: 'port_forward_stopped', sessionId });
|
|
219
273
|
}
|
|
220
274
|
}
|
|
221
275
|
cleanup() {
|
|
276
|
+
// ポートフォワードセッションのクリーンアップ
|
|
277
|
+
for (const [, pfSession] of this.portForwardSessions) {
|
|
278
|
+
pfSession.wsProxy.closeAll();
|
|
279
|
+
}
|
|
280
|
+
this.portForwardSessions.clear();
|
|
222
281
|
if (this.wsProxy) {
|
|
223
282
|
this.wsProxy.closeAll();
|
|
224
283
|
this.wsProxy = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vscode-tunnel-websocket.js","sourceRoot":"","sources":["../../src/vscode/vscode-tunnel-websocket.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA0B;AAE1B,sDAA2D;AAC3D,sCAAkC;AAClC,oCAAsD;AAEtD,2CAIoB;AACpB,mDAA8C;AAC9C,2DAAsD;AACtD,uDAAiD;
|
|
1
|
+
{"version":3,"file":"vscode-tunnel-websocket.js","sourceRoot":"","sources":["../../src/vscode/vscode-tunnel-websocket.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA0B;AAE1B,sDAA2D;AAC3D,sCAAkC;AAClC,oCAAsD;AAEtD,2CAIoB;AACpB,mDAA8C;AAC9C,2DAAsD;AACtD,uDAAiD;AA2DjD;;;;;GAKG;AACH,MAAa,qBAAsB,SAAQ,wCAA4C;IAQlE;IACA;IACA;IATF,KAAK,CAAQ;IACtB,YAAY,GAAwB,IAAI,CAAA;IACxC,OAAO,GAAyB,IAAI,CAAA;IAC3B,mBAAmB,GAAG,IAAI,GAAG,EAA0D,CAAA;IAExG,YACE,MAAc,EACG,KAAa,EACb,OAAe,EACf,UAAmB;QAEpC,KAAK,CAAC;YACJ,mBAAmB,EAAE,2CAA+B;YACpD,oBAAoB,EAAE,6CAAiC;YACvD,SAAS,EAAE,aAAa;SACzB,CAAC,CAAA;QARe,UAAK,GAAL,KAAK,CAAQ;QACb,YAAO,GAAP,OAAO,CAAQ;QACf,eAAU,GAAV,UAAU,CAAS;QAOpC,IAAI,CAAC,KAAK,GAAG,IAAA,kBAAU,EAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;IACrD,CAAC;IAES,eAAe;QACvB,OAAO,IAAI,YAAS,CAAC,IAAI,CAAC,KAAK,EAAE;YAC/B,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,IAAI,CAAC,KAAK,EAAE;gBACrC,YAAY,EAAE,IAAI,CAAC,OAAO;aAC3B;SACF,CAAC,CAAA;IACJ,CAAC;IAES,MAAM,CAAC,GAAc,EAAE,OAA8B;QAC7D,eAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAA;QAChE,IAAI,CAAC,oBAAoB,CAAC,OAAO,GAAG,CAAC,CAAA;QACrC,OAAO,EAAE,CAAA;IACX,CAAC;IAES,eAAe,CAAC,GAAwB;QAChD,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;YACjB,KAAK,aAAa;gBAChB,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAA;gBAC1B,MAAK;YACP,KAAK,cAAc;gBACjB,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAA;gBAC3B,MAAK;YACP,KAAK,mBAAmB;gBACtB,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAA;gBAC/B,MAAK;YACP,KAAK,oBAAoB;gBACvB,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAA;gBAChC,MAAK;YACP,KAAK,cAAc;gBACjB,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAA;gBAC3B,MAAK;YACP,KAAK,UAAU;gBACb,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;gBACvB,MAAK;YACP,KAAK,cAAc;gBACjB,MAAK;YACP,KAAK,OAAO,CAAC,CAAC,CAAC;gBACb,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,IAAI,SAAS,CAAA;gBACvC,eAAM,CAAC,IAAI,CAAC,qCAAqC,GAAG,CAAC,SAAS,IAAI,MAAM,MAAM,MAAM,EAAE,CAAC,CAAA;gBACvF,MAAK;YACP,CAAC;YACD;gBACE,eAAM,CAAC,KAAK,CAAC,qCAAsC,GAAwB,CAAC,IAAI,EAAE,CAAC,CAAA;QACvF,CAAC;IACH,CAAC;IAES,YAAY;QACpB,IAAI,CAAC,OAAO,EAAE,CAAA;IAChB,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,GAAwB;QACrD,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAA;QAC/B,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAA;YAC1D,OAAM;QACR,CAAC;QAED,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAA;QACpD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,sBAAsB,EAAE,CAAC,CAAA;YACxE,OAAM;QACR,CAAC;QAED,iBAAiB;QACjB,IAAI,IAAI,CAAC,YAAY,EAAE,SAAS,EAAE,CAAC;YACjC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAA;YACzB,IAAI,CAAC,IAAI,CAAC;gBACR,IAAI,EAAE,cAAc;gBACpB,SAAS;gBACT,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;gBACjC,UAAU;aACX,CAAC,CAAA;YACF,OAAM;QACR,CAAC;QAED,IAAI,CAAC;YACH,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,CAAC,EAAE,UAAU,EAAE,CAAC,CAAA;YACpD,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAA;YAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,+BAAa,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAA;YAE7D,IAAI,CAAC,IAAI,CAAC;gBACR,IAAI,EAAE,cAAc;gBACpB,SAAS;gBACT,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;gBACjC,UAAU;aACX,CAAC,CAAA;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,IAAI,CAAC;gBACR,IAAI,EAAE,OAAO;gBACb,SAAS;gBACT,OAAO,EAAE,gCAAgC,IAAA,uBAAe,EAAC,KAAK,CAAC,EAAE;aAClE,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAEO,iBAAiB,CAAC,GAAwB;QAChD,eAAM,CAAC,IAAI,CAAC,gDAAgD,GAAG,CAAC,SAAS,GAAG,CAAC,CAAA;QAC7E,IAAI,CAAC,OAAO,EAAE,CAAA;QACd,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;YAClB,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAA;QACjE,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,GAAwB;QACtD,8BAA8B;QAC9B,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QACzF,MAAM,UAAU,GAAG,SAAS,EAAE,UAAU,CAAA;QAExC,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,EAAE,CAAC;YACjD,IAAI,CAAC,IAAI,CAAC;gBACR,IAAI,EAAE,OAAO;gBACb,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,OAAO,EAAE,4BAA4B;aACtC,CAAC,CAAA;YACF,OAAM;QACR,CAAC;QAED,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,IAAI,CAAC,YAAa,CAAC,KAAK,EAAE,CAAA;QAC5B,CAAC;QAED,MAAM,IAAI,GAAG,UAAU,IAAI,IAAI,CAAC,YAAa,CAAC,OAAO,EAAE,CAAA;QAEvD,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAA,oCAAgB,EAAC,IAAI,EAAE;gBAC5C,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,KAAK;gBAC3B,IAAI,EAAE,GAAG,CAAC,IAAI,IAAI,GAAG;gBACrB,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE;gBAC1B,IAAI,EAAE,GAAG,CAAC,IAAI;aACf,CAAC,CAAA;YAEF,wBAAwB;YACxB,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAA;YACvC,IAAI,UAAU,GAAG,oCAAwB,EAAE,CAAC;gBAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,oCAAwB,CAAC,CAAA;gBACpE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC;oBACrC,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,CACnC,CAAC,GAAG,oCAAwB,EAC5B,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,oCAAwB,CACnC,CAAA;oBACD,IAAI,CAAC,IAAI,CAAC;wBACR,IAAI,EAAE,eAAe;wBACrB,SAAS,EAAE,GAAG,CAAC,SAAS;wBACxB,SAAS,EAAE,GAAG,CAAC,SAAS;wBACxB,UAAU,EAAE,QAAQ,CAAC,UAAU;wBAC/B,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;wBAC/C,IAAI,EAAE,KAAK;wBACX,cAAc,EAAE,CAAC;wBACjB,cAAc,EAAE,WAAW;qBAC5B,CAAC,CAAA;gBACJ,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,IAAI,CAAC;oBACR,IAAI,EAAE,eAAe;oBACrB,SAAS,EAAE,GAAG,CAAC,SAAS;oBACxB,SAAS,EAAE,GAAG,CAAC,SAAS;oBACxB,UAAU,EAAE,QAAQ,CAAC,UAAU;oBAC/B,OAAO,EAAE,QAAQ,CAAC,OAAO;oBACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;iBACpB,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,IAAI,CAAC;gBACR,IAAI,EAAE,OAAO;gBACb,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,OAAO,EAAE,qBAAqB,IAAA,uBAAe,EAAC,KAAK,CAAC,EAAE;aACvD,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAEO,aAAa,CAAC,GAAwB;QAC5C,gCAAgC;QAChC,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QACzF,MAAM,KAAK,GAAG,SAAS,EAAE,OAAO,IAAI,IAAI,CAAC,OAAO,CAAA;QAEhD,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACnE,OAAM;QACR,CAAC;QACD,IAAI,CAAC,KAAK;YAAE,OAAM;QAElB,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,IAAI,CAAC,YAAa,CAAC,KAAK,EAAE,CAAA;QAC5B,CAAC;QACD,MAAM,WAAW,GAAG,GAAG,CAAC,WAAW,CAAA;QACnC,IAAI,CAAC,WAAW;YAAE,OAAM;QAExB,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;YAC3B,sBAAsB;YACtB,KAAK,CAAC,cAAc,CAClB,WAAW,EACX,GAAG,CAAC,IAAI,EACR,GAAG,EAAE;gBACH,IAAI,CAAC,IAAI,CAAC;oBACR,IAAI,EAAE,UAAU;oBAChB,SAAS,EAAE,GAAG,CAAC,SAAS;oBACxB,WAAW;oBACX,MAAM,EAAE,IAAI;iBACb,CAAC,CAAA;YACJ,CAAC,EACD,CAAC,IAAI,EAAE,EAAE;gBACP,IAAI,CAAC,IAAI,CAAC;oBACR,IAAI,EAAE,UAAU;oBAChB,SAAS,EAAE,GAAG,CAAC,SAAS;oBACxB,WAAW;oBACX,IAAI;iBACL,CAAC,CAAA;YACJ,CAAC,EACD,GAAG,EAAE;gBACH,IAAI,CAAC,IAAI,CAAC;oBACR,IAAI,EAAE,UAAU;oBAChB,SAAS,EAAE,GAAG,CAAC,SAAS;oBACxB,WAAW;oBACX,QAAQ,EAAE,IAAI;iBACf,CAAC,CAAA;YACJ,CAAC,CACF,CAAA;QACH,CAAC;aAAM,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;YACxB,KAAK,CAAC,eAAe,CAAC,WAAW,CAAC,CAAA;QACpC,CAAC;aAAM,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,CAAC,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;QACxC,CAAC;IACH,CAAC;IAEO,qBAAqB,CAAC,GAAwB;QACpD,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAA;QAC/B,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAA;YAC1D,OAAM;QACR,CAAC;QAED,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAA;QACjC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAA;YACtE,OAAM;QACR,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,+BAAa,CAAC,UAAU,CAAC,CAAA;QAC7C,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAA;QAEhE,eAAM,CAAC,IAAI,CAAC,4CAA4C,SAAS,WAAW,UAAU,EAAE,CAAC,CAAA;QAEzF,IAAI,CAAC,IAAI,CAAC;YACR,IAAI,EAAE,oBAAoB;YAC1B,SAAS;YACT,UAAU;SACX,CAAC,CAAA;IACJ,CAAC;IAEO,sBAAsB,CAAC,GAAwB;QACrD,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAA;QAC/B,eAAM,CAAC,IAAI,CAAC,qDAAqD,SAAS,GAAG,CAAC,CAAA;QAE9E,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YACzD,IAAI,SAAS,EAAE,CAAC;gBACd,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAA;gBAC5B,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YAC5C,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,SAAS,EAAE,CAAC,CAAA;QACxD,CAAC;IACH,CAAC;IAEO,OAAO;QACb,wBAAwB;QACxB,KAAK,MAAM,CAAC,EAAE,SAAS,CAAC,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACrD,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAA;QAC9B,CAAC;QACD,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAA;QAEhC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAA;YACvB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACrB,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAA;YACxB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;QAC1B,CAAC;IACH,CAAC;IAEO,IAAI,CAAC,GAAuB;QAClC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;IACvB,CAAC;CACF;AAhTD,sDAgTC"}
|