Publish v2.4.302

ahadvirus · May 19, 2022 · 32a8a8a · 32a8a8a
1 parent 4f76935
commit 32a8a8a
Show file tree

Hide file tree

Showing 24 changed files with 79 additions and 74 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
-# Upcoming
+# v2.4.302
+
+### Server
+* Update: Improve Session Management
+
 
 ### Developer
 * Update: Move VpnHood.Client.WebUI to a standalone repo
@@ -385,3 +389,4 @@
 
 
 
+
diff --git a/Pub/Version.json b/Pub/Version.json
@@ -1,6 +1,6 @@
 {
   "Major": 2,
   "Minor": 4,
-  "Build": 300,
-  "BumpTime": "2022-04-02T05:05:12.6932632Z"
+  "Build": 302,
+  "BumpTime": "2022-05-19T19:12:37.8101140Z"
 }
diff --git a/Samples/VpnHood.Samples.SimpleClient.Droid/VpnHood.Samples.SimpleClient.Droid.csproj b/Samples/VpnHood.Samples.SimpleClient.Droid/VpnHood.Samples.SimpleClient.Droid.csproj
@@ -108,12 +108,12 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="VpnHood.Client">
-      <Version>2.4.292</Version>
+      <Version>2.4.297</Version>
     </PackageReference>
     <PackageReference Include="VpnHood.Client.Device.Android">
-      <Version>2.4.292</Version>
+      <Version>2.4.297</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

diff --git a/Samples/VpnHood.Samples.SimpleClient.Win/VpnHood.Samples.SimpleClient.Win.csproj b/Samples/VpnHood.Samples.SimpleClient.Win/VpnHood.Samples.SimpleClient.Win.csproj
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="VpnHood.Client" Version="2.4.292" />
-    <PackageReference Include="VpnHood.Client.Device.WinDivert" Version="2.4.292" />
+    <PackageReference Include="VpnHood.Client" Version="2.4.297" />
+    <PackageReference Include="VpnHood.Client.Device.WinDivert" Version="2.4.297" />
   </ItemGroup>
 
 </Project>
diff --git a/VpnHood.App.Launcher/VpnHood.App.Launcher.csproj b/VpnHood.App.Launcher/VpnHood.App.Launcher.csproj
@@ -14,9 +14,9 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <Product>VpnHood.App.Launcher</Product>
     <ApplicationIcon>Resources\VpnHood.ico</ApplicationIcon>
-    <Version>2.4.297</Version>
-    <AssemblyVersion>2.4.297</AssemblyVersion>
-    <FileVersion>2.4.297</FileVersion>
+    <Version>2.4.302</Version>
+    <AssemblyVersion>2.4.302</AssemblyVersion>
+    <FileVersion>2.4.302</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/VpnHood.Client.App.Android/Assets/SPA.zip b/VpnHood.Client.App.Android/Assets/SPA.zip
diff --git a/VpnHood.Client.App.Android/VpnHood.Client.App.Android.csproj b/VpnHood.Client.App.Android/VpnHood.Client.App.Android.csproj
@@ -81,7 +81,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AndroidApp.cs" />

diff --git a/VpnHood.Client.App.UI/VpnHood.Client.App.UI.csproj b/VpnHood.Client.App.UI/VpnHood.Client.App.UI.csproj
@@ -12,9 +12,9 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>Tiny internal webserver to server your single-page application (SPA). You need this only if you want to create a UI for your VpnHood client by single-page application (SPA).</Description>
     <PackageId>VpnHood.Client.App.UI</PackageId>
-    <Version>2.4.300</Version>
-    <AssemblyVersion>2.4.300</AssemblyVersion>
-    <FileVersion>2.4.300</FileVersion>
+    <Version>2.4.302</Version>
+    <AssemblyVersion>2.4.302</AssemblyVersion>
+    <FileVersion>2.4.302</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>

diff --git a/VpnHood.Client.App.Win/Resources/SPA.zip b/VpnHood.Client.App.Win/Resources/SPA.zip
diff --git a/VpnHood.Client.App.Win/VpnHood.Client.App.Win.csproj b/VpnHood.Client.App.Win/VpnHood.Client.App.Win.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -58,7 +58,7 @@
 
   <ItemGroup>
     <PackageReference Include=" " Version="1.0.664.37" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1072.54" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1210.39" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/VpnHood.Client.App/VpnHood.Client.App.csproj b/VpnHood.Client.App/VpnHood.Client.App.csproj
@@ -11,9 +11,9 @@
     <RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
     <Description>Readymade Vpn App skeleton for VpnHood clients. You just need to create a UI on it.</Description>
     <PackageId>VpnHood.Client.App</PackageId>
-    <Version>2.4.300</Version>
-    <AssemblyVersion>2.4.300</AssemblyVersion>
-    <FileVersion>2.4.300</FileVersion>
+    <Version>2.4.302</Version>
+    <AssemblyVersion>2.4.302</AssemblyVersion>
+    <FileVersion>2.4.302</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>

diff --git a/VpnHood.Client.Device.Android/VpnHood.Client.Device.Android.csproj b/VpnHood.Client.Device.Android/VpnHood.Client.Device.Android.csproj
@@ -58,10 +58,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
-      <Version>6.0.0</Version>
+      <Version>6.0.1</Version>
     </PackageReference>
     <PackageReference Include="PacketDotNet">
-      <Version>1.4.0</Version>
+      <Version>1.4.5</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/VpnHood.Client.Device.WinDivert/VpnHood.Client.Device.WinDivert.csproj b/VpnHood.Client.Device.WinDivert/VpnHood.Client.Device.WinDivert.csproj
@@ -9,11 +9,11 @@
     <RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>VpnHood client device provider for Windows using WinDivert.</Description>
-    <Version>2.4.300</Version>
+    <Version>2.4.302</Version>
     <PackageId>VpnHood.Client.Device.WinDivert</PackageId>
     <Version>1.1.226</Version>
-    <AssemblyVersion>2.4.300</AssemblyVersion>
-    <FileVersion>2.4.300</FileVersion>
+    <AssemblyVersion>2.4.302</AssemblyVersion>
+    <FileVersion>2.4.302</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SharpPcap" Version="6.1.0" />
+    <PackageReference Include="SharpPcap" Version="6.2.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/VpnHood.Client.Device/VpnHood.Client.Device.csproj b/VpnHood.Client.Device/VpnHood.Client.Device.csproj
@@ -14,9 +14,9 @@
     <RepositoryType></RepositoryType>
     <PackageId>VpnHood.Client.Device</PackageId>
     <RootNamespace>VpnHood.Client.Device</RootNamespace>
-    <Version>2.4.300</Version>
-    <AssemblyVersion>2.4.300</AssemblyVersion>
-    <FileVersion>2.4.300</FileVersion>
+    <Version>2.4.302</Version>
+    <AssemblyVersion>2.4.302</AssemblyVersion>
+    <FileVersion>2.4.302</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>
@@ -33,8 +33,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="PacketDotNet" Version="1.4.0" />
-    <PackageReference Include="System.Text.Json" Version="6.0.1" />
+    <PackageReference Include="PacketDotNet" Version="1.4.5" />
+    <PackageReference Include="System.Text.Json" Version="6.0.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/VpnHood.Client/VpnHood.Client.csproj b/VpnHood.Client/VpnHood.Client.csproj
@@ -13,16 +13,16 @@
     <Copyright>2020 VpnHood</Copyright>
     <PackageId>VpnHood.Client</PackageId>
     <PackageTags>VPN VpnClient Proxy</PackageTags>
-    <Version>2.4.300</Version>
-    <AssemblyVersion>2.4.300</AssemblyVersion>
-    <FileVersion>2.4.300</FileVersion>
+    <Version>2.4.302</Version>
+    <AssemblyVersion>2.4.302</AssemblyVersion>
+    <FileVersion>2.4.302</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-    <PackageReference Include="System.Text.Json" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
+    <PackageReference Include="System.Text.Json" Version="6.0.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/VpnHood.Common/VpnHood.Common.csproj b/VpnHood.Common/VpnHood.Common.csproj
@@ -12,16 +12,16 @@
     <PackageId>VpnHood.Common</PackageId>
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>VpnHood Common Library is shared among all other VpnHood modules.</Description>
-    <Version>2.4.300</Version>
-    <AssemblyVersion>2.4.300</AssemblyVersion>
-    <FileVersion>2.4.300</FileVersion>
+    <Version>2.4.302</Version>
+    <AssemblyVersion>2.4.302</AssemblyVersion>
+    <FileVersion>2.4.302</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-    <PackageReference Include="System.Text.Json" Version="6.0.1" />
+    <PackageReference Include="System.Text.Json" Version="6.0.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/VpnHood.Server.Access/ServerStatus.cs b/VpnHood.Server.Access/ServerStatus.cs
@@ -10,6 +10,6 @@ public class ServerStatus
         public int ThreadCount { get; set; }
         public long TunnelSendSpeed { get; set; }
         public long TunnelReceiveSpeed { get; set; }
-        public string ConfigCode { get; set; } = default!;
+        public string? ConfigCode { get; set; }
     }
 }
diff --git a/VpnHood.Server.Access/SessionOptions.cs b/VpnHood.Server.Access/SessionOptions.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Text.Json.Serialization;
-using System.Threading;
 using VpnHood.Common.Converters;
 
 namespace VpnHood.Server

diff --git a/VpnHood.Server.Access/VpnHood.Server.Access.csproj b/VpnHood.Server.Access/VpnHood.Server.Access.csproj
@@ -12,9 +12,9 @@
     <PackageId>VpnHood.Server.Access</PackageId>
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>Stores, and retrieves end users' access and usage. Provides required interfaces and classes to use or create an access server and accounting.</Description>
-    <Version>2.4.300</Version>
-    <AssemblyVersion>2.4.300</AssemblyVersion>
-    <FileVersion>2.4.300</FileVersion>
+    <Version>2.4.302</Version>
+    <AssemblyVersion>2.4.302</AssemblyVersion>
+    <FileVersion>2.4.302</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="6.0.1" />
+    <PackageReference Include="System.Text.Json" Version="6.0.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/VpnHood.Server.App.Net/VpnHood.Server.App.Net.csproj b/VpnHood.Server.App.Net/VpnHood.Server.App.Net.csproj
@@ -12,9 +12,9 @@
     <RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
     <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
     <PackageIcon>VpnHood.png</PackageIcon>
-    <Version>2.4.297</Version>
-    <AssemblyVersion>2.4.297</AssemblyVersion>
-    <FileVersion>2.4.297</FileVersion>
+    <Version>2.4.302</Version>
+    <AssemblyVersion>2.4.302</AssemblyVersion>
+    <FileVersion>2.4.302</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -41,11 +41,11 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.0" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
-    <PackageReference Include="NLog" Version="4.7.13" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="1.7.4" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.1" />
+    <PackageReference Include="NLog" Version="5.0.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VpnHood.Tunneling\VpnHood.Tunneling.csproj" />

diff --git a/VpnHood.Server/VpnHood.Server.csproj b/VpnHood.Server/VpnHood.Server.csproj
@@ -13,17 +13,17 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>The core of VpnHood server. It can listen and accept connections from VpnHood clients.</Description>
     <PackageId>VpnHood.Server</PackageId>
-    <Version>2.4.300</Version>
-    <AssemblyVersion>2.4.300</AssemblyVersion>
-    <FileVersion>2.4.300</FileVersion>
+    <Version>2.4.302</Version>
+    <AssemblyVersion>2.4.302</AssemblyVersion>
+    <FileVersion>2.4.302</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-    <PackageReference Include="PacketDotNet" Version="1.4.0" />
-    <PackageReference Include="System.Text.Json" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
+    <PackageReference Include="PacketDotNet" Version="1.4.5" />
+    <PackageReference Include="System.Text.Json" Version="6.0.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/VpnHood.Server/VpnHoodServer.cs b/VpnHood.Server/VpnHoodServer.cs
@@ -24,7 +24,7 @@ public class VpnHoodServer : IDisposable
         private Timer? _updateStatusTimer;
         private bool _disposed;
         private string? _lastConfigError;
-        private string _lastConfigCode = "";
+        private string? _lastConfigCode;
 
         public VpnHoodServer(IAccessServer accessServer, ServerOptions options)
         {
@@ -160,9 +160,8 @@ private async Task Configure()
                 if (_tcpHost.IsStarted) await _tcpHost.Stop();
                 _tcpHost.Start(serverConfig.TcpEndPoints);
 
-                State = ServerState.Started;
-
-                // set _updateStatusTimer
+                // make sure to send status after starting the service at least once
+                // it is required to inform that server is successfully configured
                 if (serverConfig.UpdateStatusInterval != TimeSpan.Zero)
                 {
                     VhLogger.Instance.LogInformation($"Set {nameof(serverConfig.UpdateStatusInterval)} to {serverConfig.UpdateStatusInterval.TotalSeconds} seconds.");
@@ -171,6 +170,8 @@ private async Task Configure()
                     _updateStatusTimer = new Timer(StatusTimerCallback, null, TimeSpan.Zero, serverConfig.UpdateStatusInterval);
                 }
 
+                // set config status
+                State = ServerState.Started;
                 _lastConfigError = null;
                 VhLogger.Instance.LogInformation("Server is ready!");
             }

diff --git a/VpnHood.Tunneling/VpnHood.Tunneling.csproj b/VpnHood.Tunneling/VpnHood.Tunneling.csproj
@@ -15,19 +15,19 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <Product>VpnHood.Tunneling</Product>
     <Description>Provides tunnelling classes and protocols shared between VpnHood.Client and VpnHood.Server.</Description>
-    <Version>2.4.300</Version>
-    <AssemblyVersion>2.4.300</AssemblyVersion>
-    <FileVersion>2.4.300</FileVersion>
+    <Version>2.4.302</Version>
+    <AssemblyVersion>2.4.302</AssemblyVersion>
+    <FileVersion>2.4.302</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-    <PackageReference Include="PacketDotNet" Version="1.4.0" />
-    <PackageReference Include="System.Text.Json" Version="6.0.1" />
+    <PackageReference Include="PacketDotNet" Version="1.4.5" />
+    <PackageReference Include="System.Text.Json" Version="6.0.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/VpnHood.ZTest/VpnHood.ZTest.csproj b/VpnHood.ZTest/VpnHood.ZTest.csproj
@@ -16,10 +16,10 @@
   <ItemGroup>
     <PackageReference Include="EmbedIO" Version="3.4.3" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageReference Include="coverlet.collector" Version="3.1.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>