mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-28 22:55:49 +08:00
This PR implements the **OPC UA Device Integration (DI, OPC 10000-100)** companion-spec library trio (`Opc.Ua.Di` / `Opc.Ua.Di.Server` / `Opc.Ua.Di.Client`) plus a worked example (`Applications/MinimalPumpServer`) demonstrating the OPC 40223 Pumps companion specification end-to-end with full simulation. It also closes 11 fluent-API gaps in `Opc.Ua.Server.Fluent`, three source-generator bugs, integrates the DI layer into the unified `services.AddOpcUa()` Microsoft.Extensions DI hosting pattern, and adds 250+ new tests. **Worked example — `Applications/MinimalPumpServer/`** - AOT-compatible console host using `Host.CreateApplicationBuilder` + `AddOpcUa()`. - `PumpNodeManager` inherits from `DiNodeManager`; multi-namespace (DI + Machinery + Pumps) via runtime NodeSet2 loading and `ModelLoaderBuilder`. - Demonstrates declarative second-pump creation via `.ConfigureDevicesFor<PumpNodeManager>(...)` and software-package seeding from the same configurator. - Full simulation: pressure, temperatures, power, flow, efficiency, level, cavitation/overheat fault injection, alarm setup, NAMUR-style supervision. **Documentation** - `Docs/Opc.Ua.Di/` — README, DeviceBuilder, Hosting, LockService, SoftwareUpdate, ClientHelpers (6 new developer guides). - `Docs/Opc.Ua.Di/ComplianceMatrix.md` — every DI declaration mapped to In-v1 / Generated / Deferred / Excluded. - `Docs/CompanionSpecLibraries.md` — packaging guide for new companion-spec libraries. - `Docs/FluentApiGaps.md` — historical record of G1–G11. - `Docs/SourceGeneratedNodeManagers.md` updated for richer node managers. - `Docs/plans/StateMachineBuilder.md` — deferred state-machine builder design.
197 lines
8.9 KiB
C#
197 lines
8.9 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2025 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 Microsoft.Extensions.DependencyInjection.Extensions;
|
|
using Opc.Ua;
|
|
using Opc.Ua.Client;
|
|
using Opc.Ua.Di.Client;
|
|
using Opc.Ua.Di.Client.Hosting;
|
|
|
|
namespace Microsoft.Extensions.DependencyInjection
|
|
{
|
|
/// <summary>
|
|
/// <see cref="IOpcUaClientBuilder"/> extensions that register the
|
|
/// OPC UA Device Integration (DI, OPC 10000-100) client services
|
|
/// in the unified <c>AddOpcUa()</c> Microsoft.Extensions DI
|
|
/// hosting model.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Usage:
|
|
/// <code>
|
|
/// services.AddOpcUa()
|
|
/// .AddClient(o => { ... })
|
|
/// .AddOpcUaDi();
|
|
///
|
|
/// // Then inject IDiDiscoveryService or
|
|
/// // Func<NodeId, CancellationToken, ValueTask<DiDeviceClient>>
|
|
/// // into your application services.
|
|
/// </code>
|
|
/// <para>
|
|
/// Requires <c>AddClient(...)</c> to be called first — the
|
|
/// extension throws if the managed-session factory is missing.
|
|
/// </para>
|
|
/// </remarks>
|
|
public static class OpcUaClientDiBuilderExtensions
|
|
{
|
|
/// <summary>
|
|
/// Registers DI client services:
|
|
/// <list type="bullet">
|
|
/// <item>
|
|
/// <description>
|
|
/// <see cref="IDiDiscoveryService"/> — enumerates
|
|
/// DeviceType instances on the connected server.
|
|
/// </description>
|
|
/// </item>
|
|
/// <item>
|
|
/// <description>
|
|
/// <see cref="Func{T1, T2, TResult}"/> for
|
|
/// (<see cref="NodeId"/>,
|
|
/// <see cref="CancellationToken"/>) returning
|
|
/// <see cref="ValueTask{TResult}"/> of
|
|
/// <see cref="DiDeviceClient"/> — opens the lazy
|
|
/// session and creates a verified DiDeviceClient
|
|
/// rooted at the supplied NodeId.
|
|
/// </description>
|
|
/// </item>
|
|
/// </list>
|
|
/// </summary>
|
|
/// <param name="builder">The client builder.</param>
|
|
/// <returns>The same builder, for chaining.</returns>
|
|
/// <exception cref="ArgumentNullException">
|
|
/// <paramref name="builder"/> is null.
|
|
/// </exception>
|
|
public static IOpcUaClientBuilder AddOpcUaDi(this IOpcUaClientBuilder builder)
|
|
{
|
|
if (builder is null)
|
|
{
|
|
throw new ArgumentNullException(nameof(builder));
|
|
}
|
|
builder.Services.TryAddSingleton<IDiDiscoveryService>(sp =>
|
|
{
|
|
var accessor = sp.GetService<Func<CancellationToken, Task<ManagedSession>>>()
|
|
?? throw new InvalidOperationException(
|
|
"AddOpcUaDi() requires AddClient() to be called first. " +
|
|
"The managed-session factory was not registered.");
|
|
ITelemetryContext telemetry = sp.GetService<ITelemetryContext>()
|
|
?? throw new InvalidOperationException(
|
|
"AddOpcUaDi() requires an ITelemetryContext. " +
|
|
"AddClient() registers one by default.");
|
|
|
|
return new DiDiscoveryService(accessor, telemetry);
|
|
});
|
|
|
|
// Lazy factory: callers ask for a DiDeviceClient rooted at a NodeId;
|
|
// we open the managed session (or reuse it) and call ForDeviceAsync
|
|
// to validate the node exists.
|
|
builder.Services.TryAddSingleton<
|
|
Func<NodeId, CancellationToken, ValueTask<DiDeviceClient>>>(sp =>
|
|
{
|
|
var accessor = sp.GetService<Func<CancellationToken, Task<ManagedSession>>>()
|
|
?? throw new InvalidOperationException(
|
|
"AddOpcUaDi() requires AddClient() to be called first. " +
|
|
"The managed-session factory was not registered.");
|
|
ITelemetryContext telemetry = sp.GetService<ITelemetryContext>()
|
|
?? throw new InvalidOperationException(
|
|
"AddOpcUaDi() requires an ITelemetryContext.");
|
|
|
|
return async (NodeId deviceNodeId, CancellationToken ct) =>
|
|
{
|
|
ManagedSession session = await accessor(ct).ConfigureAwait(false);
|
|
return await DiDeviceClient
|
|
.ForDeviceAsync(session, deviceNodeId, telemetry, ct)
|
|
.ConfigureAwait(false);
|
|
};
|
|
});
|
|
|
|
// Lock client factory: callers supply the NodeId of a
|
|
// LockingServicesType instance; we open the session and
|
|
// wrap it in a DiLockClient.
|
|
builder.Services.TryAddSingleton<
|
|
Func<NodeId, CancellationToken, ValueTask<DiLockClient>>>(sp =>
|
|
{
|
|
var accessor = sp.GetService<Func<CancellationToken, Task<ManagedSession>>>()
|
|
?? throw new InvalidOperationException(
|
|
"AddOpcUaDi() requires AddClient() to be called first.");
|
|
ITelemetryContext telemetry = sp.GetService<ITelemetryContext>()
|
|
?? throw new InvalidOperationException(
|
|
"AddOpcUaDi() requires an ITelemetryContext.");
|
|
|
|
return async (NodeId lockNodeId, CancellationToken ct) =>
|
|
{
|
|
ManagedSession session = await accessor(ct).ConfigureAwait(false);
|
|
return new DiLockClient(session, lockNodeId, telemetry);
|
|
};
|
|
});
|
|
|
|
// Topology client: enumerates DeviceSet / NetworkSet /
|
|
// DeviceTopology folders. Constructed lazily on first use.
|
|
builder.Services.TryAddSingleton<
|
|
Func<CancellationToken, ValueTask<DiTopologyClient>>>(sp =>
|
|
{
|
|
var accessor = sp.GetService<Func<CancellationToken, Task<ManagedSession>>>()
|
|
?? throw new InvalidOperationException(
|
|
"AddOpcUaDi() requires AddClient() to be called first.");
|
|
ITelemetryContext telemetry = sp.GetService<ITelemetryContext>()
|
|
?? throw new InvalidOperationException(
|
|
"AddOpcUaDi() requires an ITelemetryContext.");
|
|
|
|
return async (CancellationToken ct) =>
|
|
{
|
|
ManagedSession session = await accessor(ct).ConfigureAwait(false);
|
|
return new DiTopologyClient(session, telemetry);
|
|
};
|
|
});
|
|
|
|
// SoftwareUpdate client factory: callers supply a NodeId of
|
|
// a SoftwareUpdateType instance on the server.
|
|
builder.Services.TryAddSingleton<
|
|
Func<NodeId, CancellationToken, ValueTask<SoftwareUpdateClient>>>(sp =>
|
|
{
|
|
var accessor = sp.GetService<Func<CancellationToken, Task<ManagedSession>>>()
|
|
?? throw new InvalidOperationException(
|
|
"AddOpcUaDi() requires AddClient() to be called first.");
|
|
ITelemetryContext telemetry = sp.GetService<ITelemetryContext>()
|
|
?? throw new InvalidOperationException(
|
|
"AddOpcUaDi() requires an ITelemetryContext.");
|
|
|
|
return async (NodeId softwareUpdateNodeId, CancellationToken ct) =>
|
|
{
|
|
ManagedSession session = await accessor(ct).ConfigureAwait(false);
|
|
return new SoftwareUpdateClient(session, softwareUpdateNodeId, telemetry);
|
|
};
|
|
});
|
|
|
|
return builder;
|
|
}
|
|
}
|
|
}
|