Update 1.5.0.1

.github/workflows/publish.yml

@@ -27,6 +27,18 @@ jobs:
         uses: docker/setup-buildx-action@v3
         with:
           version: latest
+      - name: Get version informations
+        id: infos
+        run: |
+          versionGit=${{ steps.get-latest-tag.outputs.tag }}
+          versionProject=v$(grep '<Version>' 'iGotify Notification Assist.csproj' | cut -d '>' -f2 | cut -d '<' -f1 | xargs)
+          if [ "$versionGit" != "$versionProject" -a $(git tag | grep -c "$versionProject") -eq 0 ]; then
+            echo "version=$versionProject" >> $GITHUB_OUTPUT
+            echo "createtag=true" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+          echo "version=$versionGit" >> $GITHUB_OUTPUT
+          echo "createtag=false" >> $GITHUB_OUTPUT
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:
@@ -36,11 +48,11 @@ jobs:
       - name: Run Buildx & Push Multi Arch for dev
         if: steps.extract_branch.outputs.branch == 'dev'
         run: |
-          docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t ghcr.io/androidseb25/igotify-notification-assist-dev:latest -f ./Dockerfile --provenance=false --sbom=false --output type=image,push=true .
+          docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t ghcr.io/androidseb25/igotify-notification-assist-dev:latest -t ghcr.io/androidseb25/igotify-notification-assist-dev:${{ steps.infos.outputs.version }} -f ./Dockerfile --provenance=false --sbom=false --output type=image,push=true .
       - name: Run Buildx & Push Multi Arch for public
         if: steps.extract_branch.outputs.branch != 'dev'
         run: |
-          docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t ghcr.io/androidseb25/igotify-notification-assist:latest -f ./Dockerfile --provenance=false --sbom=false --output type=image,push=true .
+          docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t ghcr.io/androidseb25/igotify-notification-assist:latest -t ghcr.io/androidseb25/igotify-notification-assist:${{ steps.infos.outputs.version }} -f ./Dockerfile --provenance=false --sbom=false --output type=image,push=true .
       - name: Gotify Notification SUCCESS
         if: success()
         uses: eikendev/gotify-action@master

Models/CustomHeaders.cs

@@ -2,6 +2,6 @@ namespace iGotify_Notification_Assist.Models;
 
 public class CustomHeaders
 {
-    public string Key { get; set; }
-    public string Value { get; set; }
+    public string? Key { get; set; }
+    public string? Value { get; set; }
 }

README.md

@@ -1,7 +1,6 @@
 [![Donate with PayPal](https://raw.githubusercontent.com/androidseb25/iGotify-Notification-Assistent/main/paypal-donate-icon-7_20.png)](https://www.paypal.com/donate/?hosted_button_id=VFSL9ZECRD6D6)
 ![Stars](https://img.shields.io/github/stars/androidseb25/iGotify-Notification-Assistent?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAEsWlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS41LjAiPgogPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iCiAgICB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyIKICAgIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIKICAgIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIKICAgIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIgogICAgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIKICAgdGlmZjpJbWFnZUxlbmd0aD0iNDgiCiAgIHRpZmY6SW1hZ2VXaWR0aD0iNDgiCiAgIHRpZmY6UmVzb2x1dGlvblVuaXQ9IjIiCiAgIHRpZmY6WFJlc29sdXRpb249IjcyLzEiCiAgIHRpZmY6WVJlc29sdXRpb249IjcyLzEiCiAgIGV4aWY6UGl4ZWxYRGltZW5zaW9uPSI0OCIKICAgZXhpZjpQaXhlbFlEaW1lbnNpb249IjQ4IgogICBleGlmOkNvbG9yU3BhY2U9IjEiCiAgIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiCiAgIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIKICAgeG1wOk1vZGlmeURhdGU9IjIwMjMtMDQtMTlUMTc6NDE6MDIrMDI6MDAiCiAgIHhtcDpNZXRhZGF0YURhdGU9IjIwMjMtMDQtMTlUMTc6NDE6MDIrMDI6MDAiPgogICA8eG1wTU06SGlzdG9yeT4KICAgIDxyZGY6U2VxPgogICAgIDxyZGY6bGkKICAgICAgc3RFdnQ6YWN0aW9uPSJwcm9kdWNlZCIKICAgICAgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWZmaW5pdHkgUGhvdG8gMiAyLjAuNCIKICAgICAgc3RFdnQ6d2hlbj0iMjAyMy0wNC0xOVQxNzo0MTowMiswMjowMCIvPgogICAgPC9yZGY6U2VxPgogICA8L3htcE1NOkhpc3Rvcnk+CiAgPC9yZGY6RGVzY3JpcHRpb24+CiA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgo8P3hwYWNrZXQgZW5kPSJyIj8+0oDKYwAAAYFpQ0NQc1JHQiBJRUM2MTk2Ni0yLjEAACiRdZHfK4NRGMc/hiamKS5cuFgaV5tmanGjTEItaaYMN9u7X2o/3t53S8utcqsocePXBX8Bt8q1UkRKbrkmbliv591WW7Ln9Jznc77nPE/nPAcsobSS0Vs8kMnmteC037EUXnZYX2mhGzuDWCOKrk7MzwdoaF8PNJnxzm3WanzuX+uIxXUFmtqExxVVywvPCAfW86rJu8I9SioSEz4XdmlyQeF7U49W+M3kZIV/TNZCwUmwdAk7knUcrWMlpWWE5eU4M+mCUr2P+RJbPLu4ILFfvA+dINP4cTDLFJP4GGZMZh9uvAzJigb5nnL+HDnJVWRWKaKxRpIUeVyiFqR6XGJC9LiMNEWz/3/7qidGvJXqNj+0vhjGxwBYd6C0bRjfx4ZROoHmZ7jK1vJzRzD6Kfp2TXMegn0TLq5rWnQPLreg90mNaJGy1CxuSSTg/Qw6w9B9C+0rlZ5V9zl9hNCGfNUN7B/AoJy3r/4CMN5nzbh35xIAAAAJcEhZcwAACxMAAAsTAQCanBgAAAGYSURBVGiB7VjtjcMgDH2cbhx2KJ2syWSlO2Qf+sd3iji+7NhJT+JJVSKCsY39sCkwMTExMTFhhLRhSRvC1XaIQMYn+i1Wer6sFgZw270/rJSYOEBpE7KxxUKXVQTMdjyH016Qdv9Z+Xx3HlFTn0UEWrsftJVZRCA1FXpdnaoRGDnztcmsuhtpwxMDaaIZBbUIlI7OxtxFSy9rJ7IU2b/fwCNopOerMAbOSVV1gIx9MA3TRqTnWnPquyF8tfHI9MfShBYHXo1vZ6NqS5MDRLbT2oIKVufrpO+S+GInmsYDg6dQp7+xQtd4gHGMnuzEcNPHroij1VaI6DzuHAF2JSYFkSs3gJVrPCBsJUjRKpGtYCjfSzjSC8UDsmprWV7qOQhSwSMOXF3gABy4D/RuXmxDhHcEUQQ+6d+2T+GA+JIjdYCT/1GoYwiWEVidh2PUjFt/yl+IiNMhcLEojdzwJERmR6BD4GpFdf63z6m2IhIeSFIoFMZ+0qVrwM4RlVbkKAeGDc9BMnk0YmmuOtKGoFkLtNebmJj4R3gDsdt6T8W+vnEAAAAASUVORK5CYII=)
 [![Crowdin](https://badges.crowdin.net/igotify/localized.svg)](https://crowdin.com/project/igotify)
-[![Qodana](https://github.com/androidseb25/iGotify-Notification-Assistent/actions/workflows/code_quality.yml/badge.svg?branch=main)](https://github.com/androidseb25/iGotify-Notification-Assistent/actions/workflows/code_quality.yml)
 
 # iGotify
 

Services/DatabaseService.cs

@@ -25,7 +25,7 @@ public static bool CreateDatebase(string path)
 
         // Create a sample table
         const string createTableQuery =
-            "create table if not exists Users (Uid integer primary key, ClientToken text not null, DeviceToken text not null, Headers text not null);";
+            "create table if not exists Users (Uid integer primary key, ClientToken text not null, DeviceToken text not null, GotifyUrl text not null, Headers text not null);";
         dbConnection.Execute(createTableQuery);
 
         // Perform other database operations as needed

Services/GotifySocketService.cs

@@ -37,7 +37,7 @@ public void Init()
         isInit = isDbFileExists;
     }
 
-    public static async void KillWsThread(string clientToken)
+    public static void KillWsThread(string clientToken)
     {
         if (_threadSockets != null)
         {
@@ -47,24 +47,24 @@ public static async void KillWsThread(string clientToken)
             try
             {
                 // 1) Signal termination
-                threadSocket.cts.Cancel();
+                threadSocket.cts?.Cancel();
 
                 // 2) If you have a WebSocket, close it actively so that blocking reads wake up
                 threadSocket.ws!.Stop();
 
                 // 3) Wait for thread end (short timeout so nothing hangs)
-                if (threadSocket.thread.IsAlive)
+                if (threadSocket.thread!.IsAlive)
                     threadSocket.thread.Join(millisecondsTimeout: 500);
             }
             finally
             {
-                threadSocket.cts.Dispose();
+                threadSocket.cts?.Dispose();
                 _threadSockets.Remove(threadSocket);
             }
         }
     }
 
-    public static async void KillAllWsThread()
+    public static void KillAllWsThread()
     {
         if (_threadSockets != null)
         {
@@ -73,13 +73,13 @@ public static async void KillAllWsThread()
                 try
                 {
                     // 1) Signal termination
-                    threadSocket.cts.Cancel();
+                    threadSocket.cts?.Cancel();
 
                     // 2) If you have a WebSocket, close it actively so that blocking reads wake up
                     threadSocket.ws!.Stop();
 
                     // 3) Wait for thread end (short timeout so nothing hangs)
-                    if (threadSocket.thread.IsAlive)
+                    if (threadSocket.thread!.IsAlive)
                         threadSocket.thread.Join(millisecondsTimeout: 500);
                 }
                 catch (Exception e)
@@ -88,7 +88,7 @@ public static async void KillAllWsThread()
                 }
                 finally
                 {
-                    threadSocket.cts.Dispose();
+                    threadSocket.cts?.Dispose();
                 }
             }
 
@@ -136,7 +136,7 @@ public static void StartWsThread(Users user)
 
     private static void StartWsConn(ThreadSocket threadSocket, Users user)
     {
-        while (!threadSocket.cts.IsCancellationRequested)
+        while (!threadSocket.cts!.IsCancellationRequested)
         {
             try
             {
@@ -170,7 +170,7 @@ private static void StartWsConn(ThreadSocket threadSocket, Users user)
 
     private static void StartWsConn(ThreadSocket threadSocket, string gotifyServerUrl, string clientToken)
     {
-        while (!threadSocket.cts.IsCancellationRequested)
+        while (!threadSocket.cts!.IsCancellationRequested)
         {
             try
             {

Services/WebSockClient.cs

@@ -30,6 +30,8 @@ public void Start(string clientToken, bool isRestart = false)
                     var client = new ClientWebSocket();
                     foreach (var header in customHeaders)
                     {
+                        if (header.Key == null || header.Value == null)
+                            continue;
                         client.Options.SetRequestHeader(header.Key, header.Value);
                     }
 

iGotify Notification Assist.csproj

@@ -6,9 +6,9 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <InvariantGlobalization>true</InvariantGlobalization>
         <RootNamespace>iGotify_Notification_Assist</RootNamespace>
-        <AssemblyVersion>1.5.0.0</AssemblyVersion>
-        <FileVersion>1.5.0.0</FileVersion>
-        <Version>1.5.0.0</Version>
+        <AssemblyVersion>1.5.0.1</AssemblyVersion>
+        <FileVersion>1.5.0.1</FileVersion>
+        <Version>1.5.0.1</Version>
         <LangVersion>default</LangVersion>
     </PropertyGroup>
 
@@ -19,8 +19,10 @@
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.8" />
         <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.8" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="Scalar.AspNetCore" Version="2.7.0" />
+        <PackageReference Include="Scalar.AspNetCore" Version="2.7.2" />
         <PackageReference Include="secntfy.nuget" Version="1.0.5" />
+        <PackageReference Include="System.Net.Http" Version="4.3.4" />
+        <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
         <PackageReference Include="Websocket.Client" Version="5.2.0" />
     </ItemGroup>