Remove ShowVer.exe

.travis.yml

@@ -2,7 +2,7 @@ sudo: true
 language: node_js
 
 node_js: 
-  - 10
+  - 14
 
 matrix:
   include:
@@ -12,6 +12,13 @@ matrix:
         chrome: stable
     - os: osx
       osx_image: xcode10.1
-
-
-
+    - os: windows
+      addons:
+        firefox: latest
+      before_install:
+        - choco install googlechrome --acceptlicense --yes --no-progress --ignore-checksums
+        - export PATH=$PATH:"${TRAVIS_BUILD_DIR}/node_modules/.bin"
+      env:
+        - YARN_GPG=no
+      after_success:
+        - tasklist

Gruntfile.js

@@ -6,7 +6,8 @@ module.exports = function (grunt) {
     simplemocha: {
       options: {
         timeout: 600000,
-        reporter: 'spec'
+        reporter: 'spec',
+        path: process.env.PWD
       },
       all: { src: ['test/**/*.js'] }
     },

lib/local/instance.js

@@ -1,5 +1,4 @@
 var path = require('path');
-var spawn = require("child_process").spawn;
 var exec = require("child_process").exec;
 var execFile = require("child_process").execFile;
 var EventEmitter = require('events').EventEmitter;
@@ -38,11 +37,18 @@ var Instance = function (cmd, args, settings, options) {
   this.options = options || {};
   var self = this;
 
-  var childProcess = args === null ? exec(cmd, settings || {}) : spawn(cmd, args, settings || {});
+  var childProcess = args === null ?
+    exec(cmd, settings || {}) :
+    execFile(cmd, args, settings || { shell: !!options.subshell });
 
-  debug( (args === null ? 'exec' : 'spawn') + ' child process with process id',
+  debug( (args === null ? 'exec' : 'execFile') + ' child process with process id',
     childProcess.pid, cmd, args);
 
+  childProcess.on('error', function(error) {
+      debug("error caught", error);
+      self.emit('exit', { code: error.status, signal: 15 });
+  });
+
   childProcess.on('exit', function (code, signal) {
     self.emit('stop', {
       code: code,
@@ -103,10 +109,13 @@ Instance.prototype.stop = function (callback) {
       execFile('osascript', ['-e', command]);
     } else if (process.platform === 'win32') {
       //Adding `"` wasn't safe/functional on Win systems
-      command = 'taskkill /IM ' + (this.options.imageName || path.basename(this.cmd)); 
-      debug('Executing shutdown taskkil', command);
-      command = command.split(' ');
-      execFile(command[0], command.slice(1)).once('exit', function(data) {
+      debug('Executing shutdown taskkill on', this.options.imageName || path.basename(this.cmd));
+      execFile(
+        'taskkill',
+        (this.options.forceKill ? ['/F'] : []).concat(
+           ['/IM', this.options.imageName || path.basename(this.cmd)]
+        )
+      ).once('exit', function(data) {
         self.emit('stop', data);
       });
     } else {

lib/local/platform/windows.js

@@ -1,9 +1,10 @@
+
 var os = require('os');
 var fs = require('fs');
 var path = require('path');
 //Windows 64bits "Program Files"
 //Windows 32bits "Program Files x86"
-var programFiles = os.arch() === "x64" ? process.env.ProgramFiles : process.env["ProgramFiles(x86)"];
+var programFiles = os.arch() === "x64" ? process.env.ProgramFiles : ( process.env["ProgramFiles(x86)"] || process.env.ProgramFiles );
 var cwd = path.normalize(programFiles);
 var appData = appData || process.env.APPDATA;
 
@@ -50,18 +51,24 @@ module.exports = {
   electron: {
     defaultLocation: path.join(process.cwd(), 'node_modules', '.bin', 'electron.cmd'),
     pathQuery: 'dir /s /b electron.exe',
+    imageName: 'electron.exe',
     args: [path.join(__dirname, '..', '..', '..', 'resources', 'electron.js')],
     multi: true,
+    subshell: true,
+    forceKill: true,
     cwd: cwd
   },
   phantom: {
     defaultLocation: [
       path.join(process.cwd(), 'node_modules', '.bin', 'phantomjs'),
       path.join(programFiles, 'phantomjs', 'phantomjs.exe')
     ],
-    pathQuery: 'dir /s /b phantomjs.exe',
+    imageName: 'phantomjs.exe',
     args: [path.join(__dirname, '..', '..', '..', 'resources', 'phantom.js')],
+    pathQuery: 'dir /s /b phantomjs.exe',
     multi: true,
+    subshell: true,
+    forceKill: true,
     cwd: cwd
   },
   nodeWebkit: {

lib/local/version.js

@@ -22,24 +22,26 @@ module.exports = function(browser) {
     return Q(null);
   }
 
-  // Run ShowVer.exe and parse out ProductVersion key (Windows)
+  // Use WMIC to get browser version
   if (process.platform === 'win32') {
-    var command = path.join('"' + __dirname, '..', '..', 'resources', 'ShowVer.exe" "' + browser.command + '"');
     var deferred = Q.defer();
+    PromiseExec('wmic datafile where "name=\'' + browser.command.replace(/\\/gi, '\\\\') + '\'" get version')
+      .then(function (exeVersion) {
+        var versionSplit = exeVersion.stdout.split('\n');
+        var versionString = versionSplit[1].trim();
+        var regex = /\s*(.*)/;
+        if (typeof versionString === 'string' && regex.test(versionString)) {
+          browser.version = versionString;
+          debug('Found browser version', browser.name, browser.version);
+        } else {
+          debug("Did not find browser version", browser.name);
+        }
 
-    debug('Retrieving version for windows executable', command);
-    // Can't use Q.nfcall here unfortunately because of non 0 exit code
-    execFile(command.split(' ')[0], command.split(' ').slice(1), function(error, stdout) {
-      var regex = /ProductVersion:\s*(.*)/;
-      // ShowVer.exe returns a non zero status code even if it works
-      if (typeof stdout === 'string' && regex.test(stdout)) {
-        browser.version = stdout.match(regex)[1];
-        debug('Found browser version', browser.name, browser.version);
-      }
-
-      return deferred.resolve(browser);
+        return deferred.resolve(browser);
+    }, function(error) {
+       debug("error when getting browser version for", browser.name);
+       return deferred.reject(error);
     });
-
     return deferred.promise;
   }
 
@@ -69,3 +71,36 @@ module.exports = function(browser) {
     return browser;
   });
 };
+
+/**
+ * @param {string} app command to execute
+ * @returns {Promise<{stdout:string, stderr:string, code:number}>}
+ */
+function PromiseExec(app) {
+  var deferred = Q.defer();
+  var child = execFile(app.split(' ')[0], app.split(' ').slice(1), { shell: true });
+  var stdout = '';
+  var stderr = '';
+
+  debug("about to exec", app);
+
+  child.addListener('error', function(error) {
+    debug("error caught in PromiseExec", error);
+    deferred.reject(error);
+  });
+
+  child.stdout.on('data', function (data) {
+      stdout += data;
+  });
+
+  child.stderr.on('data', function (data) {
+      stderr += data;
+  });
+
+  child.addListener('exit', function (code) {
+    debug("PromiseExec: app exited with code", code, ":", app);
+    deferred.resolve({ stdout: stdout, stderr: stderr, code: code} );
+  });
+
+  return deferred.promise;
+}