Moved the raw socket.io to a "private" property and using this.socket as message subject

Author: destegabry

src/daemon.js

@@ -2,21 +2,21 @@ import { Subject, BehaviorSubject } from 'rxjs';
 
 export default class Daemon {
   constructor() {
-    this.socket = null;
+    this._socket = null;
     this.pluginURL = null;
-    this.messageBus = new Subject();
+    this.socket = new Subject();
     this.serialMonitor = new Subject();
     this.devicesList = new BehaviorSubject({
       serial: [],
       network: []
     });
-    this.messageBus.subscribe(this.updateDevicesList.bind(this));
+    this.socket.subscribe(this.updateDevicesList.bind(this));
     this.openingSerial = null;
     this.closingSerial = null;
   }
 
   initSocket() {
-    this.socket.on('message', this.parseMessage.bind(this));
+    this._socket.on('message', this.parseMessage.bind(this));
   }
 
   initPluginUrl(pluginUrl) {
@@ -56,10 +56,10 @@ export default class Daemon {
 
   parseMessage(message) {
     try {
-      this.messageBus.next(JSON.parse(message));
+      this.socket.next(JSON.parse(message));
     }
     catch (SyntaxError) {
-      this.messageBus.next(message);
+      this.socket.next(message);
     }
   }
 
@@ -85,12 +85,12 @@ export default class Daemon {
           return reject(new Error('Failed to open serial'));
         }
       };
-      this.openSubscription = this.messageBus.subscribe(checkOpen);
+      this.openSubscription = this.socket.subscribe(checkOpen);
     }).finally(() => {
       this.openSubscription.unsubscribe();
       this.openingSerial = null;
     });
-    this.socket.emit('command', `open ${port} 9600 timed`);
+    this._socket.emit('command', `open ${port} 9600 timed`);
     return this.openingSerial;
   }
 
@@ -118,12 +118,12 @@ export default class Daemon {
           return reject(new Error('Failed to close serial'));
         }
       };
-      this.closeSubscription = this.messageBus.subscribe(checkClosed);
+      this.closeSubscription = this.socket.subscribe(checkClosed);
     }).finally(() => {
       this.closeSubscription.unsubscribe();
       this.closingSerial = null;
     });
-    this.socket.emit('command', `close ${port}`);
+    this._socket.emit('command', `close ${port}`);
     return this.closingSerial;
   }
 
@@ -134,7 +134,7 @@ export default class Daemon {
       }
     };
     if (!this.readSerialSubscription) {
-      this.readSerialSubscription = this.messageBus.subscribe(onMessage);
+      this.readSerialSubscription = this.socket.subscribe(onMessage);
     }
   }
 }

src/socket-daemon.js

@@ -78,7 +78,7 @@ export default class SocketDaemon extends Daemon {
           interval(POLLING_INTERVAL)
             .pipe(startWith(0))
             .pipe(takeUntil(this.wsConnected.pipe(filter(status => !status))))
-            .subscribe(() => this.socket.emit('command', 'list'));
+            .subscribe(() => this._socket.emit('command', 'list'));
         }
         else {
           this.agentFound.next(false);
@@ -163,19 +163,19 @@ export default class SocketDaemon extends Daemon {
   _wsConnect() {
     const wsProtocol = this.selectedProtocol === PROTOCOL.HTTPS ? 'ws' : 'wss';
     const address = this.agentInfo[wsProtocol];
-    this.socket = io(address, { reconnection: false, forceNew: true });
+    this._socket = io(address, { reconnection: false, forceNew: true });
 
-    this.socket.on('connect', () => {
+    this._socket.on('connect', () => {
       // On connect download windows drivers which are indispensable for detection of boards
-      this.socket.emit('command', 'downloadtool windows-drivers latest arduino keep');
-      this.socket.emit('command', 'downloadtool bossac 1.7.0 arduino keep');
+      this._socket.emit('command', 'downloadtool windows-drivers latest arduino keep');
+      this._socket.emit('command', 'downloadtool bossac 1.7.0 arduino keep');
 
       this.wsConnected.next(true);
     });
 
-    this.socket.on('error', error => this.error.next(error));
+    this._socket.on('error', error => this.error.next(error));
 
-    this.socket.on('disconnect', () => {
+    this._socket.on('disconnect', () => {
       this.wsConnected.next(false);
     });
   }