Removed dependency from Uploader, it will be injected by the client.

Author: csarnataro

package.json

@@ -15,7 +15,6 @@
     "lib": "lib"
   },
   "dependencies": {
-    "@bcmi-labs/arduino-chromeos-uploader": "https://github.com/bcmi-labs/arduino-chromeos-uploader.git#csarnataro/iot-1597-main-refactoring",
     "detect-browser": "^4.8.0",
     "rxjs": "^6.5.3",
     "semver-compare": "^1.0.0",

src/chrome-os-daemon.js

@@ -17,32 +17,37 @@
 * a commercial license, send an email to [email protected].
 *
 */
-
 import WebSerialDaemon from './web-serial-daemon';
 import ChromeAppDaemon from './chrome-app-daemon';
 
 /**
  * ChromeOSDaemon is a new implementation for ChromeOS which allows
  + to select the legacy Chrome app or the new BETA web serial API,
- * based on the the existance of a specific key in the browser CacheStorage,
- * which in turn means that the user has installed it from the Google Play Store
+ * based on the the existance of a `useWebSerial` key available in the constructor.
+ * Warning: support for WebSerialDaemon is still in alpha, so if you don't know
+ * how to deal with Web Serial API, just stick with the Chrome App Deamon.
  *
  */
 export default function ChromeOsDaemon(boardsUrl, options) {
 
-  let useWebSerial = null;
+  let useWebSerial;
   let chromeExtensionId;
+  let Uploader;
+  let uploaderOptions;
 
   // check chromeExtensionId OR web serial API
   if (typeof options === 'string') {
     chromeExtensionId = options;
   }
   else {
-    useWebSerial = options.useWebSerial;
     chromeExtensionId = options.chromeExtensionId;
+    useWebSerial = options.useWebSerial;
+    Uploader = options.Uploader;
+    uploaderOptions = options.uploaderOptions || {};
   }
-  if (useWebSerial === 'true' && 'serial' in navigator) {
-    this.flavour = new WebSerialDaemon(boardsUrl);
+
+  if ('serial' in navigator && useWebSerial === 'true' && !!Uploader) {
+    this.flavour = new WebSerialDaemon(boardsUrl, Uploader, uploaderOptions);
   }
   else {
     this.flavour = new ChromeAppDaemon(boardsUrl, chromeExtensionId);

src/web-serial-daemon.js

@@ -1,33 +1,24 @@
-import { Uploader } from '@bcmi-labs/arduino-chromeos-uploader';
 import {
   filter, takeUntil
 } from 'rxjs/operators';
 import Daemon from './daemon';
 
+/**
+ * WARNING: the WebSerialDaemon with support for the Web Serial API is still in an alpha version.
+ * At the moment it doesn't implement all the features available in the
+ * Use at your own risk.
+ *
+ * The `Uploader` parameter in the constructor is the component which is
+ * used to interact with the Web Serial API.
+ * It must provide a method `upload`.
+ */
 export default class WebSerialDaemon extends Daemon {
-  constructor(boardsUrl) {
+  constructor(boardsUrl, Uploader, uploaderOptions) {
     super(boardsUrl);
     this.port = null;
     this.agentFound.next(true); // subscribe(() => true);
     this.channelOpenStatus.next(true); // subscribe(() => true);
-    this.uploader = new Uploader({
-      logger: console,
-      filters: [
-        { usbVendorId: 0x2341 }
-      ],
-      disconnectCallback: () => {
-        console.log('DISCONNECTED');
-        // this.appMessages.next({ ports: [] });
-      },
-      connectCallback: () => {
-        console.log('CONNECTED');
-      },
-      sendSupportedBoardsCallback: (supportedBoards) => {
-        this.supportedBoards.next(supportedBoards);
-
-      }
-    });
-
+    this.uploader = new Uploader(uploaderOptions);
   }
 
   // // Specific for serial web API on chromebooks