craft-native 0.0.90 → 0.0.91

package/dist/index.cjs

@@ -2341,6 +2341,13 @@ function webkitRequest(bucket, message, options = {}) {
 }
 
 // src/api/window.ts
+var CURRENT_WINDOW_ID = "main";
+function getInjectedWindowBridge() {
+  if (typeof globalThis.window === "undefined")
+    return;
+  return globalThis.window.craft?.window;
+}
+
 class Window {
   _id;
   _listeners = new Map;
@@ -2357,7 +2364,9 @@ class Window {
     return this._closed;
   }
   _setupEventListeners() {
-    if (typeof window2 !== "undefined") {
+    if (this._domListeners.length > 0)
+      return;
+    if (typeof globalThis.window !== "undefined") {
       const eventTypes = [
         "show",
         "hide",
@@ -2378,7 +2387,11 @@ class Window {
       eventTypes.forEach((type) => {
         const handler = (event) => {
           if (event.detail?.windowId === this._id || !event.detail?.windowId) {
-            this._emit(type, event.detail?.data);
+            if (type === "close" || type === "closed")
+              this._closed = true;
+            else if (type === "show" || type === "focus")
+              this._closed = false;
+            this._emit(type, event.detail?.data ?? event.detail);
           }
         };
         const eventName = `craft:window:${type}`;
@@ -2388,13 +2401,17 @@ class Window {
     }
   }
   _cleanupEventListeners() {
-    if (typeof window2 !== "undefined") {
+    if (typeof globalThis.window !== "undefined") {
       for (const { type, handler } of this._domListeners) {
         globalThis.window.removeEventListener(type, handler);
       }
       this._domListeners = [];
     }
   }
+  _markOpen() {
+    this._closed = false;
+    this._setupEventListeners();
+  }
   _emit(event, data) {
     const listeners = this._listeners.get(event);
     if (listeners) {
@@ -2422,15 +2439,19 @@ class Window {
   }
   async show() {
     await this._call("show");
+    this._markOpen();
   }
   async hide() {
     await this._call("hide");
   }
   async toggle() {
     await this._call("toggle");
+    if (this._closed)
+      this._markOpen();
   }
   async focus() {
     await this._call("focus");
+    this._markOpen();
   }
   async blur() {
     await this._call("blur");
@@ -2450,7 +2471,6 @@ class Window {
   async close() {
     await this._call("close");
     this._closed = true;
-    this._cleanupEventListeners();
   }
   async destroy() {
     await this._call("destroy");
@@ -2576,12 +2596,11 @@ class Window {
   }
   async _call(action, data) {
     if (isWebKitHost()) {
-      return webkitRequest(`window.${action}`, {
-        type: "window",
-        action,
-        windowId: this._id,
-        data
-      });
+      const injected = getInjectedWindowBridge();
+      if (!injected?._call) {
+        throw new Error("Craft window bridge is unavailable");
+      }
+      return injected._call(action, data, this._id);
     }
     const bridge = getBridge();
     return bridge.request(`window.${action}`, { windowId: this._id, ...data });
@@ -2613,16 +2632,38 @@ class WindowManager {
   }
   async create(options = {}) {
     const id = options.id || `window_${++this._idCounter}_${Date.now()}`;
+    if (id === CURRENT_WINDOW_ID) {
+      throw new Error(`Window id "${CURRENT_WINDOW_ID}" is reserved for the current window`);
+    }
     const existing = this._windows.get(id);
-    const bridge = getBridge();
-    await bridge.request("window.create", { ...options, id });
-    if (existing)
+    if (isWebKitHost()) {
+      const injected = getInjectedWindowBridge();
+      if (!injected?.open) {
+        throw new Error("Craft window bridge is unavailable");
+      }
+      await injected.open({ ...options, id });
+    } else {
+      const bridge = getBridge();
+      await bridge.request("window.create", { ...options, id });
+    }
+    if (existing) {
+      const retained = existing;
+      retained._markOpen();
       return existing;
+    }
     const win = new Window(id);
     this._windows.set(id, win);
     return win;
   }
   async getFocused() {
+    if (isWebKitHost()) {
+      const injected = getInjectedWindowBridge();
+      if (!injected?._call) {
+        throw new Error("Craft window bridge is unavailable");
+      }
+      const id2 = await injected._call("getFocused", undefined, "main");
+      return id2 ? this._windows.get(id2) || null : null;
+    }
     const bridge = getBridge();
     const id = await bridge.request("window.getFocused");
     return id ? this._windows.get(id) || null : null;
@@ -4613,6 +4654,15 @@ async function open(target) {
       throw new Error(`Unsupported platform: ${platform}`);
   }
 }
+// src/api/live-activity-handle.ts
+function createLiveActivityHandle(id, update, end) {
+  return {
+    id,
+    update,
+    end
+  };
+}
+
 // src/api/mobile.ts
 var WEB_DEVICE_ID_KEY = "__craft_web_device_id__";
 function _webFallbackDeviceId() {
@@ -5250,10 +5300,8 @@ var liveActivities = {
     return window.craft?.liveActivities?.areEnabled?.() ?? false;
   },
   async start(config) {
-    if (!isCraft() || getPlatform() !== "ios") {
-      return { id: `mock-${Date.now()}` };
-    }
-    return window.craft?.liveActivities?.start?.(config) ?? { id: `mock-${Date.now()}` };
+    const result = !isCraft() || getPlatform() !== "ios" ? { id: `mock-${Date.now()}` } : await (window.craft?.liveActivities?.start?.(config) ?? { id: `mock-${Date.now()}` });
+    return createLiveActivityHandle(result.id, (state) => liveActivities.update(result.id, state), (finalState) => liveActivities.end(result.id, finalState));
   },
   async update(activityId, contentState, alertConfig) {
     if (!isCraft() || getPlatform() !== "ios")

package/dist/index.js

@@ -2102,6 +2102,13 @@ function webkitRequest(bucket, message, options = {}) {
 }
 
 // src/api/window.ts
+var CURRENT_WINDOW_ID = "main";
+function getInjectedWindowBridge() {
+  if (typeof globalThis.window === "undefined")
+    return;
+  return globalThis.window.craft?.window;
+}
+
 class Window {
   _id;
   _listeners = new Map;
@@ -2118,7 +2125,9 @@ class Window {
     return this._closed;
   }
   _setupEventListeners() {
-    if (typeof window2 !== "undefined") {
+    if (this._domListeners.length > 0)
+      return;
+    if (typeof globalThis.window !== "undefined") {
       const eventTypes = [
         "show",
         "hide",
@@ -2139,7 +2148,11 @@ class Window {
       eventTypes.forEach((type) => {
         const handler = (event) => {
           if (event.detail?.windowId === this._id || !event.detail?.windowId) {
-            this._emit(type, event.detail?.data);
+            if (type === "close" || type === "closed")
+              this._closed = true;
+            else if (type === "show" || type === "focus")
+              this._closed = false;
+            this._emit(type, event.detail?.data ?? event.detail);
           }
         };
         const eventName = `craft:window:${type}`;
@@ -2149,13 +2162,17 @@ class Window {
     }
   }
   _cleanupEventListeners() {
-    if (typeof window2 !== "undefined") {
+    if (typeof globalThis.window !== "undefined") {
       for (const { type, handler } of this._domListeners) {
         globalThis.window.removeEventListener(type, handler);
       }
       this._domListeners = [];
     }
   }
+  _markOpen() {
+    this._closed = false;
+    this._setupEventListeners();
+  }
   _emit(event, data) {
     const listeners = this._listeners.get(event);
     if (listeners) {
@@ -2183,15 +2200,19 @@ class Window {
   }
   async show() {
     await this._call("show");
+    this._markOpen();
   }
   async hide() {
     await this._call("hide");
   }
   async toggle() {
     await this._call("toggle");
+    if (this._closed)
+      this._markOpen();
   }
   async focus() {
     await this._call("focus");
+    this._markOpen();
   }
   async blur() {
     await this._call("blur");
@@ -2211,7 +2232,6 @@ class Window {
   async close() {
     await this._call("close");
     this._closed = true;
-    this._cleanupEventListeners();
   }
   async destroy() {
     await this._call("destroy");
@@ -2337,12 +2357,11 @@ class Window {
   }
   async _call(action, data) {
     if (isWebKitHost()) {
-      return webkitRequest(`window.${action}`, {
-        type: "window",
-        action,
-        windowId: this._id,
-        data
-      });
+      const injected = getInjectedWindowBridge();
+      if (!injected?._call) {
+        throw new Error("Craft window bridge is unavailable");
+      }
+      return injected._call(action, data, this._id);
     }
     const bridge = getBridge();
     return bridge.request(`window.${action}`, { windowId: this._id, ...data });
@@ -2374,16 +2393,38 @@ class WindowManager {
   }
   async create(options = {}) {
     const id = options.id || `window_${++this._idCounter}_${Date.now()}`;
+    if (id === CURRENT_WINDOW_ID) {
+      throw new Error(`Window id "${CURRENT_WINDOW_ID}" is reserved for the current window`);
+    }
     const existing = this._windows.get(id);
-    const bridge = getBridge();
-    await bridge.request("window.create", { ...options, id });
-    if (existing)
+    if (isWebKitHost()) {
+      const injected = getInjectedWindowBridge();
+      if (!injected?.open) {
+        throw new Error("Craft window bridge is unavailable");
+      }
+      await injected.open({ ...options, id });
+    } else {
+      const bridge = getBridge();
+      await bridge.request("window.create", { ...options, id });
+    }
+    if (existing) {
+      const retained = existing;
+      retained._markOpen();
       return existing;
+    }
     const win = new Window(id);
     this._windows.set(id, win);
     return win;
   }
   async getFocused() {
+    if (isWebKitHost()) {
+      const injected = getInjectedWindowBridge();
+      if (!injected?._call) {
+        throw new Error("Craft window bridge is unavailable");
+      }
+      const id2 = await injected._call("getFocused", undefined, "main");
+      return id2 ? this._windows.get(id2) || null : null;
+    }
     const bridge = getBridge();
     const id = await bridge.request("window.getFocused");
     return id ? this._windows.get(id) || null : null;
@@ -4374,6 +4415,15 @@ async function open(target) {
       throw new Error(`Unsupported platform: ${platform}`);
   }
 }
+// src/api/live-activity-handle.ts
+function createLiveActivityHandle(id, update, end) {
+  return {
+    id,
+    update,
+    end
+  };
+}
+
 // src/api/mobile.ts
 var WEB_DEVICE_ID_KEY = "__craft_web_device_id__";
 function _webFallbackDeviceId() {
@@ -5011,10 +5061,8 @@ var liveActivities = {
     return window.craft?.liveActivities?.areEnabled?.() ?? false;
   },
   async start(config) {
-    if (!isCraft() || getPlatform() !== "ios") {
-      return { id: `mock-${Date.now()}` };
-    }
-    return window.craft?.liveActivities?.start?.(config) ?? { id: `mock-${Date.now()}` };
+    const result = !isCraft() || getPlatform() !== "ios" ? { id: `mock-${Date.now()}` } : await (window.craft?.liveActivities?.start?.(config) ?? { id: `mock-${Date.now()}` });
+    return createLiveActivityHandle(result.id, (state) => liveActivities.update(result.id, state), (finalState) => liveActivities.end(result.id, finalState));
   },
   async update(activityId, contentState, alertConfig) {
     if (!isCraft() || getPlatform() !== "ios")

package/dist/ios/src/index.js

@@ -150,7 +150,7 @@ ${plistArray(config.appGroups)}
   }
   if (config.enablePushNotifications) {
     entries.push(`    <key>aps-environment</key>
-    <string>development</string>`);
+    <string>$(CRAFT_APNS_ENVIRONMENT)</string>`);
   }
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -348,7 +348,7 @@ async function init(options) {
 `);
   const dirs = [output, join(output, "Sources"), join(output, "Shared"), join(output, "dist")];
   if (options.config?.enableWatchApp)
-    dirs.push(join(output, "WatchApp"));
+    dirs.push(join(output, "WatchApp"), join(output, "WatchExtension"));
   for (const dir of dirs) {
     if (!existsSync(dir)) {
       mkdirSync(dir, { recursive: true });
@@ -400,7 +400,7 @@ async function init(options) {
   }
   if (config.enableWatchApp) {
     nativeTargets.push(`  ${name}Watch:
-    type: application
+    type: application.watchapp2
     platform: watchOS
     deploymentTarget: "${config.watchosVersion || "9.0"}"
     sources:
@@ -410,6 +410,21 @@ async function init(options) {
       CODE_SIGN_ENTITLEMENTS: WatchApp/Watch.entitlements
       PRODUCT_BUNDLE_IDENTIFIER: ${finalBundleId}.watchkitapp
       SWIFT_VERSION: "5.0"
+      SKIP_INSTALL: YES
+    dependencies:
+      - target: ${name}WatchExtension
+  ${name}WatchExtension:
+    type: watchkit2-extension
+    platform: watchOS
+    deploymentTarget: "${config.watchosVersion || "9.0"}"
+    sources:
+      - WatchExtension
+    settings:
+      INFOPLIST_FILE: WatchExtension/Info.plist
+      CODE_SIGN_ENTITLEMENTS: WatchExtension/Watch.entitlements
+      PRODUCT_BUNDLE_IDENTIFIER: ${finalBundleId}.watchkitapp.watchkitextension
+      SWIFT_VERSION: "5.0"
+      APPLICATION_EXTENSION_API_ONLY: YES
       SKIP_INSTALL: YES`);
   }
   const runtimeDir = resolveRuntimeDir(options.runtimeDir);
@@ -437,10 +452,13 @@ ${nativeDependencies.join(`
   }
   if (config.enableWatchApp) {
     const watchSource = readFileSync(join(TEMPLATES_DIR, "CraftWatchApp.swift.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, name);
-    writeFileSync(join(output, "WatchApp", `${name}WatchApp.swift`), watchSource);
+    writeFileSync(join(output, "WatchExtension", `${name}WatchApp.swift`), watchSource);
     const watchInfo = readFileSync(join(TEMPLATES_DIR, "WatchApp.Info.plist.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, name).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId);
     writeFileSync(join(output, "WatchApp", "Info.plist"), watchInfo);
     writeFileSync(join(output, "WatchApp", "Watch.entitlements"), renderWatchEntitlements(config));
+    const watchExtensionInfo = readFileSync(join(TEMPLATES_DIR, "WatchExtension.Info.plist.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, name).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId);
+    writeFileSync(join(output, "WatchExtension", "Info.plist"), watchExtensionInfo);
+    writeFileSync(join(output, "WatchExtension", "Watch.entitlements"), renderWatchEntitlements(config));
   }
   const placeholderHtml = `<!DOCTYPE html>
 <html>