refine monitor connection settings

Author: Alberto Iannaccone

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

@@ -1,10 +1,7 @@
 import '../../src/browser/style/index.css';
 import { ContainerModule } from 'inversify';
 import { WidgetFactory } from '@theia/core/lib/browser/widget-manager';
-import {
-  CommandContribution,
-  CommandRegistry,
-} from '@theia/core/lib/common/command';
+import { CommandContribution } from '@theia/core/lib/common/command';
 import { bindViewContribution } from '@theia/core/lib/browser/shell/view-contribution';
 import {
   TabBarToolbarContribution,
@@ -424,8 +421,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
         context.container.get<MonitorManagerProxyClient>(
           MonitorManagerProxyClient
         ),
-        context.container.get<BoardsServiceProvider>(BoardsServiceProvider),
-        context.container.get<CommandRegistry>(CommandRegistry)
+        context.container.get<BoardsServiceProvider>(BoardsServiceProvider)
       );
     },
   }));

arduino-ide-extension/src/browser/monitor-manager-proxy-client-impl.ts

@@ -1,4 +1,4 @@
-import { Emitter, MessageService } from '@theia/core';
+import { CommandRegistry, Emitter, MessageService } from '@theia/core';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { Board, Port } from '../common/protocol';
 import {
@@ -10,6 +10,8 @@ import {
   PluggableMonitorSettings,
   MonitorSettings,
 } from '../node/monitor-settings/monitor-settings-provider';
+import { BoardsConfig } from './boards/boards-config';
+import { MonitorViewContribution } from './serial/monitor/monitor-view-contribution';
 
 @injectable()
 export class MonitorManagerProxyClientImpl
@@ -29,13 +31,11 @@ export class MonitorManagerProxyClientImpl
   readonly onMonitorSettingsDidChange =
     this.onMonitorSettingsDidChangeEmitter.event;
 
-  protected readonly onWSConnectionChangedEmitter = new Emitter<boolean>();
-  readonly onWSConnectionChanged = this.onWSConnectionChangedEmitter.event;
-
   // WebSocket used to handle pluggable monitor communication between
   // frontend and backend.
   private webSocket?: WebSocket;
   private wsPort?: number;
+  private lastConnectedBoard: BoardsConfig.Config;
 
   getWebSocketPort(): number | undefined {
     return this.wsPort;
@@ -47,20 +47,20 @@ export class MonitorManagerProxyClientImpl
 
     // This is necessary to call the backend methods from the frontend
     @inject(MonitorManagerProxyFactory)
-    protected server: MonitorManagerProxyFactory
+    protected server: MonitorManagerProxyFactory,
+
+    @inject(CommandRegistry)
+    protected readonly commandRegistry: CommandRegistry
   ) {}
 
   /**
    * Connects a localhost WebSocket using the specified port.
    * @param addressPort port of the WebSocket
    */
-  connect(addressPort: number): void {
-    if (this.webSocket) {
-      return;
-    }
+  async connect(addressPort: number): Promise<void> {
+    if (!!this.webSocket && this.wsPort === addressPort) return;
     try {
       this.webSocket = new WebSocket(`ws://localhost:${addressPort}`);
-      this.onWSConnectionChangedEmitter.fire(true);
     } catch {
       this.messageService.error('Unable to connect to websocket');
       return;
@@ -87,7 +87,6 @@ export class MonitorManagerProxyClientImpl
     try {
       this.webSocket?.close();
       this.webSocket = undefined;
-      this.onWSConnectionChangedEmitter.fire(false);
     } catch {
       this.messageService.error('Unable to close websocket');
     }
@@ -102,7 +101,18 @@ export class MonitorManagerProxyClientImpl
     port: Port,
     settings?: PluggableMonitorSettings
   ): Promise<void> {
-    return this.server().startMonitor(board, port, settings);
+    await this.server().startMonitor(board, port, settings);
+    if (
+      board.fqbn !== this.lastConnectedBoard?.selectedBoard?.fqbn ||
+      port.id !== this.lastConnectedBoard?.selectedPort?.id
+    )
+      await this.commandRegistry.executeCommand(
+        MonitorViewContribution.RESET_SERIAL_MONITOR
+      );
+    this.lastConnectedBoard = {
+      selectedBoard: board,
+      selectedPort: port,
+    };
   }
 
   getCurrentSettings(board: Board, port: Port): Promise<MonitorSettings> {

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

@@ -13,12 +13,10 @@ import { ArduinoSelect } from '../../widgets/arduino-select';
 import { SerialMonitorSendInput } from './serial-monitor-send-input';
 import { SerialMonitorOutput } from './serial-monitor-send-output';
 import { BoardsServiceProvider } from '../../boards/boards-service-provider';
-import { CommandRegistry, nls } from '@theia/core/lib/common';
+import { nls } from '@theia/core/lib/common';
 import { MonitorManagerProxyClient } from '../../../common/protocol';
 import { MonitorModel } from '../../monitor-model';
 import { MonitorSettings } from '../../../node/monitor-settings/monitor-settings-provider';
-import { MonitorViewContribution } from './monitor-view-contribution';
-import { BoardsConfig } from '../../boards/boards-config';
 
 @injectable()
 export class MonitorWidget extends ReactWidget {
@@ -43,8 +41,6 @@ export class MonitorWidget extends ReactWidget {
   protected closing = false;
   protected readonly clearOutputEmitter = new Emitter<void>();
 
-  protected lastConnectedBoard: BoardsConfig.Config;
-
   constructor(
     @inject(MonitorModel)
     protected readonly monitorModel: MonitorModel,
@@ -53,10 +49,7 @@ export class MonitorWidget extends ReactWidget {
     protected readonly monitorManagerProxy: MonitorManagerProxyClient,
 
     @inject(BoardsServiceProvider)
-    protected readonly boardsServiceProvider: BoardsServiceProvider,
-
-    @inject(CommandRegistry)
-    protected readonly commandRegistry: CommandRegistry
+    protected readonly boardsServiceProvider: BoardsServiceProvider
   ) {
     super();
     this.id = MonitorWidget.ID;
@@ -85,18 +78,6 @@ export class MonitorWidget extends ReactWidget {
               selectedPort
             );
 
-            if (
-              selectedBoard.fqbn !==
-                this.lastConnectedBoard?.selectedBoard?.fqbn ||
-              selectedPort.id !== this.lastConnectedBoard?.selectedPort?.id
-            )
-              await this.commandRegistry.executeCommand(
-                MonitorViewContribution.RESET_SERIAL_MONITOR
-              );
-            this.lastConnectedBoard = {
-              selectedBoard,
-              selectedPort,
-            };
             this.update();
           }
         }

arduino-ide-extension/src/common/protocol/monitor-service.ts

@@ -30,7 +30,6 @@ export const MonitorManagerProxyClient = Symbol('MonitorManagerProxyClient');
 export interface MonitorManagerProxyClient {
   onMessagesReceived: Event<{ messages: string[] }>;
   onMonitorSettingsDidChange: Event<MonitorSettings>;
-  onWSConnectionChanged: Event<boolean>;
   connect(addressPort: number): void;
   disconnect(): void;
   getWebSocketPort(): number | undefined;