node-install-release 0.3.6 → 0.3.9

package/bin/node-install-release.js

@@ -2,7 +2,6 @@
 
 var getopts = require('getopts-compat');
 var exit = require('exit');
-var assign = require('just-extend');
 var nir = require('..');
 
 (function () {
@@ -23,7 +22,7 @@ var nir = require('..');
   }
 
   var installPath = args.length > 1 ? args[1] : null;
-  nir(args[0], installPath, assign({ stdio: 'inherit' }, options), function (err, results) {
+  nir(args[0], installPath, Object.assign({ stdio: 'inherit' }, options), function (err, results) {
     if (err) {
       console.log(err.message);
       return exit(err.code || -1);

package/lib/arch.js

@@ -1,14 +1,72 @@
-function arch() {
-  var execSync = require('child_process').execSync;
+// Inline until merged: https://github.com/jakejarvis/arch/blob/detect-arm/index.js
 
+/*! arch. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
+var cp = require('child_process');
+var fs = require('fs');
+var path = require('path');
+
+/**
+ * Returns the operating system's CPU architecture. This is different than
+ * `process.arch` or `os.arch()` which returns the architecture the Node.js (or
+ * Electron) binary was compiled for.
+ */
+module.exports = function arch() {
+  /**
+   * On macOS, we need to detect if x64 Node is running because the CPU is truly
+   * an Intel chip, or if it's running on Apple Silicon via Rosetta 2:
+   * https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment
+   */
+  if (process.platform === 'darwin') {
+    var nativeArm = process.arch === 'arm64';
+    var rosettaArm = cp.execSync('sysctl -in sysctl.proc_translated', { encoding: 'utf8' }) === '1\n';
+
+    return nativeArm || rosettaArm ? 'arm64' : 'x64';
+  }
+
+  /**
+   * On Windows, the most reliable way to detect a 64-bit OS from within a 32-bit
+   * app is based on the presence of a WOW64 file: %SystemRoot%\SysNative.
+   * See: https://twitter.com/feross/status/776949077208510464
+   */
+  if (process.platform === 'win32') {
+    var useEnv = false;
+    try {
+      useEnv = !!(process.env.SYSTEMROOT && fs.statSync(process.env.SYSTEMROOT));
+    } catch (err) {}
+
+    var sysRoot = useEnv ? process.env.SYSTEMROOT : 'C:\\Windows';
+
+    // If %SystemRoot%\SysNative exists, we are in a WOW64 FS Redirected application.
+    var isWOW64 = false;
+    try {
+      isWOW64 = !!fs.statSync(path.join(sysRoot, 'sysnative'));
+    } catch (err) {}
+
+    return isWOW64 ? 'x64' : 'x86';
+  }
+
+  /**
+   * On Linux, use the `getconf` command to get the architecture.
+   */
   if (process.platform === 'linux') {
     try {
-      var stdout = execSync('uname -a').toString('utf8');
-      if (~stdout.indexOf('raspberrypi')) return 'arm-pi';
+      var output1 = cp.execSync('uname -a', { encoding: 'utf8' });
+      if (~output1.indexOf('raspberrypi')) return 'arm-pi';
     } catch (err) {}
+
+    var output = cp.execSync('getconf LONG_BIT', { encoding: 'utf8' });
+    return output === '64\n' ? 'x64' : 'x86';
   }
 
-  return require('arch')();
-}
+  /**
+   * The running binary is 64-bit, so the OS is clearly 64-bit.
+   */
+  if (process.arch === 'x64') {
+    return 'x64';
+  }
 
-module.exports = arch();
+  /**
+   * If none of the above, assume the architecture is 32-bit.
+   */
+   return 'x86';
+};

package/lib/conditionalCache.js

@@ -1,6 +1,5 @@
 var path = require('path');
 var get = require('get-remote');
-var assign = require('just-extend');
 var access = require('fs-access-compat');
 
 var progress = require('./progress');
@@ -20,7 +19,7 @@ module.exports = function conditionalCache(endpoint, dest, options, callback) {
       if (err) return callback(err);
 
       // TODO: do I need assign?
-      get(endpoint, assign({ filename: path.basename(dest), progress: progress, time: 1000 }, options)).file(path.dirname(dest), function (err) {
+      get(endpoint, Object.assign({ filename: path.basename(dest), progress: progress, time: 1000 }, options)).file(path.dirname(dest), function (err) {
         console.log('');
         callback(err);
       });

package/lib/conditionalExtract.js

@@ -1,17 +1,18 @@
 var path = require('path');
 var extract = require('fast-extract');
 var mkpath = require('mkpath');
-var assign = require('just-extend');
 var access = require('fs-access-compat');
 
 var progress = require('./progress');
 
 var major = +process.versions.node.split('.')[0];
 var minor = +process.versions.node.split('.')[1];
-var call = require('node-version-call');
 var callExtract = __dirname + '/callExtract.js'; // eslint-disable-line n/no-path-concat
 
+var call = null; // remove dependency
 module.exports = function conditionalExtract(src, dest, options, callback) {
+  if (!call) call = require('node-version-call'); // remove dependency
+
   if (typeof options === 'function') {
     callback = options;
     options = null;
@@ -22,7 +23,7 @@ module.exports = function conditionalExtract(src, dest, options, callback) {
     if (!err) return callback(); // already exists
 
     mkpath(path.dirname(dest), function () {
-      var extractOptions = assign({ strip: 1, progress: progress, time: 1000 }, options);
+      var extractOptions = Object.assign({ strip: 1, progress: progress, time: 1000 }, options);
 
       // TODO: yauzl does not read the master record properly on Node 0.8
       if (major === 0 && minor <= 8 && path.extname(src) === '.zip') {

package/lib/index.js

@@ -1,3 +1,4 @@
+require('./polyfills');
 var install = require('./install');
 
 function installRelease(versionDetails, dest, options, callback) {

package/lib/install.js

@@ -1,7 +1,7 @@
 var path = require('path');
 var Queue = require('queue-cb');
 var mkpath = require('mkpath');
-var assign = require('just-extend');
+
 var resolveVersions = require('node-resolve-versions');
 
 var installVersion = require('./installVersion');
@@ -16,7 +16,7 @@ var DEFAULT_OPTIONS = {
 };
 
 module.exports = function install(versionDetails, dest, options, callback) {
-  options = assign({}, DEFAULT_OPTIONS, options, { path: 'raw' });
+  options = Object.assign({}, DEFAULT_OPTIONS, options, { path: 'raw' });
   resolveVersions(versionDetails, options, function (err, versions) {
     if (err) return callback(err);
     if (!versions.length) return callback(new Error('Could not resolve versions for: ' + JSON.stringify(versionDetails)));

package/lib/installNode/filenames.js

@@ -1,4 +1,4 @@
-var systemArch = require('../arch');
+var osArch = require('os').arch || require('../arch');
 
 var PLATFORM_OS = {
   win32: 'win',
@@ -13,14 +13,19 @@ var PLATFORM_FILES = {
 module.exports = function prebuiltFilenames(options) {
   var platform = options.platform || process.platform;
   var os = PLATFORM_OS[platform] || platform;
-  var arch = options.arch || systemArch;
+  var archs = [options.arch || osArch()];
+  if (platform === 'darwin' && archs[0] === 'arm64') archs.push('x64'); // fallback
 
   var files = PLATFORM_FILES[platform];
-  if (typeof files === 'undefined') return [os + '-' + arch];
-
   var results = [];
-  for (var index = 0; index < files.length; index++) {
-    results.push(os + '-' + arch + '-' + files[index]);
+  for (var i = 0; i < archs.length; i++) {
+    if (typeof files === 'undefined') {
+      results.push(os + '-' + archs[i]);
+    } else {
+      for (var j = 0; j < files.length; j++) {
+        results.push(os + '-' + archs[i] + '-' + files[j]);
+      }
+    }
   }
   return results;
 };

package/lib/installNode/installCompressed.js

@@ -1,5 +1,4 @@
 var path = require('path');
-var assign = require('just-extend');
 
 var conditionalCache = require('../conditionalCache');
 var conditionalExtract = require('../conditionalExtract');
@@ -11,7 +10,7 @@ module.exports = function installCompressed(relativePath, dest, record, options,
 
   conditionalCache(downloadPath, cachePath, function (err) {
     if (err) return callback(err);
-    conditionalExtract(cachePath, dest, assign({ strip: 1, progress: progress, time: 1000 }, options), function (err) {
+    conditionalExtract(cachePath, dest, Object.assign({ strip: 1, progress: progress, time: 1000 }, options), function (err) {
       console.log('');
       callback(err);
     });

package/lib/polyfills/execCallback.js

@@ -0,0 +1,5 @@
+var cp = require('child_process');
+
+module.exports = function execCallback(cmd, options, callback) {
+  return cp.exec(cmd, options, callback);
+};

package/lib/polyfills/index.js

@@ -0,0 +1,14 @@
+require('core-js/actual/object/assign');
+require('core-js/actual/promise');
+
+var cp = require('child_process');
+if (!cp.execSync) {
+  var execCallback = __dirname + '/execCallback.js'; // eslint-disable-line n/no-path-concat
+
+  var functionExec = null; // break dependencies
+  cp.execSync = function execSyncPolyfill(cmd, options) {
+    if (!functionExec) functionExec = require('function-exec-sync');
+
+    return functionExec({ callbacks: true }, execCallback, cmd, options || {});
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-install-release",
-  "version": "0.3.6",
+  "version": "0.3.9",
   "description": "Cross-platform solution for installing releases of Node.js",
   "keywords": [
     "node",
@@ -32,23 +32,23 @@
     "test:engines": "nvu engines npm test"
   },
   "dependencies": {
-    "arch": "^2.2.0",
-    "cross-spawn-cb": "^0.6.6",
+    "core-js": "^3.24.1",
+    "cross-spawn-cb": "^0.6.7",
     "end-with": "^1.0.2",
     "exit": "^0.1.2",
     "fast-extract": "^0.3.4",
     "fs-access-compat": "^1.0.3",
+    "function-exec-sync": "^0.2.4",
     "get-remote": "^0.7.5",
     "getopts-compat": "^2.2.5",
     "isarray": "^2.0.5",
-    "just-extend": "^6.0.1",
     "lodash.find": "^4.6.0",
     "lodash.keys": "^4.2.0",
     "match-semver": "^0.1.1",
     "mkpath": "^1.0.0",
     "node-filename-to-dist-paths": "^0.1.13",
     "node-resolve-versions": "^0.3.2",
-    "node-version-call": "^0.3.1",
+    "node-version-call": "^0.3.2",
     "osenv": "^0.1.5",
     "pump": "^3.0.0",
     "queue-cb": "^1.1.7",
@@ -56,10 +56,10 @@
     "single-line-log2": "^1.1.3"
   },
   "devDependencies": {
-    "@typescript-eslint/parser": "^5.30.7",
+    "@typescript-eslint/parser": "^5.31.0",
     "cr": "^0.1.0",
     "depcheck": "^1.4.3",
-    "eslint": "^8.20.0",
+    "eslint": "^8.21.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.26.0",
@@ -67,7 +67,7 @@
     "fs-access-sync-compat": "^1.0.2",
     "is-version": "^0.2.1",
     "mocha-compat": "^3.5.5",
-    "node-version-utils": "^0.5.2",
+    "node-version-utils": "^0.5.4",
     "prettier": "^2.7.1"
   },
   "engines": {