mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-20 00:31:32 +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>
501 lines
17 KiB
C#
501 lines
17 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.Concurrent;
|
|
using System.Collections.Generic;
|
|
using System.Diagnostics.CodeAnalysis;
|
|
using System.Runtime.CompilerServices;
|
|
using System.Threading;
|
|
using System.Threading.Channels;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.Options;
|
|
using Opc.Ua.Client.Subscriptions.MonitoredItems;
|
|
|
|
namespace Opc.Ua.Client.Subscriptions.Streaming
|
|
{
|
|
/// <summary>
|
|
/// Default implementation of <see cref="IStreamingSubscription"/>.
|
|
/// Wraps a single subscription created on demand via the
|
|
/// session's <see cref="ISubscriptionManager"/>. Each
|
|
/// SubscribeXxxAsync call adds a monitored item to the shared
|
|
/// subscription and pipes notifications into a per-call channel.
|
|
/// </summary>
|
|
public sealed class StreamingSubscription : IStreamingSubscription
|
|
{
|
|
private readonly ISubscriptionManager m_subscriptionManager;
|
|
private readonly SubscriptionOptions m_subscriptionOptions;
|
|
private readonly SemaphoreSlim m_initLock = new(1, 1);
|
|
private readonly ConcurrentDictionary<uint, Subscriber> m_subscribers = new();
|
|
private readonly Notifier m_notifier;
|
|
|
|
private ISubscription? m_subscription;
|
|
private bool m_disposed;
|
|
private long m_handleCounter;
|
|
|
|
/// <summary>
|
|
/// Creates a new streaming subscription backed by the supplied
|
|
/// <see cref="ISubscriptionManager"/>.
|
|
/// </summary>
|
|
public StreamingSubscription(
|
|
ISubscriptionManager subscriptionManager,
|
|
SubscriptionOptions? subscriptionOptions = null)
|
|
{
|
|
m_subscriptionManager = subscriptionManager
|
|
?? throw new ArgumentNullException(nameof(subscriptionManager));
|
|
m_subscriptionOptions = subscriptionOptions ?? new SubscriptionOptions();
|
|
m_notifier = new Notifier(this);
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public IAsyncEnumerable<DataValueChange> SubscribeDataChangesAsync(
|
|
NodeId nodeId,
|
|
MonitoredItems.MonitoredItemOptions? options = null,
|
|
CancellationToken ct = default)
|
|
{
|
|
if (nodeId.IsNull)
|
|
{
|
|
throw new ArgumentNullException(nameof(nodeId));
|
|
}
|
|
return SubscribeDataChangesImpl([nodeId], options, ct);
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public IAsyncEnumerable<DataValueChange> SubscribeDataChangesAsync(
|
|
IReadOnlyList<NodeId> nodeIds,
|
|
MonitoredItems.MonitoredItemOptions? options = null,
|
|
CancellationToken ct = default)
|
|
{
|
|
if (nodeIds == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(nodeIds));
|
|
}
|
|
return SubscribeDataChangesImpl(nodeIds, options, ct);
|
|
}
|
|
|
|
private async IAsyncEnumerable<DataValueChange> SubscribeDataChangesImpl(
|
|
IReadOnlyList<NodeId> nodeIds,
|
|
MonitoredItems.MonitoredItemOptions? options,
|
|
[EnumeratorCancellation] CancellationToken ct)
|
|
{
|
|
await EnsureSubscriptionAsync(ct).ConfigureAwait(false);
|
|
|
|
var channel = Channel.CreateUnbounded<DataValueChange>(new UnboundedChannelOptions
|
|
{
|
|
SingleReader = true,
|
|
SingleWriter = false,
|
|
AllowSynchronousContinuations = false
|
|
});
|
|
|
|
var monitoredItems = new List<IMonitoredItem>();
|
|
uint handle = (uint)Interlocked.Increment(ref m_handleCounter);
|
|
var subscriber = new Subscriber(channel, isEvent: false);
|
|
m_subscribers[handle] = subscriber;
|
|
|
|
try
|
|
{
|
|
foreach (NodeId nodeId in nodeIds)
|
|
{
|
|
MonitoredItems.MonitoredItemOptions itemOptions = (options ?? new MonitoredItems.MonitoredItemOptions())
|
|
with
|
|
{ StartNodeId = nodeId };
|
|
|
|
string name = $"stream_data_{handle}_{nodeId}";
|
|
|
|
if (m_subscription!.MonitoredItems.TryAdd(
|
|
name,
|
|
new OptionsMonitor<MonitoredItems.MonitoredItemOptions>(itemOptions),
|
|
out IMonitoredItem? item) && item != null)
|
|
{
|
|
monitoredItems.Add(item);
|
|
subscriber.AddClientHandle(item.ClientHandle);
|
|
}
|
|
}
|
|
|
|
await foreach (DataValueChange change in channel.Reader
|
|
.ReadAllAsync(ct).ConfigureAwait(false))
|
|
{
|
|
yield return change;
|
|
}
|
|
}
|
|
finally
|
|
{
|
|
m_subscribers.TryRemove(handle, out _);
|
|
foreach (IMonitoredItem item in monitoredItems)
|
|
{
|
|
try
|
|
{
|
|
m_subscription?.MonitoredItems.TryRemove(item.ClientHandle);
|
|
}
|
|
catch
|
|
{
|
|
// best effort cleanup
|
|
}
|
|
}
|
|
channel.Writer.TryComplete();
|
|
}
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public IAsyncEnumerable<EventNotification> SubscribeEventsAsync(
|
|
NodeId notifierId,
|
|
EventFilter filter,
|
|
MonitoredItems.MonitoredItemOptions? options = null,
|
|
CancellationToken ct = default)
|
|
{
|
|
if (notifierId.IsNull)
|
|
{
|
|
throw new ArgumentNullException(nameof(notifierId));
|
|
}
|
|
if (filter == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(filter));
|
|
}
|
|
return SubscribeEventsImpl(notifierId, filter, options, ct);
|
|
}
|
|
|
|
private async IAsyncEnumerable<EventNotification> SubscribeEventsImpl(
|
|
NodeId notifierId,
|
|
EventFilter filter,
|
|
MonitoredItems.MonitoredItemOptions? options,
|
|
[EnumeratorCancellation] CancellationToken ct)
|
|
{
|
|
await EnsureSubscriptionAsync(ct).ConfigureAwait(false);
|
|
|
|
MonitoredItems.MonitoredItemOptions itemOptions = (options ?? new MonitoredItems.MonitoredItemOptions())
|
|
with
|
|
{
|
|
StartNodeId = notifierId,
|
|
AttributeId = Attributes.EventNotifier,
|
|
Filter = filter,
|
|
QueueSize = options?.QueueSize > 0 ? options.QueueSize : 10
|
|
};
|
|
|
|
var channel = Channel.CreateUnbounded<EventNotification>(new UnboundedChannelOptions
|
|
{
|
|
SingleReader = true,
|
|
SingleWriter = false,
|
|
AllowSynchronousContinuations = false
|
|
});
|
|
|
|
uint handle = (uint)Interlocked.Increment(ref m_handleCounter);
|
|
var subscriber = new Subscriber(channel, isEvent: true);
|
|
m_subscribers[handle] = subscriber;
|
|
|
|
string name = $"stream_event_{handle}_{notifierId}";
|
|
IMonitoredItem? item = null;
|
|
|
|
try
|
|
{
|
|
if (m_subscription!.MonitoredItems.TryAdd(
|
|
name,
|
|
new OptionsMonitor<MonitoredItems.MonitoredItemOptions>(itemOptions),
|
|
out item) && item != null)
|
|
{
|
|
subscriber.AddClientHandle(item.ClientHandle);
|
|
}
|
|
|
|
await foreach (EventNotification notification in channel.Reader
|
|
.ReadAllAsync(ct).ConfigureAwait(false))
|
|
{
|
|
yield return notification;
|
|
}
|
|
}
|
|
finally
|
|
{
|
|
m_subscribers.TryRemove(handle, out _);
|
|
if (item != null)
|
|
{
|
|
try
|
|
{
|
|
m_subscription?.MonitoredItems.TryRemove(item.ClientHandle);
|
|
}
|
|
catch
|
|
{
|
|
// best effort cleanup
|
|
}
|
|
}
|
|
channel.Writer.TryComplete();
|
|
}
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public async ValueTask DisposeAsync()
|
|
{
|
|
if (m_disposed)
|
|
{
|
|
return;
|
|
}
|
|
m_disposed = true;
|
|
|
|
// Complete all open channels
|
|
foreach (KeyValuePair<uint, Subscriber> kvp in m_subscribers)
|
|
{
|
|
kvp.Value.Complete();
|
|
}
|
|
m_subscribers.Clear();
|
|
|
|
if (m_subscription != null)
|
|
{
|
|
try
|
|
{
|
|
await m_subscription.DisposeAsync().ConfigureAwait(false);
|
|
}
|
|
catch
|
|
{
|
|
// best effort cleanup
|
|
}
|
|
m_subscription = null;
|
|
}
|
|
|
|
m_initLock.Dispose();
|
|
}
|
|
|
|
private async ValueTask EnsureSubscriptionAsync(CancellationToken ct)
|
|
{
|
|
if (m_subscription != null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
await m_initLock.WaitAsync(ct).ConfigureAwait(false);
|
|
try
|
|
{
|
|
// Double-check after acquiring the init lock — another
|
|
// caller may have created the subscription while we
|
|
// were waiting. CA1508's single-threaded flow analysis
|
|
// cannot model the concurrent write so it flags the
|
|
// null check as 'always false'; the check is required
|
|
// for correctness.
|
|
#pragma warning disable CA1508
|
|
if (m_subscription != null)
|
|
{
|
|
return;
|
|
}
|
|
#pragma warning restore CA1508
|
|
|
|
m_subscription = m_subscriptionManager.Add(
|
|
m_notifier,
|
|
new OptionsMonitor<SubscriptionOptions>(m_subscriptionOptions));
|
|
}
|
|
finally
|
|
{
|
|
m_initLock.Release();
|
|
}
|
|
}
|
|
|
|
internal void DispatchDataChange(in DataValueChange change)
|
|
{
|
|
if (change.MonitoredItem == null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
uint clientHandle = change.MonitoredItem.ClientHandle;
|
|
foreach (KeyValuePair<uint, Subscriber> kvp in m_subscribers)
|
|
{
|
|
if (!kvp.Value.IsEvent && kvp.Value.HandlesClientHandle(clientHandle))
|
|
{
|
|
kvp.Value.WriteDataChange(change);
|
|
}
|
|
}
|
|
}
|
|
|
|
internal void DispatchEvent(in EventNotification notification)
|
|
{
|
|
if (notification.MonitoredItem == null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
uint clientHandle = notification.MonitoredItem.ClientHandle;
|
|
foreach (KeyValuePair<uint, Subscriber> kvp in m_subscribers)
|
|
{
|
|
if (kvp.Value.IsEvent && kvp.Value.HandlesClientHandle(clientHandle))
|
|
{
|
|
kvp.Value.WriteEvent(notification);
|
|
}
|
|
}
|
|
}
|
|
|
|
private sealed class Notifier : ISubscriptionNotificationHandler
|
|
{
|
|
private readonly StreamingSubscription m_parent;
|
|
|
|
public Notifier(StreamingSubscription parent)
|
|
{
|
|
m_parent = parent;
|
|
}
|
|
|
|
public ValueTask OnDataChangeNotificationAsync(
|
|
ISubscription subscription,
|
|
uint sequenceNumber,
|
|
DateTime publishTime,
|
|
ReadOnlyMemory<DataValueChange> notification,
|
|
PublishState publishStateMask,
|
|
IReadOnlyList<string> stringTable)
|
|
{
|
|
ReadOnlySpan<DataValueChange> span = notification.Span;
|
|
for (int i = 0; i < span.Length; i++)
|
|
{
|
|
m_parent.DispatchDataChange(span[i]);
|
|
}
|
|
return default;
|
|
}
|
|
|
|
public ValueTask OnEventDataNotificationAsync(
|
|
ISubscription subscription,
|
|
uint sequenceNumber,
|
|
DateTime publishTime,
|
|
ReadOnlyMemory<EventNotification> notification,
|
|
PublishState publishStateMask,
|
|
IReadOnlyList<string> stringTable)
|
|
{
|
|
ReadOnlySpan<EventNotification> span = notification.Span;
|
|
for (int i = 0; i < span.Length; i++)
|
|
{
|
|
m_parent.DispatchEvent(span[i]);
|
|
}
|
|
return default;
|
|
}
|
|
|
|
public ValueTask OnKeepAliveNotificationAsync(
|
|
ISubscription subscription,
|
|
uint sequenceNumber,
|
|
DateTime publishTime,
|
|
PublishState publishStateMask)
|
|
{
|
|
return default;
|
|
}
|
|
|
|
public ValueTask OnSubscriptionStateChangedAsync(
|
|
ISubscription subscription,
|
|
SubscriptionState state,
|
|
PublishState publishStateMask,
|
|
CancellationToken ct = default)
|
|
{
|
|
// Streaming subscription only cares about data/event
|
|
// notification streams; lifecycle transitions are
|
|
// observed by the streaming consumer via the channel
|
|
// completion (DisposeAsync).
|
|
return default;
|
|
}
|
|
}
|
|
|
|
private sealed class Subscriber
|
|
{
|
|
private readonly object m_channelObj;
|
|
private readonly HashSet<uint> m_clientHandles = [];
|
|
private readonly object m_handlesLock = new();
|
|
|
|
public bool IsEvent { get; }
|
|
|
|
public Subscriber(Channel<DataValueChange> channel, bool isEvent)
|
|
{
|
|
m_channelObj = channel;
|
|
IsEvent = isEvent;
|
|
}
|
|
|
|
public Subscriber(Channel<EventNotification> channel, bool isEvent)
|
|
{
|
|
m_channelObj = channel;
|
|
IsEvent = isEvent;
|
|
}
|
|
|
|
public void AddClientHandle(uint handle)
|
|
{
|
|
lock (m_handlesLock)
|
|
{
|
|
m_clientHandles.Add(handle);
|
|
}
|
|
}
|
|
|
|
public bool HandlesClientHandle(uint handle)
|
|
{
|
|
lock (m_handlesLock)
|
|
{
|
|
return m_clientHandles.Contains(handle);
|
|
}
|
|
}
|
|
|
|
public void WriteDataChange(DataValueChange change)
|
|
{
|
|
if (m_channelObj is Channel<DataValueChange> ch)
|
|
{
|
|
ch.Writer.TryWrite(change);
|
|
}
|
|
}
|
|
|
|
public void WriteEvent(EventNotification notification)
|
|
{
|
|
if (m_channelObj is Channel<EventNotification> ch)
|
|
{
|
|
ch.Writer.TryWrite(notification);
|
|
}
|
|
}
|
|
|
|
public void Complete()
|
|
{
|
|
switch (m_channelObj)
|
|
{
|
|
case Channel<DataValueChange> ch1:
|
|
ch1.Writer.TryComplete();
|
|
break;
|
|
case Channel<EventNotification> ch2:
|
|
ch2.Writer.TryComplete();
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
private sealed class OptionsMonitor<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] T>
|
|
: IOptionsMonitor<T>
|
|
{
|
|
public OptionsMonitor(T value)
|
|
{
|
|
CurrentValue = value;
|
|
}
|
|
|
|
public T CurrentValue { get; }
|
|
|
|
public T Get(string? name)
|
|
{
|
|
return CurrentValue;
|
|
}
|
|
|
|
public IDisposable? OnChange(Action<T, string?> listener)
|
|
{
|
|
return null;
|
|
}
|
|
}
|
|
|
|
}
|
|
}
|
|
|