mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 14:43:08 +08:00
0374e19121
# Description _Describe the changes here to communicate to the maintainers why they should accept this pull request. By default - this will become the Commit message after merging and thus define history._ Add provider-backed MachineTool, bundled WMTP, GMS and CranesHoists companions using the existing Machinery/MachineVision fluent, DI and typed-client approach. **The PR is open/non-draft by user choice. Current head `ecc4a7d6ca3e8004cf28ab54da605da302d026bf` is mergeable and has 108 successful checks, six intentionally skipped checks, zero failures and zero pending checks. All five primary workflows completed successfully at that exact head.** | Family | Released specification/model | Packaging | | --- | --- | --- | | MachineTool | OPC 40501-1, 1.02.0 | Model, Server, Client and MCP; normal root versions | | WMTP | OPC 40505, 1.0.0 | Bundled in MachineTool; distinct CLR/wire namespace and independent WMTP-only hosting | | GMS | OPC 40210 reference 1.0.1, normative model 1.0.0 | Model, Server, Client and MCP; normal root versions | | CranesHoists | OPC 40020-1, 1.00 | Model, Server, Client and MCP; all four plus Debug variants forced preview | There are **12 new packable projects**. No separate WMTP package/profile/guide, root version bump, tag, release or package publication is included. Mandatory instance structure is the default; selected optional features require explicit providers. The implementation reuses Machinery results/jobs/files/ProcessValues and Robotics topology, including retained MachineTool Production, defined GMS jobs/parts, modern ISA95/Machinery jobs, shared-owner hosting and isolated instances alongside MachineVision. Runtime and integration fixes preserve raw quality/timestamps, coherent acquisition, namespace ownership, accepted-configuration state, borrowed-resource lifetime, session/node/file cleanup, terminal-value publication, event propagation and endpoint-aware capability publication. Firmware/licence transfer means provider acceptance, not installation/activation. Cancellation does not silently abort another caller's operation. The later upstream MCP expansion is integrated without losing either family set or its default-off privileged/live execution policy. ### Conformance and scope Canonical model inputs are pinned to UA-Nodeset revision `96a08945425d0295edb3607d2a38f6841ef44046`. **GMS upstream exception:** [Annex A.1](https://reference.opcfoundation.org/specs/OPC-40210/annex-a) makes the released NodeSet normative, but §12.3.2.7 requires undefined `GMS_ProductionStatisticsType`. Inherited statistics and defined jobs/parts are implemented without inventing a standard type/NodeId; the complete GMS Production facet is withheld. The requirement ledger records **102 positively evidenced CU rows, 96 directly negative-tested rows and six explicit negative-evidence limitations**. All 648 test-class/name/TRX links were independently resolved to passing cases. The six limitations concern Stacklight, retained legacy PowerOnDuration, Machinery PowerOnDuration, WorkingUnit, Obligation and MaintenanceMode. They are not claims that every invalid-input or hardware-control behavior was tested. The undefined GMS requirement is outside the 102 defined CUs. No external certification claim is made. Retained baseline complete-assembly line coverage, with generated code retained and no source exclusions: | Family | Model | Server | Client | | --- | ---: | ---: | ---: | | MachineTool/WMTP | 83.80% | 91.98% | 84.74% | | GMS | 95.51% | 90.63% | 88.38% | | CranesHoists | 92.76% | 94.45% | 92.24% | These nine measurements predate the later focused review fixes and merges; they are not relabelled as new `ecc4a7d6c` percentages. The current head's separate CI code-coverage check succeeded. No new exclusions or threshold relaxations were introduced. ## Related Issues - Fixes [#4764](https://github.com/OPCFoundation/UA-.NETStandard/issues/4764), the implementation/design and acceptance tracker. ## Checklist _Put an `x` in the boxes that apply. You can complete these step by step after opening the PR._ - [ ] I have signed the [CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf) and read the [CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md) doc. - [x] I have added tests that prove my fix is effective or that my feature works and increased code coverage. - [x] I have added all necessary documentation. - [ ] I have verified that my changes do not introduce (new) build or analyzer warnings. - [ ] I ran **all** tests locally using the **UA.slnx** solution against at least .net **framework** and .net **10**, and all passed. - [ ] I fixed **all** failing and flaky tests in the CI pipelines and **all** CodeQL warnings. - [x] I have addressed **all** PR feedback received.
246 lines
12 KiB
C#
246 lines
12 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2026 The OPC Foundation, Inc. All rights reserved.
|
|
*
|
|
* OPC Foundation MIT License 1.00
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use,
|
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following
|
|
* conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* The complete license agreement can be found here:
|
|
* http://opcfoundation.org/License/MIT/1.00/
|
|
* ======================================================================*/
|
|
|
|
using System;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Opc.Ua;
|
|
using Opc.Ua.Client;
|
|
using Opc.Ua.Client.Subscriptions;
|
|
using Opc.Ua.Client.Subscriptions.Streaming;
|
|
using Opc.Ua.GMS;
|
|
using Opc.Ua.GMS.Client;
|
|
using Opc.Ua.GMS.Contracts;
|
|
using Opc.Ua.MachineTool;
|
|
using SubscriptionOptions = Opc.Ua.Client.Subscriptions.SubscriptionOptions;
|
|
|
|
namespace GmsSample.Client
|
|
{
|
|
/// <summary>
|
|
/// Owns finite data, event, condition-refresh and typed intermediate-result observations.
|
|
/// </summary>
|
|
internal static class GmsObservation
|
|
{
|
|
/// <summary>
|
|
/// Reuses bounded library collectors and verifies that their temporary subscriptions are removed.
|
|
/// </summary>
|
|
/// <exception cref="InvalidOperationException">
|
|
/// Managed subscriptions or their cleanup are unavailable.
|
|
/// </exception>
|
|
internal static async Task RunAsync(
|
|
GmsClient client, GmsDeviceEntry entry, GmsClientArguments options, CancellationToken cancellationToken)
|
|
{
|
|
if (!client.Session.TryGetSubscriptionManager(out ISubscriptionManager? manager))
|
|
{
|
|
throw new InvalidOperationException("The managed GMS session has no subscription manager.");
|
|
}
|
|
int before = manager.Count;
|
|
var bounds = new MachineToolObservationOptions
|
|
{
|
|
Window = TimeSpan.FromSeconds(options.Seconds),
|
|
MaximumNotifications = options.Count
|
|
};
|
|
try
|
|
{
|
|
MachineToolDataObservation data = await client.ObserveDataAsync(entry.NodeId, bounds, cancellationToken)
|
|
.ConfigureAwait(false);
|
|
long bytes = 0;
|
|
foreach (MachineToolObservedValue change in data.Changes)
|
|
{
|
|
bytes += Measure(client, Variant.From(change.Value));
|
|
Console.WriteLine($"DATA node={change.NodeId} sequence={change.SequenceNumber}");
|
|
GmsReader.PrintValue("notification", change.Value);
|
|
}
|
|
Console.WriteLine(
|
|
$"OBSERVED_DATA {entry.BrowseName} count={data.Changes.Count} bytes={bytes} maximumBytes=1048576 " +
|
|
$"limitReached={data.LimitReached} dropped={data.DroppedNotifications}");
|
|
if (options.Events)
|
|
{
|
|
MachineToolEventObservation conditions = await client.ObserveConditionsAsync(
|
|
entry.NodeId, bounds, cancellationToken).ConfigureAwait(false);
|
|
PrintEvents(client, "CONDITIONS", conditions);
|
|
MachineToolEventObservation events = await client.ObserveEventsAsync(
|
|
entry.NodeId, bounds, cancellationToken).ConfigureAwait(false);
|
|
PrintEvents(client, "EVENTS", events);
|
|
if (options.Characteristic != null)
|
|
{
|
|
await ObserveIntermediateAsync(client, entry, options, manager, false, cancellationToken)
|
|
.ConfigureAwait(false);
|
|
}
|
|
}
|
|
if (options.VerifyCleanup)
|
|
{
|
|
await ObserveIntermediateAsync(client, entry, options, manager, true, cancellationToken)
|
|
.ConfigureAwait(false);
|
|
}
|
|
}
|
|
finally
|
|
{
|
|
Console.WriteLine(
|
|
$"OBSERVATION_CLEANUP before={before} after={manager.Count} connected={client.Session.Connected}");
|
|
}
|
|
if (manager.Count != before)
|
|
{
|
|
throw new InvalidOperationException("A GMS observation retained a temporary subscription.");
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Displays decoded native environmental warnings alongside unmodified event identities and raw fields.
|
|
/// </summary>
|
|
private static void PrintEvents(GmsClient client, string label, MachineToolEventObservation observation)
|
|
{
|
|
long bytes = 0;
|
|
foreach (MachineToolObservedEvent notification in observation.Events)
|
|
{
|
|
Console.WriteLine(
|
|
$"EVENT id={notification.Event.EventId} type={notification.Event.EventType} " +
|
|
$"source={notification.Event.SourceNode} time={notification.Event.Time}");
|
|
var fields = new Variant[notification.Fields.Count];
|
|
for (int index = 0; index < fields.Length; index++)
|
|
{
|
|
fields[index] = notification.Fields[index].Value;
|
|
}
|
|
bytes += Measure(client, Variant.From(ArrayOf.Wrapped(fields)));
|
|
if (notification.Event is SensorWarningAlarmTypeRecord warning)
|
|
{
|
|
Console.WriteLine(
|
|
$"SENSOR_WARNING condition={warning.ConditionId} input={warning.InputNode} " +
|
|
$"source={warning.SourceNode} error={warning.ErrorCode} retain={warning.Retain}; " +
|
|
"environmental measurement, not primary probe qualification.");
|
|
foreach (MachineToolEventField field in notification.Fields)
|
|
{
|
|
Console.WriteLine($" WARNING_FIELD path={field.BrowsePath} raw={field.Value}");
|
|
}
|
|
}
|
|
}
|
|
Console.WriteLine(
|
|
$"OBSERVED_{label} count={observation.Events.Count} bytes={bytes} maximumBytes=1048576 " +
|
|
$"limitReached={observation.LimitReached} dropped={observation.DroppedNotifications} " +
|
|
$"refreshCompleted={observation.RefreshCompleted}");
|
|
if (observation.Events.IsEmpty)
|
|
{
|
|
Console.WriteLine("No matching events in this bounded observation; not a hardware all-clear claim.");
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Distinguishes server-side subscription readiness from empty-window expiry and delivered cancellation.
|
|
/// </summary>
|
|
/// <exception cref="TimeoutException">The finite deadline expired before monitored-item creation.</exception>
|
|
/// <exception cref="InvalidOperationException">
|
|
/// The explicitly requested cancellation was not delivered.
|
|
/// </exception>
|
|
private static async Task ObserveIntermediateAsync(
|
|
GmsClient client, GmsDeviceEntry entry, GmsClientArguments options, ISubscriptionManager manager,
|
|
bool cancelOnReady, CancellationToken cancellationToken)
|
|
{
|
|
using var window = new CancellationTokenSource(TimeSpan.FromSeconds(options.Seconds));
|
|
using var running = CancellationTokenSource.CreateLinkedTokenSource(window.Token, cancellationToken);
|
|
var streaming = new StreamingSubscription(manager,
|
|
new SubscriptionOptions { PublishingInterval = TimeSpan.FromMilliseconds(100) });
|
|
bool ready = false;
|
|
bool cancelled = false;
|
|
int count = 0;
|
|
await using (streaming.ConfigureAwait(false))
|
|
{
|
|
ArrayOf<QualifiedName> selection = options.Characteristic == null
|
|
? []
|
|
: [new QualifiedName(options.Characteristic, entry.NodeId.NamespaceIndex)];
|
|
GmsResultClient results = client.GetResults(entry.NodeId, GmsResultReader.Limits(options));
|
|
try
|
|
{
|
|
await foreach (GmsIntermediateResultNotification notification in
|
|
results.ObserveIntermediateResultsAsync(streaming, options.Count, OnReady,
|
|
selection, running.Token).ConfigureAwait(false))
|
|
{
|
|
count++;
|
|
Console.WriteLine(
|
|
$"INTERMEDIATE event={notification.Event.EventId} type={notification.Event.EventType} " +
|
|
$"program={notification.Event.ProgramName} time={notification.Event.Time}");
|
|
foreach (GmsCharacteristicEventValues characteristic in notification.Characteristics)
|
|
{
|
|
Console.WriteLine(
|
|
$"CHARACTERISTIC {characteristic.Name} id={characteristic.Identifier} " +
|
|
$"value={characteristic.ResultValue} units={characteristic.EngineeringUnits} " +
|
|
$"nominal={characteristic.Nominal} lower={characteristic.LowerTolerance} " +
|
|
$"upper={characteristic.UpperTolerance} " +
|
|
$"lowerForm={characteristic.LowerToleranceForm} " +
|
|
$"upperForm={characteristic.UpperToleranceForm} " +
|
|
$"class={characteristic.CharacteristicsClass} " +
|
|
$"evaluation={characteristic.Evaluation} valid={characteristic.IsValid} " +
|
|
$"formula={characteristic.Formula}");
|
|
}
|
|
}
|
|
}
|
|
catch (OperationCanceledException) when (running.IsCancellationRequested &&
|
|
!cancellationToken.IsCancellationRequested)
|
|
{
|
|
if (!ready)
|
|
{
|
|
throw new TimeoutException("Intermediate observation expired before server-side readiness.");
|
|
}
|
|
cancelled = cancelOnReady;
|
|
Console.WriteLine(cancelOnReady
|
|
? "EXPECTED_OBSERVATION_CANCELLATION after monitored-item creation."
|
|
: "INTERMEDIATE_WINDOW_COMPLETE: only received notifications are reported.");
|
|
}
|
|
if (cancelOnReady && !cancelled)
|
|
{
|
|
throw new InvalidOperationException("Expected observation cancellation was not delivered.");
|
|
}
|
|
}
|
|
Console.WriteLine(
|
|
$"INTERMEDIATE_COMPLETE ready={ready} count={count} maximum={options.Count} " +
|
|
$"maximumMetadataBytes=131072 dropped={streaming.DroppedNotificationCount} " +
|
|
"ownedSubscription=disposed eventFieldsHaveNoInventedDataValueQuality=true");
|
|
|
|
ValueTask OnReady(CancellationToken _)
|
|
{
|
|
ready = true;
|
|
Console.WriteLine($"INTERMEDIATE_READY system={entry.BrowseName} cancellationCheck={cancelOnReady}");
|
|
if (cancelOnReady)
|
|
{
|
|
running.Cancel();
|
|
}
|
|
return default;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Reports actual encoded payload sizes within the shared collectors' one-mebibyte bound.
|
|
/// </summary>
|
|
private static int Measure(GmsClient client, in Variant value)
|
|
{
|
|
var limits = new GmsResultLimits { MaximumMetadataBytes = 1024 * 1024 };
|
|
return limits.Measure(value, client.Session.MessageContext);
|
|
}
|
|
}
|
|
}
|