@tokamakdev/platform-ios-simulator-x64 0.1.1-beta.116 → 0.1.1-beta.118

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

@@ -8,20 +8,18 @@ import Foundation
 /// bytes, errors, non-finite numbers, and records whose keys include `#`.
 struct TokamakBinding {
   private let resources: TokamakResources
-  private let request: Result<[String: Any], TokamakPluginError>
+  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
-    request = Result { () throws(TokamakPluginError) in
-      guard let request = try decodePluginValue(payload) as? [String: Any] else {
-        throw typeError("A binding request is an object")
-      }
-      return request
-    }
   }
 
   /// The rejection of a member the running OS version lacks.
@@ -30,24 +28,22 @@ struct TokamakBinding {
 
   /// Argument `index` as JSON.
   subscript(index: Int) -> Any {
-    get throws {
-      let arguments = try request.get()["arguments"] as? [Any] ?? []
-      return arguments.indices.contains(index) ? arguments[index] : NSNull()
-    }
+    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.get()["target"] as Any, as: type)
+    try object(request["target"] as Any, as: type)
   }
 
   /// The handlers an implementation calls.
   var methods: Set<String> {
-    Set((try? request.get()["methods"] as? [String]) ?? [])
+    Set(request["methods"] as? [String] ?? [])
   }
 
   private var scope: String {
-    (try? request.get()["scope"] as? String) ?? ""
+    request["scope"] as? String ?? ""
   }
 
   // MARK: Decoding
@@ -175,10 +171,7 @@ struct TokamakBinding {
   func encode(_ value: UUID) -> Any { value.uuidString }
 
   func encode(_ value: any Error) -> Any {
-    let error = Self.failure(value)
-    var encoded: [String: Any] = ["#": "error", "name": error.name, "message": error.message]
-    encoded["cause"] = error.cause
-    return encoded
+    TokamakPluginError(value).json.merging(["#": "error"]) { $1 }
   }
 
   /// Keeps `value` in the invocation's scope and refers to it, with the
@@ -240,28 +233,12 @@ struct TokamakBinding {
     return { [resources] in resources.end(scope) }
   }
 
-  /// Rejects the member the plugin does not bind.
-  func unsupported(_ member: String) -> (() -> Void)? {
-    fail(TokamakPluginError.notSupported("\(member) is not supported"))
-    return nil
-  }
-
   func send(_ value: Any?, done: Bool) {
     reply(TokamakPluginResult(encodePluginValue(value), done: done))
   }
 
   private func fail(_ error: any Error) {
-    reply(TokamakPluginResult(.failure(Self.failure(error)), done: true))
-  }
-
-  /// `error` for the Worker: an `OperationError` whose cause has the
-  /// platform error's domain and code.
-  static func failure(_ error: any Error) -> TokamakPluginError {
-    if let error = error as? TokamakPluginError { return error }
-    let error = error as NSError
-    return TokamakPluginError(
-      name: "OperationError", message: error.localizedDescription,
-      cause: ["domain": error.domain, "code": error.code])
+    reply(TokamakPluginResult(.failure(TokamakPluginError(error)), done: true))
   }
 
   /// The field `key` of `value` tagged `tag`.

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

@@ -85,10 +85,7 @@ final class TokamakCorePlugin: TokamakPlugin {
       "window.dispatchEvent(new MessageEvent('message', {data, origin: location.origin})); return true;",
       arguments: ["data": data], in: nil, in: .page
     ) { result in
-      reply(
-        result.map { _ in nil }.mapError {
-          TokamakPluginError(name: "OperationError", message: $0.localizedDescription)
-        })
+      reply(result.map { _ in nil }.mapError { TokamakPluginError($0) })
     }
   }
 

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

@@ -27,6 +27,28 @@ struct TokamakPluginError: Error {
   )
 }
 
+extension TokamakPluginError {
+  /// `error` for the Worker: itself, or an `OperationError` whose cause has
+  /// the platform error's domain and code.
+  init(_ error: any Error) {
+    if let error = error as? Self {
+      self = error
+      return
+    }
+    let error = error as NSError
+    self.init(
+      name: "OperationError", message: error.localizedDescription,
+      cause: ["domain": error.domain, "code": error.code])
+  }
+
+  /// The error as JSON: its name, message and cause.
+  var json: [String: Any] {
+    var json: [String: Any] = ["name": name, "message": message]
+    json["cause"] = cause
+    return json
+  }
+}
+
 typealias TokamakPluginReply = (Result<Any?, TokamakPluginError>) -> Void
 typealias TokamakPluginBytesReply = (TokamakPluginResult) -> Void
 
@@ -48,9 +70,7 @@ struct TokamakPluginResult {
       self.payload = payload
       failed = false
     case .failure(let error):
-      var failure: [String: Any] = ["name": error.name, "message": error.message]
-      failure["cause"] = error.cause
-      payload = try! JSONSerialization.data(withJSONObject: failure)
+      payload = try! JSONSerialization.data(withJSONObject: error.json)
       failed = true
     }
   }
@@ -69,22 +89,6 @@ func encodePluginValue(_ value: Any?) -> Result<Data, TokamakPluginError> {
   return .success(json)
 }
 
-/// Decodes `payload` as JSON for `call`, and encodes its reply.
-private func callJSON(
-  _ payload: Data,
-  _ reply: @escaping TokamakPluginBytesReply,
-  _ call: (Any, @escaping TokamakPluginReply) -> (() -> Void)?
-) -> (() -> Void)? {
-  do {
-    return call(try decodePluginValue(payload)) {
-      reply(TokamakPluginResult($0.flatMap(encodePluginValue), done: true))
-    }
-  } catch {
-    reply(TokamakPluginResult(.failure(error), done: true))
-    return nil
-  }
-}
-
 func decodePluginValue(_ payload: Data) throws(TokamakPluginError) -> Any {
   do { return try JSONSerialization.jsonObject(with: payload, options: .fragmentsAllowed) } catch {
     throw .init(name: "DataCloneError", message: error.localizedDescription)
@@ -195,13 +199,13 @@ protocol TokamakPlugin: AnyObject {
   /// Serial executor for this operation and its cancellation.
   func executor(for method: String) -> DispatchQueue
 
-  func callBytes(method: String, payload: Data, reply: @escaping TokamakPluginBytesReply) -> (
-    () -> Void
-  )?
+  /// Throws when the call cannot start, which ends it.
+  func callBytes(method: String, payload: Data, reply: @escaping TokamakPluginBytesReply)
+    throws(TokamakPluginError) -> (() -> Void)?
   func callBytes(
     method: String, payload: Data, body: TokamakPluginBody,
     reply: @escaping TokamakPluginBytesReply
-  ) -> (() -> Void)?
+  ) throws(TokamakPluginError) -> (() -> Void)?
   func subscribeBytes(method: String, payload: Data, reply: @escaping TokamakPluginBytesReply)
     throws(TokamakPluginError) -> (() -> Void)
 
@@ -244,17 +248,21 @@ protocol TokamakPlugin: AnyObject {
 extension TokamakPlugin {
   func executor(for method: String) -> DispatchQueue { .main }
 
-  func callBytes(method: String, payload: Data, reply: @escaping TokamakPluginBytesReply) -> (
-    () -> Void
-  )? {
-    callJSON(payload, reply) { call(method: method, arguments: $0, reply: $1) }
+  func callBytes(method: String, payload: Data, reply: @escaping TokamakPluginBytesReply)
+    throws(TokamakPluginError) -> (() -> Void)?
+  {
+    try call(method: method, arguments: decodePluginValue(payload)) {
+      reply(TokamakPluginResult($0.flatMap(encodePluginValue), done: true))
+    }
   }
 
   func callBytes(
     method: String, payload: Data, body: TokamakPluginBody,
     reply: @escaping TokamakPluginBytesReply
-  ) -> (() -> Void)? {
-    callJSON(payload, reply) { call(method: method, arguments: $0, body: body, reply: $1) }
+  ) throws(TokamakPluginError) -> (() -> Void)? {
+    try call(method: method, arguments: decodePluginValue(payload), body: body) {
+      reply(TokamakPluginResult($0.flatMap(encodePluginValue), done: true))
+    }
   }
 
   func subscribeBytes(method: String, payload: Data, reply: @escaping TokamakPluginBytesReply)
@@ -408,10 +416,11 @@ final class TokamakPluginRequests<Key: Hashable> {
           request.cancellation = try target.subscribeBytes(
             method: method, payload: payload, reply: reply)
         } else if let body = request.body {
-          request.cancellation = target.callBytes(
+          request.cancellation = try target.callBytes(
             method: method, payload: payload, body: body, reply: reply)
         } else {
-          request.cancellation = target.callBytes(method: method, payload: payload, reply: reply)
+          request.cancellation = try target.callBytes(
+            method: method, payload: payload, reply: reply)
         }
       } catch {
         if remove(key, request) { send(key, TokamakPluginResult(.failure(error), done: true)) }

package/package.json

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