get specific release info (#687)

nwutils · Nov 16, 2022 · 16eb002 · 16eb002
1 parent d30754d
commit 16eb002
Show file tree

Hide file tree

Showing 11 changed files with 77 additions and 55 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nw-builder",
-  "version": "4.0.0-rc.8",
+  "version": "4.0.0",
   "description": "Build NW.js desktop applications for Mac, Windows and Linux.",
   "keywords": [
     "NW.js",
@@ -25,9 +25,7 @@
     "format": "prettier --write \"**/*.{js,md}\"",
     "lint": "eslint ./src",
     "docs": "jsdoc ./src/nwbuild.js -d docs",
-    "demo:run": "cd ./test/demo && node run.js",
-    "demo:bld": "cd ./test/demo && node bld.js",
-    "demo:cli": "cd ./test/demo && nwbuild ./nwapp --version=0.69.1 --flavour=sdk --platform=linux --arch=x64 --outDir=./build"
+    "demo": "cd ./test/demo && nwbuild ./nwapp --version=0.69.1 --flavour=sdk --platform=linux --arch=x64 --outDir=./build"
   },
   "devDependencies": {
     "eslint": "^8.25.0",

diff --git a/src/bld/osxCfg.js b/src/bld/osxCfg.js
@@ -2,7 +2,7 @@ import fs from "node:fs/promises";
 
 import plist from "plist";
 
-const setOsxConfig = async (pkg, outDir) => {
+const setOsxConfig = async (pkg, outDir, releaseInfo) => {
   // Rename CFBundleDisplayName in Contents/Info.plist
   let contents_info_plist_path = `${outDir}/nwjs.app/Contents/Info.plist`;
   let contents_info_plist_json = plist.parse(
@@ -15,17 +15,16 @@ const setOsxConfig = async (pkg, outDir) => {
   // Rename CFBundleDisplayName in Contents/Resources/en.lproj/InfoPlist.strings
 
   // Rename Helper apps in Contents/Framework.framework/Versions/n.n.n.n/Helpers
-  let chromium_version = "107.0.5304.88";
   let helper_app_path_alerts = (name = "nwjs") =>
-    `${outDir}/nwjs.app/Contents/Frameworks/nwjs Framework.framework/Versions/${chromium_version}/Helpers/${name} Helper (Alerts).app`;
+    `${outDir}/nwjs.app/Contents/Frameworks/nwjs Framework.framework/Versions/${releaseInfo.components.chromium}/Helpers/${name} Helper (Alerts).app`;
   let helper_app_path_gpu = (name = "nwjs") =>
-    `${outDir}/nwjs.app/Contents/Frameworks/nwjs Framework.framework/Versions/${chromium_version}/Helpers/${name} Helper (GPU).app`;
+    `${outDir}/nwjs.app/Contents/Frameworks/nwjs Framework.framework/Versions/${releaseInfo.components.chromium}/Helpers/${name} Helper (GPU).app`;
   let helper_app_path_plugin = (name = "nwjs") =>
-    `${outDir}/nwjs.app/Contents/Frameworks/nwjs Framework.framework/Versions/${chromium_version}/Helpers/${name} Helper (Plugin).app`;
+    `${outDir}/nwjs.app/Contents/Frameworks/nwjs Framework.framework/Versions/${releaseInfo.components.chromium}/Helpers/${name} Helper (Plugin).app`;
   let helper_app_path_renderer = (name = "nwjs") =>
-    `${outDir}/nwjs.app/Contents/Frameworks/nwjs Framework.framework/Versions/${chromium_version}/Helpers/${name} Helper (Renderer).app`;
+    `${outDir}/nwjs.app/Contents/Frameworks/nwjs Framework.framework/Versions/${releaseInfo.components.chromium}/Helpers/${name} Helper (Renderer).app`;
   let helper_app_path = (name = "nwjs") =>
-    `${outDir}/nwjs.app/Contents/Frameworks/nwjs Framework.framework/Versions/${chromium_version}/Helpers/${name} Helper.app`;
+    `${outDir}/nwjs.app/Contents/Frameworks/nwjs Framework.framework/Versions/${releaseInfo.components.chromium}/Helpers/${name} Helper.app`;
   await fs.rename(helper_app_path_alerts(), helper_app_path_alerts(pkg.name));
   await fs.rename(helper_app_path_gpu(), helper_app_path_gpu(pkg.name));
   await fs.rename(helper_app_path_plugin(), helper_app_path_plugin(pkg.name));

diff --git a/src/bld/package.js b/src/bld/package.js
@@ -5,7 +5,7 @@ import { setLinuxConfig } from "./linuxCfg.js";
 import { setOsxConfig } from "./osxCfg.js";
 import { setWinConfig } from "./winCfg.js";
 
-const packager = async (srcDir, nwDir, outDir, platform, zip) => {
+const packager = async (srcDir, nwDir, outDir, platform, zip, releaseInfo) => {
   fs.rmSync(outDir, { force: true, recursive: true });
   fs.cpSync(nwDir, outDir, { recursive: true });
   fs.cpSync(
@@ -33,7 +33,7 @@ const packager = async (srcDir, nwDir, outDir, platform, zip) => {
       setWinConfig(pkg, outDir);
       break;
     case "osx":
-      setOsxConfig(pkg, outDir);
+      setOsxConfig(pkg, outDir, releaseInfo);
       break;
     default:
       break;

diff --git a/src/cli.js b/src/cli.js
@@ -3,7 +3,7 @@
 import yargs from "yargs/yargs";
 import { hideBin } from "yargs/helpers";
 
-import nwbuild from "./nwbuild.js";
+import { nwbuild } from "./nwbuild.js";
 
 const cli = yargs(hideBin(process.argv))
   .version(false)

diff --git a/src/get/getManifest.js b/src/get/getManifest.js
@@ -0,0 +1,21 @@
+import https from "node:https";
+
+export const getManifest  = (manifestUrl) => {
+    let chunks = undefined;
+
+    return new Promise((resolve, reject) => {
+        https.get(manifestUrl, (res) => {
+            res.on("data", (chunk) => {
+                chunks += chunk;
+            });
+
+            res.on("error", (e) => {
+                reject(e);
+            });
+
+            res.on("end", () => {
+                resolve(chunks);
+            });
+        });
+    });
+};
diff --git a/src/get/getReleaseInfo.js b/src/get/getReleaseInfo.js
@@ -0,0 +1,21 @@
+import fs from "node:fs/promises";
+
+import { getManifest } from "./getManifest.js";
+
+export const getReleaseInfo = async (version, cacheDir, manifestUrl) => {
+    let releaseData = undefined;
+    try {
+        await fs.access(`${cacheDir}/manifest.json`);
+        console.log(`[ INFO ] Manifest file already exists locally under ${cacheDir}`)
+    } catch(e) {
+        console.log(`[ ERROR ] Manifest file does not exist locally`);
+        console.log(`[ INFO ] Downloading latest manifest file under ${cacheDir}`);
+        const data = await getManifest(manifestUrl);
+    await fs.writeFile(`${cacheDir}/manifest.json`, data.slice(9));
+    } finally {
+        let manifestData = await fs.readFile(`${cacheDir}/manifest.json`);
+        let manifestJson = JSON.parse(manifestData);
+        releaseData = manifestJson.versions.find(release => release.version === `v${version}`);
+    }
+    return releaseData;
+};
diff --git a/src/nwbuild.js b/src/nwbuild.js
@@ -2,6 +2,7 @@ import fs from "node:fs/promises";
 import { decompress } from "./get/decompress.js";
 import { develop } from "./run/develop.js";
 import { download } from "./get/download.js";
+import { getReleaseInfo } from "./get/getReleaseInfo.js";
 import { remove } from "./get/remove.js";
 import { packager } from "./bld/package.js";
 
@@ -32,7 +33,7 @@ const nwbuild = async ({
   outDir,
   // flags
   downloadUrl = "https://dl.nwjs.io",
-  // manifestUrl = "https://nwjs.io/versions",
+  manifestUrl = "https://nwjs.io/versions",
   noCache = false,
   zip = false,
   run = false,
@@ -60,6 +61,8 @@ const nwbuild = async ({
       outDir = pkgData.nwbuild.outDir ?? outDir;
     }
   }
+
+  let releaseInfo = await getReleaseInfo(version, cacheDir, manifestUrl);
   let nwDir = `${cacheDir}/nwjs${
     flavour === "sdk" ? "-sdk" : ""
   }-v${version}-${platform}-${arch}`;
@@ -82,7 +85,7 @@ const nwbuild = async ({
   if (run === true) {
     await develop(srcDir, nwDir, platform);
   } else {
-    await packager(srcDir, nwDir, outDir, platform, zip);
+    await packager(srcDir, nwDir, outDir, platform, zip, releaseInfo);
   }
 };
 

diff --git a/test/demo/bld.js b/test/demo/bld.js
diff --git a/test/demo/nwapp/package.json b/test/demo/nwapp/package.json
@@ -9,6 +9,6 @@
         "platform": "osx",
         "arch": "x64",
         "outDir": "./build",
-        "run": true
+        "run": false
     }
 }
diff --git a/test/demo/run.js b/test/demo/run.js