feat: Added PipeClient.CreatePipeStreamForConnectionFunc.

HavenDV · Dec 8, 2023 · eae9191 · eae9191
1 parent caf0005
commit eae9191
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 35 deletions.
diff --git a/src/libs/H.Pipes/Factories/PipeClientFactory.cs b/src/libs/H.Pipes/Factories/PipeClientFactory.cs
@@ -63,8 +63,8 @@ public static async Task<NamedPipeClientStream> CreateAndConnectAsync(
     public static NamedPipeClientStream Create(string pipeName, string serverName)
     {
         return new NamedPipeClientStream(
-            serverName,
-            pipeName,
+            serverName: serverName,
+            pipeName: pipeName,
             direction: PipeDirection.InOut,
             options: PipeOptions.Asynchronous | PipeOptions.WriteThrough);
     }

diff --git a/src/libs/H.Pipes/PipeClient.cs b/src/libs/H.Pipes/PipeClient.cs
@@ -41,6 +41,11 @@ public bool IsConnecting
 
     /// <inheritdoc/>
     public Func<string, string, NamedPipeClientStream>? CreatePipeStreamFunc { get; set; }
+
+    /// <summary>
+    /// If set, used instead of CreatePipeStreamFunc for connections
+    /// </summary>
+    public Func<string, string, NamedPipeClientStream>? CreatePipeStreamForConnectionFunc { get; set; }
 
     /// <inheritdoc/>
     public string PipeName { get; }
@@ -177,8 +182,11 @@ public async Task ConnectAsync(CancellationToken cancellationToken = default)
 
             // Connect to the actual data pipe
 #pragma warning disable CA2000 // Dispose objects before losing scope
-            var dataPipe = await PipeClientFactory
-                .CreateAndConnectAsync(connectionPipeName, ServerName, CreatePipeStreamFunc, cancellationToken)
+            var dataPipe = await PipeClientFactory.CreateAndConnectAsync(
+                pipeName: connectionPipeName,
+                serverName: ServerName,
+                func: CreatePipeStreamForConnectionFunc ?? CreatePipeStreamFunc,
+                cancellationToken: cancellationToken)
 #pragma warning restore CA2000 // Dispose objects before losing scope
                     .ConfigureAwait(false);
 

diff --git a/src/tests/H.Pipes.Tests/Tests.cs b/src/tests/H.Pipes.Tests/Tests.cs
@@ -143,37 +143,14 @@ public async Task WriteOnlyServer()
             Console.WriteLine($"PipeName: {pipeName}");
 
             await using var server = new PipeServer<byte[]>(pipeName);
-            if (OperatingSystem.IsWindows())
-            {
-                var pipeSecurity = new PipeSecurity();
-                pipeSecurity.AddAccessRule(new PipeAccessRule(
-                    new SecurityIdentifier(WellKnownSidType.WorldSid, null),
-                    PipeAccessRights.ReadWrite,
-                    AccessControlType.Allow));                
-
-#pragma warning disable CA1416
-                server.CreatePipeStreamFunc = name => NamedPipeServerStreamAcl.Create(
-                    pipeName: name,
-                    direction: PipeDirection.Out,
-                    maxNumberOfServerInstances: 1,
-                    transmissionMode: PipeTransmissionMode.Byte,
-                    options: PipeOptions.Asynchronous | PipeOptions.WriteThrough,
-                    inBufferSize: 0,
-                    outBufferSize: 0,
-                    pipeSecurity: pipeSecurity);
-#pragma warning restore CA1416
-            }
-            else
-            {
-                server.CreatePipeStreamFunc = static pipeName => new NamedPipeServerStream(
-                    pipeName: pipeName,
-                    direction: PipeDirection.Out,
-                    maxNumberOfServerInstances: 1,
-                    transmissionMode: PipeTransmissionMode.Byte,
-                    options: PipeOptions.Asynchronous | PipeOptions.WriteThrough,
-                    inBufferSize: 0,
-                    outBufferSize: 0);
-            }
+            server.CreatePipeStreamFunc = static pipeName => new NamedPipeServerStream(
+                pipeName: pipeName,
+                direction: PipeDirection.Out,
+                maxNumberOfServerInstances: 1,
+                transmissionMode: PipeTransmissionMode.Byte,
+                options: PipeOptions.Asynchronous | PipeOptions.WriteThrough,
+                inBufferSize: 0,
+                outBufferSize: 0);
 
             server.ClientConnected += async (_, args) =>
             {
@@ -237,6 +214,12 @@ await server.WriteAsync(new byte[]
 
             var isClientReceivedMessage = new TaskCompletionSource<bool>();
             await using var client = new PipeClient<byte[]>(pipeName);
+            client.CreatePipeStreamForConnectionFunc = static (pipeName, serverName) => new NamedPipeClientStream(
+                serverName: serverName,
+                pipeName: pipeName,
+                direction: PipeDirection.In,
+                options: PipeOptions.Asynchronous | PipeOptions.WriteThrough);
+
             client.MessageReceived += (_, _) =>
             {
                 _ = isClientReceivedMessage.TrySetResult(true);