agent-gear 1.0.3 → 1.1.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/acp/bridge.d.ts +1 -0
- package/dist/acp/bridge.d.ts.map +1 -1
- package/dist/acp/bridge.js +15 -3
- package/dist/acp/bridge.js.map +1 -1
- package/dist/acp/spawner.d.ts +2 -0
- package/dist/acp/spawner.d.ts.map +1 -1
- package/dist/acp/spawner.js +38 -4
- package/dist/acp/spawner.js.map +1 -1
- package/dist/index.js +0 -0
- package/dist/port-forward.d.ts +10 -0
- package/dist/port-forward.d.ts.map +1 -0
- package/dist/port-forward.js +68 -0
- package/dist/port-forward.js.map +1 -0
- package/dist/port-forward.test.d.ts +2 -0
- package/dist/port-forward.test.d.ts.map +1 -0
- package/dist/port-forward.test.js +163 -0
- package/dist/port-forward.test.js.map +1 -0
- package/dist/socketio-client.d.ts.map +1 -1
- package/dist/socketio-client.js +32 -3
- package/dist/socketio-client.js.map +1 -1
- package/package.json +5 -1
- package/src/acp/bridge.ts +16 -3
- package/src/acp/spawner.ts +38 -5
- package/src/port-forward.test.ts +202 -0
- package/src/port-forward.ts +88 -0
- package/src/socketio-client.ts +36 -3
- package/tests/acp-bridge.test.ts +61 -0
- package/tests/acp-spawner.test.ts +96 -1
- package/tests/socketio-client.test.ts +120 -2
package/dist/acp/bridge.d.ts
CHANGED
|
@@ -28,6 +28,7 @@ export declare class AcpSessionBridge extends EventEmitter implements acp.Client
|
|
|
28
28
|
private textChunkBuffer;
|
|
29
29
|
private textChunkTimer;
|
|
30
30
|
private initializing;
|
|
31
|
+
private stopped;
|
|
31
32
|
constructor(socket: Socket, options: AcpBridgeOptions, spawner?: AcpSpawner);
|
|
32
33
|
start(): Promise<void>;
|
|
33
34
|
resume(externalSessionId: string): Promise<void>;
|
package/dist/acp/bridge.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../../src/acp/bridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,GAAG,CAAC,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAC,CAAC;CACtH;AAgBD,qBAAa,gBAAiB,SAAQ,YAAa,YAAW,GAAG,CAAC,MAAM;IACtE,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,UAAU,CAAiC;IACnD,OAAO,CAAC,UAAU,CAAyC;IAC3D,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,YAAY,CAA4C;IAChE,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,eAAe,CAAM;IAC7B,OAAO,CAAC,cAAc,CAA8C;IACpE,OAAO,CAAC,YAAY,CAAS;
|
|
1
|
+
{"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../../src/acp/bridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,GAAG,CAAC,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAC,CAAC;CACtH;AAgBD,qBAAa,gBAAiB,SAAQ,YAAa,YAAW,GAAG,CAAC,MAAM;IACtE,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,UAAU,CAAiC;IACnD,OAAO,CAAC,UAAU,CAAyC;IAC3D,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,YAAY,CAA4C;IAChE,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,eAAe,CAAM;IAC7B,OAAO,CAAC,cAAc,CAA8C;IACpE,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,OAAO,CAAS;gBAEZ,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,UAAU;IASrE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA+BtB,MAAM,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkDhD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAa3B,MAAM,IAAI,IAAI;IAMR,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ9C,SAAS,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;YAQ7C,aAAa;YA8Bb,cAAc;IAe5B,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,sBAAsB;IAUxB,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB7D,iBAAiB,CACrB,MAAM,EAAE,GAAG,CAAC,wBAAwB,GACnC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;IAWzC,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,eAAe;IAgBvB,OAAO,CAAC,UAAU;IAOlB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,WAAW;CAepB"}
|
package/dist/acp/bridge.js
CHANGED
|
@@ -23,6 +23,7 @@ export class AcpSessionBridge extends EventEmitter {
|
|
|
23
23
|
textChunkBuffer = '';
|
|
24
24
|
textChunkTimer = null;
|
|
25
25
|
initializing = false;
|
|
26
|
+
stopped = false;
|
|
26
27
|
constructor(socket, options, spawner) {
|
|
27
28
|
super();
|
|
28
29
|
this.socket = socket;
|
|
@@ -151,20 +152,29 @@ export class AcpSessionBridge extends EventEmitter {
|
|
|
151
152
|
this.processPrompt(message);
|
|
152
153
|
}
|
|
153
154
|
async processPrompt(message) {
|
|
154
|
-
if (!this.connection || !this.acpSessionId)
|
|
155
|
+
if (!this.connection || !this.acpSessionId || this.stopped)
|
|
155
156
|
return;
|
|
156
157
|
this.activePrompt = this.connection.prompt({
|
|
157
158
|
sessionId: this.acpSessionId,
|
|
158
159
|
prompt: [{ type: 'text', text: message.content }],
|
|
159
160
|
});
|
|
161
|
+
this.socket.emit('acp:prompt:start', { sessionId: this.sessionId });
|
|
162
|
+
let stopReason = 'end_turn';
|
|
160
163
|
try {
|
|
161
|
-
await this.activePrompt;
|
|
164
|
+
const result = await this.activePrompt;
|
|
165
|
+
stopReason = result?.stopReason ?? 'end_turn';
|
|
162
166
|
}
|
|
163
167
|
catch {
|
|
164
|
-
|
|
168
|
+
stopReason = 'error';
|
|
165
169
|
}
|
|
166
170
|
finally {
|
|
167
171
|
this.activePrompt = null;
|
|
172
|
+
if (!this.stopped) {
|
|
173
|
+
this.socket.emit('acp:prompt:complete', {
|
|
174
|
+
sessionId: this.sessionId,
|
|
175
|
+
stopReason,
|
|
176
|
+
});
|
|
177
|
+
}
|
|
168
178
|
if (this.inputQueue.length > 0) {
|
|
169
179
|
this.processPrompt(this.inputQueue.shift());
|
|
170
180
|
}
|
|
@@ -274,10 +284,12 @@ export class AcpSessionBridge extends EventEmitter {
|
|
|
274
284
|
});
|
|
275
285
|
}
|
|
276
286
|
emitStopped(reason, exitCode) {
|
|
287
|
+
this.stopped = true;
|
|
277
288
|
this.socket.emit('acp:stopped', { sessionId: this.sessionId, reason, exitCode });
|
|
278
289
|
this.emit('acp:stopped', { sessionId: this.sessionId, reason, exitCode });
|
|
279
290
|
}
|
|
280
291
|
handleError(error) {
|
|
292
|
+
this.stopped = true;
|
|
281
293
|
const msg = error instanceof Error ? error.message : String(error);
|
|
282
294
|
this.socket.emit('acp:stopped', {
|
|
283
295
|
sessionId: this.sessionId,
|
package/dist/acp/bridge.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridge.js","sourceRoot":"","sources":["../../src/acp/bridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAa/B,SAAS,YAAY,CAAC,OAAuC;IAC3D,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACjC,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE;QAClB,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE;KACjB,CAAC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,OAAO,gBAAiB,SAAQ,YAAY;IACxC,OAAO,CAAa;IACpB,MAAM,CAAS;IACf,SAAS,CAAS;IAClB,GAAG,CAAS;IACZ,UAAU,CAAiC;IAC3C,UAAU,GAAoC,IAAI,CAAC;IACnD,YAAY,GAAkB,IAAI,CAAC;IACnC,YAAY,GAAuC,IAAI,CAAC;IACxD,UAAU,GAAkB,EAAE,CAAC;IAC/B,eAAe,GAAG,EAAE,CAAC;IACrB,cAAc,GAAyC,IAAI,CAAC;IAC5D,YAAY,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"bridge.js","sourceRoot":"","sources":["../../src/acp/bridge.ts"],"names":[],"mappings":"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"}
|
package/dist/acp/spawner.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawner.d.ts","sourceRoot":"","sources":["../../src/acp/spawner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"spawner.d.ts","sourceRoot":"","sources":["../../src/acp/spawner.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,IAAI,CAAW;IACvB,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,OAAO,CAAgB;gBAEnB,OAAO,EAAE,iBAAiB;IAQtC,KAAK,IAAI,IAAI;IA8Bb,IAAI,KAAK,IAAI,cAAc,CAG1B;IAED,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAGvC;IAED,IAAI,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAE1B;IAED,IAAI,IAAI,IAAI;IAmBZ,SAAS,IAAI,OAAO;IAIpB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,qBAAqB;IAc7B,OAAO,CAAC,kBAAkB;CAW3B"}
|
package/dist/acp/spawner.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { spawn, execFileSync } from 'child_process';
|
|
2
2
|
import { Writable, Readable } from 'node:stream';
|
|
3
3
|
import { existsSync, mkdirSync } from 'fs';
|
|
4
|
+
import { platform } from 'os';
|
|
4
5
|
export class AcpSpawner {
|
|
5
6
|
process = null;
|
|
6
7
|
sessionId;
|
|
@@ -20,10 +21,14 @@ export class AcpSpawner {
|
|
|
20
21
|
const cmd = this.resolveCommand();
|
|
21
22
|
console.log(`Starting ACP server ${cmd}`);
|
|
22
23
|
mkdirSync(this.cwd, { recursive: true });
|
|
23
|
-
|
|
24
|
+
const spawnOptions = {
|
|
24
25
|
cwd: this.cwd,
|
|
25
26
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
26
|
-
}
|
|
27
|
+
};
|
|
28
|
+
if (platform() === 'win32') {
|
|
29
|
+
spawnOptions.shell = true;
|
|
30
|
+
}
|
|
31
|
+
this.process = spawn(cmd, this.args, spawnOptions);
|
|
27
32
|
this.process.stderr?.on('data', (data) => {
|
|
28
33
|
console.error(`ACP stderr: ${data.toString()}`);
|
|
29
34
|
});
|
|
@@ -50,7 +55,17 @@ export class AcpSpawner {
|
|
|
50
55
|
return this._closed;
|
|
51
56
|
}
|
|
52
57
|
stop() {
|
|
53
|
-
if (this.process)
|
|
58
|
+
if (!this.process)
|
|
59
|
+
return;
|
|
60
|
+
if (platform() === 'win32') {
|
|
61
|
+
this.process.kill();
|
|
62
|
+
setTimeout(() => {
|
|
63
|
+
if (this.process) {
|
|
64
|
+
this.process.kill();
|
|
65
|
+
}
|
|
66
|
+
}, 5000);
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
54
69
|
this.process.kill('SIGTERM');
|
|
55
70
|
setTimeout(() => {
|
|
56
71
|
if (this.process) {
|
|
@@ -63,8 +78,27 @@ export class AcpSpawner {
|
|
|
63
78
|
return this.process !== null;
|
|
64
79
|
}
|
|
65
80
|
resolveCommand() {
|
|
66
|
-
if (this.command.includes('/'))
|
|
81
|
+
if (this.command.includes('\\') || this.command.includes('/'))
|
|
67
82
|
return this.command;
|
|
83
|
+
return platform() === 'win32' ? this.resolveWindowsCommand() : this.resolveUnixCommand();
|
|
84
|
+
}
|
|
85
|
+
resolveWindowsCommand() {
|
|
86
|
+
try {
|
|
87
|
+
const result = execFileSync('where', [this.command], { encoding: 'utf8', timeout: 1000 });
|
|
88
|
+
const firstMatch = result.trim().split('\n')[0]?.trim();
|
|
89
|
+
if (firstMatch)
|
|
90
|
+
return firstMatch;
|
|
91
|
+
}
|
|
92
|
+
catch { /* not found via where */ }
|
|
93
|
+
const pathext = (process.env.PATHEXT || '.COM;.EXE;.BAT;.CMD').split(';');
|
|
94
|
+
for (const ext of pathext) {
|
|
95
|
+
const candidate = this.command + ext.toLowerCase();
|
|
96
|
+
if (existsSync(candidate))
|
|
97
|
+
return candidate;
|
|
98
|
+
}
|
|
99
|
+
return this.command;
|
|
100
|
+
}
|
|
101
|
+
resolveUnixCommand() {
|
|
68
102
|
const candidates = [this.command, `/usr/bin/${this.command}`, `/usr/local/bin/${this.command}`];
|
|
69
103
|
for (const cmd of candidates) {
|
|
70
104
|
try {
|
package/dist/acp/spawner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawner.js","sourceRoot":"","sources":["../../src/acp/spawner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"spawner.js","sourceRoot":"","sources":["../../src/acp/spawner.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
File without changes
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { Socket } from 'socket.io-client';
|
|
2
|
+
export declare class PortForwardManager {
|
|
3
|
+
private tunnels;
|
|
4
|
+
createTunnel(tunnelId: string, port: number, serverSocket: Socket): Promise<void>;
|
|
5
|
+
handleTunnelData(tunnelId: string, data: string): void;
|
|
6
|
+
closeTunnel(tunnelId: string): void;
|
|
7
|
+
closeAll(): void;
|
|
8
|
+
}
|
|
9
|
+
export declare const portForwardManager: PortForwardManager;
|
|
10
|
+
//# sourceMappingURL=port-forward.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"port-forward.d.ts","sourceRoot":"","sources":["../src/port-forward.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAQ/C,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,OAAO,CAAkC;IAE3C,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDvF,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAStD,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAQnC,QAAQ,IAAI,IAAI;CAOjB;AAED,eAAO,MAAM,kBAAkB,oBAA2B,CAAC"}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import net from 'node:net';
|
|
2
|
+
export class PortForwardManager {
|
|
3
|
+
tunnels = new Map();
|
|
4
|
+
async createTunnel(tunnelId, port, serverSocket) {
|
|
5
|
+
const localSocket = net.connect({ host: '127.0.0.1', port });
|
|
6
|
+
return new Promise((resolve) => {
|
|
7
|
+
const onError = (err) => {
|
|
8
|
+
console.error(`Port forward tunnel error: tunnelId=${tunnelId} error=${err.message}`);
|
|
9
|
+
serverSocket.emit('port-forward:created', {
|
|
10
|
+
tunnelId,
|
|
11
|
+
success: false,
|
|
12
|
+
error: err.message,
|
|
13
|
+
});
|
|
14
|
+
localSocket.destroy();
|
|
15
|
+
resolve();
|
|
16
|
+
};
|
|
17
|
+
localSocket.once('error', onError);
|
|
18
|
+
localSocket.once('connect', () => {
|
|
19
|
+
localSocket.removeListener('error', onError);
|
|
20
|
+
this.tunnels.set(tunnelId, { id: tunnelId, port, localSocket });
|
|
21
|
+
console.log(`Port forward tunnel created: tunnelId=${tunnelId} port=${port}`);
|
|
22
|
+
serverSocket.emit('port-forward:created', { tunnelId, success: true });
|
|
23
|
+
localSocket.on('data', (data) => {
|
|
24
|
+
serverSocket.emit('port-forward:data', {
|
|
25
|
+
tunnelId,
|
|
26
|
+
data: data.toString('base64'),
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
localSocket.on('close', () => {
|
|
30
|
+
console.log(`Port forward local socket closed: tunnelId=${tunnelId}`);
|
|
31
|
+
this.tunnels.delete(tunnelId);
|
|
32
|
+
serverSocket.emit('port-forward:close', { tunnelId });
|
|
33
|
+
});
|
|
34
|
+
localSocket.on('error', (err) => {
|
|
35
|
+
console.error(`Port forward local socket error: tunnelId=${tunnelId} error=${err.message}`);
|
|
36
|
+
this.tunnels.delete(tunnelId);
|
|
37
|
+
serverSocket.emit('port-forward:error', { tunnelId, error: err.message });
|
|
38
|
+
});
|
|
39
|
+
resolve();
|
|
40
|
+
});
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
handleTunnelData(tunnelId, data) {
|
|
44
|
+
const tunnel = this.tunnels.get(tunnelId);
|
|
45
|
+
if (!tunnel) {
|
|
46
|
+
console.warn(`Port forward data for unknown tunnel: tunnelId=${tunnelId}`);
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
tunnel.localSocket.write(Buffer.from(data, 'base64'));
|
|
50
|
+
}
|
|
51
|
+
closeTunnel(tunnelId) {
|
|
52
|
+
const tunnel = this.tunnels.get(tunnelId);
|
|
53
|
+
if (!tunnel)
|
|
54
|
+
return;
|
|
55
|
+
console.log(`Port forward closing tunnel: tunnelId=${tunnelId}`);
|
|
56
|
+
tunnel.localSocket.destroy();
|
|
57
|
+
this.tunnels.delete(tunnelId);
|
|
58
|
+
}
|
|
59
|
+
closeAll() {
|
|
60
|
+
console.log(`Port forward closing all tunnels: count=${this.tunnels.size}`);
|
|
61
|
+
for (const tunnel of this.tunnels.values()) {
|
|
62
|
+
tunnel.localSocket.destroy();
|
|
63
|
+
}
|
|
64
|
+
this.tunnels.clear();
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
export const portForwardManager = new PortForwardManager();
|
|
68
|
+
//# sourceMappingURL=port-forward.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"port-forward.js","sourceRoot":"","sources":["../src/port-forward.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"port-forward.test.d.ts","sourceRoot":"","sources":["../src/port-forward.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,163 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
2
|
+
vi.mock('node:net', () => ({
|
|
3
|
+
default: {
|
|
4
|
+
connect: vi.fn(),
|
|
5
|
+
},
|
|
6
|
+
}));
|
|
7
|
+
import net from 'node:net';
|
|
8
|
+
import { PortForwardManager } from './port-forward.js';
|
|
9
|
+
function createMockLocalSocket() {
|
|
10
|
+
const handlers = new Map();
|
|
11
|
+
return {
|
|
12
|
+
once: vi.fn((event, handler) => {
|
|
13
|
+
handlers.set(event, handler);
|
|
14
|
+
}),
|
|
15
|
+
on: vi.fn((event, handler) => {
|
|
16
|
+
handlers.set(event, handler);
|
|
17
|
+
}),
|
|
18
|
+
removeListener: vi.fn(),
|
|
19
|
+
destroy: vi.fn(),
|
|
20
|
+
write: vi.fn(),
|
|
21
|
+
emit: vi.fn(),
|
|
22
|
+
_handlers: handlers,
|
|
23
|
+
_trigger(event, ...args) {
|
|
24
|
+
const handler = handlers.get(event);
|
|
25
|
+
if (handler)
|
|
26
|
+
handler(...args);
|
|
27
|
+
},
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
function createMockServerSocket() {
|
|
31
|
+
return {
|
|
32
|
+
emit: vi.fn(),
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
describe('PortForwardManager', () => {
|
|
36
|
+
let portForwardManager;
|
|
37
|
+
beforeEach(() => {
|
|
38
|
+
vi.clearAllMocks();
|
|
39
|
+
portForwardManager = new PortForwardManager();
|
|
40
|
+
});
|
|
41
|
+
describe('createTunnel', () => {
|
|
42
|
+
it('should send port-forward:created(success: true) and store tunnel on connection success', async () => {
|
|
43
|
+
const mockLocalSocket = createMockLocalSocket();
|
|
44
|
+
const mockServerSocket = createMockServerSocket();
|
|
45
|
+
vi.mocked(net.connect).mockReturnValue(mockLocalSocket);
|
|
46
|
+
const promise = portForwardManager.createTunnel('tunnel-1', 3000, mockServerSocket);
|
|
47
|
+
mockLocalSocket._trigger('connect');
|
|
48
|
+
await promise;
|
|
49
|
+
expect(net.connect).toHaveBeenCalledWith({ host: '127.0.0.1', port: 3000 });
|
|
50
|
+
expect(mockServerSocket.emit).toHaveBeenCalledWith('port-forward:created', {
|
|
51
|
+
tunnelId: 'tunnel-1',
|
|
52
|
+
success: true,
|
|
53
|
+
});
|
|
54
|
+
});
|
|
55
|
+
it('should send port-forward:created(success: false, error) and destroy socket on connection failure', async () => {
|
|
56
|
+
const mockLocalSocket = createMockLocalSocket();
|
|
57
|
+
const mockServerSocket = createMockServerSocket();
|
|
58
|
+
vi.mocked(net.connect).mockReturnValue(mockLocalSocket);
|
|
59
|
+
const promise = portForwardManager.createTunnel('tunnel-1', 3000, mockServerSocket);
|
|
60
|
+
mockLocalSocket._trigger('error', new Error('ECONNREFUSED'));
|
|
61
|
+
await promise;
|
|
62
|
+
expect(mockServerSocket.emit).toHaveBeenCalledWith('port-forward:created', {
|
|
63
|
+
tunnelId: 'tunnel-1',
|
|
64
|
+
success: false,
|
|
65
|
+
error: 'ECONNREFUSED',
|
|
66
|
+
});
|
|
67
|
+
expect(mockLocalSocket.destroy).toHaveBeenCalled();
|
|
68
|
+
});
|
|
69
|
+
it('should send port-forward:data with base64 encoded data when local socket receives data', async () => {
|
|
70
|
+
const mockLocalSocket = createMockLocalSocket();
|
|
71
|
+
const mockServerSocket = createMockServerSocket();
|
|
72
|
+
vi.mocked(net.connect).mockReturnValue(mockLocalSocket);
|
|
73
|
+
const promise = portForwardManager.createTunnel('tunnel-1', 3000, mockServerSocket);
|
|
74
|
+
mockLocalSocket._trigger('connect');
|
|
75
|
+
await promise;
|
|
76
|
+
const testData = Buffer.from('hello world');
|
|
77
|
+
mockLocalSocket._trigger('data', testData);
|
|
78
|
+
expect(mockServerSocket.emit).toHaveBeenCalledWith('port-forward:data', {
|
|
79
|
+
tunnelId: 'tunnel-1',
|
|
80
|
+
data: testData.toString('base64'),
|
|
81
|
+
});
|
|
82
|
+
});
|
|
83
|
+
it('should send port-forward:close and remove tunnel when local socket closes', async () => {
|
|
84
|
+
const mockLocalSocket = createMockLocalSocket();
|
|
85
|
+
const mockServerSocket = createMockServerSocket();
|
|
86
|
+
vi.mocked(net.connect).mockReturnValue(mockLocalSocket);
|
|
87
|
+
const promise = portForwardManager.createTunnel('tunnel-1', 3000, mockServerSocket);
|
|
88
|
+
mockLocalSocket._trigger('connect');
|
|
89
|
+
await promise;
|
|
90
|
+
mockLocalSocket._trigger('close');
|
|
91
|
+
expect(mockServerSocket.emit).toHaveBeenCalledWith('port-forward:close', {
|
|
92
|
+
tunnelId: 'tunnel-1',
|
|
93
|
+
});
|
|
94
|
+
});
|
|
95
|
+
it('should send port-forward:error and remove tunnel when local socket errors after connect', async () => {
|
|
96
|
+
const mockLocalSocket = createMockLocalSocket();
|
|
97
|
+
const mockServerSocket = createMockServerSocket();
|
|
98
|
+
vi.mocked(net.connect).mockReturnValue(mockLocalSocket);
|
|
99
|
+
const promise = portForwardManager.createTunnel('tunnel-1', 3000, mockServerSocket);
|
|
100
|
+
mockLocalSocket._trigger('connect');
|
|
101
|
+
await promise;
|
|
102
|
+
mockLocalSocket._trigger('error', new Error('ECONNRESET'));
|
|
103
|
+
expect(mockServerSocket.emit).toHaveBeenCalledWith('port-forward:error', {
|
|
104
|
+
tunnelId: 'tunnel-1',
|
|
105
|
+
error: 'ECONNRESET',
|
|
106
|
+
});
|
|
107
|
+
});
|
|
108
|
+
});
|
|
109
|
+
describe('handleTunnelData', () => {
|
|
110
|
+
it('should write base64 decoded data to the corresponding local socket', async () => {
|
|
111
|
+
const mockLocalSocket = createMockLocalSocket();
|
|
112
|
+
const mockServerSocket = createMockServerSocket();
|
|
113
|
+
vi.mocked(net.connect).mockReturnValue(mockLocalSocket);
|
|
114
|
+
const promise = portForwardManager.createTunnel('tunnel-1', 3000, mockServerSocket);
|
|
115
|
+
mockLocalSocket._trigger('connect');
|
|
116
|
+
await promise;
|
|
117
|
+
const base64Data = Buffer.from('test payload').toString('base64');
|
|
118
|
+
portForwardManager.handleTunnelData('tunnel-1', base64Data);
|
|
119
|
+
expect(mockLocalSocket.write).toHaveBeenCalledWith(Buffer.from('test payload'));
|
|
120
|
+
});
|
|
121
|
+
it('should log warning and ignore for unknown tunnelId', () => {
|
|
122
|
+
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => { });
|
|
123
|
+
portForwardManager.handleTunnelData('unknown-tunnel', 'data');
|
|
124
|
+
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('unknown tunnel'));
|
|
125
|
+
warnSpy.mockRestore();
|
|
126
|
+
});
|
|
127
|
+
});
|
|
128
|
+
describe('closeTunnel', () => {
|
|
129
|
+
it('should destroy local socket and remove tunnel from map', async () => {
|
|
130
|
+
const mockLocalSocket = createMockLocalSocket();
|
|
131
|
+
const mockServerSocket = createMockServerSocket();
|
|
132
|
+
vi.mocked(net.connect).mockReturnValue(mockLocalSocket);
|
|
133
|
+
const promise = portForwardManager.createTunnel('tunnel-1', 3000, mockServerSocket);
|
|
134
|
+
mockLocalSocket._trigger('connect');
|
|
135
|
+
await promise;
|
|
136
|
+
portForwardManager.closeTunnel('tunnel-1');
|
|
137
|
+
expect(mockLocalSocket.destroy).toHaveBeenCalled();
|
|
138
|
+
});
|
|
139
|
+
it('should silently ignore unknown tunnelId', () => {
|
|
140
|
+
expect(() => portForwardManager.closeTunnel('unknown-tunnel')).not.toThrow();
|
|
141
|
+
});
|
|
142
|
+
});
|
|
143
|
+
describe('closeAll', () => {
|
|
144
|
+
it('should close all tunnels and clear the map', async () => {
|
|
145
|
+
const socket1 = createMockLocalSocket();
|
|
146
|
+
const socket2 = createMockLocalSocket();
|
|
147
|
+
const mockServerSocket = createMockServerSocket();
|
|
148
|
+
vi.mocked(net.connect)
|
|
149
|
+
.mockReturnValueOnce(socket1)
|
|
150
|
+
.mockReturnValueOnce(socket2);
|
|
151
|
+
const promise1 = portForwardManager.createTunnel('tunnel-1', 3000, mockServerSocket);
|
|
152
|
+
socket1._trigger('connect');
|
|
153
|
+
await promise1;
|
|
154
|
+
const promise2 = portForwardManager.createTunnel('tunnel-2', 4000, mockServerSocket);
|
|
155
|
+
socket2._trigger('connect');
|
|
156
|
+
await promise2;
|
|
157
|
+
portForwardManager.closeAll();
|
|
158
|
+
expect(socket1.destroy).toHaveBeenCalled();
|
|
159
|
+
expect(socket2.destroy).toHaveBeenCalled();
|
|
160
|
+
});
|
|
161
|
+
});
|
|
162
|
+
});
|
|
163
|
+
//# sourceMappingURL=port-forward.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"port-forward.test.js","sourceRoot":"","sources":["../src/port-forward.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socketio-client.d.ts","sourceRoot":"","sources":["../src/socketio-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"socketio-client.d.ts","sourceRoot":"","sources":["../src/socketio-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AA4I3E,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAChC,MAAM,CAgcR;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAE/C"}
|
package/dist/socketio-client.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { io as createSocketIOClient } from 'socket.io-client';
|
|
2
|
-
import { hostname } from 'os';
|
|
3
|
-
import { readdir } from 'fs/promises';
|
|
2
|
+
import { hostname, platform } from 'os';
|
|
3
|
+
import { readdir, access } from 'fs/promises';
|
|
4
4
|
import { join } from 'path';
|
|
5
5
|
import { homedir } from 'os';
|
|
6
6
|
import { Heartbeat } from './heartbeat.js';
|
|
@@ -12,7 +12,8 @@ import { AcpSyncBridge } from './acp/sync-bridge.js';
|
|
|
12
12
|
import { gitHandler } from './git-handler.js';
|
|
13
13
|
import { worktreeHandler } from './worktree-handler.js';
|
|
14
14
|
import { fsHandler } from './fs-handler.js';
|
|
15
|
-
|
|
15
|
+
import { portForwardManager } from './port-forward.js';
|
|
16
|
+
const CONTROLLER_VERSION = '1.0.4';
|
|
16
17
|
const acpBridges = new Map();
|
|
17
18
|
function createSpawner(serverType, sessionId, cwd) {
|
|
18
19
|
const config = acpDetector.getSpawnerConfig(serverType);
|
|
@@ -346,6 +347,21 @@ export function connectToServer(endpoint, key, options) {
|
|
|
346
347
|
console.log(`FS browse requested: requestId=${data.requestId} path=${data.path}`);
|
|
347
348
|
try {
|
|
348
349
|
const targetPath = data.path || homedir();
|
|
350
|
+
// On Windows, listing '/' should return available drive letters
|
|
351
|
+
if ((data.path === '/' || data.path === '') && platform() === 'win32') {
|
|
352
|
+
const drives = [];
|
|
353
|
+
for (let i = 65; i <= 90; i++) {
|
|
354
|
+
const letter = String.fromCharCode(i);
|
|
355
|
+
const drivePath = `${letter}:\\`;
|
|
356
|
+
try {
|
|
357
|
+
await access(drivePath);
|
|
358
|
+
drives.push({ name: `${letter}:`, path: drivePath, isDirectory: true });
|
|
359
|
+
}
|
|
360
|
+
catch { /* drive not available */ }
|
|
361
|
+
}
|
|
362
|
+
socket.emit('fs:browse:result', { requestId: data.requestId, entries: drives });
|
|
363
|
+
return;
|
|
364
|
+
}
|
|
349
365
|
const entries = await readdir(targetPath, { withFileTypes: true });
|
|
350
366
|
const result = entries
|
|
351
367
|
.filter((entry) => !entry.name.startsWith('.'))
|
|
@@ -400,9 +416,22 @@ export function connectToServer(endpoint, key, options) {
|
|
|
400
416
|
const result = await worktreeHandler.commit(data.path, data.message);
|
|
401
417
|
socket.emit('git:commit:result', { requestId: data.requestId, ...result });
|
|
402
418
|
});
|
|
419
|
+
// Port Forward events
|
|
420
|
+
socket.on('port-forward:create', async (data) => {
|
|
421
|
+
console.log(`Port forward create requested: tunnelId=${data.tunnelId} port=${data.port}`);
|
|
422
|
+
await portForwardManager.createTunnel(data.tunnelId, data.port, socket);
|
|
423
|
+
});
|
|
424
|
+
socket.on('port-forward:data', (data) => {
|
|
425
|
+
portForwardManager.handleTunnelData(data.tunnelId, data.data);
|
|
426
|
+
});
|
|
427
|
+
socket.on('port-forward:close', (data) => {
|
|
428
|
+
console.log(`Port forward close: tunnelId=${data.tunnelId}`);
|
|
429
|
+
portForwardManager.closeTunnel(data.tunnelId);
|
|
430
|
+
});
|
|
403
431
|
socket.on('disconnect', (reason) => {
|
|
404
432
|
console.log(`Disconnected: ${reason}`);
|
|
405
433
|
heartbeat.stop();
|
|
434
|
+
portForwardManager.closeAll();
|
|
406
435
|
});
|
|
407
436
|
socket.on('connect_error', (err) => {
|
|
408
437
|
console.error(`Connection error: ${err.message}`);
|