diff --git a/src/ZB.MOM.WW.MxGateway.Worker.Tests/Ipc/WorkerPipeClientTests.cs b/src/ZB.MOM.WW.MxGateway.Worker.Tests/Ipc/WorkerPipeClientTests.cs index 5d7f53c9..aab99039 100644 --- a/src/ZB.MOM.WW.MxGateway.Worker.Tests/Ipc/WorkerPipeClientTests.cs +++ b/src/ZB.MOM.WW.MxGateway.Worker.Tests/Ipc/WorkerPipeClientTests.cs @@ -31,7 +31,7 @@ public sealed class WorkerPipeClientTests WorkerPipeClient client = new( connectTimeoutMilliseconds: 5000, - (stream, options) => CreateSession(stream, options)); + sessionFactory: (stream, options, _) => CreateSession(stream, options)); Task clientTask = client.RunAsync(workerOptions); await Task.Factory.FromAsync(server.BeginWaitForConnection, server.EndWaitForConnection, null); @@ -138,6 +138,40 @@ public sealed class WorkerPipeClientTests await Assert.ThrowsAsync(async () => await client.RunAsync(workerOptions)); } + /// Verifies that the consolidated constructor still rejects non-positive timeouts. + /// Overall timeout under test. + /// Per-attempt timeout under test. + /// Parameter the exception must name. + [Theory] + [InlineData(0, 50, "connectTimeoutMilliseconds")] + [InlineData(-1, 50, "connectTimeoutMilliseconds")] + [InlineData(1000, 0, "connectAttemptTimeoutMilliseconds")] + [InlineData(1000, -5, "connectAttemptTimeoutMilliseconds")] + public void Constructor_RejectsNonPositiveTimeouts( + int connectTimeoutMilliseconds, + int connectAttemptTimeoutMilliseconds, + string expectedParameter) + { + ArgumentOutOfRangeException exception = Assert.Throws( + () => new WorkerPipeClient( + logger: null, + connectTimeoutMilliseconds, + connectAttemptTimeoutMilliseconds)); + + Assert.Equal(expectedParameter, exception.ParamName); + } + + /// + /// Verifies that the all-defaults constructor (the production path passes only a logger) + /// builds a client without a session factory. + /// + [Fact] + public void Constructor_WithDefaults_DoesNotThrow() + { + _ = new WorkerPipeClient(); + _ = new WorkerPipeClient(logger: null); + } + /// /// Reads frames until one matching the expected body case is found, /// skipping interleaved heartbeats (the first heartbeat is emitted diff --git a/src/ZB.MOM.WW.MxGateway.Worker/Ipc/WorkerPipeClient.cs b/src/ZB.MOM.WW.MxGateway.Worker/Ipc/WorkerPipeClient.cs index 87c5156a..7c4b1192 100644 --- a/src/ZB.MOM.WW.MxGateway.Worker/Ipc/WorkerPipeClient.cs +++ b/src/ZB.MOM.WW.MxGateway.Worker/Ipc/WorkerPipeClient.cs @@ -33,93 +33,25 @@ public sealed class WorkerPipeClient : IWorkerPipeClient private readonly IWorkerLogger? _logger; /// - /// Initializes a worker pipe client with default timeouts. - /// - public WorkerPipeClient() - : this(null, DefaultConnectTimeoutMilliseconds) - { - } - - /// - /// Initializes a worker pipe client with a logger and default timeouts. - /// - /// Optional logger for diagnostic output. - public WorkerPipeClient(IWorkerLogger? logger) - : this(logger, DefaultConnectTimeoutMilliseconds) - { - } - - /// - /// Initializes a worker pipe client with a custom overall connect timeout. - /// - /// Overall connection timeout in milliseconds. - public WorkerPipeClient(int connectTimeoutMilliseconds) - : this(null, connectTimeoutMilliseconds) - { - } - - /// - /// Initializes a worker pipe client with custom timeouts and a session factory. - /// - /// Overall connection timeout in milliseconds. - /// Factory creating the worker pipe session. - public WorkerPipeClient( - int connectTimeoutMilliseconds, - Func sessionFactory) - : this( - null, - connectTimeoutMilliseconds, - ResolveDefaultConnectAttemptTimeoutMilliseconds(), - (stream, frameOptions, _) => sessionFactory(stream, frameOptions)) - { - } - - /// - /// Initializes a worker pipe client with a logger and custom overall timeout. + /// Initializes a worker pipe client. Every argument is optional: production passes only a + /// logger, and tests override the timeouts and the session factory. /// /// Optional logger for diagnostic output. /// Overall connection timeout in milliseconds. + /// + /// Per-attempt connection timeout in milliseconds; resolves + /// from the + /// environment, falling back to . + /// + /// + /// Factory creating the worker pipe session; constructs the production + /// . + /// public WorkerPipeClient( - IWorkerLogger? logger, - int connectTimeoutMilliseconds) - : this( - logger, - connectTimeoutMilliseconds, - ResolveDefaultConnectAttemptTimeoutMilliseconds(), - (stream, frameOptions, workerLogger) => new WorkerPipeSession(stream, frameOptions, workerLogger)) - { - } - - /// - /// Initializes a worker pipe client with logger, timeouts, and a session factory. - /// - /// Optional logger for diagnostic output. - /// Overall connection timeout in milliseconds. - /// Factory creating the worker pipe session. - public WorkerPipeClient( - IWorkerLogger? logger, - int connectTimeoutMilliseconds, - Func sessionFactory) - : this( - logger, - connectTimeoutMilliseconds, - ResolveDefaultConnectAttemptTimeoutMilliseconds(), - sessionFactory) - { - } - - /// - /// Initializes a worker pipe client with full configuration. - /// - /// Optional logger for diagnostic output. - /// Overall connection timeout in milliseconds. - /// Per-attempt connection timeout in milliseconds. - /// Factory creating the worker pipe session. - public WorkerPipeClient( - IWorkerLogger? logger, - int connectTimeoutMilliseconds, - int connectAttemptTimeoutMilliseconds, - Func sessionFactory) + IWorkerLogger? logger = null, + int connectTimeoutMilliseconds = DefaultConnectTimeoutMilliseconds, + int? connectAttemptTimeoutMilliseconds = null, + Func? sessionFactory = null) { if (connectTimeoutMilliseconds <= 0) { @@ -128,7 +60,9 @@ public sealed class WorkerPipeClient : IWorkerPipeClient "Worker pipe connect timeout must be greater than zero."); } - if (connectAttemptTimeoutMilliseconds <= 0) + int attemptTimeoutMilliseconds = + connectAttemptTimeoutMilliseconds ?? ResolveDefaultConnectAttemptTimeoutMilliseconds(); + if (attemptTimeoutMilliseconds <= 0) { throw new ArgumentOutOfRangeException( nameof(connectAttemptTimeoutMilliseconds), @@ -136,9 +70,10 @@ public sealed class WorkerPipeClient : IWorkerPipeClient } _logger = logger; - _sessionFactory = sessionFactory ?? throw new ArgumentNullException(nameof(sessionFactory)); + _sessionFactory = sessionFactory + ?? ((stream, frameOptions, workerLogger) => new WorkerPipeSession(stream, frameOptions, workerLogger)); _connectTimeoutMilliseconds = connectTimeoutMilliseconds; - _connectAttemptTimeoutMilliseconds = connectAttemptTimeoutMilliseconds; + _connectAttemptTimeoutMilliseconds = attemptTimeoutMilliseconds; } /// diff --git a/src/ZB.MOM.WW.MxGateway.Worker/Ipc/WorkerPipeSession.cs b/src/ZB.MOM.WW.MxGateway.Worker/Ipc/WorkerPipeSession.cs index 799616bb..7a128a14 100644 --- a/src/ZB.MOM.WW.MxGateway.Worker/Ipc/WorkerPipeSession.cs +++ b/src/ZB.MOM.WW.MxGateway.Worker/Ipc/WorkerPipeSession.cs @@ -1550,63 +1550,31 @@ public sealed class WorkerPipeSession } } - private WorkerEnvelope CreateEnvelope(WorkerHello hello) - { - return CreateBaseEnvelope(hello); - } - - private WorkerEnvelope CreateEnvelope(WorkerReady ready) - { - return CreateBaseEnvelope(ready); - } - - private WorkerEnvelope CreateEnvelope(WorkerFault fault) - { - return CreateBaseEnvelope(fault); - } - - private WorkerEnvelope CreateEnvelope(WorkerCommandReply reply) - { - return CreateBaseEnvelope(reply); - } - - private WorkerEnvelope CreateEnvelope(WorkerEvent workerEvent) - { - return CreateBaseEnvelope(workerEvent); - } - - private WorkerEnvelope CreateEnvelope(WorkerShutdownAck shutdownAck) - { - return CreateBaseEnvelope(shutdownAck); - } - - private WorkerEnvelope CreateEnvelope(WorkerHeartbeat heartbeat) - { - return CreateBaseEnvelope(heartbeat); - } - - private WorkerEnvelope CreateBaseEnvelope(WorkerHello body) + // One overload per outbound body type: a protobuf oneof has a distinct setter per case, so the + // overloads cannot collapse further without reflection. Each stamps the shared header through + // CreateBaseEnvelope and assigns its body. + private WorkerEnvelope CreateEnvelope(WorkerHello body) { WorkerEnvelope envelope = CreateBaseEnvelope(); envelope.WorkerHello = body; return envelope; } - private WorkerEnvelope CreateBaseEnvelope(WorkerReady body) + private WorkerEnvelope CreateEnvelope(WorkerReady body) { WorkerEnvelope envelope = CreateBaseEnvelope(); envelope.WorkerReady = body; return envelope; } - private WorkerEnvelope CreateBaseEnvelope(WorkerFault body) + private WorkerEnvelope CreateEnvelope(WorkerFault body) { WorkerEnvelope envelope = CreateBaseEnvelope(); envelope.WorkerFault = body; return envelope; } - private WorkerEnvelope CreateBaseEnvelope(WorkerCommandReply body) + private WorkerEnvelope CreateEnvelope(WorkerCommandReply body) { WorkerEnvelope envelope = CreateBaseEnvelope(); envelope.CorrelationId = body.Reply?.CorrelationId ?? string.Empty; @@ -1614,21 +1582,21 @@ public sealed class WorkerPipeSession return envelope; } - private WorkerEnvelope CreateBaseEnvelope(WorkerEvent body) + private WorkerEnvelope CreateEnvelope(WorkerEvent body) { WorkerEnvelope envelope = CreateBaseEnvelope(); envelope.WorkerEvent = body; return envelope; } - private WorkerEnvelope CreateBaseEnvelope(WorkerShutdownAck body) + private WorkerEnvelope CreateEnvelope(WorkerShutdownAck body) { WorkerEnvelope envelope = CreateBaseEnvelope(); envelope.WorkerShutdownAck = body; return envelope; } - private WorkerEnvelope CreateBaseEnvelope(WorkerHeartbeat body) + private WorkerEnvelope CreateEnvelope(WorkerHeartbeat body) { WorkerEnvelope envelope = CreateBaseEnvelope(); envelope.WorkerHeartbeat = body;