mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 22:55:08 +08:00
01d6b5d26c
> Tracking issue #4576. #4577 is merged, so this branch is rebased onto > `master` and contains only the Machinery commits. ## Summary Second of four stacked PRs. Adds the OPC UA for Machinery series as model packages plus a server and a client SDK, following the companion pattern of DI and Robotics, and the two models it depends on that the repository does not carry yet. | Package | Content | |---|---| | `Opc.Ua.IA` | OPC 10000-200 IA 1.01.4, **moved out of `Opc.Ua.Robotics`** (see below) | | `Opc.Ua.ECM` | OPC 34100 Energy Consumption Management 1.0.1 | | `Opc.Ua.PADIM` | OPC 30081 PA-DIM 1.02.0 with the IRDI dictionary | | `Opc.Ua.Machinery` | OPC 40001-1 Basic Building Blocks 1.04.1 | | `Opc.Ua.Machinery.ProcessValues` | OPC 40001-2 Process Values 1.00.0 | | `Opc.Ua.Machinery.Jobs` | OPC 40001-3 Job Management 1.0.1 | | `Opc.Ua.Machinery.Energy` | OPC 40001-4 Energy 1.00 | | `Opc.Ua.Machinery.Result` | OPC 40001-101 Result Transfer 1.01.0 | | `Opc.Ua.Machinery.Server` | `AddMachinery()` / `ConfigureMachinery(...)`, fluent machine builder, server-driven state machines, process values, job management over the shared ISA-95 V2 binder, energy, result management incl. `GenerateFileForRead` | | `Opc.Ua.Machinery.Client` | machine discovery, identification, state observation, process values, job and result access | OPC 40001-101 `ResultTransferType` redeclares `GenerateFileForRead` with its own arguments; the generator fix for such overrides, merged with #4577, is what makes it appear on the `ResultTransfer` instances. All NodeSets are byte-identical to `UA-Nodeset/latest`. Each model carries a pinned `Model/*.NodeIds.csv` the generator validates, next to the unmodified upstream table; `tools/nodesets/derive-identifier-table.py` derives the former from the latter. ## Changes to existing code - **IA moves out of Robotics.** Machinery needs IA as well (OPC 40001-1 types `Stacklight` with `BasicStacklightType`), and two assemblies generating the same model under the same prefix collide at any consumer referencing both. The NodeSet moves verbatim, so no generated type changes; the prefix stays `Opc.Ua.IA`. Source-compatible, but IA types now live in `Opc.Ua.IA.dll` rather than `Opc.Ua.Robotics.dll` — binary-breaking for consumers of the Robotics package. - **`samples/OpenUsd/GeneratorServer`** drops its hand-reduced Machinery NodeSet copy and the script that produced it (a workaround for the generator defect fixed by #4577) and references `Opc.Ua.Machinery` instead. - `README.md` and `docs/README.md` list the new models; the README also corrects the Industrial Automation entry (Part 200, not OPC 40001-1). ## Review follow-ups Separate commits after the docs/samples commit, so the reviewed state stays comparable. Each fix comes with a test that fails without it. - Copilot review: a transition is committed only while the state machine is still in its source state; optional Jobs/Result namespaces the server does not load are reported as absent, as documented; resources of registered machines (result transfer, job-management change pumps) are released with the node manager (`DisposeMachineryResourcesAsync` for a custom DI manager); `NodeId`/`LocalizedText` use their null sentinels instead of `Nullable<T>`. - Own review with the rubric in `.github/copilot-instructions.md`: a failed browse call propagates from the client instead of reading as "no children"; the predefined result metadata compares `CreationTime` against the `DateTimeUtc` sentinels (the `DateTime` conversion shifted `DateTime.MaxValue` by the host's UTC offset); process values below `Monitoring` are found; a second metering point named `Main` is rejected; the zero-point event is reported when the handler throws; smaller state-sharing and documentation corrections. ## Testing - `tests/Opc.Ua.Machinery.Tests`: 162 tests on net8 and net10 and with the netstandard2.1 libraries; the integration tests connect a real client session over `opc.tcp` to a hosted server. - With IA extracted: Robotics 636, OpenUsd 921, DI 433 and SourceGeneration 263 tests pass. - `UA.slnx` builds for net472, net48, netstandard2.0/2.1 and net8/9/10 with SDK 10.0.401 and no warnings. - Changed-line coverage of this layer (`check-coverage.ps1`): 91.68 % (6059 of 6609 changed lines, against `master`). - Fork CI, full PR matrix incl. macOS, on the current master: green, all 184 jobs ([run 36582685653](https://github.com/biancode/UA-.NETStandard/actions/runs/36582685653)). CodeQL: green ([run 36582689589](https://github.com/biancode/UA-.NETStandard/actions/runs/36582689589)). - Beyond the in-repo tests the implementation has been validated end to end against a separate, non-public OPC UA client and server. ## Reviewing Commits are ordered so each builds: IA extraction → identifier-table tool → ECM/PA-DIM → Machinery models → server → client → tests → docs/samples → GeneratorServer sample → review follow-ups. The model commits are large only because of the NodeSets and identifier tables; the hand-written code starts at the server commit. --------- Co-authored-by: Marc Schier <marcschier@users.noreply.github.com>
187 lines
7.9 KiB
C#
187 lines
7.9 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.IO;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Opc.Ua;
|
|
using Opc.Ua.Client;
|
|
using Opc.Ua.Client.Subscriptions.Streaming;
|
|
using Opc.Ua.Configuration;
|
|
|
|
namespace MachinerySample.Client
|
|
{
|
|
/// <summary>
|
|
/// Connects a demo session. Certificate handling is deliberately the
|
|
/// minimum that lets the sample run against its own server.
|
|
/// </summary>
|
|
internal sealed class SampleSession : IAsyncDisposable
|
|
{
|
|
private SampleSession(
|
|
ManagedSession session,
|
|
ApplicationInstance application)
|
|
{
|
|
Session = session;
|
|
m_application = application;
|
|
}
|
|
|
|
public ManagedSession Session { get; }
|
|
|
|
public IStreamingSubscription Streaming => Session.DefaultStreaming;
|
|
|
|
public static async Task<SampleSession> ConnectAsync(
|
|
MachineryClientOptions options,
|
|
ITelemetryContext telemetry,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
string pkiRoot = GetPrivateStateRoot();
|
|
var configuration = new ApplicationConfiguration(telemetry)
|
|
{
|
|
ApplicationName = "MachineryClient",
|
|
ApplicationUri = "urn:localhost:OPCFoundation:MachineryClient",
|
|
ApplicationType = ApplicationType.Client,
|
|
SecurityConfiguration = new SecurityConfiguration
|
|
{
|
|
ApplicationCertificate = new CertificateIdentifier
|
|
{
|
|
StoreType = CertificateStoreType.Directory,
|
|
StorePath = Path.Combine(pkiRoot, "own"),
|
|
SubjectName = "CN=MachineryClient, O=OPC Foundation"
|
|
},
|
|
TrustedIssuerCertificates = new CertificateTrustList
|
|
{
|
|
StoreType = CertificateStoreType.Directory,
|
|
StorePath = Path.Combine(pkiRoot, "issuer")
|
|
},
|
|
TrustedPeerCertificates = new CertificateTrustList
|
|
{
|
|
StoreType = CertificateStoreType.Directory,
|
|
StorePath = Path.Combine(pkiRoot, "trusted")
|
|
},
|
|
RejectedCertificateStore = new CertificateTrustList
|
|
{
|
|
StoreType = CertificateStoreType.Directory,
|
|
StorePath = Path.Combine(pkiRoot, "rejected")
|
|
},
|
|
AutoAcceptUntrustedCertificates = options.Insecure
|
|
},
|
|
TransportQuotas = new TransportQuotas { MaxMessageSize = 8 * 1024 * 1024 },
|
|
ClientConfiguration = new ClientConfiguration(),
|
|
ServerConfiguration = new ServerConfiguration()
|
|
};
|
|
await configuration.ValidateAsync(ApplicationType.Client, cancellationToken)
|
|
.ConfigureAwait(false);
|
|
|
|
var appInstance = new ApplicationInstance(configuration, telemetry);
|
|
await appInstance
|
|
.CheckApplicationInstanceCertificatesAsync(true, ct: cancellationToken)
|
|
.ConfigureAwait(false);
|
|
// The application instance owns the certificate manager the
|
|
// session validates with, so it lives as long as the session and
|
|
// is disposed with it. Disposing it here would leave the session
|
|
// with a disposed CertificateManager and every connect attempt
|
|
// failing with ObjectDisposedException.
|
|
configuration.CertificateManager ??= CertificateManagerFactory.Create(
|
|
configuration.SecurityConfiguration,
|
|
telemetry);
|
|
if (options.Insecure)
|
|
{
|
|
configuration.CertificateManager.AcceptError = static (_, _) => true;
|
|
Console.Error.WriteLine(
|
|
"WARNING: --insecure is demo-only: any server certificate is accepted.");
|
|
}
|
|
|
|
try
|
|
{
|
|
EndpointDescription? endpointDescription = await CoreClientUtils.SelectEndpointAsync(
|
|
configuration,
|
|
options.ServerUrl,
|
|
useSecurity: true,
|
|
discoverTimeout: 15000,
|
|
telemetry,
|
|
cancellationToken).ConfigureAwait(false);
|
|
if (endpointDescription is null)
|
|
{
|
|
throw ServiceResultException.Create(
|
|
StatusCodes.BadTimeout,
|
|
"Could not reach {0}.",
|
|
options.ServerUrl);
|
|
}
|
|
|
|
var endpoint = new ConfiguredEndpoint(
|
|
null,
|
|
endpointDescription,
|
|
EndpointConfiguration.Create(configuration));
|
|
ManagedSession session = await new ManagedSessionBuilder(configuration, telemetry)
|
|
.UseEndpoint(endpoint)
|
|
.WithSessionName("MachineryClient")
|
|
.WithSessionTimeout(TimeSpan.FromSeconds(60))
|
|
.WithUserIdentity(new UserIdentity(new AnonymousIdentityToken()))
|
|
.ConnectAsync(cancellationToken).ConfigureAwait(false);
|
|
return new SampleSession(session, appInstance);
|
|
}
|
|
catch
|
|
{
|
|
await appInstance.DisposeAsync().ConfigureAwait(false);
|
|
throw;
|
|
}
|
|
}
|
|
|
|
public async ValueTask DisposeAsync()
|
|
{
|
|
// Tear the streaming subscription down while the channel is still
|
|
// open, so removing its monitored items does not race the close.
|
|
await Streaming.DisposeAsync().ConfigureAwait(false);
|
|
await Session.CloseAsync(CancellationToken.None).ConfigureAwait(false);
|
|
await Session.DisposeAsync().ConfigureAwait(false);
|
|
await m_application.DisposeAsync().ConfigureAwait(false);
|
|
}
|
|
|
|
private static string GetPrivateStateRoot()
|
|
{
|
|
string baseDirectory = Environment.GetFolderPath(
|
|
Environment.SpecialFolder.LocalApplicationData);
|
|
if (string.IsNullOrEmpty(baseDirectory))
|
|
{
|
|
baseDirectory = AppContext.BaseDirectory;
|
|
}
|
|
string root = Path.Combine(
|
|
baseDirectory,
|
|
"OPC Foundation",
|
|
"MachineryClient",
|
|
"pki");
|
|
Directory.CreateDirectory(root);
|
|
return root;
|
|
}
|
|
|
|
private readonly ApplicationInstance m_application;
|
|
}
|
|
}
|