gavindiaz/mtapi
1
0
Fork 0
mirror of https://github.com/vdemydiuk/mtapi.git synced 2026-08-20 06:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Integrate MtRpcClient into Mt5ApiClient

Browse Source
This commit is contained in:
Viacheslav Demydiuk
2024-01-08 19:56:31 +02:00
parent 9a9403a324
commit b398b1b498
1 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MtApi5/MtApi5Client.cs
+109 -109
View File
@@ -3,6 +3,7 @@ using System.Collections;
using MtApi5.Requests; using MtApi5.Requests;
using Newtonsoft.Json; using Newtonsoft.Json;
using MtApi5.Events; using MtApi5.Events;
using MtClient;
namespace MtApi5 namespace MtApi5
{ {
@@ -29,7 +30,7 @@ namespace MtApi5
#region Private Fields #region Private Fields
private static readonly MtLog Log = LogConfigurator.GetLogger(typeof(MtApi5Client)); private static readonly MtLog Log = LogConfigurator.GetLogger(typeof(MtApi5Client));
//private MtClient _client; private MtRpcClient? _client;
private readonly object _locker = new object(); private readonly object _locker = new object();
private volatile bool _isBacktestingMode; private volatile bool _isBacktestingMode;
private Mt5ConnectionState _connectionState = Mt5ConnectionState.Disconnected; private Mt5ConnectionState _connectionState = Mt5ConnectionState.Disconnected;
@@ -73,8 +74,8 @@ namespace MtApi5
///<param name="port">Port of host connection (default 8222) </param> ///<param name="port">Port of host connection (default 8222) </param>
public void BeginConnect(int port) public void BeginConnect(int port)
{ {
Log.Info($"BeginConnect: port = {port}"); Log.Info($"BeginConnect: port = localhost:{port}");
Task.Factory.StartNew(() => Connect(port)); Task.Factory.StartNew(() => Connect("localhost", port));
} }
///<summary> ///<summary>
@@ -3317,75 +3318,99 @@ namespace MtApi5
#endregion #endregion
#region Private Methods #region Private Methods
//private MtClient Client private MtRpcClient? Client
//{ {
// get get
// { {
// lock (_locker) lock (_locker)
// { {
// return _client; return _client;
// } }
// } }
//} }
//private void Connect(MtClient client) public async void Connect(string host, int port)
//{ {
// lock (_locker) lock (_locker)
// { {
// if (_connectionState == Mt5ConnectionState.Connected if (_connectionState == Mt5ConnectionState.Connected
// || _connectionState == Mt5ConnectionState.Connecting) || _connectionState == Mt5ConnectionState.Connecting)
// { {
// return; return;
// } }
// _connectionState = Mt5ConnectionState.Connecting; _connectionState = Mt5ConnectionState.Connecting;
// } }
// string message = string.IsNullOrEmpty(client.Host) ? $"Connecting to localhost:{client.Port}" : $"Connecting to {client.Host}:{client.Port}"; string message = $"Connecting to {host}:{port}";
// ConnectionStateChanged?.Invoke(this, new Mt5ConnectionEventArgs(Mt5ConnectionState.Connecting, message)); ConnectionStateChanged?.Invoke(this, new Mt5ConnectionEventArgs(Mt5ConnectionState.Connecting, message));
// var state = Mt5ConnectionState.Failed; var client = new MtRpcClient(host, port);
var state = Mt5ConnectionState.Failed;
try
{
await client.Connect();
client.MessageReceived += _client_OnMessageReceived;
client.ConnectionFailed += _client_OnConnectionFailed;
// lock (_locker) state = Mt5ConnectionState.Connected;
// { }
// try catch (Exception e)
// { {
// client.Connect(); Log.Warn($"Failed connection to {host}:{port}. {e.Message}");
// state = Mt5ConnectionState.Connected; }
// }
// catch (Exception e)
// {
// client.Dispose();
// message = string.IsNullOrEmpty(client.Host) ? $"Failed connection to localhost:{client.Port}. {e.Message}" : $"Failed connection to {client.Host}:{client.Port}. {e.Message}";
// Log.Warn(message); lock (_locker)
// } {
if (state == Mt5ConnectionState.Connected)
{
_client = client;
Log.Info($"Connected to {host}:{port}");
}
// if (state == Mt5ConnectionState.Connected) _connectionState = state;
// { }
// _client = client;
// _client.QuoteAdded += _client_QuoteAdded;
// _client.QuoteRemoved += _client_QuoteRemoved;
// _client.QuoteUpdated += _client_QuoteUpdated;
// _client.ServerDisconnected += _client_ServerDisconnected;
// _client.ServerFailed += _client_ServerFailed;
// _client.MtEventReceived += _client_MtEventReceived;
// message = string.IsNullOrEmpty(client.Host) ? $"Connected to localhost:{client.Port}" : $"Connected to { client.Host}:{client.Port}";
// Log.Info(message); ConnectionStateChanged?.Invoke(this, new Mt5ConnectionEventArgs(state, message));
// }
// _connectionState = state; if (state == Mt5ConnectionState.Connected)
// } {
OnConnected();
}
}
// ConnectionStateChanged?.Invoke(this, new Mt5ConnectionEventArgs(state, message)); private void _client_OnMessageReceived(object? o, MtMessage msg)
{
// if (state == Mt5ConnectionState.Connected) Task.Run(() =>
// { {
// OnConnected(); switch (msg.MsgType)
// } {
//} case MessageType.ExpertList:
//ProcessExpertList(msg as MtExpertListMsg);
break;
case MessageType.ExpertAdded:
//ProcessExpertAdded(msg as MtExpertAddedMsg);
break;
case MessageType.ExpertRemoved:
//ProcessExpertRemoved(msg as MtExpertRemovedMsg);
break;
case MessageType.Event:
//ProcessEvent(msg as MtEvent);
break;
case MessageType.Response:
//ProcessResponse(msg as MtResponse);
break;
}
});
}
private void _client_OnConnectionFailed(object? sender, EventArgs e)
{
lock (_locker)
{
Disconnect(true);
}
}
//private void _client_MtEventReceived(MtEvent e) //private void _client_MtEventReceived(MtEvent e)
//{ //{
@@ -3452,54 +3477,29 @@ namespace MtApi5
OnLockTicks?.Invoke(this, new Mt5LockTicksEventArgs(e.Instrument)); OnLockTicks?.Invoke(this, new Mt5LockTicksEventArgs(e.Instrument));
} }
private void Connect(string host, int port)
{
//var client = new MtClient(host, port);
//Connect(client);
}
private void Connect(int port)
{
//var client = new MtClient(port);
//Connect(client);
}
private void Disconnect(bool failed) private void Disconnect(bool failed)
{ {
//var state = failed ? Mt5ConnectionState.Failed : Mt5ConnectionState.Disconnected; var state = failed ? Mt5ConnectionState.Failed : Mt5ConnectionState.Disconnected;
//var message = failed ? "Connection Failed" : "Disconnected"; var message = failed ? "Connection Failed" : "Disconnected";
//lock (_locker) MtRpcClient? client;
//{
// if (_connectionState == Mt5ConnectionState.Disconnected
// || _connectionState == Mt5ConnectionState.Failed)
// return;
// if (_client != null) lock (_locker)
// { {
// _client.QuoteAdded -= _client_QuoteAdded; if (_connectionState == Mt5ConnectionState.Disconnected
// _client.QuoteRemoved -= _client_QuoteRemoved; || _connectionState == Mt5ConnectionState.Failed)
// _client.QuoteUpdated -= _client_QuoteUpdated; return;
// _client.ServerDisconnected -= _client_ServerDisconnected;
// _client.ServerFailed -= _client_ServerFailed;
// _client.MtEventReceived -= _client_MtEventReceived;
// if (!failed) _connectionState = state;
// { client = _client;
// _client.Disconnect(); _client = null;
// } }
// _client.Dispose(); client?.Disconnect(); //TODO: use dispose
// _client = null; Log.Info(message);
// }
// _connectionState = state; ConnectionStateChanged?.Invoke(this, new Mt5ConnectionEventArgs(state, message));
//}
//Log.Info(message);
//ConnectionStateChanged?.Invoke(this, new Mt5ConnectionEventArgs(state, message));
} }
private T SendCommand<T>(Mt5CommandType commandType, ArrayList? commandParameters, Dictionary<string, object>? namedParams = null, int? executor = null) private T SendCommand<T>(Mt5CommandType commandType, ArrayList? commandParameters, Dictionary<string, object>? namedParams = null, int? executor = null)
@@ -3579,15 +3579,15 @@ namespace MtApi5
// QuoteUpdated?.Invoke(this, quote.Instrument, quote.Bid, quote.Ask); // QuoteUpdated?.Invoke(this, quote.Instrument, quote.Bid, quote.Ask);
//} //}
private void _client_ServerDisconnected(object sender, EventArgs e) //private void _client_ServerDisconnected(object sender, EventArgs e)
{ //{
Disconnect(false); // Disconnect(false);
} //}
private void _client_ServerFailed(object sender, EventArgs e) //private void _client_ServerFailed(object sender, EventArgs e)
{ //{
Disconnect(true); // Disconnect(true);
} //}
//private void _client_QuoteRemoved(MtQuote quote) //private void _client_QuoteRemoved(MtQuote quote)
//{ //{