OpenLogics/MewtocolNet
1
0
Fork 0
mirror of https://github.com/OpenLogics/MewtocolNet.git synced 2025-12-06 03:01:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed exception handling on receive

Browse Source
This commit is contained in:
Felix Weiß
2022-06-30 15:47:05 +02:00
parent e953938a65
commit e4ddad685a
2 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
MewtocolNet/Mewtocol/MewtocolInterface.cs
View File

@@ -101,6 +101,8 @@ namespace MewtocolNet {
internal List<Task> PriorityTasks { get; set; } = new List<Task>(); internal List<Task> PriorityTasks { get; set; } = new List<Task>();
internal int SendExceptionsInRow = 0;
#region Initialization #region Initialization
/// <summary> /// <summary>
@@ -600,43 +602,57 @@ namespace MewtocolNet {
await client.ConnectAsync(ip, port); await client.ConnectAsync(ip, port);
using (NetworkStream stream = client.GetStream()) { using (NetworkStream stream = client.GetStream()) {
var message = _blockString.ToHexASCIIBytes(); var message = _blockString.ToHexASCIIBytes();
var messageAscii = BitConverter.ToString(message).Replace("-", " "); var messageAscii = BitConverter.ToString(message).Replace("-", " ");
//send request //send request
using (var sendStream = new MemoryStream(message)) { try {
await sendStream.CopyToAsync(stream); using (var sendStream = new MemoryStream(message)) {
Logger.Log($"OUT MSG: {_blockString}", LogLevel.Critical, this); await sendStream.CopyToAsync(stream);
//log message sent Logger.Log($"OUT MSG: {_blockString}", LogLevel.Critical, this);
ASCIIEncoding enc = new ASCIIEncoding(); //log message sent
string characters = enc.GetString(message); ASCIIEncoding enc = new ASCIIEncoding();
string characters = enc.GetString(message);
}
} catch (IOException) {
return null;
} }
//await result //await result
StringBuilder response = new StringBuilder(); StringBuilder response = new StringBuilder();
byte[] responseBuffer = new byte[256]; try {
do {
int bytes = stream.Read(responseBuffer, 0, responseBuffer.Length); byte[] responseBuffer = new byte[256];
response.Append(Encoding.UTF8.GetString(responseBuffer, 0, bytes)); do {
int bytes = stream.Read(responseBuffer, 0, responseBuffer.Length);
response.Append(Encoding.UTF8.GetString(responseBuffer, 0, bytes));
}
while (stream.DataAvailable);
} catch (IOException) {
return null;
} }
while (stream.DataAvailable);
sw.Stop(); sw.Stop();
var curCycle = (int)sw.ElapsedMilliseconds; var curCycle = (int)sw.ElapsedMilliseconds;
if (Math.Abs(CycleTimeMs - curCycle) > 2) { if (Math.Abs(CycleTimeMs - curCycle) > 2) {
CycleTimeMs = curCycle; CycleTimeMs = curCycle;
} }
Logger.Log($"IN MSG ({(int)sw.Elapsed.TotalMilliseconds}ms): {_blockString}", LogLevel.Critical, this); Logger.Log($"IN MSG ({(int)sw.Elapsed.TotalMilliseconds}ms): {_blockString}", LogLevel.Critical, this);
SendExceptionsInRow = 0;
return response.ToString(); return response.ToString();
} }
} catch (Exception) { } catch (SocketException) {
if (IsConnected) { if (IsConnected) {
CycleTimeMs = 0; CycleTimeMs = 0;
IsConnected = false; IsConnected = false;
Disconnected?.Invoke(); Disconnected?.Invoke();
KillPoller();
Logger.Log("The PLC connection was closed", LogLevel.Error, this);
} }
KillPoller();
Logger.Log("The PLC connection was closed", LogLevel.Error, this);
return null; return null;
} }

2
MewtocolNet/MewtocolNet.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<PackageId>MewtocolNet</PackageId> <PackageId>MewtocolNet</PackageId>
<Version>0.4.0</Version> <Version>0.4.1</Version>
<Authors>Felix Weiss</Authors> <Authors>Felix Weiss</Authors>
<Company>Womed</Company> <Company>Womed</Company>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>