fix(query-core): do not call resumePausedMutations while we are offli…

…ne (#7019)

when mutations are resumed after they have been restored from an external storage, there is no retryer that can pick up the mutation where it left off, so we need to re-execute it from scratch. However, this doesn't really happen if we are offline - the promise will be pending until we go online again; only "continue" from the retryer can immediately resolve a Promise here - execute needs to wait until it's really finished. But since mutations run in serial when resumed, this will lead to a forever hanging promise.

With this fix, `queryClient.resumePausedMutations` will only resume them if we are currently online to avoid this state.

packages/query-core/src/queryClient.ts

@@ -80,8 +80,8 @@ export class QueryClient {
         this.#queryCache.onFocus()
       }
     })
-    this.#unsubscribeOnline = onlineManager.subscribe(() => {
-      if (onlineManager.isOnline()) {
+    this.#unsubscribeOnline = onlineManager.subscribe((online) => {
+      if (online) {
         this.resumePausedMutations()
         this.#queryCache.onOnline()
       }
@@ -391,7 +391,10 @@ export class QueryClient {
   }
 
   resumePausedMutations(): Promise<unknown> {
-    return this.#mutationCache.resumePausedMutations()
+    if (onlineManager.isOnline()) {
+      return this.#mutationCache.resumePausedMutations()
+    }
+    return Promise.resolve()
   }
 
   getQueryCache(): QueryCache {

packages/query-core/src/tests/queryClient.test.tsx

@@ -3,23 +3,20 @@ import { waitFor } from '@testing-library/react'
 
 import {
   MutationObserver,
+  QueryClient,
   QueryObserver,
+  dehydrate,
   focusManager,
+  hydrate,
   onlineManager,
 } from '..'
-import { noop } from '../utils'
 import {
   createQueryClient,
   mockOnlineManagerIsOnline,
   queryKey,
   sleep,
 } from './utils'
-import type {
-  QueryCache,
-  QueryClient,
-  QueryFunction,
-  QueryObserverOptions,
-} from '..'
+import type { QueryCache, QueryFunction, QueryObserverOptions } from '..'
 
 describe('queryClient', () => {
   let queryClient: QueryClient
@@ -1458,8 +1455,8 @@ describe('queryClient', () => {
       const observer2 = new MutationObserver(queryClient, {
         mutationFn: async () => 2,
       })
-      void observer1.mutate().catch(noop)
-      void observer2.mutate().catch(noop)
+      void observer1.mutate()
+      void observer2.mutate()
 
       await waitFor(() => {
         expect(observer1.getCurrentResult().isPaused).toBeTruthy()
@@ -1500,8 +1497,8 @@ describe('queryClient', () => {
           return 2
         },
       })
-      void observer1.mutate().catch(noop)
-      void observer2.mutate().catch(noop)
+      void observer1.mutate()
+      void observer2.mutate()
 
       await waitFor(() => {
         expect(observer1.getCurrentResult().isPaused).toBeTruthy()
@@ -1521,6 +1518,76 @@ describe('queryClient', () => {
       expect(orders).toEqual(['1start', '1end', '2start', '2end'])
     })
 
+    test('should resumePausedMutations when coming online after having called resumePausedMutations while offline', async () => {
+      const consoleMock = vi.spyOn(console, 'error')
+      consoleMock.mockImplementation(() => undefined)
+      onlineManager.setOnline(false)
+
+      const observer = new MutationObserver(queryClient, {
+        mutationFn: async () => 1,
+      })
+
+      void observer.mutate()
+
+      expect(observer.getCurrentResult().isPaused).toBeTruthy()
+
+      await queryClient.resumePausedMutations()
+
+      // still paused because we are still offline
+      expect(observer.getCurrentResult().isPaused).toBeTruthy()
+
+      onlineManager.setOnline(true)
+
+      await waitFor(() => {
+        expect(observer.getCurrentResult().status).toBe('success')
+      })
+    })
+
+    test('should resumePausedMutations when coming online after having restored cache (and resumed) while offline', async () => {
+      const consoleMock = vi.spyOn(console, 'error')
+      consoleMock.mockImplementation(() => undefined)
+      onlineManager.setOnline(false)
+
+      const observer = new MutationObserver(queryClient, {
+        mutationFn: async () => 1,
+      })
+
+      void observer.mutate()
+
+      expect(observer.getCurrentResult().isPaused).toBeTruthy()
+
+      const state = dehydrate(queryClient)
+
+      const newQueryClient = new QueryClient({
+        defaultOptions: {
+          mutations: {
+            mutationFn: async () => 1,
+          },
+        },
+      })
+
+      newQueryClient.mount()
+
+      hydrate(newQueryClient, state)
+
+      // still paused because we are still offline
+      expect(
+        newQueryClient.getMutationCache().getAll()[0]?.state.isPaused,
+      ).toBeTruthy()
+
+      await newQueryClient.resumePausedMutations()
+
+      onlineManager.setOnline(true)
+
+      await waitFor(() => {
+        expect(
+          newQueryClient.getMutationCache().getAll()[0]?.state.status,
+        ).toBe('success')
+      })
+
+      newQueryClient.unmount()
+    })
+
     test('should notify queryCache and mutationCache after multiple mounts and single unmount', async () => {
       const testClient = createQueryClient()
       testClient.mount()