GithubStar/UA-.NETStandard
1
0
Fork 0
mirror of https://github.com/OPCFoundation/UA-.NETStandard.git synced 2026-10-26 04:19:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8 from OPCFoundation/prototyping

Browse Source 
Merge Publisher fixes
This commit is contained in:
Martin Regen
2016-11-11 12:22:08 +01:00
committed by GitHub
parent 468b4449d8 dba46b47c0
commit 0760916637
18 changed files with 604 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SampleApplications/Samples/NetCoreConsolePublisher/AmqpConnection.cs
+135 -51
View File
@@ -17,10 +17,6 @@ namespace Opc.Ua.Publisher
[CollectionDataContract(Name = "ListOfAmqpConnectionConfigurations", Namespace = Namespaces.OpcUaConfig, ItemName = "AmqpConnectionConfiguration")]
public partial class AmqpConnectionCollection : List<AmqpConnection>
{
public AmqpConnectionCollection()
{
}
public static AmqpConnectionCollection Load(ApplicationConfiguration configuration)
{
return configuration.ParseExtension<AmqpConnectionCollection>();
@@ -75,12 +71,16 @@ namespace Opc.Ua.Publisher
private Connection m_connection;
private Session m_session;
private SenderLink m_link;
private Queue<ArraySegment<byte>> messages;
private LinkedList<ArraySegment<byte>> messages;
private DateTime m_currentExpiryTime;
private Timer m_tokenRenewalTimer;
private bool m_closed;
private int m_counter;
private int m_sendCounter;
private int m_sendAcceptedCounter;
private int m_sendRejectedCounter;
private object m_sending;
private int m_sendallthreads;
#endregion
@@ -108,7 +108,16 @@ namespace Opc.Ua.Publisher
/// </summary>
private void Initialize()
{
messages = new Queue<ArraySegment<byte>>();
m_connection = null;
m_session = null;
m_link = null;
m_closed = true;
m_sending = new object();
m_sendallthreads = 0;
messages = new LinkedList<ArraySegment<byte>>();
m_sendCounter = 0;
m_sendAcceptedCounter = 0;
m_sendRejectedCounter = 0;
}
#endregion
@@ -119,33 +128,51 @@ namespace Opc.Ua.Publisher
/// <returns></returns>
public async Task OpenAsync()
{
Close();
ConnectionFactory factory = new ConnectionFactory();
factory.AMQP.ContainerId = Guid.NewGuid().ToString();
if (UseCbs)
// make sure only one SendAll or OpenAsync task is active
if (Interlocked.Increment(ref m_sendallthreads) != 1)
{
factory.SASL.Profile = SaslProfile.External;
Interlocked.Decrement(ref m_sendallthreads);
return;
}
m_connection = await factory.CreateAsync(GetAddress());
m_connection.Closed += new ClosedCallback(OnConnectionClosed);
if (UseCbs && KeyName != null && KeyValue != null)
try
{
await StartCbs();
Close();
ConnectionFactory factory = new ConnectionFactory();
factory.AMQP.ContainerId = Guid.NewGuid().ToString();
if (UseCbs)
{
factory.SASL.Profile = SaslProfile.External;
}
m_connection = await factory.CreateAsync(GetAddress());
m_connection.Closed += new ClosedCallback(OnConnectionClosed);
if (UseCbs && KeyName != null && KeyValue != null)
{
await StartCbs();
}
else
{
await ResetLinkAsync();
}
Utils.Trace("AMQP Connection opened, connected to '{0}'...", Endpoint);
m_closed = false;
}
else
catch (Exception e)
{
await ResetLinkAsync();
Utils.Trace("AMQP Connection failed to open, exception: {0}...", e.Message);
}
finally
{
Interlocked.Decrement(ref m_sendallthreads);
}
Utils.Trace("AMQP Connection opened, connected to '{0}'...", Endpoint);
m_closed = false;
// Push out the messages we have so far
await Task.Run(new Action(SendAll));
SendAll();
}
/// <summary>
@@ -156,7 +183,7 @@ namespace Opc.Ua.Publisher
{
lock (messages)
{
messages.Enqueue(body);
messages.AddLast(body);
}
if (IsClosed())
@@ -175,16 +202,40 @@ namespace Opc.Ua.Publisher
/// </summary>
protected void SendAll()
{
// make sure only one send all task is active
if (Interlocked.Increment(ref m_sendallthreads) != 1)
{
Interlocked.Decrement(ref m_sendallthreads);
return;
}
try
{
lock (messages)
while (!IsClosed())
{
while (!IsClosed() && messages.Count != 0)
ArraySegment<byte> onemessage;
lock (messages)
{
bool sent = SendOne(messages.Peek());
if (sent)
if (messages.Count == 0)
{
messages.Dequeue();
break;
}
onemessage = messages.First.Value;
messages.RemoveFirst();
}
bool sent;
lock (m_sending)
{
sent = SendOneAsync(onemessage, SendAllCallback);
}
if (!sent)
{
lock (messages)
{
messages.AddFirst(onemessage);
}
}
}
@@ -193,6 +244,34 @@ namespace Opc.Ua.Publisher
{
Close();
}
finally
{
Interlocked.Decrement(ref m_sendallthreads);
}
}
/// <summary>
/// Send outcome callback
/// </summary>
/// <param name="body"></param>
/// <returns>Whether message was sent</returns>
void SendAllCallback(Message message, Outcome outcome, object state)
{
if (outcome.Descriptor.Code == 36)
{
// accepted
m_sendAcceptedCounter++;
}
else
{
// rejected or other fail reason
m_sendRejectedCounter++;
}
if (((m_sendRejectedCounter + m_sendAcceptedCounter) % 100) == 0)
{
Utils.Trace("Send Statistics: {0} sent {1} accepted {2} rejected",
m_sendCounter, m_sendAcceptedCounter, m_sendRejectedCounter);
}
}
/// <summary>
@@ -200,32 +279,32 @@ namespace Opc.Ua.Publisher
/// </summary>
/// <param name="body"></param>
/// <returns>Whether message was sent</returns>
protected bool SendOne(ArraySegment<byte> body)
protected bool SendOneAsync(ArraySegment<byte> body, OutcomeCallback SendCallback)
{
m_counter++;
if (IsClosed())
{
return false;
}
var istrm = new MemoryStream(body.Array, body.Offset, body.Count, false);
Message message = new Message()
using (var istrm = new MemoryStream(body.Array, body.Offset, body.Count, false))
{
BodySection = new Data() { Binary = istrm.ToArray() }
};
Message message = new Message()
{
BodySection = new Data() { Binary = istrm.ToArray() }
};
message.Properties = new Properties()
{
MessageId = Guid.NewGuid().ToString(),
ContentType = "application/opcua+json"
};
message.Properties = new Properties()
{
MessageId = Guid.NewGuid().ToString(),
ContentType = "application/opcua+json"
};
if (m_link != null)
{
m_link.Send(message, 6000);
return true;
if (m_link != null)
{
m_sendCounter++;
m_link.Send(message, SendCallback, null);
return true;
}
}
return false;
@@ -237,6 +316,11 @@ namespace Opc.Ua.Publisher
public void Close()
{
m_closed = true;
if (m_tokenRenewalTimer != null)
{
m_tokenRenewalTimer.Dispose();
m_tokenRenewalTimer = null;
}
Dispose(true);
}
@@ -442,12 +526,12 @@ namespace Opc.Ua.Publisher
{
try
{
lock (messages)
lock (m_sending)
{
bool result = RenewTokenAsync(GenerateSharedAccessToken()).Wait(60000);
bool result = RenewTokenAsync(GenerateSharedAccessToken()).Wait(TokenLifetime);
if (!result)
{
Utils.Trace( "Unexpected timeout error renewing token.");
Utils.Trace("Unexpected timeout error renewing token.");
}
}
}
SampleApplications/Samples/NetCoreConsolePublisher/Opc.Ua.Publisher.config.xml → SampleApplications/Samples/NetCoreConsolePublisher/Opc.Ua.Publisher.Config.xml
+6 -2
View File
@@ -91,6 +91,10 @@
<StorePath>OPC Foundation/CertificateStores/RejectedCertificates</StorePath>
</RejectedCertificateStore>
<!-- WARNING: The following setting (to automatically accept untrusted certificates) should be used
for easy debugging purposes ONLY and turned off for production deployments! -->
<AutoAcceptUntrustedCertificates>true</AutoAcceptUntrustedCertificates>
</SecurityConfiguration>
<TransportConfigurations></TransportConfigurations>
@@ -143,8 +147,8 @@
For example, a URL used for an endpoint which uses the Basic256 security policy would look like this:
http://localhost:61211/UA/SampleClient/Basic256 -->
<BaseAddresses>
<ua:String>opc.tcp://localhost:61210/UA/SampleClient</ua:String>
<ua:String>https://localhost:61212/UA/SampleClient/</ua:String>
<ua:String>opc.tcp://localhost:61410/UA/Publisher</ua:String>
<ua:String>https://localhost:61412/UA/Publisher/</ua:String>
</BaseAddresses>
<!--
SampleApplications/Samples/NetCoreConsolePublisher/Opc.Ua.Publisher.Endpoints.xml
+1 -17
View File
@@ -7,23 +7,7 @@
<ua:Endpoints>
<ua:ConfiguredEndpoint>
<ua:Endpoint>
<EndpointUrl>opc.tcp://localhost:61210/UA/SampleClient</EndpointUrl>
<SecurityMode>SignAndEncrypt_3</SecurityMode>
<SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15</SecurityPolicyUri>
<UserIdentityTokens>
<UserTokenPolicy>
<TokenType>Anonymous_0</TokenType>
</UserTokenPolicy>
</UserIdentityTokens>
<TransportProfileUri>http://opcfoundation.org/UA/profiles/transport/wsxmlorbinary</TransportProfileUri>
<SecurityLevel>0</SecurityLevel>
</ua:Endpoint>
<ua:UpdateBeforeConnect>true</ua:UpdateBeforeConnect>
<ua:SelectedUserTokenPolicy>0</ua:SelectedUserTokenPolicy>
</ua:ConfiguredEndpoint>
<ua:ConfiguredEndpoint>
<ua:Endpoint>
<EndpointUrl>opc.tcp://192.168.2.101:51210/UA/SampleServer</EndpointUrl>
<EndpointUrl>opc.tcp://localhost:61410/UA/Publisher</EndpointUrl>
<SecurityMode>SignAndEncrypt_3</SecurityMode>
<SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15</SecurityPolicyUri>
<UserIdentityTokens>
SampleApplications/Samples/NetCoreConsolePublisher/Program.cs
+105 -83
View File
@@ -19,6 +19,7 @@ using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace NetCoreConsolePublisher
@@ -58,16 +59,22 @@ namespace NetCoreConsolePublisher
{
Console.WriteLine(message);
}
if (ask)
{
ConsoleKeyInfo result = Console.ReadKey();
Console.WriteLine();
return await Task.FromResult((result.KeyChar == 'y') || (result.KeyChar == 'Y') || (result.KeyChar == '\r'));
}
else
{
return await Task.FromResult(true);
try
{
ConsoleKeyInfo result = Console.ReadKey();
Console.WriteLine();
return await Task.FromResult((result.KeyChar == 'y') || (result.KeyChar == 'Y') || (result.KeyChar == '\r'));
}
catch
{
// intentionally fall through
}
}
return await Task.FromResult(true);
}
}
@@ -80,6 +87,38 @@ namespace NetCoreConsolePublisher
private static Session m_session = null;
public static void Main(string[] args)
{
bool started = false;
try
{
Task t = ConsoleSamplePublisher();
t.Wait();
Console.WriteLine("Publisher started. Press any key to exit...");
started = true;
}
catch (Exception ex)
{
Utils.Trace("Exception:" + ex.Message);
Console.WriteLine("Exception: {0}", ex.Message);
Console.WriteLine("Press any key to exit...");
}
try {
Console.ReadKey(true);
}
catch
{
if (started)
{
// wait forever if there is no console
Thread.Sleep(Timeout.Infinite);
}
}
CleanupPublisher();
}
private static async Task ConsoleSamplePublisher()
{
ApplicationInstance.MessageDlg = new ApplicationMessageDlg();
ApplicationInstance application = new ApplicationInstance();
@@ -87,90 +126,73 @@ namespace NetCoreConsolePublisher
application.ApplicationType = ApplicationType.ClientAndServer;
application.ConfigSectionName = "Opc.Ua.Publisher";
try
// load the application configuration.
m_configuration = await application.LoadApplicationConfiguration(false);
// check the application certificate.
bool certOK = await application.CheckApplicationInstanceCertificate(false, 0);
if (!certOK)
{
// load the application configuration.
Task<ApplicationConfiguration> task = application.LoadApplicationConfiguration(false);
task.Wait();
m_configuration = task.Result;
// check the application certificate.
Task<bool> task2 = application.CheckApplicationInstanceCertificate(false, 0);
task2.Wait();
bool certOK = task2.Result;
if (!certOK)
{
throw new Exception("Application instance certificate invalid!");
}
// start the server.
Task task3 = application.Start(new SampleServer());
task3.Wait();
// get list of cached endpoints.
m_endpoints = m_configuration.LoadCachedEndpoints(true);
m_endpoints.DiscoveryUrls = m_configuration.ClientConfiguration.WellKnownDiscoveryUrls;
// start publishers.
m_publishers = AmqpConnectionCollection.Load(m_configuration);
foreach (AmqpConnection publisher in m_publishers)
{
Task t = publisher.OpenAsync();
}
m_MonitoredItem_Notification = new MonitoredItemNotificationEventHandler(MonitoredItem_Notification);
// connect to a server.
EndpointConnect();
// publish preconfigured nodes
PublishedNodesCollection nodes = PublishedNodesCollection.Load(m_configuration);
foreach (NodeId node in nodes)
{
CreateMonitoredItem(node);
}
Console.WriteLine("Publisher started. Press any key to exit...");
Console.ReadKey(true);
if (m_publishers != null)
{
foreach (var publisher in m_publishers)
{
publisher.Close();
}
}
if (m_session != null)
{
m_session.Close();
}
throw new Exception("Application instance certificate invalid!");
}
catch (ServiceResultException ex)
// start the server.
await application.Start(new SampleServer());
// get list of cached endpoints.
m_endpoints = m_configuration.LoadCachedEndpoints(true);
m_endpoints.DiscoveryUrls = m_configuration.ClientConfiguration.WellKnownDiscoveryUrls;
// start publishers.
m_publishers = AmqpConnectionCollection.Load(m_configuration);
foreach (AmqpConnection publisher in m_publishers)
{
Utils.Trace("ServiceResultException:" + ex.Message);
Console.WriteLine("Exception: {0}", ex.Message);
Console.WriteLine("Press any key to exit...");
Console.ReadKey(true);
await publisher.OpenAsync();
}
m_MonitoredItem_Notification = new MonitoredItemNotificationEventHandler(MonitoredItem_Notification);
// connect to first server
await EndpointConnect(0);
// publish preconfigured nodes
PublishedNodesCollection nodes = PublishedNodesCollection.Load(m_configuration);
foreach (NodeId node in nodes)
{
CreateMonitoredItem(node);
}
}
public static void EndpointConnect()
private static void CleanupPublisher()
{
// Connect to the first cached endpoint in our list
if (m_endpoints.Count > 0)
if (m_publishers != null)
{
Task<Session> task = Session.Create(
m_configuration,
m_endpoints[0],
true,
false,
m_configuration.ApplicationName,
60000,
null,
null);
task.Wait();
m_session = task.Result;
foreach (var publisher in m_publishers)
{
publisher.Close();
}
}
if (m_session != null)
{
m_session.Close();
}
}
private static async Task EndpointConnect(int endpoint)
{
// Connect to cached endpoint in our list
if (m_endpoints.Count > endpoint)
{
m_session = await Session.Create(
m_configuration,
m_endpoints[endpoint],
true,
false,
m_configuration.ApplicationName,
60000,
null,
null);
if (m_session != null)
{
SampleApplications/Samples/Opc.Ua.Sample/Boiler/BoilerNodeManager.cs
+13 -5
View File
@@ -132,8 +132,12 @@ namespace Boiler
AddPredefinedNode(context, boiler);
// Autostart boiler simulation
boiler.OnControlSimulation(context, null, 0, Opc.Ua.Methods.ProgramStateMachineType_Start, null, null);
// Autostart boiler simulation state machine
MethodState start = boiler.Simulation.Start;
IList<Variant> inputArguments = new List<Variant>();
IList<Variant> outputArguments = new List<Variant>();
List<ServiceResult> errors = new List<ServiceResult>();
start.Call(context, boiler.NodeId, inputArguments, errors, outputArguments);
}
@@ -203,15 +207,19 @@ namespace Boiler
BoilerState activeNode = new BoilerState(passiveNode.Parent);
activeNode.Create(context, passiveNode);
// Autostart boiler simulation
activeNode.OnControlSimulation(context, null, 0, Opc.Ua.Methods.ProgramStateMachineType_Start, null, null);
// replace the node in the parent.
if (passiveNode.Parent != null)
{
passiveNode.Parent.ReplaceChild(context, activeNode);
}
// Autostart boiler simulation state machine
MethodState start = activeNode.Simulation.Start;
IList<Variant> inputArguments = new List<Variant>();
IList<Variant> outputArguments = new List<Variant>();
List<ServiceResult> errors = new List<ServiceResult>();
start.Call(context, activeNode.NodeId, inputArguments, errors, outputArguments);
return activeNode;
}
}
SampleApplications/Samples/Opc.Ua.Sample/Boiler/BoilerState.cs
+1 -1
View File
@@ -71,7 +71,7 @@ namespace Boiler
/// <summary>
/// Changes the state of the simulation.
/// </summary>
public ServiceResult OnControlSimulation(
private ServiceResult OnControlSimulation(
ISystemContext context,
StateMachineState machine,
uint transitionId,
SampleApplications/Samples/Publisher.Net4/AmqpConnection.cs
+144 -47
View File
@@ -71,12 +71,16 @@ namespace Opc.Ua.Publisher
private Connection m_connection;
private Session m_session;
private SenderLink m_link;
private Queue<ArraySegment<byte>> messages;
private LinkedList<ArraySegment<byte>> messages;
private DateTime m_currentExpiryTime;
private Timer m_tokenRenewalTimer;
private bool m_closed;
private int m_counter;
private int m_sendCounter;
private int m_sendAcceptedCounter;
private int m_sendRejectedCounter;
private object m_sending;
private int m_sendallthreads;
#endregion
@@ -104,7 +108,16 @@ namespace Opc.Ua.Publisher
/// </summary>
private void Initialize()
{
messages = new Queue<ArraySegment<byte>>();
m_connection = null;
m_session = null;
m_link = null;
m_closed = true;
m_sending = new object();
m_sendallthreads = 0;
messages = new LinkedList<ArraySegment<byte>>();
m_sendCounter = 0;
m_sendAcceptedCounter = 0;
m_sendRejectedCounter = 0;
}
#endregion
@@ -115,33 +128,51 @@ namespace Opc.Ua.Publisher
/// <returns></returns>
public async Task OpenAsync()
{
Close();
ConnectionFactory factory = new ConnectionFactory();
factory.AMQP.ContainerId = Guid.NewGuid().ToString();
if (UseCbs)
// make sure only one SendAll or OpenAsync task is active
if (Interlocked.Increment(ref m_sendallthreads) != 1)
{
factory.SASL.Profile = SaslProfile.External;
Interlocked.Decrement(ref m_sendallthreads);
return;
}
m_connection = await factory.CreateAsync(GetAddress());
m_connection.Closed += new ClosedCallback(OnConnectionClosed);
if (UseCbs && KeyName != null && KeyValue != null)
try
{
await StartCbs();
Close();
ConnectionFactory factory = new ConnectionFactory();
factory.AMQP.ContainerId = Guid.NewGuid().ToString();
if (UseCbs)
{
factory.SASL.Profile = SaslProfile.External;
}
m_connection = await factory.CreateAsync(GetAddress());
m_connection.Closed += new ClosedCallback(OnConnectionClosed);
if (UseCbs && KeyName != null && KeyValue != null)
{
await StartCbs();
}
else
{
await ResetLinkAsync();
}
Utils.Trace("AMQP Connection opened, connected to '{0}'...", Endpoint);
m_closed = false;
}
else
catch (Exception e)
{
await ResetLinkAsync();
Utils.Trace("AMQP Connection failed to open, exception: {0}...", e.Message);
}
finally
{
Interlocked.Decrement(ref m_sendallthreads);
}
Utils.Trace("AMQP Connection opened, connected to '{0}'...", Endpoint);
m_closed = false;
// Push out the messages we have so far
await Task.Run(new Action(SendAll));
SendAll();
}
/// <summary>
@@ -152,10 +183,14 @@ namespace Opc.Ua.Publisher
{
lock (messages)
{
messages.Enqueue(body);
messages.AddLast(body);
}
if (!IsClosed())
if (IsClosed())
{
Task.Run(OpenAsync);
}
else
{
// Push out the messages we have so far
Task.Run(new Action(SendAll));
@@ -167,16 +202,40 @@ namespace Opc.Ua.Publisher
/// </summary>
protected void SendAll()
{
// make sure only one send all task is active
if (Interlocked.Increment(ref m_sendallthreads) != 1)
{
Interlocked.Decrement(ref m_sendallthreads);
return;
}
try
{
lock (messages)
while (!IsClosed())
{
while (!IsClosed() && messages.Count != 0)
ArraySegment<byte> onemessage;
lock (messages)
{
bool sent = SendOne(messages.Peek());
if (sent)
if (messages.Count == 0)
{
messages.Dequeue();
break;
}
onemessage = messages.First.Value;
messages.RemoveFirst();
}
bool sent;
lock (m_sending)
{
sent = SendOneAsync(onemessage, SendAllCallback);
}
if (!sent)
{
lock (messages)
{
messages.AddFirst(onemessage);
}
}
}
@@ -184,8 +243,34 @@ namespace Opc.Ua.Publisher
catch (Exception)
{
Close();
}
finally
{
Interlocked.Decrement(ref m_sendallthreads);
}
}
Task t = OpenAsync();
/// <summary>
/// Send outcome callback
/// </summary>
/// <param name="body"></param>
/// <returns>Whether message was sent</returns>
void SendAllCallback(Message message, Outcome outcome, object state)
{
if (outcome.Descriptor.Code == 36)
{
// accepted
m_sendAcceptedCounter++;
}
else
{
// rejected or other fail reason
m_sendRejectedCounter++;
}
if (((m_sendRejectedCounter + m_sendAcceptedCounter) % 100) == 0)
{
Utils.Trace("Send Statistics: {0} sent {1} accepted {2} rejected",
m_sendCounter, m_sendAcceptedCounter, m_sendRejectedCounter);
}
}
@@ -194,32 +279,32 @@ namespace Opc.Ua.Publisher
/// </summary>
/// <param name="body"></param>
/// <returns>Whether message was sent</returns>
protected bool SendOne(ArraySegment<byte> body)
protected bool SendOneAsync(ArraySegment<byte> body, OutcomeCallback SendCallback)
{
m_counter++;
if (IsClosed())
{
return false;
}
var istrm = new MemoryStream(body.Array, body.Offset, body.Count, false);
Message message = new Message()
using (var istrm = new MemoryStream(body.Array, body.Offset, body.Count, false))
{
BodySection = new Data() { Binary = istrm.ToArray() }
};
Message message = new Message()
{
BodySection = new Data() { Binary = istrm.ToArray() }
};
message.Properties = new Properties()
{
MessageId = Guid.NewGuid().ToString(),
ContentType = "application/opcua+json"
};
message.Properties = new Properties()
{
MessageId = Guid.NewGuid().ToString(),
ContentType = "application/opcua+json"
};
if (m_link != null)
{
m_link.Send(message, 6000);
return true;
if (m_link != null)
{
m_sendCounter++;
m_link.Send(message, SendCallback, null);
return true;
}
}
return false;
@@ -231,6 +316,11 @@ namespace Opc.Ua.Publisher
public void Close()
{
m_closed = true;
if (m_tokenRenewalTimer != null)
{
m_tokenRenewalTimer.Dispose();
m_tokenRenewalTimer = null;
}
Dispose(true);
}
@@ -436,7 +526,14 @@ namespace Opc.Ua.Publisher
{
try
{
RenewTokenAsync(GenerateSharedAccessToken()).Wait(60000);
lock (m_sending)
{
bool result = RenewTokenAsync(GenerateSharedAccessToken()).Wait(TokenLifetime);
if (!result)
{
Utils.Trace("Unexpected timeout error renewing token.");
}
}
}
catch (Exception e)
{
SampleApplications/Samples/Publisher.Net4/Opc.Ua.Publisher.Endpoints.xml
+1 -17
View File
@@ -7,23 +7,7 @@
<ua:Endpoints>
<ua:ConfiguredEndpoint>
<ua:Endpoint>
<EndpointUrl>opc.tcp://localhost:61210/UA/Publisher</EndpointUrl>
<SecurityMode>SignAndEncrypt_3</SecurityMode>
<SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15</SecurityPolicyUri>
<UserIdentityTokens>
<UserTokenPolicy>
<TokenType>Anonymous_0</TokenType>
</UserTokenPolicy>
</UserIdentityTokens>
<TransportProfileUri>http://opcfoundation.org/UA/profiles/transport/wsxmlorbinary</TransportProfileUri>
<SecurityLevel>0</SecurityLevel>
</ua:Endpoint>
<ua:UpdateBeforeConnect>true</ua:UpdateBeforeConnect>
<ua:SelectedUserTokenPolicy>0</ua:SelectedUserTokenPolicy>
</ua:ConfiguredEndpoint>
<ua:ConfiguredEndpoint>
<ua:Endpoint>
<EndpointUrl>opc.tcp://192.168.2.101:51210/UA/SampleServer</EndpointUrl>
<EndpointUrl>opc.tcp://localhost:61410/UA/Publisher</EndpointUrl>
<SecurityMode>SignAndEncrypt_3</SecurityMode>
<SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15</SecurityPolicyUri>
<UserIdentityTokens>
SampleApplications/Samples/Publisher.Net4/Opc.Ua.Publisher.Net4.csproj
+2 -2
View File
@@ -63,8 +63,8 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Amqp.Net, Version=1.1.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\AMQPNetLite.1.1.8\lib\net45\Amqp.Net.dll</HintPath>
<Reference Include="Amqp.Net, Version=1.2.0.0, Culture=neutral, PublicKeyToken=905a7b1e6458e0c3, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\AMQPNetLite.1.2.1\lib\net45\Amqp.Net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Opc.Ua.Client, Version=1.2.334.6, Culture=neutral, processorArchitecture=MSIL">
SampleApplications/Samples/Publisher.Net4/Opc.Ua.Publisher.config.xml
+2 -2
View File
@@ -143,8 +143,8 @@
For example, a URL used for an endpoint which uses the Basic256 security policy would look like this:
http://localhost:61211/UA/Publisher/Basic256 -->
<BaseAddresses>
<ua:String>opc.tcp://localhost:61210/UA/Publisher</ua:String>
<ua:String>https://localhost:61212/UA/Publisher/</ua:String>
<ua:String>opc.tcp://localhost:61410/UA/Publisher</ua:String>
<ua:String>https://localhost:61412/UA/Publisher/</ua:String>
</BaseAddresses>
<!--
SampleApplications/Samples/Publisher.Net4/PublisherForm.cs
+37 -30
View File
@@ -97,10 +97,6 @@ namespace Opc.Ua.Sample.Controls
Disconnect();
m_publishers = AmqpConnectionCollection.Load(configuration);
foreach (var publisher in m_publishers)
{
Task t = publisher.OpenAsync();
}
this.NotificationsCTRL.ItemsAdded += NotificationsCTRL_ItemsAdded;
}
@@ -111,34 +107,14 @@ namespace Opc.Ua.Sample.Controls
{
foreach (NotificationMessageListCtrl.ItemData item in e.Items)
{
if (item.NotificationMessage == null || item.Subscription.Session == null)
if (item.NotificationMessage != null && item.Subscription.Session != null)
{
return;
}
JsonEncoder encoder = new JsonEncoder(
item.Subscription.Session.MessageContext, false);
foreach (MonitoredItem monitoredItem in item.Subscription.MonitoredItems)
{
encoder.WriteNodeId("MonitoredItem", monitoredItem.ResolvedNodeId);
((DataChangeNotification)((NotificationData)item.NotificationMessage.NotificationData[0].Body)).MonitoredItems[0].Encode(encoder);
string json = encoder.Close();
json = json.Replace("\\", "");
byte[] bytes = new UTF8Encoding(false).GetBytes(json);
foreach (var publisher in m_publishers)
IList<MonitoredItemNotification> listOfNotifications = item.NotificationMessage.GetDataChanges(false);
foreach (MonitoredItemNotification notification in listOfNotifications)
{
try
{
publisher.Publish(new ArraySegment<byte>(bytes));
Utils.Trace(null, "Publishing: " + json);
}
catch (Exception ex)
{
Utils.Trace(ex, "Failed to publish message, dropping....");
}
// lookup the monitored item.
MonitoredItem monitoredItem = item.Subscription.FindItemByClientHandle(notification.ClientHandle);
this.CreateAmqpMessage(monitoredItem, notification.Value);
}
}
}
@@ -149,6 +125,37 @@ namespace Opc.Ua.Sample.Controls
}
}
private void CreateAmqpMessage(MonitoredItem monitoredItem, DataValue value)
{
JsonEncoder encoder = new JsonEncoder(
monitoredItem.Subscription.Session.MessageContext, false);
string hostname = monitoredItem.Subscription.Session.ConfiguredEndpoint.EndpointUrl.DnsSafeHost;
if (hostname == "localhost")
{
hostname = Utils.GetHostName();
}
encoder.WriteString("HostName", hostname);
encoder.WriteNodeId("MonitoredItem", monitoredItem.ResolvedNodeId);
encoder.WriteDataValue("Value", value);
var json = encoder.Close();
var bytes = new UTF8Encoding(false).GetBytes(json);
foreach (var publisher in m_publishers)
{
try
{
publisher.Publish(new ArraySegment<byte>(bytes));
Utils.Trace(null, "New JSON Message: " + json);
}
catch (Exception ex)
{
Utils.Trace(ex, "Failed to add message, dropping....");
}
}
}
/// <summary>
/// Opens a new form.
/// </summary>
SampleApplications/Samples/Publisher.Net4/packages.config
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AMQPNetLite" version="1.1.8" targetFramework="net46" />
<package id="AMQPNetLite" version="1.2.1" targetFramework="net46" />
<package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="net46" />
<package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="net46" />
<package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="net46" />
SampleApplications/Samples/Publisher/AmqpConnection.cs
+144 -47
View File
@@ -71,12 +71,16 @@ namespace Opc.Ua.Publisher
private Connection m_connection;
private Session m_session;
private SenderLink m_link;
private Queue<ArraySegment<byte>> messages;
private LinkedList<ArraySegment<byte>> messages;
private DateTime m_currentExpiryTime;
private Timer m_tokenRenewalTimer;
private bool m_closed;
private int m_counter;
private int m_sendCounter;
private int m_sendAcceptedCounter;
private int m_sendRejectedCounter;
private object m_sending;
private int m_sendallthreads;
#endregion
@@ -104,7 +108,16 @@ namespace Opc.Ua.Publisher
/// </summary>
private void Initialize()
{
messages = new Queue<ArraySegment<byte>>();
m_connection = null;
m_session = null;
m_link = null;
m_closed = true;
m_sending = new object();
m_sendallthreads = 0;
messages = new LinkedList<ArraySegment<byte>>();
m_sendCounter = 0;
m_sendAcceptedCounter = 0;
m_sendRejectedCounter = 0;
}
#endregion
@@ -115,33 +128,51 @@ namespace Opc.Ua.Publisher
/// <returns></returns>
public async Task OpenAsync()
{
Close();
ConnectionFactory factory = new ConnectionFactory();
factory.AMQP.ContainerId = Guid.NewGuid().ToString();
if (UseCbs)
// make sure only one SendAll or OpenAsync task is active
if (Interlocked.Increment(ref m_sendallthreads) != 1)
{
factory.SASL.Profile = SaslProfile.External;
Interlocked.Decrement(ref m_sendallthreads);
return;
}
m_connection = await factory.CreateAsync(GetAddress());
m_connection.Closed += new ClosedCallback(OnConnectionClosed);
if (UseCbs && KeyName != null && KeyValue != null)
try
{
await StartCbs();
Close();
ConnectionFactory factory = new ConnectionFactory();
factory.AMQP.ContainerId = Guid.NewGuid().ToString();
if (UseCbs)
{
factory.SASL.Profile = SaslProfile.External;
}
m_connection = await factory.CreateAsync(GetAddress());
m_connection.Closed += new ClosedCallback(OnConnectionClosed);
if (UseCbs && KeyName != null && KeyValue != null)
{
await StartCbs();
}
else
{
await ResetLinkAsync();
}
Utils.Trace("AMQP Connection opened, connected to '{0}'...", Endpoint);
m_closed = false;
}
else
catch (Exception e)
{
await ResetLinkAsync();
Utils.Trace("AMQP Connection failed to open, exception: {0}...", e.Message);
}
finally
{
Interlocked.Decrement(ref m_sendallthreads);
}
Utils.Trace("AMQP Connection opened, connected to '{0}'...", Endpoint);
m_closed = false;
// Push out the messages we have so far
await Task.Run(new Action(SendAll));
SendAll();
}
/// <summary>
@@ -152,10 +183,14 @@ namespace Opc.Ua.Publisher
{
lock (messages)
{
messages.Enqueue(body);
messages.AddLast(body);
}
if (!IsClosed())
if (IsClosed())
{
Task.Run(OpenAsync);
}
else
{
// Push out the messages we have so far
Task.Run(new Action(SendAll));
@@ -167,16 +202,40 @@ namespace Opc.Ua.Publisher
/// </summary>
protected void SendAll()
{
// make sure only one send all task is active
if (Interlocked.Increment(ref m_sendallthreads) != 1)
{
Interlocked.Decrement(ref m_sendallthreads);
return;
}
try
{
lock (messages)
while (!IsClosed())
{
while (!IsClosed() && messages.Count != 0)
ArraySegment<byte> onemessage;
lock (messages)
{
bool sent = SendOne(messages.Peek());
if (sent)
if (messages.Count == 0)
{
messages.Dequeue();
break;
}
onemessage = messages.First.Value;
messages.RemoveFirst();
}
bool sent;
lock (m_sending)
{
sent = SendOneAsync(onemessage, SendAllCallback);
}
if (!sent)
{
lock (messages)
{
messages.AddFirst(onemessage);
}
}
}
@@ -184,8 +243,34 @@ namespace Opc.Ua.Publisher
catch (Exception)
{
Close();
}
finally
{
Interlocked.Decrement(ref m_sendallthreads);
}
}
Task t = OpenAsync();
/// <summary>
/// Send outcome callback
/// </summary>
/// <param name="body"></param>
/// <returns>Whether message was sent</returns>
void SendAllCallback(Message message, Outcome outcome, object state)
{
if (outcome.Descriptor.Code == 36)
{
// accepted
m_sendAcceptedCounter++;
}
else
{
// rejected or other fail reason
m_sendRejectedCounter++;
}
if (((m_sendRejectedCounter + m_sendAcceptedCounter) % 100) == 0)
{
Utils.Trace("Send Statistics: {0} sent {1} accepted {2} rejected",
m_sendCounter, m_sendAcceptedCounter, m_sendRejectedCounter);
}
}
@@ -194,32 +279,32 @@ namespace Opc.Ua.Publisher
/// </summary>
/// <param name="body"></param>
/// <returns>Whether message was sent</returns>
protected bool SendOne(ArraySegment<byte> body)
protected bool SendOneAsync(ArraySegment<byte> body, OutcomeCallback SendCallback)
{
m_counter++;
if (IsClosed())
{
return false;
}
var istrm = new MemoryStream(body.Array, body.Offset, body.Count, false);
Message message = new Message()
using (var istrm = new MemoryStream(body.Array, body.Offset, body.Count, false))
{
BodySection = new Data() { Binary = istrm.ToArray() }
};
Message message = new Message()
{
BodySection = new Data() { Binary = istrm.ToArray() }
};
message.Properties = new Properties()
{
MessageId = Guid.NewGuid().ToString(),
ContentType = "application/opcua+json"
};
message.Properties = new Properties()
{
MessageId = Guid.NewGuid().ToString(),
ContentType = "application/opcua+json"
};
if (m_link != null)
{
m_link.Send(message, 6000);
return true;
if (m_link != null)
{
m_sendCounter++;
m_link.Send(message, SendCallback, null);
return true;
}
}
return false;
@@ -231,6 +316,11 @@ namespace Opc.Ua.Publisher
public void Close()
{
m_closed = true;
if (m_tokenRenewalTimer != null)
{
m_tokenRenewalTimer.Dispose();
m_tokenRenewalTimer = null;
}
Dispose(true);
}
@@ -436,7 +526,14 @@ namespace Opc.Ua.Publisher
{
try
{
RenewTokenAsync(GenerateSharedAccessToken()).Wait(60000);
lock (m_sending)
{
bool result = RenewTokenAsync(GenerateSharedAccessToken()).Wait(TokenLifetime);
if (!result)
{
Utils.Trace("Unexpected timeout error renewing token.");
}
}
}
catch (Exception e)
{
SampleApplications/Samples/Publisher/ClientPage.xaml.cs
+6 -5
View File
@@ -99,11 +99,6 @@ namespace Opc.Ua.Publisher
m_publishers = AmqpConnectionCollection.Load(configuration);
foreach (var publisher in m_publishers)
{
Task t = publisher.OpenAsync();
}
m_MonitoredItem_Notification = new MonitoredItemNotificationEventHandler(MonitoredItem_Notification);
}
@@ -545,6 +540,12 @@ namespace Opc.Ua.Publisher
JsonEncoder encoder = new JsonEncoder(
monitoredItem.Subscription.Session.MessageContext, false);
string hostname = monitoredItem.Subscription.Session.ConfiguredEndpoint.EndpointUrl.DnsSafeHost;
if (hostname == "localhost")
{
hostname = Utils.GetHostName();
}
encoder.WriteString("HostName", hostname);
encoder.WriteNodeId("MonitoredItem", monitoredItem.ResolvedNodeId);
e.NotificationValue.Encode(encoder);
SampleApplications/Samples/Publisher/Opc.Ua.Publisher.Endpoints.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<ua:Endpoints>
<ua:ConfiguredEndpoint>
<ua:Endpoint>
<EndpointUrl>opc.tcp://localhost:61210/UA/SampleClient</EndpointUrl>
<EndpointUrl>opc.tcp://localhost:61410/UA/Publisher</EndpointUrl>
<SecurityMode>SignAndEncrypt_3</SecurityMode>
<SecurityPolicyUri>http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15</SecurityPolicyUri>
<UserIdentityTokens>
SampleApplications/Samples/Publisher/Opc.Ua.Publisher.config.xml
+2 -2
View File
@@ -143,8 +143,8 @@
For example, a URL used for an endpoint which uses the Basic256 security policy would look like this:
http://localhost:61211/UA/Publisher/Basic256 -->
<BaseAddresses>
<ua:String>opc.tcp://localhost:61210/UA/Publisher</ua:String>
<ua:String>https://localhost:61212/UA/Publisher/</ua:String>
<ua:String>opc.tcp://localhost:61410/UA/Publisher</ua:String>
<ua:String>https://localhost:61412/UA/Publisher/</ua:String>
</BaseAddresses>
<!--
SampleApplications/Samples/Publisher/Opc.Ua.Publisher.csproj
+2 -1
View File
@@ -205,7 +205,8 @@
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy "$(ProjectDir)OPC Foundation\*.*" "$(TargetDir)AppX\OPC Foundation" /I/E/R/Y</PostBuildEvent>
<PostBuildEvent>mkdir "$(ProjectDir)OPC Foundation"
xcopy "$(ProjectDir)OPC Foundation\*.*" "$(TargetDir)AppX\OPC Foundation" /I/E/R/Y</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
SampleApplications/Samples/Publisher/project.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"dependencies": {
"AMQPNetLite": "1.1.8",
"AMQPNetLite": "1.2.1",
"Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
"System.Xml.XmlDocument": "4.0.1"
},