cfd403710e
Every HistoryUpdate a SQL backend applies now leaves a modification trail
(prior value, principal, Part 11 update type, modification time), and
HistoryReadRaw with IsReadModified=true serves it as HistoryModifiedData.
- Core: HistoryUpdateContext threaded into all three IHistorianDataUpdater
methods; IHistorianDataSource.ReadModifiedAsync (default NotSupported =>
BadHistoryOperationUnsupported on Gateway/Null); HistoryModified* contracts.
- SqlServer: schema v2 (002_sample_modified.sql, RequiredVersion=2, docs copy);
trail written by OUTPUT ... INTO on the same MERGE/DELETE statement, so a
failed update leaves no audit row; retention purges SampleModified per tag on
the source-time cutoff; ReadModifiedAsync keyed on (SourceTimeUtc, ModifiedId).
- QuestDB: append-only {prefix}sample_modified (TTL like samples), trail row
written BEFORE the change (orphan-on-crash, never an untracked change);
existence reads now carry the prior value; ReadModifiedAsync.
- Node manager: modified reads dispatch + page via the #669 continuation store
(HistoryContinuationState gains HistoryCursorKind + LastModifiedId), gated by
the existing HistoryRead decision; session principal / key id passed to the
updater. IsDeleteModified stays unsupported.
- Client.CLI: historyread --modified.
- Tests: node-manager dispatch/paging/cursor binding/principal threading,
over-the-wire HistoryModifiedData, shared ModifiedValueConformance on both
backends, SqlServer atomicity (forced trail failure => no change) + v1->v2
upgrade + retention trail purge.
- Docs: Historian.md (Modified-value history section, schema v2 upgrade note),
security.md, Client.CLI.md, CLAUDE.md.
399 lines
14 KiB
C#
399 lines
14 KiB
C#
using Opc.Ua;
|
|
using Opc.Ua.Client;
|
|
using Serilog;
|
|
using ZB.MOM.WW.OtOpcUa.Client.Shared.Helpers;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Client.Shared.Adapters;
|
|
|
|
/// <summary>
|
|
/// Production session adapter wrapping a real OPC UA Session.
|
|
/// </summary>
|
|
internal sealed class DefaultSessionAdapter : ISessionAdapter
|
|
{
|
|
private static readonly ILogger Logger = Log.ForContext<DefaultSessionAdapter>();
|
|
private readonly Session _session;
|
|
|
|
/// <summary>
|
|
/// Wraps a live OPC UA session so the shared client can issue runtime operations through a testable adapter surface.
|
|
/// </summary>
|
|
/// <param name="session">The connected OPC UA session used for browsing, reads, writes, history, and subscriptions.</param>
|
|
public DefaultSessionAdapter(Session session)
|
|
{
|
|
_session = session;
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public bool Connected => _session.Connected;
|
|
|
|
/// <inheritdoc />
|
|
public string SessionId => _session.SessionId?.ToString() ?? string.Empty;
|
|
|
|
/// <inheritdoc />
|
|
public string SessionName => _session.SessionName ?? string.Empty;
|
|
|
|
/// <inheritdoc />
|
|
public string EndpointUrl => _session.Endpoint?.EndpointUrl ?? string.Empty;
|
|
|
|
/// <inheritdoc />
|
|
public string ServerName => _session.Endpoint?.Server?.ApplicationName?.Text ?? string.Empty;
|
|
|
|
/// <inheritdoc />
|
|
public string SecurityMode => _session.Endpoint?.SecurityMode.ToString() ?? string.Empty;
|
|
|
|
/// <inheritdoc />
|
|
public string SecurityPolicyUri => _session.Endpoint?.SecurityPolicyUri ?? string.Empty;
|
|
|
|
/// <inheritdoc />
|
|
public NamespaceTable NamespaceUris => _session.NamespaceUris;
|
|
|
|
/// <inheritdoc />
|
|
public void RegisterKeepAliveHandler(Action<bool> callback)
|
|
{
|
|
_session.KeepAlive += (_, e) =>
|
|
{
|
|
var isGood = e.Status == null || ServiceResult.IsGood(e.Status);
|
|
callback(isGood);
|
|
};
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public async Task<DataValue> ReadValueAsync(NodeId nodeId, CancellationToken ct)
|
|
{
|
|
return await _session.ReadValueAsync(nodeId, ct);
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public async Task<StatusCode> WriteValueAsync(NodeId nodeId, DataValue value, CancellationToken ct)
|
|
{
|
|
var writeValue = new WriteValue
|
|
{
|
|
NodeId = nodeId,
|
|
AttributeId = Attributes.Value,
|
|
Value = value
|
|
};
|
|
|
|
var writeCollection = new WriteValueCollection { writeValue };
|
|
var response = await _session.WriteAsync(null, writeCollection, ct);
|
|
// A malformed or service-level-faulted response can come back with an empty
|
|
// Results collection alongside a service fault. Surface the service result
|
|
// (or BadUnexpectedError) rather than letting Results[0] throw
|
|
// IndexOutOfRangeException upstream.
|
|
if (response.Results == null || response.Results.Count == 0)
|
|
{
|
|
var serviceResult = response.ResponseHeader?.ServiceResult.Code ?? StatusCodes.BadUnexpectedError;
|
|
throw new ServiceResultException(serviceResult,
|
|
$"Write response contained no results for node {nodeId}.");
|
|
}
|
|
|
|
return response.Results[0];
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public async Task<(byte[]? ContinuationPoint, ReferenceDescriptionCollection References)> BrowseAsync(
|
|
NodeId nodeId, uint nodeClassMask, CancellationToken ct)
|
|
{
|
|
var (_, continuationPoint, references) = await _session.BrowseAsync(
|
|
null,
|
|
null,
|
|
nodeId,
|
|
0u,
|
|
BrowseDirection.Forward,
|
|
ReferenceTypeIds.HierarchicalReferences,
|
|
true,
|
|
nodeClassMask);
|
|
|
|
return (continuationPoint, references ?? []);
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public async Task<(byte[]? ContinuationPoint, ReferenceDescriptionCollection References)> BrowseNextAsync(
|
|
byte[] continuationPoint, CancellationToken ct)
|
|
{
|
|
// Pass the caller's token so a cancelled browse does not block on the continuation
|
|
// round-trip.
|
|
var (_, nextCp, nextRefs) = await _session.BrowseNextAsync(null, false, continuationPoint, ct);
|
|
return (nextCp, nextRefs ?? []);
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public async Task<bool> HasChildrenAsync(NodeId nodeId, CancellationToken ct)
|
|
{
|
|
var (_, _, references) = await _session.BrowseAsync(
|
|
null,
|
|
null,
|
|
nodeId,
|
|
1u,
|
|
BrowseDirection.Forward,
|
|
ReferenceTypeIds.HierarchicalReferences,
|
|
true,
|
|
0u);
|
|
|
|
return references != null && references.Count > 0;
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public async Task<Models.HistoryUpdateOutcome> HistoryUpdateAsync(HistoryUpdateDetails details, CancellationToken ct)
|
|
{
|
|
var response = await _session.HistoryUpdateAsync(
|
|
null,
|
|
new ExtensionObjectCollection { new ExtensionObject(details) },
|
|
ct).ConfigureAwait(false);
|
|
|
|
var statuses = new List<StatusCode>();
|
|
var ops = new List<IReadOnlyList<StatusCode>>();
|
|
if (response.Results != null)
|
|
foreach (var r in response.Results)
|
|
{
|
|
statuses.Add(r.StatusCode);
|
|
ops.Add(r.OperationResults?.ToArray() ?? Array.Empty<StatusCode>());
|
|
}
|
|
|
|
return new Models.HistoryUpdateOutcome(response.ResponseHeader.ServiceResult, statuses, ops);
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public async Task<IReadOnlyList<DataValue>> HistoryReadRawAsync(
|
|
NodeId nodeId, DateTime startTime, DateTime endTime, int maxValues, CancellationToken ct)
|
|
{
|
|
var details = new ReadRawModifiedDetails
|
|
{
|
|
StartTime = startTime,
|
|
EndTime = endTime,
|
|
NumValuesPerNode = (uint)maxValues,
|
|
IsReadModified = false,
|
|
ReturnBounds = false
|
|
};
|
|
|
|
var nodesToRead = new HistoryReadValueIdCollection
|
|
{
|
|
new HistoryReadValueId { NodeId = nodeId }
|
|
};
|
|
|
|
var allValues = new List<DataValue>();
|
|
byte[]? continuationPoint = null;
|
|
|
|
do
|
|
{
|
|
if (continuationPoint != null)
|
|
nodesToRead[0].ContinuationPoint = continuationPoint;
|
|
|
|
// Use the async overload so this method is genuinely asynchronous,
|
|
// honors the cancellation token, and does not block the caller's thread
|
|
// (which would block the UI dispatcher for client.ui consumers).
|
|
var response = await _session.HistoryReadAsync(
|
|
null,
|
|
new ExtensionObject(details),
|
|
TimestampsToReturn.Source,
|
|
continuationPoint != null,
|
|
nodesToRead,
|
|
ct).ConfigureAwait(false);
|
|
|
|
var results = response.Results;
|
|
if (results == null || results.Count == 0)
|
|
break;
|
|
|
|
var result = results[0];
|
|
// A refused read (BadHistoryOperationUnsupported, BadUserAccessDenied, ...) must surface; only
|
|
// BadNoData is an empty result. Swallowing it printed "0 values returned" for a refusal.
|
|
HistoryReadStatus.ThrowIfRefused(result.StatusCode, nodeId);
|
|
|
|
if (result.HistoryData is ExtensionObject ext && ext.Body is HistoryData historyData)
|
|
allValues.AddRange(historyData.DataValues);
|
|
|
|
continuationPoint = result.ContinuationPoint;
|
|
} while (continuationPoint != null && continuationPoint.Length > 0 && allValues.Count < maxValues);
|
|
|
|
return allValues;
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public async Task<IReadOnlyList<Models.HistoryModifiedEntry>> HistoryReadModifiedAsync(
|
|
NodeId nodeId, DateTime startTime, DateTime endTime, int maxValues, CancellationToken ct)
|
|
{
|
|
var details = new ReadRawModifiedDetails
|
|
{
|
|
StartTime = startTime,
|
|
EndTime = endTime,
|
|
NumValuesPerNode = (uint)maxValues,
|
|
IsReadModified = true,
|
|
ReturnBounds = false
|
|
};
|
|
|
|
var nodesToRead = new HistoryReadValueIdCollection
|
|
{
|
|
new HistoryReadValueId { NodeId = nodeId }
|
|
};
|
|
|
|
var all = new List<Models.HistoryModifiedEntry>();
|
|
byte[]? continuationPoint = null;
|
|
|
|
do
|
|
{
|
|
if (continuationPoint != null)
|
|
nodesToRead[0].ContinuationPoint = continuationPoint;
|
|
|
|
var response = await _session.HistoryReadAsync(
|
|
null,
|
|
new ExtensionObject(details),
|
|
TimestampsToReturn.Both,
|
|
false,
|
|
nodesToRead,
|
|
ct).ConfigureAwait(false);
|
|
|
|
var results = response.Results;
|
|
if (results == null || results.Count == 0)
|
|
break;
|
|
|
|
var result = results[0];
|
|
HistoryReadStatus.ThrowIfRefused(result.StatusCode, nodeId);
|
|
|
|
if (result.HistoryData is ExtensionObject ext && ext.Body is HistoryModifiedData modified)
|
|
{
|
|
for (var i = 0; i < modified.DataValues.Count; i++)
|
|
{
|
|
var info = i < modified.ModificationInfos.Count ? modified.ModificationInfos[i] : null;
|
|
all.Add(new Models.HistoryModifiedEntry(
|
|
modified.DataValues[i],
|
|
info?.ModificationTime ?? DateTime.MinValue,
|
|
info?.UpdateType ?? default,
|
|
info?.UserName));
|
|
}
|
|
}
|
|
|
|
continuationPoint = result.ContinuationPoint;
|
|
} while (continuationPoint != null && continuationPoint.Length > 0 && all.Count < maxValues);
|
|
|
|
// A read stopped by the client's own cap leaves a server cursor behind; release it.
|
|
if (continuationPoint is { Length: > 0 })
|
|
{
|
|
nodesToRead[0].ContinuationPoint = continuationPoint;
|
|
await _session.HistoryReadAsync(null, new ExtensionObject(details), TimestampsToReturn.Both, true,
|
|
nodesToRead, ct).ConfigureAwait(false);
|
|
}
|
|
|
|
return all;
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public async Task<IReadOnlyList<DataValue>> HistoryReadAggregateAsync(
|
|
NodeId nodeId, DateTime startTime, DateTime endTime, NodeId aggregateId, double intervalMs,
|
|
CancellationToken ct)
|
|
{
|
|
var details = new ReadProcessedDetails
|
|
{
|
|
StartTime = startTime,
|
|
EndTime = endTime,
|
|
ProcessingInterval = intervalMs,
|
|
AggregateType = [aggregateId]
|
|
};
|
|
|
|
var nodesToRead = new HistoryReadValueIdCollection
|
|
{
|
|
new HistoryReadValueId { NodeId = nodeId }
|
|
};
|
|
|
|
// Use the async overload so the method honors the cancellation token and
|
|
// does not block on a synchronous service round-trip.
|
|
var response = await _session.HistoryReadAsync(
|
|
null,
|
|
new ExtensionObject(details),
|
|
TimestampsToReturn.Source,
|
|
false,
|
|
nodesToRead,
|
|
ct).ConfigureAwait(false);
|
|
|
|
var results = response.Results;
|
|
var allValues = new List<DataValue>();
|
|
|
|
if (results != null && results.Count > 0)
|
|
{
|
|
var result = results[0];
|
|
HistoryReadStatus.ThrowIfRefused(result.StatusCode, nodeId);
|
|
if (result.HistoryData is ExtensionObject ext &&
|
|
ext.Body is HistoryData historyData)
|
|
allValues.AddRange(historyData.DataValues);
|
|
}
|
|
|
|
return allValues;
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public async Task<ISubscriptionAdapter> CreateSubscriptionAsync(int publishingIntervalMs, CancellationToken ct)
|
|
{
|
|
var subscription = new Subscription(_session.DefaultSubscription)
|
|
{
|
|
PublishingInterval = publishingIntervalMs,
|
|
DisplayName = "ClientShared_Subscription"
|
|
};
|
|
|
|
_session.AddSubscription(subscription);
|
|
await subscription.CreateAsync(ct);
|
|
|
|
return new DefaultSubscriptionAdapter(subscription);
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public async Task CloseAsync(CancellationToken ct)
|
|
{
|
|
try
|
|
{
|
|
// Use the async overload so the caller does not block on the close
|
|
// service round-trip and the cancellation token is honored.
|
|
if (_session.Connected) await _session.CloseAsync(ct).ConfigureAwait(false);
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Logger.Warning(ex, "Error closing session");
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Releases the wrapped OPC UA session when the shared client shuts down or swaps endpoints during failover.
|
|
/// </summary>
|
|
public void Dispose()
|
|
{
|
|
try
|
|
{
|
|
if (_session.Connected) DisposeBridge.Run(ct => _session.CloseAsync(ct));
|
|
}
|
|
catch
|
|
{
|
|
}
|
|
|
|
_session.Dispose();
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public async Task<IList<object>?> CallMethodAsync(NodeId objectId, NodeId methodId, object[] inputArguments,
|
|
CancellationToken ct = default)
|
|
{
|
|
var result = await _session.CallAsync(
|
|
null,
|
|
new CallMethodRequestCollection
|
|
{
|
|
new()
|
|
{
|
|
ObjectId = objectId,
|
|
MethodId = methodId,
|
|
InputArguments = new VariantCollection(inputArguments.Select(a => new Variant(a)))
|
|
}
|
|
},
|
|
ct);
|
|
|
|
// An empty Results collection paired with a service fault must surface as
|
|
// a ServiceResultException, not an IndexOutOfRangeException from Results[0].
|
|
if (result.Results == null || result.Results.Count == 0)
|
|
{
|
|
var serviceResult = result.ResponseHeader?.ServiceResult.Code ?? StatusCodes.BadUnexpectedError;
|
|
throw new ServiceResultException(serviceResult,
|
|
$"Call response contained no results for method {methodId} on {objectId}.");
|
|
}
|
|
|
|
var callResult = result.Results[0];
|
|
if (StatusCode.IsBad(callResult.StatusCode))
|
|
throw new ServiceResultException(callResult.StatusCode);
|
|
|
|
return callResult.OutputArguments?.Select(v => v.Value).ToList();
|
|
}
|
|
}
|