mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-19 07:02:16 +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>
408 lines
16 KiB
C#
408 lines
16 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 System;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
namespace Opc.Ua.Di.Server.Builders
|
|
{
|
|
/// <summary>
|
|
/// Well-known state / transition metadata for the four DI
|
|
/// software-update state machines (OPC 10000-100 §10.3).
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// The DI source-generator does not yet emit Part-16 cause /
|
|
/// transition tables for the generated <c>*StateMachineState</c>
|
|
/// subclasses, so this dispatcher writes <c>CurrentState</c> and
|
|
/// <c>LastTransition</c> directly instead of routing through
|
|
/// <see cref="FiniteStateMachineState"/>'s
|
|
/// <c>SetState</c> / <c>DoCause</c> path (which depends on
|
|
/// overridden <c>StateTable</c> / <c>TransitionTable</c>).
|
|
/// When the generator gains table-emission support, this helper
|
|
/// can be replaced by
|
|
/// <c>StateMachineBuilder.For(sm, ctx).WithCause(...)</c> chains.
|
|
/// </remarks>
|
|
internal static class SoftwareUpdateStateMachineDispatcher
|
|
{
|
|
/// <summary>
|
|
/// ---- well-known state identifiers (delegated to typed Ids classes) ----
|
|
/// PrepareForUpdate
|
|
/// </summary>
|
|
internal const uint PrepareForUpdate_Idle = PrepareForUpdateStateMachineTypeIds.StateIds.Idle;
|
|
internal const uint PrepareForUpdate_Preparing = PrepareForUpdateStateMachineTypeIds.StateIds.Preparing;
|
|
internal const uint PrepareForUpdate_PreparedForUpdate = PrepareForUpdateStateMachineTypeIds.StateIds.PreparedForUpdate;
|
|
|
|
/// <summary>
|
|
/// Installation
|
|
/// </summary>
|
|
internal const uint Installation_Idle = InstallationStateMachineTypeIds.StateIds.Idle;
|
|
internal const uint Installation_Installing = InstallationStateMachineTypeIds.StateIds.Installing;
|
|
internal const uint Installation_Error = InstallationStateMachineTypeIds.StateIds.Error;
|
|
|
|
/// <summary>
|
|
/// PowerCycle
|
|
/// </summary>
|
|
internal const uint PowerCycle_NotWaiting = PowerCycleStateMachineTypeIds.StateIds.NotWaitingForPowerCycle;
|
|
internal const uint PowerCycle_Waiting = PowerCycleStateMachineTypeIds.StateIds.WaitingForPowerCycle;
|
|
|
|
/// <summary>
|
|
/// Confirmation
|
|
/// </summary>
|
|
internal const uint Confirmation_NotWaitingForConfirm = ConfirmationStateMachineTypeIds.StateIds.NotWaitingForConfirm;
|
|
internal const uint Confirmation_WaitingForConfirm = ConfirmationStateMachineTypeIds.StateIds.WaitingForConfirm;
|
|
|
|
/// <summary>
|
|
/// ---- well-known transition identifiers (delegated to typed Ids classes) ----
|
|
/// PrepareForUpdate
|
|
/// </summary>
|
|
internal const uint PrepareForUpdate_IdleToPreparing = PrepareForUpdateStateMachineTypeIds.TransitionIds.IdleToPreparing;
|
|
internal const uint PrepareForUpdate_PreparingToIdle = PrepareForUpdateStateMachineTypeIds.TransitionIds.PreparingToIdle;
|
|
internal const uint PrepareForUpdate_PreparingToPreparedForUpdate = PrepareForUpdateStateMachineTypeIds.TransitionIds.PreparingToPreparedForUpdate;
|
|
internal const uint PrepareForUpdate_PreparedForUpdateToResuming = PrepareForUpdateStateMachineTypeIds.TransitionIds.PreparedForUpdateToResuming;
|
|
|
|
/// <summary>
|
|
/// Installation
|
|
/// </summary>
|
|
internal const uint Installation_IdleToInstalling = InstallationStateMachineTypeIds.TransitionIds.IdleToInstalling;
|
|
internal const uint Installation_InstallingToIdle = InstallationStateMachineTypeIds.TransitionIds.InstallingToIdle;
|
|
internal const uint Installation_InstallingToError = InstallationStateMachineTypeIds.TransitionIds.InstallingToError;
|
|
internal const uint Installation_ErrorToIdle = InstallationStateMachineTypeIds.TransitionIds.ErrorToIdle;
|
|
|
|
/// <summary>
|
|
/// Confirmation
|
|
/// </summary>
|
|
internal const uint Confirmation_NotWaitingToWaiting = ConfirmationStateMachineTypeIds.TransitionIds.NotWaitingForConfirmToWaitingForConfirm;
|
|
internal const uint Confirmation_WaitingToNotWaiting = ConfirmationStateMachineTypeIds.TransitionIds.WaitingForConfirmToNotWaitingForConfirm;
|
|
|
|
/// <summary>
|
|
/// ---- per-state browse-name + state-number lookup table ----
|
|
/// (StateNumber values now sourced from the generator-emitted *Ids.StateNumbers classes
|
|
/// so any future change in the DI model is picked up automatically.)
|
|
/// </summary>
|
|
private static readonly (uint Id, uint Number, string Name)[] s_states =
|
|
[
|
|
(PrepareForUpdate_Idle,
|
|
PrepareForUpdateStateMachineTypeIds.StateNumbers.Idle, "Idle"),
|
|
(PrepareForUpdate_Preparing,
|
|
PrepareForUpdateStateMachineTypeIds.StateNumbers.Preparing, "Preparing"),
|
|
(PrepareForUpdate_PreparedForUpdate,
|
|
PrepareForUpdateStateMachineTypeIds.StateNumbers.PreparedForUpdate, "PreparedForUpdate"),
|
|
(Installation_Idle,
|
|
InstallationStateMachineTypeIds.StateNumbers.Idle, "Idle"),
|
|
(Installation_Installing,
|
|
InstallationStateMachineTypeIds.StateNumbers.Installing, "Installing"),
|
|
(Installation_Error,
|
|
InstallationStateMachineTypeIds.StateNumbers.Error, "Error"),
|
|
(PowerCycle_NotWaiting,
|
|
PowerCycleStateMachineTypeIds.StateNumbers.NotWaitingForPowerCycle, "NotWaitingForPowerCycle"),
|
|
(PowerCycle_Waiting,
|
|
PowerCycleStateMachineTypeIds.StateNumbers.WaitingForPowerCycle, "WaitingForPowerCycle"),
|
|
(Confirmation_NotWaitingForConfirm,
|
|
ConfirmationStateMachineTypeIds.StateNumbers.NotWaitingForConfirm, "NotWaitingForConfirm"),
|
|
(Confirmation_WaitingForConfirm,
|
|
ConfirmationStateMachineTypeIds.StateNumbers.WaitingForConfirm, "WaitingForConfirm"),
|
|
];
|
|
|
|
/// <summary>
|
|
/// ---- per-transition browse-name + transition-number lookup table ----
|
|
/// </summary>
|
|
private static readonly (uint Id, uint Number, string Name)[] s_transitions =
|
|
[
|
|
(PrepareForUpdate_IdleToPreparing,
|
|
PrepareForUpdateStateMachineTypeIds.TransitionNumbers.IdleToPreparing,
|
|
"IdleToPreparing"),
|
|
(PrepareForUpdate_PreparingToIdle,
|
|
PrepareForUpdateStateMachineTypeIds.TransitionNumbers.PreparingToIdle,
|
|
"PreparingToIdle"),
|
|
(PrepareForUpdate_PreparingToPreparedForUpdate,
|
|
PrepareForUpdateStateMachineTypeIds.TransitionNumbers.PreparingToPreparedForUpdate,
|
|
"PreparingToPreparedForUpdate"),
|
|
(PrepareForUpdate_PreparedForUpdateToResuming,
|
|
PrepareForUpdateStateMachineTypeIds.TransitionNumbers.PreparedForUpdateToResuming,
|
|
"PreparedForUpdateToResuming"),
|
|
(Installation_IdleToInstalling,
|
|
InstallationStateMachineTypeIds.TransitionNumbers.IdleToInstalling,
|
|
"IdleToInstalling"),
|
|
(Installation_InstallingToIdle,
|
|
InstallationStateMachineTypeIds.TransitionNumbers.InstallingToIdle,
|
|
"InstallingToIdle"),
|
|
(Installation_InstallingToError,
|
|
InstallationStateMachineTypeIds.TransitionNumbers.InstallingToError,
|
|
"InstallingToError"),
|
|
(Installation_ErrorToIdle,
|
|
InstallationStateMachineTypeIds.TransitionNumbers.ErrorToIdle,
|
|
"ErrorToIdle"),
|
|
(Confirmation_NotWaitingToWaiting,
|
|
ConfirmationStateMachineTypeIds.TransitionNumbers.NotWaitingForConfirmToWaitingForConfirm,
|
|
"NotWaitingForConfirmToWaitingForConfirm"),
|
|
(Confirmation_WaitingToNotWaiting,
|
|
ConfirmationStateMachineTypeIds.TransitionNumbers.WaitingForConfirmToNotWaitingForConfirm,
|
|
"WaitingForConfirmToNotWaitingForConfirm"),
|
|
];
|
|
|
|
/// <summary>
|
|
/// Initialise the FSM's <c>CurrentState</c> to its standard
|
|
/// initial state (Idle / NotWaiting…). Idempotent.
|
|
/// </summary>
|
|
internal static void InitializeToInitialState(
|
|
FiniteStateMachineState sm,
|
|
uint initialStateId,
|
|
ushort diNamespaceIndex,
|
|
ISystemContext context)
|
|
{
|
|
ApplyState(sm, initialStateId, diNamespaceIndex, context);
|
|
ClearLastTransition(sm);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Writes <paramref name="stateId"/> into <paramref name="sm"/>'s
|
|
/// <c>CurrentState</c> variable. Bypasses
|
|
/// <see cref="FiniteStateMachineState"/>'s
|
|
/// <c>UpdateStateVariable</c> (which requires a
|
|
/// <c>StateTable</c> override the source-generated DI FSMs
|
|
/// don't provide).
|
|
/// </summary>
|
|
internal static void ApplyState(
|
|
FiniteStateMachineState sm,
|
|
uint stateId,
|
|
ushort diNamespaceIndex,
|
|
ISystemContext context)
|
|
{
|
|
if (sm?.CurrentState is null)
|
|
{
|
|
return;
|
|
}
|
|
(uint _, uint number, string name) = Lookup(s_states, stateId, "Unknown");
|
|
|
|
sm.CurrentState.Value = new LocalizedText(name);
|
|
|
|
if (sm.CurrentState.Id is { } idVar)
|
|
|
|
{
|
|
|
|
idVar.Value = new NodeId(stateId, diNamespaceIndex);
|
|
|
|
}
|
|
if (sm.CurrentState.Number is { } numberVar)
|
|
|
|
{
|
|
|
|
numberVar.Value = number;
|
|
|
|
}
|
|
sm.CurrentState.ClearChangeMasks(context, includeChildren: true);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Writes <paramref name="transitionId"/> into <paramref name="sm"/>'s
|
|
/// optional <c>LastTransition</c> variable (created lazily by
|
|
/// <see cref="EnsureLastTransition(FiniteStateMachineState, ISystemContext)"/>).
|
|
/// Sets <c>TransitionTime</c> to <see cref="DateTime.UtcNow"/>.
|
|
/// </summary>
|
|
internal static void ApplyTransition(
|
|
FiniteStateMachineState sm,
|
|
uint transitionId,
|
|
ushort diNamespaceIndex,
|
|
ISystemContext context)
|
|
{
|
|
if (sm is null)
|
|
{
|
|
return;
|
|
}
|
|
EnsureLastTransition(sm, context);
|
|
|
|
if (sm.LastTransition is null)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
(uint _, uint number, string name) = Lookup(s_transitions, transitionId, "Unknown");
|
|
|
|
sm.LastTransition.Value = new LocalizedText(name);
|
|
|
|
if (sm.LastTransition.Id is { } idVar)
|
|
|
|
{
|
|
|
|
idVar.Value = new NodeId(transitionId, diNamespaceIndex);
|
|
|
|
}
|
|
if (sm.LastTransition.Number is { } numberVar)
|
|
|
|
{
|
|
|
|
numberVar.Value = number;
|
|
|
|
}
|
|
if (sm.LastTransition.TransitionTime is { } ttVar)
|
|
|
|
{
|
|
|
|
ttVar.Value = DateTime.UtcNow;
|
|
|
|
}
|
|
sm.LastTransition.ClearChangeMasks(context, includeChildren: true);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Atomically writes a state transition: sets
|
|
/// <c>CurrentState</c> to <paramref name="toStateId"/> and
|
|
/// <c>LastTransition</c> to <paramref name="transitionId"/>.
|
|
/// </summary>
|
|
internal static void Move(
|
|
FiniteStateMachineState sm,
|
|
uint toStateId,
|
|
uint transitionId,
|
|
ushort diNamespaceIndex,
|
|
ISystemContext context)
|
|
{
|
|
ApplyState(sm, toStateId, diNamespaceIndex, context);
|
|
ApplyTransition(sm, transitionId, diNamespaceIndex, context);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Updates <c>InstallationStateMachine.PercentComplete</c> if
|
|
/// the optional child is present. No-op otherwise.
|
|
/// </summary>
|
|
internal static void SetPercentComplete(
|
|
InstallationStateMachineState sm,
|
|
byte percent,
|
|
ISystemContext context)
|
|
{
|
|
if (sm?.PercentComplete is null)
|
|
{
|
|
return;
|
|
}
|
|
sm.PercentComplete.Value = percent;
|
|
sm.PercentComplete.ClearChangeMasks(context, includeChildren: false);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Fires a state-change hook, swallowing and logging any
|
|
/// exception so the SU method invocation isn't aborted by
|
|
/// instrumentation faults.
|
|
/// </summary>
|
|
internal static async ValueTask FireAsync(
|
|
Func<ISoftwareUpdateContext, SoftwareUpdateStateChange, ValueTask>? handler,
|
|
ISoftwareUpdateContext context,
|
|
SoftwareUpdateStateChange change,
|
|
ILogger? logger,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
if (handler is null)
|
|
{
|
|
return;
|
|
}
|
|
cancellationToken.ThrowIfCancellationRequested();
|
|
|
|
try
|
|
{
|
|
await handler(context, change).ConfigureAwait(false);
|
|
}
|
|
catch (OperationCanceledException)
|
|
{
|
|
throw;
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
logger?.LogWarning(
|
|
ex,
|
|
"Software-update state-change hook threw for phase {Phase}; swallowed.",
|
|
change.Phase);
|
|
}
|
|
}
|
|
|
|
private static void ClearLastTransition(FiniteStateMachineState sm)
|
|
{
|
|
if (sm?.LastTransition is null)
|
|
{
|
|
return;
|
|
}
|
|
sm.LastTransition.Value = default;
|
|
|
|
if (sm.LastTransition.Id is { } idVar)
|
|
|
|
{
|
|
|
|
idVar.Value = default;
|
|
|
|
}
|
|
if (sm.LastTransition.Number is { } numberVar)
|
|
|
|
{
|
|
|
|
numberVar.Value = 0;
|
|
|
|
}
|
|
if (sm.LastTransition.TransitionTime is { } ttVar)
|
|
|
|
{
|
|
|
|
ttVar.Value = DateTime.MinValue;
|
|
|
|
}
|
|
}
|
|
|
|
private static void EnsureLastTransition(
|
|
FiniteStateMachineState sm,
|
|
ISystemContext context)
|
|
{
|
|
if (sm.LastTransition is not null)
|
|
{
|
|
return;
|
|
}
|
|
// The generated *StateMachineState classes inherit
|
|
// AddLastTransition from FiniteStateMachineState; the
|
|
// optional child wraps the standard Part-5 LastTransition
|
|
// / FiniteTransitionVariableType (Value + Id + Number +
|
|
// TransitionTime).
|
|
sm.AddLastTransition(context);
|
|
}
|
|
|
|
private static (uint Id, uint Number, string Name) Lookup(
|
|
(uint Id, uint Number, string Name)[] table,
|
|
uint id,
|
|
string fallbackName)
|
|
{
|
|
for (int ii = 0; ii < table.Length; ii++)
|
|
{
|
|
if (table[ii].Id == id)
|
|
{
|
|
return table[ii];
|
|
}
|
|
}
|
|
return (id, 0, fallbackName);
|
|
}
|
|
}
|
|
}
|