fix: AppType filtering, RecordId reporting, and MainOnly scenario report

JusterZhu · JusterZhu · commit b7712929d0f4 · 2026-05-30T00:59:48.000+08:00
- HttpDownloadSource: filter response by AppType for HasMainUpdate/HasUpgradeUpdate
  instead of only checking Body.Count &gt; 0, preventing Both scenario misjudgment
- ClientStrategy: capture _mainRecordId and _upgradeRecordId separately per AppType,
  copy RecordId into downloadVersions for IPC, add SafeReportUpdateAppliedAsync in
  MainOnly scenario, use explicit recordId in UpgradeOnly/Both reports
- UpdateStrategy: read RecordId from UpdateVersions instead of hardcoded 0,
  add _reportType/SetReportType for poll(1) vs push(2) distinction
- Add ReportType to ProcessInfo, GlobalConfigInfo, ConfigurationMapper for IPC
- Bootstrap: wire ReportType from ProcessInfo to UpdateStrategy.SetReportType()
- DiffPipeline: rename DeleteListFileName to generalupdate.delete.json
diff --git a/src/c#/GeneralUpdate.Core/Bootstrap/GeneralUpdateBootstrap.cs b/src/c#/GeneralUpdate.Core/Bootstrap/GeneralUpdateBootstrap.cs
@@ -177,6 +177,7 @@ private async Task<GeneralUpdateBootstrap> LaunchWithStrategy(IStrategy roleStra
 
                 case UpdateStrategy us:
                     us.SetDiffPipeline(diffPipeline);
+                    us.SetReportType(_configInfo.ReportType);
                     break;
             }
 
@@ -369,6 +370,7 @@ private void InitializeFromEnvironment()
             DriverDirectory = processInfo.DriverDirectory,
             UpdatePath = processInfo.UpdatePath,
             LaunchClientAfterUpdate = processInfo.LaunchClientAfterUpdate,
+            ReportType = processInfo.ReportType,
             BlackFiles = processInfo.BlackFiles ?? BlackListDefaults.DefaultBlackFiles,
             BlackFormats = processInfo.BlackFileFormats ?? BlackListDefaults.DefaultBlackFormats,
             SkipDirectorys = processInfo.SkipDirectorys ?? BlackListDefaults.DefaultSkipDirectories
diff --git a/src/c#/GeneralUpdate.Core/Configuration/ConfigurationMapper.cs b/src/c#/GeneralUpdate.Core/Configuration/ConfigurationMapper.cs
@@ -170,14 +170,15 @@ public static ProcessInfo MapToProcessInfo(
             List<VersionInfo> updateVersions,
             List<string> blackFileFormats,
             List<string> blackFiles,
-            List<string> skipDirectories)
+            List<string> skipDirectories,
+            int reportType = 1)
         {
             if (source == null)
                 throw new ArgumentNullException(nameof(source), "GlobalConfigInfo source cannot be null");
 
             // 在单一位置创建 ProcessInfo，包含所有必需参数
             // 集中管理 ProcessInfo 的参数映射逻辑
-            return new ProcessInfo(
+            var processInfo = new ProcessInfo(
                 appName: source.MainAppName,                    // MainAppName 映射到 ProcessInfo.UpdateAppName
                 installPath: source.InstallPath,
                 currentVersion: source.ClientVersion,           // ClientVersion 映射到 ProcessInfo.CurrentVersion
@@ -201,6 +202,8 @@ public static ProcessInfo MapToProcessInfo(
                 upgradePath: source.UpdatePath,                  // 自定义升级目录
                 launchClient: source.LaunchClientAfterUpdate
             );
+            processInfo.ReportType = reportType;
+            return processInfo;
         }
     }
 }
diff --git a/src/c#/GeneralUpdate.Core/Configuration/GlobalConfigInfo.cs b/src/c#/GeneralUpdate.Core/Configuration/GlobalConfigInfo.cs
@@ -99,6 +99,12 @@ public class GlobalConfigInfo : BaseConfigInfo
     /// </summary>
     public bool LaunchClientAfterUpdate { get; set; } = true;
 
+    /// <summary>
+    ///     The report type for status reporting: 1 = Upgrade (active poll), 2 = Push (SignalR push).
+    ///     Passed from ClientStrategy through ProcessInfo to UpdateStrategy.
+    /// </summary>
+    public int ReportType { get; set; } = 1;
+
     /// <summary>
     ///     The list of version information objects to be updated.
     ///     Populated from the update server response based on <see cref="IsUpgradeUpdate" /> and <see cref="IsMainUpdate" />.
diff --git a/src/c#/GeneralUpdate.Core/Configuration/ProcessInfo.cs b/src/c#/GeneralUpdate.Core/Configuration/ProcessInfo.cs
@@ -373,5 +373,12 @@ public ProcessInfo(string appName
         /// </summary>
         [JsonPropertyName("LaunchClientAfterUpdate")]
         public bool LaunchClientAfterUpdate { get; set; } = true;
+
+        /// <summary>
+        ///     The report type for status reporting: 1 = Upgrade (active poll), 2 = Push (SignalR push).
+        ///     Passed from ClientStrategy to UpdateStrategy so it uses the same type when reporting.
+        /// </summary>
+        [JsonPropertyName("ReportType")]
+        public int ReportType { get; set; } = 1;
     }
 }
diff --git a/src/c#/GeneralUpdate.Core/Download/Sources/HttpDownloadSource.cs b/src/c#/GeneralUpdate.Core/Download/Sources/HttpDownloadSource.cs
@@ -118,8 +118,11 @@ public async Task<DownloadSourceResult> ListAsync(CancellationToken token = defa
             _appSecretKey, _platform, _productId,
             _scheme, _token, token);
 
-        var hasMainUpdate = mainResp?.Body?.Count > 0;
-        var hasUpgradeUpdate = upgradeResp?.Body?.Count > 0;
+        // Check that returned VersionInfo items' AppType matches the requested type,
+        // rather than just checking Count > 0. The server may return items whose
+        // AppType doesn't match the request, which would mis-identify the scenario.
+        var hasMainUpdate = mainResp?.Body?.Any(v => v.AppType == (int)AppType.Client) == true;
+        var hasUpgradeUpdate = upgradeResp?.Body?.Any(v => v.AppType == (int)AppType.Upgrade) == true;
 
         var assets = new List<DownloadAsset>();
 
diff --git a/src/c#/GeneralUpdate.Core/Pipeline/DiffPipeline.cs b/src/c#/GeneralUpdate.Core/Pipeline/DiffPipeline.cs
@@ -76,7 +76,7 @@ public class DiffPipeline
     private readonly IProgress<DiffProgress>? _progress;
 
     private const string PatchExtension = ".patch";
-    private const string DeleteListFileName = "generalupdate_delete_files.json";
+    private const string DeleteListFileName = "generalupdate.delete.json";
 
     /// <summary>
     /// Initializes a new pipeline instance with default options, default binary differ
diff --git a/src/c#/GeneralUpdate.Core/Strategy/ClientStrategy.cs b/src/c#/GeneralUpdate.Core/Strategy/ClientStrategy.cs
@@ -72,6 +72,8 @@ public class ClientStrategy : IStrategy
     private Download.Abstractions.IDownloadExecutor? _customDownloadExecutor;
     private Func<string?, Download.Abstractions.IDownloadPipeline>? _customDownloadPipelineFactory;
     private int _mainRecordId;
+    private int _upgradeRecordId;
+    private int _reportType = 1; // 1=Upgrade(active poll), 2=Push(SignalR push)
 
     /// <summary>
     /// Update scenario determined by the server validation result, indicating which update targets are needed.
@@ -160,6 +162,16 @@ public ClientStrategy(Download.Abstractions.IDownloadOrchestrator? orchestrator)
     /// </remarks>
     public void SetOrchestrator(Download.Abstractions.IDownloadOrchestrator? orchestrator) => _orchestrator = orchestrator;
 
+    /// <summary>
+    /// Sets the report type for status reporting. Injected by the bootstrap for push-triggered updates.
+    /// </summary>
+    /// <param name="reportType">1 = Upgrade (active poll), 2 = Push (SignalR push). Default is 1.</param>
+    /// <remarks>
+    /// When a push notification triggers the update (via SignalR hub), the caller should set this to 2
+    /// so the server can distinguish push-triggered updates from active poll updates.
+    /// </remarks>
+    public void SetReportType(int reportType) => _reportType = reportType;
+
     /// <summary>
     /// Sets a custom download retry policy. Registered and injected by the bootstrap via <c>.DownloadPolicy&lt;T&gt;()</c>.
     /// </summary>
@@ -427,8 +439,13 @@ private async Task ExecuteStandardWorkflowAsync()
 
         var updateInfoArgs = new UpdateInfoEventArgs(versionResp);
 
-        // Capture the first RecordId for status reporting to GeneralSpacestation
-        _mainRecordId = downloadPlan.Assets.FirstOrDefault().RecordId;
+        // Capture RecordIds per AppType for status reporting.
+        // Client packages are reported by UpdateStrategy (Bowl) via IPC; Upgrade packages
+        // are applied in-place and reported by ClientStrategy.
+        _mainRecordId = downloadPlan.Assets
+            .FirstOrDefault(a => (a.AppType ?? (int)AppType.Client) == (int)AppType.Client)?.RecordId ?? 0;
+        _upgradeRecordId = downloadPlan.Assets
+            .FirstOrDefault(a => a.AppType == (int)AppType.Upgrade)?.RecordId ?? 0;
         EventManager.Instance.Dispatch(this, updateInfoArgs);
 
         var isForcibly = downloadPlan.IsForcibly;
@@ -504,6 +521,7 @@ private async Task ExecuteStandardWorkflowAsync()
         // Build VersionInfo list with AppType preserved from server response.
         var downloadVersions = downloadPlan.Assets.Select(a => new VersionInfo
         {
+            RecordId = a.RecordId,
             Name = a.Name,
             Hash = a.SHA256,
             Url = a.Url,
@@ -523,24 +541,29 @@ private async Task ExecuteStandardWorkflowAsync()
             case UpdateScenario.UpgradeOnly:
                 await ApplyUpgradePackagesAsync(upgradeVersions).ConfigureAwait(false);
                 await SafeOnAfterUpdateAsync(hooksCtx).ConfigureAwait(false);
-                await SafeReportUpdateAppliedAsync(hooksCtx).ConfigureAwait(false);
+                await SafeReportUpdateAppliedAsync(hooksCtx, _upgradeRecordId).ConfigureAwait(false);
                 GeneralTracer.Info("ClientStrategy: Upgrade-only update applied, client continues running.");
                 break;
 
             case UpdateScenario.MainOnly:
                 SendProcessIpc(clientVersions);
+                await SafeOnAfterUpdateAsync(hooksCtx).ConfigureAwait(false);
+                await SafeReportUpdateAppliedAsync(hooksCtx, _mainRecordId).ConfigureAwait(false);
                 await SafeOnBeforeStartAppAsync(hooksCtx).ConfigureAwait(false);
                 await LaunchUpgradeProcessAsync().ConfigureAwait(false);
                 break;
 
             case UpdateScenario.Both:
                 await ApplyUpgradePackagesAsync(upgradeVersions).ConfigureAwait(false);
                 await SafeOnAfterUpdateAsync(hooksCtx).ConfigureAwait(false);
-                await SafeReportUpdateAppliedAsync(hooksCtx).ConfigureAwait(false);
+                await SafeReportUpdateAppliedAsync(hooksCtx, _upgradeRecordId).ConfigureAwait(false);
                 SendProcessIpc(clientVersions);
                 await SafeOnBeforeStartAppAsync(hooksCtx).ConfigureAwait(false);
                 await LaunchUpgradeProcessAsync().ConfigureAwait(false);
                 break;
+            case UpdateScenario.None:
+            default:
+                throw new ArgumentOutOfRangeException();
         }
     }
 
@@ -584,7 +607,8 @@ private void SendProcessIpc(List<VersionInfo> clientVersions)
             _configInfo!, clientVersions,
             _configInfo!.BlackFormats ?? BlackListDefaults.DefaultBlackFormats,
             _configInfo.BlackFiles ?? BlackListDefaults.DefaultBlackFiles,
-            _configInfo.SkipDirectorys ?? BlackListDefaults.DefaultSkipDirectories);
+            _configInfo.SkipDirectorys ?? BlackListDefaults.DefaultSkipDirectories,
+            _reportType);
 
         _configInfo.ProcessInfo = JsonSerializer.Serialize(processInfo,
             ProcessInfoJsonContext.Default.ProcessInfo);
@@ -883,7 +907,7 @@ private async Task SafeReportUpdateStartedAsync(Hooks.UpdateContext ctx)
         {
             await Reporter
                 .ReportAsync(new Download.Reporting.UpdateReport(_mainRecordId,
-                    (int)Download.Reporting.UpdateStatus.Updating, 1)).ConfigureAwait(false);
+                    (int)Download.Reporting.UpdateStatus.Updating, _reportType)).ConfigureAwait(false);
         }
         catch (Exception ex)
         {
@@ -901,7 +925,7 @@ private async Task SafeReportDownloadCompletedAsync(Hooks.UpdateContext ctx)
         {
             await Reporter
                 .ReportAsync(new Download.Reporting.UpdateReport(_mainRecordId,
-                    (int)Download.Reporting.UpdateStatus.Updating, 1)).ConfigureAwait(false);
+                    (int)Download.Reporting.UpdateStatus.Updating, _reportType)).ConfigureAwait(false);
         }
         catch (Exception ex)
         {
@@ -920,7 +944,7 @@ private async Task SafeReportUpdateFailedAsync(Hooks.UpdateContext ctx, Exceptio
         {
             await Reporter
                 .ReportAsync(new Download.Reporting.UpdateReport(_mainRecordId,
-                    (int)Download.Reporting.UpdateStatus.Failure, 1)).ConfigureAwait(false);
+                    (int)Download.Reporting.UpdateStatus.Failure, _reportType)).ConfigureAwait(false);
         }
         catch (Exception ex)
         {
@@ -932,13 +956,13 @@ await Reporter
     /// Safely reports the update applied success status. If the report fails, logs a warning.
     /// </summary>
     /// <param name="ctx">The update context.</param>
-    private async Task SafeReportUpdateAppliedAsync(Hooks.UpdateContext ctx)
+    private async Task SafeReportUpdateAppliedAsync(Hooks.UpdateContext ctx, int recordId)
     {
         try
         {
             await Reporter
-                .ReportAsync(new Download.Reporting.UpdateReport(_mainRecordId,
-                    (int)Download.Reporting.UpdateStatus.Success, 1)).ConfigureAwait(false);
+                .ReportAsync(new Download.Reporting.UpdateReport(recordId,
+                    (int)Download.Reporting.UpdateStatus.Success, _reportType)).ConfigureAwait(false);
         }
         catch (Exception ex)
         {
diff --git a/src/c#/GeneralUpdate.Core/Strategy/UpdateStrategy.cs b/src/c#/GeneralUpdate.Core/Strategy/UpdateStrategy.cs

Original file line number	Diff line number	Diff line change
`@@ -373,5 +373,12 @@ public ProcessInfo(string appName`
`373`	`373`	`/// </summary>`
`374`	`374`	`[JsonPropertyName("LaunchClientAfterUpdate")]`
`375`	`375`	`public bool LaunchClientAfterUpdate { get; set; } = true;`
	`376`	`+`
	`377`	`+ /// <summary>`
	`378`	`+ /// The report type for status reporting: 1 = Upgrade (active poll), 2 = Push (SignalR push).`
	`379`	`+ /// Passed from ClientStrategy to UpdateStrategy so it uses the same type when reporting.`
	`380`	`+ /// </summary>`
	`381`	`+ [JsonPropertyName("ReportType")]`
	`382`	`+ public int ReportType { get; set; } = 1;`
`376`	`383`	`}`
`377`	`384`	`}`