agent-gear 1.1.5 → 1.1.7
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 +83 -3
- package/dist/acp/bridge.d.ts.map +1 -1
- package/dist/acp/bridge.js +386 -62
- package/dist/acp/bridge.js.map +1 -1
- package/dist/acp/bridge.test.js +131 -8
- package/dist/acp/bridge.test.js.map +1 -1
- package/dist/acp/spawner.js +4 -4
- package/dist/acp/spawner.js.map +1 -1
- package/dist/acp/sync-bridge.d.ts +6 -1
- package/dist/acp/sync-bridge.d.ts.map +1 -1
- package/dist/acp/sync-bridge.js +23 -3
- package/dist/acp/sync-bridge.js.map +1 -1
- package/dist/commands/mcp-proxy.d.ts +10 -0
- package/dist/commands/mcp-proxy.d.ts.map +1 -1
- package/dist/commands/mcp-proxy.js +78 -24
- package/dist/commands/mcp-proxy.js.map +1 -1
- package/dist/socketio-client.d.ts.map +1 -1
- package/dist/socketio-client.js +164 -4
- package/dist/socketio-client.js.map +1 -1
- package/package.json +2 -2
- package/src/acp/bridge.test.ts +160 -8
- package/src/acp/bridge.ts +479 -63
- package/src/acp/spawner.ts +4 -4
- package/src/acp/sync-bridge.ts +27 -3
- package/src/commands/mcp-proxy.ts +91 -28
- package/src/socketio-client.ts +197 -5
- package/tests/acp-bridge.test.ts +369 -31
- package/tests/acp-spawner.test.ts +28 -1
- package/tests/acp-sync-bridge.test.ts +39 -1
- package/tests/acp-wire-elicitation.test.ts +158 -0
- package/tests/acp-wire-mcp.test.ts +114 -0
- package/tests/commands/mcp-proxy-dispatcher.test.ts +117 -0
- package/tests/fixtures/fake-acp-agent.mjs +122 -0
- package/tests/socketio-client.test.ts +211 -0
package/dist/acp/bridge.test.js
CHANGED
|
@@ -1,18 +1,25 @@
|
|
|
1
1
|
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
2
|
-
vi.
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
const { mockNewSession, mockResumeSession, mockInitialize, mockClientSideConnection } = vi.hoisted(() => {
|
|
3
|
+
const mockNewSession = vi.fn().mockResolvedValue({ sessionId: 'acp-sess-abc' });
|
|
4
|
+
const mockResumeSession = vi.fn().mockResolvedValue({});
|
|
5
|
+
const mockInitialize = vi.fn().mockResolvedValue({ protocolVersion: 1 });
|
|
6
|
+
const mockClientSideConnection = vi.fn(function () {
|
|
5
7
|
return {
|
|
6
|
-
initialize:
|
|
7
|
-
newSession:
|
|
8
|
-
resumeSession:
|
|
8
|
+
initialize: mockInitialize,
|
|
9
|
+
newSession: mockNewSession,
|
|
10
|
+
resumeSession: mockResumeSession,
|
|
9
11
|
prompt: vi.fn().mockResolvedValue({ stopReason: 'end_turn' }),
|
|
10
12
|
cancel: vi.fn().mockResolvedValue(undefined),
|
|
11
13
|
closeSession: vi.fn().mockResolvedValue({}),
|
|
12
14
|
setSessionMode: vi.fn().mockResolvedValue({}),
|
|
13
|
-
|
|
15
|
+
setSessionConfigOption: vi.fn().mockResolvedValue({}),
|
|
14
16
|
};
|
|
15
|
-
})
|
|
17
|
+
});
|
|
18
|
+
return { mockNewSession, mockResumeSession, mockInitialize, mockClientSideConnection };
|
|
19
|
+
});
|
|
20
|
+
vi.mock('@agentclientprotocol/sdk', () => ({
|
|
21
|
+
ndJsonStream: vi.fn(() => ({})),
|
|
22
|
+
ClientSideConnection: mockClientSideConnection,
|
|
16
23
|
}));
|
|
17
24
|
import { AcpSessionBridge } from './bridge.js';
|
|
18
25
|
class MockAcpSpawner {
|
|
@@ -146,4 +153,120 @@ describe('AcpSessionBridge - requestPermission', () => {
|
|
|
146
153
|
warnSpy.mockRestore();
|
|
147
154
|
});
|
|
148
155
|
});
|
|
156
|
+
describe('AcpSessionBridge - mcpEndpoint injection', () => {
|
|
157
|
+
let mockSocket;
|
|
158
|
+
let mockSpawner;
|
|
159
|
+
function createBridge(mcpEndpoint) {
|
|
160
|
+
return new AcpSessionBridge(mockSocket, { sessionId: 'sess-1', cwd: '/home/user', mcpEndpoint }, mockSpawner);
|
|
161
|
+
}
|
|
162
|
+
beforeEach(() => {
|
|
163
|
+
vi.clearAllMocks();
|
|
164
|
+
vi.useFakeTimers();
|
|
165
|
+
mockSocket = createMockSocket();
|
|
166
|
+
mockSpawner = new MockAcpSpawner();
|
|
167
|
+
});
|
|
168
|
+
afterEach(() => {
|
|
169
|
+
vi.useRealTimers();
|
|
170
|
+
vi.restoreAllMocks();
|
|
171
|
+
});
|
|
172
|
+
it('should pass http mcpServers to newSession when mcpEndpoint provided', async () => {
|
|
173
|
+
const bridge = createBridge({
|
|
174
|
+
url: 'http://gateway/mcp/sess-1',
|
|
175
|
+
token: 'tok-1',
|
|
176
|
+
serverNames: ['github-mcp', 'fs-mcp'],
|
|
177
|
+
});
|
|
178
|
+
await bridge.start();
|
|
179
|
+
expect(mockNewSession).toHaveBeenCalledWith(expect.objectContaining({
|
|
180
|
+
mcpServers: [
|
|
181
|
+
{ type: 'http', name: 'github-mcp', url: 'http://gateway/mcp/sess-1/github-mcp', headers: [{ name: 'Authorization', value: 'Bearer tok-1' }] },
|
|
182
|
+
{ type: 'http', name: 'fs-mcp', url: 'http://gateway/mcp/sess-1/fs-mcp', headers: [{ name: 'Authorization', value: 'Bearer tok-1' }] },
|
|
183
|
+
],
|
|
184
|
+
}));
|
|
185
|
+
});
|
|
186
|
+
it('should not set mcpServers when mcpEndpoint absent', async () => {
|
|
187
|
+
const bridge = createBridge();
|
|
188
|
+
await bridge.start();
|
|
189
|
+
expect(mockNewSession).toHaveBeenCalledWith(expect.objectContaining({
|
|
190
|
+
mcpServers: [],
|
|
191
|
+
}));
|
|
192
|
+
});
|
|
193
|
+
it('should pass http mcpServers to resumeSession when mcpEndpoint provided', async () => {
|
|
194
|
+
const bridge = createBridge({
|
|
195
|
+
url: 'http://gateway/mcp/sess-1',
|
|
196
|
+
token: 'tok-1',
|
|
197
|
+
serverNames: ['github-mcp'],
|
|
198
|
+
});
|
|
199
|
+
await bridge.resume('ext-123');
|
|
200
|
+
expect(mockResumeSession).toHaveBeenCalledWith(expect.objectContaining({
|
|
201
|
+
mcpServers: [
|
|
202
|
+
{ type: 'http', name: 'github-mcp', url: 'http://gateway/mcp/sess-1/github-mcp', headers: [{ name: 'Authorization', value: 'Bearer tok-1' }] },
|
|
203
|
+
],
|
|
204
|
+
}));
|
|
205
|
+
});
|
|
206
|
+
it('should fail with a diagnosable error when mcpEndpoint.serverNames is missing', async () => {
|
|
207
|
+
const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => { });
|
|
208
|
+
const bridge = createBridge({
|
|
209
|
+
url: 'http://gateway/mcp/sess-1',
|
|
210
|
+
token: 'tok-1',
|
|
211
|
+
// simulate an upstream payload that drifts from the contract
|
|
212
|
+
serverNames: undefined,
|
|
213
|
+
});
|
|
214
|
+
await bridge.start();
|
|
215
|
+
expect(mockNewSession).not.toHaveBeenCalled();
|
|
216
|
+
expect(mockSocket.emit).toHaveBeenCalledWith('acp:stopped', expect.objectContaining({
|
|
217
|
+
sessionId: 'sess-1',
|
|
218
|
+
reason: 'error',
|
|
219
|
+
error: expect.stringContaining('serverNames'),
|
|
220
|
+
}));
|
|
221
|
+
// the failure must be visible in local logs, not only via socket events
|
|
222
|
+
expect(errorSpy).toHaveBeenCalledWith(expect.stringContaining('serverNames'));
|
|
223
|
+
expect(mockSpawner.stop).toHaveBeenCalled();
|
|
224
|
+
});
|
|
225
|
+
it('should fail with a diagnosable error when mcpEndpoint.serverNames is empty', async () => {
|
|
226
|
+
const bridge = createBridge({
|
|
227
|
+
url: 'http://gateway/mcp/sess-1',
|
|
228
|
+
token: 'tok-1',
|
|
229
|
+
serverNames: [],
|
|
230
|
+
});
|
|
231
|
+
await bridge.start();
|
|
232
|
+
expect(mockNewSession).not.toHaveBeenCalled();
|
|
233
|
+
expect(mockSocket.emit).toHaveBeenCalledWith('acp:stopped', expect.objectContaining({
|
|
234
|
+
sessionId: 'sess-1',
|
|
235
|
+
reason: 'error',
|
|
236
|
+
error: expect.stringContaining('serverNames'),
|
|
237
|
+
}));
|
|
238
|
+
});
|
|
239
|
+
it('should log the MCP servers passed to session/new without leaking the token', async () => {
|
|
240
|
+
const logSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
|
|
241
|
+
const bridge = createBridge({
|
|
242
|
+
url: 'http://gateway/mcp/sess-1',
|
|
243
|
+
token: 'secret-token',
|
|
244
|
+
serverNames: ['fluentui-mcp'],
|
|
245
|
+
});
|
|
246
|
+
await bridge.start();
|
|
247
|
+
const logLines = logSpy.mock.calls.map((c) => String(c[0]));
|
|
248
|
+
const mcpLog = logLines.find((l) => l.includes('passing MCP servers via session/new'));
|
|
249
|
+
expect(mcpLog).toBeDefined();
|
|
250
|
+
expect(mcpLog).toContain('fluentui-mcp(type=http, url=http://gateway/mcp/sess-1/fluentui-mcp');
|
|
251
|
+
expect(mcpLog).not.toContain('secret-token');
|
|
252
|
+
});
|
|
253
|
+
it('should warn when passing http MCP servers to an agent without http MCP capability', async () => {
|
|
254
|
+
mockInitialize.mockResolvedValueOnce({
|
|
255
|
+
protocolVersion: 1,
|
|
256
|
+
agentCapabilities: { mcpCapabilities: { http: false, sse: true } },
|
|
257
|
+
});
|
|
258
|
+
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => { });
|
|
259
|
+
const bridge = createBridge({
|
|
260
|
+
url: 'http://gateway/mcp/sess-1',
|
|
261
|
+
token: 'tok-1',
|
|
262
|
+
serverNames: ['fluentui-mcp'],
|
|
263
|
+
});
|
|
264
|
+
await bridge.start();
|
|
265
|
+
expect(warnSpy).toHaveBeenCalledWith(expect.stringContaining('mcpCapabilities.http'));
|
|
266
|
+
// still passes the servers through — the agent decides
|
|
267
|
+
expect(mockNewSession).toHaveBeenCalledWith(expect.objectContaining({
|
|
268
|
+
mcpServers: [expect.objectContaining({ type: 'http', name: 'fluentui-mcp' })],
|
|
269
|
+
}));
|
|
270
|
+
});
|
|
271
|
+
});
|
|
149
272
|
//# sourceMappingURL=bridge.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridge.test.js","sourceRoot":"","sources":["../../src/acp/bridge.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"bridge.test.js","sourceRoot":"","sources":["../../src/acp/bridge.test.ts"],"names":[],"mappings":"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"}
|
package/dist/acp/spawner.js
CHANGED
|
@@ -19,7 +19,7 @@ export class AcpSpawner {
|
|
|
19
19
|
}
|
|
20
20
|
start() {
|
|
21
21
|
const cmd = this.resolveCommand();
|
|
22
|
-
console.log(`Starting ACP server
|
|
22
|
+
console.log(`Starting ACP server: session=${this.sessionId} cmd=${cmd} args=${JSON.stringify(this.args)} cwd=${this.cwd}`);
|
|
23
23
|
mkdirSync(this.cwd, { recursive: true });
|
|
24
24
|
const spawnOptions = {
|
|
25
25
|
cwd: this.cwd,
|
|
@@ -30,15 +30,15 @@ export class AcpSpawner {
|
|
|
30
30
|
}
|
|
31
31
|
this.process = spawn(cmd, this.args, spawnOptions);
|
|
32
32
|
this.process.stderr?.on('data', (data) => {
|
|
33
|
-
console.error(`ACP stderr: ${data.toString()}`);
|
|
33
|
+
console.error(`ACP stderr (session=${this.sessionId}): ${data.toString()}`);
|
|
34
34
|
});
|
|
35
35
|
this.process.on('exit', (code, signal) => {
|
|
36
|
-
console.log(`ACP process exited
|
|
36
|
+
console.log(`ACP process exited: session=${this.sessionId} code=${code} signal=${signal} cmd=${cmd} args=${JSON.stringify(this.args)}`);
|
|
37
37
|
this.process = null;
|
|
38
38
|
this.resolveClosed?.();
|
|
39
39
|
});
|
|
40
40
|
this.process.on('error', (error) => {
|
|
41
|
-
console.error(
|
|
41
|
+
console.error(`ACP process error (session=${this.sessionId}, cmd=${cmd}):`, error);
|
|
42
42
|
});
|
|
43
43
|
}
|
|
44
44
|
get stdin() {
|
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,EAAwC,MAAM,eAAe,CAAC;AAC1F,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAS9B,MAAM,OAAO,UAAU;IACb,OAAO,GAAwB,IAAI,CAAC;IACpC,SAAS,CAAS;IAClB,GAAG,CAAS;IACZ,OAAO,CAAS;IAChB,IAAI,CAAW;IACf,aAAa,GAAwB,IAAI,CAAC;IAC1C,OAAO,CAAgB;IAE/B,YAAY,OAA0B;QACpC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,UAAU,CAAC;QAC7C,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED,KAAK;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"spawner.js","sourceRoot":"","sources":["../../src/acp/spawner.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,9 +7,12 @@ export declare class AcpSyncBridge implements acp.Client {
|
|
|
7
7
|
private spawner;
|
|
8
8
|
private connection;
|
|
9
9
|
private updates;
|
|
10
|
+
private capabilities;
|
|
10
11
|
constructor(options: AcpSyncBridgeOptions, spawner?: AcpSpawner);
|
|
11
12
|
connect(timeoutMs?: number): Promise<void>;
|
|
12
|
-
|
|
13
|
+
supportsDelete(): boolean;
|
|
14
|
+
listSessions(cwd: string, cursor?: string | null): Promise<acp.ListSessionsResponse>;
|
|
15
|
+
deleteSession(sessionId: string): Promise<void>;
|
|
13
16
|
loadSession(sessionId: string, cwd: string, timeoutMs?: number): Promise<{
|
|
14
17
|
config: acp.LoadSessionResponse;
|
|
15
18
|
updates: acp.SessionNotification[];
|
|
@@ -17,5 +20,7 @@ export declare class AcpSyncBridge implements acp.Client {
|
|
|
17
20
|
disconnect(sessionId?: string): Promise<void>;
|
|
18
21
|
sessionUpdate(params: acp.SessionNotification): Promise<void>;
|
|
19
22
|
requestPermission(): Promise<acp.RequestPermissionResponse>;
|
|
23
|
+
unstable_createElicitation(): Promise<acp.CreateElicitationResponse>;
|
|
24
|
+
unstable_completeElicitation(): Promise<void>;
|
|
20
25
|
}
|
|
21
26
|
//# sourceMappingURL=sync-bridge.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-bridge.d.ts","sourceRoot":"","sources":["../../src/acp/sync-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAsB1C,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;CACb;AAED,qBAAa,aAAc,YAAW,GAAG,CAAC,MAAM;IAC9C,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,UAAU,CAAyC;IAC3D,OAAO,CAAC,OAAO,CAAiC;
|
|
1
|
+
{"version":3,"file":"sync-bridge.d.ts","sourceRoot":"","sources":["../../src/acp/sync-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAsB1C,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;CACb;AAED,qBAAa,aAAc,YAAW,GAAG,CAAC,MAAM;IAC9C,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,UAAU,CAAyC;IAC3D,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,YAAY,CAAsC;gBAE9C,OAAO,EAAE,oBAAoB,EAAE,OAAO,CAAC,EAAE,UAAU;IAOzD,OAAO,CAAC,SAAS,GAAE,MAA2B,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBpE,cAAc,IAAI,OAAO;IAInB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;IAOpF,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/C,WAAW,CACf,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,SAAS,GAAE,MAAgC,GAC1C,OAAO,CAAC;QACT,MAAM,EAAE,GAAG,CAAC,mBAAmB,CAAC;QAChC,OAAO,EAAE,GAAG,CAAC,mBAAmB,EAAE,CAAC;KACpC,CAAC;IAuBI,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7C,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7D,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;IAI3D,0BAA0B,IAAI,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;IAIpE,4BAA4B,IAAI,OAAO,CAAC,IAAI,CAAC;CAGpD"}
|
package/dist/acp/sync-bridge.js
CHANGED
|
@@ -19,6 +19,7 @@ export class AcpSyncBridge {
|
|
|
19
19
|
spawner;
|
|
20
20
|
connection = null;
|
|
21
21
|
updates = [];
|
|
22
|
+
capabilities = null;
|
|
22
23
|
constructor(options, spawner) {
|
|
23
24
|
this.spawner = spawner ?? new AcpSpawner({
|
|
24
25
|
sessionId: `sync_${Date.now()}`,
|
|
@@ -38,10 +39,23 @@ export class AcpSyncBridge {
|
|
|
38
39
|
clientCapabilities: {},
|
|
39
40
|
clientInfo: { name: 'agent-gear', version: '1.0.0' },
|
|
40
41
|
});
|
|
41
|
-
await withTimeout(Promise.race([initPromise, exitPromise]), timeoutMs, `ACP connect timed out after ${timeoutMs}ms`);
|
|
42
|
+
const result = await withTimeout(Promise.race([initPromise, exitPromise]), timeoutMs, `ACP connect timed out after ${timeoutMs}ms`);
|
|
43
|
+
this.capabilities = result.agentCapabilities ?? null;
|
|
42
44
|
}
|
|
43
|
-
|
|
44
|
-
return this.
|
|
45
|
+
supportsDelete() {
|
|
46
|
+
return Boolean(this.capabilities?.sessionCapabilities?.delete);
|
|
47
|
+
}
|
|
48
|
+
async listSessions(cwd, cursor) {
|
|
49
|
+
if (!this.connection) {
|
|
50
|
+
throw new Error('ACP connection not established');
|
|
51
|
+
}
|
|
52
|
+
return this.connection.listSessions({ cwd, ...(cursor ? { cursor } : {}) });
|
|
53
|
+
}
|
|
54
|
+
async deleteSession(sessionId) {
|
|
55
|
+
if (!this.connection) {
|
|
56
|
+
throw new Error('ACP connection not established');
|
|
57
|
+
}
|
|
58
|
+
await this.connection.deleteSession({ sessionId });
|
|
45
59
|
}
|
|
46
60
|
async loadSession(sessionId, cwd, timeoutMs = LOAD_SESSION_TIMEOUT_MS) {
|
|
47
61
|
this.updates = [];
|
|
@@ -71,5 +85,11 @@ export class AcpSyncBridge {
|
|
|
71
85
|
async requestPermission() {
|
|
72
86
|
return { outcome: { outcome: 'cancelled' } };
|
|
73
87
|
}
|
|
88
|
+
async unstable_createElicitation() {
|
|
89
|
+
return { action: 'cancel' };
|
|
90
|
+
}
|
|
91
|
+
async unstable_completeElicitation() {
|
|
92
|
+
// no-op
|
|
93
|
+
}
|
|
74
94
|
}
|
|
75
95
|
//# sourceMappingURL=sync-bridge.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-bridge.js","sourceRoot":"","sources":["../../src/acp/sync-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAC/B,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAClC,MAAM,uBAAuB,GAAG,OAAO,CAAC;AAExC,KAAK,UAAU,WAAW,CACxB,OAAmB,EACnB,EAAU,EACV,OAAe;IAEf,IAAI,KAAoC,CAAC;IACzC,MAAM,YAAY,GAAG,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;QACpD,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IACH,IAAI,CAAC;QACH,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IACrD,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAM,CAAC,CAAC;IACvB,CAAC;AACH,CAAC;AAMD,MAAM,OAAO,aAAa;IAChB,OAAO,CAAa;IACpB,UAAU,GAAoC,IAAI,CAAC;IACnD,OAAO,GAA8B,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"sync-bridge.js","sourceRoot":"","sources":["../../src/acp/sync-bridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,18 @@
|
|
|
1
|
+
import { ChildProcess } from 'child_process';
|
|
1
2
|
interface McpProxyOptions {
|
|
2
3
|
server: string;
|
|
3
4
|
key: string;
|
|
4
5
|
command: string;
|
|
5
6
|
}
|
|
7
|
+
interface JsonRpcRequest {
|
|
8
|
+
jsonrpc?: string;
|
|
9
|
+
id?: unknown;
|
|
10
|
+
method?: string;
|
|
11
|
+
[key: string]: unknown;
|
|
12
|
+
}
|
|
13
|
+
export declare function createStdioDispatcher(child: ChildProcess): {
|
|
14
|
+
forward(request: JsonRpcRequest): Promise<unknown>;
|
|
15
|
+
};
|
|
6
16
|
export declare function startMcpRegistration(options: McpProxyOptions): Promise<void>;
|
|
7
17
|
export {};
|
|
8
18
|
//# sourceMappingURL=mcp-proxy.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-proxy.d.ts","sourceRoot":"","sources":["../../src/commands/mcp-proxy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mcp-proxy.d.ts","sourceRoot":"","sources":["../../src/commands/mcp-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,YAAY,EAAE,MAAM,eAAe,CAAC;AAGpD,UAAU,eAAe;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,cAAc;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAeD,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,YAAY;qBA4CpC,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;EAoBrD;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CA+FlF"}
|
|
@@ -1,5 +1,79 @@
|
|
|
1
1
|
import { spawn } from 'child_process';
|
|
2
2
|
import { io as ioClient } from 'socket.io-client';
|
|
3
|
+
const FORWARD_TIMEOUT_MS = 30_000;
|
|
4
|
+
// JSON-RPC notifications have no id and MUST NOT be waited on: per the MCP
|
|
5
|
+
// spec the server never responds to them. Waiting would stall every hop of
|
|
6
|
+
// the forward chain for the full timeout.
|
|
7
|
+
function isNotification(request) {
|
|
8
|
+
return request.id === undefined || request.id === null;
|
|
9
|
+
}
|
|
10
|
+
// Persistent line-buffered JSON-RPC dispatcher over a child process' stdio.
|
|
11
|
+
// Responses are matched to requests by id, so chunked responses (a single
|
|
12
|
+
// 'data' event is NOT guaranteed to contain exactly one complete JSON
|
|
13
|
+
// message) and concurrent in-flight requests are handled correctly.
|
|
14
|
+
export function createStdioDispatcher(child) {
|
|
15
|
+
let buffer = '';
|
|
16
|
+
const pending = new Map();
|
|
17
|
+
child.stdout?.on('data', (data) => {
|
|
18
|
+
buffer += data.toString();
|
|
19
|
+
let idx;
|
|
20
|
+
while ((idx = buffer.indexOf('\n')) >= 0) {
|
|
21
|
+
const line = buffer.slice(0, idx).trim();
|
|
22
|
+
buffer = buffer.slice(idx + 1);
|
|
23
|
+
if (!line)
|
|
24
|
+
continue;
|
|
25
|
+
let msg;
|
|
26
|
+
try {
|
|
27
|
+
msg = JSON.parse(line);
|
|
28
|
+
}
|
|
29
|
+
catch {
|
|
30
|
+
console.error(`[MCP proxy] ignoring non-JSON line from child: ${line.slice(0, 200)}`);
|
|
31
|
+
continue;
|
|
32
|
+
}
|
|
33
|
+
const entry = pending.get(msg.id);
|
|
34
|
+
if (!entry) {
|
|
35
|
+
console.error(`[MCP proxy] ignoring response with unknown id: ${JSON.stringify(msg.id)}`);
|
|
36
|
+
continue;
|
|
37
|
+
}
|
|
38
|
+
clearTimeout(entry.timeout);
|
|
39
|
+
pending.delete(msg.id);
|
|
40
|
+
console.log(`[MCP proxy] response: method=${entry.method} id=${JSON.stringify(msg.id)}${msg.error ? ` error=${msg.error.message}` : ''}`);
|
|
41
|
+
entry.resolve(msg);
|
|
42
|
+
}
|
|
43
|
+
});
|
|
44
|
+
const rejectAll = (reason) => {
|
|
45
|
+
for (const [, entry] of pending) {
|
|
46
|
+
clearTimeout(entry.timeout);
|
|
47
|
+
entry.reject(reason);
|
|
48
|
+
}
|
|
49
|
+
pending.clear();
|
|
50
|
+
};
|
|
51
|
+
child.on('exit', (code) => {
|
|
52
|
+
console.log(`[MCP proxy] MCP command exited with code ${code}, rejecting ${pending.size} pending request(s)`);
|
|
53
|
+
rejectAll(new Error(`MCP command exited with code ${code}`));
|
|
54
|
+
});
|
|
55
|
+
return {
|
|
56
|
+
forward(request) {
|
|
57
|
+
const method = request.method ?? '(unknown)';
|
|
58
|
+
if (isNotification(request)) {
|
|
59
|
+
// Fire-and-forget: deliver the notification (e.g. notifications/initialized
|
|
60
|
+
// completes the MCP handshake) but do not wait for a response.
|
|
61
|
+
console.log(`[MCP proxy] forwarding notification: method=${method}`);
|
|
62
|
+
child.stdin?.write(JSON.stringify(request) + '\n');
|
|
63
|
+
return Promise.resolve(null);
|
|
64
|
+
}
|
|
65
|
+
console.log(`[MCP proxy] forwarding request: method=${method} id=${JSON.stringify(request.id)}`);
|
|
66
|
+
return new Promise((resolve, reject) => {
|
|
67
|
+
const timeout = setTimeout(() => {
|
|
68
|
+
pending.delete(request.id);
|
|
69
|
+
reject(new Error(`Request timeout waiting for ${method}`));
|
|
70
|
+
}, FORWARD_TIMEOUT_MS);
|
|
71
|
+
pending.set(request.id, { resolve, reject, timeout, method });
|
|
72
|
+
child.stdin?.write(JSON.stringify(request) + '\n');
|
|
73
|
+
});
|
|
74
|
+
},
|
|
75
|
+
};
|
|
76
|
+
}
|
|
3
77
|
export async function startMcpRegistration(options) {
|
|
4
78
|
const { server, key, command } = options;
|
|
5
79
|
console.log(`Registering MCP proxy with server ${server}...`);
|
|
@@ -30,9 +104,6 @@ export async function startMcpRegistration(options) {
|
|
|
30
104
|
child.on('error', (err) => {
|
|
31
105
|
console.error('Failed to start MCP command:', err.message);
|
|
32
106
|
});
|
|
33
|
-
child.on('exit', (code) => {
|
|
34
|
-
console.log(`MCP command exited with code ${code}`);
|
|
35
|
-
});
|
|
36
107
|
// 3. Establish WebSocket connection
|
|
37
108
|
const socket = ioClient(`${server}/mcp-proxy`, {
|
|
38
109
|
transports: ['websocket'],
|
|
@@ -49,17 +120,19 @@ export async function startMcpRegistration(options) {
|
|
|
49
120
|
console.error(`Proxy error: ${data.code} - ${data.message}`);
|
|
50
121
|
});
|
|
51
122
|
// 4. Bridge requests
|
|
123
|
+
const dispatcher = createStdioDispatcher(child);
|
|
52
124
|
socket.on('proxy:request', async (data) => {
|
|
53
125
|
try {
|
|
54
|
-
const response = await
|
|
126
|
+
const response = await dispatcher.forward(data.request);
|
|
55
127
|
socket.emit('proxy:response', { requestId: data.requestId, response });
|
|
56
128
|
}
|
|
57
129
|
catch (err) {
|
|
130
|
+
console.error(`[MCP proxy] forward failed: method=${data.request?.method} id=${JSON.stringify(data.request?.id)} error=${err.message}`);
|
|
58
131
|
socket.emit('proxy:response', {
|
|
59
132
|
requestId: data.requestId,
|
|
60
133
|
response: {
|
|
61
134
|
jsonrpc: '2.0',
|
|
62
|
-
id: data.request.id,
|
|
135
|
+
id: data.request.id ?? null,
|
|
63
136
|
error: { code: -32603, message: err.message },
|
|
64
137
|
},
|
|
65
138
|
});
|
|
@@ -83,23 +156,4 @@ export async function startMcpRegistration(options) {
|
|
|
83
156
|
process.on('SIGINT', shutdown);
|
|
84
157
|
process.on('SIGTERM', shutdown);
|
|
85
158
|
}
|
|
86
|
-
function forwardToChild(child, request) {
|
|
87
|
-
return new Promise((resolve, reject) => {
|
|
88
|
-
const timeout = setTimeout(() => {
|
|
89
|
-
reject(new Error('Request timeout'));
|
|
90
|
-
}, 30000);
|
|
91
|
-
const onData = (data) => {
|
|
92
|
-
clearTimeout(timeout);
|
|
93
|
-
child.stdout?.removeListener('data', onData);
|
|
94
|
-
try {
|
|
95
|
-
resolve(JSON.parse(data.toString()));
|
|
96
|
-
}
|
|
97
|
-
catch {
|
|
98
|
-
reject(new Error('Invalid JSON response from MCP command'));
|
|
99
|
-
}
|
|
100
|
-
};
|
|
101
|
-
child.stdout?.on('data', onData);
|
|
102
|
-
child.stdin?.write(JSON.stringify(request) + '\n');
|
|
103
|
-
});
|
|
104
|
-
}
|
|
105
159
|
//# sourceMappingURL=mcp-proxy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-proxy.js","sourceRoot":"","sources":["../../src/commands/mcp-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAgB,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,EAAE,IAAI,QAAQ,EAAU,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp-proxy.js","sourceRoot":"","sources":["../../src/commands/mcp-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAgB,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,EAAE,IAAI,QAAQ,EAAU,MAAM,kBAAkB,CAAC;AAe1D,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAElC,2EAA2E;AAC3E,2EAA2E;AAC3E,0CAA0C;AAC1C,SAAS,cAAc,CAAC,OAAuB;IAC7C,OAAO,OAAO,CAAC,EAAE,KAAK,SAAS,IAAI,OAAO,CAAC,EAAE,KAAK,IAAI,CAAC;AACzD,CAAC;AAED,4EAA4E;AAC5E,0EAA0E;AAC1E,sEAAsE;AACtE,oEAAoE;AACpE,MAAM,UAAU,qBAAqB,CAAC,KAAmB;IACvD,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,MAAM,OAAO,GAAG,IAAI,GAAG,EAA4H,CAAC;IAEpJ,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;QACxC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC1B,IAAI,GAAG,CAAC;QACR,OAAO,CAAC,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YACzC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;YAC/B,IAAI,CAAC,IAAI;gBAAE,SAAS;YACpB,IAAI,GAAmD,CAAC;YACxD,IAAI,CAAC;gBACH,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,CAAC,KAAK,CAAC,kDAAkD,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;gBACtF,SAAS;YACX,CAAC;YACD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAClC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,kDAAkD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC1F,SAAS;YACX,CAAC;YACD,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,gCAAgC,KAAK,CAAC,MAAM,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC1I,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,CAAC,MAAa,EAAE,EAAE;QAClC,KAAK,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,OAAO,EAAE,CAAC;YAChC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5B,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC;QACD,OAAO,CAAC,KAAK,EAAE,CAAC;IAClB,CAAC,CAAC;IAEF,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;QACxB,OAAO,CAAC,GAAG,CAAC,4CAA4C,IAAI,eAAe,OAAO,CAAC,IAAI,qBAAqB,CAAC,CAAC;QAC9G,SAAS,CAAC,IAAI,KAAK,CAAC,gCAAgC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,OAAO,CAAC,OAAuB;YAC7B,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,WAAW,CAAC;YAC7C,IAAI,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC5B,4EAA4E;gBAC5E,+DAA+D;gBAC/D,OAAO,CAAC,GAAG,CAAC,+CAA+C,MAAM,EAAE,CAAC,CAAC;gBACrE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;gBACnD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,0CAA0C,MAAM,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACjG,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;oBAC9B,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;oBAC3B,MAAM,CAAC,IAAI,KAAK,CAAC,+BAA+B,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC7D,CAAC,EAAE,kBAAkB,CAAC,CAAC;gBACvB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC9D,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,OAAwB;IACjE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAEzC,OAAO,CAAC,GAAG,CAAC,qCAAqC,MAAM,KAAK,CAAC,CAAC;IAE9D,0BAA0B;IAC1B,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,MAAM,yBAAyB,EAAE;QAC/D,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,GAAG;YACH,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,SAAS;YAC3C,OAAO;YACP,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,SAAS;SAClD,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAS,CAAC;IAC5C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QACpD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,uBAAuB,MAAM,CAAC,OAAO,YAAY,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAEhF,yBAAyB;IACzB,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1C,OAAO,CAAC,GAAG,CAAC,+BAA+B,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEpE,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE;QAC7B,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;QAC/B,KAAK,EAAE,IAAI;KACZ,CAAC,CAAC;IAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;QACxB,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,oCAAoC;IACpC,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,MAAM,YAAY,EAAE;QAC7C,UAAU,EAAE,CAAC,WAAW,CAAC;QACzB,WAAW,EAAE,IAAI;KAClB,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;QACxB,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;QACtD,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,IAA2C,EAAE,EAAE;QAC5E,OAAO,CAAC,GAAG,CAAC,8CAA8C,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,IAAuC,EAAE,EAAE;QACnE,OAAO,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,qBAAqB;IACrB,MAAM,UAAU,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,CAAC,EAAE,CAAC,eAAe,EAAE,KAAK,EAAE,IAAoD,EAAE,EAAE;QACxF,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACxD,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;QACzE,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,OAAO,CAAC,KAAK,CAAC,sCAAsC,IAAI,CAAC,OAAO,EAAE,MAAM,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YACxI,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE;gBAC5B,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,QAAQ,EAAE;oBACR,OAAO,EAAE,KAAK;oBACd,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,IAAI;oBAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE;iBAC9C;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,eAAe;IACf,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE;QACzC,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC,EAAE,KAAK,CAAC,CAAC;IAEV,aAAa;IACb,MAAM,QAAQ,GAAG,GAAG,EAAE;QACpB,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;QAC1C,aAAa,CAAC,iBAAiB,CAAC,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7D,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,MAAM,CAAC,UAAU,EAAE,CAAC;QACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC;IAEF,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AAClC,CAAC"}
|
|
@@ -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;AA2L3E,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAChC,MAAM,CAwnBR;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAE/C"}
|