适配AOT

Author: JusterZhu

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

@@ -3,6 +3,7 @@
 using System.Runtime.InteropServices;
 using System.Text.Json;
 using GeneralUpdate.Bowl.Strategys;
+using GeneralUpdate.Common.AOT.JsonContext;
 using GeneralUpdate.Common.Shared.Object;
 
 namespace GeneralUpdate.Bowl;
@@ -45,7 +46,10 @@ private static MonitorParameter CreateParameter()
         if(string.IsNullOrWhiteSpace(json))
             throw new ArgumentNullException("ProcessInfo environment variable not set !"); 
 
-        var processInfo = JsonSerializer.Deserialize<ProcessInfo>(json);
+        var processInfo = JsonSerializer.Deserialize<ProcessInfo>(json, ProcessInfoJsonContext.Default.ProcessInfo);
+        if(processInfo == null)
+            throw new ArgumentNullException("ProcessInfo json deserialize fail!");
+        
         return new MonitorParameter
         {
             ProcessNameOrId = processInfo.AppName,

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

@@ -8,6 +8,7 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using GeneralUpdate.ClientCore.Strategys;
+using GeneralUpdate.Common.AOT.JsonContext;
 using GeneralUpdate.Common.FileBasic;
 using GeneralUpdate.Common.Download;
 using GeneralUpdate.Common.Internal;
@@ -141,17 +142,19 @@ private async Task ExecuteWorkflowAsync()
         //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
-            ,1
+            , AppType.ClientApp
             ,_configinfo.AppSecretKey
             ,_configinfo.Platform
-            ,_configinfo.ProductId);
+            ,_configinfo.ProductId
+            , VersionRespJsonContext.Default.VersionRespDTO);
 
         var upgradeResp = await VersionService.Validate(_configinfo.UpdateUrl
             , _configinfo.UpgradeClientVersion
-            ,2
+            , AppType.UpgradeApp
             ,_configinfo.AppSecretKey
             ,_configinfo.Platform
-            ,_configinfo.ProductId);
+            ,_configinfo.ProductId
+            , VersionRespJsonContext.Default.VersionRespDTO);
 
         _configinfo.IsUpgradeUpdate = CheckUpgrade(upgradeResp);
         _configinfo.IsMainUpdate = CheckUpgrade(mainResp);
@@ -161,7 +164,7 @@ private async Task ExecuteWorkflowAsync()
         if (CanSkip(isForcibly)) return;
 
         _configinfo.Encoding = GetOption(UpdateOption.Encoding) ?? Encoding.Default;
-        _configinfo.Format = GetOption(UpdateOption.Format) ?? ".zip";
+        _configinfo.Format = GetOption(UpdateOption.Format) ?? Format.ZIP;
         _configinfo.DownloadTimeOut = GetOption(UpdateOption.DownloadTimeOut) == 0 ? 60 : GetOption(UpdateOption.DownloadTimeOut);
         _configinfo.DriveEnabled = GetOption(UpdateOption.Drive) ?? false;
         _configinfo.TempPath = GeneralFileManager.GetTempDirectory("main_temp");
@@ -190,7 +193,7 @@ private async Task ExecuteWorkflowAsync()
                 , _configinfo.BackupDirectory
                 , _configinfo.Bowl);
 
-            _configinfo.ProcessInfo = JsonSerializer.Serialize(processInfo);
+            _configinfo.ProcessInfo = JsonSerializer.Serialize(processInfo,ProcessInfoJsonContext.Default.ProcessInfo);
         }
 
         GeneralFileManager.Backup(_configinfo.InstallPath, _configinfo.BackupDirectory, _notBackupDirectory);
@@ -263,7 +266,7 @@ private bool CheckUpgrade(VersionRespDTO? response)
             return false;
         }
 
-        if (response.Code == HttpStatus.OK)
+        if (response.Code == 200)
         {
             return response.Body.Count > 0;
         }
@@ -276,7 +279,7 @@ private bool CheckUpgrade(VersionRespDTO? response)
     /// </summary>
     /// <param name="versions"></param>
     /// <returns></returns>
-    private bool CheckForcibly(List<VersionBodyDTO>? versions)
+    private bool CheckForcibly(List<VersionInfo>? versions)
     {
         if (versions == null) 
             return false;
@@ -314,8 +317,8 @@ private void ExecuteCustomOptions()
         {
             if (!option.Invoke())
             {
-                EventManager.Instance.Dispatch(this,
-                    new ExceptionEventArgs(null, $"{nameof(option)}Execution failure!"));
+                var args = new ExceptionEventArgs(null, $"{nameof(option)}Execution failure!");
+                EventManager.Instance.Dispatch(this,args);
             }
         }
     }

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

@@ -4,6 +4,7 @@
 using GeneralUpdate.Common.Internal;
 using GeneralUpdate.Common.Internal.Event;
 using GeneralUpdate.Common.Internal.Pipeline;
+using GeneralUpdate.Common.Shared.Object;
 using GeneralUpdate.Zip;
 using GeneralUpdate.Zip.Factory;
 
@@ -40,8 +41,8 @@ private static OperationType MatchType(string extensionName)
     {
         var type = extensionName switch
         {
-            ".zip" => OperationType.GZip,
-            ".7z" => OperationType.G7z,
+            Format.ZIP => OperationType.GZip,
+            Format.SEVENZIP => OperationType.G7z,
             _ => OperationType.None
         };
         return type;

src/c#/GeneralUpdate.Common/AOT/JsonContext/ProcessInfoJsonContext.cs

@@ -0,0 +1,7 @@
+using System.Text.Json.Serialization;
+using GeneralUpdate.Common.Shared.Object;
+
+namespace GeneralUpdate.Common.AOT.JsonContext;
+
+[JsonSerializable(typeof(ProcessInfo))]
+public partial class ProcessInfoJsonContext : JsonSerializerContext;

src/c#/GeneralUpdate.Common/AOT/JsonContext/VersionRespJsonContext.cs

@@ -0,0 +1,7 @@
+using System.Text.Json.Serialization;
+using GeneralUpdate.Common.Shared.Object;
+
+namespace GeneralUpdate.Common.AOT.JsonContext;
+
+[JsonSerializable(typeof(VersionRespDTO))]
+public partial class VersionRespJsonContext : JsonSerializerContext;

src/c#/GeneralUpdate.Common/Download/DownloadManager.cs

@@ -65,7 +65,6 @@ public async Task LaunchTasksAsync()
             }
             catch (Exception ex)
             {
-                _failedVersions.Add((null, ex.Message));
                 MultiAllDownloadCompleted?.Invoke(this, new MultiAllDownloadCompletedEventArgs(false, _failedVersions));
                 throw new Exception($"Download manager error: {ex.Message}", ex);
             }

src/c#/GeneralUpdate.Common/Download/DownloadTask.cs

@@ -14,19 +14,19 @@ public class DownloadTask
 
         private readonly HttpClient _httpClient;
         private readonly DownloadManager _manager;
-        private readonly VersionBodyDTO _version;
+        private readonly VersionInfo? _version;
         private const int DEFAULT_DELTA = 1048576; // 1024*1024
         private long _beforBytes;
         private long _receivedBytes;
         private long _totalBytes;
-        private Timer _speedTimer;
+        private Timer? _speedTimer;
         private DateTime _startTime;
 
         #endregion Private Members
 
         #region Constructors
 
-        public DownloadTask(DownloadManager manager, VersionBodyDTO version)
+        public DownloadTask(DownloadManager manager, VersionInfo version)
         {
             _manager = manager;
             _version = version;
@@ -53,7 +53,7 @@ public async Task LaunchAsync()
                 InitStatisticsEvent();
                 InitProgressEvent();
                 InitCompletedEvent();
-                var path = Path.Combine(_manager.Path, $"{_version.Name}{_manager.Format}");
+                var path = Path.Combine(_manager.Path, $"{_version?.Name}{_manager.Format}");
                 await DownloadFileRangeAsync(_version.Url, path);
             }
             catch (Exception ex)
@@ -139,7 +139,8 @@ private async Task WriteFileAsync(string tempPath, byte[] chunk, long totalBytes
 
         private void InitStatisticsEvent()
         {
-            if (_speedTimer != null) return;
+            if (_speedTimer != null) 
+                return;
 
             _speedTimer = new Timer(_ =>
             {

src/c#/GeneralUpdate.Common/Download/MultiEventArgs/MutiAllDownloadCompletedEventArgs.cs

@@ -5,9 +5,6 @@ namespace GeneralUpdate.Common.Download
 {
     public class MultiAllDownloadCompletedEventArgs : EventArgs
     {
-        public MultiAllDownloadCompletedEventArgs()
-        { }
-
         public MultiAllDownloadCompletedEventArgs(bool isAllDownloadCompleted, IList<(object, string)> failedVersions)
         {
             IsAllDownloadCompleted = isAllDownloadCompleted;

src/c#/GeneralUpdate.Common/Download/MultiEventArgs/MutiDownloadProgressChangedEventArgs.cs

@@ -1,4 +1,5 @@
 using System;
+using GeneralUpdate.Common.Shared.Object.Enum;
 
 namespace GeneralUpdate.Common.Download
 {