@tokamakdev/platform-ios-simulator-x64 0.1.1-beta.75 → 0.1.1-beta.77

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

@@ -231,6 +231,10 @@ private final class TokamakController {
     self.host = host
   }
 
+  deinit {
+    pluginBridge?.close()
+  }
+
   func start(frame: CGRect, completion: @escaping (WKWebView) -> Void) {
     host.whenStarted { result in
       switch result {
@@ -368,31 +372,28 @@ private final class TokamakController {
     }
   }
 #else
-  private final class TokamakIOSApplicationDelegate: UIResponder, UIApplicationDelegate {
-    private lazy var host = TokamakHost()
-    private lazy var controller = TokamakController(host: host)
-    var window: UIWindow?
-
-    func application(
-      _ application: UIApplication,
-      didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
-    ) -> Bool {
-      let window = UIWindow(frame: UIScreen.main.bounds)
-      let viewController = UIViewController()
-      window.rootViewController = viewController
-      window.makeKeyAndVisible()
-      self.window = window
-
-      controller.start(frame: viewController.view.bounds) { webView in
-        webView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-        viewController.view.addSubview(webView)
-      }
-      return true
+  @main
+  private enum TokamakApplication {
+    /// Only an app that declares the `remote-notification` background mode
+    /// gets a delegate that receives remote notifications, which UIKit
+    /// otherwise warns about.
+    static func main() {
+      let modes = Bundle.main.object(forInfoDictionaryKey: "UIBackgroundModes") as? [String]
+      let delegate: TokamakIOSApplicationDelegate.Type =
+        modes?.contains("remote-notification") == true
+        ? TokamakIOSPushApplicationDelegate.self : TokamakIOSApplicationDelegate.self
+      UIApplicationMain(
+        CommandLine.argc,
+        CommandLine.unsafeArgv,
+        nil,
+        NSStringFromClass(delegate)
+      )
     }
+  }
 
-    func applicationWillEnterForeground(_ application: UIApplication) {
-      controller.restoreGateway()
-    }
+  private class TokamakIOSApplicationDelegate: UIResponder, UIApplicationDelegate {
+    /// Exists from launch, whether or not a scene connects.
+    let host = TokamakHost()
 
     func application(
       _ application: UIApplication,
@@ -407,7 +408,9 @@ private final class TokamakController {
     ) {
       host.didFailToRegisterForRemoteNotifications(error: error)
     }
+  }
 
+  private final class TokamakIOSPushApplicationDelegate: TokamakIOSApplicationDelegate {
     func application(
       _ application: UIApplication,
       didReceiveRemoteNotification userInfo: [AnyHashable: Any],
@@ -423,15 +426,41 @@ private final class TokamakController {
     }
   }
 
-  @main
-  private enum TokamakApplication {
-    static func main() {
-      UIApplicationMain(
-        CommandLine.argc,
-        CommandLine.unsafeArgv,
-        nil,
-        NSStringFromClass(TokamakIOSApplicationDelegate.self)
-      )
+  /// The Info.plist scene configuration names this class.
+  @objc(TokamakSceneDelegate)
+  private final class TokamakSceneDelegate: UIResponder, UIWindowSceneDelegate {
+    var window: UIWindow?
+    private var controller: TokamakController?
+
+    func scene(
+      _ scene: UIScene,
+      willConnectTo session: UISceneSession,
+      options connectionOptions: UIScene.ConnectionOptions
+    ) {
+      guard let scene = scene as? UIWindowScene else { return }
+      let host = (UIApplication.shared.delegate as! TokamakIOSApplicationDelegate).host
+      let viewController = UIViewController()
+      let window = UIWindow(windowScene: scene)
+      window.rootViewController = viewController
+      window.makeKeyAndVisible()
+      self.window = window
+
+      let controller = TokamakController(host: host)
+      controller.start(frame: viewController.view.bounds) { webView in
+        webView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        viewController.view.addSubview(webView)
+      }
+      self.controller = controller
+    }
+
+    func sceneWillEnterForeground(_ scene: UIScene) {
+      controller?.restoreGateway()
+    }
+
+    /// Releases the scene's window and page, which a reconnection recreates.
+    func sceneDidDisconnect(_ scene: UIScene) {
+      window = nil
+      controller = nil
     }
   }
 #endif

package/package.json

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