@webspatial/platform-visionos 0.0.2 → 0.0.3-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webspatial/platform-visionos",
-  "version": "0.0.2",
+  "version": "0.0.3-alpha.0",
   "description": "Used to publish WebSpatial projects to Apple Vision Pro",
   "type": "commonjs",
   "engines": {

package/web-spatial/libs/SpatialWindowContainer.swift

@@ -14,6 +14,25 @@ class SpatialWindowContainer: SpatialObject {
 
     // Resources that will be destroyed when this window group is removed
     private var childResources = [String: SpatialObject]()
+    public func addChildResource(_ spatialObject: SpatialObject) {
+        childResources[spatialObject.id] = spatialObject
+        spatialObject
+            .on(
+                event: SpatialObject.Events.BeforeDestroyed.rawValue,
+                listener: onSptatialObjectDestroyed
+            )
+    }
+
+    private func onSptatialObjectDestroyed(_ object: Any, _ data: Any) {
+        let spatialObject = object as! SpatialObject
+        spatialObject
+            .off(
+                event: SpatialObject.Events.BeforeDestroyed.rawValue,
+                listener: onSptatialObjectDestroyed
+            )
+        childResources.removeValue(forKey: spatialObject.id)
+    }
+
     public var childContainers = [String: SpatialWindowContainer]()
 
     var wgd: WindowContainerData

package/web-spatial/libs/Utils/CommandManager.swift

@@ -128,8 +128,8 @@ class CommandManager {
     }
 
     private func setComponent(target: SpatialWindowComponent, info: CommandInfo) {
-        if let component = target.getChildSpatialObject(name: info.resourceID) as? SpatialComponent,
-           let entity = target.getChildSpatialObject(name: info.entityID) as? SpatialEntity
+        if let component = SpatialObject.get(info.resourceID) as? SpatialComponent,
+           let entity = SpatialObject.get(info.entityID) as? SpatialEntity
         {
             entity.addComponent(component)
         } else {
@@ -147,6 +147,15 @@ class CommandManager {
         }
     }
 
+    private static func setParentResourceDependencies(object: SpatialObject, info: CommandInfo) {
+        if let parentWindowComponent = SpatialObject.get(info.resourceID) as? SpatialWindowComponent {
+            parentWindowComponent.addChildSpatialObject(object)
+        }
+        if let parentWindowContainer = SpatialWindowContainer.getSpatialWindowContainer(info.windowContainerID) {
+            parentWindowContainer.addChildResource(object)
+        }
+    }
+
     private func createResource(target: SpatialWindowComponent, info: CommandInfo) {
         let data = info.cmd.data!
         if let type = data.type {
@@ -165,9 +174,11 @@ class CommandManager {
             case "PhysicallyBasedMaterial":
                 sr = SpatialPhysicallyBasedMaterial(PhysicallyBasedMaterial())
             case "SpatialWebView":
-                sr = SpatialWindowComponent(parentWindowContainerID: target.readWindowContainerID(id: info.windowContainerID))
-                let spatialWindowComponent = sr as! SpatialWindowComponent
-                spatialWindowComponent.parentWebviewID = target.id
+                if let parentWindowContainer = SpatialWindowContainer.getSpatialWindowContainer(info.windowContainerID) {
+                    sr = SpatialWindowComponent(parentWindowContainerID: parentWindowContainer.id)
+                    let spatialWindowComponent = sr as! SpatialWindowComponent
+                    spatialWindowComponent.parentWebviewID = target.id
+                }
             case "SpatialView":
                 sr = SpatialViewComponent()
             case "Model3DComponent":
@@ -206,8 +217,8 @@ class CommandManager {
 
                                 Task.detached { @MainActor in
                                     // Update state on main thread
+                                    CommandManager.setParentResourceDependencies(object: spatialModelComponent, info: info)
                                     target.completeEvent(requestID: info.requestID, data: "{createdID: '" + spatialModelComponent.id + "'}")
-                                    target.addChildSpatialObject(spatialModelComponent)
                                     logger.debug("Model load success!")
                                 }
                             } catch {
@@ -224,8 +235,8 @@ class CommandManager {
             default: logger.warning("failed to create sr of type \(type)")
             }
             if let srObject = sr {
+                CommandManager.setParentResourceDependencies(object: srObject, info: info)
                 target.completeEvent(requestID: info.requestID, data: "{createdID: '" + srObject.id + "'}")
-                target.addChildSpatialObject(srObject)
             } else {
                 logger.warning("failed to create sr of type: \(type)")
             }

package/web-spatial/web_spatialApp.swift

@@ -11,15 +11,19 @@ let logger = Logger()
 
 // To load a local path, remove http:// eg.  "static-web/"
 let nativeAPIVersion = "0.0.1"
+// start URL
+let startURL = pwaManager.start_url
 
 // detect when app properties like defaultSize change so we can avoid race condition of setting default values and then opening window container
 var sceneStateChangedCB: ((Any) -> Void) = { _ in
 }
 
+// TODO: we need to get rid of rootWGD and rootWC to cleanup memory and better handle close/reopen
+weak var rootWC: SpatialWindowComponent?
+
 @main
 struct web_spatialApp: App {
     @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
-    @State var root: SpatialWindowComponent? = nil
     @State var rootWGD: SpatialWindowContainer
     @State var initialLaunch = true
 
@@ -28,7 +32,7 @@ struct web_spatialApp: App {
     @Environment(\.scenePhase) private var scenePhase
 
     init() {
-        logger.debug("WebSpatial App Started --------")
+        logger.debug("WebSpatial App Started -------- rootURL: " + startURL)
 
         // init global logger
         Logger.initLogger()
@@ -48,7 +52,7 @@ struct web_spatialApp: App {
     // There seems to be a bug in WKWebView where it needs to be initialized after the app has loaded so we do this here instead of init()
     // https://forums.developer.apple.com/forums/thread/61432
     func initAppOnViewMount() {
-        if root == nil {
+        if rootWC == nil {
             let fileUrl = getFileUrl()
 
             // Create a default entity with webview resource
@@ -58,7 +62,9 @@ struct web_spatialApp: App {
             rootEntity.addComponent(windowComponent)
             rootEntity.setParentWindowContainer(wg: rootWGD)
 
-            root = windowComponent
+            rootWGD.addChildResource(windowComponent)
+            rootWGD.addChildResource(rootEntity)
+            rootWC = windowComponent
         }
     }
 
@@ -72,14 +78,16 @@ struct web_spatialApp: App {
             if windowData.windowContainerID == SpatialWindowContainer.getRootID() {
                 VStack {}.onAppear { initAppOnViewMount() }
 
-                PlainWindowContainerView().environment(rootWGD).background(Color.clear.opacity(0)).onOpenURL { myURL in
-                    initAppOnViewMount()
-                    let urlToLoad = pwaManager.checkInDeeplink(url: myURL.absoluteString)
-
-                    if let url = URL(string: urlToLoad) {
-                        root!.navigateToURL(url: url)
-                    }
-                }
+                PlainWindowContainerView().environment(rootWGD).background(Color.clear.opacity(0))
+//                TODO: Universal link is currently broken
+//                .onOpenURL { myURL in
+//                    initAppOnViewMount()
+//                    let urlToLoad = pwaManager.checkInDeeplink(url: myURL.absoluteString)
+//
+//                    if let url = URL(string: urlToLoad) {
+//                        // root!.navigateToURL(url: url)
+//                    }
+//                }
             } else {
                 let wg = SpatialWindowContainer.getOrCreateSpatialWindowContainer(
                     windowData.windowContainerID, windowData