Merge branch 'main' into fix/less-globbing

Author: robertsLando

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [6.1.1](https://github.com/yao-pkg/pkg/compare/v6.1.0...v6.1.1) (2024-11-13)
+
+### Bug Fixes
+
+- missing `fs/promises` patches to resolve `Not found` error ([#124](https://github.com/yao-pkg/pkg/issues/124)) ([93fed60](https://github.com/yao-pkg/pkg/commit/93fed60943fef354e0cefde58b72fa48eb8ff23e))
+
 ## [6.1.0](https://github.com/yao-pkg/pkg/compare/v6.0.1...v6.1.0) (2024-11-04)
 
 ### Features

lib/sea.ts

@@ -156,7 +156,15 @@ function getNodeOs(platform: string) {
 
 /** Get the node arch based on target arch */
 function getNodeArch(arch: string) {
-  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}`);
@@ -166,7 +174,7 @@ function getNodeArch(arch: string) {
 }
 
 /** Get latest node version based on the provided partial version */
-async function getNodeVersion(nodeVersion: string) {
+async function getNodeVersion(os: string, arch: string, nodeVersion: string) {
   // 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)) {
@@ -183,23 +191,39 @@ async function getNodeVersion(nodeVersion: string) {
     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: { version: string }) => v.version)
-    .find((v: string) => v.startsWith(`v${nodeVersion}`));
+  const nodeOS = os === 'darwin' ? 'osx' : os;
+  const latestVersionAndFiles = versions
+    .map((v: { version: string; files: string[] }) => [v.version, v.files])
+    .find(
+      ([v, files]: [string, string[]]) =>
+        v.startsWith(`v${nodeVersion}`) &&
+        files.find((f: string) => f.startsWith(`${nodeOS}-${arch}`)),
+    );
 
-  if (!latestVersion) {
+  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 */
@@ -222,16 +246,31 @@ async function getNodejsExecutable(
     return process.execPath;
   }
 
+  const os = getNodeOs(target.platform);
+  const arch = getNodeArch(target.arch);
+
   const nodeVersion = await getNodeVersion(
+    os,
+    arch,
     target.nodeRange.replace('node', ''),
   );
 
-  const os = getNodeOs(target.platform);
-  const arch = getNodeArch(target.arch);
-
   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 = join(homedir(), '.pkg-cache', 'sea');
 
   // Ensure the download directory exists

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yao-pkg/pkg",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "description": "Package your Node.js project into an executable",
   "main": "lib-es5/index.js",
   "license": "MIT",

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 ?
   }
 
   // ///////////////////////////////////////////////////////////////

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');
     }
   }
 })();