mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-21 00:56:28 +08:00
d525bc3f28
# Description This PR fixes bounded ManagedSession reconnect cleanup and reorganizes the sample applications into domain-focused folders. ## Reconnect cleanup - Bounds reconnect integration cleanup with independent 30-second close and dispose limits. - Sends `CloseSession` through the awaited transport request path during `Session.DisposeAsync`. - Preserves explicit `Session.CloseAsync` behavior that waits for or cancels outstanding publish requests. - Covers the disposal request path with a regression test. ## Sample organization - `samples/OpenUsd`: `GeneratorServer`, `SiteCompositionServer` - `samples/Redundancy`: `RedundantClient`, `RedundantServer`, `RedundantPubSub` - `samples/Isa95`: `MinimalIsa95Server` - `samples/MinimalApi`: `MinimalBoilerServer`, `MinimalCalcServer`, `MinimalClient` - `samples/DI`: `PumpDeviceIntegrationServer` - `samples/Lds`: `ConsoleLdsServer` - `samples/Reference`: `ConsoleReferenceClient`, `ConsoleReferenceServer` - `samples/PubSub`: `ConsoleReferencePubSubClient` `UA.slnx` now exposes the same requested domain groups. Project references, tests, runtime sample probes, CI workflows, Dockerfiles, Compose files, helper scripts, and documentation were updated to the new paths. `samples/Robotics/MinimalRobotServer` remains under `Robotics`. ## Validation - `dotnet build UA.slnx` - 3 Redundancy short-haul sample tests - 70 DI sample tests - 914 OpenUSD tests - 1 WotCon model-materialization test - 137 AOT tests - `docker compose config` for all 6 moved Redundancy Compose files ## Related Issues - Fixes #4273 ## Checklist - [ ] I have signed the [CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf) and read the [CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md) doc. - [x] I have added tests that prove my fix is effective or that my feature works and increased code coverage. - [x] I have added all necessary documentation. - [x] I have verified that my changes do not introduce new build or analyzer warnings. - [x] I built the complete `UA.slnx` solution locally. - [ ] I ran all tests locally against at least .NET Framework and .NET 10. - [ ] I fixed all failing and flaky tests in the CI pipelines and all CodeQL warnings. - [x] I have addressed all PR feedback received. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: marcschier <11168470+marcschier@users.noreply.github.com> Co-authored-by: Marc Schier <mschier@microsoft.com> Co-authored-by: Marc Schier <marcschier@users.noreply.github.com> Copilot-Session: a2c2838f-74ae-4997-a1d4-50574d9e0636
95 lines
4.3 KiB
C#
95 lines
4.3 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.Threading.Tasks;
|
|
using Opc.Ua.Server.Fluent;
|
|
|
|
namespace Calc
|
|
{
|
|
/// <summary>
|
|
/// Source-generated <c>CustomNodeManager2</c> for the calculator
|
|
/// sample. The <c>[NodeManager]</c> attribute opts this partial class
|
|
/// in to source generation: the generator emits the sibling partial
|
|
/// that owns the predefined-node load and calls back into the
|
|
/// <c>Configure</c> partials in <c>CalcNodeManager.Configure.cs</c>.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// The calculator model intentionally exposes three method shapes —
|
|
/// sync int+int→int, async double+double→double, and reference-typed
|
|
/// string+string→string — to exercise the generator's typed
|
|
/// <c>OnCall</c> input-unpack and output-box code paths end-to-end.
|
|
/// The wiring lives in the second partial; this file holds only the
|
|
/// attribute-bearing class declaration so that the source generator
|
|
/// pipeline (<c>[NodeManager]</c> + <c>AdditionalFiles</c> NodeSet2)
|
|
/// can be reasoned about in one glance.
|
|
/// </remarks>
|
|
[NodeManager(NamespaceUri = "http://opcfoundation.org/UA/Calc/")]
|
|
public partial class CalcNodeManager
|
|
{
|
|
partial void Configure(INodeManagerBuilder builder)
|
|
{
|
|
// Intentionally empty. Kept to mirror the Boiler sample and
|
|
// demonstrate that the typed and non-typed Configure partials
|
|
// coexist on the same class — the generated address-space
|
|
// bootstrap invokes both. The calculator sample wires every
|
|
// node through the typed surface in
|
|
// Configure(ICalcNodeManagerBuilder).
|
|
}
|
|
|
|
partial void Configure(ICalcNodeManagerBuilder builder)
|
|
{
|
|
// Sync int+int→int — exercises Variant.TryGetValue<int> on
|
|
// each input arg and Variant.From<int> on the boxed result.
|
|
builder.Calculator.Add
|
|
.OnCall((a, b) => a + b);
|
|
|
|
// Async double+double→double — exercises the typed async
|
|
// OnCall overload (Func<double, double, CancellationToken,
|
|
// ValueTask<double>>) end-to-end through
|
|
// AsyncCustomNodeManager.CallAsync, plus Variant.From<double>
|
|
// on the boxed result.
|
|
builder.Calculator.Multiply
|
|
.OnCall(async (x, y, ct) =>
|
|
{
|
|
await Task.Yield();
|
|
ct.ThrowIfCancellationRequested();
|
|
return x * y;
|
|
});
|
|
|
|
// Sync string+string→string — exercises reference-type
|
|
// marshalling on both inputs and the output. Coalesces null
|
|
// inputs to empty so the handler is well-defined when a
|
|
// client passes a null Variant in either slot.
|
|
builder.Calculator.Concat
|
|
.OnCall((left, right) =>
|
|
(left ?? string.Empty) + (right ?? string.Empty));
|
|
}
|
|
}
|
|
}
|