craft-native 0.0.92 → 0.0.94

package/dist/index.d.ts

@@ -3,7 +3,27 @@
  * TypeScript SDK powered by Bun
  */
 import type { AppConfig, WindowOptions } from './types.js';
+/**
+ * The version a `craft --version` first line reports, whichever form it takes:
+ * `craft version 0.0.92`, `craft/0.0.92 darwin-arm64 bun-v1.4.1`,
+ * `craft 0.0.92`, `v0.0.92`, or a bare `0.0.92`.
+ *
+ * The slash form is the CLI's own, and used to survive the strip intact, so
+ * the whole line was compared against a semver and never matched — two
+ * identical versions reported as drift, on the one path where the real fault
+ * was that PATH had resolved to the CLI at all (#236).
+ */
 export declare function parseCraftVersionOutput(output: string): string;
+/**
+ * The rejection for a child that exited non-zero.
+ *
+ * Whatever the child managed to say comes first, because it is the only part
+ * that can name the actual fault. `quiet` used to map to `stdio: 'ignore'`,
+ * which threw that away and then told the caller to read output that no
+ * longer existed — leaving `exited with code 1` as the whole of the error
+ * (#236).
+ */
+export declare function craftProcessFailedMessage(code: number | null, stderr: string, quiet: boolean): string;
 export { packageApp, pack, type PackageConfig, type PackageResult } from './package.js';
 export { craftBinaryNotFoundMessage, resolveCraftBinary } from './binary-resolver.js';
 export * from './utils/index.js';

package/dist/index.js

@@ -17,7 +17,7 @@ var __require = import.meta.require;
 
 // src/index.ts
 import { execFile as execFile2, spawn as spawn4 } from "child_process";
-import { mkdtempSync as mkdtempSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
+import { mkdtempSync as mkdtempSync3, writeFileSync as writeFileSync3 } from "fs";
 import { tmpdir as tmpdir4 } from "os";
 import { join as join4 } from "path";
 import { promisify as promisify2 } from "util";
@@ -40,6 +40,7 @@ function resolveCraftBinary(explicit) {
   }
   return "craft";
 }
+var CRAFT_CLI_SPAWN_MARKER = "CRAFT_CLI_SPAWNED_FROM";
 function craftBinaryNotFoundMessage(triedPath) {
   return [
     `Craft native binary not found (tried "${triedPath}").`,
@@ -56,6 +57,11 @@ function craftBinaryNotFoundMessage(triedPath) {
   ].join(`
 `);
 }
+// package.json
+var version = "0.0.94";
+
+// src/sdk-version.ts
+var SDK_VERSION = version;
 
 // src/package.ts
 import { spawn } from "child_process";
@@ -183,13 +189,13 @@ async function packageApp(config) {
 }
 async function packageMacOS(config, outDir) {
   const results = [];
-  const { name, version, bundleId = `com.myapp.${name.toLowerCase()}` } = config;
+  const { name, version: version2, bundleId = `com.myapp.${name.toLowerCase()}` } = config;
   const opts = config.macos || {};
   const hardenedRuntime = !opts.appStore;
   const appBundlePath = join(outDir, `${name}.app`);
   const appBundle = createMacOSAppBundle({
     name,
-    version,
+    version: version2,
     bundleId,
     buildNumber: opts.buildNumber,
     category: opts.category,
@@ -233,7 +239,7 @@ async function packageMacOS(config, outDir) {
   }
   results.push({ success: true, platform: "macos", format: "app", outputPath: appBundlePath });
   if (opts.dmg !== false) {
-    const outputPath = join(outDir, `${name}-${version}.dmg`);
+    const outputPath = join(outDir, `${name}-${version2}.dmg`);
     const dmgResult = await createDMG({ appBundlePath, outputPath, volumeName: name });
     results.push({
       success: dmgResult.success,
@@ -246,12 +252,12 @@ async function packageMacOS(config, outDir) {
       results.push(...await notarizeIfRequested(opts, outputPath, "dmg"));
   }
   if (opts.pkg || opts.appStore) {
-    const outputPath = join(outDir, `${name}-${version}.pkg`);
+    const outputPath = join(outDir, `${name}-${version2}.pkg`);
     const pkgResult = await createPKG({
       appBundlePath,
       outputPath,
       identifier: bundleId,
-      version,
+      version: version2,
       appStore: opts.appStore === true,
       installerIdentity: opts.installerIdentity
     });
@@ -297,14 +303,14 @@ async function notarizeIfRequested(opts, artifactPath, format) {
 }
 async function packageWindows(config, outDir) {
   const results = [];
-  const { name, version } = config;
+  const { name, version: version2 } = config;
   const opts = config.windows || {};
   if (opts.msi !== false) {
     const msiResult = await createMSI({
       name,
-      version,
+      version: version2,
       binaryPath: config.binaryPath,
-      outputPath: join(outDir, `${name}-${version}.msi`),
+      outputPath: join(outDir, `${name}-${version2}.msi`),
       manufacturer: config.author || "Unknown",
       architecture: opts.architecture || windowsArchitecture(process.arch),
       certificatePath: opts.certificatePath,
@@ -321,9 +327,9 @@ async function packageWindows(config, outDir) {
   if (opts.zip || opts.msi === false) {
     const zipResult = await createZIP({
       name,
-      version,
+      version: version2,
       binaryPath: config.binaryPath,
-      outputPath: join(outDir, `${name}-${version}-windows.zip`)
+      outputPath: join(outDir, `${name}-${version2}-windows.zip`)
     });
     results.push({
       success: zipResult.success,
@@ -337,14 +343,14 @@ async function packageWindows(config, outDir) {
 }
 async function packageLinux(config, outDir) {
   const results = [];
-  const { name, version } = config;
+  const { name, version: version2 } = config;
   const opts = config.linux || {};
   if (opts.deb !== false) {
     const debResult = await createDEB({
       name,
-      version,
+      version: version2,
       binaryPath: config.binaryPath,
-      outputPath: join(outDir, `${name}_${version}_amd64.deb`),
+      outputPath: join(outDir, `${name}_${version2}_amd64.deb`),
       description: config.description || "",
       maintainer: config.author || "Unknown",
       dependencies: opts.debDependencies || ["libgtk-3-0", "libwebkit2gtk-4.1-37"]
@@ -360,9 +366,9 @@ async function packageLinux(config, outDir) {
   if (opts.rpm) {
     const rpmResult = await createRPM({
       name,
-      version,
+      version: version2,
       binaryPath: config.binaryPath,
-      outputPath: join(outDir, `${name}-${version}-1.x86_64.rpm`),
+      outputPath: join(outDir, `${name}-${version2}-1.x86_64.rpm`),
       description: config.description || "",
       requires: opts.rpmDependencies || ["gtk3", "webkit2gtk3"]
     });
@@ -377,9 +383,9 @@ async function packageLinux(config, outDir) {
   if (opts.appImage) {
     const appImageResult = await createAppImage({
       name,
-      version,
+      version: version2,
       binaryPath: config.binaryPath,
-      outputPath: join(outDir, `${name}-${version}-x86_64.AppImage`),
+      outputPath: join(outDir, `${name}-${version2}-x86_64.AppImage`),
       iconPath: config.iconPath
     });
     results.push({
@@ -2570,7 +2576,7 @@ class SystemTray {
   }
   async setIcon(icon) {
     this._options.icon = icon;
-    await this._call("setIcon", icon);
+    await this._call("setIcon", JSON.stringify({ icon }));
   }
   async setTooltip(tooltip) {
     this._options.tooltip = tooltip;
@@ -2584,6 +2590,9 @@ class SystemTray {
         if (!processedItem.id && processedItem.label) {
           processedItem.id = `menu_${index}_${Date.now()}`;
         }
+        if (!processedItem.action && processedItem.id && processedItem.type !== "separator") {
+          processedItem.action = processedItem.id;
+        }
         if (processedItem.submenu) {
           processedItem.submenu = processItems(processedItem.submenu);
         }
@@ -2646,9 +2655,9 @@ class SystemTray {
       return new Promise((resolve, reject) => {
         try {
           window.webkit.messageHandlers.craft.postMessage({
-            type: "tray",
-            action,
-            data: typeof data === "string" ? data : JSON.stringify(data)
+            t: "tray",
+            a: action,
+            d: typeof data === "string" ? data : JSON.stringify(data)
           });
           resolve(undefined);
         } catch (error) {
@@ -3928,8 +3937,8 @@ var crypto = {
     if (combined.length < 1 + SALT_LEN + IV_LEN + TAG_LEN) {
       throw new CraftCryptoError("Ciphertext too short to be valid");
     }
-    const version = combined[0];
-    if (version !== FORMAT_VERSION) {
+    const version2 = combined[0];
+    if (version2 !== FORMAT_VERSION) {
       throw new LegacyCiphertextError;
     }
     const salt = combined.slice(1, 1 + SALT_LEN);
@@ -4894,6 +4903,13 @@ var lifecycle = {
     return () => document.removeEventListener("visibilitychange", handler);
   }
 };
+function bridgeNotification(options, now = Date.now()) {
+  const { scheduleAt, ...rest } = options;
+  if (scheduleAt === undefined)
+    return rest;
+  const wait = Math.ceil(scheduleAt - now);
+  return wait > 0 ? { ...rest, delay: wait } : rest;
+}
 var notifications = {
   async show(options) {
     const craft = getCraftMobile();
@@ -4907,7 +4923,7 @@ var notifications = {
   async schedule(options) {
     const craft = getCraftMobile();
     if (typeof window !== "undefined" && craft?.notifications) {
-      return craft.notifications.schedule(options);
+      return craft.notifications.schedule(bridgeNotification(options));
     }
     throw new Error("Scheduled notifications not available in web");
   },
@@ -10583,14 +10599,14 @@ async function updaterCommand(args) {
   switch (subcommand) {
     case "check": {
       const url = rest[0];
-      const version = rest[1] || "0.0.0";
+      const version2 = rest[1] || "0.0.0";
       if (!url) {
         console.error("Usage: craft updater check <update-url> [current-version]");
         process.exit(1);
       }
       const updater = new AutoUpdater({
         updateUrl: url,
-        currentVersion: version,
+        currentVersion: version2,
         appPath: process.cwd(),
         autoDownload: false
       });
@@ -10624,14 +10640,14 @@ ${update.releaseNotes}`);
       break;
     }
     case "generate-manifest": {
-      const version = rest[0];
+      const version2 = rest[0];
       const outputPath = rest[1] || "update.json";
-      if (!version) {
+      if (!version2) {
         console.error("Usage: craft updater generate-manifest <version> [output]");
         process.exit(1);
       }
       const manifest = {
-        version,
+        version: version2,
         releaseDate: new Date().toISOString(),
         platforms: {}
       };
@@ -10663,21 +10679,13 @@ var updater_default = AutoUpdater;
 // src/index.ts
 var execFileAsync2 = promisify2(execFile2);
 var versionMismatchWarned = false;
-function getSdkVersion() {
-  try {
-    const pkgPath = join4(import.meta.dir, "..", "package.json");
-    return JSON.parse(readFileSync3(pkgPath, "utf-8")).version ?? "unknown";
-  } catch {
-    return "unknown";
-  }
-}
 async function probeBinaryVersion(craftPath) {
   if (versionMismatchWarned)
     return;
   try {
     const { stdout } = await execFileAsync2(craftPath, ["--version"], { timeout: 2000 });
     const nativeVersion = parseCraftVersionOutput(stdout);
-    const sdkVersion = getSdkVersion();
+    const sdkVersion = SDK_VERSION;
     if (sdkVersion !== "unknown" && nativeVersion && nativeVersion !== sdkVersion) {
       versionMismatchWarned = true;
       console.warn(`\u26A0\uFE0F  Craft binary/SDK version mismatch: SDK=${sdkVersion}, native=${nativeVersion}.
@@ -10687,7 +10695,27 @@ async function probeBinaryVersion(craftPath) {
 }
 function parseCraftVersionOutput(output) {
   const firstLine = output.trim().split(/\r?\n/, 1)[0] ?? "";
-  return firstLine.replace(/^craft version\s+/i, "").replace(/^v/, "").trim();
+  const withoutName = firstLine.replace(/^craft(?:\s+version)?[\s/]+/i, "").trim();
+  const firstToken = withoutName.split(/\s+/, 1)[0] ?? "";
+  return firstToken.replace(/^v/, "").trim();
+}
+var STDERR_TAIL_LIMIT = 4000;
+function craftProcessFailedMessage(code, stderr, quiet) {
+  const said = stderr.trim();
+  const header = `\u274C Craft process exited with code ${code}`;
+  if (said)
+    return `${header}
+
+${said}`;
+  const where = quiet ? "It wrote nothing to stderr. Re-run without `quiet` to see its full output." : "Check the console output above for more details.";
+  return `${header}
+
+` + `This may indicate:
+` + `  \u2022 Invalid window configuration
+` + `  \u2022 Malformed HTML content
+` + `  \u2022 System resource constraints
+
+` + where;
 }
 function detectDevMode() {
   if (typeof process === "undefined")
@@ -10750,8 +10778,14 @@ class CraftApp {
     const args = this.buildArgs();
     const craftPath = await this.findCraftBinary();
     probeBinaryVersion(craftPath);
+    const quiet = this.config.quiet === true;
     this.process = spawn4(craftPath, args, {
-      stdio: this.config.quiet ? "ignore" : "inherit"
+      stdio: quiet ? ["ignore", "ignore", "pipe"] : "inherit",
+      env: { ...process.env, [CRAFT_CLI_SPAWN_MARKER]: craftPath }
+    });
+    let stderrTail = "";
+    this.process.stderr?.on("data", (chunk) => {
+      stderrTail = (stderrTail + chunk.toString()).slice(-STDERR_TAIL_LIMIT);
     });
     return new Promise((resolve, reject) => {
       this.process?.on("error", (error) => {
@@ -10771,18 +10805,11 @@ class CraftApp {
 ` + `For troubleshooting, visit:
 ` + "  https://github.com/home-lang/craft/issues"));
       });
-      this.process?.on("exit", (code) => {
+      this.process?.on("close", (code) => {
         if (code === 0 || code === null) {
           resolve();
         } else {
-          reject(new Error(`\u274C Craft process exited with code ${code}
-
-` + `This may indicate:
-` + `  \u2022 Invalid window configuration
-` + `  \u2022 Malformed HTML content
-` + `  \u2022 System resource constraints
-
-` + "Check the console output above for more details."));
+          reject(new Error(craftProcessFailedMessage(code, stderrTail, quiet)));
         }
       });
     });
@@ -11098,6 +11125,7 @@ export {
   createArcSidebar,
   createApp,
   craftUnavailableMessage,
+  craftProcessFailedMessage,
   craftBinaryNotFoundMessage,
   copy,
   exports_components as components,