open/close serial monitor

Author: Alberto Iannaccone

src/reader-writer.js

@@ -11,6 +11,7 @@ export default class ReaderWriter {
     };
     this.messageSubject.subscribe(this.updateDevicesList.bind(this));
     this.openingSerial = null;
+    this.closingSerial = null;
   }
 
   initSocket(socket) {
@@ -63,26 +64,49 @@ export default class ReaderWriter {
     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') {
+        if (message.Cmd === 'Open') {
           return resolve();
         }
-        if (data.Cmd === 'OpenFail') {
+        if (message.Cmd === 'OpenFail') {
           return reject(new Error('Failed to open serial'));
         }
       };
-      this.messageSubject.subscribe(checkOpen);
+      this.openSubscription = this.messageSubject.subscribe(checkOpen);
     }).finally(() => {
+      this.openSubscription.unsubscribe();
       this.openingSerial = null;
     });
     this.socket.emit('command', `open ${port} 9600 timed`);
     return this.openingSerial;
   }
 
+  closeSerialMonitor(port) {
+    if (this.closingSerial) {
+      return this.closingSerial;
+    }
+    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 checkClosed = null;
+    this.closingSerial = new Promise((resolve, reject) => {
+      checkClosed = message => {
+        if (message.Cmd === 'Close') {
+          return resolve();
+        }
+        if (message.Cmd === 'CloseFail') {
+          return reject(new Error('Failed to close serial'));
+        }
+      };
+      this.closeSubscription = this.messageSubject.subscribe(checkClosed);
+    }).finally(() => {
+      this.closeSubscription.unsubscribe();
+      this.closingSerial = null;
+    });
+    this.socket.emit('command', `close ${port}`);
+    return this.closingSerial;
+  }
 }

test/app.jsx

@@ -2,6 +2,16 @@ import React from 'react';
 import Daemon from '../src';
 import { WS_STATUS_CONNECTED, AGENT_STATUS_FOUND } from '../src/socket-daemon';
 
+const handleOpen = (e, port) => {
+  e.preventDefault();
+  Daemon.readerWriter.openSerialMonitor(port);
+};
+
+const handleClose = (e, port) => {
+  e.preventDefault();
+  Daemon.readerWriter.closeSerialMonitor(port);
+};
+
 class App extends React.Component {
   constructor() {
     super();
@@ -53,8 +63,8 @@ class App extends React.Component {
   }
 
   render() {
-    const listSerialDevices = this.state.serialDevices.map(device => <li>{device.Name}</li>);
-    const listNetworkDevices = this.state.networkDevices.map(device => <li>{device.Name}</li>);
+    const listSerialDevices = this.state.serialDevices.map((device, i) => (<li key={i}>{device.Name} - IsOpen: {device.IsOpen ? 'true' : 'false'} - <a href="#" onClick={(e) => handleOpen(e, device.Name)}>open</a> - <a href="#" onClick={(e) => handleClose(e, device.Name)}>close</a></li>));
+    const listNetworkDevices = this.state.networkDevices.map((device, i) => <li key={i}>{device.Name}</li>);
 
     return (
       <div>