craft-native 0.0.185 → 0.0.187

package/dist/index.cjs

@@ -269,9 +269,8 @@ __export(exports_src, {
 });
 module.exports = __toCommonJS(exports_src);
 var import_node_child_process = require("node:child_process");
-var import_node_fs2 = require("node:fs");
-var import_node_os = require("node:os");
-var import_node_path = require("node:path");
+var import_node_fs3 = require("node:fs");
+var import_node_path2 = require("node:path");
 var import_node_util = require("node:util");
 
 // src/binary-resolver.ts
@@ -310,11 +309,125 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.185";
+var version = "0.0.187";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;
 
+// src/temp-dir.ts
+var import_node_fs2 = require("node:fs");
+var import_node_os = require("node:os");
+var import_node_path = require("node:path");
+var OWNED_NAME = /^craft-(?:.+-)?p(\d+)-[A-Za-z0-9]{6}$/;
+var KEEP_MARKER = ".craft-keep";
+var SWEEP_MIN_AGE_MS = 60000;
+var SIGNALS = ["SIGINT", "SIGTERM", "SIGHUP"];
+var live = new Set;
+var hooked = false;
+var swept = false;
+function removeQuietly(dir) {
+  try {
+    import_node_fs2.rmSync(dir, { recursive: true, force: true });
+  } catch {}
+}
+function removeAllTempDirs() {
+  for (const dir of live)
+    removeQuietly(dir);
+  live.clear();
+  unhook();
+}
+function onExit() {
+  for (const dir of live)
+    removeQuietly(dir);
+  live.clear();
+}
+function onSignal(signal) {
+  removeAllTempDirs();
+  if (process.listenerCount(signal) === 0)
+    process.exit(128 + (import_node_os.constants.signals[signal] ?? 1));
+}
+var signalHandlers = new Map(SIGNALS.map((signal) => [signal, () => onSignal(signal)]));
+function hook() {
+  if (hooked)
+    return;
+  hooked = true;
+  process.on("exit", onExit);
+  for (const [signal, handler] of signalHandlers) {
+    try {
+      process.on(signal, handler);
+    } catch {}
+  }
+}
+function unhook() {
+  if (!hooked)
+    return;
+  hooked = false;
+  process.off("exit", onExit);
+  for (const [signal, handler] of signalHandlers)
+    process.off(signal, handler);
+}
+function pidIsAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return error.code === "EPERM";
+  }
+}
+function sweepOrphanedTempDirs(options = {}) {
+  const root = options.root ?? import_node_os.tmpdir();
+  const isAlive = options.isAlive ?? pidIsAlive;
+  const minAge = options.minAgeMs ?? SWEEP_MIN_AGE_MS;
+  const now = options.now ?? Date.now();
+  const removed = [];
+  let names;
+  try {
+    names = import_node_fs2.readdirSync(root);
+  } catch {
+    return removed;
+  }
+  for (const name of names) {
+    const match = OWNED_NAME.exec(name);
+    if (!match)
+      continue;
+    const pid = Number(match[1]);
+    if (pid === process.pid || isAlive(pid))
+      continue;
+    const path = import_node_path.join(root, name);
+    try {
+      if (now - import_node_fs2.statSync(path).mtimeMs < minAge)
+        continue;
+      if (import_node_fs2.existsSync(import_node_path.join(path, KEEP_MARKER)))
+        continue;
+    } catch {
+      continue;
+    }
+    removeQuietly(path);
+    removed.push(path);
+  }
+  return removed;
+}
+function tempDirPrefix(label) {
+  const bare = label.replace(/^craft-/, "").replace(/-+$/, "");
+  return bare ? `craft-${bare}-p${process.pid}-` : `craft-p${process.pid}-`;
+}
+function createTempDir(label, root = import_node_os.tmpdir()) {
+  if (!swept) {
+    swept = true;
+    sweepOrphanedTempDirs({ root });
+  }
+  hook();
+  const dir = import_node_fs2.mkdtempSync(import_node_path.join(root, tempDirPrefix(label)));
+  live.add(dir);
+  return dir;
+}
+function removeTempDir(dir) {
+  removeQuietly(dir);
+  live.delete(dir);
+  if (live.size === 0)
+    unhook();
+}
+
 // src/package.ts
 var import_child_process = require("child_process");
 var import_crypto = require("crypto");
@@ -935,7 +1048,7 @@ async function createPKG(opts) {
     }));
     return built.success ? { success: true, outputPath: opts.outputPath } : { success: false, error: built.error };
   }
-  const tempDir = import_fs.mkdtempSync(import_path.join(import_os.tmpdir(), "craft-pkg-"));
+  const tempDir = createTempDir("craft-pkg-");
   try {
     const root = import_path.join(tempDir, "root");
     const appsDir = import_path.join(root, "Applications");
@@ -955,7 +1068,7 @@ async function createPKG(opts) {
     }));
     return built.success ? { success: true, outputPath: opts.outputPath } : { success: false, error: built.error };
   } finally {
-    import_fs.rmSync(tempDir, { recursive: true, force: true });
+    removeTempDir(tempDir);
   }
 }
 function xml(value) {
@@ -1075,7 +1188,7 @@ function runCommand(command, args, cwd) {
   });
 }
 async function createMSI(opts) {
-  const tempDir = import_fs.mkdtempSync(import_path.join(import_os.tmpdir(), "craft-msi-"));
+  const tempDir = createTempDir("craft-msi-");
   try {
     const binaryName = windowsExecutableName(opts.name);
     const additionalFiles = windowsCompanionFiles(opts.additionalFiles, binaryName);
@@ -1103,7 +1216,7 @@ async function createMSI(opts) {
     const missingTool = /ENOENT|not found/i.test(message);
     return { success: false, error: missingTool ? `WiX Toolset not found: ${message}` : message };
   } finally {
-    import_fs.rmSync(tempDir, { recursive: true, force: true });
+    removeTempDir(tempDir);
   }
 }
 async function createZIP(opts) {
@@ -1123,6 +1236,7 @@ async function createZIP(opts) {
 }
 async function createDEB(opts) {
   return new Promise((resolve) => {
+    let staging;
     try {
       const sanitizedName = opts.name.toLowerCase();
       const safeDebName = /^[a-z0-9._+-]+$/;
@@ -1145,7 +1259,8 @@ async function createDEB(opts) {
         }
       }
       const desktopContent = linuxDesktopEntry(opts.name, sanitizedName, opts.urlSchemes, opts.launchUrl);
-      const tempDir = import_fs.mkdtempSync(import_path.join(import_os.tmpdir(), "craft-deb-"));
+      const tempDir = createTempDir("craft-deb-");
+      staging = tempDir;
       const debianDir = import_path.join(tempDir, "DEBIAN");
       const binDir = import_path.join(tempDir, "usr", "bin");
       const applicationsDir = import_path.join(tempDir, "usr", "share", "applications");
@@ -1168,7 +1283,7 @@ Description: ${description || opts.name}
       import_fs.writeFileSync(import_path.join(applicationsDir, `${binaryName}.desktop`), desktopContent);
       const proc = import_child_process.spawn("dpkg-deb", ["--build", tempDir, opts.outputPath]);
       proc.on("close", (code) => {
-        import_fs.rmSync(tempDir, { recursive: true, force: true });
+        removeTempDir(tempDir);
         if (code === 0) {
           resolve({ success: true, outputPath: opts.outputPath });
         } else {
@@ -1176,10 +1291,12 @@ Description: ${description || opts.name}
         }
       });
       proc.on("error", (err) => {
-        import_fs.rmSync(tempDir, { recursive: true, force: true });
+        removeTempDir(tempDir);
         resolve({ success: false, error: err.message });
       });
     } catch (error) {
+      if (staging)
+        removeTempDir(staging);
       resolve({ success: false, error: error.message });
     }
   });
@@ -1260,8 +1377,10 @@ install -m 755 %{SOURCE0} %{buildroot}/usr/bin/${sanitizedName}
 }
 async function createAppImage(opts) {
   return new Promise((resolve) => {
+    let staging;
     try {
-      const appDir = import_fs.mkdtempSync(import_path.join(import_os.tmpdir(), "craft-appimage-"));
+      const appDir = createTempDir("craft-appimage-");
+      staging = appDir;
       const appDirPath = import_path.join(appDir, `${opts.name}.AppDir`);
       const binDir = import_path.join(appDirPath, "usr", "bin");
       const shareDir = import_path.join(appDirPath, "usr", "share");
@@ -1367,7 +1486,7 @@ Icon=${binaryName}
         env: { ...process.env, ARCH: "x86_64" }
       });
       proc.on("close", (code) => {
-        import_fs.rmSync(appDir, { recursive: true, force: true });
+        removeTempDir(appDir);
         if (code === 0) {
           import_fs.chmodSync(opts.outputPath, 493);
           resolve({ success: true, outputPath: opts.outputPath });
@@ -1376,10 +1495,12 @@ Icon=${binaryName}
         }
       });
       proc.on("error", (err) => {
-        import_fs.rmSync(appDir, { recursive: true, force: true });
+        removeTempDir(appDir);
         resolve({ success: false, error: `appimagetool not found: ${err.message}` });
       });
     } catch (error) {
+      if (staging)
+        removeTempDir(staging);
       resolve({ success: false, error: error.message });
     }
   });
@@ -10238,7 +10359,7 @@ __export(exports_updater, {
 });
 var import_fs4 = require("fs");
 var import_path3 = require("path");
-var import_os3 = require("os");
+var import_os2 = require("os");
 var import_child_process3 = require("child_process");
 var import_crypto3 = require("crypto");
 var import_events3 = require("events");
@@ -10246,7 +10367,6 @@ var import_events3 = require("events");
 // src/updater/macos-bundle.ts
 var import_child_process2 = require("child_process");
 var import_fs3 = require("fs");
-var import_os2 = require("os");
 var import_path2 = require("path");
 var import_util = require("util");
 var execFileAsync = import_util.promisify(import_child_process2.execFile);
@@ -10344,9 +10464,10 @@ function findTopLevelApp(root) {
   return parts[0] ?? null;
 }
 async function extractBundleFromDmg(dmgPath, stagingDir) {
-  const staging = stagingDir ?? import_fs3.mkdtempSync(import_path2.join(import_os2.tmpdir(), "craft-update-"));
-  const mountPoint = import_fs3.mkdtempSync(import_path2.join(import_os2.tmpdir(), "craft-mount-"));
+  const staging = stagingDir ?? createTempDir("craft-update-");
+  const mountPoint = createTempDir("craft-mount-");
   let mounted = false;
+  let staged = false;
   try {
     await execFileAsync("hdiutil", ["attach", dmgPath, "-nobrowse", "-readonly", "-mountpoint", mountPoint]);
     mounted = true;
@@ -10355,6 +10476,7 @@ async function extractBundleFromDmg(dmgPath, stagingDir) {
       throw new Error(`No .app found in disk image: ${dmgPath}`);
     const appPath = import_path2.join(staging, import_path2.basename(source));
     await dittoBundle(source, appPath);
+    staged = true;
     return { appPath, stagingDir: staging };
   } finally {
     if (mounted) {
@@ -10362,19 +10484,25 @@ async function extractBundleFromDmg(dmgPath, stagingDir) {
         await execFileAsync("hdiutil", ["detach", mountPoint, "-force"]);
       } catch {}
     }
-    try {
-      import_fs3.rmSync(mountPoint, { recursive: true, force: true });
-    } catch {}
+    removeTempDir(mountPoint);
+    if (!staged && !stagingDir)
+      removeTempDir(staging);
   }
 }
 async function extractBundleFromZip(zipPath, stagingDir) {
-  const staging = stagingDir ?? import_fs3.mkdtempSync(import_path2.join(import_os2.tmpdir(), "craft-update-"));
+  const staging = stagingDir ?? createTempDir("craft-update-");
   const unpacked = import_path2.join(staging, "payload");
-  await execFileAsync("ditto", ["-x", "-k", zipPath, unpacked]);
-  const source = findTopLevelApp(unpacked);
-  if (!source)
-    throw new Error(`No .app found in archive: ${zipPath}`);
-  return { appPath: source, stagingDir: staging };
+  try {
+    await execFileAsync("ditto", ["-x", "-k", zipPath, unpacked]);
+    const source = findTopLevelApp(unpacked);
+    if (!source)
+      throw new Error(`No .app found in archive: ${zipPath}`);
+    return { appPath: source, stagingDir: staging };
+  } catch (error) {
+    if (!stagingDir)
+      removeTempDir(staging);
+    throw error;
+  }
 }
 async function extractBundle(archivePath, stagingDir) {
   if (archivePath.endsWith(".dmg"))
@@ -10469,7 +10597,7 @@ class AutoUpdater extends import_events3.EventEmitter {
   downloadDir() {
     if (this.config.downloadDir)
       return this.config.downloadDir;
-    return import_path3.join(import_os3.tmpdir(), "craft-updates", import_path3.basename(this.config.appPath) || "app");
+    return import_path3.join(import_os2.tmpdir(), "craft-updates", import_path3.basename(this.config.appPath) || "app");
   }
   getLastError() {
     return this.lastError;
@@ -10759,9 +10887,7 @@ class AutoUpdater extends import_events3.EventEmitter {
         leftoverPath: previousPath
       });
     } finally {
-      try {
-        import_fs4.rmSync(staged.stagingDir, { recursive: true, force: true });
-      } catch {}
+      removeTempDir(staged.stagingDir);
     }
   }
   async assertBundleTrusted(bundlePath) {
@@ -11132,6 +11258,7 @@ function detectDevMode() {
 class CraftApp {
   process;
   config;
+  sidebarConfigDir;
   constructor(config = {}) {
     if (config.window?.width !== undefined && (config.window.width < 100 || config.window.width > 1e4)) {
       throw new Error(`Invalid window width: ${config.window.width}. Must be between 100 and 10000 pixels.`);
@@ -11168,8 +11295,15 @@ class CraftApp {
       throw new Error(`No content to display. Provide either html or url:
 ` + "  show(html, options) or loadURL(url, options)");
     }
+    this.removeSidebarConfig();
     const args = this.buildArgs();
-    const craftPath = await this.findCraftBinary();
+    let craftPath;
+    try {
+      craftPath = await this.findCraftBinary();
+    } catch (error) {
+      this.removeSidebarConfig();
+      throw error;
+    }
     probeBinaryVersion(craftPath);
     const quiet = this.config.quiet === true;
     this.process = import_node_child_process.spawn(craftPath, args, {
@@ -11182,6 +11316,7 @@ class CraftApp {
     });
     return new Promise((resolve, reject) => {
       this.process?.on("error", (error) => {
+        this.removeSidebarConfig();
         if (error.code === "ENOENT") {
           reject(new Error(craftBinaryNotFoundMessage(craftPath)));
           return;
@@ -11199,6 +11334,7 @@ class CraftApp {
 ` + "  https://github.com/home-lang/craft/issues"));
       });
       this.process?.on("close", (code) => {
+        this.removeSidebarConfig();
         if (code === 0 || code === null) {
           resolve();
         } else {
@@ -11216,6 +11352,12 @@ class CraftApp {
       this.process.kill();
     }
   }
+  removeSidebarConfig() {
+    if (!this.sidebarConfigDir)
+      return;
+    removeTempDir(this.sidebarConfigDir);
+    this.sidebarConfigDir = undefined;
+  }
   buildArgs() {
     const args = [];
     const { window: window3, html, url, appName } = this.config;
@@ -11314,9 +11456,10 @@ class CraftApp {
         if (safeForArgv) {
           args.push("--sidebar-config", json);
         } else {
-          const dir = import_node_fs2.mkdtempSync(import_node_path.join(import_node_os.tmpdir(), "craft-sidebar-"));
-          const path = import_node_path.join(dir, "sidebar-config.json");
-          import_node_fs2.writeFileSync(path, json, "utf-8");
+          const dir = createTempDir("craft-sidebar-");
+          this.sidebarConfigDir = dir;
+          const path = import_node_path2.join(dir, "sidebar-config.json");
+          import_node_fs3.writeFileSync(path, json, "utf-8");
           args.push("--sidebar-config-file", path);
         }
       }

package/dist/index.d.cts

@@ -42,6 +42,8 @@ export type { BundleIdentity, BundleTrustFailure, BundleTrustPolicy, BundleTrust
 export declare class CraftApp {
     private process?;
     private config;
+    /** The spilled sidebar config's directory, removed when the window process ends. */
+    private sidebarConfigDir?;
     constructor(config?: AppConfig);
     /**
      * Create and show a window with HTML content
@@ -55,6 +57,8 @@ export declare class CraftApp {
      * Close the window
      */
     close(): void;
+    /** The window process has read its sidebar config, or never will. */
+    private removeSidebarConfig;
     private buildArgs;
     /**
      * Resolve the `craft` binary to spawn.

package/dist/index.d.ts

@@ -42,6 +42,8 @@ export type { BundleIdentity, BundleTrustFailure, BundleTrustPolicy, BundleTrust
 export declare class CraftApp {
     private process?;
     private config;
+    /** The spilled sidebar config's directory, removed when the window process ends. */
+    private sidebarConfigDir?;
     constructor(config?: AppConfig);
     /**
      * Create and show a window with HTML content
@@ -55,6 +57,8 @@ export declare class CraftApp {
      * Close the window
      */
     close(): void;
+    /** The window process has read its sidebar config, or never will. */
+    private removeSidebarConfig;
     private buildArgs;
     /**
      * Resolve the `craft` binary to spawn.