@yao-pkg/pkg 6.1.0 → 6.2.0

package/lib-es5/sea.js

@@ -109,14 +109,22 @@ function getNodeOs(platform) {
 }
 /** Get the node arch based on target arch */
 function getNodeArch(arch) {
-    const allowedArchs = ['x64', 'arm64', 'armv7l', 'ppc64', 's390x'];
+    const allowedArchs = [
+        'x64',
+        'arm64',
+        'armv7l',
+        'ppc64',
+        's390x',
+        'riscv64',
+        'loong64',
+    ];
     if (!allowedArchs.includes(arch)) {
         throw new Error(`Unsupported architecture: ${arch}`);
     }
     return arch;
 }
 /** Get latest node version based on the provided partial version */
-async function getNodeVersion(nodeVersion) {
+async function getNodeVersion(os, arch, nodeVersion) {
     // validate nodeVersion using regex. Allowed formats: 16, 16.0, 16.0.0
     const regex = /^\d{1,2}(\.\d{1,2}){0,2}$/;
     if (!regex.test(nodeVersion)) {
@@ -129,18 +137,30 @@ async function getNodeVersion(nodeVersion) {
     if (parts.length === 3) {
         return nodeVersion;
     }
-    const response = await fetch('https://nodejs.org/dist/index.json');
+    let url;
+    switch (arch) {
+        case 'riscv64':
+        case 'loong64':
+            url = 'https://unofficial-builds.nodejs.org/download/release/index.json';
+            break;
+        default:
+            url = 'https://nodejs.org/dist/index.json';
+            break;
+    }
+    const response = await fetch(url);
     if (!response.ok) {
         throw new Error('Failed to fetch node versions');
     }
     const versions = await response.json();
-    const latestVersion = versions
-        .map((v) => v.version)
-        .find((v) => v.startsWith(`v${nodeVersion}`));
-    if (!latestVersion) {
+    const nodeOS = os === 'darwin' ? 'osx' : os;
+    const latestVersionAndFiles = versions
+        .map((v) => [v.version, v.files])
+        .find(([v, files]) => v.startsWith(`v${nodeVersion}`) &&
+        files.find((f) => f.startsWith(`${nodeOS}-${arch}`)));
+    if (!latestVersionAndFiles) {
         throw new Error(`Node version ${nodeVersion} not found`);
     }
-    return latestVersion;
+    return latestVersionAndFiles[0];
 }
 /** Fetch, validate and extract nodejs binary. Returns a path to it */
 async function getNodejsExecutable(target, opts) {
@@ -154,12 +174,23 @@ async function getNodejsExecutable(target, opts) {
     if (opts.useLocalNode) {
         return process.execPath;
     }
-    const nodeVersion = await getNodeVersion(target.nodeRange.replace('node', ''));
     const os = getNodeOs(target.platform);
     const arch = getNodeArch(target.arch);
+    const nodeVersion = await getNodeVersion(os, arch, target.nodeRange.replace('node', ''));
     const fileName = `node-${nodeVersion}-${os}-${arch}.${os === 'win' ? 'zip' : 'tar.gz'}`;
-    const url = `https://nodejs.org/dist/${nodeVersion}/${fileName}`;
-    const checksumUrl = `https://nodejs.org/dist/${nodeVersion}/SHASUMS256.txt`;
+    let url;
+    let checksumUrl;
+    switch (arch) {
+        case 'riscv64':
+        case 'loong64':
+            url = `https://unofficial-builds.nodejs.org/download/release/${nodeVersion}/${fileName}`;
+            checksumUrl = `https://unofficial-builds.nodejs.org/download/release/${nodeVersion}/SHASUMS256.txt`;
+            break;
+        default:
+            url = `https://nodejs.org/dist/${nodeVersion}/${fileName}`;
+            checksumUrl = `https://nodejs.org/dist/${nodeVersion}/SHASUMS256.txt`;
+            break;
+    }
     const downloadDir = (0, path_1.join)((0, os_1.homedir)(), '.pkg-cache', 'sea');
     // Ensure the download directory exists
     if (!(await exists(downloadDir))) {
@@ -215,6 +246,7 @@ async function sea(entryPoint, opts) {
     // create a temporary directory for the processing work
     const tmpDir = (0, path_1.join)((0, os_1.tmpdir)(), 'pkg-sea', `${Date.now()}`);
     await (0, promises_1.mkdir)(tmpDir, { recursive: true });
+    const previousDirectory = process.cwd();
     try {
         // change working directory to the temp directory
         process.chdir(tmpDir);
@@ -262,6 +294,7 @@ async function sea(entryPoint, opts) {
         await (0, promises_1.rm)(tmpDir, { recursive: true }).catch(() => {
             log_1.log.warn(`Failed to cleanup the temp directory ${tmpDir}`);
         });
+        process.chdir(previousDirectory);
     }
 }
 exports.default = sea;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yao-pkg/pkg",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "description": "Package your Node.js project into an executable",
   "main": "lib-es5/index.js",
   "license": "MIT",
@@ -25,7 +25,7 @@
     "@babel/generator": "^7.23.0",
     "@babel/parser": "^7.23.0",
     "@babel/types": "^7.23.0",
-    "@yao-pkg/pkg-fetch": "3.5.17",
+    "@yao-pkg/pkg-fetch": "3.5.18",
     "into-stream": "^6.0.0",
     "minimist": "^1.2.6",
     "multistream": "^4.1.0",

package/prelude/bootstrap.js

@@ -1722,12 +1722,16 @@ function payloadFileSync(pointer) {
     fs.promises.stat = util.promisify(fs.stat);
     fs.promises.lstat = util.promisify(fs.lstat);
 
-    /*
     fs.promises.read = util.promisify(fs.read);
     fs.promises.realpath = util.promisify(fs.realpath);
     fs.promises.fstat = util.promisify(fs.fstat);
+    fs.promises.statfs = util.promisify(fs.fstat);
     fs.promises.access = util.promisify(fs.access);
-  */
+
+    // TODO: all promises methods that try to edit files in snapshot should throw
+    // TODO implement missing methods
+    // fs.promises.readlink ?
+    // fs.promises.opendir ?
   }
 
   // ///////////////////////////////////////////////////////////////

package/prelude/diagnostic.js

@@ -80,7 +80,7 @@ function humanSize(bytes) {
     return totalSize;
   }
   function wrap(obj, name) {
-    const f = fs[name];
+    const f = obj[name];
     obj[name] = (...args) => {
       const args1 = Object.values(args);
       console.log(
@@ -111,6 +111,7 @@ function humanSize(bytes) {
       wrap(fs, 'open');
       wrap(fs, 'readSync');
       wrap(fs, 'read');
+      wrap(fs, 'readFile');
       wrap(fs, 'writeSync');
       wrap(fs, 'write');
       wrap(fs, 'closeSync');
@@ -131,6 +132,18 @@ function humanSize(bytes) {
       wrap(fs, 'exists');
       wrap(fs, 'accessSync');
       wrap(fs, 'access');
+
+      wrap(fs.promises, 'open');
+      wrap(fs.promises, 'read');
+      wrap(fs.promises, 'readFile');
+      wrap(fs.promises, 'write');
+      wrap(fs.promises, 'readdir');
+      wrap(fs.promises, 'realpath');
+      wrap(fs.promises, 'stat');
+      wrap(fs.promises, 'lstat');
+      wrap(fs.promises, 'fstat');
+      wrap(fs.promises, 'access');
+      wrap(fs.promises, 'copyFile');
     }
   }
 })();