fixed conflict

Author: Stefania

src/reader-writer.js

@@ -1,22 +1,42 @@
+import { Subject } from 'rxjs';
+
 export default class ReaderWriter {
-  constructor(socket, pluginUrl, devicesListStatus) {
-    this.socket = socket;
-    this.pluginUrl = pluginUrl;
-    this.devicesListStatus = devicesListStatus;
-    this.socket.on('message', this.parseMessage.bind(this));
+  constructor() {
+    this.socket = null;
+    this.pluginURL = null;
+    this.messageSubject = new Subject();
+    this.devicesList = {
+      serial: [],
+      network: []
+    };
+    this.messageSubject.subscribe(this.updateDevicesList.bind(this));
+    this.openingSerial = null;
   }
 
   initSocket(socket) {
     this.socket = socket;
+    this.socket.on('message', this.parseMessage.bind(this));
   }
 
   initPluginUrl(pluginUrl) {
     this.pluginURL = pluginUrl;
   }
 
+  updateDevicesList(devicesInfo) {
+    // Result of a list command
+    if (devicesInfo.Ports) {
+      if (devicesInfo.Network) {
+        this.devicesList.network = devicesInfo.Ports;
+      }
+      else {
+        this.devicesList.serial = devicesInfo.Ports;
+      }
+      console.log(this.devicesList);
+    }
+  }
+
   parseMessage(message) {
     let jsonMessage;
-
     try {
       jsonMessage = JSON.parse(message);
     }
@@ -25,10 +45,44 @@ export default class ReaderWriter {
     }
 
     if (jsonMessage) {
-      // Result of a list command
-      if (jsonMessage.Ports) {
-        this.devicesListStatus.next(jsonMessage);
-      }
+      this.messageSubject.next(jsonMessage);
+    }
+  }
+
+  openSerialMonitor(port) {
+    if (this.openingSerial) {
+      return this.openingSerial;
+    }
+    const serialPort = this.devicesList.serial.find(p => p.Name === port);
+    if (!serialPort) {
+      return Promise.reject(new Error('No board found'));
     }
+    if (serialPort.IsOpen) {
+      return Promise.resolve();
+    }
+    let checkOpen = null;
+    this.openingSerial = new Promise((resolve, reject) => {
+      checkOpen = message => {
+        let data = null;
+        try {
+          data = JSON.parse(message);
+        }
+        catch (SyntaxError) {
+          return;
+        }
+        if (data.Cmd === 'Open') {
+          return resolve();
+        }
+        if (data.Cmd === 'OpenFail') {
+          return reject(new Error('Failed to open serial'));
+        }
+      };
+      this.messageSubject.subscribe(checkOpen);
+    }).finally(() => {
+      this.openingSerial = null;
+    });
+    this.socket.emit('command', `open ${port} 9600 timed`);
+    return this.openingSerial;
   }
+
 }

src/socket-daemon.js

@@ -74,31 +74,12 @@ export default class SocketDaemon {
 
     this.agentDiscoveryStatus = new BehaviorSubject(AGENT_STATUS_NOT_FOUND);
     this.wsConnectionStatus = new BehaviorSubject(WS_STATUS_DISCONNECTED);
-    this.devicesListStatus = new Subject();
     this.wsError = new Subject();
 
-    this.devicesList = {
-      serial: [],
-      network: []
-    };
-
-    this.devicesListStatus.subscribe(devicesInfo => {
-      if (devicesInfo.Network) {
-        this.devicesList.network = devicesInfo.Ports;
-      }
-      else {
-        this.devicesList.serial = devicesInfo.Ports;
-      }
-      console.log(this.devicesList);
-    });
-
-    this.readerWriter = null;
+    this.readerWriter = new ReaderWriter();
     this.wsConnectionStatus.subscribe(status => {
       if (status === WS_STATUS_CONNECTED) {
-        this.readerWriter = new ReaderWriter(this.socket, this.agentInfo[this.selectedProtocol], this.devicesListStatus);
-      }
-      else {
-        this.readerWriter = null;
+        this.readerWriter.initSocket(this.socket);
       }
     });
   }
@@ -154,10 +135,14 @@ export default class SocketDaemon {
             if (r.response.url.indexOf(PROTOCOL.HTTPS) === 0) {
               this.selectedProtocol = PROTOCOL.HTTPS;
             }
+<<<<<<< HEAD
             else {
               // Protocol http, force 127.0.0.1 for old agent versions too
               this.agentInfo[this.selectedProtocol] = this.agentInfo[this.selectedProtocol].replace('localhost', '127.0.0.1');
             }
+=======
+            this.readerWriter.initPluginUrl(this.agentInfo[this.selectedProtocol]);
+>>>>>>> 93943b354033c52810ae98200bee481ba5eef5d9
             return true;
           }
           return false;

test/index.js

@@ -32,3 +32,7 @@ document.getElementById('connect').addEventListener('click', () => {
   Daemon.findAgent()
     .catch(showError);
 });
+
+Daemon.readerWriter.messageSubject.subscribe(devicesInfo => {
+  document.getElementById('boards-list').innerHTML = JSON.stringify(devicesInfo, null, 2);
+});