[WindowsUtils] Self rewrite, move to utils

src/updater/squirrelUpdate.js

@@ -18,7 +18,7 @@ var _path = _interopRequireDefault(require("path"));
 
 var autoStart = _interopRequireWildcard(require("../autoStart"));
 
-var windowsUtils = _interopRequireWildcard(require("./windowsUtils"));
+var windowsUtils = _interopRequireWildcard(require("../utils/windowsUtils"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 

src/updater/windowsUtils.js

@@ -1,82 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.spawn = spawn;
-exports.spawnReg = spawnReg;
-exports.addToRegistry = addToRegistry;
-
-var _child_process = _interopRequireDefault(require("child_process"));
-
-var _path = _interopRequireDefault(require("path"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const regExe = process.env.SystemRoot ? _path.default.join(process.env.SystemRoot, 'System32', 'reg.exe') : 'reg.exe'; // Spawn a command and invoke the callback when it completes with an error
-// and the output from standard out.
-
-function spawn(command, args, callback) {
-  let stdout = '';
-  let spawnedProcess;
-
-  try {
-    // TODO: contrary to below, it should not throw any error
-    spawnedProcess = _child_process.default.spawn(command, args);
-  } catch (err) {
-    // Spawn can throw an error
-    process.nextTick(() => {
-      if (callback != null) {
-        callback(err, stdout);
-      }
-    });
-    return;
-  } // TODO: we need to specify the encoding for the data if we're going to concat it as a string
-
-
-  spawnedProcess.stdout.on('data', data => {
-    stdout += data;
-  });
-  let err = null; // TODO: close event might not get called, we should
-  //       callback on error https://nodejs.org/api/child_process.html#child_process_event_error
-
-  spawnedProcess.on('error', err => {
-    // TODO: there should always be an error
-    if (err != null) {
-      err = err;
-    }
-  }); // TODO: don't listen to close, but listen to exit instead
-
-  spawnedProcess.on('close', (code, signal) => {
-    if (err === null && code !== 0) {
-      err = new Error('Command failed: ' + (signal || code));
-    }
-
-    if (err != null) {
-      err.code = err.code || code;
-      err.stdout = err.stdout || stdout;
-    }
-
-    if (callback != null) {
-      callback(err, stdout);
-    }
-  });
-} // Spawn reg.exe and callback when it completes
-
-
-function spawnReg(args, callback) {
-  return spawn(regExe, args, callback);
-} // TODO: since we're doing this one by one, we could have a more graceful way of processing the queue
-//       rather than mutating the array
-
-
-function addToRegistry(queue, callback) {
-  if (queue.length === 0) {
-    return callback && callback();
-  }
-
-  const args = queue.shift();
-  args.unshift('add');
-  args.push('/f');
-  return spawnReg(args, () => addToRegistry(queue, callback));
-}

src/utils/windowsUtils.js

@@ -0,0 +1,48 @@
+const child_process = require('child_process');
+const { join } = require('path');
+
+const regExePath = process.env.SystemRoot ? join(process.env.SystemRoot, 'System32', 'reg.exe') : 'reg.exe';
+
+const spawn = (cmd, args, callback = (() => {})) => {
+  const stdout = '';
+  let process;
+
+  try {
+    process = child_process.spawn(cmd, args);
+  } catch (e) {
+    callback(e, stdout);
+  }
+
+  process.stdout.on('data', data => {
+    stdout += data;
+  });
+
+  proocess.on('error', err => { callback(err, stdout); });
+
+  process.on('exit', (code, signal) => {
+    let err = null;
+    if (code !== 0) {
+      err = new Error('Command failed: ' + (signal || code));
+
+      err.code = err.code || code;
+      err.stdout = err.stdout || stdout;
+    }
+
+    callback(err, stdout);
+  });
+};
+
+const spawnReg = (args, callback) => spawn(regExePath, args, callback);
+
+const addToRegistry = (queue, callback) => {
+  if (queue.length === 0) {
+    return callback && callback();
+  }
+
+  const args = queue.shift();
+  args.unshift('add');
+  args.push('/f');
+  return spawnReg(args, () => addToRegistry(queue, callback));
+};
+
+module.exports = { spawn, spawnReg, addToRegistry };