added downloadtool test

Author: Stefania

src/daemon.js

@@ -14,6 +14,7 @@ export default class Daemon {
     this.agentFound = new BehaviorSubject(null);
     this.channelOpen = new BehaviorSubject(null);
     this.error = new Subject();
+
     this.appMessages = new Subject();
     this.serialMonitorOpened = new BehaviorSubject(false);
     this.serialMonitorMessages = new Subject();

src/socket-daemon.js

@@ -31,7 +31,7 @@ import io from 'socket.io-client';
 import semVerCompare from 'semver-compare';
 import { detect } from 'detect-browser';
 
-import { timer } from 'rxjs';
+import { BehaviorSubject, timer } from 'rxjs';
 import { takeUntil, filter } from 'rxjs/operators';
 
 import Daemon from './daemon';
@@ -50,21 +50,32 @@ const LOOPBACK_ADDRESS = '127.0.0.1';
 const LOOPBACK_HOSTNAME = 'localhost';
 const LOOKUP_PORT_START = 8991;
 const LOOKUP_PORT_END = 9000;
+let orderedPluginAddresses = [LOOPBACK_ADDRESS, LOOPBACK_HOSTNAME];
+
 const CANT_FIND_AGENT_MESSAGE = 'Arduino Create Agent cannot be found';
+
 let updateAttempts = 0;
-let orderedPluginAddresses = [LOOPBACK_ADDRESS, LOOPBACK_HOSTNAME];
 
 if (browser.name !== 'chrome' && browser.name !== 'firefox') {
   orderedPluginAddresses = [LOOPBACK_HOSTNAME, LOOPBACK_ADDRESS];
 }
 
+const DOWNLOAD_NOPE = 'DOWNLOAD_NOPE';
+const DOWNLOAD_DONE = 'DOWNLOAD_DONE';
+const DOWNLOAD_ERROR = 'DOWNLOAD_ERROR';
+const DOWNLOAD_IN_PROGRESS = 'DOWNLOAD_IN_PROGRESS';
+
 export default class SocketDaemon extends Daemon {
   constructor() {
     super();
     this.selectedProtocol = PROTOCOL.HTTP;
     this.socket = null;
     this.pluginURL = null;
 
+    this.downloading = new BehaviorSubject({ status: DOWNLOAD_NOPE });
+    this.downloadingDone = this.downloading.pipe(filter(download => download.status === DOWNLOAD_DONE));
+    this.downloadingError = this.downloading.pipe(filter(download => download.status === DOWNLOAD_ERROR));
+
     this.openChannel(() => this.socket.emit('command', 'list'));
 
     this.agentFound
@@ -188,6 +199,10 @@ export default class SocketDaemon extends Daemon {
       this.handleUploadMessage(message);
     }
 
+    if (message.DownloadStatus) {
+      this.handleDownloadMessage(message);
+    }
+
     if (message.Err) {
       this.uploading.next({ status: this.UPLOAD_ERROR, err: message.Err });
     }
@@ -343,6 +358,25 @@ export default class SocketDaemon extends Daemon {
     }
   }
 
+  handleDownloadMessage(message) {
+    if (this.downloading.getValue().status !== DOWNLOAD_IN_PROGRESS) {
+      return;
+    }
+    switch (message.DownloadStatus) {
+      case 'Pending':
+        this.downloading.next({ status: DOWNLOAD_IN_PROGRESS, msg: message.Msg });
+        break;
+      case 'Success':
+        this.downloading.next({ status: DOWNLOAD_DONE, msg: message.Msg });
+        break;
+      case 'Error':
+        this.downloading.next({ status: DOWNLOAD_ERROR, err: message.Msg });
+        break;
+      default:
+        this.downloading.next({ status: DOWNLOAD_IN_PROGRESS, msg: message.Msg });
+    }
+  }
+
   /**
    * Perform an upload via http on the daemon
    * @param {Object} target = {
@@ -425,6 +459,7 @@ export default class SocketDaemon extends Daemon {
    * @param {string} replacementStrategy
    */
   downloadToolCommand(toolName, toolVersion, packageName, replacementStrategy) {
+    this.downloading.next({ status: DOWNLOAD_IN_PROGRESS });
     this.socket.emit('command', `downloadtool ${toolName} ${toolVersion} ${packageName} ${replacementStrategy}`);
   }
 

test/app.jsx

@@ -51,6 +51,8 @@ class App extends React.Component {
       serialPortOpen: '',
       uploadStatus: '',
       uploadError: '',
+      downloadStatus: '',
+      downloadError: '',
       supportedBoards: []
     };
     this.handleOpen = this.handleOpen.bind(this);
@@ -96,6 +98,13 @@ class App extends React.Component {
       this.setState({ uploadStatus: upload.status });
       console.log(upload);
     });
+
+    if (daemon.downloading) {
+      daemon.downloading.subscribe(download => {
+        this.setState({ downloadStatus: download.status });
+        console.log(download);
+      });
+    }
   }
 
   showError(err) {
@@ -128,6 +137,19 @@ class App extends React.Component {
     serialInput.value = '';
   }
 
+  handleDownloadTool(e) {
+    e.preventDefault();
+    const toolname = document.getElementById('toolname');
+    const toolversion = document.getElementById('toolversion');
+    const packageName = document.getElementById('package');
+    const replacement = document.getElementById('replacement');
+    daemon.downloadTool(toolname.value, toolversion.value, packageName.value, replacement.value);
+    toolname.value = '';
+    toolversion.value = '';
+    packageName.value = '';
+    replacement.value = '';
+  }
+
   render() {
     const listSerialDevices = this.state.serialDevices.map((device, i) =>
       <li key={i}>
@@ -161,42 +183,61 @@ class App extends React.Component {
       uploadClass = 'in-progress';
     }
 
+    let downloadClass;
+    if (this.state.downloadStatus === daemon.DOWNLOAD_DONE) {
+      downloadClass = 'success';
+    }
+    else if (this.state.downloadStatus === daemon.DOWNLOAD_ERROR) {
+      downloadClass = 'error';
+    }
+    else if (this.state.downloadStatus === daemon.DOWNLOAD_IN_PROGRESS) {
+      downloadClass = 'in-progress';
+    }
+
     return (
       <div>
         <h1>Test Arduino Create Plugin</h1>
 
-        <p>
-          Agent status: <span className={ this.state.agentStatus ? 'found' : 'not-found' }>
-            { this.state.agentStatus ? 'Found' : 'Not found' }
-          </span>
-        </p>
-        <p>
-          Channel status: <span className={ this.state.channelStatus ? 'found' : 'not-found' }>
-            { this.state.channelStatus ? 'Connected' : 'Not connected' }
-          </span>
-        </p>
-
-        <pre>
-          { this.state.agentInfo }
-        </pre>
+        <div className="section">
+          <h2>Plugin info</h2>
+
+          <p>
+            Agent status: <span className={ this.state.agentStatus ? 'found' : 'not-found' }>
+              { this.state.agentStatus ? 'Found' : 'Not found' }
+            </span>
+          </p>
+          <p>
+            Channel status: <span className={ this.state.channelStatus ? 'found' : 'not-found' }>
+              { this.state.channelStatus ? 'Connected' : 'Not connected' }
+            </span>
+          </p>
+
+          <pre>
+            { this.state.agentInfo }
+          </pre>
+        </div>
 
         <div className="section">
-          <h2>Devices</h2>
+          <h2>Connected Devices</h2>
+
           <strong>serial:</strong>
           <ul>
             { listSerialDevices }
           </ul>
+
           <strong>network:</strong>
           <ul>
             { listNetworkDevices }
           </ul>
+
           <p id="error"></p>
         </div>
 
         {
           this.state.supportedBoards.length ?
             <div className="section">
               <h2>Supported boards</h2>
+
               <ul>
                 {supportedBoards}
               </ul>
@@ -206,10 +247,12 @@ class App extends React.Component {
 
         <div className="serial-monitor section">
           <h2>Serial Monitor</h2>
+
           <form onSubmit={this.handleSend}>
             <input id="serial-input" />
             <input type="submit" value="Send" />
           </form>
+
           <textarea id="serial-textarea" value={ this.state.serialMonitorContent }/>
         </div>
 
@@ -219,6 +262,37 @@ class App extends React.Component {
           <div>Upload status: <span className={ uploadClass }> { this.state.uploadStatus }</span></div>
           <div>{ this.state.uploadError }</div>
         </div>
+
+        { daemon.downloading ? <div className="section">
+          <h2>Download tool (not supported on Chrome OS)</h2>
+
+          <div>
+            <p>Example:</p>
+            <dl>
+              <dt>Tool Name:</dt>
+              <dd>windows-drivers</dd>
+
+              <dt>Tool Version:</dt>
+              <dd>latest</dd>
+
+              <dt>Package:</dt>
+              <dd>arduino</dd>
+
+              <dt>Replacement Strategy:</dt>
+              <dd>keep</dd>
+            </dl>
+          </div>
+
+          <form onSubmit={this.handleDownloadTool}>
+            <div><input id="toolname" placeholder="Tool Name"/></div>
+            <div><input id="toolversion" placeholder="Tool Version" /></div>
+            <div><input id="package" placeholder="Package" /></div>
+            <div><input id="replacement" placeholder="Replacement strategy"/></div>
+
+            <input type="submit" value="Download" />
+            <div>Download status: <span className={ downloadClass }> { this.state.downloadStatus }</span></div>
+          </form>
+        </div> : null}
       </div>
     );
   }

test/index.html

@@ -3,31 +3,37 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <title>Test Daemon</title>
+  <title>Test Arduino Create Plugin</title>
   <style>
-  #error, .not-found, .closed, .error {
-    color: red
-  }
+    body {
+      color: #2c353a;
+      font-family: Lucida Grande,Lucida,Verdana,sans-serif;
+      padding: 15px;
+    }
 
-  .found, .open, .success {
-    color: green;
-  }
+    #error, .not-found, .closed, .error {
+      color: red
+    }
 
-  pre {
-    background: #f9f9f9;
-  }
+    .found, .open, .success {
+      color: green;
+    }
 
-  .in-progress {
-    color: blue;
-  }
+    pre {
+      background: #f9f9f9;
+    }
 
-  #serial-textarea {
-    height: 300px;
-  }
+    .in-progress {
+      color: blue;
+    }
 
-  .section {
-    margin: 20px;
-  }
+    #serial-textarea {
+      height: 300px;
+    }
+
+    .section {
+      margin: 20px;
+    }
   </style>
 </head>
 <body>