feat: refactor watcher for sync friend request

src/main/constants.ts

@@ -31,3 +31,5 @@ export const achievementSoundPath = app.isPackaged
 export const backupsPath = path.join(app.getPath("userData"), "Backups");
 
 export const appVersion = app.getVersion() + (isStaging ? "-staging" : "");
+
+export const MAIN_LOOP_INTERVAL = 1500;

src/main/events/profile/sync-friend-requests.ts

@@ -1,18 +1,23 @@
+import { MAIN_LOOP_INTERVAL } from "@main/constants";
 import { registerEvent } from "../register-event";
-import { HydraApi } from "@main/services";
+import { HydraApi, WindowManager } from "@main/services";
 import { publishNewFriendRequestNotification } from "@main/services/notifications";
 import { UserNotLoggedInError } from "@shared";
 import type { FriendRequestSync } from "@types";
 
 interface SyncState {
   friendRequestCount: number | null;
+  tick: number;
 }
 
+const ticksToUpdate = (2 * 60 * 1000) / MAIN_LOOP_INTERVAL; // 2 minutes
+
 const syncState: SyncState = {
   friendRequestCount: null,
+  tick: 0,
 };
 
-const syncFriendRequests = async (_event: Electron.IpcMainInvokeEvent) => {
+const syncFriendRequests = async () => {
   return HydraApi.get<FriendRequestSync>(`/profile/friend-requests/sync`)
     .then((res) => {
       if (
@@ -24,6 +29,11 @@ const syncFriendRequests = async (_event: Electron.IpcMainInvokeEvent) => {
 
       syncState.friendRequestCount = res.friendRequestCount;
 
+      WindowManager.mainWindow?.webContents.send(
+        "on-sync-friend-requests",
+        res
+      );
+
       return res;
     })
     .catch((err) => {
@@ -34,4 +44,16 @@ const syncFriendRequests = async (_event: Electron.IpcMainInvokeEvent) => {
     });
 };
 
-registerEvent("syncFriendRequests", syncFriendRequests);
+const syncFriendRequestsEvent = async (_event: Electron.IpcMainInvokeEvent) => {
+  return syncFriendRequests();
+};
+
+export const watchFriendRequests = async () => {
+  if (syncState.tick % ticksToUpdate === 0) {
+    await syncFriendRequests();
+  }
+
+  syncState.tick++;
+};
+
+registerEvent("syncFriendRequests", syncFriendRequestsEvent);

src/main/services/main-loop.ts

@@ -3,18 +3,21 @@ import { DownloadManager } from "./download";
 import { watchProcesses } from "./process-watcher";
 import { AchievementWatcherManager } from "./achievements/achievement-watcher-manager";
 import { UpdateManager } from "./update-manager";
+import { watchFriendRequests } from "@main/events/profile/sync-friend-requests";
+import { MAIN_LOOP_INTERVAL } from "@main/constants";
 
 export const startMainLoop = async () => {
   // eslint-disable-next-line no-constant-condition
   while (true) {
     await Promise.allSettled([
       watchProcesses(),
+      watchFriendRequests(),
       DownloadManager.watchDownloads(),
       AchievementWatcherManager.watchAchievements(),
       DownloadManager.getSeedStatus(),
       UpdateManager.checkForUpdatePeriodically(),
     ]);
 
-    await sleep(1500);
+    await sleep(MAIN_LOOP_INTERVAL);
   }
 };

src/main/services/update-manager.ts

@@ -4,9 +4,11 @@ import { AppUpdaterEvent, UserPreferences } from "@types";
 import { app } from "electron";
 import { publishNotificationUpdateReadyToInstall } from "@main/services/notifications";
 import { db, levelKeys } from "@main/level";
+import { MAIN_LOOP_INTERVAL } from "@main/constants";
 
 const { autoUpdater } = updater;
 const sendEventsForDebug = false;
+const ticksToUpdate = (50 * 60 * 1000) / MAIN_LOOP_INTERVAL; // 50 minutes
 
 export class UpdateManager {
   private static hasNotified = false;
@@ -72,7 +74,7 @@ export class UpdateManager {
   }
 
   public static checkForUpdatePeriodically() {
-    if (this.checkTick % 2000 == 0) {
+    if (this.checkTick % ticksToUpdate == 0) {
       this.checkForUpdates();
     }
     this.checkTick++;

src/preload/index.ts

@@ -15,6 +15,7 @@ import type {
   SeedingStatus,
   GameAchievement,
   Theme,
+  FriendRequestSync,
 } from "@types";
 import type { AuthPage, CatalogueCategory } from "@shared";
 import type { AxiosProgressEvent } from "axios";
@@ -306,6 +307,15 @@ contextBridge.exposeInMainWorld("electron", {
     ipcRenderer.invoke("processProfileImage", imagePath),
   getFriendRequests: () => ipcRenderer.invoke("getFriendRequests"),
   syncFriendRequests: () => ipcRenderer.invoke("syncFriendRequests"),
+  onSyncFriendRequests: (cb: (friendRequests: FriendRequestSync) => void) => {
+    const listener = (
+      _event: Electron.IpcRendererEvent,
+      friendRequests: FriendRequestSync
+    ) => cb(friendRequests);
+    ipcRenderer.on("on-sync-friend-requests", listener);
+    return () =>
+      ipcRenderer.removeListener("on-sync-friend-requests", listener);
+  },
   updateFriendRequest: (userId: string, action: FriendRequestAction) =>
     ipcRenderer.invoke("updateFriendRequest", userId, action),
   sendFriendRequest: (userId: string) =>

src/renderer/src/app.tsx

@@ -20,6 +20,7 @@ import {
   setUserDetails,
   setProfileBackground,
   setGameRunning,
+  setFriendRequestCount,
 } from "@renderer/features";
 import { useTranslation } from "react-i18next";
 import { UserFriendModal } from "./pages/shared-modals/user-friend-modal";
@@ -51,7 +52,6 @@ export function App() {
     isFriendsModalVisible,
     friendRequetsModalTab,
     friendModalUserId,
-    syncFriendRequests,
     hideFriendsModal,
     fetchUserDetails,
     updateUserDetails,
@@ -123,7 +123,7 @@ export function App() {
       .then((response) => {
         if (response) {
           updateUserDetails(response);
-          syncFriendRequests();
+          window.electron.syncFriendRequests();
         }
       })
       .finally(() => {
@@ -134,23 +134,27 @@ export function App() {
         $script.src = `${import.meta.env.RENDERER_VITE_EXTERNAL_RESOURCES_URL}/bundle.js?t=${Date.now()}`;
         document.head.appendChild($script);
       });
-  }, [fetchUserDetails, syncFriendRequests, updateUserDetails, dispatch]);
+  }, [fetchUserDetails, updateUserDetails, dispatch]);
 
   const onSignIn = useCallback(() => {
     fetchUserDetails().then((response) => {
       if (response) {
         updateUserDetails(response);
-        syncFriendRequests();
+        window.electron.syncFriendRequests();
         showSuccessToast(t("successfully_signed_in"));
       }
     });
-  }, [
-    fetchUserDetails,
-    syncFriendRequests,
-    t,
-    showSuccessToast,
-    updateUserDetails,
-  ]);
+  }, [fetchUserDetails, t, showSuccessToast, updateUserDetails]);
+
+  useEffect(() => {
+    const unsubscribe = window.electron.onSyncFriendRequests((result) => {
+      dispatch(setFriendRequestCount(result.friendRequestCount));
+    });
+
+    return () => {
+      unsubscribe();
+    };
+  }, [dispatch]);
 
   useEffect(() => {
     const unsubscribe = window.electron.onGamesRunning((gamesRunning) => {

src/renderer/src/components/sidebar/sidebar-profile.tsx

@@ -1,7 +1,7 @@
 import { useNavigate } from "react-router-dom";
 import { PeopleIcon } from "@primer/octicons-react";
 import { useAppSelector, useUserDetails } from "@renderer/hooks";
-import { useEffect, useMemo } from "react";
+import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { UserFriendModalTab } from "@renderer/pages/shared-modals/user-friend-modal";
 import SteamLogo from "@renderer/assets/steam-logo.svg?react";
@@ -9,19 +9,13 @@ import { Avatar } from "../avatar/avatar";
 import { AuthPage } from "@shared";
 import "./sidebar-profile.scss";
 
-const LONG_POLLING_INTERVAL = 120_000;
-
 export function SidebarProfile() {
   const navigate = useNavigate();
 
   const { t } = useTranslation("sidebar");
 
-  const {
-    userDetails,
-    friendRequestCount,
-    showFriendsModal,
-    syncFriendRequests,
-  } = useUserDetails();
+  const { userDetails, friendRequestCount, showFriendsModal } =
+    useUserDetails();
 
   const { gameRunning } = useAppSelector((state) => state.gameRunning);
 
@@ -34,16 +28,6 @@ export function SidebarProfile() {
     navigate(`/profile/${userDetails.id}`);
   };
 
-  useEffect(() => {
-    const pollingInterval = setInterval(() => {
-      syncFriendRequests();
-    }, LONG_POLLING_INTERVAL);
-
-    return () => {
-      clearInterval(pollingInterval);
-    };
-  }, [syncFriendRequests]);
-
   const friendsButton = useMemo(() => {
     if (!userDetails) return null;
 

src/renderer/src/declaration.d.ts

@@ -280,7 +280,10 @@ declare global {
       path: string
     ) => Promise<{ imagePath: string; mimeType: string }>;
     getFriendRequests: () => Promise<FriendRequest[]>;
-    syncFriendRequests: () => Promise<FriendRequestSync>;
+    syncFriendRequests: () => Promise<void>;
+    onSyncFriendRequests: (
+      cb: (friendRequests: FriendRequestSync) => void
+    ) => () => Electron.IpcRenderer;
     updateFriendRequest: (
       userId: string,
       action: FriendRequestAction

src/renderer/src/hooks/use-user-details.ts

@@ -6,7 +6,6 @@ import {
   setFriendRequests,
   setFriendsModalVisible,
   setFriendsModalHidden,
-  setFriendRequestCount,
 } from "@renderer/features";
 import type {
   FriendRequestAction,
@@ -88,24 +87,15 @@ export function useUserDetails() {
     ]
   );
 
-  const syncFriendRequests = useCallback(async () => {
-    return window.electron
-      .syncFriendRequests()
-      .then((sync) => {
-        dispatch(setFriendRequestCount(sync.friendRequestCount));
-      })
-      .catch(() => {});
-  }, [dispatch]);
-
   const fetchFriendRequests = useCallback(async () => {
     return window.electron
       .getFriendRequests()
       .then((friendRequests) => {
-        syncFriendRequests();
+        window.electron.syncFriendRequests();
         dispatch(setFriendRequests(friendRequests));
       })
       .catch(() => {});
-  }, [dispatch, syncFriendRequests]);
+  }, [dispatch]);
 
   const showFriendsModal = useCallback(
     (initialTab: UserFriendModalTab, userId: string) => {
@@ -167,7 +157,6 @@ export function useUserDetails() {
     patchUser,
     sendFriendRequest,
     fetchFriendRequests,
-    syncFriendRequests,
     updateFriendRequestState,
     blockUser,
     unblockUser,