@tokamakdev/platform-ios-simulator-x64 0.1.1-beta.54 → 0.1.1-beta.56

package/ios-simulator-x64/build/entrypoint

@@ -53,13 +53,12 @@ case "$target" in
     ;;
 esac
 
+bundle=$output
 if [[ "$platform" == macos ]]; then
-  bundle=$output
   contents=$bundle/Contents
   executable_dir=$contents/MacOS
   app_dir=$contents/Resources/app
 else
-  bundle=$output
   contents=$bundle
   executable_dir=$bundle
   app_dir=$bundle/app
@@ -77,27 +76,21 @@ write_plist() {
 }
 
 sign_bundle() {
-  if [[ "$platform" == ios ]]; then
-    signing_args=(
-      sign
-      --platform ios
-      --project "$project_dir"
-      --bundle "$bundle"
-      --bundle-id "$identifier"
-    )
-    if [[ -f "$metadata/device-id" ]]; then
-      signing_args+=(--device-id "$(cat "$metadata/device-id")")
-    fi
-    "$apple_tool" "${signing_args[@]}"
-  elif [[ "$platform" == macos ]]; then
-    "$apple_tool" sign \
-      --platform macos \
-      --project "$project_dir" \
-      --bundle "$bundle" \
-      --bundle-id "$identifier"
-  else
+  if [[ "$platform" != ios && "$platform" != macos ]]; then
     codesign --force --timestamp=none --sign - "$bundle"
+    return
+  fi
+  signing_args=(
+    sign
+    --platform "$platform"
+    --project "$project_dir"
+    --bundle "$bundle"
+    --bundle-id "$identifier"
+  )
+  if [[ "$platform" == ios && -f "$metadata/device-id" ]]; then
+    signing_args+=(--device-id "$(cat "$metadata/device-id")")
   fi
+  "$apple_tool" "${signing_args[@]}"
 }
 
 bundle_key_file=$output_parent/.tokamak/$(basename "$output").input-key
@@ -184,16 +177,18 @@ done
 registry=$temporary/TokamakPluginRegistry.swift
 {
   printf '%s\n\n' 'import Foundation'
-  printf '%s\n' 'func tokamakPlugins(host: TokamakHost) -> [any TokamakPlugin] {'
-  printf '%s\n' '  ['
+  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' '  ]'
-  printf '%s\n' '}'
+  printf '%s\n' '  ]' '}'
 } > "$registry"
 
+# The executable exports only the entry points of the runtime parts the app
+# links.
+exported_symbols=$temporary/exported-symbols
+sed 's/^/_/' "$metadata/exported-symbols" > "$exported_symbols"
 swift_args=(
   "${swift_sources[@]}"
   "$registry"
@@ -208,7 +203,7 @@ swift_args=(
   -lc++
   -lresolv
   -Xlinker -dead_strip
-  -Xlinker -no_exported_symbols
+  -Xlinker -exported_symbols_list -Xlinker "$exported_symbols"
 )
 for plugin in "$input/plugins"/*; do
   [[ -d "$plugin" ]] || continue
@@ -227,7 +222,8 @@ if [[ "$platform" == ios-simulator ]]; then
 fi
 
 xcrun --sdk "$sdk" swiftc "${swift_args[@]}" -o "$executable_dir/$app_slug"
-xcrun --sdk "$sdk" strip "$executable_dir/$app_slug"
+# Local symbols go; the exported entry points of linked parts stay.
+xcrun --sdk "$sdk" strip -x "$executable_dir/$app_slug"
 
 write_plist
 

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

@@ -205,9 +205,7 @@ final class RuntimeHandle {
     guard handle != nil else {
       throw RuntimeError.runtime(String(cString: error))
     }
-    try? FileManager.default.removeItem(
-      at: state.appendingPathComponent(startupErrorFile)
-    )
+    try? FileManager.default.removeItem(at: state.appendingPathComponent(startupErrorFile))
   }
 
   deinit {
@@ -223,11 +221,7 @@ final class RuntimeHandle {
   func restoreGateway() throws -> UInt16 {
     var error = [CChar](repeating: 0, count: 512)
     let port = error.withUnsafeMutableBufferPointer { error in
-      tokamak_runtime_restore_gateway(
-        handle,
-        error.baseAddress,
-        error.count
-      )
+      tokamak_runtime_restore_gateway(handle, error.baseAddress, error.count)
     }
     guard port != 0 else {
       throw RuntimeError.runtime(String(cString: error))
@@ -245,7 +239,7 @@ final class RuntimeHandle {
       decoding: try JSONSerialization.data(withJSONObject: body, options: .fragmentsAllowed),
       as: UTF8.self
     )
-    var response = TokamakBytes(data: nil, len: 0)
+    var response = TokamakBytes()
     var error = [CChar](repeating: 0, count: 1024)
     let succeeded = name.withCString { name in
       body.withCString { body in
@@ -266,14 +260,11 @@ final class RuntimeHandle {
     guard succeeded else {
       throw RuntimeError.runtime(String(cString: error))
     }
-    guard let bytes = response.data else { return Data() }
-    return Data(bytes: bytes, count: response.len)
+    return response.contents ?? Data()
   }
 
-  func serverAuthority(
-    host: String
-  ) -> AuthenticationMaterial<Data> {
-    var bytes = TokamakBytes(data: nil, len: 0)
+  func serverAuthority(host: String) -> AuthenticationMaterial<Data> {
+    var bytes = TokamakBytes()
     let decision = host.withCString {
       tokamak_runtime_server_authority(handle, $0, &bytes)
     }
@@ -282,28 +273,17 @@ final class RuntimeHandle {
       return .defaultHandling
     case Int32(TOKAMAK_DECISION_USE):
       defer { tokamak_bytes_free(bytes) }
-      guard let data = bytes.data else { return .cancel }
-      return .use(Data(bytes: data, count: bytes.len))
+      guard let authority = bytes.contents else { return .cancel }
+      return .use(authority)
     default:
       return .cancel
     }
   }
 
-  func clientIdentity(
-    host: String,
-    previousFailures: Int
-  ) -> AuthenticationMaterial<(Data, Data)> {
-    var identity = TokamakIdentity(
-      certificate: TokamakBytes(data: nil, len: 0),
-      private_key: TokamakBytes(data: nil, len: 0)
-    )
+  func clientIdentity(host: String, previousFailures: Int) -> AuthenticationMaterial<(Data, Data)> {
+    var identity = TokamakIdentity()
     let decision = host.withCString {
-      tokamak_runtime_client_identity(
-        handle,
-        $0,
-        max(previousFailures, 0),
-        &identity
-      )
+      tokamak_runtime_client_identity(handle, $0, max(previousFailures, 0), &identity)
     }
     switch decision {
     case Int32(TOKAMAK_DECISION_DEFAULT):
@@ -311,16 +291,12 @@ final class RuntimeHandle {
     case Int32(TOKAMAK_DECISION_USE):
       defer { tokamak_identity_free(identity) }
       guard
-        let certificate = identity.certificate.data,
-        let privateKey = identity.private_key.data
+        let certificate = identity.certificate.contents,
+        let privateKey = identity.private_key.contents
       else {
         return .cancel
       }
-      return .use(
-        (
-          Data(bytes: certificate, count: identity.certificate.len),
-          Data(bytes: privateKey, count: identity.private_key.len)
-        ))
+      return .use((certificate, privateKey))
     default:
       return .cancel
     }
@@ -364,3 +340,10 @@ final class RuntimeHandle {
     .appendingPathComponent(identifier, isDirectory: true)
   }
 }
+
+extension TokamakBytes {
+  /// A copy of the buffer, or nil when it is null.
+  fileprivate var contents: Data? {
+    data.map { Data(bytes: $0, count: len) }
+  }
+}

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

@@ -121,8 +121,7 @@ final class TokamakPluginBridge: NSObject, WKScriptMessageHandler {
       message.frameInfo.securityOrigin.isAppOrigin(host),
       let encoded = message.body as? String,
       let data = encoded.data(using: .utf8),
-      let request = try? JSONSerialization.jsonObject(with: data)
-        as? [String: Any],
+      let request = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
       let type = request["type"] as? String,
       let session = request["session"] as? String
     else {
@@ -142,21 +141,13 @@ final class TokamakPluginBridge: NSObject, WKScriptMessageHandler {
     dispatch(type: type, key: key, request: request)
   }
 
-  private func dispatch(
-    type: String,
-    key: RequestKey,
-    request: [String: Any]
-  ) {
+  private func dispatch(type: String, key: RequestKey, request: [String: Any]) {
     guard
       let pluginId = request["plugin"] as? String,
       let method = request["method"] as? String,
       let plugin = plugins[pluginId]
     else {
-      send(
-        key: key,
-        result: .failure(.notSupported("Plugin is not supported")),
-        done: true
-      )
+      send(key: key, result: .failure(.notSupported("Plugin is not supported")), done: true)
       return
     }
     let arguments = request["arguments"] ?? NSNull()
@@ -175,29 +166,18 @@ final class TokamakPluginBridge: NSObject, WKScriptMessageHandler {
       cancellations[key] = cancellation
     default:
       send(
-        key: key,
-        result: .failure(.notSupported("Plugin operation is not supported")),
-        done: true
-      )
+        key: key, result: .failure(.notSupported("Plugin operation is not supported")), done: true)
     }
   }
 
   /// Plugins reply from any thread; delivery happens on the main thread.
-  private func send(
-    key: RequestKey,
-    result: Result<Any?, TokamakPluginError>,
-    done: Bool
-  ) {
+  private func send(key: RequestKey, result: Result<Any?, TokamakPluginError>, done: Bool) {
     DispatchQueue.main.async { [weak self] in
       self?.deliver(key: key, result: result, done: done)
     }
   }
 
-  private func deliver(
-    key: RequestKey,
-    result: Result<Any?, TokamakPluginError>,
-    done: Bool
-  ) {
+  private func deliver(key: RequestKey, result: Result<Any?, TokamakPluginError>, done: Bool) {
     if done {
       cancellations.removeValue(forKey: key)?()
     }

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

@@ -84,7 +84,6 @@ private final class NavigationDelegate: NSObject, WKNavigationDelegate, WKUIDele
     for navigationAction: WKNavigationAction,
     windowFeatures: WKWindowFeatures
   ) -> WKWebView? {
-    _ = (configuration, windowFeatures)
     guard let url = navigationAction.request.url else { return nil }
     if url.isAppOrigin(runtime.appHost) {
       webView.load(navigationAction.request)
@@ -109,11 +108,7 @@ private final class NavigationDelegate: NSObject, WKNavigationDelegate, WKUIDele
   func webView(
     _ webView: WKWebView,
     didReceive challenge: URLAuthenticationChallenge,
-    completionHandler:
-      @escaping (
-        URLSession.AuthChallengeDisposition,
-        URLCredential?
-      ) -> Void
+    completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void
   ) {
     let space = challenge.protectionSpace
     switch space.authenticationMethod {
@@ -155,11 +150,7 @@ private final class NavigationDelegate: NSObject, WKNavigationDelegate, WKUIDele
   private func answer(
     _ material: AuthenticationMaterial<Data>,
     trust: SecTrust?,
-    completion:
-      @escaping (
-        URLSession.AuthChallengeDisposition,
-        URLCredential?
-      ) -> Void
+    completion: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void
   ) {
     switch material {
     case .defaultHandling:
@@ -169,14 +160,8 @@ private final class NavigationDelegate: NSObject, WKNavigationDelegate, WKUIDele
     case .use(let authority):
       guard
         let trust,
-        let certificate = SecCertificateCreateWithData(
-          nil,
-          authority as CFData
-        ),
-        SecTrustSetAnchorCertificates(
-          trust,
-          [certificate] as CFArray
-        ) == errSecSuccess,
+        let certificate = SecCertificateCreateWithData(nil, authority as CFData),
+        SecTrustSetAnchorCertificates(trust, [certificate] as CFArray) == errSecSuccess,
         SecTrustSetAnchorCertificatesOnly(trust, true) == errSecSuccess
       else {
         completion(.cancelAuthenticationChallenge, nil)
@@ -199,10 +184,7 @@ private final class NavigationDelegate: NSObject, WKNavigationDelegate, WKUIDele
 
   private func answer(
     _ material: AuthenticationMaterial<(Data, Data)>,
-    completion: (
-      URLSession.AuthChallengeDisposition,
-      URLCredential?
-    ) -> Void
+    completion: (URLSession.AuthChallengeDisposition, URLCredential?) -> Void
   ) {
     switch material {
     case .defaultHandling:
@@ -210,36 +192,17 @@ private final class NavigationDelegate: NSObject, WKNavigationDelegate, WKUIDele
     case .cancel:
       completion(.cancelAuthenticationChallenge, nil)
     case .use(let value):
-      guard
-        let identity = identity(
-          certificate: value.0,
-          privateKey: value.1
-        )
-      else {
+      guard let identity = identity(certificate: value.0, privateKey: value.1) else {
         completion(.cancelAuthenticationChallenge, nil)
         return
       }
-      completion(
-        .useCredential,
-        URLCredential(
-          identity: identity,
-          certificates: nil,
-          persistence: .none
-        )
-      )
+      let credential = URLCredential(identity: identity, certificates: nil, persistence: .none)
+      completion(.useCredential, credential)
     }
   }
 
-  private func identity(
-    certificate: Data,
-    privateKey: Data
-  ) -> SecIdentity? {
-    guard
-      let certificate = SecCertificateCreateWithData(
-        nil,
-        certificate as CFData
-      )
-    else {
+  private func identity(certificate: Data, privateKey: Data) -> SecIdentity? {
+    guard let certificate = SecCertificateCreateWithData(nil, certificate as CFData) else {
       return nil
     }
     let attributes: [CFString: Any] = [
@@ -247,12 +210,7 @@ private final class NavigationDelegate: NSObject, WKNavigationDelegate, WKUIDele
       kSecAttrKeyClass: kSecAttrKeyClassPrivate,
       kSecAttrKeySizeInBits: 256,
     ]
-    guard
-      let key = SecKeyCreateWithData(
-        privateKey as CFData,
-        attributes as CFDictionary,
-        nil
-      )
+    guard let key = SecKeyCreateWithData(privateKey as CFData, attributes as CFDictionary, nil)
     else {
       return nil
     }
@@ -273,10 +231,7 @@ private final class TokamakController {
     self.host = host
   }
 
-  func start(
-    frame: CGRect,
-    completion: @escaping (WKWebView) -> Void
-  ) {
+  func start(frame: CGRect, completion: @escaping (WKWebView) -> Void) {
     host.whenStarted { result in
       switch result {
       case .success(let runtime):
@@ -315,15 +270,9 @@ private final class TokamakController {
     #endif
     configuration.mediaTypesRequiringUserActionForPlayback = []
 
-    let pluginBridge = TokamakPluginBridge(
-      host: runtime.appHost,
-      plugins: host.plugins
-    )
+    let pluginBridge = TokamakPluginBridge(host: runtime.appHost, plugins: host.plugins)
     pluginBridge.install(in: configuration.userContentController)
-    let navigation = NavigationDelegate(
-      runtime: runtime,
-      pluginBridge: pluginBridge
-    )
+    let navigation = NavigationDelegate(runtime: runtime, pluginBridge: pluginBridge)
     self.navigation = navigation
     let webView = WKWebView(frame: frame, configuration: configuration)
     #if os(iOS)
@@ -339,16 +288,9 @@ private final class TokamakController {
     return webView
   }
 
-  private func setProxy(
-    port: UInt16,
-    host: String,
-    dataStore: WKWebsiteDataStore
-  ) {
+  private func setProxy(port: UInt16, host: String, dataStore: WKWebsiteDataStore) {
     var proxy = ProxyConfiguration(
-      httpCONNECTProxy: .hostPort(
-        host: "127.0.0.1",
-        port: NWEndpoint.Port(rawValue: port)!
-      )
+      httpCONNECTProxy: .hostPort(host: "127.0.0.1", port: NWEndpoint.Port(rawValue: port)!)
     )
     proxy.matchDomains = [host]
     proxy.allowFailover = false
@@ -371,19 +313,12 @@ private final class TokamakController {
     func applicationDidFinishLaunching(_ notification: Notification) {
       let window = NSWindow(
         contentRect: NSRect(x: 0, y: 0, width: 1024, height: 768),
-        styleMask: [
-          .titled,
-          .closable,
-          .miniaturizable,
-          .resizable,
-        ],
+        styleMask: [.titled, .closable, .miniaturizable, .resizable],
         backing: .buffered,
         defer: false
       )
       window.title =
-        Bundle.main.object(
-          forInfoDictionaryKey: "CFBundleName"
-        ) as? String ?? "tokamak"
+        Bundle.main.object(forInfoDictionaryKey: "CFBundleName") as? String ?? "tokamak"
       window.center()
       window.makeKeyAndOrderFront(nil)
       NSApplication.shared.activate(ignoringOtherApps: true)
@@ -396,9 +331,7 @@ private final class TokamakController {
       }
     }
 
-    func applicationShouldTerminateAfterLastWindowClosed(
-      _ sender: NSApplication
-    ) -> Bool {
+    func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
       true
     }
 
@@ -451,10 +384,7 @@ private final class TokamakController {
       self.window = window
 
       controller.start(frame: viewController.view.bounds) { webView in
-        webView.autoresizingMask = [
-          .flexibleWidth,
-          .flexibleHeight,
-        ]
+        webView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         viewController.view.addSubview(webView)
       }
       return true

package/package.json

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