port upload preliminar operations inside library, using boards v3 api, [CM-266]

Author: Stefania

src/chrome-app-daemon.js

@@ -239,34 +239,14 @@ export default class ChromeOsDaemon extends Daemon {
    *  ],
    * }
    */
-  upload(target, data) {
-    this.closeSerialMonitor(target.port);
-    this.uploading.next({ status: this.UPLOAD_IN_PROGRESS });
-
-    if (data.files.length === 0) { // At least one file to upload
-      this.uploading.next({ status: this.UPLOAD_ERROR, err: 'You need at least one file to upload' });
-      return;
-    }
-
-    // Main file
-    const file = data.files[0];
-    file.name = file.name.split('/');
-    file.name = file.name[file.name.length - 1];
-
-    const payload = {
-      board: target.board,
-      port: target.port,
-      commandline: data.commandline,
-      filename: file.name,
-      data: file.data,
-    };
-
+  _upload(payload) {
+    const currPayload = payload;
     try {
       window.oauth.token().then(token => {
-        payload.token = token.token;
+        currPayload.token = token.token;
         this.channel.postMessage({
           command: 'upload',
-          data: payload
+          data: currPayload
         });
       });
     }

src/daemon.js

@@ -98,6 +98,40 @@ export default class Daemon {
       });
   }
 
+  upload(target, sketch, compilation) {
+    if (!target.network) {
+      this.closeSerialMonitor(target.port);
+    }
+    this.uploading.next({ status: this.UPLOAD_IN_PROGRESS });
+
+
+    // Fetch command line for the board
+    fetch(`https://builder.arduino.cc/v3/boards/${target.board}/compute`, {
+      method: 'POST',
+      body: JSON.stringify({ action: 'upload' })
+    })
+      .then(result => result.json())
+      .then(uploadCommandInfo => {
+        const projectNameIndex = uploadCommandInfo.commandline.indexOf('{build.project_name}');
+        let ext = uploadCommandInfo.commandline.substring(projectNameIndex + 21, projectNameIndex + 24);
+        if (!ext || !compilation[ext]) {
+          console.log('we received a faulty ext property, defaulting to .bin');
+          ext = 'bin';
+        }
+
+        const uploadPayload = {
+          board: target.board,
+          port: target.port,
+          commandline: uploadCommandInfo.commandline,
+          filename: `${sketch.name}.${ext}`,
+          hex: compilation[ext], // For desktop agent
+          data: compilation[ext], // For chromeOS plugin, consider to align this
+        };
+
+        this._upload(uploadPayload, target, uploadCommandInfo);
+      });
+  }
+
   /**
    * Compares 2 devices list checking they contains the same ports in the same order
    * @param {Array<device>} a the first list

src/socket-daemon.js

@@ -411,65 +411,52 @@ export default class SocketDaemon extends Daemon {
    *  options: {}
    * }
    */
-  upload(target, data) {
-    if (!target.network) {
-      this.closeSerialMonitor(target.port);
-    }
-    this.uploading.next({ status: this.UPLOAD_IN_PROGRESS });
-
-    if (data.files.length === 0) { // At least one file to upload
-      this.uploading.next({ status: this.UPLOAD_ERROR, err: 'You need at least one file to upload' });
-      return;
-    }
+  _upload(uploadPayload, target, uploadCommandInfo) {
+    uploadCommandInfo.tools.forEach(tool => {
+      this.downloadTool(tool.name, tool.version, tool.packager);
+    });
 
-    // Main file
-    const file = data.files[0];
-    file.name = file.name.split('/');
-    file.name = file.name[file.name.length - 1];
-
-    const payload = {
-      board: target.board,
-      port: target.port,
-      commandline: data.commandline,
-      signature: data.signature,
-      hex: file.data,
-      filename: file.name,
+    const socketParameters = {
+      signature: uploadCommandInfo.signature,
       extra: {
         auth: {
           username: target.auth_user,
           password: target.auth_pass,
           private_key: target.auth_key,
           port: target.auth_port
         },
-        wait_for_upload_port: data.options.wait_for_upload_port === 'true' || data.options.wait_for_upload_port === true,
-        use_1200bps_touch: data.options.use_1200bps_touch === 'true' || data.options.use_1200bps_touch === true,
+        wait_for_upload_port: uploadCommandInfo.options.wait_for_upload_port === 'true' || uploadCommandInfo.options.wait_for_upload_port === true,
+        use_1200bps_touch: uploadCommandInfo.options.use_1200bps_touch === 'true' || uploadCommandInfo.options.use_1200bps_touch === true,
         network: target.network,
         ssh: target.ssh,
-        params_verbose: data.options.param_verbose,
-        params_quiet: data.options.param_quiet,
-        verbose: data.options.verbose
+        params_verbose: uploadCommandInfo.options.param_verbose,
+        params_quiet: uploadCommandInfo.options.param_quiet,
+        verbose: uploadCommandInfo.options.verbose
       },
-      extrafiles: data.extrafiles || []
+      extrafiles: uploadCommandInfo.extrafiles || []
+      // Consider to push extra resource files from sketch in future if feature requested (from data folder)
     };
 
-    for (let i = 1; i < data.files.length; i += 1) {
-      payload.extrafiles.push({ filename: data.files[i].name, hex: data.files[i].data });
-    }
+    const completePayload = Object.assign({}, uploadPayload, socketParameters);
+
+    this.downloadingDone.subscribe(() => {
+      this.serialMonitorOpened.pipe(filter(open => !open))
+        .pipe(first())
+        .subscribe(() => {
+          fetch(`${this.pluginURL}/upload`, {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'text/plain; charset=utf-8'
+            },
+            body: JSON.stringify(completePayload)
+          })
+            .catch(error => {
+              this.uploading.next({ status: this.UPLOAD_ERROR, err: error });
+            });
+        });
+    });
 
-    this.serialMonitorOpened.pipe(filter(open => !open))
-      .pipe(first())
-      .subscribe(() => {
-        fetch(`${this.pluginURL}/upload`, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'text/plain; charset=utf-8'
-          },
-          body: JSON.stringify(payload)
-        })
-          .catch(error => {
-            this.uploading.next({ status: this.UPLOAD_ERROR, err: error });
-          });
-      });
+    this.downloadingError.subscribe(error => this.uploading.next({ status: this.UPLOAD_ERROR, err: error }));
   }
 
   /**

test/app.jsx

@@ -40,21 +40,10 @@ const handleUpload = () => {
     network: false
   };
 
-  const data = {
-    files: [{
-      name: 'serial_mirror.bin',
-      data: HEX
-    }],
-    commandline: '\"{runtime.tools.bossac-1.7.0.path}/bossac\" {upload.verbose} --port={serial.port.file} -U true -i -e -w -v \"{build.path}/{build.project_name}.bin\" -R',
-    signature: '66695789d14908f52cb1964da58ec9fa816d6ddb321900c60ad6ec2d84a7c713abb2b71404030c043e32cf548736eb706180da8256f2533bd132430896437c72b396abe19e632446f16e43b80b73f5cf40aec946d00e7543721cc72d77482a84d2d510e46ea6ee0aaf063ec267b5046a1ace36b7eb04c64b4140302586f1e10eda8452078498ab5c9985e8f5d521786064601daa5ba2978cf91cfeb64e83057b3475ec029a1b835460f4e203c1635eaba812b076248a3589cd5d84c52398f09d255f8aae25d66a40d5ab2b1700247defbdfd044c77d44078197d1f543800e11f79d6ef1c6eb46df65fe2fffd81716b11d798ba21a3ca2cb20f6d955d8e1f8aef',
-    extrafiles: [],
-    options: {
-      wait_for_upload_port: true,
-      use_1200bps_touch: true,
-      params_verbose: '-v'
-    }
+  const sketch = {
+    name: 'serial_mirror.bin',
   };
-  daemon.upload(target, data);
+  daemon.upload(target, sketch, { data: HEX });
 };
 
 const handleDownloadTool = e => {