mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 22:55:08 +08:00
a81d981755
# Description
Pure code-style sweep across the repo — no behavioral changes. Drives
`dotnet format` info-level diagnostics down on a large slice of the
codebase (Stack, Libraries, Tests, Tools).
Six commits, applied bottom-up in safety order so each batch leaves the
build green:
1. **`style: fix whitespace and final-newline formatting (WHITESPACE,
FINALNEWLINE)`**
197 hits across ~30 files; pure mechanical cleanup.
2. **`style: apply dotnet format style fixes (IDE rules)`**
IDE-rule batch via `dotnet format style --severity info` —
`var`/explicit type, simplify names, collection expressions, expression
bodies, unused usings, etc.
3. **`style: apply dotnet format analyzers fixes (RCS blank-line
formatting)`**
Roslynator formatting (RCS0xxx) blank-line and punctuation rules.
4. **`style: convert comments to doc comments and inline local vars
(RCS1181, RCS1124)`**
24 files. RCS1181 promotes `// summary`-style comments above
public/internal members to `/// <summary>` doc comments; RCS1124 inlines
locals used exactly once. Generated `Tools/` files were reverted to keep
the source-generator outputs deterministic.
5. **`docs(agent): correct --diagnostics flag form and verify Roslynator
4.x code fixers`**
Updates `.github/agents/opc-ua-codestyle-enforcer.agent.md` with two
corrections discovered while running this sweep:
- `dotnet format --diagnostics "RULE1 RULE2"` (single quoted,
space-separated) silently fixes nothing on `dotnet format` 10.x — it
parses as one unknown ID and exits 0. The correct form is `--diagnostics
RULE1 --diagnostics RULE2 …`, repeated per rule.
- Roslynator 4.15.0 **does** ship code fixers for
RCS1078/1118/1124/1140/1142/1181/1221/1260 (the previous "no auto-fixer"
list was outdated). RCS1140/1142 default to `Hidden` so need `--severity
info` to surface and fire; RCS1078 requires
`roslynator_empty_string_style = field` (already set in
`.editorconfig`). Only NUnit4002/2046/2010 genuinely lack auto-fixers in
this stack.
6. **`style: format new code from master merge (dotnet format sweep)`**
After merging master into the branch (commit `e3ebc8742`), re-ran the
same three-phase format sweep on the 151 .cs files brought in by the
merge, scoped per project via repeated `--include`. 81 files changed;
same rule families as commits 1–4.
- Hand-fixed `Tests/Opc.Ua.MigrationAnalyzer.Tests/AnalyzerHarness.cs`
for `RCS1174` (redundant `async`/`await` removal) because the auto-fixer
didn't apply for that specific case.
- Reverted files that the formatter would break:
- `Libraries/Opc.Ua.Server/Server/ServerInternalData.cs` — multi-TFM
analysis disagreement injected `<<<<<<<` / `=======` / `>>>>>>>`
markers.
-
`Tools/Opc.Ua.MigrationAnalyzer.Core/{Core/Stack/Client/ChannelBase.cs,
Core/Stack/Types/IUserIdentityTokenHandler.cs,
Client/Session/Session.cs}` — IDE0005 removed `using
Opc.Ua.Security.Certificates` that IS used (the files are 1.5.378
reference fixtures for the analyzer).
- `Tests/Opc.Ua.Gds.Tests/PushTest.cs` — IDE0002 over-simplified
`OpcUa.ObjectTypeIds` to `ObjectTypeIds`, which then resolves to a
conflicting type.
### What this PR does **not** touch
- No behavioral or semantic logic changes.
- No `.editorconfig` rule promotions (rules stay at their current
severities; this is a backlog-burndown pass, not a rule tightening).
- Generated source under `Tools/` is intentionally excluded.
- Higher-risk rule families (`RCS1090`/`CA2007` `ConfigureAwait`,
`RCS1249` null-forgiving cleanup, `IDE0270`/`IDE0059`) are left for
follow-up sweeps because they need per-TFM build verification or
semantic review.
## Related Issues
_No tracking issue — this is a non-functional style sweep and the
agent-doc correction is a follow-up to the same work. Happy to open one
if the maintainers prefer._
## 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. _(N/A — style-only, no
behavioral change)_
- [x] I have added all necessary documentation. _(agent doc updated with
the two corrections)_
- [x] I have verified that my changes do not introduce (new) build or
analyzer warnings. _(verified clean on `net10.0` and `net48`; only
pre-existing `NETSDK1005`/`NETSDK1207` failures on Tools/AOT projects)_
- [ ] I ran **all** tests locally using the **UA.slnx** solution against
at least .net **framework** and .net **10**, and all passed. _(build
verified on net10 and net48 per batch; full test suite not yet run
locally — relying on CI)_
- [ ] I fixed **all** failing and flaky tests in the CI pipelines and
**all** CodeQL warnings.
- [ ] I have addressed **all** PR feedback received.
---------
Co-authored-by: agent <agent@local>
267 lines
10 KiB
C#
267 lines
10 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.Runtime.CompilerServices;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Opc.Ua.Client;
|
|
|
|
namespace Opc.Ua.Di.Client
|
|
{
|
|
/// <summary>
|
|
/// Client-side wrapper for the OPC 10000-100 §10.4
|
|
/// <c>TransferServicesType</c> facet. Composes (does <em>not</em>
|
|
/// inherit) the source-generated
|
|
/// <see cref="Opc.Ua.Di.TransferServicesTypeClient"/> proxy to
|
|
/// invoke <c>TransferToDevice</c> / <c>TransferFromDevice</c> and
|
|
/// poll <c>FetchTransferResultData</c>, decoding each chunk and
|
|
/// yielding parameter entries until the server flags
|
|
/// <c>EndOfResults</c>.
|
|
/// </summary>
|
|
public sealed class DiTransferClient
|
|
{
|
|
private TransferServicesTypeClient? m_proxy;
|
|
|
|
/// <summary>
|
|
/// Creates a new transfer client rooted at the supplied
|
|
/// <c>TransferServicesType</c> instance.
|
|
/// </summary>
|
|
public DiTransferClient(
|
|
ISession session,
|
|
NodeId transferServicesNodeId,
|
|
ITelemetryContext telemetry)
|
|
{
|
|
if (session is null)
|
|
{
|
|
throw new ArgumentNullException(nameof(session));
|
|
}
|
|
if (transferServicesNodeId.IsNull)
|
|
{
|
|
throw new ArgumentException(
|
|
"TransferServices NodeId is required.",
|
|
nameof(transferServicesNodeId));
|
|
}
|
|
if (telemetry is null)
|
|
{
|
|
throw new ArgumentNullException(nameof(telemetry));
|
|
}
|
|
|
|
Session = session;
|
|
TransferServicesNodeId = transferServicesNodeId;
|
|
Telemetry = telemetry;
|
|
}
|
|
|
|
/// <summary>
|
|
/// The owning session.
|
|
/// </summary>
|
|
public ISession Session { get; }
|
|
|
|
/// <summary>
|
|
/// The NodeId of the <c>TransferServicesType</c> instance.
|
|
/// </summary>
|
|
public NodeId TransferServicesNodeId { get; }
|
|
|
|
/// <summary>
|
|
/// Telemetry context.
|
|
/// </summary>
|
|
public ITelemetryContext Telemetry { get; }
|
|
|
|
private TransferServicesTypeClient Proxy
|
|
{
|
|
get
|
|
{
|
|
return m_proxy ??= new TransferServicesTypeClient(
|
|
Session, TransferServicesNodeId, Telemetry);
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Invokes <c>TransferToDevice</c>. Returns the transfer ID
|
|
/// that subsequent <see cref="StreamAsync"/> calls poll on.
|
|
/// The generated proxy returns the tuple
|
|
/// <c>(transferID, initTransferStatus)</c>; this wrapper
|
|
/// surfaces only the transfer ID for caller convenience and
|
|
/// raises on bad initialisation status.
|
|
/// </summary>
|
|
public async ValueTask<int> TransferToDeviceAsync(CancellationToken ct = default)
|
|
{
|
|
(int transferId, int initStatus) = await Proxy
|
|
.TransferToDeviceAsync(ct)
|
|
.ConfigureAwait(false);
|
|
ThrowOnInitFailure(initStatus, "TransferToDevice");
|
|
return transferId;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Invokes <c>TransferFromDevice</c>. Returns the transfer ID
|
|
/// that subsequent <see cref="StreamAsync"/> calls poll on.
|
|
/// The generated proxy returns the tuple
|
|
/// <c>(transferID, initTransferStatus)</c>; this wrapper
|
|
/// surfaces only the transfer ID for caller convenience and
|
|
/// raises on bad initialisation status.
|
|
/// </summary>
|
|
public async ValueTask<int> TransferFromDeviceAsync(CancellationToken ct = default)
|
|
{
|
|
(int transferId, int initStatus) = await Proxy
|
|
.TransferFromDeviceAsync(ct)
|
|
.ConfigureAwait(false);
|
|
ThrowOnInitFailure(initStatus, "TransferFromDevice");
|
|
return transferId;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Streams parameter entries from a previously-initiated
|
|
/// transfer by calling <c>FetchTransferResultData</c> in a
|
|
/// loop with monotonically-increasing sequence numbers until
|
|
/// the server flags <c>EndOfResults</c>.
|
|
/// </summary>
|
|
/// <param name="transferId">
|
|
/// The transfer ID returned by
|
|
/// <see cref="TransferToDeviceAsync"/> or
|
|
/// <see cref="TransferFromDeviceAsync"/>.
|
|
/// </param>
|
|
/// <param name="maxResultsPerChunk">
|
|
/// Maximum entries per server-side chunk. 0 = unlimited.
|
|
/// </param>
|
|
/// <param name="omitGoodResults">
|
|
/// When true, ask the server to skip <c>Good</c> entries.
|
|
/// </param>
|
|
/// <param name="ct">Cancellation token.</param>
|
|
public async IAsyncEnumerable<ParameterFetchEntry> StreamAsync(
|
|
int transferId,
|
|
int maxResultsPerChunk = 50,
|
|
bool omitGoodResults = false,
|
|
[EnumeratorCancellation] CancellationToken ct = default)
|
|
{
|
|
int sequence = 0;
|
|
while (true)
|
|
{
|
|
ct.ThrowIfCancellationRequested();
|
|
|
|
ExtensionObject chunkPayload = await Proxy
|
|
.FetchTransferResultDataAsync(
|
|
transferId,
|
|
sequence,
|
|
maxResultsPerChunk,
|
|
omitGoodResults,
|
|
ct)
|
|
.ConfigureAwait(false);
|
|
|
|
FetchChunk chunk = DecodeChunk(chunkPayload);
|
|
|
|
if (chunk.IsError)
|
|
{
|
|
throw new ServiceResultException(
|
|
chunk.ErrorStatus,
|
|
"Transfer ended with error status from server.");
|
|
}
|
|
|
|
if (chunk.Entries != null)
|
|
{
|
|
foreach (ParameterFetchEntry entry in chunk.Entries)
|
|
{
|
|
yield return entry;
|
|
}
|
|
}
|
|
|
|
if (chunk.EndOfResults)
|
|
{
|
|
yield break;
|
|
}
|
|
|
|
sequence = chunk.NextSequenceNumber;
|
|
}
|
|
}
|
|
|
|
private static void ThrowOnInitFailure(int initStatus, string method)
|
|
{
|
|
if (initStatus != 0)
|
|
{
|
|
throw new ServiceResultException(
|
|
StatusCodes.BadInvalidArgument,
|
|
$"{method} initialisation failed (status {initStatus}).");
|
|
}
|
|
}
|
|
|
|
private static FetchChunk DecodeChunk(ExtensionObject payload)
|
|
{
|
|
// The generated FetchTransferResultData proxy returns an
|
|
// ExtensionObject wrapping either TransferResultDataDataType
|
|
// or TransferResultErrorDataType per OPC 10000-100 §10.4;
|
|
// unwrap and dispatch on the subtype.
|
|
if (payload.IsNull ||
|
|
!payload.TryGetValue(out IEncodeable? body) ||
|
|
body is null)
|
|
{
|
|
return new FetchChunk(EndOfResults: true);
|
|
}
|
|
if (body is Opc.Ua.Di.TransferResultErrorDataType err)
|
|
{
|
|
return new FetchChunk(
|
|
IsError: true,
|
|
ErrorStatus: new StatusCode((uint)err.Status));
|
|
}
|
|
if (body is Opc.Ua.Di.TransferResultDataDataType data)
|
|
{
|
|
var entries = new List<ParameterFetchEntry>(data.ParameterDefs.Count);
|
|
for (int i = 0; i < data.ParameterDefs.Count; i++)
|
|
{
|
|
Opc.Ua.Di.ParameterResultDataType p = data.ParameterDefs[i];
|
|
QualifiedName[] nodePath = p.NodePath.ToArray() ?? Array.Empty<QualifiedName>();
|
|
entries.Add(new ParameterFetchEntry(
|
|
NodePath: nodePath,
|
|
StatusCode: p.StatusCode));
|
|
}
|
|
return new FetchChunk(
|
|
NextSequenceNumber: data.SequenceNumber + 1,
|
|
EndOfResults: data.EndOfResults,
|
|
Entries: entries);
|
|
}
|
|
return new FetchChunk(EndOfResults: true);
|
|
}
|
|
|
|
private readonly record struct FetchChunk(
|
|
List<ParameterFetchEntry>? Entries = null,
|
|
bool EndOfResults = false,
|
|
int NextSequenceNumber = 0,
|
|
bool IsError = false,
|
|
StatusCode ErrorStatus = default);
|
|
}
|
|
|
|
/// <summary>
|
|
/// One parameter entry yielded by
|
|
/// <see cref="DiTransferClient.StreamAsync"/>.
|
|
/// </summary>
|
|
public sealed record ParameterFetchEntry(
|
|
QualifiedName[] NodePath,
|
|
StatusCode StatusCode);
|
|
}
|