luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2016-03-16 update 1 FboxConnector bug fix

Browse Source
This commit is contained in:
parallelbgls@outlook.com
2016-03-16 15:30:50 +08:00
parent 84f4eeda1e
commit 7ad109fe76
4 changed files with 428 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

299
Modbus.Net/Modbus.Net.FBox/FBoxConnector.cs
View File

@@ -27,26 +27,24 @@ namespace Modbus.Net.FBox
private OAuth2Client _oauth2; private OAuth2Client _oauth2;
private string _refreshToken; private string _refreshToken;
private HttpClient _httpClient; private HttpClient _httpClient { get; set; }
private HttpClient _httpClient2; private HttpClient _httpClient2 { get; set; }
private HubConnection _hubConnection; private HubConnection _hubConnection { get; set; }
private SignalRSigninMsg _msg; protected SignalRSigninMsg Msg { get; }
protected SignalRSigninMsg Msg => _msg; private DMonGroup _dataGroup { get; set; }
private DMonGroup _dataGroup; private string _groupUid { get; set; }
private int _state; private string _boxUid { get; set; }
private string _groupUid; private string _boxNo { get; set; }
private string _boxUid; private int _boxSessionId { get; set; }
private string _boxNo; private int _connectionState { get; set; }
private int _boxSessionId; private Dictionary<string, double> _data { get; set; }
private int _connectionState; private Dictionary<string, Type> _dataType { get; set; }
private Dictionary<string, double> _data;
private Dictionary<string, Type> _dataType;
private DateTime _timeStamp = DateTime.MinValue; private DateTime _timeStamp { get; set; } = DateTime.MinValue;
public override string ConnectionToken { get; } public override string ConnectionToken { get; }
private AsyncLock _lock = new AsyncLock(); //private AsyncLock _lock = new AsyncLock();
private Timer _timer; private Timer _timer;
@@ -57,20 +55,6 @@ namespace Modbus.Net.FBox
private bool _connected; private bool _connected;
public override bool IsConnected => _connected; public override bool IsConnected => _connected;
private bool Connected
{
get { return _connected; }
set
{
if (value == false)
{
Disconnect();
}
_connected = value;
}
}
private Constants _constants; private Constants _constants;
private Constants Constants => _constants ?? (_constants = new Constants()); private Constants Constants => _constants ?? (_constants = new Constants());
@@ -79,7 +63,7 @@ namespace Modbus.Net.FBox
Constants.SignalRServer = msg.SignalRServer; Constants.SignalRServer = msg.SignalRServer;
System.Net.ServicePointManager.ServerCertificateValidationCallback = delegate { return true; }; System.Net.ServicePointManager.ServerCertificateValidationCallback = delegate { return true; };
ConnectionToken = machineId + "," + localSequence; ConnectionToken = machineId + "," + localSequence;
_msg = msg; Msg = msg;
_data = new Dictionary<string, double>(); _data = new Dictionary<string, double>();
_dataType = new Dictionary<string, Type>(); _dataType = new Dictionary<string, Type>();
} }
@@ -88,13 +72,12 @@ namespace Modbus.Net.FBox
{ {
try try
{ {
var tokenResponse = await _oauth2.RequestRefreshTokenAsync(_refreshToken); var tokenResponse = await _oauth2.RequestRefreshTokenAsync(_refreshToken);
_refreshToken = tokenResponse.RefreshToken; _refreshToken = tokenResponse.RefreshToken;
_httpClient.SetBearerToken(tokenResponse.AccessToken); _httpClient.SetBearerToken(tokenResponse.AccessToken);
_httpClient2.SetBearerToken(tokenResponse.AccessToken); _httpClient2.SetBearerToken(tokenResponse.AccessToken);
_hubConnection.Stop();
_hubConnection.Headers["Authorization"] = "Bearer " + tokenResponse.AccessToken; _hubConnection.Headers["Authorization"] = "Bearer " + tokenResponse.AccessToken;
await _hubConnection.Start(); await _hubConnection.Start();
await await
@@ -133,29 +116,32 @@ namespace Modbus.Net.FBox
if (tokenResponse != null) if (tokenResponse != null)
{ {
_refreshToken = tokenResponse.RefreshToken; _refreshToken = tokenResponse.RefreshToken;
await CallService(Msg, tokenResponse.AccessToken); if (await CallService(Msg, tokenResponse.AccessToken))
} {
await await
_httpClient2.PostAsync( _httpClient2.PostAsync(
"dmon/group/" + _dataGroup.Uid + "/start", null); "dmon/group/" + _dataGroup.Uid + "/start", null);
Connected = true; _connected = true;
_timer = new Timer(ChangeToken, null, 3600*1000*4, 3600*1000*4); _timer = new Timer(ChangeToken, null, 3600*1000*4, 3600*1000*4);
Console.WriteLine("SignalR Connected success"); Console.WriteLine("SignalR Connected success");
return true; return true;
}
}
return false;
} }
catch (Exception e) catch (Exception e)
{ {
_oauth2 = null; _oauth2 = null;
Console.WriteLine("SignalR Connected failed"); Console.WriteLine("SignalR Connected failed " + e.Message);
Clear();
return false; return false;
} }
} }
private async Task CallService(SignalRSigninMsg msg, string token) private async Task<bool> CallService(SignalRSigninMsg msg, string token)
{
try
{ {
var guid = Guid.NewGuid().ToString(); var guid = Guid.NewGuid().ToString();
var baseAddress = Constants.AspNetWebApiSampleApi; var baseAddress = Constants.AspNetWebApiSampleApi;
@@ -176,10 +162,12 @@ namespace Modbus.Net.FBox
var response = await _httpClient.GetStringAsync("boxgroup"); var response = await _httpClient.GetStringAsync("boxgroup");
List<BoxGroup> boxGroups = JsonConvert.DeserializeObject<List<BoxGroup>>(response); List<BoxGroup> boxGroups = JsonConvert.DeserializeObject<List<BoxGroup>>(response);
if (boxGroups == null) return false;
foreach (var boxGroup in boxGroups) foreach (var boxGroup in boxGroups)
{ {
var boxes = boxGroup.BoxRegs; var boxes = boxGroup.BoxRegs;
if (boxes == null) continue;
foreach (var box in boxes) foreach (var box in boxes)
{ {
var sessionId = box.Box.CurrentSessionId; var sessionId = box.Box.CurrentSessionId;
@@ -189,8 +177,12 @@ namespace Modbus.Net.FBox
var boxNo = box.Box.BoxNo; var boxNo = box.Box.BoxNo;
var connectionState = box.Box.ConnectionState; var connectionState = box.Box.ConnectionState;
if (boxNo != MachineId) continue; if (boxNo != MachineId) continue;
if (connectionState != 1)
{
_connected = false;
return false;
}
_httpClient2 = new HttpClient _httpClient2 = new HttpClient
{ {
@@ -283,28 +275,37 @@ namespace Modbus.Net.FBox
dataHubProxy.On<int, string, int, int>("boxConnectionStateChanged", dataHubProxy.On<int, string, int, int>("boxConnectionStateChanged",
async (newConnectionToken, getBoxUid, oldStatus, newStatus) => async (newConnectionToken, getBoxUid, oldStatus, newStatus) =>
{ {
//#if DEBUG #if DEBUG
//Console.WriteLine( Console.WriteLine(
//$"Box uid {getBoxUid} change state at {DateTime.Now} new connectionToken {newConnectionToken} newStatus {newStatus}"); $"Box uid {getBoxUid} change state at {DateTime.Now} new connectionToken {newConnectionToken} newStatus {newStatus}");
//#endif #endif
sessionId = newConnectionToken; sessionId = newConnectionToken;
_boxSessionId = sessionId; _boxSessionId = sessionId;
_connectionState = newStatus; _connectionState = newStatus;
_httpClient2.DefaultRequestHeaders.Remove("X-FBox-Session"); if (!IsConnected || _httpClient2 == null || _hubConnection == null)
_httpClient2.DefaultRequestHeaders.Add("X-FBox-Session",
sessionId.ToString());
_hubConnection.Headers["X-FBox-Session"] = sessionId.ToString();
if (_hubConnection.State == ConnectionState.Disconnected)
{ {
await _hubConnection.Start(); Clear();
return;
} }
try
{
while (
!_httpClient2.DefaultRequestHeaders.TryAddWithoutValidation("X-FBox-Session",
sessionId.ToString()))
{
_httpClient2.DefaultRequestHeaders.Remove("X-FBox-Session");
}
_httpClient2.DefaultRequestHeaders.Add("X-FBox-Session", sessionId.ToString());
_hubConnection.Headers["X-FBox-Session"] = sessionId.ToString();
await _hubConnection.Start();
if (newStatus == 1) if (newStatus == 1)
{ {
if (Connected) if (IsConnected)
{ {
await await
_httpClient2.PostAsync( _httpClient2.PostAsync(
@@ -318,25 +319,33 @@ namespace Modbus.Net.FBox
{ {
_data.Clear(); _data.Clear();
} }
Connected = false; //await DisconnectAsync();
//_connected = false;
}
}
catch (Exception ex)
{
Console.WriteLine("SignalR boxSessionId change error: " + ex.Message);
await DisconnectAsync();
} }
}); });
_hubConnection.Error += async ex => _hubConnection.Error += async ex =>
{ {
Console.WriteLine(@"SignalR error: {0}", ex.Message); Console.WriteLine(@"SignalR error: {0}", ex.Message);
await ConnectRecovery(_hubConnection); await DisconnectAsync();
_connected = false;
}; };
_hubConnection.Closed += async () => _hubConnection.Closed += () =>
{ {
await ConnectRecovery(_hubConnection); _hubConnection.Dispose();
_connected = false;
}; };
ServicePointManager.DefaultConnectionLimit = 10; ServicePointManager.DefaultConnectionLimit = 10;
if (_dataGroup == null) return; if (_dataGroup == null) return false;
var groupUid = _dataGroup.Uid; var groupUid = _dataGroup.Uid;
var groupName = _dataGroup.Name; var groupName = _dataGroup.Name;
@@ -351,7 +360,8 @@ namespace Modbus.Net.FBox
} }
_dataType = new Dictionary<string, Type>(); _dataType = new Dictionary<string, Type>();
if (_dataGroup.DMonEntries != null)
{
foreach (var dMonEntry in _dataGroup.DMonEntries) foreach (var dMonEntry in _dataGroup.DMonEntries)
{ {
Type type; Type type;
@@ -445,54 +455,23 @@ namespace Modbus.Net.FBox
_dataType[dMonEntry.Desc] = type; _dataType[dMonEntry.Desc] = type;
} }
} }
}
await _hubConnection.Start(); await _hubConnection.Start();
await dataHubProxy.Invoke("updateClientId", guid); await dataHubProxy.Invoke("updateClientId", guid);
return true;
} }
} }
} return false;
private async Task ConnectRecovery(HubConnection hubConnection)
{
try
{
if (hubConnection.State != ConnectionState.Connected)
{
try
{
hubConnection.Stop();
} }
catch catch
{ {
// ignored Clear();
} return false;
await hubConnection.Start();
if (Connected)
{
await
_httpClient2.PostAsync(
"dmon/group/" + _dataGroup.Uid + "/start", null);
} }
} }
}
catch
{
lock (_data)
{
_data.Clear();
}
Connected = false;
}
}
public override bool Disconnect() public override bool Disconnect()
{ {
return AsyncHelper.RunSync(DisconnectAsync); return AsyncHelper.RunSync(DisconnectAsync);
@@ -502,25 +481,89 @@ namespace Modbus.Net.FBox
{ {
try try
{ {
if (_httpClient2 != null)
{
await await
_httpClient2.PostAsync( _httpClient2.PostAsync(
"dmon/group/" + _groupUid + "/stop", "dmon/group/" + _groupUid + "/stop",
null); null);
_connected = false; }
_timer.Dispose(); Clear();
_timer = null;
Console.WriteLine("SignalR Disconnect success"); Console.WriteLine("SignalR Disconnect success");
return true; return true;
} }
catch catch (Exception e)
{ {
Console.WriteLine("SignalR Disconnect failed"); Console.WriteLine("SignalR Disconnect failed " + e.Message);
Clear();
return false; return false;
} }
} }
private async void Clear()
{
try
{
if (_hubConnection != null)
{
await Task.Run(() => _hubConnection.Stop(TimeSpan.FromSeconds(10)));
_hubConnection = null;
}
}
catch (Exception)
{
_hubConnection = null;
// ignored
}
try
{
if (_httpClient != null)
{
_httpClient.Dispose();
_httpClient = null;
}
}
catch (Exception)
{
//ignore
}
try
{
if (_httpClient2 != null)
{
_httpClient2.Dispose();
_httpClient2 = null;
}
}
catch (Exception)
{
//ignore
}
if (_data != null)
{
lock (_data)
{
_data.Clear();
_dataType.Clear();
}
}
_timeStamp = DateTime.MinValue;
_connected = false;
try
{
if (_timer != null)
{
_timer.Dispose();
_timer = null;
}
}
catch (Exception)
{
//ignore
}
}
public override bool SendMsgWithoutReturn(byte[] message) public override bool SendMsgWithoutReturn(byte[] message)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
@@ -532,16 +575,22 @@ namespace Modbus.Net.FBox
} }
public override byte[] SendMsg(byte[] message) public override byte[] SendMsg(byte[] message)
{
return AsyncHelper.RunSync(() => SendMsgAsync(message));
}
public override async Task<byte[]> SendMsgAsync(byte[] message)
{ {
if (_httpClient == null) if (_httpClient == null)
{ {
Connected = false; await DisconnectAsync();
_connected = false;
return null; return null;
} }
if (_hubConnection.State == ConnectionState.Disconnected) if (_hubConnection.State == ConnectionState.Disconnected)
{ {
_hubConnection.Start(); await _hubConnection.Start();
} }
var formater = new AddressFormaterFBox(); var formater = new AddressFormaterFBox();
@@ -549,23 +598,29 @@ namespace Modbus.Net.FBox
byte[] ans; byte[] ans;
if (_connectionState != 1) //if (_connectionState != 1)
{ //{
Connected = false; //await DisconnectAsync();
Console.WriteLine($"Return Value Rejected with connectionToken {ConnectionToken}"); //_connected = false;
return null; //Console.WriteLine($"Return Value Rejected with connectionToken {ConnectionToken}");
} //return null;
//}
if (_timeStamp == DateTime.MinValue) if (_timeStamp == DateTime.MinValue)
{ {
return Encoding.ASCII.GetBytes("NoData"); return Encoding.ASCII.GetBytes("NoData");
} }
if (DateTime.Now - _timeStamp > TimeSpan.FromMinutes(1)) if (DateTime.Now - _timeStamp > TimeSpan.FromMinutes(2))
{ {
Connected = false; Console.WriteLine("SignalR Timeout: {0} {1} {2}", _timeStamp, DateTime.Now, ConnectionToken);
if (_connectionState != 1)
{
await DisconnectAsync();
_connected = false;
return null; return null;
} }
}
Dictionary<string, double> machineDataValue; Dictionary<string, double> machineDataValue;
lock (_data) lock (_data)
@@ -575,7 +630,8 @@ namespace Modbus.Net.FBox
var machineDataType = _dataType; var machineDataType = _dataType;
if (machineDataType == null || machineDataType.Count == 0) if (machineDataType == null || machineDataType.Count == 0)
{ {
Connected = false; await DisconnectAsync();
_connected = false;
Console.WriteLine($"Return Value Rejected with connectionToken {ConnectionToken}"); Console.WriteLine($"Return Value Rejected with connectionToken {ConnectionToken}");
return null; return null;
} }
@@ -597,8 +653,14 @@ namespace Modbus.Net.FBox
machineDataValue[formater.FormatAddress(translator.GetAreaName(area), address)], machineDataValue[formater.FormatAddress(translator.GetAreaName(area), address)],
machineDataType[formater.FormatAddress(translator.GetAreaName(area), address)]); machineDataType[formater.FormatAddress(translator.GetAreaName(area), address)]);
} }
catch (Exception e) catch (Exception)
{ {
if (machineDataValue.Count != machineDataType.Count)
{
await
_httpClient2.PostAsync(
"dmon/group/" + _dataGroup.Uid + "/start", null);
}
return Encoding.ASCII.GetBytes("NoData"); return Encoding.ASCII.GetBytes("NoData");
//dataAns[0] = //dataAns[0] =
//Convert.ChangeType( //Convert.ChangeType(
@@ -612,10 +674,5 @@ namespace Modbus.Net.FBox
return ans; return ans;
} }
public override Task<byte[]> SendMsgAsync(byte[] message)
{
return Task.Factory.StartNew(() => SendMsg(message));
}
} }
} }

2
Modbus.Net/Modbus.Net.FBox/Modbus.Net.FBox.csproj
View File

@@ -75,7 +75,7 @@
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\ModBus.Net\Modbus.Net.csproj"> <ProjectReference Include="..\Modbus.Net\Modbus.Net.csproj">
<Project>{124ebef2-8960-4447-84cf-1d683b1ef7cc}</Project> <Project>{124ebef2-8960-4447-84cf-1d683b1ef7cc}</Project>
<Name>Modbus.Net</Name> <Name>Modbus.Net</Name>
</ProjectReference> </ProjectReference>

2
Modbus.Net/Modbus.Net.FBox/Modbus.Net.FBox.nuspec
View File

@@ -2,7 +2,7 @@
<package > <package >
<metadata> <metadata>
<id>Modbus.Net.FBox</id> <id>Modbus.Net.FBox</id>
<version>1.0.1</version> <version>1.0.8</version>
<title>Modbus.Net.FBox</title> <title>Modbus.Net.FBox</title>
<authors>Chris L.(Luo Sheng)</authors> <authors>Chris L.(Luo Sheng)</authors>
<owners>Hangzhou Delian Information and Science Technology Co., Ltd.</owners> <owners>Hangzhou Delian Information and Science Technology Co., Ltd.</owners>

4
Modbus.Net/Modbus.Net.FBox/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
// 方法是按如下所示使用“*”: : // 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.1")] [assembly: AssemblyVersion("1.0.8")]
[assembly: AssemblyFileVersion("1.0.1")] [assembly: AssemblyFileVersion("1.0.8")]