Clarify stdin and stdout refers to server process in StreamClientTransport

Author: halter73

tests/ModelContextProtocol.Tests/Client/McpClientExtensionsTests.cs

@@ -38,8 +38,8 @@ private async Task<IMcpClient> CreateMcpClientForServer()
     {
         await _server.StartAsync(TestContext.Current.CancellationToken);
 
-        var stdin = new StreamWriter(_clientToServerPipe.Writer.AsStream());
-        var stdout = new StreamReader(_serverToClientPipe.Reader.AsStream());
+        var serverStdinWriter = new StreamWriter(_clientToServerPipe.Writer.AsStream());
+        var serverStdoutReader = new StreamReader(_serverToClientPipe.Reader.AsStream());
 
         var serverConfig = new McpServerConfig()
         {
@@ -50,7 +50,7 @@ private async Task<IMcpClient> CreateMcpClientForServer()
 
         return await McpClientFactory.CreateAsync(
             serverConfig,
-            createTransportFunc: (_, _) => new StreamClientTransport(stdin, stdout),
+            createTransportFunc: (_, _) => new StreamClientTransport(serverStdinWriter, serverStdoutReader),
             cancellationToken: TestContext.Current.CancellationToken);
     }
 

tests/ModelContextProtocol.Tests/Configuration/McpServerBuilderExtensionsToolsTests.cs

@@ -48,8 +48,8 @@ private async Task<IMcpClient> CreateMcpClientForServer()
     {
         await _server.StartAsync(TestContext.Current.CancellationToken);
 
-        var stdin = new StreamWriter(_clientToServerPipe.Writer.AsStream());
-        var stdout = new StreamReader(_serverToClientPipe.Reader.AsStream());
+        var serverStdinWriter = new StreamWriter(_clientToServerPipe.Writer.AsStream());
+        var serverStdoutReader = new StreamReader(_serverToClientPipe.Reader.AsStream());
 
         var serverConfig = new McpServerConfig()
         {
@@ -60,7 +60,7 @@ private async Task<IMcpClient> CreateMcpClientForServer()
 
         return await McpClientFactory.CreateAsync(
             serverConfig,
-            createTransportFunc: (_, _) => new StreamClientTransport(stdin, stdout),
+            createTransportFunc: (_, _) => new StreamClientTransport(serverStdinWriter, serverStdoutReader),
             cancellationToken: TestContext.Current.CancellationToken);
     }
 
@@ -112,8 +112,8 @@ public async Task Can_Create_Multiple_Servers_From_Options_And_List_Registered_T
 
                 await server.StartAsync(TestContext.Current.CancellationToken);
 
-                var stdin = new StreamWriter(stdinPipe.Writer.AsStream());
-                var stdout = new StreamReader(stdoutPipe.Reader.AsStream());
+                var serverStdinWriter = new StreamWriter(stdinPipe.Writer.AsStream());
+                var serverStdoutReader = new StreamReader(stdoutPipe.Reader.AsStream());
 
                 var serverConfig = new McpServerConfig()
                 {
@@ -124,7 +124,7 @@ public async Task Can_Create_Multiple_Servers_From_Options_And_List_Registered_T
 
                 var client = await McpClientFactory.CreateAsync(
                     serverConfig,
-                    createTransportFunc: (_, _) => new StreamClientTransport(stdin, stdout),
+                    createTransportFunc: (_, _) => new StreamClientTransport(serverStdinWriter, serverStdoutReader),
                     cancellationToken: TestContext.Current.CancellationToken);
 
                 var tools = await client.ListToolsAsync(TestContext.Current.CancellationToken);

tests/ModelContextProtocol.Tests/Transport/StreamClientTransport.cs

@@ -9,16 +9,16 @@ namespace ModelContextProtocol.Tests.Transport;
 internal sealed class StreamClientTransport : TransportBase, IClientTransport
 {
     private readonly JsonSerializerOptions _jsonOptions = McpJsonUtilities.DefaultOptions;
-    private Task? _readTask;
-    private CancellationTokenSource _shutdownCts = new CancellationTokenSource();
-    private readonly TextReader _stdout;
-    private readonly TextWriter _stdin;
+    private readonly Task? _readTask;
+    private readonly CancellationTokenSource _shutdownCts = new CancellationTokenSource();
+    private readonly TextReader _serverStdoutReader;
+    private readonly TextWriter _serverStdinWriter;
 
-    public StreamClientTransport(TextWriter stdin, TextReader stdout)
+    public StreamClientTransport(TextWriter serverStdinReader, TextReader serverStdoutWriter)
         : base(NullLoggerFactory.Instance)
     {
-        _stdout = stdout;
-        _stdin = stdin;
+        _serverStdoutReader = serverStdoutWriter;
+        _serverStdinWriter = serverStdinReader;
         _readTask = Task.Run(() => ReadMessagesAsync(_shutdownCts.Token), CancellationToken.None);
         SetConnected(true);
     }
@@ -31,13 +31,13 @@ public override async Task SendMessageAsync(IJsonRpcMessage message, Cancellatio
             messageWithId.Id.ToString() :
             "(no id)";
 
-        await _stdin.WriteLineAsync(JsonSerializer.Serialize(message)).ConfigureAwait(false);
-        await _stdin.FlushAsync(cancellationToken).ConfigureAwait(false);
+        await _serverStdinWriter.WriteLineAsync(JsonSerializer.Serialize(message)).ConfigureAwait(false);
+        await _serverStdinWriter.FlushAsync(cancellationToken).ConfigureAwait(false);
     }
 
     private async Task ReadMessagesAsync(CancellationToken cancellationToken)
     {
-        while (await _stdout.ReadLineAsync(cancellationToken).ConfigureAwait(false) is string line)
+        while (await _serverStdoutReader.ReadLineAsync(cancellationToken).ConfigureAwait(false) is string line)
         {
             if (!string.IsNullOrWhiteSpace(line))
             {