Rename WebSocketService to WebSocketProvider and uninjected it

arduino-ide-extension/src/node/arduino-ide-backend-module.ts

@@ -82,13 +82,15 @@ import {
 } from '../common/protocol/authentication-service';
 import { ArduinoFirmwareUploaderImpl } from './arduino-firmware-uploader-impl';
 import { PlotterBackendContribution } from './plotter/plotter-backend-contribution';
-import WebSocketServiceImpl from './web-socket/web-socket-service-impl';
-import { WebSocketService } from './web-socket/web-socket-service';
 import { ArduinoLocalizationContribution } from './arduino-localization-contribution';
 import { LocalizationContribution } from '@theia/core/lib/node/i18n/localization-contribution';
 import { MonitorManagerProxyImpl } from './monitor-manager-proxy-impl';
 import { MonitorManager } from './monitor-manager';
-import { MonitorManagerProxy, MonitorManagerProxyClient, MonitorManagerProxyPath } from '../common/monitor-manager-proxy';
+import {
+  MonitorManagerProxy,
+  MonitorManagerProxyClient,
+  MonitorManagerProxyPath,
+} from '../common/monitor-manager-proxy';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(BackendApplication).toSelf().inSingletonScope();
@@ -172,9 +174,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     })
   );
 
-  // Shared WebSocketService for the backend. This will manage all websocket conenctions
-  bind(WebSocketService).to(WebSocketServiceImpl).inSingletonScope();
-
   // Shared Arduino core client provider service for the backend.
   bind(CoreClientProvider).toSelf().inSingletonScope();
 

arduino-ide-extension/src/node/serial/serial-service-impl.ts

@@ -17,7 +17,7 @@ import {
 } from '../cli-protocol/cc/arduino/cli/monitor/v1/monitor_pb';
 import { MonitorClientProvider } from './monitor-client-provider';
 import { Board } from '../../common/protocol/boards-service';
-import { WebSocketService } from '../web-socket/web-socket-service';
+import { WebSocketProvider } from '../web-socket/web-socket-provider';
 import { SerialPlotter } from '../../browser/serial/plotter/protocol';
 import { Disposable } from '@theia/core/shared/vscode-languageserver-protocol';
 
@@ -86,7 +86,7 @@ export class SerialServiceImpl implements SerialService {
     @inject(MonitorClientProvider)
     protected readonly serialClientProvider: MonitorClientProvider,
 
-    @inject(WebSocketService)
+    @inject(WebSocketProvider)
     protected readonly webSocketService: WebSocketService
   ) { }
 

arduino-ide-extension/src/node/web-socket/web-socket-provider-impl.ts

@@ -1,10 +1,10 @@
 import { Emitter } from '@theia/core';
 import { injectable } from 'inversify';
 import * as WebSocket from 'ws';
-import { WebSocketService } from './web-socket-service';
+import { WebSocketProvider } from './web-socket-provider';
 
 @injectable()
-export default class WebSocketServiceImpl implements WebSocketService {
+export default class WebSocketProviderImpl implements WebSocketProvider {
   protected wsClients: WebSocket[];
   protected server: WebSocket.Server;
 

arduino-ide-extension/src/node/web-socket/web-socket-provider.ts

@@ -1,8 +1,8 @@
 import { Event } from '@theia/core/lib/common/event';
 import * as WebSocket from 'ws';
 
-export const WebSocketService = Symbol('WebSocketService');
-export interface WebSocketService {
+export const WebSocketProvider = Symbol('WebSocketProvider');
+export interface WebSocketProvider {
   getAddress(): WebSocket.AddressInfo;
   sendMessage(message: string): void;
   onMessageReceived: Event<string>;

arduino-ide-extension/src/test/node/serial-service-impl.test.ts

@@ -7,7 +7,7 @@ use(sinonChai);
 
 import { ILogger } from '@theia/core/lib/common/logger';
 import { MonitorClientProvider } from '../../node/serial/monitor-client-provider';
-import { WebSocketService } from '../../node/web-socket/web-socket-service';
+import { WebSocketProvider } from '../../node/web-socket/web-socket-provider';
 import { MonitorServiceClient } from '../../node/cli-protocol/cc/arduino/cli/monitor/v1/monitor_grpc_pb';
 import { Status } from '../../common/protocol';
 
@@ -16,7 +16,7 @@ describe('SerialServiceImpl', () => {
 
   let logger: IMock<ILogger>;
   let serialClientProvider: IMock<MonitorClientProvider>;
-  let webSocketService: IMock<WebSocketService>;
+  let webSocketService: IMock<WebSocketProvider>;
 
   beforeEach(() => {
     logger = Mock.ofType<ILogger>();
@@ -25,7 +25,7 @@ describe('SerialServiceImpl', () => {
     logger.setup((b) => b.error(It.isAnyString()));
 
     serialClientProvider = Mock.ofType<MonitorClientProvider>();
-    webSocketService = Mock.ofType<WebSocketService>();
+    webSocketService = Mock.ofType<WebSocketProvider>();
 
     subject = new SerialServiceImpl(
       logger.object,