Joseph Doherty
560b327ee1
v2-ci / build (push) Failing after 33s
v2-ci / unit-tests (tests/Core/ZB.MOM.WW.OtOpcUa.Cluster.Tests) (push) Has been skipped
v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests) (push) Has been skipped
v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests) (push) Has been skipped
v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests) (push) Has been skipped
v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Security.Tests) (push) Has been skipped
v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests) (push) Has been skipped
v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.IntegrationTests) (push) Has been skipped
Imports the freshly-rebuilt ZB.MOM.WW.MxGateway.Client + ZB.MOM.WW.MxGateway.Contracts nupkgs (0.1.0) from /tmp/mxgw-dist. Replaces the vendored libs/ DLLs and the pre-restructure MxGateway.* namespaces across the runtime Galaxy driver, Galaxy.Browser, and their tests. Key changes: - nuget-packages/ added as a local feed via NuGet.config; .gitignore exempts it from the *.nupkg rule so the packages are tracked - Directory.Packages.props pins both packages at 0.1.0 - 4 csprojs swap <Reference HintPath="libs/...dll"/> for <PackageReference/> - 36 .cs files renamed `using MxGateway.*` -> `using ZB.MOM.WW.MxGateway.*` - libs/ removed (vendored DLLs + README.md) GalaxyBrowseSession rewritten around the new lazy API: - RootAsync calls GalaxyRepositoryClient.BrowseAsync (returns LazyBrowseNodes) and caches them by TagName instead of bulk-fetching the whole hierarchy - ExpandAsync looks up the cached LazyBrowseNode and calls its ExpandAsync, giving true one-wire-call-per-click instead of in-memory parent/child scan - _byGobjectId + _hasChildrenSet dropped (LazyBrowseNode carries HasChildrenHint) - AttributesAsync unchanged (already uses DiscoverHierarchyAsync MaxDepth=0) Tests: Galaxy.Tests 245/245, Galaxy.Browser.Tests 10/10, AdminUI.Tests 66/66. Pre-existing 12 solution errors unchanged (test sinks + Cli XML comments).
57 lines
2.7 KiB
C#
57 lines
2.7 KiB
C#
using Google.Protobuf.WellKnownTypes;
|
|
using ZB.MOM.WW.MxGateway.Contracts.Proto;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Runtime;
|
|
|
|
/// <summary>
|
|
/// Translates gateway-side <see cref="MxValue"/> instances into the boxed CLR objects
|
|
/// <c>DataValueSnapshot.Value</c> carries. Mirrors the seven Galaxy data types in
|
|
/// <c>DataTypeMap</c> (Boolean, Int32, Int64, Float32, Float64, String, DateTime), plus
|
|
/// the array variants exposed by <see cref="MxArray"/>. Unknown / awkward values fall
|
|
/// back to the <c>raw_value</c> bytes so a forward-compatible MXAccess deployment
|
|
/// doesn't lose data on the wire — the consumer can opt to deserialise the bytes.
|
|
/// </summary>
|
|
internal static class MxValueDecoder
|
|
{
|
|
/// <summary>Decodes a gateway MxValue into a boxed CLR object.</summary>
|
|
/// <param name="value">The MxValue to decode, or null.</param>
|
|
public static object? Decode(MxValue? value)
|
|
{
|
|
if (value is null) return null;
|
|
if (value.IsNull) return null;
|
|
|
|
return value.KindCase switch
|
|
{
|
|
MxValue.KindOneofCase.BoolValue => value.BoolValue,
|
|
MxValue.KindOneofCase.Int32Value => value.Int32Value,
|
|
MxValue.KindOneofCase.Int64Value => value.Int64Value,
|
|
MxValue.KindOneofCase.FloatValue => value.FloatValue,
|
|
MxValue.KindOneofCase.DoubleValue => value.DoubleValue,
|
|
MxValue.KindOneofCase.StringValue => value.StringValue,
|
|
MxValue.KindOneofCase.TimestampValue => DecodeTimestamp(value.TimestampValue),
|
|
MxValue.KindOneofCase.ArrayValue => DecodeArray(value.ArrayValue),
|
|
MxValue.KindOneofCase.RawValue => value.RawValue.ToByteArray(),
|
|
_ => null,
|
|
};
|
|
}
|
|
|
|
private static DateTime? DecodeTimestamp(Timestamp? ts) => ts?.ToDateTime();
|
|
|
|
private static object? DecodeArray(MxArray? array)
|
|
{
|
|
if (array is null) return null;
|
|
|
|
return array.ValuesCase switch
|
|
{
|
|
MxArray.ValuesOneofCase.BoolValues => array.BoolValues.Values.ToArray(),
|
|
MxArray.ValuesOneofCase.Int32Values => array.Int32Values.Values.ToArray(),
|
|
MxArray.ValuesOneofCase.Int64Values => array.Int64Values.Values.ToArray(),
|
|
MxArray.ValuesOneofCase.FloatValues => array.FloatValues.Values.ToArray(),
|
|
MxArray.ValuesOneofCase.DoubleValues => array.DoubleValues.Values.ToArray(),
|
|
MxArray.ValuesOneofCase.StringValues => array.StringValues.Values.ToArray(),
|
|
MxArray.ValuesOneofCase.TimestampValues => array.TimestampValues.Values.Select(t => t.ToDateTime()).ToArray(),
|
|
_ => null,
|
|
};
|
|
}
|
|
}
|