fix: online manager subscribe state (#2312)

* fix: background recovery when offline

Signed-off-by: Adam Setch <adam.setch@outlook.com>

* fix: background recovery when offline

Signed-off-by: Adam Setch <adam.setch@outlook.com>

* fix: background recovery when offline

Signed-off-by: Adam Setch <adam.setch@outlook.com>

---------

Signed-off-by: Adam Setch <adam.setch@outlook.com>

Author: setchy

docs/src/components/GitHubRepo.astro

@@ -30,8 +30,8 @@ const loadRepoStats = async (): Promise<RepoStats> => {
       stars: formatCount(repository.data.stargazers_count),
       latestReleaseName: latestRelease.data.name?.replace('v', '') ?? '',
     };
-  } catch (error) {
-    console.error('Failed to load repo stats', error);
+  } catch (err) {
+    console.error('Failed to load repo stats', err);
     return {
       forks: '',
       stars: '',

docs/src/components/LatestRelease.astro

@@ -92,7 +92,7 @@ const loadInitialData = async (): Promise<HeroData> => {
         ? format(latestRelease.data.published_at, 'dd/MM/yyyy')
         : '',
     };
-  } catch (error) {
+  } catch (err) {
     return {
       downloadLinks: {
         alt: [],

src/main/index.ts

@@ -11,7 +11,6 @@ import {
   type BrowserWindowConstructorOptions,
   globalShortcut,
   nativeTheme,
-  net,
   safeStorage,
   shell,
 } from 'electron';
@@ -27,6 +26,7 @@ import {
   type IAutoLaunch,
   type IKeyboardShortcut,
   type IOpenExternal,
+  type ITrayColorUpdate,
 } from '../shared/events';
 import { logError, logInfo, logWarn } from '../shared/logger';
 import { Theme } from '../shared/theme';
@@ -181,26 +181,29 @@ app.whenReady().then(async () => {
     },
   );
 
-  onMainEvent(EVENTS.UPDATE_ICON_COLOR, (_, notificationsCount: number) => {
-    if (!mb.tray.isDestroyed()) {
-      if (!net.isOnline()) {
-        setOfflineIcon();
-        return;
-      }
+  onMainEvent(
+    EVENTS.UPDATE_ICON_COLOR,
+    (_, { notificationsCount, isOnline }: ITrayColorUpdate) => {
+      if (!mb.tray.isDestroyed()) {
+        if (!isOnline) {
+          setOfflineIcon();
+          return;
+        }
 
-      if (notificationsCount < 0) {
-        setErrorIcon();
-        return;
-      }
+        if (notificationsCount < 0) {
+          setErrorIcon();
+          return;
+        }
 
-      if (notificationsCount > 0) {
-        setActiveIcon();
-        return;
-      }
+        if (notificationsCount > 0) {
+          setActiveIcon();
+          return;
+        }
 
-      setIdleIcon();
-    }
-  });
+        setIdleIcon();
+      }
+    },
+  );
 
   onMainEvent(EVENTS.UPDATE_ICON_TITLE, (_, title: string) => {
     if (!mb.tray.isDestroyed()) {
@@ -258,15 +261,15 @@ app.whenReady().then(async () => {
   handleMainEvent(EVENTS.SAFE_STORAGE_DECRYPT, (_, value: string) => {
     try {
       return safeStorage.decryptString(Buffer.from(value, 'base64'));
-    } catch (error) {
+    } catch (err) {
       // If decryption fails, the data was likely encrypted with a different app identity
       // This can happen when migrating between build systems or changing app configuration
       logError(
         'main:safe-storage-decrypt',
         'Failed to decrypt value - data may be from old build',
-        error,
+        err,
       );
-      throw error;
+      throw err;
     }
   });
 });

src/main/updater.ts

@@ -111,8 +111,8 @@ export default class AppUpdater {
     try {
       logInfo('app updater', 'Checking for updates on application launch');
       await autoUpdater.checkForUpdatesAndNotify();
-    } catch (e) {
-      logError('auto updater', 'Initial check failed', e as Error);
+    } catch (err) {
+      logError('auto updater', 'Initial check failed', err as Error);
     }
   }
 
@@ -121,8 +121,8 @@ export default class AppUpdater {
       try {
         logInfo('app updater', 'Checking for updates on a periodic schedule');
         await autoUpdater.checkForUpdatesAndNotify();
-      } catch (e) {
-        logError('auto updater', 'Scheduled check failed', e as Error);
+      } catch (err) {
+        logError('auto updater', 'Scheduled check failed', err as Error);
       }
     }, APPLICATION.UPDATE_CHECK_INTERVAL_MS);
   }

src/preload/index.test.ts

@@ -92,7 +92,10 @@ describe('preload/index', () => {
     expect(sendMainEventMock).toHaveBeenNthCalledWith(
       1,
       EVENTS.UPDATE_ICON_COLOR,
-      -1,
+      {
+        isOnline: true,
+        notificationsCount: -1,
+      },
     );
   });
 

src/preload/index.ts

@@ -34,8 +34,8 @@ export const api = {
   },
 
   tray: {
-    updateColor: (notificationsCount = 0) => {
-      sendMainEvent(EVENTS.UPDATE_ICON_COLOR, notificationsCount);
+    updateColor: (notificationsCount = 0, isOnline = true) => {
+      sendMainEvent(EVENTS.UPDATE_ICON_COLOR, { notificationsCount, isOnline });
     },
 
     updateTitle: (title = '') => sendMainEvent(EVENTS.UPDATE_ICON_TITLE, title),
@@ -117,10 +117,10 @@ export const api = {
 // Context isolation is always enabled in this app
 try {
   contextBridge.exposeInMainWorld('atlassify', api);
-} catch (error) {
+} catch (err) {
   // biome-ignore lint/suspicious/noConsole: preload environment is strictly sandboxed
   console.error(
     '[preload] Failed to expose Atlassify Bridge API to renderer',
-    error,
+    err,
   );
 }

src/renderer/context/App.tsx

@@ -1,4 +1,12 @@
-import { createContext, type ReactNode, useEffect, useMemo } from 'react';
+import {
+  createContext,
+  type ReactNode,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react';
+
+import { onlineManager } from '@tanstack/react-query';
 
 import { useAccounts } from '../hooks/useAccounts';
 import { useKeyboardNavigation } from '../hooks/useKeyboardNavigation';
@@ -35,6 +43,8 @@ export interface AppContextState {
   ) => Promise<void>;
 
   focusedNotificationId: string | null;
+
+  isOnline: boolean;
 }
 
 export const AppContext = createContext<Partial<AppContextState> | undefined>(
@@ -56,6 +66,8 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
   const useUnreadActiveIcon = useSettingsStore((s) => s.useUnreadActiveIcon);
   const useAlternateIdleIcon = useSettingsStore((s) => s.useAlternateIdleIcon);
 
+  const [isOnline, setIsOnline] = useState(false);
+
   const {
     status,
     globalError,
@@ -82,14 +94,15 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
   // biome-ignore lint/correctness/useExhaustiveDependencies: We want to update the tray on setting or notification changes
   useEffect(() => {
     const trayCount = status === 'error' ? -1 : notificationCount;
-    setTrayIconColorAndTitle(trayCount, hasMoreAccountNotifications);
+    setTrayIconColorAndTitle(trayCount, hasMoreAccountNotifications, isOnline);
   }, [
     showNotificationsCountInTray,
     useUnreadActiveIcon,
     useAlternateIdleIcon,
     status,
     notificationCount,
     hasMoreAccountNotifications,
+    isOnline,
   ]);
 
   useEffect(() => {
@@ -100,6 +113,25 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     });
   }, [resetAccounts, resetFilters]);
 
+  // Online / Offline status monitoring via TanStack Query onlineManager
+  useEffect(() => {
+    const handle = () => {
+      try {
+        const online = onlineManager.isOnline();
+
+        setIsOnline(online);
+      } catch (_err) {
+        // ignore
+      }
+    };
+
+    // Subscribe and call immediately to set initial status
+    const unsubscribe = onlineManager.subscribe(handle);
+    handle();
+
+    return () => unsubscribe();
+  }, []);
+
   const contextValues: AppContextState = useMemo(
     () => ({
       status,
@@ -116,6 +148,8 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
       markNotificationsUnread,
 
       focusedNotificationId,
+
+      isOnline,
     }),
     [
       status,
@@ -132,6 +166,8 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
       markNotificationsUnread,
 
       focusedNotificationId,
+
+      isOnline,
     ],
   );
 

src/renderer/i18n/locales/de.json

@@ -42,6 +42,11 @@
       "description2": "Bitte überprüfen Sie Ihre Netzwerkverbindung, einschließlich der Frage, ob Sie ein VPN benötigen, und versuchen Sie es erneut.",
       "title": "Netzwerkfehler"
     },
+    "offline": {
+      "description1": "Ihr Gerät ist offline.",
+      "description2": "Bitte überprüfen Sie Ihre Netzwerkverbindung.",
+      "title": "Netzwerk offline"
+    },
     "unknown": {
       "description1": "Bitte versuchen Sie es später erneut.",
       "title": "Hoppla! Etwas lief schief"

src/renderer/i18n/locales/en.json

@@ -42,6 +42,11 @@
       "description1": "Unable to connect to Atlassian Cloud.",
       "description2": "Please check your network connection, including whether you require a VPN, and try again."
     },
+    "offline": {
+      "title": "Network Offline",
+      "description1": "Your device is offline.",
+      "description2": "Please check your network connection."
+    },
     "unknown": {
       "title": "Oops! Something went wrong",
       "description1": "Please try again later."

src/renderer/i18n/locales/es.json

@@ -42,6 +42,11 @@
       "description2": "Consulte su conexión de red, incluso si necesita una VPN, y vuelva a intentarlo.",
       "title": "Error de red"
     },
+    "offline": {
+      "description1": "Su dispositivo está desconectado.",
+      "description2": "Por favor verifique su conexión de red.",
+      "title": "Red sin conexión"
+    },
     "unknown": {
       "description1": "Vuelva a intentarlo más tarde.",
       "title": "¡Ups! Algo salió mal"