craft-native 0.0.417 → 0.0.420

package/dist/cli.js

@@ -3047,7 +3047,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.417";
+var version = "0.0.420";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -375,7 +375,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.417";
+var version = "0.0.420";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/index.js

@@ -117,7 +117,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.417";
+var version = "0.0.420";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/macos/src/index.js

@@ -43,7 +43,7 @@ import process from "process";
 var macosToolchain = {
   zig: "0.18.0-dev.252+86dc5ce25",
   sources: {
-    "zig-js": { repository: "zig-utils/zig-js", revision: "f0072c95780712d1bb789280e08e7e390e83ab94", paths: ["src", "include", "tests", "tools", "docs", "bench", "conformance"] },
+    "zig-js": { repository: "zig-utils/zig-js", revision: "fef92e7f6c5e110102df15e73bbea4a6be7493b5", paths: ["src", "include", "tests", "tools", "docs", "bench", "conformance"] },
     "zig-regex": { repository: "zig-utils/zig-regex", revision: "fdd9c2e333ea6ac2fd06d080d939ef7f11d61b1b", paths: ["src"] },
     "zig-gc": { repository: "zig-utils/zig-gc", revision: "0285ef801dd221a4ae8e88b31a09ae31627657a3", paths: ["src"] }
   }

package/dist/macos/src/toolchain.d.ts

@@ -9,7 +9,7 @@ export declare const macosToolchain: {
     readonly sources: {
         readonly 'zig-js': {
             readonly repository: 'zig-utils/zig-js';
-            readonly revision: 'f0072c95780712d1bb789280e08e7e390e83ab94';
+            readonly revision: 'fef92e7f6c5e110102df15e73bbea4a6be7493b5';
             readonly paths: readonly ['src', 'include', 'tests', 'tools', 'docs', 'bench', 'conformance'];
         };
         readonly 'zig-regex': {

package/dist/macos/templates/CraftMacApplication.swift

@@ -73,6 +73,8 @@ final class CraftMacScene: NSObject, NSWindowDelegate {
     func windowWillClose(_ notification: Notification) {
         runtime.dispose()
         CraftMacApplication.shared.scenes.removeValue(forKey: name)
+        // The app's other windows learn it is gone (its tabs closed with it), so none waits on it.
+        for other in CraftMacApplication.shared.scenes.values { other.runtime.send("CRAFT_EVENT", ["event": "craftDesktopWindowClosed", "detail": ["name": name]]) }
         CraftMacApplication.shared.quitReady(scene: name)
     }
     func windowDidBecomeKey(_ notification: Notification) { runtime.send("SCREEN_FOCUS", ["focused": true]) }
@@ -419,6 +421,22 @@ final class CraftMacApplication: NSObject, NSApplicationDelegate, UNUserNotifica
         // After this result is written, from the run loop rather than a main-queue block (see applicationShouldTerminate).
         if kind == "quit" { NSApp.perform(#selector(NSApplication.terminate(_:)), with: nil, afterDelay: 0); return ["ok": true] }
         if kind == "openURL", let url = (action["url"] as? String).flatMap(URL.init(string:)) { application(NSApp, open: [url]); return ["ok": true] }
+        #if CRAFT_WEBKIT
+        // Script in a tab's page, as a person's click or a page's own code would act: what the
+        // renderer cannot reach (a link inside the page, an element to zap). `value` is the
+        // script's result as text; return JSON.stringify(...) for anything structured.
+        if kind == "web", let id = action["tab"] as? String, let script = action["js"] as? String {
+            guard let tab = CraftMacWebTabs.shared.tabs[id] else { return ["ok": false, "error": "No tab \(id)"] }
+            var answer: [String: Any]?
+            tab.view.evaluateJavaScript(script) { value, error in
+                if let error { answer = ["ok": false, "error": error.localizedDescription]; return }
+                answer = ["ok": true, "value": value.map { "\($0)" } ?? NSNull()]
+            }
+            let deadline = Date().addingTimeInterval(5)
+            while answer == nil && Date() < deadline { RunLoop.main.run(until: Date().addingTimeInterval(0.02)) }
+            return answer ?? ["ok": false, "error": "The page did not answer within 5 s"]
+        }
+        #endif
         if kind == "appearance" {
             NSApp.appearance = NSAppearance(named: action["value"] as? String == "dark" ? .darkAqua : .aqua)
             appearanceChanged(); return ["ok": true]

package/dist/macos/templates/CraftMacRuntime.swift

@@ -68,7 +68,13 @@ final class CraftMacRuntime {
         #endif
         return list
     }
-    let context = ZigJSContext()!
+    /// zig-js's precise collector, not the default arena: an arena frees nothing until the
+    /// context goes, so a window open all day kept every object its screen ever made.
+    let context: ZigJSContext = {
+        let created = ZJSGlobalContextCreateGarbageCollected(true)!
+        defer { JSGlobalContextRelease(created) }
+        return ZigJSContext(jsGlobalContextRef: created)!
+    }()
     let route: String
     let network: CraftMacNetwork
     weak var scene: CraftMacScene?

package/dist/macos/templates/CraftMacWebView.swift

@@ -40,8 +40,17 @@ final class CraftMacWebProfiles {
         return configuration.copy() as! WKWebViewConfiguration
     }
 
+    /// One store per private profile for as long as the app runs, so clearing data or adding
+    /// cookies reaches the store its tabs use (each `.nonPersistent()` call makes a new, empty one).
+    private var ephemeralStores: [String: WKWebsiteDataStore] = [:]
+
     func store(profile: String, ephemeral: Bool) -> WKWebsiteDataStore {
-        if ephemeral { return .nonPersistent() }
+        if ephemeral {
+            if let existing = ephemeralStores[profile] { return existing }
+            let made = WKWebsiteDataStore.nonPersistent()
+            ephemeralStores[profile] = made
+            return made
+        }
         if profile == "default" { return .default() }
         if #available(macOS 14.0, *) { return WKWebsiteDataStore(forIdentifier: Self.identifier(profile)) }
         return .default()
@@ -494,6 +503,38 @@ final class CraftMacWebTabs {
         }
     }
 
+    /// Cookies put into a profile's store, as another browser's import brings them: `domain` with
+    /// a leading dot covers subdomains, `expires` is milliseconds since 1970 (absent for a session
+    /// cookie), `sameSite` is "lax", "strict" or "none". Answers how many were set, and how many
+    /// could not form a cookie (no name or domain).
+    func setCookies(_ options: [String: Any], answer: @escaping (Any) -> Void) {
+        let store = CraftMacWebProfiles.shared.store(profile: options["profile"] as? String ?? "default", ephemeral: options["private"] as? Bool == true).httpCookieStore
+        let cookies = (options["cookies"] as? [[String: Any]] ?? []).map(Self.cookie)
+        let group = DispatchGroup()
+        for case let cookie? in cookies {
+            group.enter()
+            store.setCookie(cookie) { group.leave() }
+        }
+        let set = cookies.compactMap { $0 }.count
+        group.notify(queue: .main) { answer(["set": set, "skipped": cookies.count - set]) }
+    }
+
+    static func cookie(_ fields: [String: Any]) -> HTTPCookie? {
+        guard let name = fields["name"] as? String, !name.isEmpty, let domain = fields["domain"] as? String, !domain.isEmpty else { return nil }
+        var properties: [HTTPCookiePropertyKey: Any] = [
+            .name: name, .value: fields["value"] as? String ?? "", .domain: domain, .path: fields["path"] as? String ?? "/",
+        ]
+        if let expires = fields["expires"] as? Double { properties[.expires] = Date(timeIntervalSince1970: expires / 1000) }
+        if fields["secure"] as? Bool == true { properties[.secure] = "TRUE" }
+        if fields["httpOnly"] as? Bool == true { properties[HTTPCookiePropertyKey("HttpOnly")] = "TRUE" }
+        switch fields["sameSite"] as? String {
+        case "lax": properties[.sameSitePolicy] = HTTPCookieStringPolicy.sameSiteLax
+        case "strict": properties[.sameSitePolicy] = HTTPCookieStringPolicy.sameSiteStrict
+        default: break
+        }
+        return HTTPCookie(properties: properties)
+    }
+
     /// A closed window takes its tabs with it.
     func closeAll(owner: CraftMacRuntime) {
         for (id, tab) in tabs where tab.owner == nil || tab.owner === owner { tabs.removeValue(forKey: id); tab.close() }
@@ -502,6 +543,9 @@ final class CraftMacWebTabs {
     func perform(_ method: String, _ args: [Any], owner: CraftMacRuntime, answer: @escaping (Any) -> Void, fail: @escaping (String, String) -> Void) {
         let options = args.first as? [String: Any] ?? [:]
         if method == "create" {
+            // A tab that exists is answered as it is: loading the address again would reload a
+            // page that another window, say, hands over with its state intact.
+            if let id = options["id"] as? String, let existing = tabs[id] { answer(existing.state); return }
             let tab = make(id: options["id"] as? String, profile: options["profile"] as? String ?? "default", ephemeral: options["private"] as? Bool == true, owner: owner)
             tab.view.isInspectable = options["inspectable"] as? Bool ?? true
             if let address = options["url"] as? String, !address.isEmpty {
@@ -525,6 +569,7 @@ final class CraftMacWebTabs {
             let decision: WKPermissionDecision = { switch args.dropFirst().first as? String { case "grant": return .grant; case "prompt": return .prompt; default: return .deny } }()
             answer(self.answer(args.first as? String ?? "", decision)); return
         case "clearData": clearData(options, answer: answer); return
+        case "setCookies": setCookies(options, answer: answer); return
         case "cancelDownload": answer(CraftMacDownloads.shared.cancel(args.first as? String ?? "")); return
         case "revealDownload", "openDownload":
             guard let file = CraftMacDownloads.downloadedFile(args.first as? String ?? "") else { fail("NOT_FOUND", "Not a file in Downloads"); return }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.417",
+  "version": "0.0.420",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",