merge commit

Author: Alberto Iannaccone

README.md

@@ -10,35 +10,51 @@ npm install create-plugin-communication --save
 ## How to use
 
 ```js
-import Daemon from 'create-plugin-communication';ù
+import Daemon from 'create-plugin-communication';
 
-// Ask for agent connection
-Daemon.findAgent()
+const daemon = new Daemon();
 
-Daemon.agentDiscoveryStatus.subscribe(status => {
-  // AGENT_FOUND / AGENT_NOT_FOUND
+daemon.agentFound.subscribe(status => {
+  // true / false
 });
 
-Daemon.wsConnectionStatus.subscribe(status => {
-  // WS_CONNECTED / WS_DISCONNECTED
+daemon.wsConnected.subscribe(status => {
+  // true / false
 });
 
-Daemon.wsError.subscribe(err => {
+daemon.error.subscribe(err => {
   // handle err
 });
 
-Daemon.readerWriter.messageSubject.subscribe(() => {
-  const  serialDevices = Daemon.readerWriter.devicesList.serial;
-  const  networkDevices = Daemon.readerWriter.devicesList.network;
+// List available devices (serial/network)
+daemon.devicesList.subscribe(devices => {
+  const  serialDevices = devices.serial;
+  const  networkDevices = devices.network;
 });
+
+// Open serial monitor
+daemon.openSerialMonitor('port-name');
+
+// Read from serial monitor
+daemon.serialMonitorMessages.subscribe(message => {
+  console.log(message);
+});
+
+// Write to serial monitor
+daemon.writeSerial('port-name', 'message');
+
+// Close serial monitor
+daemon.closeSerialMonitor('port-name');
+
 ```
 ## Development
 Just run `npm run dev` and open your browser on http://localhost:8000
 
 ## Agent communication
 
 To enable communication between your [local installation](http://localhost:8000/) and the [Arduino Create Agent](https://github.com/arduino/arduino-create-agent)
-add `origins = http://localhost:8000` on your agent config.ini file (if you are using https, add `origins = https://localhost:8000`).
+add `origins = http://localhost:8000` on your agent config.ini file
+(if you are using https, add `origins = https://localhost:8000`).
 
 - On macOs ~/Applications/ArduinoCreateAgent-1.1/ArduinoCreateAgent.app/Contents/MacOS/config.ini
 - On Linux ~/ArduinoCreateAgent-1.1/config.ini

src/chrome-app-daemon.js

@@ -0,0 +1,115 @@
+/*
+ * This file is part of create-plugin-communication.
+ *
+ * Copyright 2018 Arduino AG (http://www.arduino.cc/)
+ *
+ * create-plugin-communication is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ */
+import {
+  Subject,
+  BehaviorSubject,
+  interval
+} from 'rxjs';
+import { filter, startWith, takeUntil } from 'rxjs/operators';
+import Daemon from './daemon';
+
+const POLLING_INTERVAL = 1000;
+
+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) {
+          interval(POLLING_INTERVAL)
+            .pipe(startWith(0))
+            .pipe(takeUntil(this.wsConnected.pipe(filter(status => !status))))
+            .subscribe(() => this.channel.postMessage({
+              command: 'listPorts'
+            }));
+        }
+        else {
+          this._wsConnect(chromeExtensionId);
+          this.agentFound.next(false);
+        }
+      });
+
+    // close all ports?
+  }
+
+  /**
+   * Instantiate connection and events listeners for chrome app
+   */
+  _wsConnect(chromeExtensionId) {
+    if (chrome.runtime) {
+      this.channel = chrome.runtime.connect(chromeExtensionId);
+      this.channel.onMessage.addListener(message => {
+        if (message.version) {
+          this.agentInfo = message;
+          this.agentFound.next(true);
+          this.wsConnected.next(true);
+        }
+        else {
+          this.appMessages.next(message);
+        }
+      });
+      this.channel.onDisconnect.addListener(() => {
+        this.wsConnected.next(false);
+        this.agentFound.next(false);
+      });
+    }
+  }
+
+  handleAppMessage(message) {
+    if (message.ports) {
+      const lastDevices = this.devicesList.getValue();
+      if (!Daemon.devicesListAreEquals(lastDevices.serial, message.ports)) {
+        this.devicesList.next({
+          serial: message.ports.map(port => ({
+            Name: port.name,
+            SerialNumber: port.serialNumber,
+            IsOpen: port.isOpen,
+            VendorID: port.vendorId,
+            ProductID: port.productId
+          })),
+          network: []
+        });
+      }
+    }
+
+    if (message.supportedBoards) {
+      this.supportedBoards.next(message.supportedBoards);
+    }
+  }
+}

src/chromeAppDaemon.js

@@ -29,7 +29,7 @@
 
 import { Deferred } from './readMessages';
 
-let port = null;
+const port = null;
 let polling;
 
 let uploading = false;
@@ -63,7 +63,7 @@ const callback = (name, data) => {
 };
 
 const onMessage = (msg) => {
-  if (msg.version) {
+  /* if (msg.version) {
     if (!polling) {
       polling = setInterval(() => {
         if (!uploading) {
@@ -89,7 +89,7 @@ const onMessage = (msg) => {
     }));
 
     callback('ports', ports);
-  }
+  } */
   else if (msg.uploadStatus) {
     if (msg.uploadStatus === 'success') {
       uploading = false;
@@ -143,7 +143,8 @@ const onMessage = (msg) => {
   }
 };
 
-const onChromeDisconnect = () => {
+/*
+  const onChromeDisconnect = () => {
   disconnected = true;
 
   if (polling) {
@@ -153,7 +154,7 @@ const onChromeDisconnect = () => {
   disconnectCb();
 };
 
-const connect = (chromeExtensionId) => {
+ const connect = (chromeExtensionId) => {
   if ((port === null || disconnected) && chrome.runtime) {
     port = chrome.runtime.connect(chromeExtensionId);
     port.onMessage.addListener(onMessage);
@@ -162,7 +163,7 @@ const connect = (chromeExtensionId) => {
   else {
     errorCb('chromeExtensionNotFound');
   }
-};
+}; */
 
 const perform = (action, data) => {
   const deferred = new Deferred();

src/daemon.js

@@ -18,6 +18,7 @@ export default class Daemon {
       serial: [],
       network: []
     });
+    this.supportedBoards = new BehaviorSubject([]);
     this.socketMessages
       .subscribe(this.handleSocketMessage.bind(this));
 

src/index.js

@@ -28,8 +28,8 @@
  */
 
 import SocketDaemon from './socket-daemon';
-import chromeAppDaemon from './chromeAppDaemon';
+import ChromeOsDaemon from './chrome-app-daemon';
 
-const Daemon = window.navigator.userAgent.indexOf(' CrOS ') !== -1 ? chromeAppDaemon : new SocketDaemon();
+const Daemon = window.navigator.userAgent.indexOf(' CrOS ') !== -1 ? ChromeOsDaemon : SocketDaemon;
 
 export default Daemon;