移除压缩组件

Author: JusterZhu

src/c#/ConsoleApp1/ConsoleApp1.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net9.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0" />
+    </ItemGroup>
+
+</Project>

src/c#/ConsoleApp1/Program.cs

@@ -0,0 +1,19 @@
+// See https://aka.ms/new-console-template for more information
+
+using Microsoft.AspNetCore.SignalR.Client;
+
+HubConnection _connection = new HubConnectionBuilder()
+    .WithUrl("http://localhost:5000/UpgradeHub")
+    .Build();
+
+_connection.On<string, string>("11", (user, message) =>
+{
+    Console.WriteLine($"{user}: {message}");
+});
+await _connection.StartAsync();
+
+while (true)
+{
+    var content = Console.ReadLine();
+    if (content == "exit") break;
+}

src/c#/GeneralUpdate.Bowl/Bowl.cs

@@ -21,13 +21,7 @@ private Bowl() { }
     private static void CreateStrategy()
     {
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-        {
             _strategy = new WindowStrategy();
-        }
-        /*else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-        {
-            _strategy = new LinuxStrategy();
-        }*/
 
         if (_strategy == null)
             throw new PlatformNotSupportedException("Unsupported operating system");

src/c#/GeneralUpdate.Client/GeneralUpdate.Client.csproj

@@ -5,15 +5,13 @@
     <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <LangVersion>13</LangVersion>
     <PublishAot>true</PublishAot>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SharpCompress" Version="0.38.0" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="System.Private.Uri" Version="4.3.2" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

src/c#/GeneralUpdate.Client/Program.cs

@@ -1,7 +1,5 @@
-using System.Diagnostics;
-using System.Text;
+using System.Text;
 using GeneralUpdate.ClientCore;
-using GeneralUpdate.ClientCore.Hubs;
 using GeneralUpdate.Common.Download;
 using GeneralUpdate.Common.Internal;
 using GeneralUpdate.Common.Internal.Bootstrap;
@@ -12,90 +10,84 @@ namespace GeneralUpdate.Client
 {
     internal class Program
     {
-        private static void Main(string[] args)
+        static async Task Main(string[] args)
         {
-            /*Task.Run(async () =>
-            {
-                var source = @"D:\packet\app";
-                var target = @"D:\packet\release";
-                var patch = @"D:\packet\patch";
-
-                await DifferentialCore.Instance?.Clean(source, target, patch);
-                await DifferentialCore.Instance?.Dirty(source, patch);
-            });*/
-            
-            Task.Run(async () =>
+            try
             {
-                try
+                Console.WriteLine($"主程序初始化，{DateTime.Now}！");
+                await Task.Delay(3000);
+                var configinfo = new Configinfo
                 {
-                    Console.WriteLine("主程序启动辣！！！！");
-                    await Task.Delay(3000);
-
-                    var configinfo = new Configinfo
-                    {
-                        //configinfo.UpdateLogUrl = "https://www.baidu.com";
-                        ReportUrl = "http://127.0.0.1:5000/Upgrade/Report",
-                        UpdateUrl = "http://127.0.0.1:5000/Upgrade/Verification",
-                        AppName = "GeneralUpdate.Upgrad.exe",
-                        MainAppName = "GeneralUpdate.Client.exe",
-                        InstallPath = @"D:\迅雷下载\Client", //Thread.GetDomain().BaseDirectory,
-                        //configinfo.Bowl = "Generalupdate.CatBowl.exe";
-                        //当前客户端的版本号
-                        ClientVersion = "1.0.0.0",
-                        //当前升级端的版本号
-                        UpgradeClientVersion = "1.0.0.0",
-                        //平台
-                        Platform = PlatformType.Windwos,
-                        //产品id
-                        ProductId = "a77c9df5-45f8-4ee9-b3ad-b9431ce0b51c",
-                        //应用密钥
-                        AppSecretKey = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                    };
+                    //configinfo.UpdateLogUrl = "https://www.baidu.com";
+                    ReportUrl = "http://127.0.0.1:5000/Upgrade/Report",
+                    UpdateUrl = "http://127.0.0.1:5000/Upgrade/Verification",
+                    AppName = "GeneralUpdate.Upgrad.exe",
+                    MainAppName = "GeneralUpdate.Client.exe",
+                    InstallPath = @"D:\packet\installtest",
+                    //configinfo.Bowl = "Generalupdate.CatBowl.exe";
+                    //当前客户端的版本号
+                    ClientVersion = "1.0.0.0",
+                    //当前升级端的版本号
+                    UpgradeClientVersion = "1.0.0.0",
+                    //产品id
+                    ProductId = "a77c9df5-45f8-4ee9-b3ad-b9431ce0b51c",
+                    //应用密钥
+                    AppSecretKey = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                };
+                _ = new GeneralClientBootstrap() //单个或多个更新包下载通知事件
+                    .AddListenerMultiDownloadProgress(OnMultiDownloadProgressChanged)
+                    //单个或多个更新包下载速度、剩余下载事件、当前下载版本信息通知事件
+                    .AddListenerMultiDownloadStatistics(OnMultiDownloadStatistics)
+                    //单个或多个更新包下载完成
+                    .AddListenerMultiDownloadCompleted(OnMultiDownloadCompleted)
+                    //完成所有的下载任务通知
+                    .AddListenerMultiAllDownloadCompleted(OnMultiAllDownloadCompleted)
+                    //下载过程出现的异常通知
+                    .AddListenerMultiDownloadError(OnMultiDownloadError)
+                    //整个更新过程出现的任何问题都会通过这个事件通知
+                    .AddListenerException(OnException)
+                    .SetConfig(configinfo)
+                    .Option(UpdateOption.DownloadTimeOut, 60)
+                    .Option(UpdateOption.Encoding, Encoding.UTF8)
+                    .Option(UpdateOption.Format, Format.ZIP)
+                    .LaunchAsync();
+                Console.WriteLine($"主程序已启动，{DateTime.Now}！");
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.Message + "\n" + e.StackTrace);
+            }
 
-                    _ = new GeneralClientBootstrap() //单个或多个更新包下载通知事件
-                        .AddListenerMultiDownloadProgress(OnMultiDownloadProgressChanged)
-                        //单个或多个更新包下载速度、剩余下载事件、当前下载版本信息通知事件
-                        .AddListenerMultiDownloadStatistics(OnMultiDownloadStatistics)
-                        //单个或多个更新包下载完成
-                        .AddListenerMultiDownloadCompleted(OnMultiDownloadCompleted)
-                        //完成所有的下载任务通知
-                        .AddListenerMultiAllDownloadCompleted(OnMultiAllDownloadCompleted)
-                        //下载过程出现的异常通知
-                        .AddListenerMultiDownloadError(OnMultiDownloadError)
-                        //整个更新过程出现的任何问题都会通过这个事件通知
-                        .AddListenerException(OnException)
-                        .SetConfig(configinfo)
-                        .Option(UpdateOption.DownloadTimeOut, 60)
-                        .Option(UpdateOption.Encoding, Encoding.UTF8)
-                        .Option(UpdateOption.Format, Format.ZIP)
-                        .LaunchAsync();
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine(e.Message + "\n" + e.StackTrace);
-                }
-            });
-            
             /*var paramsOSS = new GlobalConfigInfoOSS();
             paramsOSS.Url = "http://192.168.50.203/versions.json";
             paramsOSS.CurrentVersion = "1.0.0.0";
             paramsOSS.VersionFileName = "versions.json";
             paramsOSS.AppName = "GeneralUpdate.Client.exe";
             paramsOSS.Encoding = Encoding.UTF8.WebName;
             GeneralClientOSS.Start(paramsOSS);*/
-            
 
-            /*IUpgradeHubService hub = new UpgradeHubService("http://localhost:5008/UpgradeHub", null, "GeneralUpdate");
-            hub.AddListenerReceive(Receive);
-            hub.StartAsync().Wait();*/
+            /*var hub = new UpgradeHubService("http://localhost:5000/UpgradeHub"
+                , null,"a84d21d4-3448-48d4-b418-12c5a7a039cd");
+            hub.AddListenerReceive((message) =>
+            {
+                Debug.WriteLine(message);
+            });
+            await hub.StartAsync();*/
+
+            /*Task.Run(async () =>
+           {
+               var source = @"D:\packet\app";
+               var target = @"D:\packet\release";
+               var patch = @"D:\packet\patch";
+
+               await DifferentialCore.Instance?.Clean(source, target, patch);
+               await DifferentialCore.Instance?.Dirty(source, patch);
+           });*/
 
             while (true)
             {
-                var input = Console.ReadLine();
-                if (input == "exit")
-                {
-                    break;
-                }
+                var content = Console.ReadLine();
+                if (content == "exit") break;
             }
         }
 

src/c#/GeneralUpdate.ClientCore/GeneralClientBootstrap.cs

@@ -16,6 +16,7 @@
 using GeneralUpdate.Common.Internal.Event;
 using GeneralUpdate.Common.Internal.Strategy;
 using GeneralUpdate.Common.Shared.Object;
+using GeneralUpdate.Common.Shared.Object.Enum;
 using GeneralUpdate.Common.Shared.Service;
 
 namespace GeneralUpdate.ClientCore;
@@ -71,7 +72,6 @@ public GeneralClientBootstrap SetConfig(Configinfo configInfo)
             AppSecretKey = configInfo.AppSecretKey,
             BlackFormats = configInfo.BlackFormats,
             BlackFiles = configInfo.BlackFiles,
-            Platform = configInfo.Platform,
             ProductId = configInfo.ProductId,
             UpgradeClientVersion = configInfo.UpgradeClientVersion,
             Bowl = configInfo.Bowl
@@ -138,20 +138,22 @@ public GeneralClientBootstrap AddListenerException(Action<object, ExceptionEvent
 
     private async Task ExecuteWorkflowAsync()
     {
+        Debug.Assert(_configinfo != null);
+        
         //Request the upgrade information needed by the client and upgrade end, and determine if an upgrade is necessary.
         var mainResp = await VersionService.Validate(_configinfo.UpdateUrl
             , _configinfo.ClientVersion
             , AppType.ClientApp
-            ,_configinfo.AppSecretKey
-            ,_configinfo.Platform
-            ,_configinfo.ProductId);
+            , _configinfo.AppSecretKey
+            , GetPlatform()
+            , _configinfo.ProductId);
 
         var upgradeResp = await VersionService.Validate(_configinfo.UpdateUrl
             , _configinfo.UpgradeClientVersion
             , AppType.UpgradeApp
-            ,_configinfo.AppSecretKey
-            ,_configinfo.Platform
-            ,_configinfo.ProductId);
+            , _configinfo.AppSecretKey
+            , GetPlatform()
+            , _configinfo.ProductId);
 
         _configinfo.IsUpgradeUpdate = CheckUpgrade(upgradeResp);
         _configinfo.IsMainUpdate = CheckUpgrade(mainResp);
@@ -230,7 +232,27 @@ private async Task Download()
         }
         await manager.LaunchTasksAsync();
     }
-    
+
+    private int GetPlatform()
+    {
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            return PlatformType.Windows;
+        }
+
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+        {
+            return PlatformType.Linux;
+        }
+        
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+        {
+            return PlatformType.Mac;
+        }
+
+        return -1;
+    }
+
     /// <summary>
     /// Check if there has been a recent update failure.(only windows)
     /// </summary>

src/c#/GeneralUpdate.ClientCore/GeneralUpdate.ClientCore.csproj

@@ -27,7 +27,6 @@
     <ItemGroup>
         <ProjectReference Include="..\GeneralUpdate.Common\GeneralUpdate.Common.csproj" />
         <ProjectReference Include="..\GeneralUpdate.Differential\GeneralUpdate.Differential.csproj" />
-        <ProjectReference Include="..\GeneralUpdate.Zip\GeneralUpdate.Zip.csproj" />
     </ItemGroup>
 
     <ItemGroup>

src/c#/GeneralUpdate.ClientCore/Hubs/IUpgradeHubService.cs

@@ -9,7 +9,7 @@ public interface IUpgradeHubService
     /// Add a listener to receive upgrade information pushed from the server.
     /// </summary>
     /// <param name="receiveMessageCallback">string : group name , string :  received message content.</param>
-    public void AddListenerReceive(Action<string, string> receiveMessageCallback);
+    public void AddListenerReceive(Action<string> receiveMessageCallback);
 
     /// <summary>
     /// Add a listener to receive online and offline notifications.

src/c#/GeneralUpdate.ClientCore/Hubs/UpgradeHubService.cs

@@ -10,7 +10,7 @@ namespace GeneralUpdate.ClientCore.Hubs;
 /// <param name="url">Subscription address, for example: http://127.0.0.1/UpgradeHub</param>
 /// <param name="token">ID4 authentication token string.</param>
 /// <param name="args">Parameters to be sent to the server upon connection (recommended as a JSON string).</param>
-public class UpgradeHubService(string url, string? token = null, string? args = null) : IUpgradeHubService
+public class UpgradeHubService(string url, string? token = null, string? appkey = null) : IUpgradeHubService
 {
     private const string Onlineflag = "Online";
     private const string ReceiveMessageflag = "ReceiveMessage";
@@ -21,13 +21,13 @@ public class UpgradeHubService(string url, string? token = null, string? args =
             if (!string.IsNullOrWhiteSpace(token))
                 config.AccessTokenProvider = () => Task.FromResult(token);
 
-            if (!string.IsNullOrWhiteSpace(args))
-                config.Headers.Add("client", args);
+            if (!string.IsNullOrWhiteSpace(appkey))
+                config.Headers.Add("appkey", appkey);
         })
         .WithAutomaticReconnect(new RandomRetryPolicy())
         .Build();
 
-    public void AddListenerReceive(Action<string, string> receiveMessageCallback)
+    public void AddListenerReceive(Action<string> receiveMessageCallback)
         => _connection?.On(ReceiveMessageflag, receiveMessageCallback);
 
     public void AddListenerOnline(Action<string> onlineMessageCallback)

src/c#/GeneralUpdate.ClientCore/Pipeline/CompressMiddleware.cs

@@ -0,0 +1,34 @@
+using System;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using GeneralUpdate.Common.Compress;
+using GeneralUpdate.Common.Internal;
+using GeneralUpdate.Common.Internal.Event;
+using GeneralUpdate.Common.Internal.Pipeline;
+
+namespace GeneralUpdate.ClientCore.Pipeline;
+
+public class CompressMiddleware : IMiddleware
+{
+    public Task InvokeAsync(PipelineContext? context)
+    {
+        return Task.Run(() =>
+        {
+            try
+            {
+                var format = context.Get<string>("Format");
+                var name = context.Get<string>("Name");
+                var sourcePath = context.Get<string>("ZipFilePath");
+                var patchPath = context.Get<string>("PatchPath");
+                var encoding = context.Get<Encoding>("Encoding");
+                var destinationPath = Path.Combine(patchPath, name);
+                CompressProvider.Decompress(format,sourcePath,destinationPath, encoding);
+            }
+            catch (Exception e)
+            {
+                EventManager.Instance.Dispatch(this, new ExceptionEventArgs(e, e.Message));
+            }
+        });
+    }
+}