397d3c5c4f
Rename across every client surface using each language's idiomatic convention:
* .NET clients/dotnet/MxGateway.Client[.Cli|.Tests]/
-> clients/dotnet/ZB.MOM.WW.MxGateway.Client[.Cli|.Tests]/
namespaces -> ZB.MOM.WW.MxGateway.Client[.Cli|.Tests]
contracts ProjectReference repointed to ZB.MOM.WW.MxGateway.Contracts
sln migrated to slnx (dotnet sln migrate)
* Python src/mxgateway -> src/zb_mom_ww_mxgateway
src/mxgateway_cli -> src/zb_mom_ww_mxgateway_cli
distribution: mxaccess-gateway-client -> zb-mom-ww-mxaccess-gateway-client
* Rust crate: mxgateway-client -> zb-mom-ww-mxgateway-client
build.rs proto path repointed
* Java subprojects: mxgateway-{client,cli} -> zb-mom-ww-mxgateway-{client,cli}
packages com.dohertylan.mxgateway -> com.zb.mom.ww.mxgateway
group com.dohertylan.mxgateway -> com.zb.mom.ww.mxgateway
rootProject mxaccessgw-java -> zb-mom-ww-mxaccessgw-java
* Go generate-proto.ps1 proto path repointed; module path and
package mxgateway kept (Go convention).
* proto-inputs.json: generatedOutputs.python updated to new package path.
* scripts/run-client-e2e-tests.ps1: Java CLI install path + gradle task
updated to zb-mom-ww-mxgateway-cli.
CLI binary names (mxgw, mxgw-py, mxgw-go, mxgateway-cli) and wire-level
identifiers (MXGATEWAY_* env vars, the mxgw_<id>_<secret> API key
prefix, protobuf package names like mxaccess_gateway.v1, all MXAccess
references) intentionally NOT renamed.
Fix pre-existing alarms-over-gateway breaks unblocked by the rename:
* mxaccess_gateway.proto: add missing public message QueryActiveAlarmsRequest
{session_id, client_correlation_id, alarm_filter_prefix} and missing
rpc QueryActiveAlarms(QueryActiveAlarmsRequest) returns
(stream ActiveAlarmSnapshot). All four typed clients referenced
these but they were absent from the proto.
* MxAccessGatewayService.QueryActiveAlarms: implement the new RPC on
the server, streaming from IGatewayAlarmService.CurrentAlarms with
optional alarm_filter_prefix filter.
* clients/dotnet/.../DiscoverHierarchyOptions.cs: add the hand-written
.NET POCO that wraps DiscoverHierarchyRequest (referenced by
GalaxyRepositoryClient.DiscoverHierarchyAsync but never authored).
* Drop retired session_id field references from
AcknowledgeAlarmRequest/AcknowledgeAlarmReply test fixtures across
.NET, Rust, Go, and Python clients.
* Rust integration test: add the missing stream_alarms impl on the
fake MxAccessGateway server (the trait gained the method, fake
didn't).
* Rust CLI test: bump expected gatewayProtocolVersion 2 -> 3.
Regenerated artifacts updated in this commit:
* src/ZB.MOM.WW.MxGateway.Contracts/Generated/{MxaccessGateway,MxaccessGatewayGrpc}.cs
* clients/python/src/zb_mom_ww_mxgateway/generated/*_pb2{,_grpc}.py
* clients/go/internal/generated/*.pb.go
(C# regenerated by Grpc.Tools on contracts build; Python and Go via
their generate-proto.ps1 scripts; Rust regenerates from .proto via
tonic-build at compile time so no checked-in artefact.)
Verification: 472 server tests, 275 worker tests (9 dev-rig skipped),
18 integration tests (live MxAccess + LDAP + Galaxy), 57 .NET client
tests, 32 Rust workspace tests, 39 Python tests, all Go packages, and
gradle build for Java all pass.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
102 lines
3.7 KiB
C#
102 lines
3.7 KiB
C#
using ZB.MOM.WW.MxGateway.Contracts.Proto;
|
|
|
|
namespace ZB.MOM.WW.MxGateway.Client;
|
|
|
|
/// <summary>Extension methods for checking MxCommandReply success conditions.</summary>
|
|
public static class MxCommandReplyExtensions
|
|
{
|
|
/// <summary>Validates that the reply has a successful protocol status (Ok or MxAccessFailure), throwing a gateway exception if not.</summary>
|
|
/// <param name="reply">The command reply to check.</param>
|
|
public static MxCommandReply EnsureProtocolSuccess(this MxCommandReply reply)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(reply);
|
|
|
|
ProtocolStatusCode code = reply.ProtocolStatus?.Code
|
|
?? ProtocolStatusCode.Unspecified;
|
|
|
|
if (code is ProtocolStatusCode.Ok or ProtocolStatusCode.MxaccessFailure)
|
|
{
|
|
return reply;
|
|
}
|
|
|
|
throw CreateProtocolException(reply, code);
|
|
}
|
|
|
|
/// <summary>Validates that the reply indicates MXAccess success (no HResult or status failures), throwing MxAccessException if not.</summary>
|
|
/// <param name="reply">The command reply to check.</param>
|
|
public static MxCommandReply EnsureMxAccessSuccess(this MxCommandReply reply)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(reply);
|
|
|
|
bool mxAccessFailure = reply.ProtocolStatus?.Code is ProtocolStatusCode.MxaccessFailure;
|
|
bool hResultFailure = reply.HasHresult && reply.Hresult != 0;
|
|
bool statusFailure = reply.Statuses.Any(status => !status.IsSuccess());
|
|
|
|
if (!mxAccessFailure && !hResultFailure && !statusFailure)
|
|
{
|
|
return reply;
|
|
}
|
|
|
|
throw new MxAccessException(CreateMxAccessMessage(reply), reply);
|
|
}
|
|
|
|
private static MxGatewayException CreateProtocolException(
|
|
MxCommandReply reply,
|
|
ProtocolStatusCode code)
|
|
{
|
|
string message = CreateProtocolMessage(reply);
|
|
int? hResult = reply.HasHresult ? reply.Hresult : null;
|
|
MxStatusProxy[] statuses = reply.Statuses.ToArray();
|
|
|
|
return code switch
|
|
{
|
|
ProtocolStatusCode.SessionNotFound or ProtocolStatusCode.SessionNotReady
|
|
=> new MxGatewaySessionException(
|
|
message,
|
|
reply.SessionId,
|
|
reply.CorrelationId,
|
|
reply.ProtocolStatus,
|
|
hResult,
|
|
statuses),
|
|
ProtocolStatusCode.WorkerUnavailable
|
|
=> new MxGatewayWorkerException(
|
|
message,
|
|
reply.SessionId,
|
|
reply.CorrelationId,
|
|
reply.ProtocolStatus,
|
|
hResult,
|
|
statuses),
|
|
_
|
|
=> new MxGatewayCommandException(
|
|
message,
|
|
reply.SessionId,
|
|
reply.CorrelationId,
|
|
reply.ProtocolStatus,
|
|
hResult,
|
|
statuses),
|
|
};
|
|
}
|
|
|
|
private static string CreateProtocolMessage(MxCommandReply reply)
|
|
{
|
|
string statusMessage = string.IsNullOrWhiteSpace(reply.ProtocolStatus?.Message)
|
|
? "Gateway protocol failure."
|
|
: reply.ProtocolStatus.Message;
|
|
|
|
return $"{statusMessage} code={reply.ProtocolStatus?.Code}; session={reply.SessionId}; correlation={reply.CorrelationId}";
|
|
}
|
|
|
|
private static string CreateMxAccessMessage(MxCommandReply reply)
|
|
{
|
|
string statusSummary = reply.Statuses.Count is 0
|
|
? "no MXSTATUS_PROXY entries"
|
|
: string.Join("; ", reply.Statuses.Select(status => status.ToDiagnosticSummary()));
|
|
|
|
string hResult = reply.HasHresult
|
|
? $"0x{reply.Hresult:X8}"
|
|
: "none";
|
|
|
|
return $"MXAccess command failed. kind={reply.Kind}; hresult={hResult}; statuses={statusSummary}";
|
|
}
|
|
}
|