From df3a37f7b8881fc70f7304d2cce9f579d405ae89 Mon Sep 17 00:00:00 2001
From: Pavlo Buidenkov <pavlobu@gmail.com>
Date: Sun, 29 May 2022 19:27:28 +0200
Subject: [PATCH] fix ConnectedDevicesListDrawer

---
 app/components/ConnectedDevicesListDrawer.tsx | 90 ++++++++++---------
 .../ConnectedDevicesService/index.spec.ts     |  4 +-
 app/features/ConnectedDevicesService/index.ts |  4 +-
 app/main/IpcEvents.enum.ts                    |  2 +
 app/main/ipcMainHandlers.ts                   |  8 ++
 5 files changed, 64 insertions(+), 44 deletions(-)

diff --git a/app/components/ConnectedDevicesListDrawer.tsx b/app/components/ConnectedDevicesListDrawer.tsx
index b6f4abd..47eaae1 100644
--- a/app/components/ConnectedDevicesListDrawer.tsx
+++ b/app/components/ConnectedDevicesListDrawer.tsx
@@ -1,6 +1,7 @@
+/* eslint-disable promise/always-return */
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 /* eslint-disable react/destructuring-assignment */
-import { remote, ipcRenderer } from 'electron';
+import { ipcRenderer } from 'electron';
 import React, { useEffect, useState, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
@@ -15,17 +16,12 @@ import {
 import { Row, Col } from 'react-flexbox-grid';
 import { createStyles, makeStyles } from '@material-ui/core/styles';
 import CloseOverlayButton from './CloseOverlayButton';
-import ConnectedDevicesService from '../features/ConnectedDevicesService';
 import DeviceInfoCallout from './DeviceInfoCallout';
 import SharingSourcePreviewCard from './SharingSourcePreviewCard';
 import isWithReactRevealAnimations from '../utils/isWithReactRevealAnimations';
 import isProduction from '../utils/isProduction';
 import { IpcEvents } from '../main/IpcEvents.enum';
 
-const connectedDevicesService = remote.getGlobal(
-  'connectedDevicesService'
-) as ConnectedDevicesService;
-
 type DeviceWithDesktopCapturerSourceId = Device & {
   desktopCapturerSourceId: string;
 };
@@ -68,28 +64,39 @@ export default function ConnectedDevicesListDrawer(
   const [devicesDisplayed, setDevicesDisplayed] = useState(new Map());
 
   useEffect(() => {
-    ipcRenderer
-      .invoke(IpcEvents.GetConnectedDevices)
-      // eslint-disable-next-line promise/always-return
-      .then((devices: Device[]) => {
-        console.log('devices', devices);
-        // setConnectedDevices(devices);
-        const devicesWithSourceIds: DeviceWithDesktopCapturerSourceId[] = [];
-        devices.forEach(async (device) => {
-          const sharingSourceId = await ipcRenderer.invoke(
-            IpcEvents.GetDesktopCapturerSourceIdBySharingSessionId,
-            device.sharingSessionID
-          );
-          devicesWithSourceIds.push({
-            ...device,
-            desktopCapturerSourceId: sharingSourceId,
-          });
-          console.log('device pushed');
-        });
-        setConnectedDevices(devicesWithSourceIds);
-      })
-      // eslint-disable-next-line no-console
-      .catch((e) => console.error(e));
+    function getConnectedDevicesCallback() {
+      ipcRenderer
+        .invoke(IpcEvents.GetConnectedDevices)
+        // eslint-disable-next-line promise/always-return
+        .then(async (devices: Device[]) => {
+          const devicesWithSourceIds: DeviceWithDesktopCapturerSourceId[] = [];
+          // eslint-disable-next-line no-restricted-syntax
+          for await (const device of devices) {
+            const sharingSourceId = await ipcRenderer.invoke(
+              IpcEvents.GetDesktopCapturerSourceIdBySharingSessionId,
+              device.sharingSessionID
+            );
+            devicesWithSourceIds.push({
+              ...device,
+              desktopCapturerSourceId: sharingSourceId,
+            });
+          }
+          setConnectedDevices(devicesWithSourceIds);
+        })
+        // eslint-disable-next-line no-console
+        .catch((e) => console.error(e));
+    }
+
+    getConnectedDevicesCallback();
+
+    const connectedDevicesInterval = setInterval(
+      getConnectedDevicesCallback,
+      4000
+    );
+
+    return () => {
+      clearInterval(connectedDevicesInterval);
+    };
   }, []);
 
   useEffect(() => {
@@ -100,15 +107,18 @@ export default function ConnectedDevicesListDrawer(
     setDevicesDisplayed(map);
   }, [setDevicesDisplayed, connectedDevices]);
 
-  const handleDisconnectOneDevice = useCallback(async (id: string) => {
-    const device = connectedDevices.find((d: Device) => d.id === id);
-    if (!device) return;
-    ipcRenderer.invoke(
-      IpcEvents.DisconnectPeerAndDestroySharingSessionBySessionID,
-      device.sharingSessionID
-    );
-    connectedDevicesService.removeDeviceByID(id);
-  }, []);
+  const handleDisconnectOneDevice = useCallback(
+    async (id: string) => {
+      const device = connectedDevices.find((d: Device) => d.id === id);
+      if (!device) return;
+      ipcRenderer.invoke(
+        IpcEvents.DisconnectPeerAndDestroySharingSessionBySessionID,
+        device.sharingSessionID
+      );
+      ipcRenderer.invoke(IpcEvents.DisconnectDeviceById, id);
+    },
+    [connectedDevices]
+  );
 
   const handleDisconnectAll = useCallback(() => {
     connectedDevices.forEach((device: Device) => {
@@ -117,8 +127,8 @@ export default function ConnectedDevicesListDrawer(
         device.sharingSessionID
       );
     });
-    connectedDevicesService.removeAllDevices();
-  }, []);
+    ipcRenderer.invoke(IpcEvents.DisconnectAllDevices);
+  }, [connectedDevices]);
 
   const hideOneDeviceInDevicesDisplayed = useCallback(
     (id) => {
@@ -183,7 +193,7 @@ export default function ConnectedDevicesListDrawer(
               </div>
               <Button
                 intent="danger"
-                disabled={connectedDevicesService.getDevices().length === 0}
+                disabled={connectedDevices.length === 0}
                 onClick={() => {
                   setIsAlertDisconectAllOpen(true);
                 }}
diff --git a/app/features/ConnectedDevicesService/index.spec.ts b/app/features/ConnectedDevicesService/index.spec.ts
index 13b4b8f..93dd183 100644
--- a/app/features/ConnectedDevicesService/index.spec.ts
+++ b/app/features/ConnectedDevicesService/index.spec.ts
@@ -45,7 +45,7 @@ describe('ConnectedDevicesService tests', () => {
       it('should make .devices array empty', () => {
         service.devices.push(testDevice);
 
-        service.removeAllDevices();
+        service.disconnectAllDevices();
 
         expect(service.devices.length).toBe(0);
       });
@@ -59,7 +59,7 @@ describe('ConnectedDevicesService tests', () => {
         service.devices.push(testDevice);
         service.devices.push(testDevice2);
 
-        await service.removeDeviceByID(testDevice.id);
+        await service.disconnectDeviceByID(testDevice.id);
 
         let isStillInArray = false;
         service.devices.forEach((d) => {
diff --git a/app/features/ConnectedDevicesService/index.ts b/app/features/ConnectedDevicesService/index.ts
index e7f1a22..01964b0 100644
--- a/app/features/ConnectedDevicesService/index.ts
+++ b/app/features/ConnectedDevicesService/index.ts
@@ -22,11 +22,11 @@ class ConnectedDevices {
     return this.devices;
   }
 
-  removeAllDevices() {
+  disconnectAllDevices() {
     this.devices = [] as Device[];
   }
 
-  removeDeviceByID(deviceIDToRemove: string) {
+  disconnectDeviceByID(deviceIDToRemove: string) {
     return new Promise<undefined>((resolve) => {
       this.devices = this.devices.filter((d) => {
         return d.id !== deviceIDToRemove;
diff --git a/app/main/IpcEvents.enum.ts b/app/main/IpcEvents.enum.ts
index e2f1493..24d30e9 100644
--- a/app/main/IpcEvents.enum.ts
+++ b/app/main/IpcEvents.enum.ts
@@ -10,4 +10,6 @@ export enum IpcEvents {
   DisconnectPeerAndDestroySharingSessionBySessionID = 'disconnect-peer-and-destroy-sharing-session-by-session-id',
   GetDesktopCapturerSourceIdBySharingSessionId = 'get-desktop-capturer-source-id-by-sharing-session-id',
   GetConnectedDevices = 'get-connected-devices-list',
+  DisconnectDeviceById = 'disconnect-device-by-id',
+  DisconnectAllDevices = 'disconnect-all-devices',
 }
diff --git a/app/main/ipcMainHandlers.ts b/app/main/ipcMainHandlers.ts
index b9cc548..c9204e0 100644
--- a/app/main/ipcMainHandlers.ts
+++ b/app/main/ipcMainHandlers.ts
@@ -171,4 +171,12 @@ export default function initIpcMainHandlers(
   ipcMain.handle(IpcEvents.GetConnectedDevices, () => {
     return getDeskreenGlobal().connectedDevicesService.getDevices();
   });
+
+  ipcMain.handle(IpcEvents.DisconnectDeviceById, (_, id) => {
+    getDeskreenGlobal().connectedDevicesService.disconnectDeviceByID(id);
+  });
+
+  ipcMain.handle(IpcEvents.DisconnectAllDevices, () => {
+    getDeskreenGlobal().connectedDevicesService.disconnectAllDevices();
+  });
 }