Use 'remote' flag to distinguish graceful and ungraceful circuit pauses

Author: oroztocil

src/Components/Web.JS/src/Platform/Circuits/DefaultReconnectDisplay.ts

@@ -36,8 +36,6 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {
 
   remote = false;
 
-  graceful = false;
-
   retryWhenDocumentBecomesVisible: () => void;
 
   constructor(dialogId: string, private readonly document: Document, private readonly logger: Logger) {
@@ -97,7 +95,7 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {
     }
 
     this.operation = options?.type ?? 'reconnect';
-    this.graceful = (options?.type === 'pause') ? options.graceful : false;
+    this.remote = options?.type === 'pause' ? options?.remote : false;
 
     this.retryButton.style.display = 'none';
     this.rejoiningAnimation.style.display = 'block';
@@ -108,7 +106,7 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {
 
   update(options: ReconnectDisplayUpdateOptions): void {
     this.operation = options.type;
-    this.graceful = (options.type === 'pause') ? options.graceful : false;
+    this.remote = options?.type === 'pause' ? options?.remote : false;
 
     if (this.operation === 'pause') {
       this.retryButton.style.display = 'none';
@@ -134,15 +132,15 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {
   failed(): void {
     this.rejoiningAnimation.style.display = 'none';
     if (this.operation === 'pause') {
-      if (this.graceful) {
+      if (this.remote) {
+        // Circuit failed to resume after an ungraceful pause (e.g., server restart).
+        // We treat this as non-recoverable rejection.
+        this.rejected();
+      } {
         // Circuit failed to resume after a graceful (client-requested) pause.
         // We show a retry UI to allow the user to try to continue without losing the state.
         this.resumeButton.style.display = 'block';
         this.status.innerHTML = 'Failed to resume.<br />Please retry or reload the page.';
-      } else {
-        // Circuit failed to resume after an ungraceful pause (e.g., server restart).
-        // We treat this as non-recoverable rejection.
-        this.rejected();
       }
     } else {
       this.retryButton.style.display = 'block';
@@ -169,7 +167,7 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {
       const successful = await Blazor.reconnect!();
       if (!successful) {
         // Try to resume the circuit if the reconnect failed
-        this.update({ type: 'pause', remote: this.remote, graceful: this.graceful });
+        this.update({ type: 'pause', remote: this.remote });
         const resumeSuccessful = await Blazor.resumeCircuit!();
         if (!resumeSuccessful) {
           this.failed();

src/Components/Web.JS/src/Platform/Circuits/DefaultReconnectionHandler.ts

@@ -75,7 +75,6 @@ class ReconnectionProcess {
     const displayOptions: ReconnectDisplayUpdateOptions = {
       type: isGracefulPause ? 'pause' : 'reconnect',
       remote: this.isRemote,
-      graceful: !!isGracefulPause,
       currentAttempt: 0,
       secondsToNextAttempt: 0,
     };
@@ -86,7 +85,6 @@ class ReconnectionProcess {
       this.reconnectDisplay.update({
         type: 'pause',
         remote: this.isRemote,
-        graceful: true,
       });
     }
   }
@@ -128,7 +126,7 @@ class ReconnectionProcess {
         if (!result) {
           // Try to resume the circuit if the reconnect failed
           // If the server responded and refused to reconnect, stop auto-retrying.
-          this.reconnectDisplay.update({ type: 'pause', remote: true, graceful: false });
+          this.reconnectDisplay.update({ type: 'pause', remote: true });
           const resumeResult = await this.resumeCallback();
           if (resumeResult) {
             return;

src/Components/Web.JS/src/Platform/Circuits/ReconnectDisplay.ts

@@ -13,8 +13,7 @@ export type ReconnectDisplayUpdateOptions = ReconnectOptions | PauseOptions;
 
 export type PauseOptions = {
   type: 'pause',
-  remote: boolean,
-  graceful: boolean
+  remote: boolean
 };
 
 export type ReconnectOptions = {

src/Components/Web.JS/src/Platform/Circuits/ReconnectStateChangedEvent.ts

@@ -3,5 +3,4 @@ export interface ReconnectStateChangedEvent {
   currentAttempt?: number;
   secondsToNextAttempt?: number;
   remote?: boolean;
-  graceful?: boolean;
 }

src/Components/Web.JS/src/Platform/Circuits/UserSpecifiedDisplay.ts

@@ -71,10 +71,9 @@ export class UserSpecifiedDisplay implements ReconnectDisplay {
     }
     if (options.type === 'pause') {
       const remote = options.remote;
-      const graceful = options.graceful;
       this.dialog.classList.remove(UserSpecifiedDisplay.ShowClassName, UserSpecifiedDisplay.RetryingClassName);
       this.dialog.classList.add(UserSpecifiedDisplay.PausedClassName);
-      this.dispatchReconnectStateChangedEvent({ state: 'paused', remote: remote, graceful: graceful });
+      this.dispatchReconnectStateChangedEvent({ state: 'paused', remote: remote });
     }
   }
 

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Components/Layout/ReconnectModal.razor.js

@@ -15,7 +15,7 @@ function handleReconnectStateChanged(event) {
         reconnectModal.close();
     } else if (event.detail.state === "failed") {
         document.addEventListener("visibilitychange", retryWhenDocumentBecomesVisible);
-    } else if (event.detail.state === "rejected" || (event.detail.state === "resume-failed" && !!event.detail.graceful)) {
+    } else if (event.detail.state === "rejected" || (event.detail.state === "resume-failed" && event.detail.remote)) {
         location.reload();
     }
 }