fixed upload on chromeos

Author: Stefania

src/chrome-app-daemon.js

@@ -70,7 +70,7 @@ export default class ChromeOsDaemon extends Daemon {
       this.serialMonitorMessages.next(message.serialData);
     }
 
-    if (message.programmerstatus) {
+    if (message.uploadStatus) {
       this.handleUploadMessage(message);
     }
 
@@ -254,4 +254,9 @@ export default class ChromeOsDaemon extends Daemon {
       this.uploading.next({ status: this.UPLOAD_ERROR, err: 'you need to be logged in on a Create site to upload by Chrome App' });
     }
   }
+
+  downloadTool() {
+    // no need to download tool on chromeOS
+    this.downloading.next({ status: this.DOWNLOAD_DONE });
+  }
 }

src/daemon.js

@@ -30,6 +30,11 @@ export default class Daemon {
     this.UPLOAD_ERROR = 'UPLOAD_ERROR';
     this.UPLOAD_IN_PROGRESS = 'UPLOAD_IN_PROGRESS';
 
+    this.DOWNLOAD_DONE = 'DOWNLOAD_DONE';
+    this.DOWNLOAD_NOPE = 'DOWNLOAD_NOPE';
+    this.DOWNLOAD_ERROR = 'DOWNLOAD_ERROR';
+    this.DOWNLOAD_IN_PROGRESS = 'DOWNLOAD_IN_PROGRESS';
+
     this.agentInfo = {};
     this.agentFound = new BehaviorSubject(null);
     this.channelOpen = new BehaviorSubject(null);
@@ -59,6 +64,14 @@ export default class Daemon {
       .pipe(filter(devices => devices.serial && devices.serial.length > 0))
       .pipe(first())
       .subscribe(() => this.closeAllPorts());
+
+    this.downloading = new BehaviorSubject({ status: this.DOWNLOAD_NOPE });
+    this.downloadingDone = this.downloading.pipe(filter(download => download.status === this.DOWNLOAD_DONE))
+      .pipe(first())
+      .pipe(takeUntil(this.downloading.pipe(filter(download => download.status === this.DOWNLOAD_ERROR))));
+    this.downloadingError = this.downloading.pipe(filter(download => download.status === this.DOWNLOAD_ERROR))
+      .pipe(first())
+      .pipe(takeUntil(this.downloadingDone));
   }
 
   notifyUploadError(err) {
@@ -96,22 +109,6 @@ export default class Daemon {
     return a.every((item, index) => (b[index].Name === item.Name && b[index].IsOpen === item.IsOpen));
   }
 
-  /**
-   * Download tool - not supported in Chrome app
-   * @param {string} toolName
-   * @param {string} toolVersion
-   * @param {string} packageName
-   * @param {string} replacementStrategy
-   */
-  downloadTool(toolName, toolVersion, packageName, replacementStrategy = 'keep') {
-    if (typeof this.downloadToolCommand === 'function') {
-      this.downloadToolCommand(toolName, toolVersion, packageName, replacementStrategy);
-    }
-    else {
-      throw new Error('Download Tool not supported on Chrome OS');
-    }
-  }
-
   /**
    * Interrupt upload - not supported in Chrome app
    */

src/socket-daemon.js

@@ -22,7 +22,7 @@ import io from 'socket.io-client';
 import semVerCompare from 'semver-compare';
 import { detect } from 'detect-browser';
 
-import { BehaviorSubject, timer } from 'rxjs';
+import { timer } from 'rxjs';
 import { filter, takeUntil, first } from 'rxjs/operators';
 
 import Daemon from './daemon';
@@ -52,26 +52,13 @@ 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))
-      .pipe(first())
-      .pipe(takeUntil(this.downloading.pipe(filter(download => download.status === this.DOWNLOAD_ERROR))));
-    this.downloadingError = this.downloading.pipe(filter(download => download.status === DOWNLOAD_ERROR))
-      .pipe(first())
-      .pipe(takeUntil(this.downloadingDone));
-
     this.openChannel(() => this.socket.emit('command', 'list'));
 
     this.agentFound
@@ -382,21 +369,21 @@ export default class SocketDaemon extends Daemon {
   }
 
   handleDownloadMessage(message) {
-    if (this.downloading.getValue().status !== DOWNLOAD_IN_PROGRESS) {
+    if (this.downloading.getValue().status !== this.DOWNLOAD_IN_PROGRESS) {
       return;
     }
     switch (message.DownloadStatus) {
       case 'Pending':
-        this.downloading.next({ status: DOWNLOAD_IN_PROGRESS, msg: message.Msg });
+        this.downloading.next({ status: this.DOWNLOAD_IN_PROGRESS, msg: message.Msg });
         break;
       case 'Success':
-        this.downloading.next({ status: DOWNLOAD_DONE, msg: message.Msg });
+        this.downloading.next({ status: this.DOWNLOAD_DONE, msg: message.Msg });
         break;
       case 'Error':
-        this.downloading.next({ status: DOWNLOAD_ERROR, err: message.Msg });
+        this.downloading.next({ status: this.DOWNLOAD_ERROR, err: message.Msg });
         break;
       default:
-        this.downloading.next({ status: DOWNLOAD_IN_PROGRESS, msg: message.Msg });
+        this.downloading.next({ status: this.DOWNLOAD_IN_PROGRESS, msg: message.Msg });
     }
   }
 
@@ -486,8 +473,8 @@ export default class SocketDaemon extends Daemon {
    * @param {string} packageName
    * @param {string} replacementStrategy
    */
-  downloadToolCommand(toolName, toolVersion, packageName, replacementStrategy) {
-    this.downloading.next({ status: DOWNLOAD_IN_PROGRESS });
+  downloadTool(toolName, toolVersion, packageName, replacementStrategy) {
+    this.downloading.next({ status: this.DOWNLOAD_IN_PROGRESS });
     this.socket.emit('command', `downloadtool ${toolName} ${toolVersion} ${packageName} ${replacementStrategy}`);
   }