Merge pull request #179 from androidseb25/dev

androidseb25 · web-flow · commit 1bc246fb8bcb · 2025-08-28T16:57:36.000+02:00
Update 1.5.0.1
diff --git a/.github/workflows/publish.yml b/.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
diff --git a/Models/CustomHeaders.cs b/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; }
 }
diff --git a/Services/DatabaseService.cs b/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
diff --git a/Services/GotifySocketService.cs b/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
             {
diff --git a/Services/WebSockClient.cs b/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);
                     }
 
diff --git a/iGotify Notification Assist.csproj b/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>
 

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ namespace iGotify_Notification_Assist.Models;`
`2`	`2`
`3`	`3`	`public class CustomHeaders`
`4`	`4`	`{`
`5`		`- public string Key { get; set; }`
`6`		`- public string Value { get; set; }`
	`5`	`+ public string? Key { get; set; }`
	`6`	`+ public string? Value { get; set; }`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public void Init()`
`37`	`37`	`isInit = isDbFileExists;`
`38`	`38`	`}`
`39`	`39`
`40`		`- public static async void KillWsThread(string clientToken)`
	`40`	`+ public static void KillWsThread(string clientToken)`
`41`	`41`	`{`
`42`	`42`	`if (_threadSockets != null)`
`43`	`43`	`{`
`@@ -47,24 +47,24 @@ public static async void KillWsThread(string clientToken)`
`47`	`47`	`try`
`48`	`48`	`{`
`49`	`49`	`// 1) Signal termination`
`50`		`- threadSocket.cts.Cancel();`
	`50`	`+ threadSocket.cts?.Cancel();`
`51`	`51`
`52`	`52`	`// 2) If you have a WebSocket, close it actively so that blocking reads wake up`
`53`	`53`	`threadSocket.ws!.Stop();`
`54`	`54`
`55`	`55`	`// 3) Wait for thread end (short timeout so nothing hangs)`
`56`		`- if (threadSocket.thread.IsAlive)`
	`56`	`+ if (threadSocket.thread!.IsAlive)`
`57`	`57`	`threadSocket.thread.Join(millisecondsTimeout: 500);`
`58`	`58`	`}`
`59`	`59`	`finally`
`60`	`60`	`{`
`61`		`- threadSocket.cts.Dispose();`
	`61`	`+ threadSocket.cts?.Dispose();`
`62`	`62`	`_threadSockets.Remove(threadSocket);`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`- public static async void KillAllWsThread()`
	`67`	`+ public static void KillAllWsThread()`
`68`	`68`	`{`
`69`	`69`	`if (_threadSockets != null)`
`70`	`70`	`{`
`@@ -73,13 +73,13 @@ public static async void KillAllWsThread()`
`73`	`73`	`try`
`74`	`74`	`{`
`75`	`75`	`// 1) Signal termination`
`76`		`- threadSocket.cts.Cancel();`
	`76`	`+ threadSocket.cts?.Cancel();`
`77`	`77`
`78`	`78`	`// 2) If you have a WebSocket, close it actively so that blocking reads wake up`
`79`	`79`	`threadSocket.ws!.Stop();`
`80`	`80`
`81`	`81`	`// 3) Wait for thread end (short timeout so nothing hangs)`
`82`		`- if (threadSocket.thread.IsAlive)`
	`82`	`+ if (threadSocket.thread!.IsAlive)`
`83`	`83`	`threadSocket.thread.Join(millisecondsTimeout: 500);`
`84`	`84`	`}`
`85`	`85`	`catch (Exception e)`
`@@ -88,7 +88,7 @@ public static async void KillAllWsThread()`
`88`	`88`	`}`
`89`	`89`	`finally`
`90`	`90`	`{`
`91`		`- threadSocket.cts.Dispose();`
	`91`	`+ threadSocket.cts?.Dispose();`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
`@@ -136,7 +136,7 @@ public static void StartWsThread(Users user)`
`136`	`136`
`137`	`137`	`private static void StartWsConn(ThreadSocket threadSocket, Users user)`
`138`	`138`	`{`
`139`		`- while (!threadSocket.cts.IsCancellationRequested)`
	`139`	`+ while (!threadSocket.cts!.IsCancellationRequested)`
`140`	`140`	`{`
`141`	`141`	`try`
`142`	`142`	`{`
`@@ -170,7 +170,7 @@ private static void StartWsConn(ThreadSocket threadSocket, Users user)`
`170`	`170`
`171`	`171`	`private static void StartWsConn(ThreadSocket threadSocket, string gotifyServerUrl, string clientToken)`
`172`	`172`	`{`
`173`		`- while (!threadSocket.cts.IsCancellationRequested)`
	`173`	`+ while (!threadSocket.cts!.IsCancellationRequested)`
`174`	`174`	`{`
`175`	`175`	`try`
`176`	`176`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ public void Start(string clientToken, bool isRestart = false)`
`30`	`30`	`var client = new ClientWebSocket();`
`31`	`31`	`foreach (var header in customHeaders)`
`32`	`32`	`{`
	`33`	`+ if (header.Key == null \|\| header.Value == null)`
	`34`	`+ continue;`
`33`	`35`	`client.Options.SetRequestHeader(header.Key, header.Value);`
`34`	`36`	`}`
`35`	`37`