Merge pull request #8 from spotware/dev

Dev

Author: amusleh-spotware-com

README.md

@@ -1,22 +1,27 @@
 # OpenAPI.Net
 
-[![NuGet version (Spotware.OpenAPI.Net)](https://buildstats.info/nuget/Spotware.OpenAPI.Net)](https://www.nuget.org/packages/Spotware.OpenAPI.Net/)
+[![NuGet version (cTrader.OpenAPI.Net)](https://buildstats.info/nuget/cTrader.OpenAPI.Net)](https://www.nuget.org/packages/cTrader.OpenAPI.Net/)
 
 cTrader Open API .NET Rx library
 
 This library allows you to easily use and integrate cTrader Open API on your .NET applications.
 
 Its written by using RX streams so it makes API usage very easy and allows you to do a lot with few lines of code.
 
-Current version of library is based on .NET standard 2.1, you can't use it on .NET framework apps, you can only use it on .NET core or .NET 5 and later.
+It uses channels and array pools to avoid too many allocations, we tried our best to make it as efficient as possible.
+
+Current version of library is targets .NET 6, so you can't use it on .NET framework apps.
+
+Please check the samples, we have some good samples for all kinds of .NET apps.
+
+Feel free to fork and improve it!
 
 Documentation: [https://spotware.github.io/OpenAPI.Net/](https://spotware.github.io/OpenAPI.Net/)
 
 ## Dependencies
 
 * [protobuf](https://github.com/protocolbuffers/protobuf)
 * [Reactive](https://github.com/dotnet/reactive)
-* [System.Text.Json](https://www.nuget.org/packages/System.Text.Json/)
 * [websocket-client](https://github.com/Marfusios/websocket-client)
 
 ## Licence

src/OpenAPI.Net/Helpers/NameValueCollectionToQueryString.cs

@@ -10,7 +10,7 @@ public static string ToQueryString(this NameValueCollection collection)
         {
             if (collection == null) return string.Empty;
 
-            StringBuilder stringBuilder = new StringBuilder();
+            StringBuilder stringBuilder = new();
 
             foreach (string key in collection.Keys)
             {

src/OpenAPI.Net/OpenAPI.Net.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+	<TargetFramework>net6.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/spotware/OpenAPI.Net</PackageProjectUrl>
     <RepositoryUrl>https://github.com/spotware/OpenAPI.Net</RepositoryUrl>
-    <PackageTags>cTrader, Open API, Spotware</PackageTags>
-    <Description>A .NET RX library for Spotware Open API</Description>
-    <PackageId>Spotware.OpenAPI.Net</PackageId>
-    <Version>1.3.9</Version>
+    <PackageTags>cTrader, Open API, Spotware, cTrader</PackageTags>
+    <Description>A .NET RX library for cTrader Open API</Description>
+    <PackageId>cTrader.OpenAPI.Net</PackageId>
+    <Version>1.4.0-rc0</Version>
     <Platforms>AnyCPU</Platforms>
     <Company>Spotware</Company>
     <Authors>Spotware</Authors>
@@ -29,7 +29,6 @@
   <ItemGroup>
     <PackageReference Include="Google.Protobuf" Version="3.19.4" />
     <PackageReference Include="System.Reactive" Version="5.0.0" />
-    <PackageReference Include="System.Text.Json" Version="6.0.2" />
     <PackageReference Include="Websocket.Client" Version="4.4.43" />
   </ItemGroup>
 

src/OpenAPI.Net/OpenClient.cs

@@ -13,20 +13,21 @@
 using Websocket.Client;
 using System.Net.WebSockets;
 using System.Threading.Channels;
+using System.Buffers;
 
 namespace OpenAPI.Net
 {
     public sealed class OpenClient : IDisposable, IObservable<IMessage>
     {
         private readonly TimeSpan _heartbeatInerval;
 
-        private readonly ProtoHeartbeatEvent _heartbeatEvent = new ProtoHeartbeatEvent();
+        private readonly ProtoHeartbeatEvent _heartbeatEvent = new();
 
         private readonly Channel<ProtoMessage> _messagesChannel = Channel.CreateUnbounded<ProtoMessage>();
 
-        private readonly ConcurrentDictionary<int, IObserver<IMessage>> _observers = new ConcurrentDictionary<int, IObserver<IMessage>>();
+        private readonly ConcurrentDictionary<int, IObserver<IMessage>> _observers = new();
 
-        private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
+        private readonly CancellationTokenSource _cancellationTokenSource = new();
 
         private readonly TimeSpan _requestDelay;
 
@@ -376,11 +377,12 @@ private async Task StartSendingMessages(CancellationToken cancellationToken)
         /// <returns>Task</returns>
         private async void ReadTcp(CancellationToken cancellationToken)
         {
+            var lengthArray = new byte[sizeof(int)];
+
             try
             {
                 while (!IsDisposed)
                 {
-                    var lengthArray = new byte[sizeof(int)];
 
                     var readBytes = 0;
 
@@ -400,7 +402,7 @@ private async void ReadTcp(CancellationToken cancellationToken)
 
                     if (length <= 0) continue;
 
-                    var data = new byte[length];
+                    var data = ArrayPool<byte>.Shared.Rent(length);
 
                     readBytes = 0;
 
@@ -414,7 +416,9 @@ private async void ReadTcp(CancellationToken cancellationToken)
                     }
                     while (readBytes < length);
 
-                    var message = ProtoMessage.Parser.ParseFrom(data);
+                    var message = ProtoMessage.Parser.ParseFrom(data, 0, length);
+
+                    ArrayPool<byte>.Shared.Return(data);
 
                     OnNext(message);
                 }

src/WPF.Sample/App.xaml.cs

@@ -54,8 +54,8 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
             containerRegistry.RegisterDialog<AccountAuthView>();
 
             // Services
-            OpenClient liveClientFactory() => new OpenClient(ApiInfo.LiveHost, ApiInfo.Port, TimeSpan.FromSeconds(10));
-            OpenClient demoClientFactory() => new OpenClient(ApiInfo.DemoHost, ApiInfo.Port, TimeSpan.FromSeconds(10));
+            OpenClient liveClientFactory() => new(ApiInfo.LiveHost, ApiInfo.Port, TimeSpan.FromSeconds(10));
+            OpenClient demoClientFactory() => new(ApiInfo.DemoHost, ApiInfo.Port, TimeSpan.FromSeconds(10));
 
             var apiService = new ApiService(liveClientFactory, demoClientFactory);
 

src/WPF.Sample/Services/ChartingService.cs

@@ -12,7 +12,7 @@ public interface IChartingService : IDisposable
 
     public sealed class ChartingService : IChartingService
     {
-        private readonly List<IDisposable> _disposables = new List<IDisposable>();
+        private readonly List<IDisposable> _disposables = new();
 
         public void Dispose()
         {

src/WinForms.Sample/Main.cs

@@ -35,8 +35,8 @@ public partial class Main : Form
         //  private int _apiPort = 5035;
         private readonly OpenClient _client;
 
-        private static Queue _writeQueue = new Queue(); // not thread safe
-        private static Queue _readQueue = new Queue(); // not thread safe
+        private static Queue _writeQueue = new(); // not thread safe
+        private static Queue _readQueue = new(); // not thread safe
         private static Queue writeQueueSync = Queue.Synchronized(_writeQueue); // thread safe
         private static Queue readQueueSync = Queue.Synchronized(_readQueue); // thread safe
         private static volatile bool isShutdown;