initialize serial monito web app

Author: Alberto Iannaccone

arduino-ide-extension/package.json

@@ -22,7 +22,7 @@
     "@theia/application-package": "1.18.0",
     "@theia/core": "1.18.0",
     "@theia/editor": "1.18.0",
-		"@theia/editor-preview": "1.18.0",
+    "@theia/editor-preview": "1.18.0",
     "@theia/filesystem": "1.18.0",
     "@theia/git": "1.18.0",
     "@theia/keymaps": "1.18.0",
@@ -77,6 +77,7 @@
     "open": "^8.0.6",
     "p-queue": "^5.0.0",
     "ps-tree": "^1.2.0",
+    "query-string": "^7.0.1",
     "react-disable": "^0.1.0",
     "react-select": "^3.0.4",
     "react-tabs": "^3.1.2",

arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx

@@ -3,16 +3,13 @@ import {
   MAIN_MENU_BAR,
   MenuContribution,
   MenuModelRegistry,
-  SelectionService,
   ILogger,
   DisposableCollection,
 } from '@theia/core';
 import {
-  ContextMenuRenderer,
   FrontendApplication,
   FrontendApplicationContribution,
   LocalStorageService,
-  OpenerService,
   StatusBar,
   StatusBarAlignment,
 } from '@theia/core/lib/browser';
@@ -34,7 +31,6 @@ import {
   EditorManager,
   EditorOpenerOptions,
 } from '@theia/editor/lib/browser';
-import { FileDialogService } from '@theia/filesystem/lib/browser/file-dialog';
 import { ProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution';
 import { MonacoMenus } from '@theia/monaco/lib/browser/monaco-menu';
 import { FileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution';
@@ -46,33 +42,25 @@ import { TerminalMenus } from '@theia/terminal/lib/browser/terminal-frontend-con
 import { inject, injectable, postConstruct } from 'inversify';
 import * as React from 'react';
 import { remote } from 'electron';
-import { MainMenuManager } from '../common/main-menu-manager';
 import {
   BoardsService,
-  CoreService,
   Port,
   SketchesService,
   ExecutableService,
   Sketch,
 } from '../common/protocol';
-import { ArduinoDaemon } from '../common/protocol/arduino-daemon';
 import { ConfigService } from '../common/protocol/config-service';
-import { FileSystemExt } from '../common/protocol/filesystem-ext';
 import { ArduinoCommands } from './arduino-commands';
 import { BoardsConfig } from './boards/boards-config';
 import { BoardsConfigDialog } from './boards/boards-config-dialog';
-import { BoardsDataStore } from './boards/boards-data-store';
 import { BoardsServiceProvider } from './boards/boards-service-provider';
 import { BoardsToolBarItem } from './boards/boards-toolbar-item';
 import { EditorMode } from './editor-mode';
 import { ArduinoMenus } from './menu/arduino-menus';
-import { MonitorConnection } from './monitor/monitor-connection';
 import { MonitorViewContribution } from './monitor/monitor-view-contribution';
-import { WorkspaceService } from './theia/workspace/workspace-service';
 import { ArduinoToolbar } from './toolbar/arduino-toolbar';
 import { HostedPluginSupport } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
-import { ResponseService } from '../common/protocol/response-service';
 import { ArduinoPreferences } from './arduino-preferences';
 import { SketchesServiceClientImpl } from '../common/protocol/sketches-service-client-impl';
 import { SaveAsSketch } from './contributions/save-as-sketch';
@@ -100,24 +88,12 @@ export class ArduinoFrontendContribution
   @inject(BoardsService)
   protected readonly boardsService: BoardsService;
 
-  @inject(CoreService)
-  protected readonly coreService: CoreService;
-
   @inject(BoardsServiceProvider)
   protected readonly boardsServiceClientImpl: BoardsServiceProvider;
 
-  @inject(SelectionService)
-  protected readonly selectionService: SelectionService;
-
   @inject(EditorManager)
   protected readonly editorManager: EditorManager;
 
-  @inject(ContextMenuRenderer)
-  protected readonly contextMenuRenderer: ContextMenuRenderer;
-
-  @inject(FileDialogService)
-  protected readonly fileDialogService: FileDialogService;
-
   @inject(FileService)
   protected readonly fileService: FileService;
 
@@ -127,21 +103,12 @@ export class ArduinoFrontendContribution
   @inject(BoardsConfigDialog)
   protected readonly boardsConfigDialog: BoardsConfigDialog;
 
-  @inject(MenuModelRegistry)
-  protected readonly menuRegistry: MenuModelRegistry;
-
   @inject(CommandRegistry)
   protected readonly commandRegistry: CommandRegistry;
 
   @inject(StatusBar)
   protected readonly statusBar: StatusBar;
 
-  @inject(WorkspaceService)
-  protected readonly workspaceService: WorkspaceService;
-
-  @inject(MonitorConnection)
-  protected readonly monitorConnection: MonitorConnection;
-
   @inject(FileNavigatorContribution)
   protected readonly fileNavigatorContributions: FileNavigatorContribution;
 
@@ -166,40 +133,21 @@ export class ArduinoFrontendContribution
   @inject(EditorMode)
   protected readonly editorMode: EditorMode;
 
-  @inject(ArduinoDaemon)
-  protected readonly daemon: ArduinoDaemon;
-
-  @inject(OpenerService)
-  protected readonly openerService: OpenerService;
-
   @inject(ConfigService)
   protected readonly configService: ConfigService;
 
-  @inject(BoardsDataStore)
-  protected readonly boardsDataStore: BoardsDataStore;
-
-  @inject(MainMenuManager)
-  protected readonly mainMenuManager: MainMenuManager;
-
-  @inject(FileSystemExt)
-  protected readonly fileSystemExt: FileSystemExt;
-
   @inject(HostedPluginSupport)
   protected hostedPluginSupport: HostedPluginSupport;
 
   @inject(ExecutableService)
   protected executableService: ExecutableService;
 
-  @inject(ResponseService)
-  protected readonly responseService: ResponseService;
-
   @inject(ArduinoPreferences)
   protected readonly arduinoPreferences: ArduinoPreferences;
 
   @inject(SketchesServiceClientImpl)
   protected readonly sketchServiceClient: SketchesServiceClientImpl;
 
-  @inject(FrontendApplicationStateService)
   protected readonly appStateService: FrontendApplicationStateService;
 
   @inject(LocalStorageService)

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

@@ -253,7 +253,11 @@ import {
   UploadCertificateDialogProps,
   UploadCertificateDialogWidget,
 } from './dialogs/certificate-uploader/certificate-uploader-dialog';
-import { PlotterContribution } from './plotter/plotter-contribution';
+import { PlotterFrontendContribution } from './plotter/plotter-frontend-contribution';
+import {
+  PlotterPath,
+  PlotterService,
+} from '../common/protocol/plotter-service';
 
 const ElementQueries = require('css-element-queries/src/ElementQueries');
 
@@ -597,7 +601,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   Contribution.configure(bind, AddFile);
   Contribution.configure(bind, ArchiveSketch);
   Contribution.configure(bind, AddZipLibrary);
-  Contribution.configure(bind, PlotterContribution);
+  Contribution.configure(bind, PlotterFrontendContribution);
 
   bind(ResponseServiceImpl)
     .toSelf()
@@ -737,4 +741,9 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(UploadCertificateDialogProps).toConstantValue({
     title: 'UploadCertificate',
   });
+  bind(PlotterService)
+    .toDynamicValue((ctx) =>
+      ctx.container.get(WebSocketConnectionProvider).createProxy(PlotterPath)
+    )
+    .inSingletonScope();
 });

arduino-ide-extension/src/browser/plotter/plotter-contribution.ts

@@ -0,0 +1,89 @@
+import { injectable, inject } from 'inversify';
+import {
+  Command,
+  CommandRegistry,
+  MaybePromise,
+  MenuModelRegistry,
+} from '@theia/core';
+import { MonitorModel } from '../monitor/monitor-model';
+import { ArduinoMenus } from '../menu/arduino-menus';
+import { Contribution } from '../contributions/contribution';
+import { PlotterService } from '../../common/protocol/plotter-service';
+import { Endpoint, FrontendApplication } from '@theia/core/lib/browser';
+import { ipcRenderer } from '@theia/core/shared/electron';
+import { SerialPlotter } from './protocol';
+import { MonitorConfig } from '../../common/protocol';
+const queryString = require('query-string');
+
+export namespace SerialPlotterContribution {
+  export namespace Commands {
+    export const OPEN: Command = {
+      id: 'serial-plotter-open',
+      label: 'Serial Plotter',
+      category: 'Arduino',
+    };
+  }
+}
+
+@injectable()
+export class PlotterFrontendContribution extends Contribution {
+  protected window: Window | null;
+  protected url: string;
+  protected initConfig: SerialPlotter.Config;
+
+  @inject(MonitorModel)
+  protected readonly model: MonitorModel;
+
+  @inject(PlotterService)
+  protected readonly plotter: PlotterService;
+
+  onStart(app: FrontendApplication): MaybePromise<void> {
+    this.url = new Endpoint({ path: '/plotter' }).getRestUrl().toString();
+
+    this.initConfig = {
+      baudrates: MonitorConfig.BaudRates.map((b) => b),
+      currentBaudrate: this.model.baudRate,
+      darkTheme: true,
+      wsPort: 0,
+      generate: true,
+    };
+
+    ipcRenderer.on('CLOSE_CHILD_WINDOW', () => {
+      if (this.window) {
+        if (!this.window.closed) this.window?.close();
+        this.window = null;
+      }
+    });
+
+    return super.onStart(app);
+  }
+
+  registerCommands(registry: CommandRegistry): void {
+    registry.registerCommand(SerialPlotterContribution.Commands.OPEN, {
+      execute: async () => this.open(),
+    });
+  }
+
+  registerMenus(menus: MenuModelRegistry): void {
+    menus.registerMenuAction(ArduinoMenus.TOOLS__MAIN_GROUP, {
+      commandId: SerialPlotterContribution.Commands.OPEN.id,
+      label: SerialPlotterContribution.Commands.OPEN.label,
+      order: '7',
+    });
+  }
+
+  protected async open(): Promise<void> {
+    if (this.window) {
+      this.window.focus();
+    } else {
+      const urlWithParams = queryString.stringifyUrl(
+        {
+          url: this.url,
+          query: this.initConfig,
+        },
+        { arrayFormat: 'comma' }
+      );
+      this.window = window.open(urlWithParams, 'serialPlotter');
+    }
+  }
+}

arduino-ide-extension/src/browser/plotter/plotter-frontend-contribution.ts

@@ -0,0 +1,23 @@
+export namespace SerialPlotter {
+  export type Config = {
+    currentBaudrate: number;
+    baudrates: number[];
+    darkTheme: boolean;
+    wsPort: number;
+    generate: boolean;
+  };
+  export namespace Protocol {
+    export enum Command {
+      PLOTTER_REQUEST_CONFIG = 'PLOTTER_REQUEST_CONFIG',
+      PLOTTER_READY = 'PLOTTER_READY',
+      PLOTTER_SET_BAUDRATE = 'PLOTTER_SET_BAUDRATE',
+      PLOTTER_SET_LINE_ENDING = 'PLOTTER_SET_LINE_ENDING',
+      PLOTTER_SEND_MESSAGE = 'PLOTTER_SEND_MESSAGE',
+      PARENT_SET_CONFIG = 'PARENT_SET_CONFIG',
+    }
+    export type Message = {
+      command: SerialPlotter.Protocol.Command;
+      data?: any;
+    };
+  }
+}