craft-native 0.0.499 → 0.0.500

package/dist/index.cjs

@@ -376,7 +376,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.499";
+var version = "0.0.500";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;
@@ -1764,6 +1764,33 @@ Description: ${description || opts.name}
     }
   });
 }
+function rpmSpec(options) {
+  return [
+    "%global debug_package %{nil}",
+    "%global _build_id_links none",
+    "%global __strip /bin/true",
+    "%global __os_install_post %{nil}",
+    `Name: ${options.name}`,
+    `Version: ${options.version}`,
+    "Release: 1",
+    `Summary: ${options.summary}`,
+    "License: MIT",
+    `Source0: ${options.name}`,
+    ...options.requires ? [`Requires: ${options.requires}`] : [],
+    "",
+    "%description",
+    options.description,
+    "",
+    "%install",
+    "mkdir -p %{buildroot}/usr/bin",
+    `install -m 755 %{SOURCE0} %{buildroot}/usr/bin/${options.name}`,
+    "",
+    "%files",
+    `/usr/bin/${options.name}`,
+    ""
+  ].join(`
+`);
+}
 async function createRPM(opts) {
   return new Promise((resolve) => {
     try {
@@ -1796,26 +1823,17 @@ async function createRPM(opts) {
         return r;
       }).join(", ");
       import_fs.copyFileSync(opts.binaryPath, import_path.join(sourcesDir, sanitizedName));
-      const specContent = `Name: ${sanitizedName}
-Version: ${opts.version}
-Release: 1%{?dist}
-Summary: ${summary}
-License: MIT
-Requires: ${requires}
-
-%description
-${description}
-
-%install
-mkdir -p %{buildroot}/usr/bin
-install -m 755 %{SOURCE0} %{buildroot}/usr/bin/${sanitizedName}
-
-%files
-/usr/bin/${sanitizedName}
-`;
+      const specContent = rpmSpec({ name: sanitizedName, version: opts.version, summary, description, requires });
       const specPath = import_path.join(specDir, `${opts.name.toLowerCase()}.spec`);
       import_fs.writeFileSync(specPath, specContent);
       const proc = import_child_process.spawn("rpmbuild", ["-bb", specPath]);
+      let said = "";
+      proc.stdout?.on("data", (chunk) => {
+        said += chunk.toString();
+      });
+      proc.stderr?.on("data", (chunk) => {
+        said += chunk.toString();
+      });
       proc.on("close", (code) => {
         if (code === 0) {
           const rpmName = `${opts.name.toLowerCase()}-${opts.version}-1.x86_64.rpm`;
@@ -1827,7 +1845,9 @@ install -m 755 %{SOURCE0} %{buildroot}/usr/bin/${sanitizedName}
             resolve({ success: false, error: "Failed to copy built RPM" });
           }
         } else {
-          resolve({ success: false, error: `rpmbuild exited with code ${code}` });
+          resolve({ success: false, error: `rpmbuild exited with code ${code}: ${said.trim().split(`
+`).slice(-12).join(`
+`)}` });
         }
       });
       proc.on("error", (err) => {
@@ -2364,7 +2384,8 @@ var BridgeErrorCodes = {
   BRIDGE_DESTROYED: -6,
   BUSY: -7,
   PROTOCOL_MISMATCH: -8,
-  DISCONNECTED: -9
+  DISCONNECTED: -9,
+  NATIVE_ERROR: -10
 };
 var BRIDGE_PROTOCOL_VERSION = 1;
 function buildMessageId(prefix, counter) {
@@ -2772,6 +2793,9 @@ class NativeBridge extends import_events.EventEmitter {
     }
     try {
       if (typeof window !== "undefined") {
+        if (message.type === "request" && this.sendThroughInjectedBridge(message)) {
+          return true;
+        }
         if (window.webkit?.messageHandlers?.craft) {
           window.webkit.messageHandlers.craft.postMessage(message);
           return true;
@@ -2799,6 +2823,31 @@ class NativeBridge extends import_events.EventEmitter {
       return false;
     }
   }
+  sendThroughInjectedBridge(message) {
+    const injected = window.craft;
+    if (!injected || typeof injected.invoke !== "function" || typeof message.method !== "string")
+      return false;
+    let call;
+    try {
+      call = Promise.resolve(injected.invoke(message.method, message.params));
+    } catch (e) {
+      call = Promise.reject(e);
+    }
+    call.then((result) => this.handleResponse({ id: message.id, type: "response", result }), (error) => {
+      const detail = error ?? {};
+      const text = typeof detail.message === "string" && detail.message.length > 0 ? detail.message : `Native bridge refused ${message.method}`;
+      this.handleResponse({
+        id: message.id,
+        type: "response",
+        error: {
+          code: BridgeErrorCodes.NATIVE_ERROR,
+          message: text,
+          data: { nativeCode: typeof detail.code === "string" ? detail.code : undefined, method: message.method }
+        }
+      });
+    });
+    return true;
+  }
   failPendingForMessage(message, error) {
     const pending = this.pendingRequests.get(message.id);
     if (!pending)
@@ -5109,7 +5158,7 @@ async function getSystemInfo() {
 }
 async function exec(command, options) {
   if (typeof window !== "undefined" && window.craft) {
-    return callBridge3("process.exec", { command, ...options });
+    return callBridge3("shell.exec", { command, cwd: options?.cwd });
   }
   const { exec: nodeExec } = await import("node:child_process");
   const { promisify } = await import("node:util");
@@ -5130,107 +5179,46 @@ async function exec(command, options) {
     };
   }
 }
+var nextProcessId = 0;
+function shellFacade() {
+  return window.craft?.shell;
+}
 
 class ChildProcess {
   command;
   args;
   options;
   processId = null;
-  onStdoutHandlers = [];
-  onStderrHandlers = [];
-  onExitHandlers = [];
-  domListeners = [];
-  exited = false;
   constructor(command, args = [], options = {}) {
     this.command = command;
     this.args = args;
     this.options = options;
   }
-  addDomListener(type, handler) {
-    if (typeof window === "undefined")
-      return;
-    window.addEventListener(type, handler);
-    this.domListeners.push({ type, handler });
-  }
-  removeDomListeners() {
-    if (typeof window === "undefined")
-      return;
-    for (const { type, handler } of this.domListeners) {
-      window.removeEventListener(type, handler);
-    }
-    this.domListeners = [];
-  }
   get pid() {
     return this.processId;
   }
   async start() {
     if (typeof window !== "undefined" && window.craft) {
-      const result = await callBridge3("process.spawn", {
+      nextProcessId += 1;
+      const id = `sdk-${Date.now().toString(36)}-${nextProcessId}`;
+      await callBridge3("shell.spawn", {
+        id,
         command: this.command,
         args: this.args,
-        ...this.options
+        cwd: this.options.cwd,
+        shell: this.options.shell
       });
-      this.processId = result.pid;
-      const stdoutHandler = (event) => {
-        if (event.detail.pid === this.processId) {
-          this.onStdoutHandlers.forEach((h) => h(event.detail.data));
-        }
-      };
-      const stderrHandler = (event) => {
-        if (event.detail.pid === this.processId) {
-          this.onStderrHandlers.forEach((h) => h(event.detail.data));
-        }
-      };
-      const exitHandler = (event) => {
-        if (event.detail.pid === this.processId) {
-          this.exited = true;
-          this.onExitHandlers.forEach((h) => h(event.detail.code));
-          this.removeDomListeners();
-        }
-      };
-      this.addDomListener("craft:process:stdout", stdoutHandler);
-      this.addDomListener("craft:process:stderr", stderrHandler);
-      this.addDomListener("craft:process:exit", exitHandler);
+      this.processId = id;
       return;
     }
     throw new Error("spawn() requires Craft environment");
   }
-  async write(data) {
+  async kill() {
     if (typeof window !== "undefined" && window.craft && this.processId) {
-      await callBridge3("process.stdin", { pid: this.processId, data });
+      await shellFacade()?.kill?.(this.processId);
+      this.processId = null;
     }
   }
-  async kill(signal = "SIGTERM") {
-    if (typeof window !== "undefined" && window.craft && this.processId) {
-      await callBridge3("process.kill", { pid: this.processId, signal });
-      if (this.exited)
-        this.removeDomListeners();
-    }
-  }
-  onStdout(handler) {
-    this.onStdoutHandlers.push(handler);
-    return () => {
-      const idx = this.onStdoutHandlers.indexOf(handler);
-      if (idx >= 0)
-        this.onStdoutHandlers.splice(idx, 1);
-    };
-  }
-  onStderr(handler) {
-    this.onStderrHandlers.push(handler);
-    return () => {
-      const idx = this.onStderrHandlers.indexOf(handler);
-      if (idx >= 0)
-        this.onStderrHandlers.splice(idx, 1);
-    };
-  }
-  onExit(handler) {
-    this.onExitHandlers.push(handler);
-    return () => {
-      const idx = this.onExitHandlers.indexOf(handler);
-      if (idx >= 0)
-        this.onExitHandlers.splice(idx, 1);
-    };
-  }
 }
 function spawn2(command, args, options) {
   return new ChildProcess(command, args, options);
@@ -5243,7 +5231,7 @@ function cwd() {
 }
 async function homeDir() {
   if (typeof window !== "undefined" && window.craft) {
-    return callBridge3("process.homeDir");
+    return (await callBridge3("fs.getHomeDir"))?.path || "/";
   }
   if (typeof process !== "undefined") {
     const os = await import("node:os");
@@ -5253,7 +5241,7 @@ async function homeDir() {
 }
 async function tempDir() {
   if (typeof window !== "undefined" && window.craft) {
-    return callBridge3("process.tempDir");
+    return (await callBridge3("fs.getTempDir"))?.path || "/tmp";
   }
   if (typeof process !== "undefined") {
     const os = await import("node:os");
@@ -5281,7 +5269,10 @@ function argv() {
 }
 async function open(target) {
   if (typeof window !== "undefined" && window.craft) {
-    await callBridge3("process.open", { target });
+    if (/^[a-z][a-z0-9+.-]*:/i.test(target) && !/^[a-z]:[\\/]/i.test(target))
+      await callBridge3("shell.openUrl", { url: target });
+    else
+      await shellFacade()?.openPath?.(target);
     return;
   }
   const platform = getPlatform();

package/dist/index.js

@@ -117,7 +117,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.499";
+var version = "0.0.500";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;
@@ -1520,6 +1520,33 @@ Description: ${description || opts.name}
     }
   });
 }
+function rpmSpec(options) {
+  return [
+    "%global debug_package %{nil}",
+    "%global _build_id_links none",
+    "%global __strip /bin/true",
+    "%global __os_install_post %{nil}",
+    `Name: ${options.name}`,
+    `Version: ${options.version}`,
+    "Release: 1",
+    `Summary: ${options.summary}`,
+    "License: MIT",
+    `Source0: ${options.name}`,
+    ...options.requires ? [`Requires: ${options.requires}`] : [],
+    "",
+    "%description",
+    options.description,
+    "",
+    "%install",
+    "mkdir -p %{buildroot}/usr/bin",
+    `install -m 755 %{SOURCE0} %{buildroot}/usr/bin/${options.name}`,
+    "",
+    "%files",
+    `/usr/bin/${options.name}`,
+    ""
+  ].join(`
+`);
+}
 async function createRPM(opts) {
   return new Promise((resolve) => {
     try {
@@ -1552,26 +1579,17 @@ async function createRPM(opts) {
         return r;
       }).join(", ");
       copyFileSync(opts.binaryPath, join3(sourcesDir, sanitizedName));
-      const specContent = `Name: ${sanitizedName}
-Version: ${opts.version}
-Release: 1%{?dist}
-Summary: ${summary}
-License: MIT
-Requires: ${requires}
-
-%description
-${description}
-
-%install
-mkdir -p %{buildroot}/usr/bin
-install -m 755 %{SOURCE0} %{buildroot}/usr/bin/${sanitizedName}
-
-%files
-/usr/bin/${sanitizedName}
-`;
+      const specContent = rpmSpec({ name: sanitizedName, version: opts.version, summary, description, requires });
       const specPath = join3(specDir, `${opts.name.toLowerCase()}.spec`);
       writeFileSync3(specPath, specContent);
       const proc = spawn("rpmbuild", ["-bb", specPath]);
+      let said = "";
+      proc.stdout?.on("data", (chunk) => {
+        said += chunk.toString();
+      });
+      proc.stderr?.on("data", (chunk) => {
+        said += chunk.toString();
+      });
       proc.on("close", (code) => {
         if (code === 0) {
           const rpmName = `${opts.name.toLowerCase()}-${opts.version}-1.x86_64.rpm`;
@@ -1583,7 +1601,9 @@ install -m 755 %{SOURCE0} %{buildroot}/usr/bin/${sanitizedName}
             resolve({ success: false, error: "Failed to copy built RPM" });
           }
         } else {
-          resolve({ success: false, error: `rpmbuild exited with code ${code}` });
+          resolve({ success: false, error: `rpmbuild exited with code ${code}: ${said.trim().split(`
+`).slice(-12).join(`
+`)}` });
         }
       });
       proc.on("error", (err) => {
@@ -2120,7 +2140,8 @@ var BridgeErrorCodes = {
   BRIDGE_DESTROYED: -6,
   BUSY: -7,
   PROTOCOL_MISMATCH: -8,
-  DISCONNECTED: -9
+  DISCONNECTED: -9,
+  NATIVE_ERROR: -10
 };
 var BRIDGE_PROTOCOL_VERSION = 1;
 function buildMessageId(prefix, counter) {
@@ -2528,6 +2549,9 @@ class NativeBridge extends EventEmitter {
     }
     try {
       if (typeof window !== "undefined") {
+        if (message.type === "request" && this.sendThroughInjectedBridge(message)) {
+          return true;
+        }
         if (window.webkit?.messageHandlers?.craft) {
           window.webkit.messageHandlers.craft.postMessage(message);
           return true;
@@ -2555,6 +2579,31 @@ class NativeBridge extends EventEmitter {
       return false;
     }
   }
+  sendThroughInjectedBridge(message) {
+    const injected = window.craft;
+    if (!injected || typeof injected.invoke !== "function" || typeof message.method !== "string")
+      return false;
+    let call;
+    try {
+      call = Promise.resolve(injected.invoke(message.method, message.params));
+    } catch (e) {
+      call = Promise.reject(e);
+    }
+    call.then((result) => this.handleResponse({ id: message.id, type: "response", result }), (error) => {
+      const detail = error ?? {};
+      const text = typeof detail.message === "string" && detail.message.length > 0 ? detail.message : `Native bridge refused ${message.method}`;
+      this.handleResponse({
+        id: message.id,
+        type: "response",
+        error: {
+          code: BridgeErrorCodes.NATIVE_ERROR,
+          message: text,
+          data: { nativeCode: typeof detail.code === "string" ? detail.code : undefined, method: message.method }
+        }
+      });
+    });
+    return true;
+  }
   failPendingForMessage(message, error) {
     const pending = this.pendingRequests.get(message.id);
     if (!pending)
@@ -4865,7 +4914,7 @@ async function getSystemInfo() {
 }
 async function exec(command, options) {
   if (typeof window !== "undefined" && window.craft) {
-    return callBridge3("process.exec", { command, ...options });
+    return callBridge3("shell.exec", { command, cwd: options?.cwd });
   }
   const { exec: nodeExec } = await import("child_process");
   const { promisify } = await import("util");
@@ -4886,107 +4935,46 @@ async function exec(command, options) {
     };
   }
 }
+var nextProcessId = 0;
+function shellFacade() {
+  return window.craft?.shell;
+}
 
 class ChildProcess {
   command;
   args;
   options;
   processId = null;
-  onStdoutHandlers = [];
-  onStderrHandlers = [];
-  onExitHandlers = [];
-  domListeners = [];
-  exited = false;
   constructor(command, args = [], options = {}) {
     this.command = command;
     this.args = args;
     this.options = options;
   }
-  addDomListener(type, handler) {
-    if (typeof window === "undefined")
-      return;
-    window.addEventListener(type, handler);
-    this.domListeners.push({ type, handler });
-  }
-  removeDomListeners() {
-    if (typeof window === "undefined")
-      return;
-    for (const { type, handler } of this.domListeners) {
-      window.removeEventListener(type, handler);
-    }
-    this.domListeners = [];
-  }
   get pid() {
     return this.processId;
   }
   async start() {
     if (typeof window !== "undefined" && window.craft) {
-      const result = await callBridge3("process.spawn", {
+      nextProcessId += 1;
+      const id = `sdk-${Date.now().toString(36)}-${nextProcessId}`;
+      await callBridge3("shell.spawn", {
+        id,
         command: this.command,
         args: this.args,
-        ...this.options
+        cwd: this.options.cwd,
+        shell: this.options.shell
       });
-      this.processId = result.pid;
-      const stdoutHandler = (event) => {
-        if (event.detail.pid === this.processId) {
-          this.onStdoutHandlers.forEach((h) => h(event.detail.data));
-        }
-      };
-      const stderrHandler = (event) => {
-        if (event.detail.pid === this.processId) {
-          this.onStderrHandlers.forEach((h) => h(event.detail.data));
-        }
-      };
-      const exitHandler = (event) => {
-        if (event.detail.pid === this.processId) {
-          this.exited = true;
-          this.onExitHandlers.forEach((h) => h(event.detail.code));
-          this.removeDomListeners();
-        }
-      };
-      this.addDomListener("craft:process:stdout", stdoutHandler);
-      this.addDomListener("craft:process:stderr", stderrHandler);
-      this.addDomListener("craft:process:exit", exitHandler);
+      this.processId = id;
       return;
     }
     throw new Error("spawn() requires Craft environment");
   }
-  async write(data) {
+  async kill() {
     if (typeof window !== "undefined" && window.craft && this.processId) {
-      await callBridge3("process.stdin", { pid: this.processId, data });
+      await shellFacade()?.kill?.(this.processId);
+      this.processId = null;
     }
   }
-  async kill(signal = "SIGTERM") {
-    if (typeof window !== "undefined" && window.craft && this.processId) {
-      await callBridge3("process.kill", { pid: this.processId, signal });
-      if (this.exited)
-        this.removeDomListeners();
-    }
-  }
-  onStdout(handler) {
-    this.onStdoutHandlers.push(handler);
-    return () => {
-      const idx = this.onStdoutHandlers.indexOf(handler);
-      if (idx >= 0)
-        this.onStdoutHandlers.splice(idx, 1);
-    };
-  }
-  onStderr(handler) {
-    this.onStderrHandlers.push(handler);
-    return () => {
-      const idx = this.onStderrHandlers.indexOf(handler);
-      if (idx >= 0)
-        this.onStderrHandlers.splice(idx, 1);
-    };
-  }
-  onExit(handler) {
-    this.onExitHandlers.push(handler);
-    return () => {
-      const idx = this.onExitHandlers.indexOf(handler);
-      if (idx >= 0)
-        this.onExitHandlers.splice(idx, 1);
-    };
-  }
 }
 function spawn2(command, args, options) {
   return new ChildProcess(command, args, options);
@@ -4999,7 +4987,7 @@ function cwd() {
 }
 async function homeDir() {
   if (typeof window !== "undefined" && window.craft) {
-    return callBridge3("process.homeDir");
+    return (await callBridge3("fs.getHomeDir"))?.path || "/";
   }
   if (typeof process !== "undefined") {
     const os = await import("os");
@@ -5009,7 +4997,7 @@ async function homeDir() {
 }
 async function tempDir() {
   if (typeof window !== "undefined" && window.craft) {
-    return callBridge3("process.tempDir");
+    return (await callBridge3("fs.getTempDir"))?.path || "/tmp";
   }
   if (typeof process !== "undefined") {
     const os = await import("os");
@@ -5037,7 +5025,10 @@ function argv() {
 }
 async function open(target) {
   if (typeof window !== "undefined" && window.craft) {
-    await callBridge3("process.open", { target });
+    if (/^[a-z][a-z0-9+.-]*:/i.test(target) && !/^[a-z]:[\\/]/i.test(target))
+      await callBridge3("shell.openUrl", { url: target });
+    else
+      await shellFacade()?.openPath?.(target);
     return;
   }
   const platform = getPlatform();

package/dist/ios/templates/CraftApp.swift

@@ -838,6 +838,23 @@ final class CraftChrome: ObservableObject {
     @Published var tabs: [Tab] = []
     @Published var tabAccessory: Tab?
     private weak var tabAccessoryOwner: AnyObject?
+
+    /// Where the compact tab actions float over the page, in window
+    /// coordinates, and the shell that drew them; nil when nothing floats.
+    /// They cover the trailing end of whatever scrolls behind them, so a
+    /// screen gives its scroll views that much room at the end (#523): the
+    /// last row can be brought clear without the app knowing this geometry.
+    private(set) var floatingActions: CGRect?
+    private(set) weak var floatingActionsHost: UIView?
+    static let floatingActionsDidMove = Notification.Name("CraftFloatingActionsDidMove")
+
+    func floatingActionsMoved(to frame: CGRect?, in host: UIView?) {
+        let next = frame.flatMap { $0.isNull || $0.isEmpty ? nil : $0.integral }
+        guard next != floatingActions || (next != nil && host !== floatingActionsHost) else { return }
+        floatingActions = next
+        floatingActionsHost = next == nil ? nil : host
+        NotificationCenter.default.post(name: Self.floatingActionsDidMove, object: self)
+    }
     @Published var selected: String?
     /// The visible destination may be the accessory, independently of its owning stack.
     @Published var visiblePath: String?

package/dist/ios/templates/CraftHybrid.swift

@@ -1665,6 +1665,8 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
         guard hybrid.controller === self else { return }
+        // Once the actions are where this pass puts them.
+        defer { CraftChrome.shared.floatingActionsMoved(to: floatingActionsFrame(), in: view) }
 #if compiler(>=6.2)
         if #available(iOS 26.0, *), accessoryModel?.iconOnly != true {
             // UIKit already supplies the native safe area. This measurement is
@@ -1701,6 +1703,20 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
         CraftChrome.shared.layoutChanged(tabBar.isHidden ? 0 : max(0, view.bounds.maxY - tabBar.frame.minY) + accessoryInset)
     }
 
+    /// The compact actions' frame in the window, or nil when none float over
+    /// the page: a full-width shelf is reserved for through the safe area,
+    /// and a hidden tab bar takes its actions with it. A group is its one
+    /// capsule; separate actions are the row of them.
+    private func floatingActionsFrame() -> CGRect? {
+        guard let model = accessoryModel, model.iconOnly, view.window != nil,
+              accessoryGlass.superview === view, !accessoryGlass.isHidden, !tabBar.isHidden else { return nil }
+        var frame = accessoryGlass.frame
+        if model.accessoryLayout == nil {
+            for glass in companionGlasses where !glass.isHidden { frame = frame.union(glass.frame) }
+        }
+        return view.convert(frame, to: view.window)
+    }
+
     /// One capsule above the trailing end of the tab bar, companions first
     /// and the primary action last. Nothing divides the actions: the glass
     /// is one control, and each action is found by its place and its symbol.