mcpzip 0.1.0

MCP proxy that aggregates multiple servers behind search + execute meta-tools
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
use std::collections::HashMap;
use std::sync::atomic::{AtomicU64, Ordering};
use std::sync::Arc;

#[allow(unused_imports)]
use serde_json::{json, Value};
use tokio::sync::{oneshot, Mutex};

use crate::error::McpzipError;
use crate::mcp::protocol::*;
use crate::mcp::transport::McpTransport;

/// MCP client that communicates with an upstream MCP server.
pub struct McpClient {
    transport: Arc<dyn McpTransport>,
    next_id: AtomicU64,
    pending: Arc<Mutex<HashMap<u64, oneshot::Sender<JsonRpcResponse>>>>,
    reader_handle: Option<tokio::task::JoinHandle<()>>,
}

impl McpClient {
    /// Create a new MCP client with the given transport.
    /// Starts a background reader task that dispatches responses.
    pub fn new(transport: Arc<dyn McpTransport>) -> Self {
        let pending: Arc<Mutex<HashMap<u64, oneshot::Sender<JsonRpcResponse>>>> =
            Arc::new(Mutex::new(HashMap::new()));

        let reader_transport = transport.clone();
        let reader_pending = pending.clone();

        let reader_handle = tokio::spawn(async move {
            while let Ok(msg) = reader_transport.receive().await {
                match JsonRpcMessage::from_value(msg) {
                    Ok(JsonRpcMessage::Response(resp)) => {
                        if let Id::Number(id) = &resp.id {
                            let mut pending = reader_pending.lock().await;
                            if let Some(tx) = pending.remove(id) {
                                let _ = tx.send(resp);
                            }
                        }
                    }
                    Ok(JsonRpcMessage::Request(_) | JsonRpcMessage::Notification(_)) => {
                        // Server-initiated requests/notifications — ignore for now
                    }
                    Err(_) => {
                        // Malformed message — skip
                    }
                }
            }
        });

        Self {
            transport,
            next_id: AtomicU64::new(1),
            pending,
            reader_handle: Some(reader_handle),
        }
    }

    /// Send a request and wait for the matching response.
    async fn request(&self, method: &str, params: Option<Value>) -> Result<Value, McpzipError> {
        let id = self.next_id.fetch_add(1, Ordering::Relaxed);
        let req = make_request(id, method, params);

        let (tx, rx) = oneshot::channel();
        {
            let mut pending = self.pending.lock().await;
            pending.insert(id, tx);
        }

        self.transport.send(serde_json::to_value(&req)?).await?;

        let resp = rx.await.map_err(|_| {
            McpzipError::Transport("response channel dropped (transport closed)".into())
        })?;

        if let Some(err) = resp.error {
            return Err(McpzipError::Protocol(format!(
                "RPC error {}: {}",
                err.code, err.message
            )));
        }

        resp.result
            .ok_or_else(|| McpzipError::Protocol("response has neither result nor error".into()))
    }

    /// Send a notification (no response expected).
    async fn notify(&self, method: &str, params: Option<Value>) -> Result<(), McpzipError> {
        let notif = make_notification(method, params);
        self.transport.send(serde_json::to_value(&notif)?).await
    }

    /// Perform the MCP initialize handshake.
    pub async fn initialize(&self) -> Result<InitializeResult, McpzipError> {
        let params = InitializeParams {
            protocol_version: "2024-11-05".into(),
            capabilities: ClientCapabilities {},
            client_info: ClientInfo {
                name: "mcpzip".into(),
                version: env!("CARGO_PKG_VERSION").into(),
            },
        };

        let result = self
            .request("initialize", Some(serde_json::to_value(&params)?))
            .await?;
        let init_result: InitializeResult = serde_json::from_value(result)?;

        // Send initialized notification
        self.notify("notifications/initialized", None).await?;

        Ok(init_result)
    }

    /// List all tools from the server.
    pub async fn list_tools(&self) -> Result<Vec<ToolInfo>, McpzipError> {
        let result = self.request("tools/list", None).await?;
        let list: ListToolsResult = serde_json::from_value(result)?;
        Ok(list.tools)
    }

    /// Call a tool on the server.
    pub async fn call_tool(
        &self,
        name: &str,
        arguments: Value,
    ) -> Result<CallToolResult, McpzipError> {
        let params = CallToolParams {
            name: name.into(),
            arguments: Some(arguments),
        };
        let result = self
            .request("tools/call", Some(serde_json::to_value(&params)?))
            .await?;
        let call_result: CallToolResult = serde_json::from_value(result)?;
        Ok(call_result)
    }

    /// Shut down the client, aborting the reader task.
    pub fn close(&mut self) {
        if let Some(handle) = self.reader_handle.take() {
            handle.abort();
        }
    }
}

impl Drop for McpClient {
    fn drop(&mut self) {
        if let Some(handle) = self.reader_handle.take() {
            handle.abort();
        }
    }
}

#[cfg(test)]
mod tests {
    use super::*;
    use crate::mcp::transport::memory_transport_pair;

    /// Helper: run a mock MCP server that responds to requests.
    async fn mock_server(transport: Arc<dyn McpTransport>, tools: Vec<ToolInfo>) {
        loop {
            let msg = match transport.receive().await {
                Ok(m) => m,
                Err(_) => break,
            };
            let parsed = match JsonRpcMessage::from_value(msg) {
                Ok(m) => m,
                Err(_) => continue,
            };

            match parsed {
                JsonRpcMessage::Request(req) => {
                    let result = match req.method.as_str() {
                        "initialize" => json!({
                            "protocolVersion": "2024-11-05",
                            "capabilities": {"tools": {}},
                            "serverInfo": {"name": "mock", "version": "1.0"}
                        }),
                        "tools/list" => json!({"tools": tools}),
                        "tools/call" => {
                            let params: CallToolParams =
                                serde_json::from_value(req.params.unwrap_or_default()).unwrap();
                            json!({
                                "content": [{"type": "text", "text": format!("called {}", params.name)}]
                            })
                        }
                        _ => {
                            let resp = make_error_response(
                                req.id,
                                METHOD_NOT_FOUND,
                                "unknown method".into(),
                            );
                            transport
                                .send(serde_json::to_value(&resp).unwrap())
                                .await
                                .unwrap();
                            continue;
                        }
                    };
                    let resp = make_response(req.id, result);
                    transport
                        .send(serde_json::to_value(&resp).unwrap())
                        .await
                        .unwrap();
                }
                JsonRpcMessage::Notification(_) => {
                    // Ignore notifications
                }
                _ => {}
            }
        }
    }

    #[tokio::test]
    async fn test_initialize_handshake() {
        let (client_transport, server_transport) = memory_transport_pair();
        let client_transport = Arc::new(client_transport);
        let server_transport = Arc::new(server_transport);

        let server = tokio::spawn(mock_server(server_transport, vec![]));
        let client = McpClient::new(client_transport);

        let result = client.initialize().await.unwrap();
        assert_eq!(result.protocol_version, "2024-11-05");
        assert_eq!(result.server_info.name, "mock");

        server.abort();
    }

    #[tokio::test]
    async fn test_list_tools() {
        let (ct, st) = memory_transport_pair();
        let ct = Arc::new(ct);
        let st = Arc::new(st);

        let tools = vec![ToolInfo {
            name: "send_message".into(),
            description: Some("Send a msg".into()),
            input_schema: Some(json!({"type": "object"})),
        }];

        let server = tokio::spawn(mock_server(st, tools));
        let client = McpClient::new(ct);
        client.initialize().await.unwrap();

        let tools = client.list_tools().await.unwrap();
        assert_eq!(tools.len(), 1);
        assert_eq!(tools[0].name, "send_message");

        server.abort();
    }

    #[tokio::test]
    async fn test_call_tool() {
        let (ct, st) = memory_transport_pair();
        let ct = Arc::new(ct);
        let st = Arc::new(st);

        let server = tokio::spawn(mock_server(st, vec![]));
        let client = McpClient::new(ct);
        client.initialize().await.unwrap();

        let result = client
            .call_tool("my_tool", json!({"key": "value"}))
            .await
            .unwrap();
        assert_eq!(result.content.len(), 1);
        if let ContentItem::Text { text } = &result.content[0] {
            assert!(text.contains("my_tool"));
        } else {
            panic!("expected text content");
        }

        server.abort();
    }

    #[tokio::test]
    async fn test_request_id_increments() {
        let (ct, st) = memory_transport_pair();
        let ct = Arc::new(ct);
        let st = Arc::new(st);

        let server = tokio::spawn(mock_server(st, vec![]));
        let client = McpClient::new(ct);
        client.initialize().await.unwrap();

        // After initialize (id=1) and list_tools calls, IDs should increment
        let _tools1 = client.list_tools().await.unwrap();
        let _tools2 = client.list_tools().await.unwrap();
        // If we got here without error, IDs were correctly matched
        assert!(client.next_id.load(Ordering::Relaxed) >= 4);

        server.abort();
    }

    #[tokio::test]
    async fn test_error_response() {
        let (ct, st) = memory_transport_pair();
        let ct = Arc::new(ct);
        let st = Arc::new(st);

        let server = tokio::spawn(mock_server(st, vec![]));
        let client = McpClient::new(ct);
        client.initialize().await.unwrap();

        let err = client.request("unknown/method", None).await.unwrap_err();
        assert!(err.to_string().contains("unknown method"));

        server.abort();
    }

    // --- New tests ---

    #[tokio::test]
    async fn test_list_tools_multiple() {
        let (ct, st) = memory_transport_pair();
        let ct = Arc::new(ct);
        let st = Arc::new(st);

        let tools = vec![
            ToolInfo {
                name: "tool_a".into(),
                description: Some("Tool A".into()),
                input_schema: Some(json!({"type": "object"})),
            },
            ToolInfo {
                name: "tool_b".into(),
                description: Some("Tool B".into()),
                input_schema: None,
            },
            ToolInfo {
                name: "tool_c".into(),
                description: None,
                input_schema: None,
            },
        ];

        let server = tokio::spawn(mock_server(st, tools));
        let client = McpClient::new(ct);
        client.initialize().await.unwrap();

        let result = client.list_tools().await.unwrap();
        assert_eq!(result.len(), 3);
        assert_eq!(result[0].name, "tool_a");
        assert_eq!(result[1].name, "tool_b");
        assert_eq!(result[2].name, "tool_c");

        server.abort();
    }

    #[tokio::test]
    async fn test_call_tool_with_args() {
        let (ct, st) = memory_transport_pair();
        let ct = Arc::new(ct);
        let st = Arc::new(st);

        let server = tokio::spawn(mock_server(st, vec![]));
        let client = McpClient::new(ct);
        client.initialize().await.unwrap();

        let result = client
            .call_tool(
                "send_message",
                json!({"channel": "#general", "text": "hello"}),
            )
            .await
            .unwrap();
        assert_eq!(result.content.len(), 1);
        let ContentItem::Text { text } = &result.content[0];
        assert!(text.contains("send_message"));

        server.abort();
    }

    #[tokio::test]
    async fn test_concurrent_requests() {
        let (ct, st) = memory_transport_pair();
        let ct = Arc::new(ct);
        let st = Arc::new(st);

        let server = tokio::spawn(mock_server(st, vec![]));
        let client = Arc::new(McpClient::new(ct));
        client.initialize().await.unwrap();

        // Fire multiple concurrent list_tools requests
        let mut handles = Vec::new();
        for _ in 0..5 {
            let c = client.clone();
            handles.push(tokio::spawn(async move { c.list_tools().await }));
        }

        for h in handles {
            let result = h.await.unwrap();
            assert!(result.is_ok());
        }

        server.abort();
    }

    #[tokio::test]
    async fn test_client_close() {
        let (ct, st) = memory_transport_pair();
        let ct = Arc::new(ct);
        let st = Arc::new(st);

        let server = tokio::spawn(mock_server(st, vec![]));
        let mut client = McpClient::new(ct);
        client.initialize().await.unwrap();

        // Close should not panic
        client.close();
        // Calling close again should be fine (idempotent - handle is taken)
        client.close();

        server.abort();
    }

    #[tokio::test]
    async fn test_initialize_server_info() {
        let (ct, st) = memory_transport_pair();
        let ct = Arc::new(ct);
        let st = Arc::new(st);

        let server = tokio::spawn(mock_server(st, vec![]));
        let client = McpClient::new(ct);

        let result = client.initialize().await.unwrap();
        assert_eq!(result.protocol_version, "2024-11-05");
        assert_eq!(result.server_info.name, "mock");
        assert_eq!(result.server_info.version, "1.0");
        assert!(result.capabilities.tools.is_some());

        server.abort();
    }
}