nw 0.84.0 → 0.85.0-1-sdk

package/README.md

@@ -1,173 +1,108 @@
 # nw
 
-An installer for [NW.js](https://nwjs.io).
+An npm installer for [NW.js](https://nwjs.io).
 
-> NW.js is a runtime-environment based on Chromium and Node.js. It is used to build desktop applications that run on Windows, OSX, and Linux.
+[![npm](https://img.shields.io/npm/v/nw)](https://www.npmjs.com/package/nw)
 
-[![npm](https://img.shields.io/npm/v/nw.svg?style=flat)](https://www.npmjs.com/package/nw)
+## Install
 
-## usage
-Install locally to your project with: `npm install nw` and then in your `package.json` add a script:
+### Latest version of normal build flavor:
 
-```json
-{
-  "scripts": {
-    "start": "nw"
-  }
-}
+```shell
+npm install --save-dev nw
 ```
 
-Now it will run your local project when you type `npm start`.
-
-If your project is in another folder, add the path to the project `"start": "nw path/to/app"`.
-
-You could also call `nw` directly from `node_modules/.bin/nw` instead of adding to your `package.json`.
-
-### global
-You can also install globally with `npm install nw -g` and then in any project type `nw` to run the project. Installing locally is recommended though as each project can have its own dependent version of nw.js.
+### Specific version with changes to installer:
 
-## example
-If you want a really quick example try this:
-
-1. `git clone https://github.com/zcbenz/nw-sample-apps && cd nw-sample-apps`
-2. `npm init`
-3. `npm install nw`
-4. `"node_modules/.bin/nw" file-explorer`
-
-and now you should see a file explorer demo app.
-
-## command line options
-There are a few (platform-specific) arguments you can pass to the `nw` executable to
-customize your nw.js application:
-
-* `--mac_plist <path-to-plist-file>`: (OS X only) Copies the given file to Info.plist in the app
-  bundle. This lets you do things like change your app's name and point to a different icon.
-
-* `--mac_icon <path-to-icns-file>`: (OS X only) Copies the given .icns file to the Resources/ dir
-  in the app bundle. You will need to point to the file with a custom plist file as well (see
-  `--mac_list`)
-
-**NOTE**: These options will keep the copied files in the app bundle for as long as the bundle is
-on the filesystem (they're not deleted between app invocations). As a result, they're not
-recommended if you installed nw globally using `-g`.  Also note that
-[OS X caches these files](http://proteo.me.uk/2011/08/mac-application-bundle-caching/),
-so you may need to manually clear these cached files during development.
-
-## install a specific version of nw.js
-
-To install a specific version of nw.js use npm with the specific version: `npm install nw@0.12.0`
-
-> *Please note:* This npm package version tracks the version of nw.js that will be installed, with an additional build number that is used for revisions to the installer. As such `0.12.0-1` and `0.12.0-2` will both install `nw.js@0.12.0` but the latter has newer changes to the installer.
-
-You may use `npm view nw versions` to view the list of available versions.
+```shell
+npm install --save-dev nw@0.85.0-1
+```
 
-## install a specific build type of nw.js
+> You may use `npm view nw versions` to view the list of available versions.
 
-nw.js has three build types: `normal`, `sdk` and `nacl`. To install a specific build type you may set npm config property `nwjs_build_type`, environment variable `NWJS_BUILD_TYPE` or pass command line option `--nwjs_build_type`:
+### Specify build flavor:
 
-``` shell
-npm install nw --nwjs_build_type=sdk
+```shell
+npm install --save-dev nw@sdk
 ```
 
-Setting option in `.npmrc` file (https://www.npmjs.org/doc/files/npmrc.html):
-
-```
-nwjs_build_type=sdk
-```
+> Optionally set `nwjs_build_type=sdk` in `.npmrc` or `NWJS_BUILD_TYPE=sdk` environment variable.
 
-Setting environment variable `NWJS_BUILD_TYPE`:
+### Specify platform:
 
-``` shell
-export NWJS_BUILD_TYPE=sdk
-```
+Set `nwjs_platform` in `.npmrc` or `NWJS_PLATFORM` environment variable. Defaults to `process.platform`.
 
-You can alternatively install `sdk` build by specifying `-sdk` suffix in version:
+### Specify architecture:
 
-``` shell
-npm install nw@0.13.3-sdk
-```
+Set `nwjs_arch` in `.npmrc` or `NWJS_ARCH` environment variable. Defaults to `process.arch`.
 
-You can also run `npm install nw@sdk` to get the latest of published SDK versions. (Note: that may be a beta version.)
+### Specify cache directory:
 
-## install a specific architecture
+Set `nwjs_cache_dir` in `.npmrc` or `NWJS_ARCH` environment variable. Defaults to `./node_modules/nw`.
 
-You may use the environment variable `npm_config_nwjs_process_arch` to override the default architecture (`process.arch`) and to download NW.js built for some other architecture.
+### Specify cache flag:
 
-## finding the path to the nw.js binary
+Set `nwjs_cache` in `.npmrc` or `NWJS_ARCH` environment variable to keep or delete cached binaries. Defaults to `true`.
 
-If you would like to programmatically retrieve the path to the nw.js binary use:
+### Specify ffmpeg flag:
 
-``` js
-var findpath = require('nw').findpath;
-var nwpath = findpath();
-// nwpath will equal the path to the binary depending on your environment
-```
+Set `nwjs_ffmpeg` in `.npmrc` or `NWJS_ARCH` environment variable to toggle downloading [community FFmpeg binaries](https://github.com/nwjs-ffmpeg-prebuilt/nwjs-ffmpeg-prebuilt). Defaults to `false`.
 
-## finding the path to the chromedriver binary
+### Specify Native Addon flag:
 
-If you would like to programmatically retrieve the path to the chromedriver use:
+Set `nwjs_native_addon` in `.npmrc` or `NWJS_NATIVE_ADDON` environment variable to toggle downloading NW.js Node headers. Defaults to `false`.
 
-``` js
-var findpath = require('nw').findpath;
-var chromedriver_path = findpath('chromedriver');
-// chromedriver_path will equal the path to the binary depending on your environment
-```
+### Specify download URL:
 
-Then you can use that path to run NW.js programmatically. For example, to run in the current script's directory:
-
-```js
-require('child_process').spawn(
-   require('nw').findpath(),
-   ['.'].concat( process.argv.slice(2) ),
-   {
-      cwd: __dirname,
-      detached: true,
-      stdio: 'ignore'
-   }
-).unref();
-```
+Set `nwjs_urlbase` in `.npmrc` or `NWJS_URLBASE` environment variable. Defaults to `https://dl.nwjs.io`. The file system (`file://`) is also supported.
 
-## retrieve binaries from custom download location or file path
+## Usage
 
-The installer attempts to download binaries from the default location of `https://dl.nwjs.io/v`. You can override this by setting the npm config property `nwjs_urlbase` on the command line by passing the `--nwjs_urlbase` option:
+Add a script in your `package.json`:
 
-``` shell
-npm install nw --nwjs_urlbase=http://my.own.location/somewhere
+```json
+{
+  "scripts": {
+    "start": "nw /path/to/app"
+  }
+}
 ```
 
-or adding it to your `.npmrc` file (https://www.npmjs.org/doc/files/npmrc.html):
+Executing `npm start` runs the NW.js app. Omitting the file path makes NW.js check for valid project in current working directory. You can also call `nw` directly from `node_modules/.bin/nw`.
 
-```
-nwjs_urlbase=http://my.own.location/somewhere
-```
+## Command Line Options
 
-You can alternatively set an environment variable `NWJS_URLBASE`:
+There are a few (platform-specific) arguments you can pass to the `nw` executable to customize your nw.js application:
 
-``` shell
-export NWJS_URLBASE=http://my.own.location/somewhere
-```
+* `--mac_plist <path-to-plist-file>`: (OS X only) Copies the given file to Info.plist in the app
+  bundle. This lets you do things like change your app's name and point to a different icon.
 
-The installer supports `file://` URLs to retrieve files from the local filesystem:
+* `--mac_icon <path-to-icns-file>`: (OS X only) Copies the given .icns file to the Resources/ dir
+  in the app bundle. You will need to point to the file with a custom plist file as well (see
+  `--mac_list`)
 
-``` shell
-export NWJS_URLBASE=file:///home/bilbo/my/own/mirror
-```
+**NOTE**: These options will keep the copied files in the app bundle for as long as the bundle is
+on the filesystem (they're not deleted between app invocations). As a result, they're not
+recommended if you installed nw globally using `-g`.  Also note that
+[OS X caches these files](http://proteo.me.uk/2011/08/mac-application-bundle-caching/),
+so you may need to manually clear these cached files during development.
 
-## using a proxy with or without authentication
+## APIs
 
-If you are behind a proxy server you have to set an environment variable `http_proxy` with proxy servers url:
+### Find path to the NW.js binary:
 
-```
-export http_proxy="http://username:password@myproxy.com:8080"
+``` js
+import { findpath } from 'nw';
+var path = findpath();
 ```
 
-or
+## Find the path to the chromedriver binary
 
-```
-export http_proxy="http://myproxy.com:8080"
+``` js
+import { findpath } from 'nw';
+var path = findpath('chromedriver');
 ```
 
-(However, if the environment variable `https_proxy` is set, then it will be preferred, as [programmed](https://github.com/kevva/get-proxy/blob/master/index.js) in the `get-proxy` package.)
+## License
 
-## license
-[nw.js](https://github.com/nwjs/nw.js)'s code and this installer use the MIT license.
+[NW.js](https://github.com/nwjs/nw.js)'s code and this installer use the MIT license.

package/bin/nw.js

@@ -1,56 +1,59 @@
 #!/usr/bin/env node
 
-const { spawn } = require('node:child_process');
-const fs = require('node:fs');
-const path = require('node:path');
-const process = require('node:process');
+import { spawn } from 'node:child_process';
+import { existsSync, renameSync } from 'node:fs';
+import { dirname, resolve } from 'node:path';
+import { platform, argv, nextTick, exit, execPath } from 'node:process';
+import { fileURLToPath } from 'node:url';
 
-const { copyAssets } = require('../lib/app_assets.js');
-const findpath = require('../lib/findpath.js').findpath;
+import { copyAssets } from '../lib/app_assets.js';
+import util from '../src/util.js';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
 
 function run() {
   // Rename nw.js's own package.json as workaround for https://github.com/nwjs/nw.js/issues/1503
-  var packagejson = path.resolve(__dirname, '..', 'package.json');
-  var packagejsonBackup = path.resolve(__dirname, '..', 'package_backup.json');
-  if (!fs.existsSync(packagejsonBackup)) {
+  var packagejson = resolve(__dirname, '..', 'package.json');
+  var packagejsonBackup = resolve(__dirname, '..', 'package_backup.json');
+  if (!existsSync(packagejsonBackup)) {
     try {
-      fs.renameSync(packagejson, packagejsonBackup);
-    } catch (err) {}
+      renameSync(packagejson, packagejsonBackup);
+    } catch (err) { }
   }
 
   // copy over any asset files (icons, etc) specified via CLI args:
-  copyAssets(process.platform, findpath());
+  copyAssets(platform, util.findpath());
 
   // Normalize cli args
-  var args = process.argv.slice(2);
+  var args = argv.slice(2);
   var cwd = (args.length < 1) ? '.' : args[0];
-  if (!fs.existsSync(path.resolve(cwd))) {
+  if (!existsSync(resolve(cwd))) {
     args = ['.'].concat(args);
   } else {
     args = [cwd].concat(args.slice(1));
   }
 
   // Spawn node-webkit
-  var nw = spawn(findpath(), args, { stdio: 'inherit' });
-  nw.on('close', function() {
-    process.nextTick(function() {
-      process.exit(0);
+  var nw = spawn(util.findpath(), args, { stdio: 'inherit' });
+  nw.on('close', function () {
+    nextTick(function () {
+      exit(0);
     });
   });
 
   // Restore package.json shortly after nw is spawned
-  setTimeout(function() {
+  setTimeout(function () {
     try {
-      if (fs.existsSync(packagejsonBackup)) {
-        fs.renameSync(packagejsonBackup, packagejson);
+      if (existsSync(packagejsonBackup)) {
+        renameSync(packagejsonBackup, packagejson);
       }
-    } catch (err) {}
+    } catch (err) { }
   }, 1000);
 }
 
-if (!fs.existsSync(findpath())) {
+if (!existsSync(util.findpath())) {
   console.log('nw.js appears to have failed to download and extract. Attempting to download and extract again...');
-  var child = spawn(process.execPath, [path.resolve(__dirname, '..', 'scripts', 'install.js')], { stdio: 'inherit' });
+  var child = spawn(execPath, [resolve(__dirname, '..', 'src', 'postinstall.js')], { stdio: 'inherit' });
   child.on('close', run);
 } else {
   run();

package/lib/app_assets.js

@@ -1,20 +1,23 @@
-var fs = require('fs');
-var path = require('path');
-var argv = require('yargs').argv;
+import fs from 'node:fs';
+import path from 'node:path';
+
+import yargs from 'yargs';
+
+const argv = yargs(process.argv.slice(2)).argv;
 
 // Helper to simulate the shell's "cp" command
 function copyFileSync(srcFile, destFile) {
-  var content = fs.readFileSync(srcFile);
+  let content = fs.readFileSync(srcFile);
   fs.writeFileSync(destFile, content);
 }
 
 // Copy asset files (specified via process.argv) over to the app binary's folder
-exports.copyAssets = function copyAssets(platform, binPath) {
+export function copyAssets(platform, binPath) {
   // OS X: Save a custom plist file to Contents/Info.plist in the
   // app bundle. This lets you customize things like the app's menubar
   // name and icon (see argv.mac_icon below)
   if (argv.mac_plist && platform === 'darwin') {
-    var plistPath = path.join(binPath, '..', '..', 'Info.plist');
+    let plistPath = path.join(binPath, '..', '..', 'Info.plist');
     copyFileSync(argv.mac_plist, plistPath);
   }
 
@@ -22,8 +25,8 @@ exports.copyAssets = function copyAssets(platform, binPath) {
   // Note that for the icon to work properly you need to point to
   // it with a custom plist file.
   if (argv.mac_icon && platform === 'darwin') {
-    var iconName = path.basename(argv.mac_icon);    // Preserve the file's name
-    var iconPath = path.join(binPath, '..', '..', 'Resources', iconName);
+    let iconName = path.basename(argv.mac_icon);    // Preserve the file's name
+    let iconPath = path.join(binPath, '..', '..', 'Resources', iconName);
     copyFileSync(argv.mac_icon, iconPath);
   }
-};
+}

package/package.json

@@ -1,23 +1,25 @@
 {
   "name": "nw",
-  "version": "0.84.0",
-  "description": "A installer for nw.js",
+  "version": "0.85.0-1-sdk",
+  "description": "An installer for nw.js",
   "repository": {
     "type": "git",
     "url": "git://github.com/nwjs/npm-installer.git"
   },
-  "main": "lib/findpath.js",
+  "type": "module",
+  "main": "src/index.js",
   "bin": {
     "nw": "bin/nw.js"
   },
   "scripts": {
-    "postinstall": "node lib/install.js",
-    "test": "node --test-reporter=spec --test test/index.js",
-    "dry-run": "nw ./test/app"
+    "postinstall": "node src/postinstall.js",
+    "test": "vitest run",
+    "demo": "nw ./test/app"
   },
   "files": [
+    "bin",
     "lib",
-    "bin"
+    "src"
   ],
   "author": {
     "name": "Kyle Robinson Young",
@@ -31,10 +33,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "cli-progress": "^3.12.0",
-    "compressing": "^1.10.0",
+    "axios": "^1.6.8",
     "semver": "^7.5.4",
-    "yargs": "^17.7.2"
+    "tar": "^6.2.1",
+    "yargs": "^17.7.2",
+    "yauzl-promise": "^4.0.0"
   },
   "keywords": [
     "nw",
@@ -47,5 +50,9 @@
     "installer",
     "desktop",
     "application"
-  ]
-}
+  ],
+  "devDependencies": {
+    "selenium-webdriver": "^4.18.1",
+    "vitest": "^1.4.0"
+  }
+}

package/src/decompress.js

@@ -0,0 +1,95 @@
+import fs from "node:fs";
+import path from "node:path";
+import stream from "node:stream";
+
+import tar from "tar";
+import yauzl from "yauzl-promise";
+
+import util from "./util.js";
+
+/**
+ * Decompresses a file at `filePath` to `cacheDir` directory.
+ *
+ * @param {string} filePath  - file path to compressed binary
+ * @param {string} cacheDir  - directory to decompress into
+ */
+export default async function decompress(filePath, cacheDir) {
+  if (filePath.endsWith(".zip")) {
+    await unzip(filePath, cacheDir);
+  } else {
+    await tar.extract({
+      file: filePath,
+      C: cacheDir
+    });
+  }
+}
+
+/**
+ * Get file mode from entry. Reference implementation is [here](https://github.com/fpsqdb/zip-lib/blob/ac447d269218d396e05cd7072d0e9cd82b5ec52c/src/unzip.ts#L380).
+ *
+ * @param  {yauzl.Entry} entry  - Yauzl entry
+ * @return {number}             - entry's file mode 
+ */
+function modeFromEntry(entry) {
+  const attr = entry.externalFileAttributes >> 16 || 33188;
+
+  return [448 /* S_IRWXU */, 56 /* S_IRWXG */, 7 /* S_IRWXO */]
+    .map(mask => attr & mask)
+    .reduce((a, b) => a + b, attr & 61440 /* S_IFMT */);
+}
+
+/**
+ * Unzip `zippedFile` to `cacheDir`.
+ *
+ * @async
+ * @function
+ * @param  {string}        zippedFile  - file path to .zip file
+ * @param  {string}        cacheDir    - directory to unzip in
+ * @return {Promise<void>}
+ */
+async function unzip(zippedFile, cacheDir) {
+  const zip = await yauzl.open(zippedFile);
+  let entry = await zip.readEntry();
+  const symlinks = []; // Array to hold symbolic link entries
+
+  while (entry !== null) {
+    let entryPathAbs = path.join(cacheDir, entry.filename);
+    /* Check if entry is a symbolic link */
+    const isSymlink = ((modeFromEntry(entry) & 0o170000) === 0o120000);
+
+    if (isSymlink) {
+      /* Store symlink entries to process later */
+      symlinks.push(entry);
+    } else {
+      /* Handle regular files and directories */
+      await fs.promises.mkdir(path.dirname(entryPathAbs), {recursive: true});
+      if (!entry.filename.endsWith('/')) { // Skip directories
+        const readStream = await entry.openReadStream();
+        const writeStream = fs.createWriteStream(entryPathAbs);
+        await stream.promises.pipeline(readStream, writeStream);
+
+        /* Set file permissions after the file has been written */
+        const mode = modeFromEntry(entry);
+        await fs.promises.chmod(entryPathAbs, mode);
+      }
+    }
+
+    /* Read next entry */
+    entry = await zip.readEntry();
+  }
+
+  /* Process symbolic links after all other files have been extracted */
+  for (const symlinkEntry of symlinks) {
+    let entryPathAbs = path.join(cacheDir, symlinkEntry.filename);
+    const readStream = await symlinkEntry.openReadStream();
+    const chunks = [];
+    readStream.on("data", (chunk) => chunks.push(chunk));
+    await new Promise(resolve => readStream.on("end", resolve));
+    const linkTarget = Buffer.concat(chunks).toString('utf8').trim();
+
+    const fileExists = await util.fileExists(entryPathAbs);
+    if (!fileExists) {
+      await fs.promises.symlink(linkTarget, entryPathAbs);
+    }
+  }
+}

package/src/decompress.test.js

@@ -0,0 +1,27 @@
+import fs from "node:fs";
+
+import { beforeAll, describe, it } from "vitest";
+
+import decompress from "./decompress.js";
+import request from "./request.js";
+
+describe("get/decompress", function () {
+
+  let tarUrl = "https://dl.nwjs.io/v0.83.0/nwjs-sdk-v0.83.0-linux-x64.tar.gz";
+  let zipUrl = "https://dl.nwjs.io/v0.83.0/nwjs-sdk-v0.83.0-osx-x64.zip";
+
+  beforeAll(async function () {
+    await fs.promises.mkdir("./test/fixture/cache", {recursive: true});
+
+    await request(tarUrl, "./test/fixture/cache/nw.tar.gz");
+    await request(zipUrl, "./test/fixture/cache/nw.zip");
+  }, Infinity);
+
+  it("decompresses a Linux tarball", async function () {
+    await decompress("./test/fixture/cache/nw.tar.gz", "./test/fixture/cache");
+  }, Infinity);
+
+  it("decompresses a MacOS zip", async function () {
+    await decompress("./test/fixture/cache/nw.zip", "./test/fixture/cache");
+  }, Infinity);
+});

package/src/ffmpeg.js

@@ -0,0 +1,38 @@
+import path from "node:path";
+
+import request from "./request.js";
+
+/**
+ * Download community FFmpeg binary from `https://github.com/nwjs-ffmpeg-prebuilt/nwjs-ffmpeg-prebuilt`.
+ *
+ * @param  {string}          downloadUrl  - Download server
+ * @param  {string}          version      - Runtime version
+ * @param  {string}          platform     - NW supported platform
+ * @param  {string}          arch         - NW supported architecture
+ * @param  {string}          cacheDir     - Directory to store FFmpeg binary
+ * @return {Promise<string>}              Path of compressed file which containscommunity FFmpeg binary.
+ */
+export default async function ffmpeg(downloadUrl, version, platform, arch, cacheDir) {
+
+  /**
+   * URL to download specific FFmpeg binary from.
+   *
+   * @type {string}
+   */
+  const url = [
+    downloadUrl,
+    version,
+    `${version}-${platform}-${arch}.zip`,
+  ].join('/');
+
+  /**
+   * Absolute path of compressed file which contains FFmpeg binary.
+   */
+  const ffmpegFileAbs = path.resolve(
+    cacheDir,
+    `ffmpeg-${version}-${platform}-${arch}.zip`,
+  );
+  await request(url, ffmpegFileAbs);
+
+  return ffmpegFileAbs;
+}

package/src/ffmpeg.test.js

@@ -0,0 +1,31 @@
+import fs from "node:fs";
+import process from "node:process";
+
+import { afterEach, beforeAll, describe, expect, it } from "vitest";
+
+import ffmpeg from "./ffmpeg.js";
+import util from "./util.js";
+
+describe("get/ffmpeg", function () {
+
+  let ffmpegFile = '';
+
+  afterEach(function () {
+    fs.promises.rm(ffmpegFile, { recursive: true, force: true });
+  });
+
+  beforeAll(async function () {
+    await fs.promises.mkdir("./test/fixture", { recursive: true });
+  });
+
+  it("downloades community prebuild FFmpeg for specifc platform", async function () {
+    ffmpegFile = await ffmpeg(
+      "https://github.com/nwjs-ffmpeg-prebuilt/nwjs-ffmpeg-prebuilt/releases/download",
+      "0.83.0",
+      util.PLATFORM_KV[process.platform],
+      util.ARCH_KV[process.arch],
+      "./test/fixture"
+    );
+    expect(util.fileExists(ffmpegFile)).resolves.toBe(true);
+  }, Infinity);
+});