@webspatial/platform-visionos 0.1.16 → 0.1.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webspatial/platform-visionos",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "Used to publish WebSpatial projects to Apple Vision Pro",
   "type": "commonjs",
   "engines": {

package/web-spatial/libs/SpatialComponent.swift

@@ -11,7 +11,7 @@ class SpatialComponent: SpatialObject {
 
     override func inspect() -> [String: Any] {
         var inspectInfo: [String: Any] = [
-            "entity": entity?.id,
+            "entity": entity == nil ? "invalid" : entity!.id,
             "type": String(describing: type(of: self)),
         ]
 

package/web-spatial/libs/SpatialObject.swift

@@ -7,10 +7,12 @@ struct SpatialObjectInfo: Codable {
     var entityArray: [String]
 }
 
+// Stats from native code. Objects tracks number of native objects that were created but not yet explicitly destroyed. RefObjects tracks bjects that still have references. After an object is destroyed, we should be cleaning up all of the native references. Expect objects.count == refObjects.count , if not, there is likely a leak.
 struct SpatialObjectStatsInfo: Codable {
     var backend = "AVP"
     var objects: SpatialObjectInfo
     var refObjects: SpatialObjectInfo
+    var perfStats: PerfStats
 }
 
 class WeakReference<T: AnyObject> {
@@ -70,7 +72,8 @@ class SpatialObject: EventEmitter, Equatable {
                 windowArray: Array(weakRefWebviews.keys),
                 windowContainerArray: Array(weakRefWindowContainers.keys),
                 entityArray: Array(weakRefEntities.keys)
-            )
+            ),
+            perfStats: clock.perfStats
         )
     }
 

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

@@ -456,6 +456,7 @@ class CommandManager {
                     spatialWindowComponent.getView()!.destroy()
                     spatialWindowComponent.setView(wv: spawnedWebView)
                     spatialWindowComponent.getView()!.webViewHolder.webViewCoordinator!.webViewRef = spatialWindowComponent
+                    spatialWindowComponent.didFinishFirstLoad = true
                 }
             }
 
@@ -492,6 +493,8 @@ class CommandManager {
             }
 
             if let backgroundMaterial: BackgroundMaterial = data.update?.style?.backgroundMaterial {
+                clock.backgroundSet()
+
                 if spatialWindowComponent.isLoading {
                     spatialWindowComponent.loadingStyles.backgroundMaterial = backgroundMaterial
                 }
@@ -523,7 +526,7 @@ class CommandManager {
 
                 // If the parent window component  isn't set, the new container can continue to exist even after other window is closed
                 if info.resourceID != "notFound" {
-                    var rid = info.resourceID
+                    let rid = info.resourceID
                     let so = SpatialObject.get(rid)
                     if let parentWindowComponent = so as? SpatialWindowComponent {
                         parentWindowComponent.setWindowContainer(uuid: uuid, wgd: wgd)
@@ -531,7 +534,7 @@ class CommandManager {
                 }
 
                 if info.windowContainerID != "notFound" {
-                    if var parentContainer = SpatialWindowContainer.getSpatialWindowContainer(info.windowContainerID) {
+                    if let parentContainer = SpatialWindowContainer.getSpatialWindowContainer(info.windowContainerID) {
                         parentContainer.childContainers[uuid] = wg
                     }
                 }

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

@@ -0,0 +1,43 @@
+import SwiftUI
+
+struct PerfStats: Codable {
+    // Time from app start until the first call to setMaterial. In milliseconds
+    var firstBackgroundSet: Int = 0
+
+    // Attempts to track the number of commands handled over the last second
+    var commandCounter: Int = 0
+    var commandCounterStartTime: Int = 0
+    var commandsPerSecond = 0.0
+}
+
+class PerfClock {
+    var perfStats = PerfStats()
+
+    let createTimeMS: Int
+
+    init() {
+        createTimeMS = PerfClock.getCurrentTimeMS()
+        perfStats.commandCounterStartTime = createTimeMS
+    }
+
+    func backgroundSet() {
+        if perfStats.firstBackgroundSet == 0 {
+            perfStats.firstBackgroundSet = PerfClock.getCurrentTimeMS() - createTimeMS
+        }
+    }
+
+    func onMessage() {
+        perfStats.commandCounter += 1
+        let dt = PerfClock.getCurrentTimeMS() - createTimeMS
+        if dt > 1000 {
+            perfStats.commandsPerSecond = Double(perfStats.commandCounter) / (Double(1000.0) / Double(dt))
+
+            perfStats.commandCounter = 0
+            perfStats.commandCounterStartTime = PerfClock.getCurrentTimeMS()
+        }
+    }
+
+    static func getCurrentTimeMS() -> Int {
+        return Int(Date().timeIntervalSince1970 * 1000)
+    }
+}

package/web-spatial/libs/webView/backend/NativeWebView.swift

@@ -48,10 +48,12 @@ class Coordinator: NSObject, WKNavigationDelegate, WKScriptMessageHandler, WKUID
                 return
             }
             let session = URLSession(configuration: URLSessionConfiguration.default)
-            let dataTask = session.dataTask(with: urlRequest) { data, response, _ in
-                urlSchemeTask.didReceive(response!)
-                urlSchemeTask.didReceive(data!)
-                urlSchemeTask.didFinish()
+            let dataTask = session.dataTask(with: urlRequest) { [task = urlSchemeTask as AnyObject] data, response, _ in
+                guard let task = task as? WKURLSchemeTask else { return }
+
+                task.didReceive(response!)
+                task.didReceive(data!)
+                task.didFinish()
             }
             dataTask.resume()
             return

package/web-spatial/web_spatialApp.swift

@@ -7,6 +7,7 @@ import typealias RealityKit.RealityView
 import typealias RealityKit.SimpleMaterial
 import SwiftUI
 
+let clock = PerfClock()
 let logger = Logger()
 
 // To load a local path, remove http:// eg.  "static-web/"

package/web-spatial.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		2B0B1C102C494E5400E644F9 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B0B1C0F2C494E5400E644F9 /* Logger.swift */; };
 		2B0B430A2CBE21580003CEF3 /* CommandManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B0B43092CBE21540003CEF3 /* CommandManager.swift */; };
+		2B0FF4F42DD2711E00C3F20A /* PerfClock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B0FF4F32DD2711800C3F20A /* PerfClock.swift */; };
 		2B23CB3F2D0BEE6900E70D95 /* WindowContainerMgr.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B23CB3E2D0BEE6900E70D95 /* WindowContainerMgr.swift */; };
 		2B2F1D692BEBFAAA006897EE /* RealityKitContent in Frameworks */ = {isa = PBXBuildFile; productRef = 2B2F1D682BEBFAAA006897EE /* RealityKitContent */; };
 		2B2F1D6B2BEBFAAA006897EE /* web_spatialApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B2F1D6A2BEBFAAA006897EE /* web_spatialApp.swift */; };
@@ -60,6 +61,7 @@
 /* Begin PBXFileReference section */
 		2B0B1C0F2C494E5400E644F9 /* Logger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = "<group>"; };
 		2B0B43092CBE21540003CEF3 /* CommandManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommandManager.swift; sourceTree = "<group>"; };
+		2B0FF4F32DD2711800C3F20A /* PerfClock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PerfClock.swift; sourceTree = "<group>"; };
 		2B23CB3E2D0BEE6900E70D95 /* WindowContainerMgr.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowContainerMgr.swift; sourceTree = "<group>"; };
 		2B2F1D632BEBFAAA006897EE /* WebSpatial.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WebSpatial.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		2B2F1D672BEBFAAA006897EE /* RealityKitContent */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = RealityKitContent; sourceTree = "<group>"; };
@@ -123,6 +125,7 @@
 		2B0B1C0E2C494E4100E644F9 /* Utils */ = {
 			isa = PBXGroup;
 			children = (
+				2B0FF4F32DD2711800C3F20A /* PerfClock.swift */,
 				2BD5880D2DB1236000C0E13B /* version.swift */,
 				2BD510552D54A2FF0001E5E6 /* SceneManager.swift */,
 				2B0B43092CBE21540003CEF3 /* CommandManager.swift */,
@@ -375,6 +378,7 @@
 				2BE1E9032C9035DB00EAE76A /* SpatialInputComponent.swift in Sources */,
 				2B2F1D9B2BEDA975006897EE /* PlainWindowContainerView.swift in Sources */,
 				2BE1E8FA2C90332400EAE76A /* SpatialObject.swift in Sources */,
+				2B0FF4F42DD2711E00C3F20A /* PerfClock.swift in Sources */,
 				2BB28CCC2C747DB0007F4BDC /* OpenDismissHandlerUI.swift in Sources */,
 				2BDBED632D3FE8EC0065443F /* SpatialModel3DView.swift in Sources */,
 				2B67BBAC2D151C1A00BBC689 /* manifest.swift in Sources */,