@tokamakdev/platform-ios-arm64 0.1.1-beta.127 → 0.1.1-beta.128

package/ios-arm64/build/entrypoint

@@ -171,38 +171,27 @@ fi
 # 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_]*)*$'
-# Swift requires unique file names in a module, so the source staged as
-# <plugin>/<key>/<name> compiles as <plugin>-<key>-<name>.
+# Swift requires unique file names in a module, so a plugin's source
+# <name> compiles as <plugin>-<name>.
 plugin_sources=$temporary/plugin-sources
 mkdir "$plugin_sources"
-add_plugin_source() {
-  local plugin_id=$1 source=$2
-  local key=${source%/*}
-  local named=$plugin_sources/$plugin_id-${key##*/}-${source##*/}
-  cp "$source" "$named"
-  swift_sources+=("$named")
-}
 registry=$temporary/TokamakPluginRegistry.swift
 printf '%s\n\n%s\n%s\n' 'import Foundation' 'func tokamakPlugins(app: TokamakApp) -> [any TokamakPlugin] {' '  [' > "$registry"
 for plugin in "$input/plugins"/*/; do
   plugin_id=$(basename "$plugin")
   class=$(cat "$plugin/class" 2>/dev/null || true)
-  # A plugin whose native code is its generated bindings alone has no class.
-  if [[ -n "$class" || ! -d "$plugin/bindings" ]]; then
-    if [[ ! "$class" =~ $swift_type ]]; then
-      echo "plugin '$plugin_id' has invalid $platform class '$class'" >&2
-      exit 1
-    fi
-    printf '    %s(host: TokamakHost(app: app, plugin: "%s")),\n' "$class" "$plugin_id" >> "$registry"
+  if [[ ! "$class" =~ $swift_type ]]; then
+    echo "plugin '$plugin_id' has invalid $platform class '$class'" >&2
+    exit 1
   fi
-  # `tok bindings` names the generated class TokamakBindings_<id>, with - as _.
-  for source in "$plugin/bindings"/*.swift; do
-    printf '    TokamakBindings_%s(host: TokamakHost(app: app, plugin: "%s")),\n' "${plugin_id//-/_}" "$plugin_id" >> "$registry"
-    add_plugin_source "$plugin_id" "$source"
-  done
+  printf '    %s(host: TokamakHost(app: app, plugin: "%s")),\n' "$class" "$plugin_id" >> "$registry"
   for source in "$plugin/sources"/*; do
     case "$source" in
-      *.swift) add_plugin_source "$plugin_id" "$source" ;;
+      *.swift)
+        named=$plugin_sources/$plugin_id-${source##*/}
+        cp "$source" "$named"
+        swift_sources+=("$named")
+        ;;
       *)
         echo "Apple plugin source must be Swift: $source" >&2
         exit 1

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

@@ -9,10 +9,9 @@ final class TokamakCorePlugin: TokamakPlugin {
 
   init(host: TokamakHost) { self.host = host }
 
-  /// WebView operations and the presenter run on the main thread, which
-  /// WebKit and UIKit require.
+  /// WebView operations run on the main thread, which WebKit requires.
   func executor(for method: String) -> DispatchQueue {
-    method.hasPrefix("webview.") || method == "resource.root" ? .main : queue
+    method.hasPrefix("webview.") ? .main : queue
   }
 
   func call(method: String, arguments: Any, reply: @escaping TokamakPluginReply) -> (() -> Void)? {
@@ -22,11 +21,6 @@ final class TokamakCorePlugin: TokamakPlugin {
         Result { () throws(TokamakPluginError) -> Any? in
           try host.resources.get(arguments, as: Data.self)
         })
-    case "resource.release":
-      host.resources.release(arguments)
-      reply(.success(nil))
-    case "resource.root":
-      reply(Result { () throws(TokamakPluginError) -> Any? in try root(arguments) })
     case "webview.getCurrentPage":
       reply(.success(host.webView?.url?.absoluteString))
     case "webview.navigate":
@@ -39,28 +33,6 @@ final class TokamakCorePlugin: TokamakPlugin {
     return nil
   }
 
-  /// `resource.scope` opens a scope for the objects an invocation receives,
-  /// which ends with the subscription.
-  func subscribe(method: String, arguments: Any, reply: @escaping TokamakPluginReply)
-    throws(TokamakPluginError) -> () -> Void
-  {
-    guard method == "resource.scope" else {
-      throw .notSupported("\(id).\(method) is not supported")
-    }
-    let scope = host.resources.open()
-    reply(.success(scope))
-    return { [host] in host.resources.end(scope) }
-  }
-
-  /// Retains the app object `name` in `scope` and returns its ID: the
-  /// `presenter` a native screen is presented from.
-  private func root(_ arguments: Any) throws(TokamakPluginError) -> String {
-    let arguments = arguments as? [String: Any]
-    guard let scope = arguments?["scope"] as? String, arguments?["name"] as? String == "presenter"
-    else { throw .notSupported("\(id).resource.root has no such object") }
-    return try host.resources.retain(host.presenter(), in: scope)
-  }
-
   /// 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> {

package/ios-arm64/native-shell/TokamakResources.swift

@@ -1,61 +1,23 @@
 import Foundation
 
-/// Native objects that plugins share by ID. Each belongs to a scope and is
-/// kept until it is released or its scope ends.
+/// Native objects that plugins share by ID. Each is kept until the
+/// subscription that retained it ends.
 final class TokamakResources {
   private let lock = NSLock()
-  private var objects: [String: (object: Any, scope: String)] = [:]
-  private var scopes: [String: Set<String>] = [:]
+  private var objects: [String: Any] = [:]
 
-  /// Starts a scope and returns its ID.
-  func open() -> String {
-    let scope = UUID().uuidString
-    lock.withLock { scopes[scope] = [] }
-    return scope
-  }
-
-  /// Keeps `object` in `scope` and returns its ID. An ended scope keeps
-  /// nothing, so the ID finds no object.
-  func retain(_ object: Any, in scope: String) -> String {
-    let id = UUID().uuidString
-    lock.withLock {
-      guard scopes[scope]?.insert(id) != nil else { return }
-      objects[id] = (object, scope)
-    }
-    return id
-  }
-
-  /// Keeps `object` in a scope of its own, replies with its ID, and returns
-  /// the release to return from `subscribe`.
+  /// Keeps `object`, replies with its ID, and returns the release to return
+  /// from `subscribe`.
   func retain(_ object: Any, reply: TokamakPluginReply) -> () -> Void {
-    let scope = open()
-    reply(.success(retain(object, in: scope)))
-    return { [self] in end(scope) }
-  }
-
-  /// Releases the object retained as `id`, if it is still kept.
-  func release(_ id: Any) {
-    let removed = lock.withLock { () -> Any? in
-      guard let id = id as? String, let entry = objects.removeValue(forKey: id) else { return nil }
-      scopes[entry.scope]?.remove(id)
-      return entry.object
-    }
-    drop(removed)
-  }
-
-  /// Releases every object `scope` keeps, and keeps nothing in it later.
-  func end(_ scope: String) {
-    let removed = lock.withLock { () -> [Any] in
-      (scopes.removeValue(forKey: scope) ?? []).compactMap {
-        objects.removeValue(forKey: $0)?.object
-      }
-    }
-    drop(removed)
+    let id = UUID().uuidString
+    lock.withLock { objects[id] = object }
+    reply(.success(id))
+    return { [self] in drop(lock.withLock { objects.removeValue(forKey: id) }) }
   }
 
   /// The object retained as `id`.
   func get<Object>(_ id: Any, as type: Object.Type) throws(TokamakPluginError) -> Object {
-    guard let id = id as? String, let object = lock.withLock({ objects[id]?.object }) else {
+    guard let id = id as? String, let object = lock.withLock({ objects[id] }) else {
       throw TokamakPluginError(name: "InvalidStateError", message: "The native reference is closed")
     }
     guard let typed = object as? Object else {
@@ -65,10 +27,10 @@ final class TokamakResources {
     return typed
   }
 
-  /// Lets go of released objects on the main thread, where UI and run loop
+  /// Lets go of a released object on the main thread, where UI and run loop
   /// objects expect to be deallocated.
-  private func drop(_ objects: Any?) {
-    guard let objects else { return }
-    DispatchQueue.main.async { withExtendedLifetime(objects) {} }
+  private func drop(_ object: Any?) {
+    guard let object else { return }
+    DispatchQueue.main.async { withExtendedLifetime(object) {} }
   }
 }

package/ios-arm64/platform-pack.json

@@ -28,7 +28,6 @@
     }
   },
   "pluginKeys": {
-    "bindings": "paths",
     "class": "string",
     "plist": "path",
     "resources": "paths",

package/package.json

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

package/ios-arm64/native-shell/TokamakBindings.swift

@@ -1,324 +0,0 @@
-import Foundation
-
-/// One call or subscription of a generated platform binding. It decodes the
-/// Worker's JSON into native values and encodes native values back, keeping
-/// the native objects it returns in the receiving invocation's scope.
-///
-/// JSON objects tagged `#` carry what JSON lacks: native objects, dates,
-/// bytes, errors, non-finite numbers, and records whose keys include `#`.
-struct TokamakBinding {
-  private let resources: TokamakResources
-  private let request: [String: Any]
-  private let reply: TokamakPluginBytesReply
-
-  init(
-    _ payload: Data, resources: TokamakResources, reply: @escaping TokamakPluginBytesReply
-  ) throws(TokamakPluginError) {
-    guard let request = try decodePluginValue(payload) as? [String: Any] else {
-      throw typeError("A binding request is an object")
-    }
-    self.resources = resources
-    self.request = request
-    self.reply = reply
-  }
-
-  /// The rejection of a member the running OS version lacks.
-  static let unavailable = TokamakPluginError.notSupported(
-    "The API is unavailable on this OS version")
-
-  /// Argument `index` as JSON.
-  subscript(index: Int) -> Any {
-    let arguments = request["arguments"] as? [Any] ?? []
-    return arguments.indices.contains(index) ? arguments[index] : NSNull()
-  }
-
-  /// The object the call is made on.
-  func target<T>(_ type: T.Type) throws -> T {
-    try object(request["target"] as Any, as: type)
-  }
-
-  /// The handlers an implementation calls.
-  var methods: Set<String> {
-    Set(request["methods"] as? [String] ?? [])
-  }
-
-  private var scope: String {
-    request["scope"] as? String ?? ""
-  }
-
-  // MARK: Decoding
-
-  func decode(_ value: Any, as type: Bool.Type) throws -> Bool {
-    guard let value = value as? Bool else { throw mismatch(value, type) }
-    return value
-  }
-
-  func decode<T: BinaryInteger>(_ value: Any, as type: T.Type) throws -> T {
-    guard let number = value as? NSNumber, let value = T(exactly: number.doubleValue) else {
-      throw mismatch(value, type)
-    }
-    return value
-  }
-
-  func decode<T: BinaryFloatingPoint>(_ value: Any, as type: T.Type) throws -> T {
-    if let number = value as? NSNumber { return T(number.doubleValue) }
-    guard let number = try Double(decode(tagged(value, "number"), as: String.self)) else {
-      throw mismatch(value, type)
-    }
-    return T(number)
-  }
-
-  func decode(_ value: Any, as type: String.Type) throws -> String {
-    guard let value = value as? String else { throw mismatch(value, type) }
-    return value
-  }
-
-  func decode(_ value: Any, as type: NSNumber.Type) throws -> NSNumber {
-    guard let value = value as? NSNumber else { throw mismatch(value, type) }
-    return value
-  }
-
-  func decode(_ value: Any, as type: Locale.Type) throws -> Locale {
-    Locale(identifier: try decode(value, as: String.self))
-  }
-
-  func decode(_ value: Any, as type: TimeZone.Type) throws -> TimeZone {
-    guard let zone = TimeZone(identifier: try decode(value, as: String.self)) else {
-      throw mismatch(value, type)
-    }
-    return zone
-  }
-
-  func decode(_ value: Any, as type: Date.Type) throws -> Date {
-    Date(timeIntervalSince1970: try decode(tagged(value, "date"), as: Double.self) / 1000)
-  }
-
-  func decode(_ value: Any, as type: Data.Type) throws -> Data {
-    guard let data = Data(base64Encoded: try decode(tagged(value, "bytes"), as: String.self)) else {
-      throw mismatch(value, type)
-    }
-    return data
-  }
-
-  func decode(_ value: Any, as type: URL.Type) throws -> URL {
-    guard let url = URL(string: try decode(value, as: String.self)) else {
-      throw mismatch(value, type)
-    }
-    return url
-  }
-
-  func decode(_ value: Any, as type: UUID.Type) throws -> UUID {
-    guard let uuid = UUID(uuidString: try decode(value, as: String.self)) else {
-      throw mismatch(value, type)
-    }
-    return uuid
-  }
-
-  /// The field `name` of the struct `value`.
-  func field(_ value: Any, _ name: String) throws -> Any {
-    guard let fields = value as? [String: Any] else { throw mismatch(value, [String: Any].self) }
-    return fields[name] ?? NSNull()
-  }
-
-  /// The native object `value` refers to.
-  func object<T>(_ value: Any, as type: T.Type) throws -> T {
-    try resources.get(tagged(value, "object", key: "id"), as: type)
-  }
-
-  func optional<T>(_ value: Any, _ decode: (Any) throws -> T) rethrows -> T? {
-    value is NSNull ? nil : try decode(value)
-  }
-
-  func array<T>(_ value: Any, _ decode: (Any) throws -> T) throws -> [T] {
-    guard let values = value as? [Any] else { throw mismatch(value, [T].self) }
-    return try values.map(decode)
-  }
-
-  func record<T>(_ value: Any, _ decode: (Any) throws -> T) throws -> [String: T] {
-    let fields = (try? tagged(value, "record")) ?? value
-    guard let fields = fields as? [String: Any] else { throw mismatch(value, [String: T].self) }
-    return try fields.mapValues(decode)
-  }
-
-  // MARK: Encoding
-
-  func encode(_ value: Bool) -> Any { value }
-
-  func encode<T: BinaryInteger>(_ value: T) -> Any {
-    Int64(exactly: value).map { NSNumber(value: $0) } ?? NSNumber(value: Double(value))
-  }
-
-  func encode<T: BinaryFloatingPoint>(_ value: T) -> Any {
-    let number = Double(value)
-    if number.isFinite { return number }
-    return ["#": "number", "value": number.isNaN ? "NaN" : number > 0 ? "Infinity" : "-Infinity"]
-  }
-
-  func encode(_ value: String) -> Any { value }
-
-  func encode(_ value: NSNumber) -> Any { encode(value.doubleValue) }
-
-  func encode(_ value: Locale) -> Any { value.identifier }
-
-  func encode(_ value: TimeZone) -> Any { value.identifier }
-
-  func encode(_ value: Date) -> Any { ["#": "date", "value": value.timeIntervalSince1970 * 1000] }
-
-  func encode(_ value: Data) -> Any { ["#": "bytes", "value": value.base64EncodedString()] }
-
-  func encode(_ value: URL) -> Any { value.absoluteString }
-
-  func encode(_ value: UUID) -> Any { value.uuidString }
-
-  func encode(_ value: any Error) -> Any {
-    TokamakPluginError(value).json.merging(["#": "error"]) { $1 }
-  }
-
-  /// Keeps `value` in the invocation's scope and refers to it, with the
-  /// names of its class and superclasses.
-  func encode(object value: Any) -> Any {
-    ["#": "object", "id": resources.retain(value, in: scope), "types": types(of: value)]
-  }
-
-  func encode<T>(optional value: T?, _ encode: (T) -> Any) -> Any {
-    value.map(encode) ?? NSNull()
-  }
-
-  func encode<S: Sequence>(array values: S, _ encode: (S.Element) -> Any) -> Any {
-    values.map(encode)
-  }
-
-  func encode<T>(record fields: [String: T], _ encode: (T) -> Any) -> Any {
-    let encoded = fields.mapValues(encode)
-    return encoded["#"] == nil ? encoded : ["#": "record", "value": encoded]
-  }
-
-  // MARK: Replies
-
-  /// Replies with the JSON `body` returns, or the error it throws.
-  func run(_ body: () throws -> Any?) -> (() -> Void)? {
-    do { send(try body(), done: true) } catch { fail(error) }
-    return nil
-  }
-
-  /// Replies with the JSON `body` resolves to on the main actor, or the
-  /// error it throws. The returned function cancels its task.
-  func task(_ body: @escaping @MainActor () async throws -> Any?) -> () -> Void {
-    let task = Task { @MainActor in
-      do { send(try await body(), done: true) } catch { fail(error) }
-    }
-    return { task.cancel() }
-  }
-
-  /// Replies with each element of the sequence `body` returns on the main
-  /// actor, encoded, then ends. The returned function cancels its task.
-  func stream<S: AsyncSequence>(
-    _ body: @escaping @MainActor () async throws -> S,
-    encode: @escaping (S.Element) -> Any
-  ) -> () -> Void {
-    let task = Task {
-      do {
-        for try await element in try await body() { send(encode(element), done: false) }
-        reply(TokamakPluginResult(payload: Data(), failed: false, done: true))
-      } catch { fail(error) }
-    }
-    return { task.cancel() }
-  }
-
-  /// Keeps `type`'s implementation while the subscription lasts, and replies
-  /// with its ID.
-  func implement(_ type: TokamakBindingImplementation.Type) -> () -> Void {
-    let scope = resources.open()
-    send(resources.retain(type.init(self), in: scope), done: false)
-    return { [resources] in resources.end(scope) }
-  }
-
-  func send(_ value: Any?, done: Bool) {
-    reply(TokamakPluginResult(encodePluginValue(value), done: done))
-  }
-
-  private func fail(_ error: any Error) {
-    reply(TokamakPluginResult(.failure(TokamakPluginError(error)), done: true))
-  }
-
-  /// The field `key` of `value` tagged `tag`.
-  private func tagged(_ value: Any, _ tag: String, key: String = "value") throws -> Any {
-    guard let fields = value as? [String: Any], fields["#"] as? String == tag,
-      let field = fields[key]
-    else { throw typeError("Expected a tagged \(tag)") }
-    return field
-  }
-
-  /// The error of `value`, which is not a `type`.
-  func mismatch(_ value: Any, _ type: Any.Type) -> TokamakPluginError {
-    typeError("\(Swift.type(of: value)) is not \(type)")
-  }
-
-  /// The names of `value`'s class and superclasses, then of the Objective-C
-  /// protocols they adopt, or of its type: Objective-C names, and
-  /// module-qualified Swift names.
-  private func types(of value: Any) -> [String] {
-    let name = { (type: Any.Type) in
-      let name = String(reflecting: type)
-      return name.hasPrefix("__C.") ? String(name.dropFirst(4)) : name
-    }
-    guard let type = Swift.type(of: value) as? AnyClass else {
-      return [name(Swift.type(of: value))]
-    }
-    let classes = Array(sequence(first: type, next: class_getSuperclass))
-    let protocols = classes.flatMap(adopted).map(NSStringFromProtocol)
-    var seen = Set<String>()
-    return (classes.map(name) + protocols).filter { seen.insert($0).inserted }
-  }
-}
-
-/// The Objective-C protocols `type` adopts, each followed by those it inherits.
-private func adopted(by type: AnyClass) -> [Protocol] {
-  protocols { class_copyProtocolList(type, $0) }.flatMap { [$0] + inherited(by: $0) }
-}
-
-private func inherited(by parent: Protocol) -> [Protocol] {
-  protocols { protocol_copyProtocolList(parent, $0) }.flatMap { [$0] + inherited(by: $0) }
-}
-
-/// The protocols a runtime `copy` function lists.
-private func protocols(
-  _ copy: (UnsafeMutablePointer<UInt32>) -> AutoreleasingUnsafeMutablePointer<Protocol>?
-) -> [Protocol] {
-  var count: UInt32 = 0
-  guard let list = copy(&count) else { return [] }
-  defer { free(UnsafeMutableRawPointer(list)) }
-  return (0..<Int(count)).map { list[$0] }
-}
-
-/// A native object that implements a protocol by calling the JavaScript
-/// handlers of an implementation subscription. A method without a handler
-/// keeps the platform's default.
-class TokamakBindingImplementation: NSObject {
-  private let binding: TokamakBinding
-  private let handled: Set<String>
-
-  required init(_ binding: TokamakBinding) {
-    self.binding = binding
-    handled = binding.methods
-  }
-
-  /// The handler each optional Objective-C method calls, by selector.
-  class var selectors: [Selector: String] { [:] }
-
-  override func responds(to selector: Selector!) -> Bool {
-    guard let method = Self.selectors[selector] else { return super.responds(to: selector) }
-    return handled.contains(method)
-  }
-
-  /// Calls the handler `method`, when it has one, with the `arguments` it
-  /// encodes.
-  func call(_ method: String, _ arguments: (TokamakBinding) -> [Any]) {
-    guard handled.contains(method) else { return }
-    binding.send(["method": method, "arguments": arguments(binding)], done: false)
-  }
-}
-
-private func typeError(_ message: String) -> TokamakPluginError {
-  TokamakPluginError(name: "TypeError", message: message)
-}