Files
Copilot d525bc3f28 Bound reconnect cleanup and organize samples by domain (#4276)
# 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
2026-08-21 04:35:47 +00:00

112 lines
4.5 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.IO;
using System.Threading;
using System.Threading.Tasks;
using Opc.Ua;
using Opc.Ua.Gds;
using Opc.Ua.Gds.Server;
using Opc.Ua.Gds.Server.Database.Linq;
using Opc.Ua.Server;
namespace Quickstarts.ReferenceServer
{
/// <summary>
/// Factory that creates the GDS ApplicationsNodeManager for the reference server.
/// The node manager automatically wires handlers for:
/// <list type="bullet">
/// <item><description>CertificateDirectoryType (Part 12 §7.6)</description></item>
/// <item><description>KeyCredentialServiceType (Part 12 §8)</description></item>
/// <item><description>AuthorizationServiceType (Part 12 §9)</description></item>
/// </list>
/// </summary>
public sealed class GdsNodeManagerFactory : IAsyncNodeManagerFactory
{
private readonly GlobalDiscoveryServerConfiguration m_gdsConfiguration;
/// <summary>
/// Initializes a new instance of the <see cref="GdsNodeManagerFactory"/> class.
/// </summary>
/// <param name="gdsConfiguration">The GDS configuration.</param>
public GdsNodeManagerFactory(GlobalDiscoveryServerConfiguration gdsConfiguration)
{
m_gdsConfiguration = gdsConfiguration;
}
/// <inheritdoc/>
public ArrayOf<string> NamespacesUris =>
[
"http://opcfoundation.org/UA/GDS/applications/",
Opc.Ua.Gds.Namespaces.OpcUaGds
];
/// <inheritdoc/>
public ValueTask<IAsyncNodeManager> CreateAsync(
IServerInternal server,
ApplicationConfiguration configuration,
CancellationToken cancellationToken = default)
{
// Ensure the GDS data types are registered in the message context
if (!server.MessageContext.Factory.ContainsEncodeableType(
Opc.Ua.Gds.DataTypeIds.ApplicationRecordDataType))
{
server.MessageContext.Factory.Builder
.AddOpcUaGds()
.Commit();
}
string? databaseStorePath = Utils.ReplaceSpecialFolderNames(
m_gdsConfiguration.DatabaseStorePath);
// Ensure the directory exists
string? databaseDir = Path.GetDirectoryName(databaseStorePath);
if (!string.IsNullOrEmpty(databaseDir))
{
Directory.CreateDirectory(databaseDir);
}
LinqApplicationsDatabase database = string.IsNullOrEmpty(databaseDir)
? new LinqApplicationsDatabase()
: JsonApplicationsDatabase.Load(databaseStorePath!);
#pragma warning disable CA2000 // Ownership is transferred to the server via returned node manager instance.
return new ValueTask<IAsyncNodeManager>(
new ApplicationsNodeManager(
server,
configuration,
database,
database,
new CertificateGroup(server.Telemetry),
autoApprove: true));
#pragma warning restore CA2000
}
}
}