minor cleanup, updated naming

Author: Stefania

README.md

@@ -18,7 +18,7 @@ daemon.agentFound.subscribe(status => {
   // true / false
 });
 
-daemon.wsConnected.subscribe(status => {
+daemon.channelOpen.subscribe(status => {
   // true / false
 });
 

src/chrome-app-daemon.js

@@ -28,7 +28,6 @@
  */
 import {
   Subject,
-  BehaviorSubject,
   interval
 } from 'rxjs';
 import { filter, startWith, takeUntil } from 'rxjs/operators';
@@ -40,21 +39,17 @@ export default class ChromeOsDaemon extends Daemon {
   constructor(chromeExtensionId) {
     super();
     this.channel = null;
-    this.agentInfo = {};
-    this.agentFound = new BehaviorSubject(null);
-    this.wsConnected = new BehaviorSubject(null);
     this.appMessages = new Subject();
-    this.error = new Subject();
 
     this.appMessages
       .subscribe(this.handleAppMessage.bind(this));
 
-    this.wsConnected
-      .subscribe(wsConnected => {
-        if (wsConnected) {
+    this.channelOpen
+      .subscribe(channelOpen => {
+        if (channelOpen) {
           interval(POLLING_INTERVAL)
             .pipe(startWith(0))
-            .pipe(takeUntil(this.wsConnected.pipe(filter(status => !status))))
+            .pipe(takeUntil(this.channelOpen.pipe(filter(status => !status))))
             .subscribe(() => this.channel.postMessage({
               command: 'listPorts'
             }));
@@ -78,14 +73,14 @@ export default class ChromeOsDaemon extends Daemon {
         if (message.version) {
           this.agentInfo = message;
           this.agentFound.next(true);
-          this.wsConnected.next(true);
+          this.channelOpen.next(true);
         }
         else {
           this.appMessages.next(message);
         }
       });
       this.channel.onDisconnect.addListener(() => {
-        this.wsConnected.next(false);
+        this.channelOpen.next(false);
         this.agentFound.next(false);
       });
     }

src/daemon.js

@@ -10,6 +10,10 @@ export default class Daemon {
   constructor() {
     this.socket = null;
     this.pluginURL = null;
+    this.agentInfo = {};
+    this.agentFound = new BehaviorSubject(null);
+    this.channelOpen = new BehaviorSubject(null);
+    this.error = new Subject();
     this.socketMessages = new Subject();
     this.serialMonitorOpened = new BehaviorSubject(false);
     this.serialMonitorMessages = new Subject();

src/socket-daemon.js

@@ -32,8 +32,6 @@ import semVerCompare from 'semver-compare';
 import { detect } from 'detect-browser';
 
 import {
-  Subject,
-  BehaviorSubject,
   interval,
   timer
 } from 'rxjs';
@@ -66,18 +64,14 @@ export default class SocketDaemon extends Daemon {
   constructor() {
     super();
     this.selectedProtocol = PROTOCOL.HTTP;
-    this.agentInfo = {};
-    this.agentFound = new BehaviorSubject(null);
-    this.wsConnected = new BehaviorSubject(null);
-    this.error = new Subject();
-
-    this.wsConnected
-      .subscribe(wsConnected => {
-        if (wsConnected) {
+
+    this.channelOpen
+      .subscribe(channelOpen => {
+        if (channelOpen) {
           this.initSocket();
           interval(POLLING_INTERVAL)
             .pipe(startWith(0))
-            .pipe(takeUntil(this.wsConnected.pipe(filter(status => !status))))
+            .pipe(takeUntil(this.channelOpen.pipe(filter(status => !status))))
             .subscribe(() => this.socket.emit('command', 'list'));
         }
         else {
@@ -170,13 +164,13 @@ export default class SocketDaemon extends Daemon {
       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.channelOpen.next(true);
     });
 
     this.socket.on('error', error => this.error.next(error));
 
     this.socket.on('disconnect', () => {
-      this.wsConnected.next(false);
+      this.channelOpen.next(false);
     });
   }
 

test/app.jsx

@@ -23,7 +23,7 @@ class App extends React.Component {
     this.state = {
       error: '',
       agentStatus: false,
-      wsStatus: false,
+      channelStatus: false,
       serialDevices: [],
       networkDevices: [],
       agentInfo: '',
@@ -49,8 +49,8 @@ class App extends React.Component {
       });
     });
 
-    daemon.wsConnected.subscribe(status => {
-      this.setState({ wsStatus: status });
+    daemon.channelOpen.subscribe(status => {
+      this.setState({ channelStatus: status });
     });
 
     daemon.error.subscribe(this.showError);
@@ -171,28 +171,28 @@ class App extends React.Component {
         <h1>Test Arduino Create Plugin</h1>
 
         <p>
-          Agent status: <span id="agent-status" className={ this.state.agentStatus ? 'found' : 'not-found' }>
+          Agent status: <span className={ this.state.agentStatus ? 'found' : 'not-found' }>
             { this.state.agentStatus ? 'Found' : 'Not found' }
           </span>
         </p>
         <p>
-          Web socket status: <span id="ws-status" className={ this.state.wsStatus ? 'found' : 'not-found' }>
-            { this.state.wsStatus ? 'Connected' : 'Not connected' }
+          Web socket status: <span className={ this.state.channelStatus ? 'found' : 'not-found' }>
+            { this.state.channelStatus ? 'Connected' : 'Not connected' }
           </span>
         </p>
 
-        <pre id="agent-info">
+        <pre>
           { this.state.agentInfo }
         </pre>
 
         <div className="section">
           <h2>Devices</h2>
           <strong>serial:</strong>
-          <ul id="serial-list">
+          <ul>
             { listSerialDevices }
           </ul>
           <strong>network:</strong>
-          <ul id="network-list">
+          <ul>
             { listNetworkDevices }
           </ul>
           <p id="error"></p>