nuwax-codex 0.17.5 → 0.17.8

package/bin/nuwax-codex.js

@@ -7,8 +7,6 @@ import { spawnSync } from "node:child_process";
 import { createWriteStream, existsSync, mkdirSync, chmodSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, dirname } from "node:path";
-import { pipeline } from "node:stream/promises";
-import { createGunzip } from "node:zlib";
 import { familySync } from "detect-libc";
 import { createRequire } from "node:module";
 
@@ -88,6 +86,13 @@ async function downloadBinary(url, outPath) {
     clearInterval(logInterval);
     ws.end();
   }
+  // 等待写流的文件描述符真正释放、数据全部落盘后再返回。解压阶段(tar / yauzl)
+  // 要读取这个归档文件,若 Node 仍持有写句柄,数据未必已刷盘、在 Windows 上还可能
+  // 被独占打开拒绝。ws.end() 只是结束写入,fd 在 ‘close’ 事件时才异步关闭,必须 await。
+  await new Promise((resolve, reject) => {
+    ws.once("close", resolve);
+    ws.once("error", reject);
+  });
   process.stderr.write("\n");
 
   if (process.platform !== "win32") {
@@ -96,62 +101,48 @@ async function downloadBinary(url, outPath) {
 }
 
 async function extractTarGz(archivePath, destDir) {
-  // Simple tar.gz extraction: members are listed sequentially as
-  // [header(512B)][content(padded to 512B)]...
-  const { createReadStream } = await import("node:fs");
-  const { createGunzip } = await import("node:zlib");
-  const { pipeline } = await import("node:stream/promises");
-  const { Transform } = await import("node:stream");
-  const { writeFileSync } = await import("node:fs");
-
-  const gunzip = createGunzip();
-  const rs = createReadStream(archivePath);
-  let buffer = Buffer.alloc(0);
-
-  await pipeline(
-    rs,
-    gunzip,
-    new Transform({
-      transform(chunk, _enc, cb) {
-        buffer = Buffer.concat([buffer, chunk]);
-        while (buffer.length >= 512) {
-          // Parse tar header
-          const name = buffer.toString("utf8", 0, 100).replace(/\0.*$/, "");
-          const sizeStr = buffer.toString("utf8", 124, 136).replace(/\0.*$/, "");
-          const size = parseInt(sizeStr, 8);
-          if (isNaN(size) || size < 0) break;
-
-          const totalSize = Math.ceil((512 + size) / 512) * 512;
-          if (buffer.length < totalSize) break;
-
-          if (name && !name.endsWith("/") && size > 0) {
-            const fileData = buffer.subarray(512, 512 + size);
-            const outPath = join(destDir, name);
-            mkdirSync(dirname(outPath), { recursive: true });
-            writeFileSync(outPath, fileData);
-            if (process.platform !== "win32") {
-              chmodSync(outPath, 0o755);
-            }
-          }
-
-          buffer = buffer.subarray(totalSize);
-        }
-        cb();
-      },
-    }),
-  );
+  // 用成熟的 npm `tar` 库流式解压。仓库原先手写 tar 解析器,会把整个 entry 攒进
+  // 一个 Buffer 再落盘,对 codex 这种 ~280MB 的单文件归档是 O(n²) 内存拷贝
+  // (实测 15s 都写不出一个文件),在 macOS/Linux 上表现为“卡在 Extracting”。
+  // `tar` 走流式管道、内存恒定,并按归档内记录的 mode 还原可执行位(已验证 0o755)。
+  const tar = await import("tar");
+  await tar.x({ file: archivePath, cwd: destDir, gzip: true });
 }
 
 async function extractZip(archivePath, destDir) {
-  // extractZip 仅在 Windows 上触发（getArchiveExt 对 win32 返回 zip）。
-  // Windows 没有内置 `unzip` 命令，改用 PowerShell 的 Expand-Archive 解压。
-  const { execSync } = await import("node:child_process");
-  const psArchive = archivePath.replace(/'/g, "''");
-  const psDest = destDir.replace(/'/g, "''");
-  execSync(
-    `powershell -NoProfile -NonInteractive -Command "Expand-Archive -LiteralPath '${psArchive}' -DestinationPath '${psDest}' -Force"`,
-    { stdio: "inherit" },
-  );
+  // Windows 上用纯 JS 的 yauzl 流式解压。原实现调用 PowerShell Expand-Archive,
+  // 两个硬伤:老版本 Windows PowerShell(5.0 前)没有该 cmdlet;它用独占 FileStream
+  // 打开 zip,极易撞“正由另一进程使用”(Node 写句柄未释放 / Defender 实时扫描)。
+  // yauzl 经 Node fs 以共享只读方式读取,绕开这两类问题,且逐条目流式落盘、内存恒定。
+  const yauzl = await import("yauzl");
+  const { createWriteStream, mkdirSync } = await import("node:fs");
+  const { dirname, join } = await import("node:path");
+
+  await new Promise((resolve, reject) => {
+    yauzl.open(archivePath, { lazyEntries: true, autoClose: true }, (err, zipfile) => {
+      if (err) return reject(err);
+      zipfile.on("error", reject);
+      zipfile.on("entry", (entry) => {
+        const outPath = join(destDir, entry.fileName);
+        if (/\/$/.test(entry.fileName)) {
+          mkdirSync(outPath, { recursive: true });
+          zipfile.readEntry();
+          return;
+        }
+        mkdirSync(dirname(outPath), { recursive: true });
+        zipfile.openReadStream(entry, (e, readStream) => {
+          if (e) return reject(e);
+          const ws = createWriteStream(outPath);
+          readStream.on("error", reject);
+          ws.on("error", reject);
+          ws.on("close", () => zipfile.readEntry());
+          readStream.pipe(ws);
+        });
+      });
+      zipfile.on("close", resolve);
+      zipfile.readEntry();
+    });
+  });
 }
 
 // -- main -------------------------------------------------------------------

package/bin/postinstall.js

@@ -2,13 +2,9 @@
 // Postinstall script: pre-downloads the native `nuwax-codex` binary from
 // Alibaba Cloud OSS so the first CLI invocation is instant.
 
-import { createWriteStream, existsSync, mkdirSync, chmodSync, writeFileSync } from "node:fs";
+import { createWriteStream, existsSync, mkdirSync, chmodSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, dirname } from "node:path";
-import { createGunzip } from "node:zlib";
-import { pipeline } from "node:stream/promises";
-import { Transform } from "node:stream";
-import { createReadStream } from "node:fs";
 import { createRequire } from "node:module";
 
 const require = createRequire(import.meta.url);
@@ -88,6 +84,13 @@ async function downloadBinary(url, outPath) {
     clearInterval(logInterval);
     ws.end();
   }
+  // 等待写流的文件描述符真正释放、数据全部落盘后再返回。解压阶段(tar / yauzl)
+  // 要读取这个归档文件,若 Node 仍持有写句柄,数据未必已刷盘、在 Windows 上还可能
+  // 被独占打开拒绝。ws.end() 只是结束写入,fd 在 ‘close’ 事件时才异步关闭,必须 await。
+  await new Promise((resolve, reject) => {
+    ws.once("close", resolve);
+    ws.once("error", reject);
+  });
   process.stderr.write("\n");
   if (process.platform !== "win32") {
     chmodSync(outPath, 0o755);
@@ -99,51 +102,48 @@ async function downloadBinary(url, outPath) {
 // ---------------------------------------------------------------------------
 
 async function extractTarGz(archivePath, destDir) {
-  const gunzip = createGunzip();
-  const rs = createReadStream(archivePath);
-  let buffer = Buffer.alloc(0);
-
-  await pipeline(
-    rs,
-    gunzip,
-    new Transform({
-      transform(chunk, _enc, cb) {
-        buffer = Buffer.concat([buffer, chunk]);
-        while (buffer.length >= 512) {
-          const name = buffer.toString("utf8", 0, 100).replace(/\0.*$/, "");
-          const sizeStr = buffer.toString("utf8", 124, 136).replace(/\0.*$/, "");
-          const size = parseInt(sizeStr, 8);
-          if (isNaN(size) || size < 0) break;
-          const totalSize = Math.ceil((512 + size) / 512) * 512;
-          if (buffer.length < totalSize) break;
-          if (name && !name.endsWith("/") && size > 0) {
-            const fileData = buffer.subarray(512, 512 + size);
-            const outPath = join(destDir, name);
-            mkdirSync(dirname(outPath), { recursive: true });
-            writeFileSync(outPath, fileData);
-            if (process.platform !== "win32") {
-              chmodSync(outPath, 0o755);
-            }
-          }
-          buffer = buffer.subarray(totalSize);
-        }
-        cb();
-      },
-    }),
-  );
+  // 用成熟的 npm `tar` 库流式解压。仓库原先手写 tar 解析器,会把整个 entry 攒进
+  // 一个 Buffer 再落盘,对 codex 这种 ~280MB 的单文件归档是 O(n²) 内存拷贝
+  // (实测 15s 都写不出一个文件),在 macOS/Linux 上表现为“卡在 Extracting”。
+  // `tar` 走流式管道、内存恒定,并按归档内记录的 mode 还原可执行位(已验证 0o755)。
+  const tar = await import("tar");
+  await tar.x({ file: archivePath, cwd: destDir, gzip: true });
 }
 
 async function extractZip(archivePath, destDir) {
-  // extractZip 仅在 Windows 上触发（getArchiveExt 对 win32 返回 zip）。
-  // Windows 没有内置 `unzip` 命令，改用 PowerShell 的 Expand-Archive 解压，
-  // 否则 Windows 用户安装后预下载会被静默吞掉、首次运行 CLI 直接报错退出。
-  const { execSync } = await import("node:child_process");
-  const psArchive = archivePath.replace(/'/g, "''");
-  const psDest = destDir.replace(/'/g, "''");
-  execSync(
-    `powershell -NoProfile -NonInteractive -Command "Expand-Archive -LiteralPath '${psArchive}' -DestinationPath '${psDest}' -Force"`,
-    { stdio: "inherit" },
-  );
+  // Windows 上用纯 JS 的 yauzl 流式解压。原实现调用 PowerShell Expand-Archive,
+  // 两个硬伤:老版本 Windows PowerShell(5.0 前)没有该 cmdlet;它用独占 FileStream
+  // 打开 zip,极易撞“正由另一进程使用”(Node 写句柄未释放 / Defender 实时扫描)。
+  // yauzl 经 Node fs 以共享只读方式读取,绕开这两类问题,且逐条目流式落盘、内存恒定。
+  const yauzl = await import("yauzl");
+  const { createWriteStream, mkdirSync } = await import("node:fs");
+  const { dirname, join } = await import("node:path");
+
+  await new Promise((resolve, reject) => {
+    yauzl.open(archivePath, { lazyEntries: true, autoClose: true }, (err, zipfile) => {
+      if (err) return reject(err);
+      zipfile.on("error", reject);
+      zipfile.on("entry", (entry) => {
+        const outPath = join(destDir, entry.fileName);
+        if (/\/$/.test(entry.fileName)) {
+          mkdirSync(outPath, { recursive: true });
+          zipfile.readEntry();
+          return;
+        }
+        mkdirSync(dirname(outPath), { recursive: true });
+        zipfile.openReadStream(entry, (e, readStream) => {
+          if (e) return reject(e);
+          const ws = createWriteStream(outPath);
+          readStream.on("error", reject);
+          ws.on("error", reject);
+          ws.on("close", () => zipfile.readEntry());
+          readStream.pipe(ws);
+        });
+      });
+      zipfile.on("close", resolve);
+      zipfile.readEntry();
+    });
+  });
 }
 
 // ---------------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuwax-codex",
-  "version": "0.17.5",
+  "version": "0.17.8",
   "type": "module",
   "description": "Fork of OpenAI Codex CLI with domestic (Chinese) LLM support via genai",
   "license": "Apache-2.0",
@@ -22,6 +22,9 @@
     "llm",
     "genai"
   ],
+  "scripts": {
+    "postinstall": "node bin/postinstall.js"
+  },
   "bin": {
     "nuwax-codex": "bin/nuwax-codex.js"
   },
@@ -32,6 +35,8 @@
     "node": ">=20"
   },
   "dependencies": {
-    "detect-libc": "^2.0.0"
+    "detect-libc": "^2.0.0",
+    "tar": "^7.0.0",
+    "yauzl": "^3.1.0"
   }
 }