fix: User presence not updating (#2023)

* Log 'power-monitor/get-system-idle-state' requests

* Reload injected code in development mode

* Fix error handling on renderer processes

* Set up presence listener after setting detection

* Handle multiple RocketChatDesktop.setUserPresenceDetection() calls

* Remove unnecessary negation

Co-authored-by: Diego Sampaio <chinello@gmail.com>

Author: tassoevan

src/errors.ts

@@ -2,7 +2,7 @@ import Bugsnag from '@bugsnag/js';
 import { app } from 'electron';
 
 import { APP_ERROR_THROWN } from './app/actions';
-import { select, dispatch, listen } from './store';
+import { select, listen } from './store';
 import { whenReady } from './whenReady';
 
 type AppType = 'main' | 'rootWindow' | 'webviewPreload';
@@ -63,26 +63,5 @@ export const setupRendererErrorHandling = async (
     }
 
     setupBugsnag(apiKey, appVersion, appType);
-    return;
   }
-
-  const dispatchError = (error: Error): void => {
-    dispatch({
-      type: APP_ERROR_THROWN,
-      payload: {
-        message: error.message,
-        stack: error.stack,
-        name: error.name,
-      },
-      error: true,
-    });
-  };
-
-  window.addEventListener('error', (event): void => {
-    dispatchError(event.error);
-  });
-
-  window.addEventListener('unhandledrejection', (event): void => {
-    dispatchError(event.reason);
-  });
 };

src/preload.ts

@@ -14,7 +14,6 @@ import { setServerUrl } from './servers/preload/urls';
 import { createRendererReduxStore } from './store';
 import { listenToMessageBoxEvents } from './ui/preload/messageBox';
 import { handleTrafficLightsSpacing } from './ui/preload/sidebar';
-import { listenToUserPresenceChanges } from './userPresence/preload';
 import { whenReady } from './whenReady';
 
 declare global {
@@ -50,7 +49,6 @@ const start = async (): Promise<void> => {
 
   listenToNotificationsRequests();
   listenToScreenSharingRequests();
-  listenToUserPresenceChanges();
   listenToMessageBoxEvents();
   handleTrafficLightsSpacing();
 };

src/ui/main/serverView/index.ts

@@ -374,7 +374,7 @@ export const attachGuestWebContentsEvents = async (): Promise<void> => {
       )?.[0]
   );
 
-  let injectableCode: string;
+  let injectableCode: string | undefined;
   handle('server-view/ready', async (webContents) => {
     if (!injectableCode) {
       injectableCode = await fs.promises.readFile(
@@ -384,5 +384,9 @@ export const attachGuestWebContentsEvents = async (): Promise<void> => {
     }
 
     webContents.executeJavaScript(injectableCode, true);
+
+    if (process.env.NODE_ENV === 'development') {
+      injectableCode = undefined;
+    }
   });
 };

src/userPresence/preload.ts

@@ -1,73 +1,69 @@
 import { invoke } from '../ipc/renderer';
 import { listen } from '../store';
+import { RootAction } from '../store/actions';
 import { SYSTEM_SUSPENDING, SYSTEM_LOCKING_SCREEN } from './actions';
 import { SystemIdleState } from './common';
 
-let isAutoAwayEnabled: boolean;
-let idleThreshold: number | null;
-let goOnline = (): void => undefined;
-let goAway = (): void => undefined;
+let detachCallbacks: () => void;
 
-const setupUserPresenceListening = (): void => {
+const attachCallbacks = ({
+  isAutoAwayEnabled,
+  idleThreshold,
+  setUserOnline,
+}: {
+  isAutoAwayEnabled: boolean;
+  idleThreshold: number | null;
+  setUserOnline: (online: boolean) => void;
+}): (() => void) => {
+  const unsubscribeFromPowerMonitorEvents = listen(
+    (action): action is RootAction =>
+      [SYSTEM_SUSPENDING, SYSTEM_LOCKING_SCREEN].includes(action.type),
+    () => {
+      if (!isAutoAwayEnabled) {
+        return;
+      }
+
+      setUserOnline(false);
+    }
+  );
+
+  let pollingTimer: ReturnType<typeof setTimeout>;
   let prevState: SystemIdleState;
   const pollSystemIdleState = async (): Promise<void> => {
     if (!isAutoAwayEnabled || !idleThreshold) {
       return;
     }
 
+    pollingTimer = setTimeout(pollSystemIdleState, 2000);
+
     const state = await invoke(
       'power-monitor/get-system-idle-state',
       idleThreshold
     );
 
     if (prevState === state) {
-      setTimeout(pollSystemIdleState, 1000);
       return;
     }
 
-    const isOnline =
-      !isAutoAwayEnabled || state === 'active' || state === 'unknown';
-
-    if (isOnline) {
-      goOnline();
-    } else {
-      goAway();
-    }
+    const isOnline = state === 'active' || state === 'unknown';
+    setUserOnline(isOnline);
 
     prevState = state;
-    setTimeout(pollSystemIdleState, 1000);
   };
 
   pollSystemIdleState();
-};
 
-export const listenToUserPresenceChanges = (): void => {
-  setupUserPresenceListening();
-
-  listen(SYSTEM_SUSPENDING, () => {
-    if (!isAutoAwayEnabled) {
-      return;
-    }
-
-    goAway();
-  });
-
-  listen(SYSTEM_LOCKING_SCREEN, () => {
-    if (!isAutoAwayEnabled) {
-      return;
-    }
-
-    goAway();
-  });
+  return (): void => {
+    unsubscribeFromPowerMonitorEvents();
+    clearTimeout(pollingTimer);
+  };
 };
 
 export const setUserPresenceDetection = (options: {
   isAutoAwayEnabled: boolean;
   idleThreshold: number | null;
   setUserOnline: (online: boolean) => void;
 }): void => {
-  isAutoAwayEnabled = options.isAutoAwayEnabled;
-  idleThreshold = options.idleThreshold;
-  goOnline = () => options.setUserOnline(true);
-  goAway = () => options.setUserOnline(false);
+  detachCallbacks?.();
+  detachCallbacks = attachCallbacks(options);
 };