fix: System idle threshold (#1844)

* Replace Redux actions with IPC handler

* Sanitize user preferences

* Use stricter types

src/injected.ts

@@ -50,17 +50,17 @@ const start = (): void => {
 
   Tracker.autorun(() => {
     const uid = Meteor.userId();
-    const isAutoAwayEnabled = getUserPreference(uid, 'enableAutoAway');
-    const idleThreshold = getUserPreference(uid, 'idleTimeLimit');
+    const isAutoAwayEnabled: unknown = getUserPreference(uid, 'enableAutoAway');
+    const idleThreshold: unknown = getUserPreference(uid, 'idleTimeLimit');
 
     if (isAutoAwayEnabled) {
       delete UserPresence.awayTime;
       UserPresence.start();
     }
 
     window.RocketChatDesktop.setUserPresenceDetection({
-      isAutoAwayEnabled,
-      idleThreshold,
+      isAutoAwayEnabled: Boolean(isAutoAwayEnabled),
+      idleThreshold: idleThreshold ? Number(idleThreshold) : null,
       setUserOnline: (online) => {
         if (!online) {
           Meteor.call('UserPresence:away');

src/ipc/channels.ts

@@ -1,10 +1,13 @@
 import { AnyAction } from 'redux';
 
+import { SystemIdleState } from '../userPresence/common';
+
 type ChannelToArgsMap = {
   'redux/get-initial-state': () => unknown;
   'redux/action-dispatched': (action: AnyAction) => void;
   'servers/fetch-info': (urlHref: string) => [urlHref: string, version: string];
   'notifications/fetch-icon': (urlHref: string) => string;
+  'power-monitor/get-system-idle-state': (idleThreshold: number) => SystemIdleState;
 };
 
 export type Channel = keyof ChannelToArgsMap;

src/userPresence/actions.ts

@@ -1,13 +1,7 @@
-import { powerMonitor } from 'electron';
-
-export const SYSTEM_IDLE_STATE_REQUESTED = 'system/idle-state-resquested';
-export const SYSTEM_IDLE_STATE_RESPONDED = 'system/idle-state-responded';
 export const SYSTEM_LOCKING_SCREEN = 'system/locking-screen';
 export const SYSTEM_SUSPENDING = 'system/suspending';
 
 export type UserPresenceActionTypeToPayloadMap = {
-  [SYSTEM_IDLE_STATE_REQUESTED]: number;
-  [SYSTEM_IDLE_STATE_RESPONDED]: ReturnType<typeof powerMonitor.getSystemIdleState>;
   [SYSTEM_LOCKING_SCREEN]: never;
   [SYSTEM_LOCKING_SCREEN]: never;
   [SYSTEM_SUSPENDING]: never;

src/userPresence/common.ts

@@ -0,0 +1,3 @@
+import type { PowerMonitor } from 'electron';
+
+export type SystemIdleState = ReturnType<PowerMonitor['getSystemIdleState']>;

src/userPresence/main.ts

@@ -1,11 +1,10 @@
 import { powerMonitor } from 'electron';
 
-import { dispatch, listen } from '../store';
+import { handle } from '../ipc/main';
+import { dispatch } from '../store';
 import {
   SYSTEM_SUSPENDING,
   SYSTEM_LOCKING_SCREEN,
-  SYSTEM_IDLE_STATE_REQUESTED,
-  SYSTEM_IDLE_STATE_RESPONDED,
 } from './actions';
 
 export const setupPowerMonitor = (): void => {
@@ -17,14 +16,9 @@ export const setupPowerMonitor = (): void => {
     dispatch({ type: SYSTEM_LOCKING_SCREEN });
   });
 
-  listen(SYSTEM_IDLE_STATE_REQUESTED, (action) => {
-    dispatch({
-      type: SYSTEM_IDLE_STATE_RESPONDED,
-      payload: powerMonitor.getSystemIdleState(action.payload),
-      meta: {
-        response: true,
-        id: action.meta?.id,
-      },
-    });
-  });
+  handle(
+    'power-monitor/get-system-idle-state',
+    async (_webContents, idleThreshold) =>
+      powerMonitor.getSystemIdleState(idleThreshold),
+  );
 };

src/userPresence/preload.ts

@@ -1,17 +1,13 @@
-import { powerMonitor } from 'electron';
-
-import { listen, request } from '../store';
+import { invoke } from '../ipc/renderer';
+import { listen } from '../store';
 import {
   SYSTEM_SUSPENDING,
   SYSTEM_LOCKING_SCREEN,
-  SYSTEM_IDLE_STATE_REQUESTED,
-  SYSTEM_IDLE_STATE_RESPONDED,
 } from './actions';
-
-type SystemIdleState = ReturnType<typeof powerMonitor.getSystemIdleState>;
+import { SystemIdleState } from './common';
 
 let isAutoAwayEnabled: boolean;
-let idleThreshold: number;
+let idleThreshold: number | null;
 let goOnline = (): void => undefined;
 let goAway = (): void => undefined;
 
@@ -22,13 +18,7 @@ const setupUserPresenceListening = (): void => {
       return;
     }
 
-    const state: SystemIdleState = await request<
-      typeof SYSTEM_IDLE_STATE_REQUESTED,
-      typeof SYSTEM_IDLE_STATE_RESPONDED
-    >({
-      type: SYSTEM_IDLE_STATE_REQUESTED,
-      payload: idleThreshold,
-    });
+    const state = await invoke('power-monitor/get-system-idle-state', idleThreshold);
 
     if (prevState === state) {
       setTimeout(pollSystemIdleState, 1000);