refactor monito connection and fix some connection issues

Author: Alberto Iannaccone

arduino-ide-extension/src/browser/contributions/burn-bootloader.ts

@@ -44,12 +44,7 @@ export class BurnBootloader extends SketchContribution {
   }
 
   async burnBootloader(): Promise<void> {
-    const monitorConfig = this.monitorConnection.monitorConfig;
-    const serialConnection = this.monitorConnection.connectionType;
-
-    if (monitorConfig) {
-      await this.monitorConnection.disconnect(serialConnection);
-    }
+    await this.monitorConnection.disconnect();
     try {
       const { boardsConfig } = this.boardsServiceClientImpl;
       const port = boardsConfig.selectedPort;
@@ -76,8 +71,8 @@ export class BurnBootloader extends SketchContribution {
     } catch (e) {
       this.messageService.error(e.toString());
     } finally {
-      if (monitorConfig) {
-        await this.monitorConnection.connect(serialConnection, monitorConfig);
+      if (this.monitorConnection.isSerialOpen()) {
+        await this.monitorConnection.connect();
       }
     }
   }

arduino-ide-extension/src/browser/contributions/upload-sketch.ts

@@ -104,16 +104,7 @@ export class UploadSketch extends SketchContribution {
     if (!sketch) {
       return;
     }
-    let shouldAutoConnect = false;
-    const monitorConfig = this.monitorConnection.monitorConfig;
-    const serialConnection = this.monitorConnection.connectionType;
-    if (monitorConfig) {
-      await this.monitorConnection.disconnect(serialConnection);
-      if (this.monitorConnection.autoConnect) {
-        shouldAutoConnect = true;
-      }
-      this.monitorConnection.autoConnect = false;
-    }
+    await this.monitorConnection.disconnect();
     try {
       const { boardsConfig } = this.boardsServiceClientImpl;
       const [fqbn, { selectedProgrammer }, verify, verbose, sourceOverride] =
@@ -169,18 +160,17 @@ export class UploadSketch extends SketchContribution {
       this.uploadInProgress = false;
       this.onDidChangeEmitter.fire();
 
-      if (monitorConfig) {
-        const { board, port } = monitorConfig;
+      if (
+        this.monitorConnection.isSerialOpen() &&
+        this.monitorConnection.monitorConfig
+      ) {
+        const { board, port } = this.monitorConnection.monitorConfig;
         try {
           await this.boardsServiceClientImpl.waitUntilAvailable(
             Object.assign(board, { port }),
             10_000
           );
-          this.monitorConnection.connect(
-            serialConnection,
-            monitorConfig,
-            shouldAutoConnect
-          );
+          await this.monitorConnection.connect();
         } catch (waitError) {
           this.messageService.error(
             `Could not reconnect to serial monitor. ${waitError.toString()}`

arduino-ide-extension/src/browser/monitor/monitor-connection.ts

@@ -52,12 +52,9 @@ export class MonitorWidget extends ReactWidget {
     this.scrollOptions = undefined;
     this.toDispose.push(this.clearOutputEmitter);
     this.toDispose.push(
-      Disposable.create(() => {
-        this.monitorConnection.autoConnect = false;
-        if (this.monitorConnection.connected) {
-          this.monitorConnection.disconnect(SerialType.Monitor);
-        }
-      })
+      Disposable.create(() =>
+        this.monitorConnection.closeSerial(SerialType.Monitor)
+      )
     );
   }
 
@@ -82,7 +79,7 @@ export class MonitorWidget extends ReactWidget {
     super.onAfterAttach(msg);
     // const { boardsConfig } = this.boardsServiceProvider;
 
-    this.monitorConnection.connect(SerialType.Monitor, undefined, true);
+    this.monitorConnection.openSerial(SerialType.Monitor);
   }
 
   onCloseRequest(msg: Message): void {

arduino-ide-extension/src/browser/monitor/monitor-widget.tsx

@@ -11,7 +11,7 @@ import { ArduinoMenus } from '../menu/arduino-menus';
 import { Contribution } from '../contributions/contribution';
 import { Endpoint, FrontendApplication } from '@theia/core/lib/browser';
 import { ipcRenderer } from '@theia/core/shared/electron';
-import { MonitorConfig } from '../../common/protocol';
+import { MonitorConfig, Status } from '../../common/protocol';
 import { MonitorConnection, SerialType } from '../monitor/monitor-connection';
 import { SerialPlotter } from './protocol';
 import { BoardsServiceProvider } from '../boards/boards-service-provider';
@@ -49,8 +49,7 @@ export class PlotterFrontendContribution extends Contribution {
     ipcRenderer.on('CLOSE_CHILD_WINDOW', async () => {
       if (this.window) {
         this.window = null;
-        await this.monitorConnection.disconnect(SerialType.Plotter);
-        this.monitorConnection.autoConnect = false;
+        await this.monitorConnection.closeSerial(SerialType.Plotter);
       }
     });
 
@@ -78,25 +77,12 @@ export class PlotterFrontendContribution extends Contribution {
         return;
       }
     }
-    const { boardsConfig } = this.boardsServiceProvider;
-    const { selectedBoard: board, selectedPort: port } = boardsConfig;
-    const { baudRate } = this.model;
-    if (board && port) {
-      const status = await this.monitorConnection.connect(SerialType.Plotter, {
-        board,
-        port,
-        baudRate,
-      });
-      const wsPort = this.monitorConnection.getWsPort();
-      if (status && wsPort) {
-        this.open(wsPort);
-      } else {
-        this.messageService.error(`Couldn't open serial plotter`);
-      }
+    const status = await this.monitorConnection.openSerial(SerialType.Plotter);
+    const wsPort = this.monitorConnection.getWsPort();
+    if (Status.isOK(status) && wsPort) {
+      this.open(wsPort);
     } else {
-      this.messageService.error(
-        `Please select a board and a port to open the Serial Plotter.`
-      );
+      this.messageService.error(`Couldn't open serial plotter`);
     }
   }