Files
Marc Schier e73e71184d [WotCon] Add OPC UA WoT Connectivity 1.1 with the Types, source generation, Server and xRegistry work it builds on (#4128)
## Summary

Adds OPC UA WoT Connectivity 1.1 to the stack, together with the Types,
source generation, Server and xRegistry work it is built on. This branch
is the merge point for the fourteen-PR stack that replaced integration
PR #4093; every constituent PR was reviewed and approved separately and
is listed below.

414 files changed, +108,936 / -3,199. Roughly 46k added lines of product
code, 57k of tests, plus samples, tools and documentation.

## Types

- Complete `ExtensionObject` raw-body decoding for binary, XML and JSON
bodies by resolving the concrete type through the message context's
encodeable factory, and simplify the `Variant` structure helpers by
delegating to it (#4128).
- Add `IAtomicFileReplace` as an optional `IFileSystem` capability so
existing external implementations keep working, with atomic publish for
`LocalFileSystem` via `File.Replace`/`File.Move` and for
`VirtualFileSystem` by re-keying the in-memory entry (#4128).
- Add lossless conversion between WoT documents and NodeSet2
(`Opc.Ua.Wot.WotNodeSetConverter`). A byte-exact `uav:nodeSet` envelope
is preserved when requested, the structured `uav:nodes` projection is
used when the readable vocabulary is incomplete, and NodeSet2 is
otherwise synthesized from readable WoT terms. Unmapped JSON members
survive a round trip as pointer-addressed residue (#4131).

## Source generation

- Improve the NodeSet to ModelDesign conversion and the generated node
state (#4132).
- Generate OPC UA models directly from WoT Thing Description files
(#4134).

## Server

- Add live NodeManager shadow and immediate reload. A reload
materializes a new generation beside the active one and switches
atomically; the superseded generation is retired gracefully so existing
MonitoredItems keep being served until they drain, or immediately when
the caller asks for it. Includes the request admission and drain
machinery that lets an orderly shutdown wait for admitted requests
instead of tearing down underneath them (#4147).
- Make subscription transfer between sessions transactional, so a failed
transfer leaves neither session holding a partially moved subscription
(#4150).

## xRegistry

- Allow clients to use explicit registry roots rather than assuming a
well-known location (#4130).

## WoT Connectivity

- Add the WoT Connectivity 1.1 information model: a registry-first
revision layered on the abstract xRegistry base model, incorporating the
complete published OPC 10100-1 v1.02 surface as deprecated nodes in the
same namespace so existing 1.02 clients keep working (#4139).
- Add the protocol binding abstractions and planners that compile WoT
forms into executable plans (#4140).
- Add the HTTP, Modbus, OPC UA and MQTT binding executors (#4144).
- Add the registry and its stores, including document versioning,
validation, dependency resolution and refresh (#4146).
- Add the registry client (#4142).
- Materialize WoT Thing Descriptions into the server address space,
deriving types from Thing Models and instances from Thing Descriptions
(#4154).
- Restore the WoT asset registry bridge so the deprecated 1.02 asset
surface is backed by the registry (#4171).
- Add the WoT Connectivity samples and complete the documentation
(#4156), and restore the remaining coverage and docs (#4172).

## New projects

`src/Opc.Ua.WotCon.Bindings`, `src/Opc.Ua.WotCon.Bindings.Mqtt`,
`tests/Opc.Ua.WotCon.Bindings.Tests`,
`tests/Opc.Ua.WotCon.Samples.Tests`, and the `samples/WotCon`
AggregationServer, AggregationClient and FlatTagServer samples.

## Constituent pull requests

Merged into this branch top-down, each independently approved:

| PR | Title |
| --- | --- |
| #4128 | [Types] Complete ExtensionObject decoding and add an atomic
file replace capability |
| #4131 | [Types] Add lossless conversion between WoT documents and
NodeSet2 |
| #4132 | [SourceGeneration] Improve NodeSet to ModelDesign conversion
and generated node state |
| #4134 | [SourceGeneration] Generate OPC UA models from WoT Thing
Description files |
| #4147 | [Server] Add live NodeManager shadow and immediate reload |
| #4150 | [Server] Make subscription transfer between sessions
transactional |
| #4130 | [XRegistry] Allow clients to use explicit registry roots |
| #4139 | [WotCon] Add the WoT Connectivity 1.1 information model |
| #4140 | [WotCon] Add the WoT protocol binding abstractions and
planners |
| #4144 | [WotCon] Add the HTTP, Modbus, OPC UA and MQTT binding
executors |
| #4146 | [WotCon] Add the WoT Connectivity registry and its stores |
| #4142 | [WotCon] Add the WoT Connectivity registry client |
| #4154 | [WotCon] Materialize WoT Thing Descriptions into the server
address space |
| #4156 | [WotCon] Add the WoT Connectivity samples and complete the
documentation |
| #4171 | Restore WoT asset registry bridge |
| #4172 | Restore WoT coverage and docs |

Supersedes #4093.

## Follow-up

The WoT Connectivity and WoT Binding drafts have moved to 1.1-draft2
since this work was authored. Aligning with that revision - the removed
group vocabulary, the new projection/View construct, the remaining model
vocabulary terms and the two new portable-identity validation rules - is
tracked separately and will follow in its own pull request.

## Validation

Built for every target framework with zero warnings and zero errors, and
validated at the tip of the stack with `Opc.Ua.WotCon.Tests` at 999
passed / 0 failed and `Opc.Ua.Server.Tests` at 4024 passed / 0 failed.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 9e6a5abf-3299-4cd1-9855-010fedbf0ad8
2026-08-05 10:14:15 +02:00

505 lines
21 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.Collections.Generic;
using System.IO;
using System.Text;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Opc.Ua;
using Opc.Ua.Client;
using Opc.Ua.WotCon;
using Opc.Ua.WotCon.Client;
namespace AggregationClient
{
/// <summary>
/// Executes the real sample loader and reader workflow in process.
/// </summary>
public static class AggregationClientRunner
{
/// <summary>
/// Builds the client host used by the workflow.
/// </summary>
public static IHost BuildHost(AggregationClientOptions options)
{
Validate(options);
HostApplicationBuilder builder = Host.CreateApplicationBuilder();
builder.Logging.ClearProviders();
builder.Logging.AddConsole();
builder.Logging.SetMinimumLevel(LogLevel.Warning);
builder.Services
.AddOpcUa()
.AddOpcTcpTransport()
.AddClient(client =>
{
client.ApplicationName = options.ApplicationName;
client.ApplicationUri =
$"urn:localhost:OPCFoundation:{options.ApplicationName}";
client.ProductUri = "uri:opcfoundation.org:AggregationClient";
if (!string.IsNullOrWhiteSpace(options.PkiRoot))
{
client.PkiRoot = options.PkiRoot;
}
client.AutoAcceptUntrustedCertificates = true;
client.Session = new ManagedSessionOptions
{
SessionName = "AggregationClient",
SessionTimeout = TimeSpan.FromSeconds(60)
};
})
.AddDiscoveryAndConnect(discovery =>
{
discovery.DiscoveryUrl = options.AggregationEndpoint;
discovery.SecurityMode = MessageSecurityMode.None;
discovery.SecurityPolicyUri = SecurityPolicies.None;
})
.AddWotRegistryClient();
return builder.Build();
}
/// <summary>
/// Loads the four documents, refreshes the registry and reads the Pump.
/// </summary>
public static async Task<AggregationClientResult> RunAsync(
AggregationClientOptions options,
CancellationToken cancellationToken = default)
{
using IHost host = BuildHost(options);
await host.StartAsync(cancellationToken).ConfigureAwait(false);
try
{
Func<CancellationToken, Task<ManagedSession>> connect =
host.Services.GetRequiredService<
Func<CancellationToken, Task<ManagedSession>>>();
ManagedSession session = await connect(cancellationToken).ConfigureAwait(false);
await using (session.ConfigureAwait(false))
{
session.MessageContext.NamespaceUris.Update(
session.NamespaceUris.ToArray());
Func<ManagedSession, CancellationToken, Task<WotRegistryClient>> createClient =
host.Services.GetRequiredService<
Func<ManagedSession, CancellationToken, Task<WotRegistryClient>>>();
WotRegistryClient client = await createClient(session, cancellationToken)
.ConfigureAwait(false);
ArrayOf<WotRegistryDocument> documents = await LoadDocumentsAsync(
options,
cancellationToken).ConfigureAwait(false);
WotRegistryBulkLoadResult loadResult = await client.LoadDocumentsAsync(
documents,
refresh: true,
requestId: Guid.NewGuid().ToString("N"),
ct: cancellationToken).ConfigureAwait(false);
EnsureRefreshSucceeded(loadResult);
await session.FetchNamespaceTablesAsync(cancellationToken).ConfigureAwait(false);
session.MessageContext.NamespaceUris.Update(
session.NamespaceUris.ToArray());
NodeId pumpNodeId = ResolvePumpNodeId(session);
ArrayOf<WotPumpBrowseNode> browsedNodes = await BrowsePumpAsync(
session,
pumpNodeId,
cancellationToken).ConfigureAwait(false);
ArrayOf<WotPumpValueResult> values = await ReadPumpValuesAsync(
session,
cancellationToken).ConfigureAwait(false);
return new AggregationClientResult(loadResult, browsedNodes, values);
}
}
finally
{
await host.StopAsync(cancellationToken).ConfigureAwait(false);
}
}
private static async ValueTask<ArrayOf<WotRegistryDocument>> LoadDocumentsAsync(
AggregationClientOptions options,
CancellationToken cancellationToken)
{
string manifestPath = Path.Combine(options.DocumentsDirectory, "documents.json");
string manifestText = await ReadTextAsync(manifestPath, cancellationToken)
.ConfigureAwait(false);
using var manifest = JsonDocument.Parse(manifestText);
var entries = new List<ManifestEntry>();
foreach (JsonElement item in manifest.RootElement.EnumerateArray())
{
var dependencies = new List<string>();
foreach (JsonElement dependency in item.GetProperty("dependsOn").EnumerateArray())
{
dependencies.Add(dependency.GetString() ??
throw new InvalidDataException("A dependency id is required."));
}
entries.Add(new ManifestEntry(
item.GetProperty("documentKind").GetString() ??
throw new InvalidDataException("Document kind is required."),
item.GetProperty("groupId").GetString() ??
throw new InvalidDataException("Group id is required."),
item.GetProperty("path").GetString() ??
throw new InvalidDataException("Document path is required."),
item.GetProperty("resourceId").GetString() ??
throw new InvalidDataException("Resource id is required."),
dependencies));
}
List<ManifestEntry> ordered = OrderByDependencies(entries);
var documents = new WotRegistryDocument[ordered.Count];
for (int i = 0; i < ordered.Count; i++)
{
ManifestEntry entry = ordered[i];
string content = await ReadTextAsync(
Path.Combine(options.DocumentsDirectory, entry.Path),
cancellationToken).ConfigureAwait(false);
WoTDocumentKindEnum kind = ParseKind(entry.DocumentKind);
if (kind == WoTDocumentKindEnum.ThingDescription &&
string.Equals(entry.Path, "SamplePump.td.json", StringComparison.Ordinal))
{
#if NET8_0_OR_GREATER
content = content
.Replace(
"${SOURCE_A_ENDPOINT}",
options.SourceAEndpoint,
StringComparison.Ordinal)
.Replace(
"${SOURCE_B_ENDPOINT}",
options.SourceBEndpoint,
StringComparison.Ordinal);
#else
content = content
.Replace("${SOURCE_A_ENDPOINT}", options.SourceAEndpoint)
.Replace("${SOURCE_B_ENDPOINT}", options.SourceBEndpoint);
#endif
}
documents[i] = new WotRegistryDocument(
kind,
entry.GroupId,
entry.ResourceId,
ByteString.From(Encoding.UTF8.GetBytes(content)));
}
return new ArrayOf<WotRegistryDocument>(documents);
}
private static void EnsureRefreshSucceeded(WotRegistryBulkLoadResult loadResult)
{
WotRegistryRefreshResult refresh = loadResult.Refresh ??
throw new InvalidOperationException("The registry refresh did not run.");
if (!refresh.HasFailures)
{
return;
}
var details = new List<string>();
foreach (WoTResourceLoadResultDataType resource in refresh.Results)
{
if (resource.Outcome is WoTOutcomeEnum.Failed or WoTOutcomeEnum.Rejected)
{
details.Add(
$"{resource.ResourceId}: {resource.Phase}/{resource.Outcome}: " +
resource.Message);
}
}
throw new ServiceResultException(
StatusCodes.BadUnexpectedError,
string.Join("; ", details));
}
private static List<ManifestEntry> OrderByDependencies(List<ManifestEntry> entries)
{
var byId = new Dictionary<string, ManifestEntry>(StringComparer.Ordinal);
foreach (ManifestEntry entry in entries)
{
if (!byId.TryAdd(entry.ResourceId, entry))
{
throw new InvalidDataException(
$"Duplicate resource id '{entry.ResourceId}' in documents.json.");
}
}
var ordered = new List<ManifestEntry>(entries.Count);
var completed = new HashSet<string>(StringComparer.Ordinal);
while (ordered.Count < entries.Count)
{
bool progressed = false;
foreach (ManifestEntry entry in entries)
{
if (completed.Contains(entry.ResourceId) ||
!DependenciesSatisfied(entry, completed, byId))
{
continue;
}
ordered.Add(entry);
completed.Add(entry.ResourceId);
progressed = true;
}
if (!progressed)
{
throw new InvalidDataException(
"documents.json contains a missing or cyclic dependency.");
}
}
return ordered;
}
private static bool DependenciesSatisfied(
ManifestEntry entry,
HashSet<string> completed,
Dictionary<string, ManifestEntry> byId)
{
foreach (string dependency in entry.DependsOn)
{
if (!byId.ContainsKey(dependency) || !completed.Contains(dependency))
{
return false;
}
}
return true;
}
private static WoTDocumentKindEnum ParseKind(string kind)
{
return kind switch
{
"ThingModel" => WoTDocumentKindEnum.ThingModel,
"ThingDescription" => WoTDocumentKindEnum.ThingDescription,
_ => throw new InvalidDataException($"Unsupported document kind '{kind}'.")
};
}
private static NodeId ResolvePumpNodeId(ManagedSession session)
{
const string pumpNamespace =
"urn:opcfoundation.org:UA:WotAggregation:PumpInstance";
ushort namespaceIndex = ResolveRequiredNamespaceIndex(
session.NamespaceUris,
pumpNamespace);
return new NodeId("Pump1", namespaceIndex);
}
private static async ValueTask<ArrayOf<WotPumpBrowseNode>> BrowsePumpAsync(
ManagedSession session,
NodeId pumpNodeId,
CancellationToken cancellationToken)
{
var browser = new Browser(session)
{
BrowseDirection = BrowseDirection.Forward,
NodeClassMask = (uint)NodeClass.Object | (uint)NodeClass.Variable,
ReferenceTypeId = Opc.Ua.ReferenceTypeIds.HierarchicalReferences,
IncludeSubtypes = true
};
var pending = new Queue<NodeId>();
var visited = new HashSet<NodeId>();
var nodes = new List<WotPumpBrowseNode>();
pending.Enqueue(pumpNodeId);
visited.Add(pumpNodeId);
while (pending.Count > 0)
{
NodeId parent = pending.Dequeue();
ArrayOf<ReferenceDescription> references = await browser.BrowseAsync(
parent,
cancellationToken).ConfigureAwait(false);
foreach (ReferenceDescription reference in references)
{
var nodeId = ExpandedNodeId.ToNodeId(
reference.NodeId,
session.NamespaceUris);
nodes.Add(new WotPumpBrowseNode(
nodeId,
reference.BrowseName,
reference.DisplayName,
reference.NodeClass));
if (reference.NodeClass == NodeClass.Object && visited.Add(nodeId))
{
pending.Enqueue(nodeId);
}
}
}
return nodes.ToArray().ToArrayOf();
}
private static async ValueTask<ArrayOf<WotPumpValueResult>> ReadPumpValuesAsync(
ManagedSession session,
CancellationToken cancellationToken)
{
const string pumpNamespace =
"urn:opcfoundation.org:UA:WotAggregation:PumpInstance";
ushort namespaceIndex = ResolveRequiredNamespaceIndex(
session.NamespaceUris,
pumpNamespace);
(string Name, string Path)[] definitions =
[
("DifferentialPressure", "Operational.Measurements.DifferentialPressure"),
("FluidTemperature", "Operational.Measurements.FluidTemperature"),
("BearingTemperature", "Operational.Measurements.BearingTemperature"),
("PumpPowerInput", "Operational.Measurements.PumpPowerInput"),
("MassFlow", "Operational.Measurements.MassFlow"),
("PumpEfficiency", "Operational.Measurements.PumpEfficiency"),
("Level", "Operational.Measurements.Level"),
("NumberOfStarts", "Operational.Measurements.NumberOfStarts"),
("Cavitation", "Events.SupervisionProcessFluid.Cavitation"),
("MotorOverheat", "Events.SupervisionPumpOperation.MotorOverheat")
];
var nodesToRead = new ReadValueId[definitions.Length];
for (int i = 0; i < definitions.Length; i++)
{
nodesToRead[i] = new ReadValueId
{
NodeId = new NodeId($"Pump1.{definitions[i].Path}", namespaceIndex),
AttributeId = Attributes.Value
};
}
ReadResponse response = await session.ReadAsync(
null,
0,
TimestampsToReturn.Both,
new ArrayOf<ReadValueId>(nodesToRead),
cancellationToken).ConfigureAwait(false);
var values = new WotPumpValueResult[definitions.Length];
for (int i = 0; i < definitions.Length; i++)
{
DataValue value = response.Results[i];
if (StatusCode.IsBad(value.StatusCode))
{
throw new ServiceResultException(
value.StatusCode,
$"Reading materialized Pump value '{definitions[i].Name}' failed.");
}
values[i] = new WotPumpValueResult(
definitions[i].Name,
nodesToRead[i].NodeId,
value.StatusCode,
value.WrappedValue);
}
return new ArrayOf<WotPumpValueResult>(values);
}
private static ushort ResolveRequiredNamespaceIndex(
NamespaceTable namespaceUris,
string namespaceUri)
{
int namespaceIndex = namespaceUris.GetIndex(namespaceUri);
if (namespaceIndex < 0)
{
throw new ServiceResultException(
StatusCodes.BadNodeIdUnknown,
$"The materialized namespace '{namespaceUri}' is not present on the server.");
}
return checked((ushort)namespaceIndex);
}
private static async Task<string> ReadTextAsync(
string path,
CancellationToken cancellationToken)
{
using var stream = new FileStream(
path,
FileMode.Open,
FileAccess.Read,
FileShare.Read,
4096,
useAsync: true);
if (stream.Length > int.MaxValue)
{
throw new IOException($"Document '{path}' is too large.");
}
byte[] bytes = new byte[(int)stream.Length];
int offset = 0;
while (offset < bytes.Length)
{
#if NET8_0_OR_GREATER
int read = await stream.ReadAsync(
bytes.AsMemory(offset, bytes.Length - offset),
cancellationToken).ConfigureAwait(false);
#else
int read = await stream.ReadAsync(
bytes,
offset,
bytes.Length - offset,
cancellationToken).ConfigureAwait(false);
#endif
if (read == 0)
{
throw new EndOfStreamException($"Document '{path}' ended unexpectedly.");
}
offset += read;
}
return Encoding.UTF8.GetString(bytes);
}
private static void Validate(AggregationClientOptions options)
{
if (options is null)
{
throw new ArgumentNullException(nameof(options));
}
if (string.IsNullOrWhiteSpace(options.AggregationEndpoint) ||
string.IsNullOrWhiteSpace(options.SourceAEndpoint) ||
string.IsNullOrWhiteSpace(options.SourceBEndpoint) ||
string.IsNullOrWhiteSpace(options.DocumentsDirectory))
{
throw new ArgumentException("All client endpoint and document options are required.");
}
}
private sealed class ManifestEntry
{
public ManifestEntry(
string documentKind,
string groupId,
string path,
string resourceId,
List<string> dependsOn)
{
DocumentKind = documentKind;
GroupId = groupId;
Path = path;
ResourceId = resourceId;
DependsOn = dependsOn;
}
public string DocumentKind { get; }
public string GroupId { get; }
public string Path { get; }
public string ResourceId { get; }
public List<string> DependsOn { get; }
}
}
}