fix: monitor reconnect on upload

Signed-off-by: Akos Kitta <[email protected]>

Author: Akos Kitta

Diff for: arduino-ide-extension/src/node/monitor-service.ts

@@ -410,7 +410,7 @@ export class MonitorService extends CoreClientAware implements Disposable {
     ]) as Promise<unknown> as Promise<void>;
   }
 
-  private closingDuplex: Promise<void> | undefined;
+  private endingDuplex: Promise<void> | undefined;
 
   /**
    * Pauses the currently running monitor, it still closes the gRPC connection
@@ -428,26 +428,28 @@ export class MonitorService extends CoreClientAware implements Disposable {
       );
       return;
     }
-    if (this.closingDuplex) {
-      return this.closingDuplex;
+    if (this.endingDuplex) {
+      return this.endingDuplex;
     }
-    const deferredClose = new Deferred<void>();
-    this.closingDuplex = deferredClose.promise;
+    const deferredEnd = new Deferred<void>();
+    this.endingDuplex = deferredEnd.promise;
 
-    // to terminate the monitor connection, send a close request, and wait for the expected cancellation error
-    duplex.once('error', (error) => {
-      // TODO: check if cancel error
-      deferredClose.resolve();
+    // to terminate the monitor connection, send a close request, and wait for the end event
+    duplex.once('end', () => {
+      deferredEnd.resolve();
     });
-    duplex.write(new MonitorRequest().setClose(true));
     try {
-      await this.closingDuplex;
+      await new Promise((resolve) =>
+        duplex.write(new MonitorRequest().setClose(true), resolve)
+      );
+      await this.endingDuplex;
     } finally {
-      this.closingDuplex = undefined;
+      this.endingDuplex = undefined;
     }
     // Sanity check
-    if (!duplex.closed) {
-      throw new Error('Could not close monitor connection');
+    // Duplexes are allowed to be half open, check whether the monitor server (the readable) has ended
+    if (!duplex.readableEnded) {
+      throw new Error('Could not end the monitor connection');
     }
   }