fix(run): pass cli args to nw process (#156)

Fixes: #150

.github/sdk.js

@@ -1,7 +1,17 @@
-import { writeFileSync } from 'node:fs';
+import fs from 'node:fs';
+import path from 'node:path';
+import url from 'node:url';
 
-import nodeManifest from '../package.json' assert { type: 'json' };
+const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
+/**
+ * @type {fs.PathLike}
+*/
+const nodeManifestPath = path.resolve(__dirname, '..' ,'package.json');
+/**
+ * @type {object}
+ */
+const nodeManifest = JSON.parse(fs.readFileSync(nodeManifestPath), { encoding: 'utf-8' });
 
 nodeManifest.version = nodeManifest.version + '-sdk';
 
-writeFileSync('./package.json', JSON.stringify(nodeManifest, null, 2));
+fs.writeFileSync('./package.json', JSON.stringify(nodeManifest, null, 2));

src/cli.js

@@ -12,13 +12,13 @@ await cli();
 async function cli() {
 
   program
-    .option('--version <string>')
-    .option('--flavor <flavor>')
-    .option('--platform <platform>')
-    .option('--arch <arch>')
-    .option('--cacheDir <cacheDir>')
-    .argument('[app]')
-    .allowUnknownOption()
+    .argument('[app]', 'File path to project', '.')
+    .option('--version <string>', 'NW.js version')
+    .option('--flavor <flavor>', 'NW.js flavor')
+    .option('--platform <platform>', 'Host platform')
+    .option('--arch <arch>', 'Host architecture')
+    .option('--cacheDir <cacheDir>', 'File path to cache directory')
+    .allowUnknownOption() // this allows chromium and node options to be passed through to the nwjs binary
     .parse(process.argv);
 
   let options = program.opts();
@@ -31,6 +31,7 @@ async function cli() {
     arch: options.arch,
     cacheDir: options.cacheDir,
     srcDir: program.args[0],
+    args: program.args.slice(1),
   });
 
 }

src/parse.js

@@ -1,9 +1,10 @@
+import fs from 'node:fs';
 import path from 'node:path';
 import process from 'node:process';
+import url from 'node:url';
 
 import semver from 'semver';
 
-import nodeManifest from '../package.json' assert { type: 'json' };
 import util from '../src/util.js';
 
 /**
@@ -26,6 +27,15 @@ import util from '../src/util.js';
  * @return {Promise<ParseOptions>}
  */
 export default async function parse(options) {
+    const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
+    /**
+     * @type {fs.PathLike}
+     */
+    const nodeManifestPath = path.resolve(__dirname, '..', 'package.json');
+    /**
+     * @type {object}
+     */
+    const nodeManifest = JSON.parse(await fs.promises.readFile(nodeManifestPath, { encoding: 'utf-8' }));
     options.version = options.version ?? nodeManifest.version;
     const parsedVersion = semver.parse(options.version);
     options.version = [

src/postinstall.js

@@ -1,20 +1,32 @@
+import fs from 'node:fs';
 import process from 'node:process';
+import path from 'node:path';
+import url from 'node:url';
 
 import semver from 'semver';
 
 import get from './get.js';
 import util from './util.js';
 
-import nodeManifest from '../package.json' assert { type: 'json' };
-
 await postinstall()
     .catch((error) => {
         if (error.code === 'EPERM') {
             console.error('Unable to create symlink since user did not run as Administrator.');
+        } else {
+            console.error(error)
         }
     });
 
 async function postinstall() {
+    const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
+    /**
+     * @type {fs.PathLike}
+     */
+    const nodeManifestPath = path.resolve(__dirname, '..' ,'package.json');
+    /**
+     * @type {object}
+     */
+    const nodeManifest = JSON.parse(await fs.promises.readFile(nodeManifestPath));
     const parsedVersion = semver.parse(nodeManifest.version);
     let version = [
         parsedVersion.major,

src/run.js

@@ -13,6 +13,7 @@ import util from "./util.js";
  * @property {"ia32" | "x64" | "arm64"}             [arch]                  Target arch
  * @property {string}                               [srcDir = "./src"]      Source directory
  * @property {string}                               [cacheDir = "./cache"]  Cache directory
+ * @property {string[]}                             [args = []]             Command line arguments
  */
 
 /**
@@ -31,6 +32,7 @@ async function run({
   arch = util.ARCH_KV[process.arch],
   srcDir = ".",
   cacheDir = "./cache",
+  args = [],
 }) {
 
   try {
@@ -46,13 +48,18 @@ async function run({
     return new Promise((res, rej) => {
       const nwProcess = child_process.spawn(
         path.resolve(nwDir, util.EXE_NAME[platform]),
-        [srcDir]
+        [srcDir, ...args],
+        { detached: true, stdio: "ignore" },
       );
 
       nwProcess.on("close", () => {
         res();
       });
 
+      nwProcess.on("message", (message) => {
+        console.log(message);
+      });
+
       nwProcess.on("error", (error) => {
         console.error(error);
         rej(error);

test/findpath.test.js

@@ -4,10 +4,10 @@ import { expect, test } from 'vitest';
 import util from '../src/util.js';
 
 test('nwjs has downloaded and been extracted', function () {
-  util.findpath('nwjs').then(function (path) {
+  util.findpath('nwjs', { flavor: 'sdk' }).then(function (path) {
     expect(fs.existsSync(path)).toEqual(true);
   })
-  .catch((error) => {
-    console.log(error);
-  });
+    .catch((error) => {
+      console.log(error);
+    });
 });

test/selenium.test.js

@@ -7,6 +7,9 @@ import { afterAll, beforeAll, describe, expect, it } from "vitest";
 import util from "../src/util.js";
 
 describe("run", async function () {
+  /**
+   * @type {chrome.Driver | undefined}
+   */
   let driver = undefined;
 
   beforeAll(async function () {
@@ -32,8 +35,8 @@ describe("run", async function () {
     expect(text).toEqual('Hello, World! Is anyone out there?');
   }, { timeout: Infinity });
 
-  afterAll(function () {
-    driver.quit();
+  afterAll(async function () {
+    await driver.quit();
   });
 
 });