connect serial plotter app with websocket

Author: Alberto Iannaccone

arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts

@@ -258,7 +258,6 @@ import {
   PlotterPath,
   PlotterService,
 } from '../common/protocol/plotter-service';
-import { PlotterConnection } from './plotter/plotter-connection';
 import { nls } from '@theia/core/lib/browser/nls';
 
 const ElementQueries = require('css-element-queries/src/ElementQueries');
@@ -411,7 +410,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     })
     .inSingletonScope();
   bind(MonitorConnection).toSelf().inSingletonScope();
-  bind(PlotterConnection).toSelf().inSingletonScope();
+
   // Serial monitor service client to receive and delegate notifications from the backend.
   bind(MonitorServiceClient).to(MonitorServiceClientImpl).inSingletonScope();
 

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

@@ -49,8 +49,10 @@ 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();
+      await this.monitorConnection.disconnect(serialConnection);
     }
     try {
       const { boardsConfig } = this.boardsServiceClientImpl;
@@ -85,7 +87,7 @@ export class BurnBootloader extends SketchContribution {
       this.messageService.error(e.toString());
     } finally {
       if (monitorConfig) {
-        await this.monitorConnection.connect(monitorConfig);
+        await this.monitorConnection.connect(serialConnection, monitorConfig);
       }
     }
   }

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

@@ -110,8 +110,9 @@ export class UploadSketch extends SketchContribution {
     }
     let shouldAutoConnect = false;
     const monitorConfig = this.monitorConnection.monitorConfig;
+    const serialConnection = this.monitorConnection.connectionType;
     if (monitorConfig) {
-      await this.monitorConnection.disconnect();
+      await this.monitorConnection.disconnect(serialConnection);
       if (this.monitorConnection.autoConnect) {
         shouldAutoConnect = true;
       }
@@ -182,12 +183,11 @@ export class UploadSketch extends SketchContribution {
             Object.assign(board, { port }),
             10_000
           );
-          if (shouldAutoConnect) {
-            // Enabling auto-connect will trigger a connect.
-            this.monitorConnection.autoConnect = true;
-          } else {
-            await this.monitorConnection.connect(monitorConfig);
-          }
+          this.monitorConnection.connect(
+            serialConnection,
+            monitorConfig,
+            shouldAutoConnect
+          );
         } catch (waitError) {
           this.messageService.error(
             nls.localize(