cross-spawn-cb 0.5.6 → 0.5.10

package/LICENSE

@@ -43,30 +43,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
----------------json-buffer-----------------------
-Copyright (c) 2013 Dominic Tarr
-
-Permission is hereby granted, free of charge,
-to any person obtaining a copy of this software and
-associated documentation files (the "Software"), to
-deal in the Software without restriction, including
-without limitation the rights to use, copy, modify,
-merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom
-the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 ---------------path-key-----------------------
 MIT License
 

package/lib/index.js

@@ -1,6 +1,4 @@
 require('./polyfills');
 module.exports = require('./spawnCallback');
 module.exports.sync = require('./spawnSyncCallback');
-
-var pathKey = require('./path-key');
-module.exports.pathKey = pathKey.default || pathKey;
+module.exports.pathKey = require('./path-key').default;

package/lib/spawn-sync/spawn-sync.js

@@ -5,76 +5,35 @@ var path = require('path');
 var fs = require('fs');
 var tmpdir = require('os').tmpdir || require('os-shim').tmpdir;
 var cp = require('child_process');
-var JSON = require('../json-buffer');
-var sleep = function () {};
+var JSON = require('json-buffer');
+var sleep = require('thread-sleep-compat');
+var suffix = require('temp-suffix')
 
-var temp = path.normalize(path.join(tmpdir(), 'spawn-sync'));
-
-function randomFileName(name) {
-  function randomHash(count) {
-    if (count === 1) return parseInt(16 * Math.random(), 10).toString(16);
-    else {
-      var hash = '';
-      for (var i = 0; i < count; i++) hash += randomHash(1);
-      return hash;
-    }
-  }
-
-  return temp + '_' + name + '_' + String(process.pid) + randomHash(20);
-}
-function unlink(filename) {
-  try {
-    fs.unlinkSync(filename);
-  } catch (ex) {
-    if (ex.code !== 'ENOENT') throw ex;
-  }
-}
-function tryUnlink(filename) {
-  // doesn't matter too much if we fail to delete temp files
+function unlinkSafe(filename) {
   try {
     fs.unlinkSync(filename);
   } catch (e) {}
 }
 
-function invoke(cmd) {
-  // location to keep flag for busy waiting fallback
-  var finished = randomFileName('finished');
-  unlink(finished);
-  if (process.platform === 'win32') {
-    cmd = cmd + '& echo "finished" > ' + finished;
-  } else {
-    cmd = cmd + '; echo "finished" > ' + finished;
-  }
-  cp.exec(cmd);
-
-  while (!fs.existsSync(finished)) {
-    // busy wait
-    sleep(200);
-  }
-
-  tryUnlink(finished);
-
-  return 0;
-}
-
-module.exports = spawnSyncFallback;
-function spawnSyncFallback(cmd, commandArgs, options) {
-  var args = [];
-  for (var i = 0; i < arguments.length; i++) {
-    args.push(arguments[i]);
-  }
+module.exports = function spawnSyncFallback(/*cmd, commandArgs, options*/) {
+  var args = Array.prototype.slice.call(arguments, 0);
 
-  // node.js script to run the command
-  var worker = path.normalize(__dirname + '/worker.js');
   // location to store arguments
-  var input = randomFileName('input');
-  var output = randomFileName('output');
-  unlink(output);
+  var temp = tmpdir();
+  var input = path.join(temp, suffix('ss-input'));
+  var output = path.join(temp, suffix('ss-output'));
 
   fs.writeFileSync(input, JSON.stringify(args));
-  invoke('"' + process.execPath + '" "' + worker + '" "' + input + '" "' + output + '"');
+  unlinkSafe(output);
+
+  var worker = path.normalize(__dirname + '/worker.js');
+  cp.exec('"' + process.execPath + '" "' + worker + '" "' + input + '" "' + output + '"');
+  while (!fs.existsSync(output)) {
+    // busy wait
+    sleep(200);
+  }
   var res = JSON.parse(fs.readFileSync(output, 'utf8'));
-  tryUnlink(input);
-  tryUnlink(output);
+  unlinkSafe(input);
+  unlinkSafe(output);
   return res;
 }

package/lib/spawn-sync/worker.js

@@ -5,56 +5,66 @@ require('../polyfills');
 
 var spawn = require('../cross-spawn').spawn;
 var fs = require('fs');
-var concat = require('concat-stream');
-var JSON = require('../json-buffer');
+var JSON = require('json-buffer');
 
 var inputFile = process.argv[2];
 var outputFile = process.argv[3];
 
-var args = JSON.parse(fs.readFileSync(inputFile, 'utf8'));
-function output(result) {
-  fs.writeFileSync(outputFile, JSON.stringify(result));
+function output(result) {  
+  fs.writeFile(outputFile+'.tmp', JSON.stringify(result), function() {
+    fs.rename(outputFile+'.tmp', outputFile, function() {
+      process.exit(0)
+    })
+  });
 }
 
-var child = spawn.apply(null, args);
-var options = args[2] && typeof args[2] === 'object' ? args[2] : args[1] && typeof args[1] === 'object' && !Array.isArray(args[1]) ? args[1] : {};
+fs.readFile(inputFile, 'utf8', function(err, contents) {
+  if (err) return output({ error: err.message });
+  var args = JSON.parse(contents);
+
+  var child = spawn.apply(null, args);
+  var options = args[2] && typeof args[2] === 'object' ? args[2] : args[1] && typeof args[1] === 'object' && !Array.isArray(args[1]) ? args[1] : {};
 
-var stdout, stderr;
-child.stdout &&
-  child.stdout.pipe(
-    concat(function (buf) {
-      stdout = buf.length ? buf : new Buffer(0);
+  var stdout, stderr;
+  if (child.stdout) {
+    stdout = [];
+    child.stdout.on('data', function(chunk) {
+      stdout.push(chunk);
     })
-  );
-child.stderr &&
-  child.stderr.pipe(
-    concat(function (buf) {
-      stderr = buf.length ? buf : new Buffer(0);
+  }
+  if (child.stderr) {
+    stderr = [];
+    child.stderr.on('data', function(chunk) {
+      stderr.push(chunk);
     })
-  );
-child.on('error', function (err) {
-  output({ pid: child.pid, error: err.message });
-});
-child.on('close', function (status, signal) {
-  if (options.encoding && options.encoding !== 'buffer') {
-    stdout = stdout.toString(options.encoding);
-    stderr = stderr.toString(options.encoding);
   }
-  output({
-    pid: child.pid,
-    output: [null, stdout, stderr],
-    stdout: stdout,
-    stderr: stderr,
-    status: status,
-    signal: signal,
+  child.on('error', function (err) {
+    output({ pid: child.pid, error: err.message });
   });
-});
+  child.on('close', function (status, signal) {
+    if (stdout) stdout = Buffer.concat(stdout)
+    if (stderr) stderr = Buffer.concat(stderr)
 
-if (options.timeout && typeof options.timeout === 'number') {
-  setTimeout(function () {
-    child.kill(options.killSignal || 'SIGTERM');
-  }, options.timeout);
-}
-if (options.input && (typeof options.input === 'string' || Buffer.isBuffer(options.input))) {
-  child.stdin.end(options.input);
-}
+    if (options.encoding && options.encoding !== 'buffer') {
+      stdout = stdout.toString(options.encoding);
+      stderr = stderr.toString(options.encoding);
+    }
+    output({
+      pid: child.pid,
+      output: [null, stdout, stderr],
+      stdout: stdout,
+      stderr: stderr,
+      status: status,
+      signal: signal,
+    });
+  });
+
+  if (options.timeout && typeof options.timeout === 'number') {
+    setTimeout(function () {
+      child.kill(options.killSignal || 'SIGTERM');
+    }, options.timeout);
+  }
+  if (options.input && (typeof options.input === 'string' || Buffer.isBuffer(options.input))) {
+    child.stdin.end(options.input);
+  }
+})

package/lib/spawnCallback.js

@@ -39,9 +39,10 @@ module.exports = function spawnCallback(command, args, options, callback) {
     if (err.code !== 'OK') return callback(err);
   });
 
-  cp.on('close', function close(status) {
+  cp.on('close', function close(status, signal) {
     nextTick(function closeNextTick() {
       result.status = status;
+      result.signal = signal;
       var err = result.status ? new Error('Non-zero exit code: ' + result.status) : null;
       if (result.stderr && result.stderr.length) {
         err = err || new Error('stderr has content');

package/lib/spawnSyncCallback.js

@@ -1,12 +1,13 @@
+var assign = require('just-extend');
 var spawnSync = require('./cross-spawn').sync;
 
 module.exports = function spawnSyncCallback(command, args, options) {
-  options = options || {};
-
-  var result = spawnSync(command, args, {
+  var syncOptions = assign({}, options || {}, {
+    env: options.env || process.env,
     stdio: 'pipe',
     encoding: 'utf-8',
   });
+  var result = spawnSync(command, args, syncOptions);
   if (result.stdout && (options.stdout === 'inherit' || options.stdio === 'inherit')) {
     process.stdout.write(result.stdout);
     result.stdout = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cross-spawn-cb",
-  "version": "0.5.6",
+  "version": "0.5.10",
   "description": "Cross spawn with a completion callback",
   "keywords": [
     "cross-spawn",
@@ -18,20 +18,21 @@
     "lint": "eslint .",
     "prepublishOnly": "dtd \"npm run lint\" \"depcheck\"",
     "test": "mocha-compat test/spec/**/*.test.js",
-    "test:engines": "nvu engines npm test",
     "build": "rollup -c config/rollup.pk.config.js && rollup -c config/rollup.cs.config.js"
   },
   "files": [
     "lib"
   ],
   "dependencies": {
-    "concat-stream": "^1.6.2",
     "cross-spawn": "^7.0.3",
+    "json-buffer": "^3.0.1",
     "just-extend": "^6.0.1",
     "next-tick": "^1.1.0",
     "object-keys": "^1.1.1",
     "once": "^1.4.0",
-    "os-shim": "^0.1.3"
+    "os-shim": "^0.1.3",
+    "temp-suffix": "^0.1.0",
+    "thread-sleep-compat": "^0.0.1"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.18.6",
@@ -40,15 +41,13 @@
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@typescript-eslint/parser": "^5.30.0",
     "depcheck": "^1.4.3",
-    "dis-dat": "^0.1.5",
+    "dis-dat": "^0.1.7",
     "eslint": "^8.18.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
     "mocha-compat": "^3.5.5",
-    "node-version-use": "^0.2.3",
     "prettier": "^2.7.1",
     "rollup": "^2.75.7",
     "rollup-plugin-babel": "^4.4.0",

package/lib/json-buffer/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2013 Dominic Tarr
-
-Permission is hereby granted, free of charge,
-to any person obtaining a copy of this software and
-associated documentation files (the "Software"), to
-deal in the Software without restriction, including
-without limitation the rights to use, copy, modify,
-merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom
-the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/lib/json-buffer/README.md

@@ -1 +0,0 @@
-Code based on https://github.com/dominictarr/json-buffer but adapted to be simpler to run in a purely node.js environment

package/lib/json-buffer/index.js

@@ -1,49 +0,0 @@
-'use strict';
-
-//TODO: handle reviver/dehydrate function like normal
-//and handle indentation, like normal.
-//if anyone needs this... please send pull request.
-
-exports.stringify = function stringify(o) {
-  if (o && Buffer.isBuffer(o)) return JSON.stringify(':base64:' + o.toString('base64'));
-
-  if (o && o.toJSON) o = o.toJSON();
-
-  if (o && 'object' === typeof o) {
-    var s = '';
-    var array = Array.isArray(o);
-    s = array ? '[' : '{';
-    var first = true;
-
-    for (var k in o) {
-      var ignore = 'function' == typeof o[k] || (!array && 'undefined' === typeof o[k]);
-      if (Object.hasOwnProperty.call(o, k) && !ignore) {
-        if (!first) s += ',';
-        first = false;
-        if (array) {
-          s += stringify(o[k]);
-        } else if (o[k] !== void 0) {
-          s += stringify(k) + ':' + stringify(o[k]);
-        }
-      }
-    }
-
-    s += array ? ']' : '}';
-
-    return s;
-  } else if ('string' === typeof o) {
-    return JSON.stringify(/^:/.test(o) ? ':' + o : o);
-  } else if ('undefined' === typeof o) {
-    return 'null';
-  } else return JSON.stringify(o);
-};
-
-exports.parse = function (s) {
-  return JSON.parse(s, function (key, value) {
-    if ('string' === typeof value) {
-      if (/^:base64:/.test(value)) return new Buffer(value.substring(8), 'base64');
-      else return /^:/.test(value) ? value.substring(1) : value;
-    }
-    return value;
-  });
-};