Skip to content

Commit 419fb74

Browse files
mrsuciumrsuciu
authored
Merge pull request #3792 from OPCFoundation/master378
Prepare 1.5.378 release
2 parents f52ae43 + d621313 commit 419fb74

71 files changed

Lines changed: 30725 additions & 20675 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Applications/Quickstarts.Servers/ReferenceServer/ReferenceNodeManager.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,14 +243,15 @@ public override void CreateAddressSpace(
243243
"Duration",
244244
DataTypeIds.Duration,
245245
ValueRanks.Scalar));
246-
variables.Add(
247-
CreateVariable(
246+
var floatVal = CreateVariable(
248247
staticFolder,
249248
scalarStatic + "Float",
250249
"Float",
251250
DataTypeIds.Float,
252251
ValueRanks.Scalar)
253-
.MinimumSamplingInterval(100));
252+
.MinimumSamplingInterval(100);
253+
floatVal.Value = (float)5;
254+
variables.Add(floatVal);
254255
variables.Add(
255256
CreateVariable(
256257
staticFolder,

‎Applications/Quickstarts.Servers/TestData/Generated/TestData.DataTypes.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ public Variant UIntegerValue
318318
public virtual ExpandedNodeId XmlEncodingId => ObjectIds.ScalarStructureDataType_Encoding_DefaultXml;
319319

320320
/// <summary cref="IJsonEncodeable.JsonEncodingId" />
321-
public virtual ExpandedNodeId JsonEncodingId => ObjectIds.ScalarStructureDataType_Encoding_DefaultJson;
321+
public virtual ExpandedNodeId JsonEncodingId => DataTypeIds.ScalarStructureDataType;
322322

323323
/// <summary cref="IEncodeable.Encode(IEncoder)" />
324324
public virtual void Encode(IEncoder encoder)
@@ -1185,7 +1185,7 @@ public VariantCollection UIntegerValue
11851185
public virtual ExpandedNodeId XmlEncodingId => ObjectIds.ArrayValueDataType_Encoding_DefaultXml;
11861186

11871187
/// <summary cref="IJsonEncodeable.JsonEncodingId" />
1188-
public virtual ExpandedNodeId JsonEncodingId => ObjectIds.ArrayValueDataType_Encoding_DefaultJson;
1188+
public virtual ExpandedNodeId JsonEncodingId => DataTypeIds.ArrayValueDataType;
11891189

11901190
/// <summary cref="IEncodeable.Encode(IEncoder)" />
11911191
public virtual void Encode(IEncoder encoder)
@@ -1683,7 +1683,7 @@ public Variant VariantDataType
16831683
public virtual ExpandedNodeId XmlEncodingId => ObjectIds.UserScalarValueDataType_Encoding_DefaultXml;
16841684

16851685
/// <summary cref="IJsonEncodeable.JsonEncodingId" />
1686-
public virtual ExpandedNodeId JsonEncodingId => ObjectIds.UserScalarValueDataType_Encoding_DefaultJson;
1686+
public virtual ExpandedNodeId JsonEncodingId => DataTypeIds.UserScalarValueDataType;
16871687

16881688
/// <summary cref="IEncodeable.Encode(IEncoder)" />
16891689
public virtual void Encode(IEncoder encoder)
@@ -2420,7 +2420,7 @@ public VariantCollection VariantDataType
24202420
public virtual ExpandedNodeId XmlEncodingId => ObjectIds.UserArrayValueDataType_Encoding_DefaultXml;
24212421

24222422
/// <summary cref="IJsonEncodeable.JsonEncodingId" />
2423-
public virtual ExpandedNodeId JsonEncodingId => ObjectIds.UserArrayValueDataType_Encoding_DefaultJson;
2423+
public virtual ExpandedNodeId JsonEncodingId => DataTypeIds.UserArrayValueDataType;
24242424

24252425
/// <summary cref="IEncodeable.Encode(IEncoder)" />
24262426
public virtual void Encode(IEncoder encoder)
@@ -2722,7 +2722,7 @@ public double Z
27222722
public virtual ExpandedNodeId XmlEncodingId => ObjectIds.Vector_Encoding_DefaultXml;
27232723

27242724
/// <summary cref="IJsonEncodeable.JsonEncodingId" />
2725-
public virtual ExpandedNodeId JsonEncodingId => ObjectIds.Vector_Encoding_DefaultJson;
2725+
public virtual ExpandedNodeId JsonEncodingId => DataTypeIds.Vector;
27262726

27272727
/// <summary cref="IEncodeable.Encode(IEncoder)" />
27282728
public virtual void Encode(IEncoder encoder)
@@ -2948,7 +2948,7 @@ public double Z
29482948
public virtual ExpandedNodeId XmlEncodingId => ObjectIds.VectorUnion_Encoding_DefaultXml;
29492949

29502950
/// <summary cref="IJsonEncodeable.JsonEncodingId" />
2951-
public virtual ExpandedNodeId JsonEncodingId => ObjectIds.VectorUnion_Encoding_DefaultJson;
2951+
public virtual ExpandedNodeId JsonEncodingId => DataTypeIds.VectorUnion;
29522952

29532953
/// <summary cref="IEncodeable.Encode(IEncoder)" />
29542954
public virtual void Encode(IEncoder encoder)
@@ -3197,7 +3197,7 @@ public double Z
31973197
public virtual ExpandedNodeId XmlEncodingId => ObjectIds.VectorWithOptionalFields_Encoding_DefaultXml;
31983198

31993199
/// <summary cref="IJsonEncodeable.JsonEncodingId" />
3200-
public virtual ExpandedNodeId JsonEncodingId => ObjectIds.VectorWithOptionalFields_Encoding_DefaultJson;
3200+
public virtual ExpandedNodeId JsonEncodingId => DataTypeIds.VectorWithOptionalFields;
32013201

32023202
/// <summary cref="IEncodeable.Encode(IEncoder)" />
32033203
public virtual void Encode(IEncoder encoder)
@@ -3510,7 +3510,7 @@ public VectorWithOptionalFieldsCollection VectorWithOptionalFieldsArray
35103510
public virtual ExpandedNodeId XmlEncodingId => ObjectIds.MultipleVectors_Encoding_DefaultXml;
35113511

35123512
/// <summary cref="IJsonEncodeable.JsonEncodingId" />
3513-
public virtual ExpandedNodeId JsonEncodingId => ObjectIds.MultipleVectors_Encoding_DefaultJson;
3513+
public virtual ExpandedNodeId JsonEncodingId => DataTypeIds.MultipleVectors;
35143514

35153515
/// <summary cref="IEncodeable.Encode(IEncoder)" />
35163516
public virtual void Encode(IEncoder encoder)
@@ -3732,7 +3732,7 @@ public LocalizedText Comment
37323732
public virtual ExpandedNodeId XmlEncodingId => ObjectIds.WorkOrderStatusType_Encoding_DefaultXml;
37333733

37343734
/// <summary cref="IJsonEncodeable.JsonEncodingId" />
3735-
public virtual ExpandedNodeId JsonEncodingId => ObjectIds.WorkOrderStatusType_Encoding_DefaultJson;
3735+
public virtual ExpandedNodeId JsonEncodingId => DataTypeIds.WorkOrderStatusType;
37363736

37373737
/// <summary cref="IEncodeable.Encode(IEncoder)" />
37383738
public virtual void Encode(IEncoder encoder)
@@ -3960,7 +3960,7 @@ public WorkOrderStatusTypeCollection StatusComments
39603960
public virtual ExpandedNodeId XmlEncodingId => ObjectIds.WorkOrderType_Encoding_DefaultXml;
39613961

39623962
/// <summary cref="IJsonEncodeable.JsonEncodingId" />
3963-
public virtual ExpandedNodeId JsonEncodingId => ObjectIds.WorkOrderType_Encoding_DefaultJson;
3963+
public virtual ExpandedNodeId JsonEncodingId => DataTypeIds.WorkOrderType;
39643964

39653965
/// <summary cref="IEncodeable.Encode(IEncoder)" />
39663966
public virtual void Encode(IEncoder encoder)
@@ -4105,4 +4105,4 @@ public object Clone()
41054105
#endregion
41064106
#endif
41074107
#endregion
4108-
}
4108+
}

‎Directory.Packages.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</PropertyGroup>
55
<ItemGroup>
66
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
7-
<PackageVersion Include="BitFaster.Caching" Version="2.5.4" />
7+
<PackageVersion Include="BitFaster.Caching" Version="2.6.0" />
88
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.6.2" />
99
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
1010
<PackageVersion Include="EmbedIO" Version="3.5.2" />
@@ -17,8 +17,8 @@
1717
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0" />
1818
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.2" />
1919
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.2" />
20-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.2" />
21-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.2" />
20+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.8" />
21+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.8" />
2222
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
2323
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
2424
<PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
@@ -46,13 +46,13 @@
4646
<PackageVersion Include="System.Buffers" Version="4.6.1" />
4747
<PackageVersion Include="System.Composition.AttributedModel" Version="10.0.2" />
4848
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
49-
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.2" />
49+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.8" />
5050
<PackageVersion Include="System.Memory" Version="4.6.3" />
51-
<PackageVersion Include="System.Formats.Asn1" Version="10.0.2" />
51+
<PackageVersion Include="System.Formats.Asn1" Version="10.0.8" />
5252
<PackageVersion Include="System.IO.Compression" Version="4.3.0" />
5353
<PackageVersion Include="System.Net.NetworkInformation" Version="4.3.0" />
54-
<PackageVersion Include="System.Collections.Immutable" Version="10.0.2" />
55-
<PackageVersion Include="System.Text.Json" Version="10.0.2" />
54+
<PackageVersion Include="System.Collections.Immutable" Version="10.0.8" />
55+
<PackageVersion Include="System.Text.Json" Version="10.0.8" />
5656
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
5757
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
5858
<PackageVersion Include="System.Security.Cryptography.Cng" Version="5.0.0" />

‎Libraries/Opc.Ua.Client/Session/Session.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3370,6 +3370,12 @@ public bool BeginPublish(int timeout)
33703370
return false;
33713371
}
33723372

3373+
if (KeepAliveStopped)
3374+
{
3375+
m_logger.LogWarning("Publish skipped due to session lost connection. Last successfull keepalive: {LastKeepAlive}", LastKeepAliveTime);
3376+
return false;
3377+
}
3378+
33733379
// get event handler to modify ack list
33743380
PublishSequenceNumbersToAcknowledgeEventHandler? callback
33753381
= m_PublishSequenceNumbersToAcknowledge;

‎Libraries/Opc.Ua.Client/Subscription/Subscription.cs‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ namespace Opc.Ua.Client
4444
/// </summary>
4545
public class Subscription : ISnapshotRestore<SubscriptionState>, IDisposable, ICloneable
4646
{
47-
private const int kMinKeepAliveTimerInterval = 1000;
4847
private const int kKeepAliveTimerMargin = 1000;
4948
private const int kRepublishMessageExpiredTimeout = 10000;
5049

@@ -53,6 +52,11 @@ public class Subscription : ISnapshotRestore<SubscriptionState>, IDisposable, IC
5352
/// </summary>
5453
public const int RepublishMessageTimeout = 2500;
5554

55+
/// <summary>
56+
/// Minimum keep alive interval
57+
/// </summary>
58+
public const int MinKeepAliveTimerInterval = 1000;
59+
5660
/// <summary>
5761
/// Create subscription
5862
/// </summary>
@@ -2125,7 +2129,9 @@ private void HandleOnKeepAliveStopped()
21252129

21262130
if (session != null &&
21272131
session.Connected &&
2128-
!session.Reconnecting)
2132+
!session.Reconnecting &&
2133+
!session.KeepAliveStopped
2134+
)
21292135
{
21302136
TraceState("PUBLISHING STOPPED");
21312137

@@ -2219,7 +2225,7 @@ private int BeginPublishTimeout()
22192225
{
22202226
return Math.Max(
22212227
Math.Min(m_keepAliveInterval * 3, int.MaxValue),
2222-
kMinKeepAliveTimerInterval);
2228+
MinKeepAliveTimerInterval);
22232229
}
22242230

22252231
/// <summary>
@@ -2333,12 +2339,12 @@ private int CalculateKeepAliveInterval()
23332339
{
23342340
int keepAliveInterval = (int)
23352341
Math.Min(CurrentPublishingInterval * (CurrentKeepAliveCount + 1), int.MaxValue);
2336-
if (keepAliveInterval < kMinKeepAliveTimerInterval)
2342+
if (keepAliveInterval < MinKeepAliveTimerInterval)
23372343
{
23382344
keepAliveInterval = (int)Math.Min(
23392345
PublishingInterval * (KeepAliveCount + 1),
23402346
int.MaxValue);
2341-
keepAliveInterval = Math.Max(kMinKeepAliveTimerInterval, keepAliveInterval);
2347+
keepAliveInterval = Math.Max(MinKeepAliveTimerInterval, keepAliveInterval);
23422348
}
23432349
return keepAliveInterval;
23442350
}

0 commit comments

Comments
 (0)