codexui-android 0.1.94 → 0.1.95

package/dist-cli/index.js

@@ -8,7 +8,7 @@ import { homedir as homedir6, networkInterfaces } from "os";
 import { isAbsolute as isAbsolute4, join as join9, resolve as resolve3 } from "path";
 import { spawn as spawn5 } from "child_process";
 import { createInterface as createInterface2 } from "readline/promises";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import { fileURLToPath as fileURLToPath3 } from "url";
 import { dirname as dirname5 } from "path";
 import { get as httpsGet } from "https";
 import { Command } from "commander";
@@ -215,7 +215,7 @@ function parseApprovalPolicy(value) {
 }
 
 // src/server/httpServer.ts
-import { fileURLToPath } from "url";
+import { fileURLToPath as fileURLToPath2 } from "url";
 import { dirname as dirname4, extname as extname3, isAbsolute as isAbsolute3, join as join8 } from "path";
 import { existsSync as existsSync4 } from "fs";
 import { writeFile as writeFile5, stat as stat6 } from "fs/promises";
@@ -4352,6 +4352,7 @@ import { createRequire } from "module";
 import { basename as basename2, dirname, join as join5 } from "path";
 import { homedir as homedir4 } from "os";
 import { spawnSync as spawnSync2 } from "child_process";
+import { fileURLToPath } from "url";
 var TERMINAL_BUFFER_LIMIT = 16 * 1024;
 var DEFAULT_COLS = 80;
 var DEFAULT_ROWS = 24;
@@ -4589,22 +4590,26 @@ function loadTerminalSpawn() {
   repairNativePtyBuild("node-pty");
   if (resolveNodePtyPrebuiltPath()) {
     try {
-      const terminal2 = require2("node-pty-prebuilt-multiarch");
+      const terminal2 = requirePtyPackage("node-pty-prebuilt-multiarch");
       return terminal2.spawn;
     } catch {
     }
   }
-  const terminal = require2("node-pty");
+  const terminal = requirePtyPackage("node-pty");
   return terminal.spawn;
 }
 function repairNativePtyBuild(packageName) {
   try {
-    const packageJson = require2.resolve(`${packageName}/package.json`);
-    const packageRoot = dirname(packageJson);
+    const packageRoot = resolvePtyPackageRoot(packageName);
+    if (!packageRoot) return;
     const buildDir = join5(packageRoot, "build");
     const makefile = join5(buildDir, "Makefile");
     const binary = join5(buildDir, "Release", "pty.node");
-    if (!existsSync3(makefile) || !isBrokenSymlink(binary)) return;
+    if (!existsSync3(binary) && !existsSync3(makefile)) {
+      runNodeGypRebuild(packageRoot);
+    }
+    if (existsSync3(binary) && !isBrokenSymlink(binary)) return;
+    if (!existsSync3(makefile)) return;
     const source = readFileSync(makefile, "utf8");
     const patched = source.replace(
       /^cmd_copy = ln -f "\$<" "\$@" 2>\/dev\/null \|\| \(rm -rf "\$@" && cp -af "\$<" "\$@"\)$/m,
@@ -4618,6 +4623,55 @@ function repairNativePtyBuild(packageName) {
   } catch {
   }
 }
+function requirePtyPackage(packageName) {
+  const vendorRoot = resolveVendorPtyPackageRoot(packageName);
+  if (vendorRoot) {
+    try {
+      return require2(vendorRoot);
+    } catch {
+    }
+  }
+  return require2(packageName);
+}
+function resolvePtyPackageRoot(packageName) {
+  try {
+    return dirname(require2.resolve(`${packageName}/package.json`));
+  } catch {
+    return resolveVendorPtyPackageRoot(packageName);
+  }
+}
+function resolveVendorPtyPackageRoot(packageName) {
+  try {
+    const moduleDir = dirname(fileURLToPath(import.meta.url));
+    const candidate = join5(moduleDir, "..", "vendor", "node_modules", packageName);
+    return existsSync3(join5(candidate, "package.json")) ? candidate : null;
+  } catch {
+    return null;
+  }
+}
+function runNodeGypRebuild(packageRoot) {
+  const nodeGyp = resolveNodeGypCli();
+  if (!nodeGyp) return;
+  spawnSync2(process.execPath, [nodeGyp, "rebuild"], {
+    cwd: packageRoot,
+    stdio: "ignore"
+  });
+}
+function resolveNodeGypCli() {
+  if (process.env.npm_config_node_gyp && existsSync3(process.env.npm_config_node_gyp)) {
+    return process.env.npm_config_node_gyp;
+  }
+  try {
+    return require2.resolve("node-gyp/bin/node-gyp.js");
+  } catch {
+  }
+  const npmRoot = spawnSync2("npm", ["root", "-g"], { encoding: "utf8" }).stdout.trim();
+  const candidates = [
+    join5(npmRoot, "node-gyp", "bin", "node-gyp.js"),
+    join5(npmRoot, "npm", "node_modules", "node-gyp", "bin", "node-gyp.js")
+  ];
+  return candidates.find((candidate) => existsSync3(candidate)) ?? null;
+}
 function isBrokenSymlink(path) {
   try {
     if (!lstatSync(path).isSymbolicLink()) return false;
@@ -4632,8 +4686,8 @@ function isBrokenSymlink(path) {
 }
 function resolveNodePtyPrebuiltPath() {
   try {
-    const packageJson = require2.resolve("node-pty-prebuilt-multiarch/package.json");
-    const packageRoot = dirname(packageJson);
+    const packageRoot = resolvePtyPackageRoot("node-pty-prebuilt-multiarch");
+    if (!packageRoot) return null;
     const builtPath = join5(packageRoot, "build", "Release", "pty.node");
     if (existsSync3(builtPath)) {
       return builtPath;
@@ -4650,8 +4704,8 @@ function resolveNodePtyPrebuiltPath() {
 function ensureNodePtyPrebuiltExecutable() {
   if (process.platform !== "darwin" && process.platform !== "linux") return;
   try {
-    const nodePtyEntry = require2.resolve("node-pty-prebuilt-multiarch");
-    const packageRoot = join5(dirname(nodePtyEntry), "..");
+    const packageRoot = resolvePtyPackageRoot("node-pty-prebuilt-multiarch");
+    if (!packageRoot) return;
     const helperPath = join5(packageRoot, "prebuilds", `${process.platform}-${process.arch}`, "spawn-helper");
     if (existsSync3(helperPath)) {
       chmodSync(helperPath, 493);
@@ -8994,7 +9048,7 @@ async function createTextEditorHtml(localPath) {
 
 // src/server/httpServer.ts
 import { WebSocketServer } from "ws";
-var __dirname = dirname4(fileURLToPath(import.meta.url));
+var __dirname = dirname4(fileURLToPath2(import.meta.url));
 var distDir = join8(__dirname, "..", "dist");
 var spaEntryFile = join8(distDir, "index.html");
 var IMAGE_CONTENT_TYPES = {
@@ -9235,7 +9289,7 @@ function generatePassword() {
 
 // src/cli/index.ts
 var program = new Command().name("codexui").description("Web interface for Codex app-server");
-var __dirname2 = dirname5(fileURLToPath2(import.meta.url));
+var __dirname2 = dirname5(fileURLToPath3(import.meta.url));
 var hasPromptedCloudflaredInstall = false;
 function getCodexHomePath() {
   return process.env.CODEX_HOME?.trim() || join9(homedir6(), ".codex");