Merge branch 'disconnect-daemon-on-suspen-DES-11'

2 files changed, 38 insertions, 1 deletions

diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts
index 5d24870908..966846fdf6 100644
--- a/gui/src/main/daemon-rpc.ts
+++ b/gui/src/main/daemon-rpc.ts
@@ -137,6 +137,7 @@ type CallFunctionArgument<T, R> =
 export class DaemonRpc {
   private client: ManagementServiceClient;
   private isConnectedValue = false;
+  private isClosed = false;
   private connectionObservers: ConnectionObserver[] = [];
   private nextSubscriptionId = 0;
   private subscriptions: Map<number, grpc.ClientReadableStream<grpcTypes.DaemonEvent>> = new Map();
@@ -154,6 +155,17 @@ export class DaemonRpc {
     return this.isConnectedValue;
   }
 
+  public reopen() {
+    if (this.isClosed) {
+      this.isClosed = false;
+      this.client = new ManagementServiceClient(
+        DAEMON_RPC_PATH,
+        grpc.credentials.createInsecure(),
+        this.channelOptions(),
+      );
+    }
+  }
+
   public connect(): Promise<void> {
     return new Promise((resolve, reject) => {
       this.client.waitForReady(this.deadlineFromNow(), (error) => {
@@ -179,6 +191,7 @@ export class DaemonRpc {
       this.removeSubscription(subscriptionId);
     }
 
+    this.isClosed = true;
     this.client.close();
     if (this.reconnectionTimeout) {
       clearTimeout(this.reconnectionTimeout);
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index 7181f863bf..1e8214a277 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -1,5 +1,5 @@
 import { exec, execFile } from 'child_process';
-import { app, nativeTheme, session, shell, systemPreferences } from 'electron';
+import { app, nativeTheme, powerMonitor, session, shell, systemPreferences } from 'electron';
 import fs from 'fs';
 import * as path from 'path';
 import util from 'util';
@@ -181,6 +181,9 @@ class ApplicationMain
       log.info('quit received');
       this.onQuit();
     });
+
+    powerMonitor.on('suspend', this.onSuspend);
+    powerMonitor.on('resume', this.onResume);
   }
 
   public async performPostUpgradeCheck(): Promise<void> {
@@ -442,6 +445,27 @@ class ApplicationMain
     );
   };
 
+  private onSuspend = () => {
+    log.info('Suspend event received, disconnecting from daemon');
+    if (this.daemonEventListener) {
+      this.daemonRpc.unsubscribeDaemonEventListener(this.daemonEventListener);
+    }
+
+    const wasConnected = this.daemonRpc.isConnected;
+    IpcMainEventChannel.navigation.notifyReset?.();
+    this.daemonRpc.disconnect();
+    this.onDaemonDisconnected(wasConnected);
+  };
+
+  private onResume = () => {
+    log.info('Resume event received, connecting to daemon');
+    this.daemonRpc.reopen();
+    this.daemonRpc.addConnectionObserver(
+      new ConnectionObserver(this.onDaemonConnected, this.onDaemonDisconnected),
+    );
+    this.connectToDaemon();
+  };
+
   private onDaemonConnected = async () => {
     const firstDaemonConnection = this.beforeFirstDaemonConnection;
     this.beforeFirstDaemonConnection = false;