restored v2

Author: Stefania

.eslintrc

@@ -1,5 +1,8 @@
 {
   "parser": "babel-eslint",
+  "plugins": [
+    "react"
+  ],
   "rules": {
     "max-len": 0,
     "comma-dangle": 0,
@@ -13,7 +16,8 @@
     "arrow-parens": 0,
     "consistent-return": 0,
     "no-useless-escape": 0,
-    "no-underscore-dangle": 0
+    "no-underscore-dangle": 0,
+    "react/jsx-uses-vars": 2
   },
   "extends": "airbnb-base",
   "env": {

demo/app.jsx

@@ -22,7 +22,7 @@ import React from 'react';
 import Daemon from '../src';
 
 import { HEX } from './serial_mirror';
-// import V2 from './v2/v2.jsx';
+import V2 from './v2/v2.jsx';
 
 const chromeExtensionID = 'hfejhkbipnickajaidoppbadcomekkde';
 
@@ -274,9 +274,9 @@ class App extends React.Component {
           <textarea aria-label="Serial Monitor output" id="serial-textarea" value={ this.state.serialMonitorContent } readOnly/>
         </div>
 
-        {/* <div className="v2">
+        <div className="v2">
           <V2 daemon={daemon}></V2>
-        </div> */}
+        </div>
 
         <div className="section">
           <h2>Upload a sample sketch on a MKR1000 at /dev/ttyACM0</h2>

package-lock.json

@@ -15,7 +15,7 @@
     "lib": "lib"
   },
   "dependencies": {
-    "detect-browser": "^4.1.0",
+    "detect-browser": "^4.4.0",
     "rxjs": "^6.4.0",
     "semver-compare": "^1.0.0",
     "socket.io-client": "2.2.0"
@@ -29,11 +29,12 @@
     "babel-preset-env": "^1.7.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
-    "clean-webpack-plugin": "^1.0.1",
+    "clean-webpack-plugin": "^2.0.1",
     "cross-env": "^5.2.0",
     "eslint": "^5.16.0",
     "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-plugin-import": "^2.17.1",
+    "eslint-plugin-import": "^2.17.2",
+    "eslint-plugin-react": "^7.12.4",
     "html-webpack-plugin": "^3.2.0",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
@@ -51,6 +52,7 @@
   },
   "scripts": {
     "test": "",
+    "https": "webpack-dev-server --https",
     "dev": "webpack-dev-server",
     "lint": "./node_modules/.bin/eslint src",
     "lint-fix": "./node_modules/.bin/eslint --fix src --ext .js",

package.json

@@ -26,7 +26,7 @@ import { timer, BehaviorSubject } from 'rxjs';
 import { filter, takeUntil, first } from 'rxjs/operators';
 
 import Daemon from './daemon';
-// import V2 from './socket-daemon.v2';
+import V2 from './socket-daemon.v2';
 
 // Required agent version
 const browser = detect();
@@ -63,17 +63,17 @@ export default class SocketDaemon extends Daemon {
 
     this.openChannel(() => this.socket.emit('command', 'list'));
 
-    // this.agentV2Found = new BehaviorSubject(null);
+    this.agentV2Found = new BehaviorSubject(null);
 
     this.agentFound
       .subscribe(agentFound => {
         if (agentFound) {
           this._wsConnect();
-          /* const v2 = new V2(this.pluginURL);
+          const v2 = new V2(this.pluginURL);
           v2.init().then(() => {
             this.v2 = v2;
             this.agentV2Found.next(this.v2);
-          }); */
+          });
         }
         else {
           this.findAgent();
@@ -279,10 +279,7 @@ export default class SocketDaemon extends Daemon {
    */
   update() {
     return fetch(`${this.agentInfo[this.selectedProtocol]}/update`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'text/plain; charset=utf-8'
-      }
+      method: 'POST'
     })
       .then(result => result.json())
       .then(response => {
@@ -307,10 +304,7 @@ export default class SocketDaemon extends Daemon {
   stopPlugin() {
     if (this.agentFound.getValue()) {
       return fetch(`${this.agentInfo[this.selectedProtocol]}/pause`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'text/plain; charset=utf-8'
-        }
+        method: 'POST'
       });
     }
   }
@@ -434,9 +428,6 @@ export default class SocketDaemon extends Daemon {
   daemonUpload(data) {
     fetch(`${this.pluginURL}/upload`, {
       method: 'POST',
-      headers: {
-        'Content-Type': 'text/plain; charset=utf-8'
-      },
       body: JSON.stringify(data)
     })
       .then(result => {
@@ -471,15 +462,15 @@ export default class SocketDaemon extends Daemon {
   _upload(uploadPayload, uploadCommandInfo) {
     if (Array.isArray(uploadCommandInfo.tools)) {
       uploadCommandInfo.tools.forEach(tool => {
-        // if (this.v2) {
-        //   this.downloading.next({ status: this.DOWNLOAD_IN_PROGRESS });
-        //   this.v2.installTool(tool).then(() => {
-        //     this.downloading.next({ status: this.DOWNLOAD_DONE });
-        //   });
-        // }
-        // else {
-        this.downloadTool(tool.name, tool.version, tool.packager);
-        // }
+        if (this.v2) {
+          this.downloading.next({ status: this.DOWNLOAD_IN_PROGRESS });
+          this.v2.installTool(tool).then(() => {
+            this.downloading.next({ status: this.DOWNLOAD_DONE });
+          });
+        }
+        else {
+          this.downloadTool(tool.name, tool.version, tool.packager);
+        }
       });
     }
 

src/socket-daemon.js

@@ -34,10 +34,7 @@ export default class SocketDaemonV2 {
   // }
   installTool(payload) {
     return fetch(`${this.daemonURL}/pkgs/tools/installed`, {
-      method: 'PUT',
-      headers: {
-        'Content-Type': 'text/plain; charset=utf-8'
-      },
+      method: 'POST',
       body: JSON.stringify(payload)
     }).then(res => res.json()
       .then((json) => {