mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-27 13:10:37 +08:00
Introduces a consistent `Microsoft.Extensions.DependencyInjection`
surface across the OPC UA libraries. Every consumer starts from a single
root entry point and chains feature-specific extension methods on a
unified builder. PubSub is intentionally excluded per the original
scope.
```csharp
services
.AddOpcUa() // Stack/Opc.Ua.Core
.AddServer(o => { /* … */ }) // Libraries/Opc.Ua.Server
.AddNodeManager<MyNodeManagerFactory>()
.Services
.AddOpcUa()
.AddClient(o => { /* … */ }); // Libraries/Opc.Ua.Client
```
Manual non-DI constructors (`new ApplicationInstance(...)`, `new
StandardServer(...)`, `new LdsServer(...)`, `new ManagedSession(...)`,
etc.) remain unchanged — DI is purely additive for users who want the
.NET Generic Host to own application lifetime, logging, and
configuration.
### What ships
| Feature library | Method on `IOpcUaBuilder` | Returns |
|----------------------------------------------|-------------------------------------------|--------------------------|
| `Opc.Ua.Core` (root) | `services.AddOpcUa()` | `IOpcUaBuilder` |
| `Opc.Ua.Configuration` | `builder.AddApplicationInstance()` |
`IOpcUaBuilder` |
| `Opc.Ua.Client` | `builder.AddClient(opt => …)` |
`IOpcUaClientBuilder` |
| `Opc.Ua.Client.ComplexTypes` | `builder.AddComplexTypes()` |
`IOpcUaBuilder` |
| `Opc.Ua.Server` | `builder.AddServer(opt => …)` |
`IOpcUaServerBuilder` |
| `Opc.Ua.Gds.Client.Common` | `builder.AddGdsClient(opt => …)` |
`IGdsClientBuilder` |
| `Opc.Ua.Gds.Server.Common` | `builder.AddGdsServer(opt => …)` |
`IGdsServerBuilder` |
| `Opc.Ua.Lds.Server` | `builder.AddLdsServer(opt => …)` |
`ILdsServerBuilder` |
| `Opc.Ua.WotCon.Server` | `builder.AddWotConServer(opt => …)` |
`IWotConServerBuilder` |
| `Opc.Ua.WotCon.Client` | `builder.AddWotConClient(opt => …)` |
`IOpcUaBuilder` |
### Design highlights
- **Binary-safe inheritance** — `IOpcUaBuilder :
IDependencyInjectionBuilder` so any existing `AddLogging(this
IDependencyInjectionBuilder)` callers keep compiling unchanged.
- **Three options overloads** per feature: `Action<TOptions>`
(AOT-safe), `IConfiguration`, `IConfigurationSection`. The two binding
overloads are annotated `[RequiresUnreferencedCode]` /
`[RequiresDynamicCode]`. Section names follow the `OpcUa:<Feature>`
convention (`OpcUa:Server`, `OpcUa:Client`, `OpcUa:Gds:Server`,
`OpcUa:Lds`, …).
- **Generic Host integration** — each server feature (regular, GDS, LDS)
registers its own `BackgroundService`. Marker singletons throw
`InvalidOperationException` on duplicate `.AddServer()` /
`.AddGdsServer()` / `.AddLdsServer()`. A regular server + GDS + LDS can
coexist in one host; each owns its own `IApplicationInstance` produced
by a shared `IApplicationInstanceFactory` so PKI roots, endpoints, and
certificates don't collide.
- **Registration isolation** — node managers registered under the
regular server via `.AddNodeManager<T>()` are wrapped in
`OpcUaServerNodeManagerRegistration` so they don't bleed into the GDS /
LDS hosted services.
- **WoT Connectivity server** composes on top of the regular server
feature: `.AddServer(...).AddWotConServer(...)` registers
`WotConnectivityNodeManagerFactory` as a server node-manager
registration.
- **Unified telemetry** — `services.AddOpcUa()` registers
`ITelemetryContext` via `TryAddSingleton` using a new
`ServiceProviderTelemetryContext` that resolves the host's
`ILoggerFactory` on first use. User-supplied registrations win.
### Removed pre-release DI surface
The pre-release `services.AddOpcUaServer(...)`,
`services.AddOpcUaClient(...)`, `services.AddOpcUaGdsClient(...)`
extensions are deleted. `IClientBuilder` was renamed to
`IOpcUaClientBuilder`. In-repo callers migrated:
- `Applications/MinimalCalcServer/Program.cs`
- `Applications/MinimalBoilerServer/Program.cs`
- `Tests/Opc.Ua.Client.Tests/ClientBuilder/OpcUaClientBuilderTests.cs`
(renamed from `OpcUaClientServiceCollectionExtensionsTests.cs`)
- Docs (`MigrationGuide.md`, `Sessions.md`,
`SourceGeneratedNodeManagers.md`, README, new
`Docs/DependencyInjection.md`)
### csproj audit
Pruned every redundant `Microsoft.Extensions.*` package reference.
`Opc.Ua.Core` already pulls in `Microsoft.Extensions.Diagnostics` and
`Microsoft.Extensions.Logging`, which transitively expose DI / Options /
Configuration.Abstractions / Options.ConfigurationExtensions to every
downstream library. Only `Microsoft.Extensions.Hosting.Abstractions`
stays explicit on the server libraries (it isn't transitively
available). Also pruned redundant `System.Formats.Asn1` (Bindings.Https)
and `System.Collections.Immutable` (Security.Certificates).
### Tests
50 new tests in eight projects:
| Project | Tests |
|--------------------------------------|-------|
| `Opc.Ua.Core.Tests` | 12 |
| `Opc.Ua.Client.Tests` | 4 |
| `Opc.Ua.Client.ComplexTypes.Tests` | 3 |
| `Opc.Ua.WotCon.Tests` | 6 |
| `Opc.Ua.Lds.Tests` | 5 |
| `Opc.Ua.Gds.Tests` | 6 |
| `Opc.Ua.Server.Tests` (integration) | 10 |
| `Opc.Ua.Aot.Tests` (smoke) | 4 |
| **Total** | **50** |
Combined-host integration tests cover the rubber-duck-driven scenarios:
telemetry-context override across legacy and new entry paths, server +
GDS + LDS coexistence with distinct ports and PKI roots,
duplicate-registration rejection, and node-manager isolation across
features.
### AOT
`dotnet publish Tests/Opc.Ua.Aot.Tests -c Release -r win-x64
--self-contained` reports zero `IL2026` / `IL3050` / `IL2104` warnings
from the new DI surface. All generic registrations carry
`[DynamicallyAccessedMembers(PublicConstructors)]`. AOT consumers stick
to the `Action<TOptions>` overload exclusively; the new
`Tests/Opc.Ua.Aot.Tests/HostingAotTests.cs` smoke fixture exercises this
end-to-end.
130 lines
5.7 KiB
C#
130 lines
5.7 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.Collections.Generic;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Opc.Ua.Configuration;
|
|
|
|
#nullable enable
|
|
|
|
namespace Opc.Ua.Lds.Server.Hosting
|
|
{
|
|
/// <summary>
|
|
/// Options for an OPC UA Local Discovery Server (LDS / LDS-ME) hosted
|
|
/// by the .NET Generic Host via
|
|
/// <see cref="OpcUaLdsServerBuilderExtensions.AddLdsServer(IOpcUaBuilder, Action{LdsServerOptions})"/>.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Only the most common knobs are exposed directly. Use
|
|
/// <see cref="ConfigureBuilder"/> for full control of the underlying
|
|
/// <see cref="IApplicationConfigurationBuilder"/> chain (security policies,
|
|
/// transport quotas, custom security stores, etc.).
|
|
/// </remarks>
|
|
public sealed class LdsServerOptions
|
|
{
|
|
/// <summary>
|
|
/// Application name. Used as the default for the certificate subject
|
|
/// common-name and the PKI root path when those are not set explicitly.
|
|
/// </summary>
|
|
public string ApplicationName { get; set; } = "LdsServer";
|
|
|
|
/// <summary>
|
|
/// Application URI (e.g. <c>urn:localhost:UA:LocalDiscoveryServer</c>).
|
|
/// Required.
|
|
/// </summary>
|
|
public string ApplicationUri { get; set; } = string.Empty;
|
|
|
|
/// <summary>
|
|
/// Product URI (e.g. <c>uri:opcfoundation.org:LocalDiscoveryServer</c>).
|
|
/// Required.
|
|
/// </summary>
|
|
public string ProductUri { get; set; } = string.Empty;
|
|
|
|
/// <summary>
|
|
/// Optional explicit certificate subject. When not set, defaults to
|
|
/// <c>CN={ApplicationName}, O=OPC Foundation, DC=localhost</c>.
|
|
/// </summary>
|
|
public string SubjectName { get; set; } = string.Empty;
|
|
|
|
/// <summary>
|
|
/// Listen URLs. Per OPC 10000-12 the canonical LDS endpoint is
|
|
/// <c>opc.tcp://{host}:4840</c>; tests typically use ephemeral ports.
|
|
/// Mutated in place by <c>options.EndpointUrls.Add(...)</c>.
|
|
/// </summary>
|
|
public IList<string> EndpointUrls { get; } = [];
|
|
|
|
/// <summary>
|
|
/// Filesystem root used for the certificate stores. When empty, defaults
|
|
/// to <c>%TEMP%/OPC Foundation/{ApplicationName}/pki</c>.
|
|
/// </summary>
|
|
public string PkiRoot { get; set; } = string.Empty;
|
|
|
|
/// <summary>
|
|
/// Whether unknown peer certificates are auto-accepted. Convenient for
|
|
/// quickstart samples; do not enable in production.
|
|
/// </summary>
|
|
public bool AutoAcceptUntrustedCertificates { get; set; }
|
|
|
|
/// <summary>
|
|
/// When <c>true</c> (the default) and the platform supports it, the
|
|
/// hosted LDS announces itself via mDNS (LDS-ME, OPC 10000-12 §6.4.6)
|
|
/// using <see cref="MulticastDiscovery"/>. Disable on platforms
|
|
/// without multicast support or in test environments.
|
|
/// </summary>
|
|
public bool EnableMulticast { get; set; } = true;
|
|
|
|
/// <summary>
|
|
/// Restrict the multicast announcer to the loopback NIC. Intended
|
|
/// for in-process tests where the LDS-ME traffic must stay local.
|
|
/// Ignored when <see cref="EnableMulticast"/> is <c>false</c>.
|
|
/// </summary>
|
|
public bool MulticastLoopbackOnly { get; set; }
|
|
|
|
/// <summary>
|
|
/// Extra server capabilities to advertise. Each entry is appended
|
|
/// via <c>IApplicationConfigurationBuilderServerOptions.AddServerCapabilities</c>
|
|
/// and surfaces in <see cref="ServerConfiguration.ServerCapabilities"/>.
|
|
/// The hosted LDS always adds <c>LDS</c> (and <c>LDS-ME</c> when
|
|
/// multicast is enabled) per OPC 10000-12 Annex D; entries here are
|
|
/// additive. Mutated in place by
|
|
/// <c>options.ServerCapabilities.Add(...)</c>.
|
|
/// </summary>
|
|
public IList<string> ServerCapabilities { get; } = [];
|
|
|
|
/// <summary>
|
|
/// Optional escape hatch invoked after the standard configuration steps
|
|
/// (transport quotas, server policies, security configuration) but
|
|
/// before <c>CreateAsync</c>. Use it to add bespoke security policies,
|
|
/// override quotas, or add custom security stores.
|
|
/// </summary>
|
|
public Action<IApplicationConfigurationBuilderServerSelected>? ConfigureBuilder { get; set; }
|
|
}
|
|
}
|