mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-20 00:31:32 +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
358 lines
12 KiB
C#
358 lines
12 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 System.Xml;
|
|
using Opc.Ua.Schema.Model;
|
|
|
|
namespace Opc.Ua.SourceGeneration
|
|
{
|
|
/// <summary>
|
|
/// Resolves the effective method argument metadata used by generators.
|
|
/// </summary>
|
|
internal static class MethodDesignArgumentResolver
|
|
{
|
|
/// <summary>
|
|
/// Resolves the effective input arguments for a method design.
|
|
/// </summary>
|
|
public static Parameter[] ResolveMethodInputs(MethodDesign method)
|
|
{
|
|
return ResolveMethodArguments(method).Inputs;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Resolves the effective output arguments for a method design.
|
|
/// </summary>
|
|
public static Parameter[] ResolveMethodOutputs(MethodDesign method)
|
|
{
|
|
return ResolveMethodArguments(method).Outputs;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Resolves the effective input and output arguments for a method design.
|
|
/// </summary>
|
|
public static (Parameter[] Inputs, Parameter[] Outputs) ResolveMethodArguments(
|
|
MethodDesign method)
|
|
{
|
|
if (method == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(method));
|
|
}
|
|
|
|
MethodDesign definition = ResolveMethodDefinition(method);
|
|
Parameter[] inputs = ResolveArguments(
|
|
definition.InputArguments,
|
|
definition.MethodDeclarationNode?.InputArguments,
|
|
definition.MethodType?.InputArguments);
|
|
Parameter[] outputs = ResolveArguments(
|
|
definition.OutputArguments,
|
|
definition.MethodDeclarationNode?.OutputArguments,
|
|
definition.MethodType?.OutputArguments);
|
|
return (inputs, outputs);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns whether a method or one of its declaration/type links defines arguments.
|
|
/// </summary>
|
|
public static bool HasMethodArguments(MethodDesign method)
|
|
{
|
|
if (method == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(method));
|
|
}
|
|
|
|
MethodDesign definition = ResolveMethodDefinition(method);
|
|
return method.HasArguments ||
|
|
definition.HasArguments ||
|
|
HasDeclaredArguments(definition);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns whether the method directly declares any arguments.
|
|
/// </summary>
|
|
public static bool HasDeclaredArguments(MethodDesign method)
|
|
{
|
|
if (method == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(method));
|
|
}
|
|
|
|
return method.InputArguments is { Length: > 0 } ||
|
|
method.OutputArguments is { Length: > 0 };
|
|
}
|
|
|
|
/// <summary>
|
|
/// Resolves the method design that owns the effective method state and
|
|
/// argument metadata.
|
|
/// </summary>
|
|
public static MethodDesign ResolveMethodDefinition(MethodDesign method)
|
|
{
|
|
if (method == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(method));
|
|
}
|
|
|
|
return ResolveMethodDefinition(method, []);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Resolves the qualified identity used to name the generated method
|
|
/// state class.
|
|
/// </summary>
|
|
public static XmlQualifiedName ResolveMethodStateIdentity(MethodDesign method)
|
|
{
|
|
if (method == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(method));
|
|
}
|
|
|
|
if (method.TypeDefinition != null && method.MethodType == null)
|
|
{
|
|
return method.TypeDefinition;
|
|
}
|
|
|
|
MethodDesign definition = ResolveMethodDefinition(method);
|
|
return definition.TypeDefinition ??
|
|
definition.SymbolicName ??
|
|
definition.SymbolicId ??
|
|
method.SymbolicName ??
|
|
method.SymbolicId;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns whether two methods have identical effective signatures.
|
|
/// </summary>
|
|
public static bool HaveSameMethodSignature(
|
|
MethodDesign first,
|
|
MethodDesign second)
|
|
{
|
|
if (first == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(first));
|
|
}
|
|
if (second == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(second));
|
|
}
|
|
|
|
return HaveSameSignature(
|
|
ResolveMethodInputs(first),
|
|
ResolveMethodOutputs(first),
|
|
ResolveMethodInputs(second),
|
|
ResolveMethodOutputs(second));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns whether two methods directly declare identical signatures.
|
|
/// </summary>
|
|
public static bool HaveSameDeclaredSignature(
|
|
MethodDesign first,
|
|
MethodDesign second)
|
|
{
|
|
if (first == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(first));
|
|
}
|
|
if (second == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(second));
|
|
}
|
|
|
|
return HaveSameSignature(
|
|
first.InputArguments ?? [],
|
|
first.OutputArguments ?? [],
|
|
second.InputArguments ?? [],
|
|
second.OutputArguments ?? []);
|
|
}
|
|
|
|
private static MethodDesign ResolveMethodDefinition(
|
|
MethodDesign method,
|
|
List<MethodDesign> visited)
|
|
{
|
|
if (ContainsReference(visited, method))
|
|
{
|
|
return method;
|
|
}
|
|
visited.Add(method);
|
|
|
|
bool hasDeclaredArguments = HasDeclaredArguments(method);
|
|
if (method.MethodType != null &&
|
|
DelegatesTo(method, method.MethodType, hasDeclaredArguments))
|
|
{
|
|
return ResolveMethodDefinition(method.MethodType, visited);
|
|
}
|
|
|
|
if (method.MethodDeclarationNode != null &&
|
|
!ReferenceEquals(method.MethodDeclarationNode, method) &&
|
|
DelegatesTo(method, method.MethodDeclarationNode, hasDeclaredArguments))
|
|
{
|
|
return ResolveMethodDefinition(method.MethodDeclarationNode, visited);
|
|
}
|
|
|
|
return method;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns whether <paramref name="method"/> takes its signature from
|
|
/// <paramref name="target"/>, which is the case when it declares no
|
|
/// arguments of its own or declares exactly the target's effective
|
|
/// signature.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// The target is resolved once here rather than through
|
|
/// <see cref="ResolveMethodInputs"/> and
|
|
/// <see cref="ResolveMethodOutputs"/>, which would each walk the target
|
|
/// chain again from scratch with their own visited list. The resolution
|
|
/// is deliberately not cached across calls: the model is still being
|
|
/// mutated while it is validated, and a generator that carried state
|
|
/// between passes would stop being deterministic.
|
|
/// </remarks>
|
|
private static bool DelegatesTo(
|
|
MethodDesign method,
|
|
MethodDesign target,
|
|
bool hasDeclaredArguments)
|
|
{
|
|
if (!hasDeclaredArguments)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
MethodDesign targetDefinition = ResolveMethodDefinition(target, []);
|
|
return HaveSameSignature(
|
|
method.InputArguments ?? [],
|
|
method.OutputArguments ?? [],
|
|
targetDefinition.InputArguments ?? [],
|
|
targetDefinition.OutputArguments ?? []);
|
|
}
|
|
|
|
private static Parameter[] ResolveArguments(
|
|
Parameter[] methodArguments,
|
|
Parameter[] declarationArguments,
|
|
Parameter[] methodTypeArguments)
|
|
{
|
|
if (methodArguments is { Length: > 0 })
|
|
{
|
|
return methodArguments;
|
|
}
|
|
|
|
if (declarationArguments is { Length: > 0 })
|
|
{
|
|
return declarationArguments;
|
|
}
|
|
|
|
if (methodTypeArguments is { Length: > 0 })
|
|
{
|
|
return methodTypeArguments;
|
|
}
|
|
|
|
return [];
|
|
}
|
|
|
|
private static bool HaveSameSignature(
|
|
Parameter[] firstInputs,
|
|
Parameter[] firstOutputs,
|
|
Parameter[] secondInputs,
|
|
Parameter[] secondOutputs)
|
|
{
|
|
return HaveSameParameters(firstInputs, secondInputs) &&
|
|
HaveSameParameters(firstOutputs, secondOutputs);
|
|
}
|
|
|
|
private static bool HaveSameParameters(
|
|
Parameter[] first,
|
|
Parameter[] second)
|
|
{
|
|
if (first.Length != second.Length)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
for (int ii = 0; ii < first.Length; ii++)
|
|
{
|
|
Parameter left = first[ii];
|
|
Parameter right = second[ii];
|
|
if (left == null || right == null)
|
|
{
|
|
if (!ReferenceEquals(left, right))
|
|
{
|
|
return false;
|
|
}
|
|
continue;
|
|
}
|
|
|
|
if (!string.Equals(left.Name, right.Name, StringComparison.Ordinal) ||
|
|
!XmlQualifiedNameEquals(left.DataType, right.DataType) ||
|
|
left.ValueRank != right.ValueRank ||
|
|
!string.Equals(
|
|
left.ArrayDimensions,
|
|
right.ArrayDimensions,
|
|
StringComparison.Ordinal) ||
|
|
left.AllowSubTypes != right.AllowSubTypes ||
|
|
left.IsOptional != right.IsOptional)
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
private static bool XmlQualifiedNameEquals(
|
|
XmlQualifiedName first,
|
|
XmlQualifiedName second)
|
|
{
|
|
if (ReferenceEquals(first, second))
|
|
{
|
|
return true;
|
|
}
|
|
if (first == null || second == null)
|
|
{
|
|
return false;
|
|
}
|
|
return string.Equals(first.Name, second.Name, StringComparison.Ordinal) &&
|
|
string.Equals(first.Namespace, second.Namespace, StringComparison.Ordinal);
|
|
}
|
|
|
|
private static bool ContainsReference(
|
|
List<MethodDesign> methods,
|
|
MethodDesign candidate)
|
|
{
|
|
foreach (MethodDesign method in methods)
|
|
{
|
|
if (ReferenceEquals(method, candidate))
|
|
{
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
}
|
|
}
|