Refactored how the uploader is injected

Author: csarnataro

src/chrome-os-daemon.js

@@ -32,8 +32,7 @@ export default function ChromeOsDaemon(boardsUrl, options) {
 
   let useWebSerial;
   let chromeExtensionId;
-  let Uploader;
-  let uploaderOptions;
+  let uploader;
 
   // check chromeExtensionId OR web serial API
   if (typeof options === 'string') {
@@ -42,14 +41,15 @@ export default function ChromeOsDaemon(boardsUrl, options) {
   else {
     chromeExtensionId = options.chromeExtensionId;
     useWebSerial = options.useWebSerial;
-    Uploader = options.Uploader;
-    uploaderOptions = options.uploaderOptions || {};
+    uploader = options.uploader;
   }
 
-  if ('serial' in navigator && useWebSerial === 'true' && !!Uploader) {
-    this.flavour = new WebSerialDaemon(boardsUrl, Uploader, uploaderOptions);
+  if ('serial' in navigator && useWebSerial && Boolean(uploader)) {
+    console.debug('Instantiating WebSerialDaemon');
+    this.flavour = new WebSerialDaemon(boardsUrl, uploader);
   }
   else {
+    console.debug('Instantiating ChromeAppDaemon');
     this.flavour = new ChromeAppDaemon(boardsUrl, chromeExtensionId);
   }
 

src/index.js

@@ -26,9 +26,11 @@ import FirmwareUpdater from './firmware-updater';
 let Daemon;
 
 if (window.navigator.userAgent.indexOf(' CrOS ') !== -1) {
+  console.debug('Instantiating ChromeOsDaemon');
   Daemon = ChromeOsDaemon;
 }
 else {
+  console.debug('Instantiating SocketDaemon');
   Daemon = SocketDaemon;
 }
 

src/web-serial-daemon.js

@@ -13,12 +13,12 @@ import Daemon from './daemon';
  * It must provide a method `upload`.
  */
 export default class WebSerialDaemon extends Daemon {
-  constructor(boardsUrl, Uploader, uploaderOptions) {
+  constructor(boardsUrl, uploader) {
     super(boardsUrl);
     this.port = null;
     this.agentFound.next(true); // subscribe(() => true);
     this.channelOpenStatus.next(true); // subscribe(() => true);
-    this.uploader = new Uploader(uploaderOptions);
+    this.uploader = uploader;
   }
 
   // // Specific for serial web API on chromebooks
@@ -80,13 +80,13 @@ export default class WebSerialDaemon extends Daemon {
    * @param {object} uploadPayload
    * TODO: document param's shape
    */
-  async _upload(uploadPayload) {
-    try {
-      await this.uploader.upload(uploadPayload);
-      this.uploading.next({ status: this.UPLOAD_DONE, msg: 'Sketch uploaded' });
-    }
-    catch (error) {
-      this.notifyUploadError(error.message);
-    }
+  _upload(uploadPayload) {
+    this.uploader.upload(uploadPayload)
+      .then(() => {
+        this.uploading.next({ status: this.UPLOAD_DONE, msg: 'Sketch uploaded' });
+      })
+      .catch(error => {
+        this.notifyUploadError(error.message);
+      });
   }
 }