nw 0.81.0-1 → 0.81.0-2

package/lib/install.mjs

@@ -11,194 +11,213 @@ import semver from 'semver';
 
 import nodeManifest from '../package.json' assert { type: 'json' };
 
-/**
- * NW.js build flavor
- * 
- * @type {'sdk' | 'normal'}
- */
-let buildType = env.npm_config_nwjs_build_type || env.NWJS_BUILD_TYPE || 'normal';
-
-/**
- * Parsed string version to Semver version object
- */
-let parsedVersion = semver.parse(nodeManifest.version);
-
-/**
- * Version string of the format `X.Y.Z-pre`.
- * The prerelease segment `pre` is used to specify build flavor, or other tags.
- * 
- * @type {string}
- */
-let versionString = [
-  parsedVersion.major,
-  parsedVersion.minor,
-  parsedVersion.patch
-].join('.');
-
-// Check if version is a prelease.
-if (typeof parsedVersion?.prerelease?.[0] === 'string') {
-  let prerelease = parsedVersion.prerelease[0].split('-');
-  if (prerelease.length > 1) {
-    prerelease = prerelease.slice(0, -1);
+await install();
+
+async function install() {
+
+  const PLATFORM_KV = {
+    darwin: 'osx',
+    linux: 'linux',
+    win32: 'win',
+  };
+
+  const ARCH_KV = {
+    x64: 'x64',
+    ia32: 'ia32',
+    arm64: 'arm64',
+  };
+
+  const __dirname = dirname(fileURLToPath(import.meta.url));
+
+  /**
+   * URL to download or get binaries from.
+   * 
+   * @type {string}
+   */
+  let url = '';
+
+  /**
+   * URL base prepended to `url`.
+   * 
+   * @type {string}
+   */
+  let urlBase = env.npm_config_nwjs_urlbase || env.NWJS_URLBASE || 'https://dl.nwjs.io/v';
+
+  /**
+   * NW.js build flavor
+   * 
+   * @type {'sdk' | 'normal'}
+   */
+  let buildType = env.npm_config_nwjs_build_type || env.NWJS_BUILD_TYPE || 'normal';
+
+  /**
+   * Parsed string version to Semver version object
+   */
+  let parsedVersion = semver.parse(nodeManifest.version);
+
+  /**
+   * Version string of the format `X.Y.Z-pre`.
+   * The prerelease segment `pre` is used to specify build flavor, or other tags.
+   * 
+   * @type {string}
+   */
+  let versionString = [
+    parsedVersion.major,
+    parsedVersion.minor,
+    parsedVersion.patch
+  ].join('.');
+
+  /**
+   * Host operating system
+   * 
+   * @type {NodeJS.Platform | 'osx' | 'win'}
+   */
+  let hostOs = env.npm_config_nwjs_platform || env.NWJS_PLATFORM || platform;
+
+  /**
+   * Host architecture
+   * 
+   * @type {NodeJS.Architecture}
+   */
+  let hostArch = env.npm_config_nwjs_process_arch || arch;
+
+  /**
+   * Path to the decompressed folder.
+   * 
+   * @type {string}
+   */
+  let nwFile = '';
+
+  /**
+   * Extension of the downloaded file.
+   * 
+   * @type {'.tar.gz' | '.zip'}
+   */
+  let nwExt = '';
+
+  /**
+   * Path to the compressed file.
+   * 
+   * @type {string}
+   */
+  let nwCache = '';
+
+  /**
+   * Path to the renamed folder containing NW.js binaries.
+   * 
+   * @type {string}
+   */
+  let nwDir = resolve(__dirname, '..', 'nwjs');
+
+  // Check if version is a prelease.
+  if (typeof parsedVersion?.prerelease?.[0] === 'string') {
+    let prerelease = parsedVersion.prerelease[0].split('-');
+    if (prerelease.length > 1) {
+      prerelease = prerelease.slice(0, -1);
+    }
+    versionString = [versionString, ...prerelease].join('-');
   }
-  versionString = [versionString, ...prerelease].join('-');
-}
-
-// Check build flavor and slice that off the `versionString`.
-if (versionString.endsWith('-sdk')) {
-  versionString = versionString.slice(0, -4);
-  buildType = 'sdk';
-} else if (versionString.endsWith('sdk')) {
-  versionString = versionString.slice(0, -3);
-  buildType = 'sdk';
-}
-
-/**
- * URL to download or get binaries from.
- * 
- * @type {string}
- */
-let url = '';
-
-/**
- * Host operating system
- * 
- * @type {NodeJS.Platform | 'osx' | 'win'}
- */
-let hostOs = env.npm_config_nwjs_platform || env.NWJS_PLATFORM || platform;
-
-/**
- * Host architecture
- * 
- * @type {NodeJS.Architecture}
- */
-let hostArch = env.npm_config_nwjs_process_arch || arch;
-
-/**
- * URL base prepended to `url`.
- * 
- * @type {string}
- */
-let urlBase = env.npm_config_nwjs_urlbase || env.NWJS_URLBASE || 'https://dl.nwjs.io/v';
-
-const PLATFORM_KV = {
-  darwin: 'osx',
-  linux: 'linux',
-  win32: 'win',
-};
-
-const ARCH_KV = {
-  x64: 'x64',
-  ia32: 'ia32',
-  arm64: 'arm64',
-};
-
-url = [
-  urlBase,
-  versionString,
-  '/nwjs',
-  buildType === 'normal' ? '' : `-${buildType}`,
-  '-v',
-  versionString,
-  '-',
-  PLATFORM_KV[hostOs],
-  '-',
-  ARCH_KV[hostArch],
-  PLATFORM_KV[hostOs] === 'linux' ? '.tar.gz' : '.zip'
-].join('');
-
-if (!PLATFORM_KV[hostOs] || !ARCH_KV[hostArch]) {
-  console.error('[ ERROR ] Could not find a compatible version of nw.js to download for your platform.');
-  exit(1);
-}
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-
-/**
- * The folder where NW.js binaries are placed.
- * 
- * @type {string}
- */
-let nwDir = resolve(__dirname, '..', 'nwjs');
-
-if (existsSync(nwDir) === true) {
-  exit(0);
-}
 
-let parsedUrl = new URL(url);
-
-/**
- * Path to the compressed binary.
- * 
- * @type {string}
- */
-let filePath = '';
-
-/**
- * Recursively delete the passed in directory.
- * Rename the downloaded file.
- * @param {string} dir - directory to remove
- */
-const rmAndRename = async (dir) => {
-  await rm(dir, { recursive: true, force: true });
-  await rename(`nwjs-v${versionString}-${PLATFORM_KV[hostOs]}-${ARCH_KV[hostArch]}`, 'nwjs');
-};
-
-/**
- * @param {'zip' | 'tgz'} zipOrTgz
- * @param {string}        filePath
- * @return {Promise<void>}
- */
-const decompress = function (zipOrTgz, filePath) {
-  return compressing[zipOrTgz].uncompress(filePath, '.')
-    .then(async () => await rmAndRename(filePath));
-}
-
-// If the url is linking to the file system,
-// then it is assumed that a compressed binary exists in that location. 
-if (parsedUrl.protocol === 'file:') {
-  filePath = resolve(decodeURIComponent(url.slice('file://'.length)));
-
-  if (existsSync(filePath) === false) {
-    console.error('[ ERROR ] Could not find ' + filePath);
+  // Check build flavor and slice that off the `versionString`.
+  if (versionString.endsWith('-sdk')) {
+    versionString = versionString.slice(0, -4);
+    buildType = 'sdk';
+  } else if (versionString.endsWith('sdk')) {
+    versionString = versionString.slice(0, -3);
+    buildType = 'sdk';
   }
 
-  // If the compressed file is of ZIP format:
-  if (filePath.endsWith('.zip')) {
-    decompress('zip', filePath);
-    // If the compressed file is of TGZ format:
-  } else if (filePath.endsWith('.tar.gz')) {
-    decompress('tgz', filePath);
-  } else {
-    console.error(`[ ERROR ] Expected .zip or .tar.gz file format. Got ${filePath}`);
+  nwFile = [
+    'nwjs',
+    buildType === 'normal' ? '' : `-${buildType}`,
+    '-v',
+    versionString,
+    '-',
+    PLATFORM_KV[hostOs],
+    '-',
+    ARCH_KV[hostArch],
+  ].join('');
+
+  nwExt = PLATFORM_KV[hostOs] === 'linux' ? '.tar.gz' : '.zip'
+
+  nwCache = [nwFile, nwExt].join('');
+
+  url = [
+    urlBase,
+    versionString,
+    '/',
+    nwCache,
+  ].join('');
+
+  if (!PLATFORM_KV[hostOs] || !ARCH_KV[hostArch]) {
+    console.error('[ ERROR ] Could not find a compatible version of nw.js to download for your platform.');
     exit(1);
   }
 
-} else {
+  /**
+   * Parsed URL.
+   * 
+   * @type {URL}
+   */
+  let parsedUrl = new URL(url);
+
+  /**
+   * Request download from server.
+   * 
+   * @type {Promise<void> | null}
+   */
+  let request = null;
+
+  if (parsedUrl.protocol === 'file:') {
+    nwCache = resolve(decodeURIComponent(url.slice('file://'.length)));
+    if (existsSync(nwCache) === false) {
+      console.error('[ ERROR ] Could not find ' + nwCache);
+      exit(1);
+    }
+  }
 
-  const bar = new progress.SingleBar({}, progress.Presets.rect);
+  if (existsSync(nwCache) === false) {
+    const bar = new progress.SingleBar({}, progress.Presets.rect);
 
-  const stream = createWriteStream(nwDir);
+    const stream = createWriteStream(nwCache);
+    request = new Promise((res, rej) => {
+      get(url, (response) => {
 
-  get(url, (response) => {
+        let chunks = 0;
+        bar.start(Number(response.headers['content-length']), 0);
+        response.on('data', async (chunk) => {
+          chunks += chunk.length;
+          bar.increment();
+          bar.update(chunks);
+        });
 
-    let chunks = 0;
-    bar.start(Number(response.headers['content-length']), 0);
-    response.on('data', async (chunk) => {
-      chunks += chunk.length;
-      bar.increment();
-      bar.update(chunks);
-    });
+        response.on('error', async () => {
+          await rm(nwCache, { force: true });
+          rej();
+        });
 
-    response.on('error', async () => await rm(nwDir, { force: true }));
+        response.on('end', () => {
+          res();
+        });
 
-    response.on('end', () => {
-      if (PLATFORM_KV[hostOs] === 'linux') {
-        decompress('tgz', nwDir);
-      } else {
-        decompress('zip', nwDir);
-      }
+        response.pipe(stream);
+      });
     });
-    response.pipe(stream);
+  }
+
+  if (request !== null) {
+    await request;
+  }
+  await rm(nwDir, {
+    recursive: true,
+    force: true,
   });
+  await compressing[platform === 'linux' ? 'tgz' : 'zip']
+    .uncompress(nwCache, '.');
+  await rename(
+    nwFile,
+    nwDir
+  );
+
+  return;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nw",
-  "version": "0.81.0-1",
+  "version": "0.81.0-2",
   "description": "A installer for nw.js",
   "repository": {
     "type": "git",
@@ -35,9 +35,6 @@
     "semver": "^7.5.4",
     "yargs": "^3.2.1"
   },
-  "devDependencies": {
-    "request": "^2.53.0"
-  },
   "keywords": [
     "nw",
     "nw.js",

package/bin/autobump

@@ -1,51 +0,0 @@
-#!/usr/bin/env node
-
-var fs = require('fs');
-var path = require('path');
-var semver = require('semver');
-var request = require('request');
-var exec = require('child_process').exec;
-
-var url = 'https://raw.github.com/rogerwang/node-webkit/master/README.md';
-var pkgpath = path.join(__dirname, '..', 'package.json');
-
-// Download README file
-var readme = request(url);
-var data = '';
-readme.on('data', function(buf) { data += buf; });
-readme.on('end', function() {
-  var version = semver.clean(/\[v([^\s]+)\s+release notes\]/i.exec(data)[1]);
-  // Version invalid so quit
-  if (!semver.valid(version)) {
-    console.error('INVALID VERSION: ' + version);
-    process.exit();
-  }
-  var pkg = require(pkgpath);
-  var currentversion = pkg.version;
-  if (semver.gt(version, pkg.version)) {
-    // Write new version to package.json
-    pkg.version = version;
-    fs.writeFileSync(pkgpath, JSON.stringify(pkg, null, 2));
-
-    console.log('PUBLISHING NEW VERSION ' + version);
-
-    var cmd = [
-      'git add package.json',
-      'git commit -m "v' + version + '"',
-      'git push origin master',
-      'npm publish',
-    ].join(' && ');
-    exec(cmd, { cwd: path.resolve(__dirname, '..') }, function(err, stdout, stderr) {
-      if (err || stderr) {
-        // Revert package.json change and try again next time
-        console.error('FAILED');
-        console.error(err || stderr);
-        pkg.version = currentversion;
-        fs.writeFileSync(pkgpath, JSON.stringify(pkg, null, 2));
-        // TODO: Should revert commit here as well
-      } else {
-        console.log('SUCCESS');
-      }
-    });
-  }
-});