node-bin-gen 9.0.4 → 11.0.0

package/README.md

@@ -11,7 +11,7 @@ $ npm install -g node-bin-gen
 # Use
 
 ```bash
-$ node-bin-gen {node,iojs} version [pre]
+$ node-bin-gen version [pre]
 ```
 
 Use a `pre` version if you're testing.
@@ -20,7 +20,7 @@ Use a `pre` version if you're testing.
 
 Warning: requires `npm@>=3` to install the generated packages globally!
 
-This package generates a `node-bin` or `iojs-bin` package, and all of the `node-{os}-{cpu}` packages, which are installed by the main metapackage (and as a hack, added to the `package.json` of `node-bin` at install time as a dependency to keep npm from marking it extraneous..
+This package generates a `node` package, and all of the `node-{os}-{cpu}` packages, which are installed by the main metapackage (and as a hack, added to the `package.json` of `node` at install time as a dependency to keep npm from marking it extraneous..
 
 # License
 

package/index.js

@@ -1,216 +1,281 @@
 #!/usr/bin/env node
-"use strict"
-
-const fs = require('fs')
-const path = require('path')
-const os = require('os')
-const util = require('util')
-const execFile = util.promisify(require('child_process').execFile)
-const unlink = util.promisify(fs.unlink)
-const mkdir = util.promisify(fs.mkdir)
-const writeFile = util.promisify(fs.writeFile)
-const readFile = util.promisify(fs.readFile)
-
-const fetch = require('make-fetch-happen').defaults({
-  cacheManager: path.resolve(os.homedir(), '.node-bin-gen-cache')
-})
-
-const VError = require('verror')
-const rimraf = util.promisify(require('rimraf'))
-const zlib = require('zlib')
-const { spawn } = require('child_process')
-const yargs = require('yargs')
-const pump = util.promisify(require('pump'))
-const debug = require('util').debuglog('node-bin-gen')
-const eos = util.promisify(require('end-of-stream'))
-
-yargs.option('skip-binaries', { describe: 'Skip downloading the binaries', boolean: true })
-yargs.option('only', { describe: 'Only download this binary package' })
-yargs.option('package-name', { alias: 'n', describe: 'Use this as the main package name', default: 'node' })
-yargs.version()
-yargs.demandCommand(1, 2, 'You must specify version, and optionally a prerelease')
-yargs.help('help').wrap(76)
-
-const argv = yargs.argv
-
-const versionprime = argv._[0]
-const pre = argv._[1]
+"use strict";
+
+import { open, unlink, mkdir, writeFile, readFile } from "node:fs/promises";
+import { Writable, Transform } from "node:stream";
+import { join, resolve, dirname } from "node:path";
+import { promisify, debuglog } from "node:util";
+import { execFile, spawn } from "node:child_process";
+import { fileURLToPath } from "url";
+
+import verr from "verror";
+import rimrafcb from "rimraf";
+import zlib from "zlib";
+import yargs from "yargs";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const { VError } = verr;
+const rimraf = promisify(rimrafcb);
+
+const argparser = yargs(process.argv.slice(2));
+argparser.option("skip-binaries", {
+  describe: "Skip downloading the binaries",
+  boolean: true,
+});
+argparser.option("only", { describe: "Only download this binary package" });
+argparser.option("package-name", {
+  alias: "n",
+  describe: "Use this as the main package name",
+  default: "node",
+});
+argparser.option("verbose", { describe: "output messages" });
+argparser.version();
+argparser.demandCommand(
+  1,
+  2,
+  "You must specify version, and optionally a prerelease"
+);
+argparser.help("help").wrap(76);
+
+const argv = argparser.argv;
+
+const versionprime = argv._[0];
+const pre = argv._[1];
 
 if (!versionprime) {
-  console.warn("Use: " + argv.$0 + " version [pre]")
-  process.exit(1)
-  return
+  console.warn("Use: " + argv.$0 + " version [pre]");
+  process.exit(1);
 }
 
-const version = (versionprime[0] != 'v') ? 'v' + versionprime : version
+const ndebug = debuglog("node-bin-gen");
+function debug(...args) {
+  if (argv.verbose) {
+    console.warn(...args);
+  }
+  ndebug(...args);
+}
+
+const version = versionprime[0] != "v" ? "v" + versionprime : version;
 
 async function buildArchPackage(os, cpu, version, pre) {
-  debug("building architecture specific package", os, cpu, version, pre)
+  debug("building architecture specific package", os, cpu, version, pre);
 
-  const platform = os == 'win' ? 'win32' : os
-  const arch = os == 'win' && cpu == 'ia32' ? 'x86' : cpu
-  const executable = os == 'win' ? 'bin/node.exe' : 'bin/node'
+  const platform = os == "win" ? "win32" : os;
+  const arch = os == "win" && cpu == "ia32" ? "x86" : cpu;
+  const executable = os == "win" ? "bin/node.exe" : "bin/node";
 
-  const dir = "node-" + os + '-' + cpu
-  const base = "node-" + version + "-" + os + "-" + cpu
-  const filename = base + (os == 'win' ? '.zip' : ".tar.gz")
+  const dir = "node-" + os + "-" + cpu;
+  const base = "node-" + version + "-" + os + "-" + cpu;
+  const filename = base + (os == "win" ? ".zip" : ".tar.gz");
   const pkg = {
-    name: 'node' + "-" + os + "-" + cpu,
-    version: version + (pre != null ? '-' + pre : ''),
-    description: 'node',
+    name:
+      (os == "darwin" && cpu == "arm64" ? "node-bin" : "node") +
+      "-" +
+      os +
+      "-" +
+      cpu,
+    version: version + (pre != null ? "-" + pre : ""),
+    description: "node",
     bin: {
-      node: executable
+      node: executable,
     },
     files: [
-      os == 'win' ? 'bin/node.exe' : 'bin/node',
-      'share',
-      'include',
-      '*.md',
-      'LICENSE'
+      os == "win" ? "bin/node.exe" : "bin/node",
+      "share",
+      "include",
+      "*.md",
+      "LICENSE",
     ],
     os: platform,
-    cpu: arch
-  }
+    cpu: arch,
+  };
+
+  debug("removing", dir);
+  await rimraf(dir, { glob: false });
+  await mkdir(dir).catch((e) => {
+    if (e.code != "EEXIST") throw e;
+  });
+
+  const url =
+    "https://nodejs.org" +
+    (/rc/.test(version)
+      ? "/download/rc/"
+      : /test/.test(version)
+      ? "/download/test/"
+      : "/dist/") +
+    version +
+    "/" +
+    filename;
+
+  debug("Fetching", url);
+
+  const res = await fetch(url);
 
-  debug('removing', dir)
-  await rimraf(dir, { glob: false })
-  await mkdir(dir).catch(e => {
-      if (e.code != 'EEXIST') throw e
-    })
+  if (res.status != 200 && res.status != 304) {
+    throw new VError("not ok: fetching %j got status code %s", url, res.status);
+  }
 
-  const url = "https://nodejs.org" + (
-    /rc/.test(version) ? "/download/rc/" :
-    /test/.test(version) ? "/download/test/" :
-    "/dist/"
-  ) + version + "/" + filename
+  debug("Unpacking into", dir);
 
-  debug("Fetching", url)
+  if (os == "win") {
+    const f = await open(filename, "w");
 
-  const res = await fetch(url)
+    await res.body.pipeTo(Writable.toWeb(f.createWriteStream()));
+    f.close();
 
-  if (res.status != 200 && res.status != 304) {
-    throw new VError("not ok: fetching %j got status code %s", url, res.status)
-  }
+    const running = execFile("unzip", [
+      "-d",
+      `${dir}/bin`,
+      "-o",
+      "-j",
+      filename,
+      `${base}/node.exe`,
+    ]);
 
-  debug("Unpacking into", dir)
+    await new Promise((y, n) => {
+      running.on("error", n);
+      running.on("exit", y);
+    });
+    await unlink(filename);
+  } else {
+    const c = spawn("tar", ["--strip-components=1", "-C", dir, "-x"], {
+      stdio: ["pipe", process.stdout, process.stderr],
+    });
 
-  if (os == 'win') {
-    const f = fs.createWriteStream(filename)
-    const written = pump(res.body, f)
-    const closed = eos(f)
+    const unzip = Transform.toWeb(zlib.createGunzip());
 
-    await Promise.all([written, closed])
-    await execFile('unzip', ['-d', `${dir}/bin`, '-o', '-j', filename, `${base}/node.exe` ])
-    await unlink(filename)
-  } else {
-    const c = spawn('tar', ['--strip-components=1', '-C', dir, '-x'], {
-      stdio: [ 'pipe', process.stdout, process.stderr ]
-    })
-    await pump(res.body, zlib.createGunzip(), c.stdin)
+    await res.body.pipeThrough(unzip).pipeTo(Writable.toWeb(c.stdin));
   }
 
-  await writeFile(path.join(dir, 'package.json'), JSON.stringify(pkg, null, 2))
-  return pkg
+  await writeFile(join(dir, "package.json"), JSON.stringify(pkg, null, 2));
+  return pkg;
 }
 
 async function fetchManifest(version) {
-  const base = 'http://nodejs.org'
+  const base = "http://nodejs.org";
   const url = (function () {
     if (/rc/.test(version)) {
-      return `${base}/download/rc/index.json`
+      return `${base}/download/rc/index.json`;
     } else if (/test/.test(version)) {
-      return `${base}/download/test/index.json`
+      return `${base}/download/test/index.json`;
     } else {
-      return `${base}/dist/index.json`
+      return `${base}/dist/index.json`;
     }
-  })()
-  const res = await fetch(url)
-  return res.json()
+  })();
+  const res = await fetch(url);
+  return res.json();
 }
 
-main().catch(err => {
-  console.warn(err.stack)
-  process.exit(1)
-})
+main().catch((err) => {
+  console.warn(err.stack);
+  process.exit(1);
+});
 
 async function main() {
+  const manifest = argv["skip-binaries"] ? [] : await fetchManifest(version);
 
-  const manifest = argv['skip-binaries'] ? [] : await fetchManifest(version)
-
-  const v = manifest.filter(function(ver) {
-    return ver.version == version
-  }).shift()
+  const v = manifest
+    .filter(function (ver) {
+      return ver.version == version;
+    })
+    .shift();
 
   if (!v) {
-    throw new VError("No such version '%s'", version)
+    throw new VError("No such version '%s'", version);
   }
-  debug("manifest", v)
+  debug("manifest", v);
 
   if (!v.files || !v.files.length) {
-    debug("No files, defaulting")
-    v.files =  ['darwin-x64', 'linux-arm64', 'linux-armv7l', 'linux-ppc64', 'linux-ppc64le', 'linux-s390x', 'linux-x64', 'linux-x86', 'sunos-x64', 'win-x64', 'win-x86']
+    debug("No files, defaulting");
+    v.files = [
+      "darwin-x64",
+      "darwin-arm64",
+      "linux-arm64",
+      "linux-armv7l",
+      "linux-ppc64",
+      "linux-ppc64le",
+      "linux-s390x",
+      "linux-x64",
+      "linux-x86",
+      "sunos-x64",
+      "win-x64",
+      "win-x86",
+    ];
   }
 
-  const files = argv.only ? [argv.only] : v.files
+  const files = argv.only ? [argv.only] : v.files;
 
-  const binaries = files.filter(function(f) {
-    return !/^headers|^src/.test(f) && !/pkg$/.test(f) && !/^win-...-(exe|msi|7z)/.test(f)
-  }).map(function(f) {
-    const bits = f.split('-')
-    return {
-      os: bits[0].replace(/^osx$/, 'darwin'),
-      cpu: bits[1],
-      format: bits[2] || 'tar.gz'
-    }
-  })
+  const binaries = files
+    .filter(function (f) {
+      return (
+        !/^headers|^src/.test(f) &&
+        !/pkg$/.test(f) &&
+        !/^win-...-(exe|msi|7z)/.test(f)
+      );
+    })
+    .map(function (f) {
+      const bits = f.split("-");
+      return {
+        os: bits[0].replace(/^osx$/, "darwin"),
+        cpu: bits[1],
+        format: bits[2] || "tar.gz",
+      };
+    });
 
-  await Promise.all(binaries.map(v => buildArchPackage(v.os, v.cpu, version, pre)))
+  await Promise.all(
+    binaries.map((v) => buildArchPackage(v.os, v.cpu, version, pre))
+  );
 
-  const pkg = buildMetapackage(version + (pre != null ? '-' + pre : ''))
+  const pkg = await buildMetapackage(version + (pre != null ? "-" + pre : ""));
 
   try {
-    await mkdir(pkg.name)
-  } catch(err) {
-    if (err && err.code != 'EEXIST') {
-      throw err
+    await mkdir(pkg.name);
+  } catch (err) {
+    if (err && err.code != "EEXIST") {
+      throw err;
     }
   }
 
-  const script = `require('node-bin-setup')("${pkg.version}", require)`
+  const script = `require('node-bin-setup')("${pkg.version}", require)`;
 
   await Promise.all([
-    readFile(path.resolve(__dirname, 'node-bin-README.md'), 'utf8')
-      .then(readme => writeFile(path.resolve(pkg.name, 'README.md'), readme.replace(/\$\{packagename\}/g, pkg.name))),
-    writeFile(path.resolve(pkg.name, 'package.json'), JSON.stringify(pkg, null, 2)),
-    writeFile(path.resolve(pkg.name, 'installArchSpecificPackage.js'), script)
-  ])
+    readFile(resolve(__dirname, "node-bin-README.md"), "utf8").then((readme) =>
+      writeFile(
+        resolve(pkg.name, "README.md"),
+        readme.replace(/\$\{packagename\}/g, pkg.name)
+      )
+    ),
+    writeFile(resolve(pkg.name, "package.json"), JSON.stringify(pkg, null, 2)),
+    writeFile(resolve(pkg.name, "installArchSpecificPackage.js"), script),
+  ]);
 }
 
-function buildMetapackage(version) {
+async function buildMetapackage(version) {
   const pkg = {
-    "name": argv['package-name'],
-    "version": version.replace(/^v/, ''),
-    "description": "node",
-    "main": "index.js",
-    "keywords": [
-      "runtime"
-    ],
-    "repository": require('./package.json').repository,
-    "scripts": {
-      "preinstall": "node installArchSpecificPackage"
+    name: argv["package-name"],
+    version: version.replace(/^v/, ""),
+    description: "node",
+    main: "index.js",
+    keywords: ["runtime"],
+    repository: JSON.parse(await readFile(`${__dirname}/package.json`))
+      .repository,
+    scripts: {
+      preinstall: "node installArchSpecificPackage",
     },
-    "bin": {
-      "node": "bin/node"
+    bin: {
+      node: "bin/node",
     },
-    "dependencies": {
-      "node-bin-setup": "^1.0.0"
+    dependencies: {
+      "node-bin-setup": "^1.0.0",
     },
-    "license": "ISC",
-    "author": "",
-    "engines": {
-      "npm": ">=5.0.0"
-    }
-  }
+    license: "ISC",
+    author: "",
+    engines: {
+      npm: ">=5.0.0",
+    },
+  };
 
-  return pkg
+  return pkg;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-bin-gen",
-  "version": "9.0.4",
+  "version": "11.0.0",
   "description": "Generate a node binary package",
   "author": "Aria Stewart <aredridel@dinhe.net>",
   "main": "index.js",
@@ -10,18 +10,18 @@
     "type": "git",
     "url": "https://github.com/aredridel/node-bin-gen"
   },
+  "type": "module",
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=18.0.0"
   },
   "dependencies": {
-    "end-of-stream": "^1.4.1",
-    "make-fetch-happen": "^9.0.1",
-    "pump": "^3.0.0",
+    "make-fetch-happen": "^10.0.3",
     "rimraf": "^3.0.0",
     "verror": "^1.9.0",
     "yargs": "^17.0.1"
   },
   "eslintConfig": {
+    "sourceType": "module",
     "parserOptions": {
       "ecmaVersion": 8
     },
@@ -39,5 +39,8 @@
       "node": true,
       "es6": true
     }
+  },
+  "devDependencies": {
+    "eslint": "^8.18.0"
   }
 }