@1mcp/agent 0.29.0-beta1 → 0.29.0-beta3
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/build/constants/mcp.d.ts +1 -1
- package/build/constants/mcp.js +1 -1
- package/build/transport/stdioProxyTransport.d.ts +14 -0
- package/build/transport/stdioProxyTransport.d.ts.map +1 -1
- package/build/transport/stdioProxyTransport.js +69 -19
- package/build/transport/stdioProxyTransport.js.map +1 -1
- package/package.json +1 -1
package/build/constants/mcp.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { ClientCapabilities, ServerCapabilities } from '@modelcontextprotocol/sd
|
|
|
5
5
|
export declare const MCP_CONFIG_FILE = "mcp.json";
|
|
6
6
|
export declare const MCP_INSTRUCTIONS_TEMPLATE_FILE = "instructions-template.md";
|
|
7
7
|
export declare const MCP_SERVER_NAME = "1mcp";
|
|
8
|
-
export declare const MCP_SERVER_VERSION = "0.29.0-
|
|
8
|
+
export declare const MCP_SERVER_VERSION = "0.29.0-beta3";
|
|
9
9
|
export declare const MCP_URI_SEPARATOR = "_1mcp_";
|
|
10
10
|
export declare const MCP_SERVER_CAPABILITIES: ServerCapabilities;
|
|
11
11
|
export declare const MCP_CLIENT_CAPABILITIES: ClientCapabilities;
|
package/build/constants/mcp.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
export const MCP_CONFIG_FILE = 'mcp.json';
|
|
3
3
|
export const MCP_INSTRUCTIONS_TEMPLATE_FILE = 'instructions-template.md';
|
|
4
4
|
export const MCP_SERVER_NAME = '1mcp';
|
|
5
|
-
export const MCP_SERVER_VERSION = '0.29.0-
|
|
5
|
+
export const MCP_SERVER_VERSION = '0.29.0-beta3';
|
|
6
6
|
export const MCP_URI_SEPARATOR = '_1mcp_';
|
|
7
7
|
export const MCP_SERVER_CAPABILITIES = {
|
|
8
8
|
completions: {},
|
|
@@ -34,10 +34,24 @@ export declare class StdioProxyTransport {
|
|
|
34
34
|
* Start the proxy transport
|
|
35
35
|
*/
|
|
36
36
|
start(): Promise<void>;
|
|
37
|
+
/**
|
|
38
|
+
* Set up HTTP transport message handlers
|
|
39
|
+
* Extracted to allow re-setup after transport recreation
|
|
40
|
+
*/
|
|
41
|
+
private setupHttpTransportMessageHandlers;
|
|
37
42
|
/**
|
|
38
43
|
* Set up bidirectional message forwarding between STDIO and HTTP
|
|
39
44
|
*/
|
|
40
45
|
private setupMessageForwarding;
|
|
46
|
+
/**
|
|
47
|
+
* Build User-Agent string with optional client info
|
|
48
|
+
*/
|
|
49
|
+
private buildUserAgent;
|
|
50
|
+
/**
|
|
51
|
+
* Recreate HTTP transport with updated User-Agent header
|
|
52
|
+
* Called after client info extraction to include client details in User-Agent
|
|
53
|
+
*/
|
|
54
|
+
private recreateHttpTransport;
|
|
41
55
|
/**
|
|
42
56
|
* Type guard to check if a JSON-RPC message is a request
|
|
43
57
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stdioProxyTransport.d.ts","sourceRoot":"","sources":["../../src/transport/stdioProxyTransport.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAOvE;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B;AA0FD;;;;;;;;GAQG;AACH,qBAAa,mBAAmB;IAUlB,OAAO,CAAC,OAAO;IAT3B,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,UAAU,CAA2B;IAC7C,OAAO,CAAC,qBAAqB,CAAS;IACtC,OAAO,CAAC,SAAS,CAAM;IACvB,OAAO,CAAC,WAAW,CAAc;gBAEb,OAAO,EAAE,0BAA0B;IA+CvD;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB5B;;OAEG;IACH,OAAO,CAAC,sBAAsB;
|
|
1
|
+
{"version":3,"file":"stdioProxyTransport.d.ts","sourceRoot":"","sources":["../../src/transport/stdioProxyTransport.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAOvE;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B;AA0FD;;;;;;;;GAQG;AACH,qBAAa,mBAAmB;IAUlB,OAAO,CAAC,OAAO;IAT3B,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,UAAU,CAA2B;IAC7C,OAAO,CAAC,qBAAqB,CAAS;IACtC,OAAO,CAAC,SAAS,CAAM;IACvB,OAAO,CAAC,WAAW,CAAc;gBAEb,OAAO,EAAE,0BAA0B;IA+CvD;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB5B;;;OAGG;IACH,OAAO,CAAC,iCAAiC;IAuBzC;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAkD9B;;OAEG;IACH,OAAO,CAAC,cAAc;IAUtB;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IA2B7B;;OAEG;IACH,OAAO,CAAC,SAAS;IAOjB;;OAEG;IACH,OAAO,CAAC,cAAc;IAiCtB;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAqB7B"}
|
|
@@ -132,7 +132,7 @@ export class StdioProxyTransport {
|
|
|
132
132
|
// Prepare minimal request headers (no large context data)
|
|
133
133
|
this.requestInit = {
|
|
134
134
|
headers: {
|
|
135
|
-
'User-Agent':
|
|
135
|
+
'User-Agent': this.buildUserAgent(),
|
|
136
136
|
'mcp-session-id': this.context.sessionId, // Non-null assertion - always set by detectProxyContext
|
|
137
137
|
},
|
|
138
138
|
};
|
|
@@ -162,6 +162,31 @@ export class StdioProxyTransport {
|
|
|
162
162
|
throw error;
|
|
163
163
|
}
|
|
164
164
|
}
|
|
165
|
+
/**
|
|
166
|
+
* Set up HTTP transport message handlers
|
|
167
|
+
* Extracted to allow re-setup after transport recreation
|
|
168
|
+
*/
|
|
169
|
+
setupHttpTransportMessageHandlers() {
|
|
170
|
+
// Forward messages from HTTP server to STDIO client
|
|
171
|
+
this.httpTransport.onmessage = async (message) => {
|
|
172
|
+
try {
|
|
173
|
+
// Forward to STDIO client
|
|
174
|
+
await this.stdioTransport.send(message);
|
|
175
|
+
}
|
|
176
|
+
catch (error) {
|
|
177
|
+
logger.error(`Error forwarding HTTP message to STDIO: ${error}`);
|
|
178
|
+
}
|
|
179
|
+
};
|
|
180
|
+
// Handle errors from HTTP transport
|
|
181
|
+
this.httpTransport.onerror = (error) => {
|
|
182
|
+
logger.error(`HTTP transport error: ${error.message}`);
|
|
183
|
+
};
|
|
184
|
+
// Handle HTTP transport close
|
|
185
|
+
this.httpTransport.onclose = async () => {
|
|
186
|
+
logger.warn('HTTP server connection closed');
|
|
187
|
+
await this.close();
|
|
188
|
+
};
|
|
189
|
+
}
|
|
165
190
|
/**
|
|
166
191
|
* Set up bidirectional message forwarding between STDIO and HTTP
|
|
167
192
|
*/
|
|
@@ -180,6 +205,11 @@ export class StdioProxyTransport {
|
|
|
180
205
|
clientVersion: clientInfo.version,
|
|
181
206
|
clientTitle: clientInfo.title,
|
|
182
207
|
});
|
|
208
|
+
// Recreate transport with enhanced User-Agent
|
|
209
|
+
this.recreateHttpTransport();
|
|
210
|
+
logger.info('✅ Updated User-Agent with client info', {
|
|
211
|
+
userAgent: this.buildUserAgent(),
|
|
212
|
+
});
|
|
183
213
|
}
|
|
184
214
|
}
|
|
185
215
|
// Add context metadata to message _meta field
|
|
@@ -191,34 +221,54 @@ export class StdioProxyTransport {
|
|
|
191
221
|
logger.error(`Error forwarding STDIO message to HTTP: ${error}`);
|
|
192
222
|
}
|
|
193
223
|
};
|
|
194
|
-
//
|
|
195
|
-
this.
|
|
196
|
-
try {
|
|
197
|
-
// Forward to STDIO client
|
|
198
|
-
await this.stdioTransport.send(message);
|
|
199
|
-
}
|
|
200
|
-
catch (error) {
|
|
201
|
-
logger.error(`Error forwarding HTTP message to STDIO: ${error}`);
|
|
202
|
-
}
|
|
203
|
-
};
|
|
224
|
+
// Set up HTTP transport message handlers
|
|
225
|
+
this.setupHttpTransportMessageHandlers();
|
|
204
226
|
// Handle errors from STDIO transport
|
|
205
227
|
this.stdioTransport.onerror = (error) => {
|
|
206
228
|
logger.error(`STDIO transport error: ${error.message}`);
|
|
207
229
|
};
|
|
208
|
-
// Handle errors from HTTP transport
|
|
209
|
-
this.httpTransport.onerror = (error) => {
|
|
210
|
-
logger.error(`HTTP transport error: ${error.message}`);
|
|
211
|
-
};
|
|
212
230
|
// Handle STDIO transport close
|
|
213
231
|
this.stdioTransport.onclose = async () => {
|
|
214
232
|
logger.info('STDIO transport closed');
|
|
215
233
|
await this.close();
|
|
216
234
|
};
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
235
|
+
}
|
|
236
|
+
/**
|
|
237
|
+
* Build User-Agent string with optional client info
|
|
238
|
+
*/
|
|
239
|
+
buildUserAgent() {
|
|
240
|
+
const base = `1MCP-Proxy/${MCP_SERVER_VERSION}`;
|
|
241
|
+
if (this.clientInfo) {
|
|
242
|
+
const { name, version, title } = this.clientInfo;
|
|
243
|
+
const clientString = title ? `${name}/${version} (${title})` : `${name}/${version}`;
|
|
244
|
+
return `${base} ${clientString}`;
|
|
245
|
+
}
|
|
246
|
+
return base;
|
|
247
|
+
}
|
|
248
|
+
/**
|
|
249
|
+
* Recreate HTTP transport with updated User-Agent header
|
|
250
|
+
* Called after client info extraction to include client details in User-Agent
|
|
251
|
+
*/
|
|
252
|
+
recreateHttpTransport() {
|
|
253
|
+
const oldTransport = this.httpTransport;
|
|
254
|
+
// Update requestInit with new User-Agent
|
|
255
|
+
this.requestInit = {
|
|
256
|
+
headers: {
|
|
257
|
+
'User-Agent': this.buildUserAgent(),
|
|
258
|
+
'mcp-session-id': this.context.sessionId,
|
|
259
|
+
},
|
|
221
260
|
};
|
|
261
|
+
// Create new transport
|
|
262
|
+
this.httpTransport = new StreamableHTTPClientTransport(this.serverUrl, {
|
|
263
|
+
requestInit: this.requestInit,
|
|
264
|
+
});
|
|
265
|
+
// Re-setup message forwarding for new transport
|
|
266
|
+
this.setupHttpTransportMessageHandlers();
|
|
267
|
+
// Close old transport gracefully
|
|
268
|
+
oldTransport.close().catch((error) => {
|
|
269
|
+
logger.warn(`Error closing old HTTP transport: ${error}`);
|
|
270
|
+
});
|
|
271
|
+
logger.info('HTTP transport recreated with updated User-Agent');
|
|
222
272
|
}
|
|
223
273
|
/**
|
|
224
274
|
* Type guard to check if a JSON-RPC message is a request
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stdioProxyTransport.js","sourceRoot":"","sources":["../../src/transport/stdioProxyTransport.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"stdioProxyTransport.js","sourceRoot":"","sources":["../../src/transport/stdioProxyTransport.ts"],"names":[],"mappings":"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"}
|