@tokamakdev/platform-ios-simulator-x64 0.1.1-beta.84 → 0.1.1-beta.85

package/ios-simulator-x64/frameworks/TokamakRuntime.framework/Headers/TokamakRuntime.h

@@ -50,6 +50,7 @@ bool tokamak_runtime_emit(const void *runtime, const char *name,
                           const char *event, uint64_t timeout_ms,
                           TokamakBytes *reply, char *error, size_t error_len);
 bool tokamak_runtime_set_foreground(const void *runtime, bool foreground);
+bool tokamak_runtime_is_foreground(const void *runtime);
 void tokamak_runtime_reply(const void *runtime, uint64_t id, const char *result);
 
 int32_t tokamak_runtime_server_authority(const void *runtime, const char *host,

package/ios-simulator-x64/native-shell/TokamakApp.swift

@@ -1,6 +1,5 @@
 import Foundation
 import TokamakRuntime
-import os
 
 #if os(iOS)
   import UIKit
@@ -34,8 +33,8 @@ final class TokamakApp {
   /// Delivers `resume` and `suspend` one at a time, in order.
   private let lifecycle = DispatchQueue(label: "tokamak.lifecycle")
   #if os(iOS)
-    /// The scenes in the foreground, which plugins read on any thread.
-    private let foregroundScenes = OSAllocatedUnfairLock(initialState: 0)
+    /// The scenes in the foreground.
+    private var foregroundScenes = 0
   #endif
 
   /// Creates the plugins. Call it before launch finishes.
@@ -173,29 +172,31 @@ final class TokamakApp {
   #if os(iOS)
     /// Delivers `resume` as the first scene enters the foreground.
     func sceneWillEnterForeground() {
-      let first = foregroundScenes.withLock { scenes in
-        scenes += 1
-        return scenes == 1
-      }
-      if first {
+      foregroundScenes += 1
+      if foregroundScenes == 1 {
         moved(toForeground: true)
       }
     }
 
     /// Delivers `suspend` as the last scene leaves the foreground.
     func sceneDidEnterBackground() {
-      let last = foregroundScenes.withLock { scenes in
-        scenes -= 1
-        return scenes == 0
-      }
-      if last {
+      foregroundScenes -= 1
+      if foregroundScenes == 0 {
         moved(toForeground: false)
       }
     }
 
-    /// Whether a scene is in the foreground. Read it on any thread.
+    /// Whether a scene is in the foreground.
+    var hasForegroundScene: Bool {
+      foregroundScenes > 0
+    }
+
+    /// Whether the app is in the foreground, as the runtime records it, or
+    /// until the runtime has started, whether a scene is in the foreground.
+    /// Read it on the main thread.
     var isInForeground: Bool {
-      foregroundScenes.withLock { $0 > 0 }
+      guard case .success(let runtime) = runtime else { return hasForegroundScene }
+      return runtime.isForeground
     }
   #endif
 
@@ -422,6 +423,11 @@ final class RuntimeHandle {
     tokamak_runtime_set_foreground(handle, foreground)
   }
 
+  /// Whether the app is in the foreground, as last recorded.
+  var isForeground: Bool {
+    tokamak_runtime_is_foreground(handle)
+  }
+
   /// Passes a plugin's `result`, JSON-serialisable, to the Worker's call or
   /// subscription `id`.
   func reply(_ id: UInt64, result: [String: Any]) {

package/ios-simulator-x64/native-shell/TokamakPlugins.swift

@@ -28,9 +28,10 @@ final class TokamakHost {
     self.plugin = plugin
   }
 
-  /// Throws `NeedsUIError` unless the app can show UI now: on iOS, while a
-  /// scene is in the foreground. A hidden or minimised macOS app still shows
-  /// system prompts. Call it where the plugin would show UI, on any thread.
+  /// Throws `NeedsUIError` unless the app can show UI now: on iOS, while it
+  /// is in the foreground. A hidden or minimised macOS app still shows system
+  /// prompts. Call it on the main thread, where the plugin decides to show
+  /// UI.
   func requireUI() throws(TokamakPluginError) {
     #if os(iOS)
       guard app.isInForeground else { throw .needsUI }

package/ios-simulator-x64/native-shell/TokamakShell.swift

@@ -431,7 +431,7 @@ private final class TokamakController {
       didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
     ) -> Bool {
       DispatchQueue.main.async {
-        self.app.start(foreground: self.app.isInForeground)
+        self.app.start(foreground: self.app.hasForegroundScene)
       }
       return true
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokamakdev/platform-ios-simulator-x64",
-  "version": "0.1.1-beta.84",
+  "version": "0.1.1-beta.85",
   "description": "The tokamak platform pack for ios-simulator-x64",
   "repository": {
     "type": "git",