Merge pull request #115 from androidseb25/dev

androidseb25 · web-flow · commit b320b225b1d6 · 2025-01-11T17:47:48.000+01:00
Release 1.3.1.0
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -118,7 +118,7 @@ jobs:
     name: Build dotNet
     strategy:
       matrix:
-        dotnet-version: [ '8.x' ]
+        dotnet-version: [ '9.x' ]
         kind: [ 'amd64', 'arm64', 'armv7' ]
         include:
           - kind: amd64
diff --git a/Controller/DeviceController.cs b/Controller/DeviceController.cs
@@ -2,6 +2,7 @@
 using iGotify_Notification_Assist.Services;
 using Microsoft.AspNetCore.Mvc;
 using SecNtfyNuGet;
+using Environments = iGotify_Notification_Assist.Services.Environments;
 
 namespace iGotify_Notification_Assist.Controller;
 
@@ -91,10 +92,11 @@ public async Task<IActionResult> DeleteDevcice(string token)
     [HttpGet("Test/{deviceToken}")]
     public async Task<IActionResult> Test(string deviceToken)
     {
-        var ntfy = new SecNtfy(Environment.GetEnvironmentVariable("SECNTFY_SERVER_URL") ?? "https://api.secntfy.app");
+        var ntfy = new SecNtfy(Environments.secNtfyUrl);
         if (deviceToken.Length > 0)
             _ = await ntfy.SendNotification(deviceToken, "Test", "Test Nachricht");
-        Console.WriteLine(ntfy.encTitle);
+        if (Environments.isLogEnabled)
+            Console.WriteLine(ntfy.encTitle);
 
         return Ok();
     }
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,10 @@
 # See https://devblogs.microsoft.com/dotnet/improving-multiplatform-container-support/
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
 WORKDIR /app
 EXPOSE 5047
 EXPOSE 7221
 
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 ARG TARGETARCH
 WORKDIR /src
 
diff --git a/Models/DeviceModel.cs b/Models/DeviceModel.cs
@@ -1,6 +1,7 @@
 using iGotify_Notification_Assist.Services;
 using SecNtfyNuGet;
 using Websocket.Client;
+using Environments = iGotify_Notification_Assist.Services.Environments;
 
 namespace iGotify_Notification_Assist.Models;
 
@@ -52,7 +53,7 @@ public async Task SendNotifications(GotifyMessage iGotifyMessage, WebsocketClien
             Console.WriteLine("THERE'S SOMETHING WRONG HERE? NO USER FOUND");
         }
         
-        var ntfy = new SecNtfy(Environment.GetEnvironmentVariable("SECNTFY_SERVER_URL") ?? "https://api.secntfy.app");
+        var ntfy = new SecNtfy(Environments.secNtfyUrl);
         _ = ntfy.SendNotification(usr.DeviceToken, title, msg, iGotifyMessage.priority == 10, imageUrl, iGotifyMessage.priority);
     }
 }
diff --git a/Program.cs b/Program.cs
@@ -1,26 +1,32 @@
 using iGotify_Notification_Assist.Services;
+using Microsoft.AspNetCore.Http.Json;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.OpenApi.Models;
+using Scalar.AspNetCore;
+using Environments = iGotify_Notification_Assist.Services.Environments;
 
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 builder.Services.AddCors();
 
-builder.Services.AddControllers(opt => { opt.SuppressImplicitRequiredAttributeForNonNullableReferenceTypes = true; })
+builder.Services.AddControllers(opt =>
+    {
+        opt.SuppressImplicitRequiredAttributeForNonNullableReferenceTypes = true;
+    })
     .AddJsonOptions(opt =>
     {
         opt.JsonSerializerOptions.PropertyNamingPolicy = null;
         opt.JsonSerializerOptions.PropertyNameCaseInsensitive = true;
     });
-
-builder.Services.AddSingleton(builder.Configuration);
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen(c =>
+builder.Services.Configure<JsonOptions>(options =>
 {
-    c.SwaggerDoc("v1", new OpenApiInfo { Title = "iGotify Notification Assist API", Version = "v1" });
+    options.SerializerOptions.PropertyNameCaseInsensitive = true; // Enable case-insensitivity
+    options.SerializerOptions.PropertyNamingPolicy = null; // Preserve exact casing
 });
 
+builder.Services.AddSingleton(builder.Configuration);
+builder.Services.AddOpenApi();
 builder.Services.AddTransient<IStartupFilter, StartUpBuilder>();
 
 var app = builder.Build();
@@ -37,17 +43,18 @@
 
 app.UseRouting();
 
-// Enable middleware to serve generated Swagger as a JSON endpoint.
-app.UseSwagger(c => { c.RouteTemplate = "/swagger/{documentName}/swagger.json"; });
-
-// Enable middleware to serve swagger-ui (HTML, JS, CSS, etc.),
-// specifying the Swagger JSON endpoint.
-app.UseSwaggerUI(c =>
+if (Environments.enableScalarUi)
 {
-    c.SwaggerEndpoint("/api/swagger/v1/swagger.json", "iGotify Notification Assist API");
-    c.RoutePrefix = string.Empty;
-    c.DefaultModelsExpandDepth(-1);
-});
+    app.MapOpenApi();
+    app.MapScalarApiReference(options =>
+    {
+        options.WithTitle("iGotify Notification Assist API")
+            .WithModels(false)
+            .WithLayout(ScalarLayout.Classic)
+            .WithTheme(ScalarTheme.Moon)
+            .WithDefaultHttpClient(ScalarTarget.CSharp, ScalarClient.HttpClient);
+    });
+}
 
 //app.UseEndpoints(endpoints => { endpoints.MapControllers(); });
 
diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json
@@ -13,7 +13,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "launchUrl": "api/",
+      "launchUrl": "scalar/v1",
       "applicationUrl": "http://localhost:5047",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
@@ -23,7 +23,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "launchUrl": "api/",
+      "launchUrl": "scalar/v1",
       "applicationUrl": "https://localhost:7221;http://localhost:5047",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
@@ -32,7 +32,7 @@
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
-      "launchUrl": "api/",
+      "launchUrl": "scalar/v1",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/Services/GotifySocketService.cs b/Services/GotifySocketService.cs
@@ -71,7 +71,11 @@ private static void StartWsConn(string gotifyServerUrl, string clientToken)
                 if (_websocketThreads == null)
                     _websocketThreads = new Dictionary<string, WebSockClient>();
                 
-                _websocketThreads.Add(clientToken, wsc);
+                _websocketThreads.TryGetValue(clientToken, out var storedWebSockClient);
+                if (storedWebSockClient == null)
+                    _websocketThreads.Add(clientToken, wsc);
+                else 
+                    Console.WriteLine($"Client: {clientToken} already connected! Skipping...");
                 
                 Thread.Sleep(Timeout.Infinite);
             }
@@ -89,13 +93,13 @@ private static void StartWsConn(string gotifyServerUrl, string clientToken)
     /// </summary>
     public async void Start()
     {
-        var secntfyUrl = Environment.GetEnvironmentVariable("SECNTFY_SERVER_URL") ?? "https://api.secntfy.app";
+        var secntfyUrl = Environments.secNtfyUrl;
 
         // [FEATURE REQUEST] #59 - https://github.com/androidseb25/iGotify-Notification-Assistent/issues/59
         // First try of implementing local running instances without app configuration
-        var gotifyUrls = Environment.GetEnvironmentVariable("GOTIFY_URLS") ?? "";
-        var gotifyClientTokens = Environment.GetEnvironmentVariable("GOTIFY_CLIENT_TOKENS") ?? "";
-        var secntfyTokens = Environment.GetEnvironmentVariable("SECNTFY_TOKENS") ?? "";
+        var gotifyUrls = Environments.gotifyUrls;
+        var gotifyClientTokens = Environments.gotifyClientTokens;
+        var secntfyTokens = Environments.secNtfyTokens;
         
         var gotifyUrlList = new List<string>();
         var gotifyClientList = new List<string>();
diff --git a/Services/Tool.cs b/Services/Tool.cs
@@ -15,4 +15,56 @@ public static string UsersDb(string databaseFilePath)
     {
         return $"Data Source={databaseFilePath}";
     }
+}
+
+
+public class Environments
+{
+    public static bool isLogEnabled
+    {
+        get
+        {
+            return Environment.GetEnvironmentVariable("ENABLE_CONSOLE_LOG") == "true";
+        }
+    }
+    public static bool enableScalarUi
+    {
+        get
+        {
+            return Environment.GetEnvironmentVariable("ENABLE_SCALAR_UI") == "true";
+        }
+    }
+
+    public static string gotifyUrls
+    {
+        get
+        {
+            return Environment.GetEnvironmentVariable("GOTIFY_URLS") ?? "";
+        }
+    }
+
+    public static string gotifyClientTokens
+    {
+        get
+        {
+            return Environment.GetEnvironmentVariable("GOTIFY_CLIENT_TOKENS") ?? "";
+        }
+    }
+
+    public static string secNtfyTokens
+    {
+        get
+        {
+            return Environment.GetEnvironmentVariable("SECNTFY_TOKENS") ?? "";
+        }
+    }
+
+    public static string secNtfyUrl
+    {
+        get
+        {
+            return Environment.GetEnvironmentVariable("SECNTFY_SERVER_URL") ?? "https://api.secntfy.app";
+        }
+    }
+    
 }
diff --git a/Services/WebSockClient.cs b/Services/WebSockClient.cs
@@ -65,7 +65,8 @@ public void Start(string clientToken, bool isRestart = false)
                 var message = msg.ToString().Replace("client::display", "clientdisplay")
                     .Replace("client::notification", "clientnotification")
                     .Replace("android::action", "androidaction");
-                Console.WriteLine("Message converted: " + message);
+                if (Environments.isLogEnabled)
+                    Console.WriteLine("Message converted: " + message);
                 // var jsonData = JsonConvert.SerializeObject(message);
                 var gm = JsonConvert.DeserializeObject<GotifyMessage>(message);
                 // If object is null return and listen to the next message
diff --git a/iGotify Notification Assist.csproj b/iGotify Notification Assist.csproj
@@ -1,25 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <InvariantGlobalization>true</InvariantGlobalization>
         <RootNamespace>iGotify_Notification_Assist</RootNamespace>
-        <AssemblyVersion>1.3.0.0</AssemblyVersion>
-        <FileVersion>1.3.0.0</FileVersion>
-        <Version>1.3.0.0</Version>
+        <AssemblyVersion>1.3.1.0</AssemblyVersion>
+        <FileVersion>1.3.1.0</FileVersion>
+        <Version>1.3.1.0</Version>
+        <LangVersion>default</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Dapper" Version="2.1.44" />
         <PackageReference Include="Dapper.Contrib" Version="2.0.78" />
         <PackageReference Include="Dapper.Mapper" Version="2.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
-        <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.6" />
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="Scalar.AspNetCore" Version="1.2.75" />
         <PackageReference Include="secntfy.nuget" Version="1.0.5" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
         <PackageReference Include="Websocket.Client" Version="5.1.2" />
     </ItemGroup>
 
diff --git a/iGotifyNotificationAssist.sln.DotSettings.user b/iGotifyNotificationAssist.sln.DotSettings.user
@@ -0,0 +1,2 @@
+﻿<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASecNtfy_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb26cc17506944dd48fbdaecd1892512f3e00_003F53_003F3be8b167_003FSecNtfy_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using iGotify_Notification_Assist.Services;`
`2`	`2`	`using SecNtfyNuGet;`
`3`	`3`	`using Websocket.Client;`
	`4`	`+using Environments = iGotify_Notification_Assist.Services.Environments;`
`4`	`5`
`5`	`6`	`namespace iGotify_Notification_Assist.Models;`
`6`	`7`
`@@ -52,7 +53,7 @@ public async Task SendNotifications(GotifyMessage iGotifyMessage, WebsocketClien`
`52`	`53`	`Console.WriteLine("THERE'S SOMETHING WRONG HERE? NO USER FOUND");`
`53`	`54`	`}`
`54`	`55`
`55`		`- var ntfy = new SecNtfy(Environment.GetEnvironmentVariable("SECNTFY_SERVER_URL") ?? "https://api.secntfy.app");`
	`56`	`+ var ntfy = new SecNtfy(Environments.secNtfyUrl);`
`56`	`57`	`_ = ntfy.SendNotification(usr.DeviceToken, title, msg, iGotifyMessage.priority == 10, imageUrl, iGotifyMessage.priority);`
`57`	`58`	`}`
`58`	`59`	`}`