Fixes for WIndows

Author: jfrux

app/sagas/network_scanner_sagas.js

@@ -11,24 +11,7 @@ import * as networkConnectionTypes from '../constants/network_connection_action_
 import * as networkScannerActions from '../actions/network_scanner_actions';
 import * as eonListActions from '../actions/eon_list_actions';
 import ping from 'net-ping';
-function timer(secs) {
-  return eventChannel(emitter => {
-      const iv = setInterval(() => {
-        secs -= 1;
-        if (secs > 0) {
-          emitter(secs);
-        } else {
-          // this causes the channel to close
-          emitter(END);
-        }
-      }, 1000);
-      // The subscriber must return an unsubscribe function
-      return () => {
-        clearInterval(iv);
-      };
-    }
-  );
-}
+
 function revisedRandId() {
   return Math.random().toString(36).replace(/[^a-z]+/g, '').substr(2, 10);
 }
@@ -172,18 +155,23 @@ function* resolveEon(action) {
 function pingEon(eon) {
   // console.warn("Pinging EON",eon);
   return new Promise((resolve,reject) => {
-    var session = ping.createSession();
+    try {
+      var session = ping.createSession();
 
-    session.pingHost(eon.ip, function pingEon(error, target) {
-      if (error) {
-        console.warn("No response from EON",error.toString());
-        reject(eon, "Could not ping EON...", error.toString());
-      } else {
-        resolve(true);
-        // console.warn("Response found for EON",eon);
-        session.close();
-      }
-    });
+      session.pingHost(eon.ip, function pingEon(error, target) {
+        if (error) {
+          console.warn("No response from EON",error.toString());
+          reject(eon, "Could not ping EON...", error.toString());
+        } else {
+          resolve(true);
+          // console.warn("Response found for EON",eon);
+          session.close();
+        }
+      });
+    } catch (e) {
+      console.warn("Cannot ping on this platform...");
+      resolve(true);
+    }
   });
 }
 
@@ -210,7 +198,7 @@ function* pingEons() {
   const { foundCount } = networkScanner;
   const { eons, unresolvedEons } = eonList;
   let eonKeys = Object.keys(eons);
-  rpc.emit('notify',{title: 'Workbench finished scanning!',body: `Found ${foundCount} EON on the network.`});
+  // rpc.emit('notify',{title: 'Workbench finished scanning!',body: `Found ${foundCount} EON on the network.`});
   // console.warn("Pinging EONS:",eonKeys);
   yield all(eonKeys.map(function * (key) {
     const eon = eons[key];

app/utils/default-shell.js

@@ -20,15 +20,14 @@ export default (() => {
   const env = process.env;
   let userShell;
   let shell;
-  
   if (userConfig && userConfig.shell && (userConfig.shell+'').length > 0) {
     return userConfig.shell;
   } else {
     if (process.platform === 'darwin') {
       shell = userShell || env.SHELL || '/bin/bash';
     } else if (process.platform === 'win32') {
       // Tests commands on the operating system and sets the userConfig to use that shell.
-      for (i = 0; i < windowsShells.length; i++) {
+      for (let i = 0; i < windowsShells.length; i++) {
         const testShell = windowsShells[i];
 
         if (shellExists(testShell)) {

package.json

@@ -266,7 +266,6 @@
     "node-cmd": "^3.0.0",
     "node-ssh": "^5.1.2",
     "popper.js": "^1.14.4",
-    "raw-loader": "^0.5.1",
     "react": "^16.4.1",
     "react-chartkick": "^0.3.0",
     "react-dom": "^16.4.1",

yarn.lock

@@ -11770,11 +11770,6 @@ [email protected]:
     iconv-lite "0.4.23"
     unpipe "1.0.0"
 
-raw-loader@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
-  integrity sha1-DD0L6u2KAclm2Xh793goElKpeao=
-
 raw-socket@*:
   version "1.6.4"
   resolved "https://registry.yarnpkg.com/raw-socket/-/raw-socket-1.6.4.tgz#adf3b0dbb6c2707386e6c13aca401240552067c1"