Merge pull request #20 from betalgo/dev

.NET 8 update and improvments
betalgo · Mar 26, 2024 · 147b16c · 147b16c
2 parents 6fda270 + 3b434d6
commit 147b16c
Show file tree

Hide file tree

Showing 49 changed files with 710 additions and 1,263 deletions.
diff --git a/LaserCatEyes.DataServiceSdk.DotNetStandard/LaserCatEyes.DataServiceSdk.DotNetStandard.csproj b/LaserCatEyes.DataServiceSdk.DotNetStandard/LaserCatEyes.DataServiceSdk.DotNetStandard.csproj
diff --git a/LaserCatEyes.DataServiceSdk.DotNetStandard/LaserCatEyesDataService.cs b/LaserCatEyes.DataServiceSdk.DotNetStandard/LaserCatEyesDataService.cs
diff --git a/LaserCatEyes.DataServiceSdk.DotNetStandard/LaserCatEyes_Logo.png b/LaserCatEyes.DataServiceSdk.DotNetStandard/LaserCatEyes_Logo.png
diff --git a/LaserCatEyes.DataServiceSdk.DotNetStandard/README.md b/LaserCatEyes.DataServiceSdk.DotNetStandard/README.md
diff --git a/LaserCatEyes.DataServiceSdk.UnitTest/LaserCatEyes.DataServiceSdk.UnitTest.csproj b/LaserCatEyes.DataServiceSdk.UnitTest/LaserCatEyes.DataServiceSdk.UnitTest.csproj
diff --git a/LaserCatEyes.DataServiceSdk/LaserCatEyes.DataServiceSdk.csproj b/LaserCatEyes.DataServiceSdk/LaserCatEyes.DataServiceSdk.csproj
@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFrameworks>net8.0;net6.0;netstandard2.0</TargetFrameworks>
 		<Copyright>Betalgo Up Ltd.</Copyright>
+		<LangVersion>Latest</LangVersion>
 		<PackageProjectUrl>https://portal.lasercateyes.com</PackageProjectUrl>
 		<PackageIcon>LaserCatEyes_Logo.png</PackageIcon>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<Version>6.0.0</Version>
+		<Version>8.0.0</Version>
 		<Authors>Betalgo Up Ltd.</Authors>
 		<Company>Betalgo Up Ltd.</Company>
 		<Product>Laser Cat Eyes</Product>
@@ -23,13 +24,24 @@
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+		<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
-		<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.23" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+		<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+		<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
 	</ItemGroup>
-
 	<ItemGroup>
 		<ProjectReference Include="..\LaserCatEyes.Domain\LaserCatEyes.Domain.csproj" />
 	</ItemGroup>

diff --git a/LaserCatEyes.DataServiceSdk/LaserCatEyesDataService.cs b/LaserCatEyes.DataServiceSdk/LaserCatEyesDataService.cs
@@ -6,21 +6,27 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace LaserCatEyes.DataServiceSdk
+namespace LaserCatEyes.DataServiceSdk;
+
+public class LaserCatEyesDataService : ILaserCatEyesDataService
 {
-    public class LaserCatEyesDataService : ILaserCatEyesDataService
+    private const string AlgoronaClientId = "989C784C-2EB2-4666-8796-D7494EBB745D";
+
+    private readonly HttpClient _client = HttpClientFactory.Create(new HttpClientHandler()
     {
-        private readonly HttpClient _client = HttpClientFactory.Create(new HttpClientHandler()
-        {
-            ServerCertificateCustomValidationCallback = (sender, cert, chain, sslPolicyErrors) => true
-        });
+        ServerCertificateCustomValidationCallback = (_, _, _, _) => true
+    });
 
-        private readonly Guid _deviceId;
-        private readonly LaserCatEyesOptions _laserCatEyesOptions;
-        private readonly LaserCatEyesSystemOptions _laserCatEyesSystemOptions;
-        private readonly bool _serviceReady;
+    private readonly Guid _deviceId;
+    private readonly LaserCatEyesOptions _laserCatEyesOptions;
+    private readonly LaserCatEyesSystemOptions _laserCatEyesSystemOptions;
+    private readonly ILogger<LaserCatEyesDataService> _logger;
+    private readonly bool _serviceReady;
 
-        public LaserCatEyesDataService(IOptions<LaserCatEyesOptions> laserCatEyesOptions, IOptions<LaserCatEyesSystemOptions> laserCatEyesSystemOptions, ILogger<LaserCatEyesDataService> logger)
+    public LaserCatEyesDataService(IOptions<LaserCatEyesOptions> laserCatEyesOptions, IOptions<LaserCatEyesSystemOptions> laserCatEyesSystemOptions, ILogger<LaserCatEyesDataService> logger)
+    {
+        _logger = logger;
+        try
         {
             _laserCatEyesOptions = laserCatEyesOptions.Value;
             _laserCatEyesSystemOptions = laserCatEyesSystemOptions.Value;
@@ -34,7 +40,7 @@ public LaserCatEyesDataService(IOptions<LaserCatEyesOptions> laserCatEyesOptions
             var deviceName = $"{Environment.MachineName}:{Environment.UserName}";
             _laserCatEyesOptions.DeviceUuid ??= Utilities.ToGuid(deviceName);
 
-            var subApp = new SubAppUpdate
+            SubAppUpdate subApp = new()
             {
                 Device = new Device
                 {
@@ -52,7 +58,7 @@ public LaserCatEyesDataService(IOptions<LaserCatEyesOptions> laserCatEyesOptions
             };
 
             _client.BaseAddress = new Uri(_laserCatEyesSystemOptions.BaseAddress);
-            _client.DefaultRequestHeaders.Add(Constants.Headers.AlgoronaClientId, _laserCatEyesSystemOptions.AlgoronaClientId);
+            _client.DefaultRequestHeaders.Add(Constants.Headers.AlgoronaClientId, !string.IsNullOrEmpty(_laserCatEyesSystemOptions.AlgoronaClientId) ? _laserCatEyesSystemOptions.AlgoronaClientId : AlgoronaClientId);
             _client.DefaultRequestHeaders.Add(Constants.Headers.AlgoronaCulture, _laserCatEyesSystemOptions.AlgoronaCulture);
             _client.DefaultRequestHeaders.Add(Constants.Headers.AlgoronaDeviceUuid, _laserCatEyesOptions.DeviceUuid.ToString());
             _client.DefaultRequestHeaders.Add(Constants.Headers.AlgoronaAppKey, _laserCatEyesOptions.AppKey);
@@ -63,39 +69,51 @@ public LaserCatEyesDataService(IOptions<LaserCatEyesOptions> laserCatEyesOptions
             _client.DefaultRequestHeaders.Add(Constants.Headers.AlgoronaDeviceId, _deviceId.ToString());
             _serviceReady = true;
         }
+        catch (Exception e)
+        {
+            logger.LogError(e, "LaserCatEyes Error on initialization");
+        }
+    }
 
 
-        public async Task<HttpResponseMessage> ReportTask(PackageData data)
+    public async Task<HttpResponseMessage> ReportTask(PackageData data)
+    {
+        if (!_serviceReady)
         {
-            if (!_serviceReady)
-            {
-                return null;
-            }
+            return null;
+        }
 
+        try
+        {
             data.DeviceUuid = _laserCatEyesOptions.DeviceUuid;
             data.DeviceId = _deviceId;
             return await _client.PostAsJsonAsync(_laserCatEyesSystemOptions.Endpoints.DataSendPackage, data);
         }
-
-
-        public bool IsServiceReady()
+        catch (Exception e)
         {
-            return _serviceReady;
+            _logger.LogError(e, "LaserCatEyes Error on initialization");
+            return null;
         }
+    }
 
-        public void Report(PackageData data)
-        {
-            if (!_serviceReady)
-            {
-                return;
-            }
 
-            Task.Run(() => ReportTask(data)).Forget();
-        }
+    public bool IsServiceReady()
+    {
+        return _serviceReady;
+    }
 
-        private async Task<HttpResponseMessage> Init(SubAppUpdate data)
+    public void Report(PackageData data)
+    {
+        if (!_serviceReady)
         {
-            return await _client.PutAsJsonAsync(_laserCatEyesSystemOptions.Endpoints.AppUpdateSubApp, data);
+            return;
         }
+
+        Task.Run(() => ReportTask(data)).Forget();
+    }
+
+    private async Task<HttpResponseMessage> Init(SubAppUpdate data)
+    {
+        return await _client.PutAsJsonAsync(_laserCatEyesSystemOptions.Endpoints.AppUpdateSubApp, data);
     }
 }