mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-20 16:52:07 +08:00
e73e71184d
## 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
191 lines
6.0 KiB
C#
191 lines
6.0 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 Opc.Ua;
|
|
using Opc.Ua.WotCon.Client;
|
|
|
|
namespace AggregationClient
|
|
{
|
|
/// <summary>
|
|
/// Configures the reusable aggregation loader and reader workflow.
|
|
/// </summary>
|
|
public sealed class AggregationClientOptions
|
|
{
|
|
/// <summary>
|
|
/// Gets or sets the aggregation server endpoint.
|
|
/// </summary>
|
|
public string AggregationEndpoint { get; set; } =
|
|
"opc.tcp://localhost:62550/AggregationServer";
|
|
|
|
/// <summary>
|
|
/// Gets or sets the Source A endpoint substituted into the Pump TD.
|
|
/// </summary>
|
|
public string SourceAEndpoint { get; set; } =
|
|
"opc.tcp://localhost:62551/SourceA";
|
|
|
|
/// <summary>
|
|
/// Gets or sets the Source B endpoint substituted into the Pump TD.
|
|
/// </summary>
|
|
public string SourceBEndpoint { get; set; } =
|
|
"opc.tcp://localhost:62552/SourceB";
|
|
|
|
/// <summary>
|
|
/// Gets or sets the OPC UA application name.
|
|
/// </summary>
|
|
public string ApplicationName { get; set; } = "AggregationClient";
|
|
|
|
/// <summary>
|
|
/// Gets or sets the isolated PKI root.
|
|
/// </summary>
|
|
public string? PkiRoot { get; set; }
|
|
|
|
/// <summary>
|
|
/// Gets or sets the directory containing documents.json and its documents.
|
|
/// </summary>
|
|
public string DocumentsDirectory { get; set; } =
|
|
System.IO.Path.Combine(System.AppContext.BaseDirectory, "Documents");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Result of loading, refreshing, browsing and reading the aggregate Pump.
|
|
/// </summary>
|
|
public sealed class AggregationClientResult
|
|
{
|
|
/// <summary>
|
|
/// Initializes a result.
|
|
/// </summary>
|
|
public AggregationClientResult(
|
|
WotRegistryBulkLoadResult loadResult,
|
|
ArrayOf<WotPumpBrowseNode> browsedNodes,
|
|
ArrayOf<WotPumpValueResult> values)
|
|
{
|
|
LoadResult = loadResult;
|
|
BrowsedNodes = browsedNodes;
|
|
Values = values;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets the document load and refresh result.
|
|
/// </summary>
|
|
public WotRegistryBulkLoadResult LoadResult { get; }
|
|
|
|
/// <summary>
|
|
/// Gets the recursively browsed Pump nodes.
|
|
/// </summary>
|
|
public ArrayOf<WotPumpBrowseNode> BrowsedNodes { get; }
|
|
|
|
/// <summary>
|
|
/// Gets the values read from the materialized Pump.
|
|
/// </summary>
|
|
public ArrayOf<WotPumpValueResult> Values { get; }
|
|
}
|
|
|
|
/// <summary>
|
|
/// Describes one node found while browsing the materialized Pump.
|
|
/// </summary>
|
|
public sealed class WotPumpBrowseNode
|
|
{
|
|
/// <summary>
|
|
/// Initializes a browse result.
|
|
/// </summary>
|
|
public WotPumpBrowseNode(
|
|
NodeId nodeId,
|
|
QualifiedName browseName,
|
|
LocalizedText displayName,
|
|
NodeClass nodeClass)
|
|
{
|
|
NodeId = nodeId;
|
|
BrowseName = browseName;
|
|
DisplayName = displayName;
|
|
NodeClass = nodeClass;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets the node id.
|
|
/// </summary>
|
|
public NodeId NodeId { get; }
|
|
|
|
/// <summary>
|
|
/// Gets the browse name.
|
|
/// </summary>
|
|
public QualifiedName BrowseName { get; }
|
|
|
|
/// <summary>
|
|
/// Gets the display name.
|
|
/// </summary>
|
|
public LocalizedText DisplayName { get; }
|
|
|
|
/// <summary>
|
|
/// Gets the node class.
|
|
/// </summary>
|
|
public NodeClass NodeClass { get; }
|
|
}
|
|
|
|
/// <summary>
|
|
/// Contains one materialized Pump value.
|
|
/// </summary>
|
|
public sealed class WotPumpValueResult
|
|
{
|
|
/// <summary>
|
|
/// Initializes a value result.
|
|
/// </summary>
|
|
public WotPumpValueResult(
|
|
string name,
|
|
NodeId nodeId,
|
|
StatusCode statusCode,
|
|
Variant value)
|
|
{
|
|
Name = name;
|
|
NodeId = nodeId;
|
|
StatusCode = statusCode;
|
|
Value = value;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets the stable property name.
|
|
/// </summary>
|
|
public string Name { get; }
|
|
|
|
/// <summary>
|
|
/// Gets the materialized node id.
|
|
/// </summary>
|
|
public NodeId NodeId { get; }
|
|
|
|
/// <summary>
|
|
/// Gets the read status.
|
|
/// </summary>
|
|
public StatusCode StatusCode { get; }
|
|
|
|
/// <summary>
|
|
/// Gets the read value.
|
|
/// </summary>
|
|
public Variant Value { get; }
|
|
}
|
|
}
|