mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-21 09:06:37 +08:00
dbc09b8e22
# Description Adopt [`System.TimeProvider`](https://learn.microsoft.com/dotnet/api/system.timeprovider) across the stack so that every place that creates timers, runs duration math, or schedules periodic work is mockable, deterministic in tests, and immune to wall-clock changes. The migration touches Core, Core.Types, Server, Client, PubSub, Configuration, Gds (server + client), Lds, and the Quickstarts/Console reference apps. Per-component changes follow the same pattern: 1. Add a `private readonly TimeProvider m_timeProvider;` field. 2. Accept a nullable `TimeProvider? timeProvider = null` as the **last** constructor parameter (new overload; legacy constructor stays for binary compatibility and delegates with `timeProvider: null`). 3. Initialise the field with `m_timeProvider = timeProvider ??= TimeProvider.System;`. 4. Replace `new Timer(...)`, `Stopwatch`, `HiResClock.*`, `DateTime.UtcNow`-based duration math, and `Task.Delay(delay, ct)` in timing loops with the matching `m_timeProvider` API (`CreateTimer`, `GetTimestamp` / `GetElapsedTime`, `GetUtcNow().UtcDateTime`, `Task.Delay(delay, m_timeProvider, ct)`). 5. Wire the provider through DI: `AddOpcUaServerBuilder` / `AddOpcUaClientBuilder` register `TimeProvider.System` via `TryAddSingleton<TimeProvider>()` so tests can swap in `Microsoft.Extensions.Time.Testing.FakeTimeProvider`. `HiResClock` itself is kept (so the `ApplicationConfiguration.DisableHiResClock` schema flag still round-trips), but **every public member** is now `[Obsolete]` with a single shared message pointing to the new migration-guide section. The few internal call sites that still need to set/read `HiResClock` are wrapped with `#pragma warning disable CS0618`. ### Highlights per component - **Core / Stack** — `Opc.Ua.Core`, `Opc.Ua.Core.Types`, channel pipeline (`UaSCBinaryClientChannel`, `ChannelToken`, `UaSCBinaryChannel`), `ApplicationConfiguration`, certificate validators, `JwksIssuerKeyResolver`, `TimeProviderExtensions` polyfills (`GetTimestampMilliseconds`, `GetTickCount`, `CancellationTokenSource(timeout, timeProvider)`, `Task.Delay(delay, provider, ct)` polyfill for older TFMs). - **Server** — session lockout, subscription pipeline (publish/sample/keep-alive/lifetime), `MonitoredItemQueue`, alarm sampling rate, `IntervalRunner`, server diagnostics, configuration state machines, hosted services. - **Client** — `Session`, managed/V2 subscription engines, reconnect handlers, channel keep-alive, periodic publishing, complex-type discovery polling. - **PubSub** — `IntervalRunner` pipeline, message-receive timers, MQTT/UDP keep-alive, publishers/readers. - **Gds / Lds** — `LdsServer`, `LinqApplicationsDatabase` expiry housekeeping, GDS clients (push, pull), `DirectoryCertificateStore`, `ConnectionStateMachine`, classic subscription engine. - **Quickstarts / Console samples** — `SampleNodeManager`, `ReferenceNodeManager`, `AlarmNodeManager`, `BoilerState`, `MemoryBufferState`, `PublishedValuesWrites`. Samples resolve via `(Server as ITimeProviderProvider)?.TimeProvider ?? TimeProvider.System` so existing ctor signatures stay binary-compatible. - **Tests** — `Opc.Ua.PubSub.Tests` adds `IntervalRunnerTests`; existing `SubscriptionTests`, `UaPublisherTests`, and `TestDataSystem` move off `HiResClock`. Added `Microsoft.Extensions.TimeProvider.Testing` package for `FakeTimeProvider` (project-load warning surfaces on net48/net472 only — runtime is .NET 8+). ### Migration guide New section [**Time and Timer abstraction (`TimeProvider`)**](Docs/MigrationGuide.md#time-and-timer-abstraction-timeprovider) documents: - The canonical replacement table (`HiResClock.UtcNow` → `timeProvider.GetUtcNow().UtcDateTime`, `HiResClock.TickCount64` → `timeProvider.GetTimestamp()`, `new Timer` → `timeProvider.CreateTimer`, `Task.Delay(delay, ct)` → `Task.Delay(delay, timeProvider, ct)`, …). - The `TimeProvider? timeProvider = null` + `??=` constructor pattern. - DI wiring and how to swap in `FakeTimeProvider` in tests. - Before/after snippets for `HiResClock.TickCount64`, `HiResClock.UtcNow`, and `new Timer(...)`. ## Related Issues - Fixes #2458 ## Checklist - [x] 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. - [ ] I ran **all** tests locally using the **UA.slnx** solution against at least .net **framework** and .net **10**, and all passed. - [ ] I fixed **all** failing and flaky tests in the CI pipelines and **all** CodeQL warnings. - [ ] I have addressed **all** PR feedback received.
296 lines
10 KiB
C#
296 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.Threading;
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
namespace Opc.Ua.Server
|
|
{
|
|
/// <summary>
|
|
/// An object that manages requests from within the server.
|
|
/// </summary>
|
|
public class RequestManager : IDisposable
|
|
{
|
|
/// <summary>
|
|
/// Initilizes the manager.
|
|
/// </summary>
|
|
public RequestManager(IServerInternal server)
|
|
: this(server, null)
|
|
{
|
|
}
|
|
|
|
/// <summary>
|
|
/// Initializes the manager with an explicit <see cref="TimeProvider"/>
|
|
/// so the request-expiry timer can be mocked in tests.
|
|
/// </summary>
|
|
/// <param name="server">The server context.</param>
|
|
/// <param name="timeProvider">The time provider used to schedule the
|
|
/// request-expiry timer and to evaluate request deadlines, or
|
|
/// <c>null</c> to use the time provider exposed by the server (or
|
|
/// <see cref="TimeProvider.System"/> as a fallback).</param>
|
|
/// <exception cref="ArgumentNullException"><paramref name="server"/>
|
|
/// is <c>null</c>.</exception>
|
|
public RequestManager(IServerInternal server, TimeProvider? timeProvider)
|
|
{
|
|
m_server = server ?? throw new ArgumentNullException(nameof(server));
|
|
m_logger = server.Telemetry.CreateLogger<RequestManager>();
|
|
m_requests = [];
|
|
m_requestTimer = null;
|
|
m_timeProvider = timeProvider
|
|
?? (server as ITimeProviderProvider)?.TimeProvider
|
|
?? TimeProvider.System;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Frees any unmanaged resources.
|
|
/// </summary>
|
|
public void Dispose()
|
|
{
|
|
Dispose(true);
|
|
GC.SuppressFinalize(this);
|
|
}
|
|
|
|
/// <summary>
|
|
/// An overrideable version of the Dispose.
|
|
/// </summary>
|
|
protected virtual void Dispose(bool disposing)
|
|
{
|
|
if (disposing)
|
|
{
|
|
List<OperationContext>? operations;
|
|
lock (m_requestsLock)
|
|
{
|
|
operations = [.. m_requests.Values];
|
|
m_requests.Clear();
|
|
}
|
|
|
|
foreach (OperationContext operation in operations)
|
|
{
|
|
operation.RequestLifetime.TryCancel(StatusCodes.BadSessionClosed);
|
|
}
|
|
|
|
m_requestTimer?.Dispose();
|
|
m_requestTimer = null;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Raised when the status of an outstanding request changes.
|
|
/// </summary>
|
|
public event RequestCancelledEventHandler RequestCancelled
|
|
{
|
|
add
|
|
{
|
|
lock (m_lock)
|
|
{
|
|
m_RequestCancelled += value;
|
|
}
|
|
}
|
|
remove
|
|
{
|
|
lock (m_lock)
|
|
{
|
|
m_RequestCancelled -= value;
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Called when a new request arrives.
|
|
/// </summary>
|
|
/// <exception cref="ArgumentNullException"><paramref name="context"/> is <c>null</c>.</exception>
|
|
public void RequestReceived(OperationContext context)
|
|
{
|
|
if (context == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(context));
|
|
}
|
|
|
|
lock (m_requestsLock)
|
|
{
|
|
m_requests.Add(context.RequestId, context);
|
|
|
|
if (context.OperationDeadline < DateTime.MaxValue && m_requestTimer == null)
|
|
{
|
|
m_requestTimer = m_timeProvider.CreateTimer(
|
|
OnTimerExpired,
|
|
null,
|
|
TimeSpan.FromSeconds(1),
|
|
TimeSpan.FromSeconds(1));
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Called when a request completes (normally or abnormally).
|
|
/// </summary>
|
|
/// <exception cref="ArgumentNullException"><paramref name="context"/> is <c>null</c>.</exception>
|
|
public void RequestCompleted(OperationContext context)
|
|
{
|
|
if (context == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(context));
|
|
}
|
|
|
|
lock (m_requestsLock)
|
|
{
|
|
// remove the request.
|
|
m_requests.Remove(context.RequestId);
|
|
}
|
|
context.RequestLifetime?.MarkCompleted();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Called when the client wishes to cancel one or more requests.
|
|
/// </summary>
|
|
public void CancelRequests(uint requestHandle, out uint cancelCount)
|
|
{
|
|
var cancelledRequests = new List<uint>();
|
|
|
|
// flag requests as cancelled.
|
|
lock (m_requestsLock)
|
|
{
|
|
foreach (OperationContext request in m_requests.Values)
|
|
{
|
|
if (request.ClientHandle == requestHandle)
|
|
{
|
|
request.RequestLifetime.TryCancel(StatusCodes.BadRequestCancelledByRequest);
|
|
cancelledRequests.Add(request.RequestId);
|
|
|
|
// report the AuditCancelEventType
|
|
m_server.ReportAuditCancelEvent(
|
|
request.Session.Id,
|
|
requestHandle,
|
|
StatusCodes.Good,
|
|
m_logger);
|
|
}
|
|
}
|
|
}
|
|
|
|
// return the number of requests found.
|
|
cancelCount = (uint)cancelledRequests.Count;
|
|
|
|
// raise notifications.
|
|
lock (m_lock)
|
|
{
|
|
for (int ii = 0; ii < cancelledRequests.Count; ii++)
|
|
{
|
|
if (m_RequestCancelled != null)
|
|
{
|
|
try
|
|
{
|
|
m_RequestCancelled(
|
|
this,
|
|
cancelledRequests[ii],
|
|
StatusCodes.BadRequestCancelledByRequest);
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
m_logger.LogError(e, "Unexpected error reporting RequestCancelled event.");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Checks for any expired requests and changes their status.
|
|
/// </summary>
|
|
private void OnTimerExpired(object? state)
|
|
{
|
|
var expiredRequests = new List<uint>();
|
|
|
|
// flag requests as expired.
|
|
lock (m_requestsLock)
|
|
{
|
|
// find the completed request.
|
|
bool deadlineExists = false;
|
|
|
|
foreach (OperationContext request in m_requests.Values)
|
|
{
|
|
if (request.OperationDeadline < m_timeProvider.GetUtcNow().UtcDateTime)
|
|
{
|
|
request.RequestLifetime.TryCancel(StatusCodes.BadTimeout);
|
|
expiredRequests.Add(request.RequestId);
|
|
}
|
|
else if (request.OperationDeadline < DateTime.MaxValue)
|
|
{
|
|
deadlineExists = true;
|
|
}
|
|
}
|
|
|
|
// check if the timer can be cancelled.
|
|
if (m_requestTimer != null && !deadlineExists)
|
|
{
|
|
m_requestTimer.Dispose();
|
|
m_requestTimer = null;
|
|
}
|
|
}
|
|
|
|
// raise notifications.
|
|
lock (m_lock)
|
|
{
|
|
for (int ii = 0; ii < expiredRequests.Count; ii++)
|
|
{
|
|
if (m_RequestCancelled != null)
|
|
{
|
|
try
|
|
{
|
|
m_RequestCancelled(this, expiredRequests[ii], StatusCodes.BadTimeout);
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
m_logger.LogError(e, "Unexpected error reporting RequestCancelled event.");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private readonly Lock m_lock = new();
|
|
private readonly ILogger m_logger;
|
|
private readonly IServerInternal m_server;
|
|
private readonly TimeProvider m_timeProvider;
|
|
private readonly Dictionary<uint, OperationContext> m_requests;
|
|
private readonly Lock m_requestsLock = new();
|
|
private ITimer? m_requestTimer;
|
|
private event RequestCancelledEventHandler? m_RequestCancelled;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Called when a request is cancelled.
|
|
/// </summary>
|
|
public delegate void RequestCancelledEventHandler(
|
|
RequestManager source,
|
|
uint requestId,
|
|
StatusCode statusCode);
|
|
}
|