@tokamakdev/platform-macos-arm64 0.1.1-beta.142 → 0.1.1-beta.144

package/macos-arm64/build/entrypoint

@@ -220,16 +220,7 @@ if [[ -n "$icon" ]]; then
 fi
 
 shopt -s nullglob
-swift_sources=()
-for source in "$pack/native-shell"/*.swift; do
-  [[ -f "$source" ]] || continue
-  swift_sources+=("$source")
-done
-
-if [[ ! -f "$pack/native-shell/TokamakShell.swift" ]]; then
-  echo "Apple native shell source is missing: $pack/native-shell/TokamakShell.swift" >&2
-  exit 1
-fi
+swift_sources=("$pack/native-shell"/*.swift)
 
 # A plugin's class is a Swift type name, which the registry creates, and its
 # sources are the Swift files in its native directory.

package/macos-arm64/native-shell/TokamakApp.swift

@@ -311,16 +311,8 @@ enum TokamakBackgroundResult {
   }
 }
 
-enum RuntimeError: Error, CustomStringConvertible {
-  case configuration(String)
-  case runtime(String)
-
-  var description: String {
-    switch self {
-    case .configuration(let message), .runtime(let message):
-      return message
-    }
-  }
+struct RuntimeError: Error, CustomStringConvertible {
+  let description: String
 }
 
 enum AuthenticationMaterial<Value> {
@@ -338,7 +330,7 @@ final class RuntimeHandle {
   /// Worker calls `plugins`.
   init(foreground: Bool, plugins: TokamakPluginHandler) throws {
     guard let appHost = Bundle.main.tokamakHost, !appHost.isEmpty else {
-      throw RuntimeError.configuration("TokamakHost is required")
+      throw RuntimeError(description: "TokamakHost is required")
     }
     self.appHost = appHost
 
@@ -371,7 +363,7 @@ final class RuntimeHandle {
     } else {
       let bundle = Bundle.main.resourceURL?.appendingPathComponent("app")
       guard let bundle else {
-        throw RuntimeError.configuration("app bundle resources are unavailable")
+        throw RuntimeError(description: "app bundle resources are unavailable")
       }
       let storage = try Self.storageDirectory()
       handle = bundle.path.withCString { bundlePath in
@@ -396,7 +388,7 @@ final class RuntimeHandle {
       }
     }
     guard handle != nil else {
-      throw RuntimeError.runtime(String(cString: error))
+      throw RuntimeError(description: String(cString: error))
     }
     try? FileManager.default.removeItem(at: state.appendingPathComponent(startupErrorFile))
   }
@@ -424,7 +416,7 @@ final class RuntimeHandle {
       tokamak_runtime_restore_gateway(handle, error.baseAddress, error.count)
     }
     guard port != 0 else {
-      throw RuntimeError.runtime(String(cString: error))
+      throw RuntimeError(description: String(cString: error))
     }
     return port
   }
@@ -453,7 +445,7 @@ final class RuntimeHandle {
     }
     defer { tokamak_bytes_free(reply) }
     guard succeeded else {
-      throw RuntimeError.runtime(String(cString: error))
+      throw RuntimeError(description: String(cString: error))
     }
     return reply.contents ?? Data()
   }
@@ -477,7 +469,7 @@ final class RuntimeHandle {
     }
     defer { tokamak_bytes_free(body) }
     guard succeeded else {
-      throw RuntimeError.runtime(String(cString: error))
+      throw RuntimeError(description: String(cString: error))
     }
     return body.contents ?? Data()
   }
@@ -574,7 +566,7 @@ final class RuntimeHandle {
   /// This app's folder in the user's `directory`.
   private static func appDirectory(_ directory: FileManager.SearchPathDirectory) throws -> URL {
     guard let identifier = Bundle.main.bundleIdentifier else {
-      throw RuntimeError.configuration("CFBundleIdentifier is required")
+      throw RuntimeError(description: "CFBundleIdentifier is required")
     }
     return try FileManager.default.url(
       for: directory,

package/macos-arm64/native-shell/TokamakControls.swift

@@ -36,7 +36,9 @@ final class TokamakCorePlugin: TokamakPlugin {
   /// Starts navigation to the app URL `path`, relative to the current page or
   /// the app origin.
   private func navigate(to path: Any) -> Result<Void, TokamakPluginError> {
-    guard let view = host.webView else { return .failure(noView) }
+    guard let view = host.webView else {
+      return .failure(.init(name: "InvalidStateError", message: "The app has no WebView"))
+    }
     let appHost = Bundle.main.tokamakHost ?? ""
     guard let path = path as? String,
       let base = view.url ?? URL(string: "https://\(appHost)/"),
@@ -60,8 +62,4 @@ final class TokamakCorePlugin: TokamakPlugin {
       reply(result.map { _ in nil }.mapError { TokamakPluginError($0) })
     }
   }
-
-  private var noView: TokamakPluginError {
-    .init(name: "InvalidStateError", message: "The app has no WebView")
-  }
 }

package/macos-arm64/native-shell/TokamakPlugins.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Security
 import WebKit
 
 #if os(iOS)
@@ -56,13 +57,9 @@ struct TokamakPluginResult {
   let payload: Data
   let failed: Bool
   let done: Bool
+}
 
-  init(payload: Data, failed: Bool, done: Bool) {
-    self.payload = payload
-    self.failed = failed
-    self.done = done
-  }
-
+extension TokamakPluginResult {
   init(_ result: Result<Data, TokamakPluginError>, done: Bool) {
     self.done = done
     switch result {
@@ -95,6 +92,14 @@ func decodePluginValue(_ payload: Data) throws(TokamakPluginError) -> Any {
   }
 }
 
+#if os(macOS)
+  /// The value of the app's entitlement `key`, or nil when its signature lacks it.
+  func tokamakEntitlement(_ key: String) -> Any? {
+    guard let task = SecTaskCreateFromSelf(nil) else { return nil }
+    return SecTaskCopyValueForEntitlement(task, key as CFString, nil)
+  }
+#endif
+
 /// The app as one plugin sees it.
 final class TokamakHost {
   private unowned let app: TokamakApp

package/macos-arm64/tools/tokamak-swift-describe

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/macos-arm64/tools/tokamak-swift-describe
 size: 34569672 bytes
-sha256: d3852fed69ed0d74bca87bf62a0417e616e92ca269149fe990e23654a95a94dc
+sha256: f1660801317e44cfbfd7f6d2c135fbf9d305fbe1c6d5465a2f5ac34525564cb4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokamakdev/platform-macos-arm64",
-  "version": "0.1.1-beta.142",
+  "version": "0.1.1-beta.144",
   "description": "The tokamak platform pack for macos-arm64",
   "repository": {
     "type": "git",