@tokamakdev/platform-macos-x64 0.1.1-beta.140 → 0.1.1-beta.141

package/macos-x64/frameworks/TokamakRuntime.framework/Headers/TokamakRuntime.h

@@ -46,6 +46,8 @@ void *tokamak_runtime_start_development(const char *state_dir, const char *host,
                                      TokamakPluginHandler plugins,
                                      char *error, size_t error_len);
 uint16_t tokamak_runtime_port(const void *runtime);
+uint16_t tokamak_runtime_await_port_change(const void *runtime, uint16_t known,
+                                        uint64_t timeout_ms);
 uint16_t tokamak_runtime_restore_gateway(const void *runtime, char *error,
                                       size_t error_len);
 void tokamak_runtime_stop(void *runtime);

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

@@ -411,6 +411,13 @@ final class RuntimeHandle {
     tokamak_runtime_port(handle)
   }
 
+  /// The gateway's port once it differs from `known`, or after `timeout` its
+  /// current port. Blocks. The port is 0 once the gateway lost its port and
+  /// could not bind another.
+  func awaitPortChange(from known: UInt16, timeout: TimeInterval) -> UInt16 {
+    tokamak_runtime_await_port_change(handle, known, UInt64(timeout * 1000))
+  }
+
   func restoreGateway() throws -> UInt16 {
     var error = [CChar](repeating: 0, count: 512)
     let port = error.withUnsafeMutableBufferPointer { error in

package/macos-x64/native-shell/TokamakShell.swift

@@ -211,6 +211,10 @@ private final class NavigationDelegate: NSObject, WKNavigationDelegate, WKUIDele
 }
 
 private final class TokamakController {
+  /// How long each wait for the gateway to move lasts, which bounds how long
+  /// a wait outlives its controller.
+  private static let portWait: TimeInterval = 60
+
   private let app: TokamakApp
   private var runtime: RuntimeHandle?
   private var navigation: NavigationDelegate?
@@ -235,18 +239,39 @@ private final class TokamakController {
   }
 
   func restoreGateway() {
-    guard let runtime, let dataStore else { return }
+    guard let runtime else { return }
     do {
-      let port = try runtime.restoreGateway()
-      guard port != proxyPort else { return }
-      setProxy(port: port, host: runtime.appHost, dataStore: dataStore)
-      proxyPort = port
-      activeWebView?.reload()
+      use(port: try runtime.restoreGateway())
     } catch {
       print("tokamak gateway could not recover: \(error)")
     }
   }
 
+  /// Routes the WebView through the gateway's `port` and loads the app there
+  /// again, once the gateway has moved. A gateway without a port leaves the
+  /// route on the lost port, where only a server presenting the runtime's
+  /// certificate is trusted.
+  private func use(port: UInt16) {
+    guard let runtime, let dataStore, port != 0, port != proxyPort else { return }
+    setProxy(port: port, host: runtime.appHost, dataStore: dataStore)
+    proxyPort = port
+    activeWebView?.reload()
+  }
+
+  /// Follows the gateway from `port` to each port it moves to, until the
+  /// controller is gone.
+  private func followGateway(runtime: RuntimeHandle, from port: UInt16) {
+    Thread { [weak self] in
+      var port = port
+      while self != nil {
+        let moved = runtime.awaitPortChange(from: port, timeout: Self.portWait)
+        guard moved != port else { continue }
+        port = moved
+        DispatchQueue.main.async { self?.use(port: moved) }
+      }
+    }.start()
+  }
+
   private func webView(frame: CGRect, runtime: RuntimeHandle) -> WKWebView {
     let configuration = WKWebViewConfiguration()
     let dataStore = WKWebsiteDataStore.default()
@@ -273,6 +298,7 @@ private final class TokamakController {
     webView.navigationDelegate = navigation
     webView.uiDelegate = navigation
     webView.load(URLRequest(url: URL(string: "https://\(runtime.appHost)/")!))
+    followGateway(runtime: runtime, from: port)
     return webView
   }
 

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

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

package/package.json

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