@modelcontextprotocol/sdk 1.24.3 → 1.25.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/dist/cjs/client/auth-extensions.js +5 -9
- package/dist/cjs/client/auth-extensions.js.map +1 -1
- package/dist/cjs/client/auth.js +30 -37
- package/dist/cjs/client/auth.js.map +1 -1
- package/dist/cjs/client/index.d.ts +61 -14
- package/dist/cjs/client/index.d.ts.map +1 -1
- package/dist/cjs/client/index.js +117 -36
- package/dist/cjs/client/index.js.map +1 -1
- package/dist/cjs/client/middleware.js +3 -3
- package/dist/cjs/client/middleware.js.map +1 -1
- package/dist/cjs/client/sse.js +19 -27
- package/dist/cjs/client/sse.js.map +1 -1
- package/dist/cjs/client/stdio.js +18 -28
- package/dist/cjs/client/stdio.js.map +1 -1
- package/dist/cjs/client/streamableHttp.d.ts.map +1 -1
- package/dist/cjs/client/streamableHttp.js +39 -49
- package/dist/cjs/client/streamableHttp.js.map +1 -1
- package/dist/cjs/client/websocket.js +6 -11
- package/dist/cjs/client/websocket.js.map +1 -1
- package/dist/cjs/examples/client/elicitationUrlExample.js +4 -5
- package/dist/cjs/examples/client/elicitationUrlExample.js.map +1 -1
- package/dist/cjs/examples/client/simpleOAuthClient.js +3 -3
- package/dist/cjs/examples/client/simpleOAuthClient.js.map +1 -1
- package/dist/cjs/examples/client/simpleStreamableHttp.js +7 -9
- package/dist/cjs/examples/client/simpleStreamableHttp.js.map +1 -1
- package/dist/cjs/examples/client/simpleTaskInteractiveClient.js +1 -2
- package/dist/cjs/examples/client/simpleTaskInteractiveClient.js.map +1 -1
- package/dist/cjs/examples/server/honoWebStandardStreamableHttp.d.ts +10 -0
- package/dist/cjs/examples/server/honoWebStandardStreamableHttp.d.ts.map +1 -0
- package/dist/cjs/examples/server/honoWebStandardStreamableHttp.js +81 -0
- package/dist/cjs/examples/server/honoWebStandardStreamableHttp.js.map +1 -0
- package/dist/cjs/examples/server/jsonResponseStreamableHttp.js +10 -4
- package/dist/cjs/examples/server/jsonResponseStreamableHttp.js.map +1 -1
- package/dist/cjs/examples/server/simpleSseServer.js +6 -3
- package/dist/cjs/examples/server/simpleSseServer.js.map +1 -1
- package/dist/cjs/examples/server/simpleStatelessStreamableHttp.js +12 -6
- package/dist/cjs/examples/server/simpleStatelessStreamableHttp.js.map +1 -1
- package/dist/cjs/examples/server/simpleStreamableHttp.js +21 -11
- package/dist/cjs/examples/server/simpleStreamableHttp.js.map +1 -1
- package/dist/cjs/examples/server/simpleTaskInteractive.js +7 -11
- package/dist/cjs/examples/server/simpleTaskInteractive.js.map +1 -1
- package/dist/cjs/examples/server/sseAndStreamableHttpCompatibleServer.js +10 -7
- package/dist/cjs/examples/server/sseAndStreamableHttpCompatibleServer.js.map +1 -1
- package/dist/cjs/examples/server/standaloneSseWithGetStreamableHttp.js +1 -1
- package/dist/cjs/examples/server/standaloneSseWithGetStreamableHttp.js.map +1 -1
- package/dist/cjs/experimental/tasks/client.js +1 -2
- package/dist/cjs/experimental/tasks/client.js.map +1 -1
- package/dist/cjs/experimental/tasks/helpers.js +3 -5
- package/dist/cjs/experimental/tasks/helpers.js.map +1 -1
- package/dist/cjs/experimental/tasks/interfaces.d.ts +3 -3
- package/dist/cjs/experimental/tasks/interfaces.d.ts.map +1 -1
- package/dist/cjs/experimental/tasks/stores/in-memory.d.ts +1 -1
- package/dist/cjs/experimental/tasks/stores/in-memory.d.ts.map +1 -1
- package/dist/cjs/experimental/tasks/stores/in-memory.js +3 -5
- package/dist/cjs/experimental/tasks/stores/in-memory.js.map +1 -1
- package/dist/cjs/inMemory.js +5 -7
- package/dist/cjs/inMemory.js.map +1 -1
- package/dist/cjs/server/auth/handlers/token.js +1 -1
- package/dist/cjs/server/auth/handlers/token.js.map +1 -1
- package/dist/cjs/server/auth/providers/proxyProvider.js +11 -17
- package/dist/cjs/server/auth/providers/proxyProvider.js.map +1 -1
- package/dist/cjs/server/auth/router.js +3 -6
- package/dist/cjs/server/auth/router.js.map +1 -1
- package/dist/cjs/server/completable.js +1 -1
- package/dist/cjs/server/completable.js.map +1 -1
- package/dist/cjs/server/index.d.ts +3 -3
- package/dist/cjs/server/index.d.ts.map +1 -1
- package/dist/cjs/server/index.js +20 -30
- package/dist/cjs/server/index.js.map +1 -1
- package/dist/cjs/server/mcp.d.ts.map +1 -1
- package/dist/cjs/server/mcp.js +25 -11
- package/dist/cjs/server/mcp.js.map +1 -1
- package/dist/cjs/server/middleware/hostHeaderValidation.js +1 -1
- package/dist/cjs/server/middleware/hostHeaderValidation.js.map +1 -1
- package/dist/cjs/server/sse.js +14 -17
- package/dist/cjs/server/sse.js.map +1 -1
- package/dist/cjs/server/stdio.js +4 -7
- package/dist/cjs/server/stdio.js.map +1 -1
- package/dist/cjs/server/streamableHttp.d.ts +52 -154
- package/dist/cjs/server/streamableHttp.d.ts.map +1 -1
- package/dist/cjs/server/streamableHttp.js +78 -653
- package/dist/cjs/server/streamableHttp.js.map +1 -1
- package/dist/cjs/server/webStandardStreamableHttp.d.ts +267 -0
- package/dist/cjs/server/webStandardStreamableHttp.d.ts.map +1 -0
- package/dist/cjs/server/webStandardStreamableHttp.js +729 -0
- package/dist/cjs/server/webStandardStreamableHttp.js.map +1 -0
- package/dist/cjs/server/zod-compat.d.ts +3 -1
- package/dist/cjs/server/zod-compat.d.ts.map +1 -1
- package/dist/cjs/server/zod-compat.js +11 -19
- package/dist/cjs/server/zod-compat.js.map +1 -1
- package/dist/cjs/server/zod-json-schema-compat.js +5 -6
- package/dist/cjs/server/zod-json-schema-compat.js.map +1 -1
- package/dist/cjs/shared/metadataUtils.js +1 -2
- package/dist/cjs/shared/metadataUtils.js.map +1 -1
- package/dist/cjs/shared/protocol.d.ts +1 -1
- package/dist/cjs/shared/protocol.d.ts.map +1 -1
- package/dist/cjs/shared/protocol.js +76 -88
- package/dist/cjs/shared/protocol.js.map +1 -1
- package/dist/cjs/shared/transport.js +1 -1
- package/dist/cjs/shared/transport.js.map +1 -1
- package/dist/cjs/spec.types.d.ts +315 -26
- package/dist/cjs/spec.types.d.ts.map +1 -1
- package/dist/cjs/spec.types.js +2 -2
- package/dist/cjs/spec.types.js.map +1 -1
- package/dist/cjs/types.d.ts +1424 -1240
- package/dist/cjs/types.d.ts.map +1 -1
- package/dist/cjs/types.js +227 -136
- package/dist/cjs/types.js.map +1 -1
- package/dist/cjs/validation/ajv-provider.d.ts +1 -1
- package/dist/cjs/validation/ajv-provider.d.ts.map +1 -1
- package/dist/cjs/validation/ajv-provider.js +4 -5
- package/dist/cjs/validation/ajv-provider.js.map +1 -1
- package/dist/cjs/validation/cfworker-provider.js +4 -5
- package/dist/cjs/validation/cfworker-provider.js.map +1 -1
- package/dist/cjs/validation/types.d.ts +12 -2
- package/dist/cjs/validation/types.d.ts.map +1 -1
- package/dist/esm/client/auth-extensions.js +5 -9
- package/dist/esm/client/auth-extensions.js.map +1 -1
- package/dist/esm/client/auth.js +30 -37
- package/dist/esm/client/auth.js.map +1 -1
- package/dist/esm/client/index.d.ts +61 -14
- package/dist/esm/client/index.d.ts.map +1 -1
- package/dist/esm/client/index.js +118 -37
- package/dist/esm/client/index.js.map +1 -1
- package/dist/esm/client/middleware.js +3 -3
- package/dist/esm/client/middleware.js.map +1 -1
- package/dist/esm/client/sse.js +19 -27
- package/dist/esm/client/sse.js.map +1 -1
- package/dist/esm/client/stdio.js +18 -28
- package/dist/esm/client/stdio.js.map +1 -1
- package/dist/esm/client/streamableHttp.d.ts.map +1 -1
- package/dist/esm/client/streamableHttp.js +40 -50
- package/dist/esm/client/streamableHttp.js.map +1 -1
- package/dist/esm/client/websocket.js +6 -11
- package/dist/esm/client/websocket.js.map +1 -1
- package/dist/esm/examples/client/elicitationUrlExample.js +4 -5
- package/dist/esm/examples/client/elicitationUrlExample.js.map +1 -1
- package/dist/esm/examples/client/simpleOAuthClient.js +3 -3
- package/dist/esm/examples/client/simpleOAuthClient.js.map +1 -1
- package/dist/esm/examples/client/simpleStreamableHttp.js +7 -9
- package/dist/esm/examples/client/simpleStreamableHttp.js.map +1 -1
- package/dist/esm/examples/client/simpleTaskInteractiveClient.js +1 -2
- package/dist/esm/examples/client/simpleTaskInteractiveClient.js.map +1 -1
- package/dist/esm/examples/server/honoWebStandardStreamableHttp.d.ts +10 -0
- package/dist/esm/examples/server/honoWebStandardStreamableHttp.d.ts.map +1 -0
- package/dist/esm/examples/server/honoWebStandardStreamableHttp.js +56 -0
- package/dist/esm/examples/server/honoWebStandardStreamableHttp.js.map +1 -0
- package/dist/esm/examples/server/jsonResponseStreamableHttp.js +10 -4
- package/dist/esm/examples/server/jsonResponseStreamableHttp.js.map +1 -1
- package/dist/esm/examples/server/simpleSseServer.js +6 -3
- package/dist/esm/examples/server/simpleSseServer.js.map +1 -1
- package/dist/esm/examples/server/simpleStatelessStreamableHttp.js +12 -6
- package/dist/esm/examples/server/simpleStatelessStreamableHttp.js.map +1 -1
- package/dist/esm/examples/server/simpleStreamableHttp.js +21 -11
- package/dist/esm/examples/server/simpleStreamableHttp.js.map +1 -1
- package/dist/esm/examples/server/simpleTaskInteractive.js +7 -11
- package/dist/esm/examples/server/simpleTaskInteractive.js.map +1 -1
- package/dist/esm/examples/server/sseAndStreamableHttpCompatibleServer.js +10 -7
- package/dist/esm/examples/server/sseAndStreamableHttpCompatibleServer.js.map +1 -1
- package/dist/esm/examples/server/standaloneSseWithGetStreamableHttp.js +1 -1
- package/dist/esm/examples/server/standaloneSseWithGetStreamableHttp.js.map +1 -1
- package/dist/esm/experimental/tasks/client.js +1 -2
- package/dist/esm/experimental/tasks/client.js.map +1 -1
- package/dist/esm/experimental/tasks/helpers.js +3 -5
- package/dist/esm/experimental/tasks/helpers.js.map +1 -1
- package/dist/esm/experimental/tasks/interfaces.d.ts +3 -3
- package/dist/esm/experimental/tasks/interfaces.d.ts.map +1 -1
- package/dist/esm/experimental/tasks/stores/in-memory.d.ts +1 -1
- package/dist/esm/experimental/tasks/stores/in-memory.d.ts.map +1 -1
- package/dist/esm/experimental/tasks/stores/in-memory.js +3 -5
- package/dist/esm/experimental/tasks/stores/in-memory.js.map +1 -1
- package/dist/esm/inMemory.js +5 -7
- package/dist/esm/inMemory.js.map +1 -1
- package/dist/esm/server/auth/handlers/token.js +1 -1
- package/dist/esm/server/auth/handlers/token.js.map +1 -1
- package/dist/esm/server/auth/providers/proxyProvider.js +11 -17
- package/dist/esm/server/auth/providers/proxyProvider.js.map +1 -1
- package/dist/esm/server/auth/router.js +3 -6
- package/dist/esm/server/auth/router.js.map +1 -1
- package/dist/esm/server/completable.js +1 -1
- package/dist/esm/server/completable.js.map +1 -1
- package/dist/esm/server/index.d.ts +3 -3
- package/dist/esm/server/index.d.ts.map +1 -1
- package/dist/esm/server/index.js +20 -30
- package/dist/esm/server/index.js.map +1 -1
- package/dist/esm/server/mcp.d.ts.map +1 -1
- package/dist/esm/server/mcp.js +25 -11
- package/dist/esm/server/mcp.js.map +1 -1
- package/dist/esm/server/middleware/hostHeaderValidation.js +1 -1
- package/dist/esm/server/middleware/hostHeaderValidation.js.map +1 -1
- package/dist/esm/server/sse.js +14 -17
- package/dist/esm/server/sse.js.map +1 -1
- package/dist/esm/server/stdio.js +4 -7
- package/dist/esm/server/stdio.js.map +1 -1
- package/dist/esm/server/streamableHttp.d.ts +52 -154
- package/dist/esm/server/streamableHttp.d.ts.map +1 -1
- package/dist/esm/server/streamableHttp.js +78 -650
- package/dist/esm/server/streamableHttp.js.map +1 -1
- package/dist/esm/server/webStandardStreamableHttp.d.ts +267 -0
- package/dist/esm/server/webStandardStreamableHttp.d.ts.map +1 -0
- package/dist/esm/server/webStandardStreamableHttp.js +725 -0
- package/dist/esm/server/webStandardStreamableHttp.js.map +1 -0
- package/dist/esm/server/zod-compat.d.ts +3 -1
- package/dist/esm/server/zod-compat.d.ts.map +1 -1
- package/dist/esm/server/zod-compat.js +11 -19
- package/dist/esm/server/zod-compat.js.map +1 -1
- package/dist/esm/server/zod-json-schema-compat.js +5 -6
- package/dist/esm/server/zod-json-schema-compat.js.map +1 -1
- package/dist/esm/shared/metadataUtils.js +1 -2
- package/dist/esm/shared/metadataUtils.js.map +1 -1
- package/dist/esm/shared/protocol.d.ts +1 -1
- package/dist/esm/shared/protocol.d.ts.map +1 -1
- package/dist/esm/shared/protocol.js +77 -89
- package/dist/esm/shared/protocol.js.map +1 -1
- package/dist/esm/shared/transport.js +1 -1
- package/dist/esm/shared/transport.js.map +1 -1
- package/dist/esm/spec.types.d.ts +315 -26
- package/dist/esm/spec.types.d.ts.map +1 -1
- package/dist/esm/spec.types.js +2 -2
- package/dist/esm/spec.types.js.map +1 -1
- package/dist/esm/types.d.ts +1430 -1246
- package/dist/esm/types.d.ts.map +1 -1
- package/dist/esm/types.js +220 -130
- package/dist/esm/types.js.map +1 -1
- package/dist/esm/validation/ajv-provider.d.ts +1 -1
- package/dist/esm/validation/ajv-provider.d.ts.map +1 -1
- package/dist/esm/validation/ajv-provider.js +3 -4
- package/dist/esm/validation/ajv-provider.js.map +1 -1
- package/dist/esm/validation/cfworker-provider.js +4 -5
- package/dist/esm/validation/cfworker-provider.js.map +1 -1
- package/dist/esm/validation/types.d.ts +12 -2
- package/dist/esm/validation/types.d.ts.map +1 -1
- package/package.json +3 -1
package/dist/esm/client/stdio.js
CHANGED
|
@@ -62,42 +62,37 @@ export class StdioClientTransport {
|
|
|
62
62
|
throw new Error('StdioClientTransport already started! If using Client class, note that connect() calls start() automatically.');
|
|
63
63
|
}
|
|
64
64
|
return new Promise((resolve, reject) => {
|
|
65
|
-
|
|
66
|
-
this._process = spawn(this._serverParams.command, (_a = this._serverParams.args) !== null && _a !== void 0 ? _a : [], {
|
|
65
|
+
this._process = spawn(this._serverParams.command, this._serverParams.args ?? [], {
|
|
67
66
|
// merge default env with server env because mcp server needs some env vars
|
|
68
67
|
env: {
|
|
69
68
|
...getDefaultEnvironment(),
|
|
70
69
|
...this._serverParams.env
|
|
71
70
|
},
|
|
72
|
-
stdio: ['pipe', 'pipe',
|
|
71
|
+
stdio: ['pipe', 'pipe', this._serverParams.stderr ?? 'inherit'],
|
|
73
72
|
shell: false,
|
|
74
73
|
windowsHide: process.platform === 'win32' && isElectron(),
|
|
75
74
|
cwd: this._serverParams.cwd
|
|
76
75
|
});
|
|
77
76
|
this._process.on('error', error => {
|
|
78
|
-
var _a;
|
|
79
77
|
reject(error);
|
|
80
|
-
|
|
78
|
+
this.onerror?.(error);
|
|
81
79
|
});
|
|
82
80
|
this._process.on('spawn', () => {
|
|
83
81
|
resolve();
|
|
84
82
|
});
|
|
85
83
|
this._process.on('close', _code => {
|
|
86
|
-
var _a;
|
|
87
84
|
this._process = undefined;
|
|
88
|
-
|
|
85
|
+
this.onclose?.();
|
|
89
86
|
});
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
(_a = this.onerror) === null || _a === void 0 ? void 0 : _a.call(this, error);
|
|
87
|
+
this._process.stdin?.on('error', error => {
|
|
88
|
+
this.onerror?.(error);
|
|
93
89
|
});
|
|
94
|
-
|
|
90
|
+
this._process.stdout?.on('data', chunk => {
|
|
95
91
|
this._readBuffer.append(chunk);
|
|
96
92
|
this.processReadBuffer();
|
|
97
93
|
});
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
(_a = this.onerror) === null || _a === void 0 ? void 0 : _a.call(this, error);
|
|
94
|
+
this._process.stdout?.on('error', error => {
|
|
95
|
+
this.onerror?.(error);
|
|
101
96
|
});
|
|
102
97
|
if (this._stderrStream && this._process.stderr) {
|
|
103
98
|
this._process.stderr.pipe(this._stderrStream);
|
|
@@ -112,11 +107,10 @@ export class StdioClientTransport {
|
|
|
112
107
|
* error output emitted by the child process.
|
|
113
108
|
*/
|
|
114
109
|
get stderr() {
|
|
115
|
-
var _a, _b;
|
|
116
110
|
if (this._stderrStream) {
|
|
117
111
|
return this._stderrStream;
|
|
118
112
|
}
|
|
119
|
-
return
|
|
113
|
+
return this._process?.stderr ?? null;
|
|
120
114
|
}
|
|
121
115
|
/**
|
|
122
116
|
* The child process pid spawned by this transport.
|
|
@@ -124,26 +118,23 @@ export class StdioClientTransport {
|
|
|
124
118
|
* This is only available after the transport has been started.
|
|
125
119
|
*/
|
|
126
120
|
get pid() {
|
|
127
|
-
|
|
128
|
-
return (_b = (_a = this._process) === null || _a === void 0 ? void 0 : _a.pid) !== null && _b !== void 0 ? _b : null;
|
|
121
|
+
return this._process?.pid ?? null;
|
|
129
122
|
}
|
|
130
123
|
processReadBuffer() {
|
|
131
|
-
var _a, _b;
|
|
132
124
|
while (true) {
|
|
133
125
|
try {
|
|
134
126
|
const message = this._readBuffer.readMessage();
|
|
135
127
|
if (message === null) {
|
|
136
128
|
break;
|
|
137
129
|
}
|
|
138
|
-
|
|
130
|
+
this.onmessage?.(message);
|
|
139
131
|
}
|
|
140
132
|
catch (error) {
|
|
141
|
-
|
|
133
|
+
this.onerror?.(error);
|
|
142
134
|
}
|
|
143
135
|
}
|
|
144
136
|
}
|
|
145
137
|
async close() {
|
|
146
|
-
var _a;
|
|
147
138
|
if (this._process) {
|
|
148
139
|
const processToClose = this._process;
|
|
149
140
|
this._process = undefined;
|
|
@@ -153,9 +144,9 @@ export class StdioClientTransport {
|
|
|
153
144
|
});
|
|
154
145
|
});
|
|
155
146
|
try {
|
|
156
|
-
|
|
147
|
+
processToClose.stdin?.end();
|
|
157
148
|
}
|
|
158
|
-
catch
|
|
149
|
+
catch {
|
|
159
150
|
// ignore
|
|
160
151
|
}
|
|
161
152
|
await Promise.race([closePromise, new Promise(resolve => setTimeout(resolve, 2000).unref())]);
|
|
@@ -163,7 +154,7 @@ export class StdioClientTransport {
|
|
|
163
154
|
try {
|
|
164
155
|
processToClose.kill('SIGTERM');
|
|
165
156
|
}
|
|
166
|
-
catch
|
|
157
|
+
catch {
|
|
167
158
|
// ignore
|
|
168
159
|
}
|
|
169
160
|
await Promise.race([closePromise, new Promise(resolve => setTimeout(resolve, 2000).unref())]);
|
|
@@ -172,7 +163,7 @@ export class StdioClientTransport {
|
|
|
172
163
|
try {
|
|
173
164
|
processToClose.kill('SIGKILL');
|
|
174
165
|
}
|
|
175
|
-
catch
|
|
166
|
+
catch {
|
|
176
167
|
// ignore
|
|
177
168
|
}
|
|
178
169
|
}
|
|
@@ -181,8 +172,7 @@ export class StdioClientTransport {
|
|
|
181
172
|
}
|
|
182
173
|
send(message) {
|
|
183
174
|
return new Promise(resolve => {
|
|
184
|
-
|
|
185
|
-
if (!((_a = this._process) === null || _a === void 0 ? void 0 : _a.stdin)) {
|
|
175
|
+
if (!this._process?.stdin) {
|
|
186
176
|
throw new Error('Not connected');
|
|
187
177
|
}
|
|
188
178
|
const json = serializeMessage(message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stdio.js","sourceRoot":"","sources":["../../../src/client/stdio.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAU,WAAW,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAqClE;;GAEG;AACH,MAAM,CAAC,MAAM,0BAA0B,GACnC,OAAO,CAAC,QAAQ,KAAK,OAAO;IACxB,CAAC,CAAC;QACI,SAAS;QACT,WAAW;QACX,UAAU;QACV,cAAc;QACd,MAAM;QACN,wBAAwB;QACxB,aAAa;QACb,YAAY;QACZ,MAAM;QACN,UAAU;QACV,aAAa;QACb,cAAc;KACjB;IACH,CAAC,CAAC,0DAA0D;QAC1D,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAE/D;;GAEG;AACH,MAAM,UAAU,qBAAqB;IACjC,MAAM,GAAG,GAA2B,EAAE,CAAC;IAEvC,KAAK,MAAM,GAAG,IAAI,0BAA0B,EAAE,CAAC;QAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACtB,SAAS;QACb,CAAC;QAED,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,6CAA6C;YAC7C,SAAS;QACb,CAAC;QAED,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,MAAM,OAAO,oBAAoB;IAU7B,YAAY,MAA6B;QARjC,gBAAW,GAAe,IAAI,UAAU,EAAE,CAAC;QAE3C,kBAAa,GAAuB,IAAI,CAAC;QAO7C,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC;QAC5B,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;YAC7D,IAAI,CAAC,aAAa,GAAG,IAAI,WAAW,EAAE,CAAC;QAC3C,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK;QACP,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CACX,+GAA+G,CAClH,CAAC;QACN,CAAC;QAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"stdio.js","sourceRoot":"","sources":["../../../src/client/stdio.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamableHttp.d.ts","sourceRoot":"","sources":["../../../src/client/streamableHttp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAyC,MAAM,wBAAwB,CAAC;AACrG,OAAO,
|
|
1
|
+
{"version":3,"file":"streamableHttp.d.ts","sourceRoot":"","sources":["../../../src/client/streamableHttp.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createFetchWithInit, normalizeHeaders } from '../shared/transport.js';
|
|
2
|
-
import { isInitializedNotification, isJSONRPCRequest,
|
|
2
|
+
import { isInitializedNotification, isJSONRPCRequest, isJSONRPCResultResponse, JSONRPCMessageSchema } from '../types.js';
|
|
3
3
|
import { auth, extractWWWAuthenticateParams, UnauthorizedError } from './auth.js';
|
|
4
4
|
import { EventSourceParserStream } from 'eventsource-parser/stream';
|
|
5
5
|
// Default reconnection options for StreamableHTTP connections
|
|
@@ -22,20 +22,18 @@ export class StreamableHTTPError extends Error {
|
|
|
22
22
|
*/
|
|
23
23
|
export class StreamableHTTPClientTransport {
|
|
24
24
|
constructor(url, opts) {
|
|
25
|
-
var _a;
|
|
26
25
|
this._hasCompletedAuthFlow = false; // Circuit breaker: detect auth success followed by immediate 401
|
|
27
26
|
this._url = url;
|
|
28
27
|
this._resourceMetadataUrl = undefined;
|
|
29
28
|
this._scope = undefined;
|
|
30
|
-
this._requestInit = opts
|
|
31
|
-
this._authProvider = opts
|
|
32
|
-
this._fetch = opts
|
|
33
|
-
this._fetchWithInit = createFetchWithInit(opts
|
|
34
|
-
this._sessionId = opts
|
|
35
|
-
this._reconnectionOptions =
|
|
29
|
+
this._requestInit = opts?.requestInit;
|
|
30
|
+
this._authProvider = opts?.authProvider;
|
|
31
|
+
this._fetch = opts?.fetch;
|
|
32
|
+
this._fetchWithInit = createFetchWithInit(opts?.fetch, opts?.requestInit);
|
|
33
|
+
this._sessionId = opts?.sessionId;
|
|
34
|
+
this._reconnectionOptions = opts?.reconnectionOptions ?? DEFAULT_STREAMABLE_HTTP_RECONNECTION_OPTIONS;
|
|
36
35
|
}
|
|
37
36
|
async _authThenStart() {
|
|
38
|
-
var _a;
|
|
39
37
|
if (!this._authProvider) {
|
|
40
38
|
throw new UnauthorizedError('No auth provider');
|
|
41
39
|
}
|
|
@@ -49,7 +47,7 @@ export class StreamableHTTPClientTransport {
|
|
|
49
47
|
});
|
|
50
48
|
}
|
|
51
49
|
catch (error) {
|
|
52
|
-
|
|
50
|
+
this.onerror?.(error);
|
|
53
51
|
throw error;
|
|
54
52
|
}
|
|
55
53
|
if (result !== 'AUTHORIZED') {
|
|
@@ -58,7 +56,6 @@ export class StreamableHTTPClientTransport {
|
|
|
58
56
|
return await this._startOrAuthSse({ resumptionToken: undefined });
|
|
59
57
|
}
|
|
60
58
|
async _commonHeaders() {
|
|
61
|
-
var _a;
|
|
62
59
|
const headers = {};
|
|
63
60
|
if (this._authProvider) {
|
|
64
61
|
const tokens = await this._authProvider.tokens();
|
|
@@ -72,14 +69,13 @@ export class StreamableHTTPClientTransport {
|
|
|
72
69
|
if (this._protocolVersion) {
|
|
73
70
|
headers['mcp-protocol-version'] = this._protocolVersion;
|
|
74
71
|
}
|
|
75
|
-
const extraHeaders = normalizeHeaders(
|
|
72
|
+
const extraHeaders = normalizeHeaders(this._requestInit?.headers);
|
|
76
73
|
return new Headers({
|
|
77
74
|
...headers,
|
|
78
75
|
...extraHeaders
|
|
79
76
|
});
|
|
80
77
|
}
|
|
81
78
|
async _startOrAuthSse(options) {
|
|
82
|
-
var _a, _b, _c, _d;
|
|
83
79
|
const { resumptionToken } = options;
|
|
84
80
|
try {
|
|
85
81
|
// Try to open an initial SSE stream with GET to listen for server messages
|
|
@@ -90,13 +86,13 @@ export class StreamableHTTPClientTransport {
|
|
|
90
86
|
if (resumptionToken) {
|
|
91
87
|
headers.set('last-event-id', resumptionToken);
|
|
92
88
|
}
|
|
93
|
-
const response = await (
|
|
89
|
+
const response = await (this._fetch ?? fetch)(this._url, {
|
|
94
90
|
method: 'GET',
|
|
95
91
|
headers,
|
|
96
|
-
signal:
|
|
92
|
+
signal: this._abortController?.signal
|
|
97
93
|
});
|
|
98
94
|
if (!response.ok) {
|
|
99
|
-
await
|
|
95
|
+
await response.body?.cancel();
|
|
100
96
|
if (response.status === 401 && this._authProvider) {
|
|
101
97
|
// Need to authenticate
|
|
102
98
|
return await this._authThenStart();
|
|
@@ -111,7 +107,7 @@ export class StreamableHTTPClientTransport {
|
|
|
111
107
|
this._handleSseStream(response.body, options, true);
|
|
112
108
|
}
|
|
113
109
|
catch (error) {
|
|
114
|
-
|
|
110
|
+
this.onerror?.(error);
|
|
115
111
|
throw error;
|
|
116
112
|
}
|
|
117
113
|
}
|
|
@@ -140,12 +136,11 @@ export class StreamableHTTPClientTransport {
|
|
|
140
136
|
* @param attemptCount Current reconnection attempt count for this specific stream
|
|
141
137
|
*/
|
|
142
138
|
_scheduleReconnection(options, attemptCount = 0) {
|
|
143
|
-
var _a;
|
|
144
139
|
// Use provided options or default options
|
|
145
140
|
const maxRetries = this._reconnectionOptions.maxRetries;
|
|
146
141
|
// Check if we've exceeded maximum retry attempts
|
|
147
142
|
if (attemptCount >= maxRetries) {
|
|
148
|
-
|
|
143
|
+
this.onerror?.(new Error(`Maximum reconnection attempts (${maxRetries}) exceeded.`));
|
|
149
144
|
return;
|
|
150
145
|
}
|
|
151
146
|
// Calculate next delay based on current attempt count
|
|
@@ -154,8 +149,7 @@ export class StreamableHTTPClientTransport {
|
|
|
154
149
|
this._reconnectionTimeout = setTimeout(() => {
|
|
155
150
|
// Use the last event ID to resume where we left off
|
|
156
151
|
this._startOrAuthSse(options).catch(error => {
|
|
157
|
-
|
|
158
|
-
(_a = this.onerror) === null || _a === void 0 ? void 0 : _a.call(this, new Error(`Failed to reconnect SSE stream: ${error instanceof Error ? error.message : String(error)}`));
|
|
152
|
+
this.onerror?.(new Error(`Failed to reconnect SSE stream: ${error instanceof Error ? error.message : String(error)}`));
|
|
159
153
|
// Schedule another attempt if this one failed, incrementing the attempt counter
|
|
160
154
|
this._scheduleReconnection(options, attemptCount + 1);
|
|
161
155
|
});
|
|
@@ -174,7 +168,6 @@ export class StreamableHTTPClientTransport {
|
|
|
174
168
|
// Reconnection is for when server disconnects BEFORE sending response
|
|
175
169
|
let receivedResponse = false;
|
|
176
170
|
const processStream = async () => {
|
|
177
|
-
var _a, _b, _c, _d;
|
|
178
171
|
// this is the closest we can get to trying to catch network errors
|
|
179
172
|
// if something happens reader will throw
|
|
180
173
|
try {
|
|
@@ -198,7 +191,7 @@ export class StreamableHTTPClientTransport {
|
|
|
198
191
|
lastEventId = event.id;
|
|
199
192
|
// Mark that we've received a priming event - stream is now resumable
|
|
200
193
|
hasPrimingEvent = true;
|
|
201
|
-
onresumptiontoken
|
|
194
|
+
onresumptiontoken?.(event.id);
|
|
202
195
|
}
|
|
203
196
|
// Skip events with no data (priming events, keep-alives)
|
|
204
197
|
if (!event.data) {
|
|
@@ -207,17 +200,17 @@ export class StreamableHTTPClientTransport {
|
|
|
207
200
|
if (!event.event || event.event === 'message') {
|
|
208
201
|
try {
|
|
209
202
|
const message = JSONRPCMessageSchema.parse(JSON.parse(event.data));
|
|
210
|
-
if (
|
|
203
|
+
if (isJSONRPCResultResponse(message)) {
|
|
211
204
|
// Mark that we received a response - no need to reconnect for this request
|
|
212
205
|
receivedResponse = true;
|
|
213
206
|
if (replayMessageId !== undefined) {
|
|
214
207
|
message.id = replayMessageId;
|
|
215
208
|
}
|
|
216
209
|
}
|
|
217
|
-
|
|
210
|
+
this.onmessage?.(message);
|
|
218
211
|
}
|
|
219
212
|
catch (error) {
|
|
220
|
-
|
|
213
|
+
this.onerror?.(error);
|
|
221
214
|
}
|
|
222
215
|
}
|
|
223
216
|
}
|
|
@@ -237,7 +230,7 @@ export class StreamableHTTPClientTransport {
|
|
|
237
230
|
}
|
|
238
231
|
catch (error) {
|
|
239
232
|
// Handle stream errors - likely a network disconnect
|
|
240
|
-
|
|
233
|
+
this.onerror?.(new Error(`SSE stream disconnected: ${error}`));
|
|
241
234
|
// Attempt to reconnect if the stream disconnects unexpectedly and we aren't closing
|
|
242
235
|
// Reconnect if: already reconnectable (GET stream) OR received a priming event (POST stream with event ID)
|
|
243
236
|
// BUT don't reconnect if we already received a response - the request is complete
|
|
@@ -253,7 +246,7 @@ export class StreamableHTTPClientTransport {
|
|
|
253
246
|
}, 0);
|
|
254
247
|
}
|
|
255
248
|
catch (error) {
|
|
256
|
-
|
|
249
|
+
this.onerror?.(new Error(`Failed to reconnect: ${error instanceof Error ? error.message : String(error)}`));
|
|
257
250
|
}
|
|
258
251
|
}
|
|
259
252
|
}
|
|
@@ -285,21 +278,19 @@ export class StreamableHTTPClientTransport {
|
|
|
285
278
|
}
|
|
286
279
|
}
|
|
287
280
|
async close() {
|
|
288
|
-
var _a, _b;
|
|
289
281
|
if (this._reconnectionTimeout) {
|
|
290
282
|
clearTimeout(this._reconnectionTimeout);
|
|
291
283
|
this._reconnectionTimeout = undefined;
|
|
292
284
|
}
|
|
293
|
-
|
|
294
|
-
|
|
285
|
+
this._abortController?.abort();
|
|
286
|
+
this.onclose?.();
|
|
295
287
|
}
|
|
296
288
|
async send(message, options) {
|
|
297
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
298
289
|
try {
|
|
299
290
|
const { resumptionToken, onresumptiontoken } = options || {};
|
|
300
291
|
if (resumptionToken) {
|
|
301
292
|
// If we have at last event ID, we need to reconnect the SSE stream
|
|
302
|
-
this._startOrAuthSse({ resumptionToken, replayMessageId: isJSONRPCRequest(message) ? message.id : undefined }).catch(err =>
|
|
293
|
+
this._startOrAuthSse({ resumptionToken, replayMessageId: isJSONRPCRequest(message) ? message.id : undefined }).catch(err => this.onerror?.(err));
|
|
303
294
|
return;
|
|
304
295
|
}
|
|
305
296
|
const headers = await this._commonHeaders();
|
|
@@ -310,9 +301,9 @@ export class StreamableHTTPClientTransport {
|
|
|
310
301
|
method: 'POST',
|
|
311
302
|
headers,
|
|
312
303
|
body: JSON.stringify(message),
|
|
313
|
-
signal:
|
|
304
|
+
signal: this._abortController?.signal
|
|
314
305
|
};
|
|
315
|
-
const response = await (
|
|
306
|
+
const response = await (this._fetch ?? fetch)(this._url, init);
|
|
316
307
|
// Handle session ID received during initialization
|
|
317
308
|
const sessionId = response.headers.get('mcp-session-id');
|
|
318
309
|
if (sessionId) {
|
|
@@ -357,7 +348,7 @@ export class StreamableHTTPClientTransport {
|
|
|
357
348
|
this._resourceMetadataUrl = resourceMetadataUrl;
|
|
358
349
|
}
|
|
359
350
|
// Mark that upscoping was tried.
|
|
360
|
-
this._lastUpscopingHeader = wwwAuthHeader
|
|
351
|
+
this._lastUpscopingHeader = wwwAuthHeader ?? undefined;
|
|
361
352
|
const result = await auth(this._authProvider, {
|
|
362
353
|
serverUrl: this._url,
|
|
363
354
|
resourceMetadataUrl: this._resourceMetadataUrl,
|
|
@@ -377,12 +368,12 @@ export class StreamableHTTPClientTransport {
|
|
|
377
368
|
this._lastUpscopingHeader = undefined;
|
|
378
369
|
// If the response is 202 Accepted, there's no body to process
|
|
379
370
|
if (response.status === 202) {
|
|
380
|
-
await
|
|
371
|
+
await response.body?.cancel();
|
|
381
372
|
// if the accepted notification is initialized, we start the SSE stream
|
|
382
373
|
// if it's supported by the server
|
|
383
374
|
if (isInitializedNotification(message)) {
|
|
384
375
|
// Start without a lastEventId since this is a fresh connection
|
|
385
|
-
this._startOrAuthSse({ resumptionToken: undefined }).catch(err =>
|
|
376
|
+
this._startOrAuthSse({ resumptionToken: undefined }).catch(err => this.onerror?.(err));
|
|
386
377
|
}
|
|
387
378
|
return;
|
|
388
379
|
}
|
|
@@ -392,34 +383,34 @@ export class StreamableHTTPClientTransport {
|
|
|
392
383
|
// Check the response type
|
|
393
384
|
const contentType = response.headers.get('content-type');
|
|
394
385
|
if (hasRequests) {
|
|
395
|
-
if (contentType
|
|
386
|
+
if (contentType?.includes('text/event-stream')) {
|
|
396
387
|
// Handle SSE stream responses for requests
|
|
397
388
|
// We use the same handler as standalone streams, which now supports
|
|
398
389
|
// reconnection with the last event ID
|
|
399
390
|
this._handleSseStream(response.body, { onresumptiontoken }, false);
|
|
400
391
|
}
|
|
401
|
-
else if (contentType
|
|
392
|
+
else if (contentType?.includes('application/json')) {
|
|
402
393
|
// For non-streaming servers, we might get direct JSON responses
|
|
403
394
|
const data = await response.json();
|
|
404
395
|
const responseMessages = Array.isArray(data)
|
|
405
396
|
? data.map(msg => JSONRPCMessageSchema.parse(msg))
|
|
406
397
|
: [JSONRPCMessageSchema.parse(data)];
|
|
407
398
|
for (const msg of responseMessages) {
|
|
408
|
-
|
|
399
|
+
this.onmessage?.(msg);
|
|
409
400
|
}
|
|
410
401
|
}
|
|
411
402
|
else {
|
|
412
|
-
await
|
|
403
|
+
await response.body?.cancel();
|
|
413
404
|
throw new StreamableHTTPError(-1, `Unexpected content type: ${contentType}`);
|
|
414
405
|
}
|
|
415
406
|
}
|
|
416
407
|
else {
|
|
417
408
|
// No requests in message but got 200 OK - still need to release connection
|
|
418
|
-
await
|
|
409
|
+
await response.body?.cancel();
|
|
419
410
|
}
|
|
420
411
|
}
|
|
421
412
|
catch (error) {
|
|
422
|
-
|
|
413
|
+
this.onerror?.(error);
|
|
423
414
|
throw error;
|
|
424
415
|
}
|
|
425
416
|
}
|
|
@@ -438,7 +429,6 @@ export class StreamableHTTPClientTransport {
|
|
|
438
429
|
* the server does not allow clients to terminate sessions.
|
|
439
430
|
*/
|
|
440
431
|
async terminateSession() {
|
|
441
|
-
var _a, _b, _c, _d;
|
|
442
432
|
if (!this._sessionId) {
|
|
443
433
|
return; // No session to terminate
|
|
444
434
|
}
|
|
@@ -448,10 +438,10 @@ export class StreamableHTTPClientTransport {
|
|
|
448
438
|
...this._requestInit,
|
|
449
439
|
method: 'DELETE',
|
|
450
440
|
headers,
|
|
451
|
-
signal:
|
|
441
|
+
signal: this._abortController?.signal
|
|
452
442
|
};
|
|
453
|
-
const response = await (
|
|
454
|
-
await
|
|
443
|
+
const response = await (this._fetch ?? fetch)(this._url, init);
|
|
444
|
+
await response.body?.cancel();
|
|
455
445
|
// We specifically handle 405 as a valid response according to the spec,
|
|
456
446
|
// meaning the server does not support explicit session termination
|
|
457
447
|
if (!response.ok && response.status !== 405) {
|
|
@@ -460,7 +450,7 @@ export class StreamableHTTPClientTransport {
|
|
|
460
450
|
this._sessionId = undefined;
|
|
461
451
|
}
|
|
462
452
|
catch (error) {
|
|
463
|
-
|
|
453
|
+
this.onerror?.(error);
|
|
464
454
|
throw error;
|
|
465
455
|
}
|
|
466
456
|
}
|
|
@@ -480,7 +470,7 @@ export class StreamableHTTPClientTransport {
|
|
|
480
470
|
async resumeStream(lastEventId, options) {
|
|
481
471
|
await this._startOrAuthSse({
|
|
482
472
|
resumptionToken: lastEventId,
|
|
483
|
-
onresumptiontoken: options
|
|
473
|
+
onresumptiontoken: options?.onresumptiontoken
|
|
484
474
|
});
|
|
485
475
|
}
|
|
486
476
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamableHttp.js","sourceRoot":"","sources":["../../../src/client/streamableHttp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AACrG,OAAO,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,iBAAiB,EAAkB,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnI,OAAO,EAAE,IAAI,EAAc,4BAA4B,EAAuB,iBAAiB,EAAE,MAAM,WAAW,CAAC;AACnH,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,8DAA8D;AAC9D,MAAM,4CAA4C,GAAsC;IACpF,wBAAwB,EAAE,IAAI;IAC9B,oBAAoB,EAAE,KAAK;IAC3B,2BAA2B,EAAE,GAAG;IAChC,UAAU,EAAE,CAAC;CAChB,CAAC;AAEF,MAAM,OAAO,mBAAoB,SAAQ,KAAK;IAC1C,YACoB,IAAwB,EACxC,OAA2B;QAE3B,KAAK,CAAC,0BAA0B,OAAO,EAAE,CAAC,CAAC;QAH3B,SAAI,GAAJ,IAAI,CAAoB;IAI5C,CAAC;CACJ;AAkGD;;;;GAIG;AACH,MAAM,OAAO,6BAA6B;IAqBtC,YAAY,GAAQ,EAAE,IAA2C;;QATzD,0BAAqB,GAAG,KAAK,CAAC,CAAC,iEAAiE;QAUpG,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,oBAAoB,GAAG,SAAS,CAAC;QACtC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,YAAY,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,CAAC;QACtC,IAAI,CAAC,aAAa,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY,CAAC;QACxC,IAAI,CAAC,MAAM,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,CAAC;QAC1B,IAAI,CAAC,cAAc,GAAG,mBAAmB,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,CAAC,CAAC;QAC1E,IAAI,CAAC,UAAU,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,CAAC;QAClC,IAAI,CAAC,oBAAoB,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,mBAAmB,mCAAI,4CAA4C,CAAC;IAC1G,CAAC;IAEO,KAAK,CAAC,cAAc;;QACxB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACtB,MAAM,IAAI,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;QACpD,CAAC;QAED,IAAI,MAAkB,CAAC;QACvB,IAAI,CAAC;YACD,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;gBACpC,SAAS,EAAE,IAAI,CAAC,IAAI;gBACpB,mBAAmB,EAAE,IAAI,CAAC,oBAAoB;gBAC9C,KAAK,EAAE,IAAI,CAAC,MAAM;gBAClB,OAAO,EAAE,IAAI,CAAC,cAAc;aAC/B,CAAC,CAAC;QACP,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAA,IAAI,CAAC,OAAO,qDAAG,KAAc,CAAC,CAAC;YAC/B,MAAM,KAAK,CAAC;QAChB,CAAC;QAED,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;YAC1B,MAAM,IAAI,iBAAiB,EAAE,CAAC;QAClC,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,eAAe,EAAE,SAAS,EAAE,CAAC,CAAC;IACtE,CAAC;IAEO,KAAK,CAAC,cAAc;;QACxB,MAAM,OAAO,GAAyC,EAAE,CAAC;QACzD,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;YACjD,IAAI,MAAM,EAAE,CAAC;gBACT,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,MAAM,CAAC,YAAY,EAAE,CAAC;YAC/D,CAAC;QACL,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAChD,CAAC;QACD,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,OAAO,CAAC,sBAAsB,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC5D,CAAC;QAED,MAAM,YAAY,GAAG,gBAAgB,CAAC,MAAA,IAAI,CAAC,YAAY,0CAAE,OAAO,CAAC,CAAC;QAElE,OAAO,IAAI,OAAO,CAAC;YACf,GAAG,OAAO;YACV,GAAG,YAAY;SAClB,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,OAAwB;;QAClD,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;QAEpC,IAAI,CAAC;YACD,2EAA2E;YAC3E,qEAAqE;YACrE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;YAC5C,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;YAE3C,iEAAiE;YACjE,IAAI,eAAe,EAAE,CAAC;gBAClB,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;YAClD,CAAC;YAED,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAA,IAAI,CAAC,MAAM,mCAAI,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE;gBACrD,MAAM,EAAE,KAAK;gBACb,OAAO;gBACP,MAAM,EAAE,MAAA,IAAI,CAAC,gBAAgB,0CAAE,MAAM;aACxC,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACf,MAAM,CAAA,MAAA,QAAQ,CAAC,IAAI,0CAAE,MAAM,EAAE,CAAA,CAAC;gBAE9B,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;oBAChD,uBAAuB;oBACvB,OAAO,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;gBACvC,CAAC;gBAED,6EAA6E;gBAC7E,4DAA4D;gBAC5D,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC1B,OAAO;gBACX,CAAC;gBAED,MAAM,IAAI,mBAAmB,CAAC,QAAQ,CAAC,MAAM,EAAE,8BAA8B,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;YACxG,CAAC;YAED,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACxD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAA,IAAI,CAAC,OAAO,qDAAG,KAAc,CAAC,CAAC;YAC/B,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACK,yBAAyB,CAAC,OAAe;QAC7C,+CAA+C;QAC/C,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC,cAAc,CAAC;QAC/B,CAAC;QAED,mCAAmC;QACnC,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,wBAAwB,CAAC;QACxE,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,2BAA2B,CAAC;QACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC;QAEhE,uBAAuB;QACvB,OAAO,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC5E,CAAC;IAED;;;;;OAKG;IACK,qBAAqB,CAAC,OAAwB,EAAE,YAAY,GAAG,CAAC;;QACpE,0CAA0C;QAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC;QAExD,iDAAiD;QACjD,IAAI,YAAY,IAAI,UAAU,EAAE,CAAC;YAC7B,MAAA,IAAI,CAAC,OAAO,qDAAG,IAAI,KAAK,CAAC,kCAAkC,UAAU,aAAa,CAAC,CAAC,CAAC;YACrF,OAAO;QACX,CAAC;QAED,sDAAsD;QACtD,MAAM,KAAK,GAAG,IAAI,CAAC,yBAAyB,CAAC,YAAY,CAAC,CAAC;QAE3D,4BAA4B;QAC5B,IAAI,CAAC,oBAAoB,GAAG,UAAU,CAAC,GAAG,EAAE;YACxC,oDAAoD;YACpD,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;;gBACxC,MAAA,IAAI,CAAC,OAAO,qDAAG,IAAI,KAAK,CAAC,mCAAmC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;gBACvH,gFAAgF;gBAChF,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,YAAY,GAAG,CAAC,CAAC,CAAC;YAC1D,CAAC,CAAC,CAAC;QACP,CAAC,EAAE,KAAK,CAAC,CAAC;IACd,CAAC;IAEO,gBAAgB,CAAC,MAAyC,EAAE,OAAwB,EAAE,eAAwB;QAClH,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,OAAO;QACX,CAAC;QACD,MAAM,EAAE,iBAAiB,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;QAEvD,IAAI,WAA+B,CAAC;QACpC,+DAA+D;QAC/D,sEAAsE;QACtE,IAAI,eAAe,GAAG,KAAK,CAAC;QAC5B,wEAAwE;QACxE,sEAAsE;QACtE,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;;YAC7B,mEAAmE;YACnE,yCAAyC;YACzC,IAAI,CAAC;gBACD,iEAAiE;gBACjE,MAAM,MAAM,GAAG,MAAM;qBAChB,WAAW,CAAC,IAAI,iBAAiB,EAA8C,CAAC;qBAChF,WAAW,CACR,IAAI,uBAAuB,CAAC;oBACxB,OAAO,EAAE,CAAC,OAAe,EAAE,EAAE;wBACzB,8DAA8D;wBAC9D,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC;oBAClC,CAAC;iBACJ,CAAC,CACL;qBACA,SAAS,EAAE,CAAC;gBAEjB,OAAO,IAAI,EAAE,CAAC;oBACV,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;oBACnD,IAAI,IAAI,EAAE,CAAC;wBACP,MAAM;oBACV,CAAC;oBAED,mCAAmC;oBACnC,IAAI,KAAK,CAAC,EAAE,EAAE,CAAC;wBACX,WAAW,GAAG,KAAK,CAAC,EAAE,CAAC;wBACvB,qEAAqE;wBACrE,eAAe,GAAG,IAAI,CAAC;wBACvB,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAG,KAAK,CAAC,EAAE,CAAC,CAAC;oBAClC,CAAC;oBAED,yDAAyD;oBACzD,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;wBACd,SAAS;oBACb,CAAC;oBAED,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;wBAC5C,IAAI,CAAC;4BACD,MAAM,OAAO,GAAG,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;4BACnE,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;gCAC7B,2EAA2E;gCAC3E,gBAAgB,GAAG,IAAI,CAAC;gCACxB,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;oCAChC,OAAO,CAAC,EAAE,GAAG,eAAe,CAAC;gCACjC,CAAC;4BACL,CAAC;4BACD,MAAA,IAAI,CAAC,SAAS,qDAAG,OAAO,CAAC,CAAC;wBAC9B,CAAC;wBAAC,OAAO,KAAK,EAAE,CAAC;4BACb,MAAA,IAAI,CAAC,OAAO,qDAAG,KAAc,CAAC,CAAC;wBACnC,CAAC;oBACL,CAAC;gBACL,CAAC;gBAED,yCAAyC;gBACzC,qEAAqE;gBACrE,2GAA2G;gBAC3G,kFAAkF;gBAClF,MAAM,SAAS,GAAG,eAAe,IAAI,eAAe,CAAC;gBACrD,MAAM,cAAc,GAAG,SAAS,IAAI,CAAC,gBAAgB,CAAC;gBACtD,IAAI,cAAc,IAAI,IAAI,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;oBACnF,IAAI,CAAC,qBAAqB,CACtB;wBACI,eAAe,EAAE,WAAW;wBAC5B,iBAAiB;wBACjB,eAAe;qBAClB,EACD,CAAC,CACJ,CAAC;gBACN,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,qDAAqD;gBACrD,MAAA,IAAI,CAAC,OAAO,qDAAG,IAAI,KAAK,CAAC,4BAA4B,KAAK,EAAE,CAAC,CAAC,CAAC;gBAE/D,oFAAoF;gBACpF,2GAA2G;gBAC3G,kFAAkF;gBAClF,MAAM,SAAS,GAAG,eAAe,IAAI,eAAe,CAAC;gBACrD,MAAM,cAAc,GAAG,SAAS,IAAI,CAAC,gBAAgB,CAAC;gBACtD,IAAI,cAAc,IAAI,IAAI,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;oBACnF,oDAAoD;oBACpD,IAAI,CAAC;wBACD,IAAI,CAAC,qBAAqB,CACtB;4BACI,eAAe,EAAE,WAAW;4BAC5B,iBAAiB;4BACjB,eAAe;yBAClB,EACD,CAAC,CACJ,CAAC;oBACN,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACb,MAAA,IAAI,CAAC,OAAO,qDAAG,IAAI,KAAK,CAAC,wBAAwB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;oBAChH,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC,CAAC;QACF,aAAa,EAAE,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CACX,wHAAwH,CAC3H,CAAC;QACN,CAAC;QAED,IAAI,CAAC,gBAAgB,GAAG,IAAI,eAAe,EAAE,CAAC;IAClD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,UAAU,CAAC,iBAAyB;QACtC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACtB,MAAM,IAAI,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;QACpD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YAC1C,SAAS,EAAE,IAAI,CAAC,IAAI;YACpB,iBAAiB;YACjB,mBAAmB,EAAE,IAAI,CAAC,oBAAoB;YAC9C,KAAK,EAAE,IAAI,CAAC,MAAM;YAClB,OAAO,EAAE,IAAI,CAAC,cAAc;SAC/B,CAAC,CAAC;QACH,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;YAC1B,MAAM,IAAI,iBAAiB,CAAC,qBAAqB,CAAC,CAAC;QACvD,CAAC;IACL,CAAC;IAED,KAAK,CAAC,KAAK;;QACP,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,YAAY,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACxC,IAAI,CAAC,oBAAoB,GAAG,SAAS,CAAC;QAC1C,CAAC;QACD,MAAA,IAAI,CAAC,gBAAgB,0CAAE,KAAK,EAAE,CAAC;QAC/B,MAAA,IAAI,CAAC,OAAO,oDAAI,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,IAAI,CACN,OAA0C,EAC1C,OAAmF;;QAEnF,IAAI,CAAC;YACD,MAAM,EAAE,eAAe,EAAE,iBAAiB,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;YAE7D,IAAI,eAAe,EAAE,CAAC;gBAClB,mEAAmE;gBACnE,IAAI,CAAC,eAAe,CAAC,EAAE,eAAe,EAAE,eAAe,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,WACvH,OAAA,MAAA,IAAI,CAAC,OAAO,qDAAG,GAAG,CAAC,CAAA,EAAA,CACtB,CAAC;gBACF,OAAO;YACX,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;YAC5C,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;YAChD,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,qCAAqC,CAAC,CAAC;YAE7D,MAAM,IAAI,GAAG;gBACT,GAAG,IAAI,CAAC,YAAY;gBACpB,MAAM,EAAE,MAAM;gBACd,OAAO;gBACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;gBAC7B,MAAM,EAAE,MAAA,IAAI,CAAC,gBAAgB,0CAAE,MAAM;aACxC,CAAC;YAEF,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAA,IAAI,CAAC,MAAM,mCAAI,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAE/D,mDAAmD;YACnD,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YACzD,IAAI,SAAS,EAAE,CAAC;gBACZ,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;YAChC,CAAC;YAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACf,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;gBAErD,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;oBAChD,2EAA2E;oBAC3E,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;wBAC7B,MAAM,IAAI,mBAAmB,CAAC,GAAG,EAAE,qDAAqD,CAAC,CAAC;oBAC9F,CAAC;oBAED,MAAM,EAAE,mBAAmB,EAAE,KAAK,EAAE,GAAG,4BAA4B,CAAC,QAAQ,CAAC,CAAC;oBAC9E,IAAI,CAAC,oBAAoB,GAAG,mBAAmB,CAAC;oBAChD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;oBAEpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;wBAC1C,SAAS,EAAE,IAAI,CAAC,IAAI;wBACpB,mBAAmB,EAAE,IAAI,CAAC,oBAAoB;wBAC9C,KAAK,EAAE,IAAI,CAAC,MAAM;wBAClB,OAAO,EAAE,IAAI,CAAC,cAAc;qBAC/B,CAAC,CAAC;oBACH,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;wBAC1B,MAAM,IAAI,iBAAiB,EAAE,CAAC;oBAClC,CAAC;oBAED,mCAAmC;oBACnC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;oBAClC,0DAA0D;oBAC1D,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC9B,CAAC;gBAED,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;oBAChD,MAAM,EAAE,mBAAmB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,4BAA4B,CAAC,QAAQ,CAAC,CAAC;oBAErF,IAAI,KAAK,KAAK,oBAAoB,EAAE,CAAC;wBACjC,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;wBAE/D,qFAAqF;wBACrF,IAAI,IAAI,CAAC,oBAAoB,KAAK,aAAa,EAAE,CAAC;4BAC9C,MAAM,IAAI,mBAAmB,CAAC,GAAG,EAAE,4CAA4C,CAAC,CAAC;wBACrF,CAAC;wBAED,IAAI,KAAK,EAAE,CAAC;4BACR,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;wBACxB,CAAC;wBAED,IAAI,mBAAmB,EAAE,CAAC;4BACtB,IAAI,CAAC,oBAAoB,GAAG,mBAAmB,CAAC;wBACpD,CAAC;wBAED,iCAAiC;wBACjC,IAAI,CAAC,oBAAoB,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,SAAS,CAAC;wBACvD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;4BAC1C,SAAS,EAAE,IAAI,CAAC,IAAI;4BACpB,mBAAmB,EAAE,IAAI,CAAC,oBAAoB;4BAC9C,KAAK,EAAE,IAAI,CAAC,MAAM;4BAClB,OAAO,EAAE,IAAI,CAAC,MAAM;yBACvB,CAAC,CAAC;wBAEH,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;4BAC1B,MAAM,IAAI,iBAAiB,EAAE,CAAC;wBAClC,CAAC;wBAED,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBAC9B,CAAC;gBACL,CAAC;gBAED,MAAM,IAAI,mBAAmB,CAAC,QAAQ,CAAC,MAAM,EAAE,8BAA8B,IAAI,EAAE,CAAC,CAAC;YACzF,CAAC;YAED,8CAA8C;YAC9C,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAC;YACnC,IAAI,CAAC,oBAAoB,GAAG,SAAS,CAAC;YAEtC,8DAA8D;YAC9D,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBAC1B,MAAM,CAAA,MAAA,QAAQ,CAAC,IAAI,0CAAE,MAAM,EAAE,CAAA,CAAC;gBAC9B,uEAAuE;gBACvE,kCAAkC;gBAClC,IAAI,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC;oBACrC,+DAA+D;oBAC/D,IAAI,CAAC,eAAe,CAAC,EAAE,eAAe,EAAE,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,OAAO,qDAAG,GAAG,CAAC,CAAA,EAAA,CAAC,CAAC;gBAC3F,CAAC;gBACD,OAAO;YACX,CAAC;YAED,oDAAoD;YACpD,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAE9D,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,IAAI,GAAG,IAAI,IAAI,IAAI,GAAG,IAAI,GAAG,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YAE9G,0BAA0B;YAC1B,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAEzD,IAAI,WAAW,EAAE,CAAC;gBACd,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;oBAC7C,2CAA2C;oBAC3C,oEAAoE;oBACpE,sCAAsC;oBACtC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,iBAAiB,EAAE,EAAE,KAAK,CAAC,CAAC;gBACvE,CAAC;qBAAM,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;oBACnD,gEAAgE;oBAChE,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;oBACnC,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;wBACxC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;wBAClD,CAAC,CAAC,CAAC,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;oBAEzC,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;wBACjC,MAAA,IAAI,CAAC,SAAS,qDAAG,GAAG,CAAC,CAAC;oBAC1B,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACJ,MAAM,CAAA,MAAA,QAAQ,CAAC,IAAI,0CAAE,MAAM,EAAE,CAAA,CAAC;oBAC9B,MAAM,IAAI,mBAAmB,CAAC,CAAC,CAAC,EAAE,4BAA4B,WAAW,EAAE,CAAC,CAAC;gBACjF,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,2EAA2E;gBAC3E,MAAM,CAAA,MAAA,QAAQ,CAAC,IAAI,0CAAE,MAAM,EAAE,CAAA,CAAC;YAClC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAA,IAAI,CAAC,OAAO,qDAAG,KAAc,CAAC,CAAC;YAC/B,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAED,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAC,gBAAgB;;QAClB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACnB,OAAO,CAAC,0BAA0B;QACtC,CAAC;QAED,IAAI,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;YAE5C,MAAM,IAAI,GAAG;gBACT,GAAG,IAAI,CAAC,YAAY;gBACpB,MAAM,EAAE,QAAQ;gBAChB,OAAO;gBACP,MAAM,EAAE,MAAA,IAAI,CAAC,gBAAgB,0CAAE,MAAM;aACxC,CAAC;YAEF,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAA,IAAI,CAAC,MAAM,mCAAI,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC/D,MAAM,CAAA,MAAA,QAAQ,CAAC,IAAI,0CAAE,MAAM,EAAE,CAAA,CAAC;YAE9B,wEAAwE;YACxE,mEAAmE;YACnE,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBAC1C,MAAM,IAAI,mBAAmB,CAAC,QAAQ,CAAC,MAAM,EAAE,gCAAgC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;YAC1G,CAAC;YAED,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAChC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAA,IAAI,CAAC,OAAO,qDAAG,KAAc,CAAC,CAAC;YAC/B,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAED,kBAAkB,CAAC,OAAe;QAC9B,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC;IACpC,CAAC;IACD,IAAI,eAAe;QACf,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,YAAY,CAAC,WAAmB,EAAE,OAAyD;QAC7F,MAAM,IAAI,CAAC,eAAe,CAAC;YACvB,eAAe,EAAE,WAAW;YAC5B,iBAAiB,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,iBAAiB;SAChD,CAAC,CAAC;IACP,CAAC;CACJ"}
|
|
1
|
+
{"version":3,"file":"streamableHttp.js","sourceRoot":"","sources":["../../../src/client/streamableHttp.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,44 +14,39 @@ export class WebSocketClientTransport {
|
|
|
14
14
|
return new Promise((resolve, reject) => {
|
|
15
15
|
this._socket = new WebSocket(this._url, SUBPROTOCOL);
|
|
16
16
|
this._socket.onerror = event => {
|
|
17
|
-
var _a;
|
|
18
17
|
const error = 'error' in event ? event.error : new Error(`WebSocket error: ${JSON.stringify(event)}`);
|
|
19
18
|
reject(error);
|
|
20
|
-
|
|
19
|
+
this.onerror?.(error);
|
|
21
20
|
};
|
|
22
21
|
this._socket.onopen = () => {
|
|
23
22
|
resolve();
|
|
24
23
|
};
|
|
25
24
|
this._socket.onclose = () => {
|
|
26
|
-
|
|
27
|
-
(_a = this.onclose) === null || _a === void 0 ? void 0 : _a.call(this);
|
|
25
|
+
this.onclose?.();
|
|
28
26
|
};
|
|
29
27
|
this._socket.onmessage = (event) => {
|
|
30
|
-
var _a, _b;
|
|
31
28
|
let message;
|
|
32
29
|
try {
|
|
33
30
|
message = JSONRPCMessageSchema.parse(JSON.parse(event.data));
|
|
34
31
|
}
|
|
35
32
|
catch (error) {
|
|
36
|
-
|
|
33
|
+
this.onerror?.(error);
|
|
37
34
|
return;
|
|
38
35
|
}
|
|
39
|
-
|
|
36
|
+
this.onmessage?.(message);
|
|
40
37
|
};
|
|
41
38
|
});
|
|
42
39
|
}
|
|
43
40
|
async close() {
|
|
44
|
-
|
|
45
|
-
(_a = this._socket) === null || _a === void 0 ? void 0 : _a.close();
|
|
41
|
+
this._socket?.close();
|
|
46
42
|
}
|
|
47
43
|
send(message) {
|
|
48
44
|
return new Promise((resolve, reject) => {
|
|
49
|
-
var _a;
|
|
50
45
|
if (!this._socket) {
|
|
51
46
|
reject(new Error('Not connected'));
|
|
52
47
|
return;
|
|
53
48
|
}
|
|
54
|
-
|
|
49
|
+
this._socket?.send(JSON.stringify(message));
|
|
55
50
|
resolve();
|
|
56
51
|
});
|
|
57
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../../src/client/websocket.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnE,MAAM,WAAW,GAAG,KAAK,CAAC;AAE1B;;GAEG;AACH,MAAM,OAAO,wBAAwB;IAQjC,YAAY,GAAQ;QAChB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;IACpB,CAAC;IAED,KAAK;QACD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACX,mHAAmH,CACtH,CAAC;QACN,CAAC;QAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,CAAC,OAAO,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAErD,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC,EAAE
|
|
1
|
+
{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../../src/client/websocket.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnE,MAAM,WAAW,GAAG,KAAK,CAAC;AAE1B;;GAEG;AACH,MAAM,OAAO,wBAAwB;IAQjC,YAAY,GAAQ;QAChB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;IACpB,CAAC;IAED,KAAK;QACD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACX,mHAAmH,CACtH,CAAC;QACN,CAAC;QAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,CAAC,OAAO,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAErD,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC,EAAE;gBAC3B,MAAM,KAAK,GAAG,OAAO,IAAI,KAAK,CAAC,CAAC,CAAE,KAAK,CAAC,KAAe,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACjH,MAAM,CAAC,KAAK,CAAC,CAAC;gBACd,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;YAC1B,CAAC,CAAC;YAEF,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,GAAG,EAAE;gBACvB,OAAO,EAAE,CAAC;YACd,CAAC,CAAC;YAEF,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,GAAG,EAAE;gBACxB,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;YACrB,CAAC,CAAC;YAEF,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,CAAC,KAAmB,EAAE,EAAE;gBAC7C,IAAI,OAAuB,CAAC;gBAC5B,IAAI,CAAC;oBACD,OAAO,GAAG,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;gBACjE,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACb,IAAI,CAAC,OAAO,EAAE,CAAC,KAAc,CAAC,CAAC;oBAC/B,OAAO;gBACX,CAAC;gBAED,IAAI,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,CAAC;YAC9B,CAAC,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;IAC1B,CAAC;IAED,IAAI,CAAC,OAAuB;QACxB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAChB,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;gBACnC,OAAO;YACX,CAAC;YAED,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5C,OAAO,EAAE,CAAC;QACd,CAAC,CAAC,CAAC;IACP,CAAC;CACJ"}
|