@tokamakdev/platform-ios-simulator-x64 0.1.1-beta.65 → 0.1.1-beta.69

package/ios-simulator-x64/build/entrypoint

@@ -76,7 +76,7 @@ write_plist() {
 }
 
 sign_bundle() {
-  if [[ "$platform" != ios && "$platform" != macos ]]; then
+  if [[ "$sdk" == iphonesimulator ]]; then
     codesign --force --timestamp=none --sign - "$bundle"
     return
   fi
@@ -96,7 +96,7 @@ sign_bundle() {
 bundle_key_file=$output_parent/.tokamak/$(basename "$output").input-key
 if [[ -f "$metadata/input-key" ]]; then
   case "$platform" in
-    ios|ios-simulator) app_files=("${TOKAMAK_IOS_PLIST:-}" "${TOKAMAK_IOS_ENTITLEMENTS:-}") ;;
+    ios) app_files=("${TOKAMAK_IOS_PLIST:-}" "${TOKAMAK_IOS_ENTITLEMENTS:-}") ;;
     macos) app_files=("${TOKAMAK_MACOS_PLIST:-}" "${TOKAMAK_MACOS_ENTITLEMENTS:-}") ;;
   esac
   bundle_key=$(
@@ -127,7 +127,7 @@ rm -rf "$bundle"
 mkdir -p "$executable_dir" "$app_dir" "$module_cache"
 cp -R "$input/app/." "$app_dir/"
 
-if [[ ( "$platform" == macos || "$platform" == ios || "$platform" == ios-simulator ) && -d "$icons/AppIcon.icon" ]]; then
+if [[ -d "$icons/AppIcon.icon" ]]; then
   if [[ "$platform" == macos ]]; then
     icon_output=$contents/Resources
     icon_minimum=14.0
@@ -160,10 +160,19 @@ if [[ ! -f "$native_shell/TokamakShell.swift" ]]; then
   exit 1
 fi
 
-for plugin in "$input/plugins"/*; do
-  [[ -d "$plugin" ]] || continue
+# A plugin's class is a Swift type name, which the registry creates, and its
+# sources are Swift.
+swift_type='^[A-Za-z_][A-Za-z0-9_]*(\.[A-Za-z_][A-Za-z0-9_]*)*$'
+registry=$temporary/TokamakPluginRegistry.swift
+printf '%s\n\n%s\n%s\n' 'import Foundation' 'func tokamakPlugins(host: TokamakHost) -> [any TokamakPlugin] {' '  [' > "$registry"
+for plugin in "$input/plugins"/*/; do
+  class=$(cat "$plugin/class" 2>/dev/null || true)
+  if [[ ! "$class" =~ $swift_type ]]; then
+    echo "plugin '$(basename "$plugin")' has invalid $platform class '$class'" >&2
+    exit 1
+  fi
+  printf '    %s(host: host),\n' "$class" >> "$registry"
   for source in "$plugin/sources"/*; do
-    [[ -f "$source" ]] || continue
     case "$source" in
       *.swift) swift_sources+=("$source") ;;
       *)
@@ -173,17 +182,7 @@ for plugin in "$input/plugins"/*; do
     esac
   done
 done
-
-registry=$temporary/TokamakPluginRegistry.swift
-{
-  printf '%s\n\n' 'import Foundation'
-  printf '%s\n' 'func tokamakPlugins(host: TokamakHost) -> [any TokamakPlugin] {' '  ['
-  for plugin in "$input/plugins"/*; do
-    [[ -d "$plugin" ]] || continue
-    printf '    %s(host: host),\n' "$(cat "$plugin/class")"
-  done
-  printf '%s\n' '  ]' '}'
-} > "$registry"
+printf '%s\n' '  ]' '}' >> "$registry"
 
 # The executable exports only the entry points of the runtime parts the app
 # links.
@@ -205,17 +204,10 @@ swift_args=(
   -Xlinker -dead_strip
   -Xlinker -exported_symbols_list -Xlinker "$exported_symbols"
 )
-for plugin in "$input/plugins"/*; do
-  [[ -d "$plugin" ]] || continue
-  for framework_file in "$plugin/frameworks"/*; do
-    [[ -f "$framework_file" ]] || continue
-    swift_args+=(-framework "$(cat "$framework_file")")
-  done
-done
 
 # Simulator builds embed their entitlements in __TEXT,__entitlements, where
 # the simulator reads them.
-if [[ "$platform" == ios-simulator ]]; then
+if [[ "$sdk" == iphonesimulator ]]; then
   simulator_entitlements=$temporary/simulator.entitlements
   "$apple_tool" simulator-entitlements --identifier "$identifier" --output "$simulator_entitlements"
   swift_args+=(-Xlinker -sectcreate -Xlinker __TEXT -Xlinker __entitlements -Xlinker "$simulator_entitlements")

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

@@ -33,22 +33,25 @@ final class TokamakHost {
   }
 
   /// Posts `body`, JSON-serialisable, to the Worker's `/tokamak/<name>`
-  /// endpoint and returns the response body. Fails unless the Worker responds
-  /// 200 within `timeout`. Call it on the main thread; `completion` runs on
-  /// the main thread.
+  /// endpoint and returns the response body, retrying a failed post. Fails
+  /// unless the Worker responds 200 within `timeout`, which includes runtime
+  /// startup. Call it on the main thread; `completion` runs on the main thread.
   func call(
     _ name: String,
     body: Any,
     timeout: TimeInterval,
     completion: @escaping (Result<Data, Error>) -> Void
   ) {
+    let deadline = Date() + timeout
     whenStarted { result in
       switch result {
       case .failure(let error):
         completion(.failure(error))
       case .success(let runtime):
         DispatchQueue.global(qos: .userInitiated).async {
-          let outcome = Result { try runtime.call(name, body: body, timeout: timeout) }
+          let outcome = Result {
+            try runtime.call(name, body: body, timeout: deadline.timeIntervalSinceNow)
+          }
           DispatchQueue.main.async { completion(outcome) }
         }
       }
@@ -229,8 +232,8 @@ final class RuntimeHandle {
     return port
   }
 
-  /// Posts `body` to the Worker's `/tokamak/<name>` endpoint, blocking until
-  /// it responds 200 or `timeout` passes.
+  /// Posts `body` to the Worker's `/tokamak/<name>` endpoint, retrying a
+  /// failed post, and blocks until it responds 200 or `timeout` passes.
   func call(_ name: String, body: Any, timeout: TimeInterval) throws -> Data {
     guard JSONSerialization.isValidJSONObject([body]) else {
       throw RuntimeError.runtime("the \(name) call body is not JSON")
@@ -248,7 +251,7 @@ final class RuntimeHandle {
             handle,
             name,
             body,
-            UInt64(timeout * 1000),
+            UInt64(max(timeout, 0) * 1000),
             &response,
             error.baseAddress,
             error.count

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

@@ -200,7 +200,12 @@ final class TokamakPluginBridge: NSObject, WKScriptMessageHandler {
     else {
       return
     }
-    webView?.evaluateJavaScript("globalThis.__tokamakReceive?.(\(json))")
+    webView?.callAsyncJavaScript(
+      "globalThis.__tokamakNative?.onmessage?.({ data })",
+      arguments: ["data": json],
+      in: nil,
+      in: .page
+    )
   }
 
   private static func bootstrap(host: String) -> String {

package/ios-simulator-x64/platform-pack.json

@@ -39,5 +39,10 @@
       "kind": "string",
       "description": "Apple Development team for automatic signing"
     }
+  },
+  "pluginKeys": {
+    "class": "string",
+    "plist": "path",
+    "sources": "paths"
   }
 }

package/package.json

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