@webspatial/platform-visionos 1.0.5 → 1.2.0

package/package.json

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

package/web-spatial/JSBCommand.swift

@@ -17,17 +17,17 @@ struct CreateSpatializedStatic3DElement: CommandDataProtocol {
     let modelURL: String
 }
 
-struct CreateSpatializedDynamic3DElement: CommandDataProtocol{
+struct CreateSpatializedDynamic3DElement: CommandDataProtocol {
     static let commandType: String = "CreateSpatializedDynamic3DElement"
     let test: Bool
 }
 
-struct CreateSpatialEntity: CommandDataProtocol{
+struct CreateSpatialEntity: CommandDataProtocol {
     static let commandType: String = "CreateSpatialEntity"
     let name: String?
 }
 
-struct CreateGeometryProperties: CommandDataProtocol{
+struct CreateGeometryProperties: CommandDataProtocol {
     static let commandType: String = "CreateGeometry"
     let type: String
     let width: Float?
@@ -38,7 +38,7 @@ struct CreateGeometryProperties: CommandDataProtocol{
     let radius: Float?
 }
 
-struct CreateUnlitMaterial: CommandDataProtocol{
+struct CreateUnlitMaterial: CommandDataProtocol {
     static let commandType: String = "CreateUnlitMaterial"
     let color: String?
     let textureId: String?
@@ -46,87 +46,87 @@ struct CreateUnlitMaterial: CommandDataProtocol{
     let opacity: Float?
 }
 
-struct CreateTexture: CommandDataProtocol{
+struct CreateTexture: CommandDataProtocol {
     static let commandType: String = "CreateTexture"
     let url: String
 }
 
-struct CreateModelAsset: CommandDataProtocol{
+struct CreateModelAsset: CommandDataProtocol {
     static let commandType: String = "CreateModelAsset"
     let url: String
 }
 
-struct CreateSpatialModelEntity: CommandDataProtocol{
+struct CreateSpatialModelEntity: CommandDataProtocol {
     static let commandType: String = "CreateSpatialModelEntity"
-    let modelAssetId:String
-    let name:String?
+    let modelAssetId: String
+    let name: String?
 }
 
-struct CreateModelComponent: CommandDataProtocol{
+struct CreateModelComponent: CommandDataProtocol {
     static let commandType: String = "CreateModelComponent"
     let geometryId: String
     let materialIds: [String]
 }
 
-struct AddComponentToEntity: CommandDataProtocol{
+struct AddComponentToEntity: CommandDataProtocol {
     static let commandType: String = "AddComponentToEntity"
     let entityId: String
     let componentId: String
 }
 
-struct AddEntityToDynamic3D: CommandDataProtocol{
+struct AddEntityToDynamic3D: CommandDataProtocol {
     static let commandType: String = "AddEntityToDynamic3D"
     let dynamic3dId: String
     let entityId: String
 }
 
-struct AddEntityToEntity: CommandDataProtocol{
+struct AddEntityToEntity: CommandDataProtocol {
     static let commandType: String = "AddEntityToEntity"
     let childId: String
     let parentId: String
 }
 
-struct SetParentForEntity: CommandDataProtocol{
+struct SetParentForEntity: CommandDataProtocol {
     static let commandType: String = "SetParentToEntity"
     let childId: String
     let parentId: String?
 }
 
-struct RemoveEntityFromParent: CommandDataProtocol{
+struct RemoveEntityFromParent: CommandDataProtocol {
     static let commandType: String = "RemoveEntityFromParent"
     let entityId: String
 }
 
-struct UpdateEntityProperties: CommandDataProtocol{
+struct UpdateEntityProperties: CommandDataProtocol {
     static let commandType: String = "UpdateEntityProperties"
     let entityId: String
-    let transform: [String:Float]
+    let transform: [String: Float]
 }
 
-struct UpdateEntityEvent: CommandDataProtocol{
+struct UpdateEntityEvent: CommandDataProtocol {
     static let commandType: String = "UpdateEntityEvent"
     let type: String
     let entityId: String
-    let isEnable:Bool
+    let isEnable: Bool
 }
 
-struct ConvertFromEntityToEntity: CommandDataProtocol{
+struct ConvertFromEntityToEntity: CommandDataProtocol {
     static let commandType: String = "ConvertFromEntityToEntity"
     let fromEntityId: String
     let toEntityId: String
-    let position:Vec3
+    let position: Vec3
 }
 
-struct ConvertFromEntityToScene: CommandDataProtocol{
+struct ConvertFromEntityToScene: CommandDataProtocol {
     static let commandType: String = "ConvertFromEntityToScene"
     let fromEntityId: String
-    let position:Vec3
+    let position: Vec3
 }
 
-struct ConvertFromSceneToEntity: CommandDataProtocol{
+struct ConvertFromSceneToEntity: CommandDataProtocol {
     static let commandType: String = "ConvertFromSceneToEntity"
     let entityId: String
-    let position:Vec3
+    let position: Vec3
 }
 
 struct InspectCommand: CommandDataProtocol {
@@ -156,15 +156,13 @@ protocol SpatializedElementProperties: SpatialObjectCommand {
     var visible: Bool? { get }
     var scrollWithParent: Bool? { get }
     var zIndex: Double? { get }
-    
+
     var enableDragStartGesture: Bool? { get }
     var enableDragGesture: Bool? { get }
     var enableDragEndGesture: Bool? { get }
-    
-    var enableRotateStartGesture: Bool? { get }
+
     var enableRotateGesture: Bool? { get }
     var enableRotateEndGesture: Bool? { get }
-    var enableMagnifyStartGesture: Bool? { get }
     var enableMagnifyGesture: Bool? { get }
     var enableMagnifyEndGesture: Bool? { get }
     var enableTapGesture: Bool? { get }
@@ -185,22 +183,20 @@ struct UpdateSpatialized2DElementProperties: SpatializedElementProperties {
     let visible: Bool?
     let scrollWithParent: Bool?
     let zIndex: Double?
-    
+
     var enableDragStartGesture: Bool?
     var enableDragGesture: Bool?
     var enableDragEndGesture: Bool?
-    var enableRotateStartGesture: Bool?
     var enableRotateGesture: Bool?
     var enableRotateEndGesture: Bool?
-    var enableMagnifyStartGesture: Bool?
     var enableMagnifyGesture: Bool?
     var enableMagnifyEndGesture: Bool?
-    var enableTapGesture: Bool?  
-    
+    var enableTapGesture: Bool?
+
     let scrollPageEnabled: Bool?
     let material: BackgroundMaterial?
     let cornerRadius: CornerRadius?
-    
+
     // this value is used by previous WebSpatial code, keep it here only for Compatibility consideration
     // may delete it when we think it's not needed
     let scrollEdgeInsetsMarginRight: Double?
@@ -211,7 +207,7 @@ struct UpdateSpatializedStatic3DElementProperties: SpatializedElementProperties
     let id: String
     let name: String?
     var clientX: Double?
-    var clientY: Double?  
+    var clientY: Double?
     let width: Double?
     let height: Double?
     let depth: Double?
@@ -221,14 +217,12 @@ struct UpdateSpatializedStatic3DElementProperties: SpatializedElementProperties
     let visible: Bool?
     let scrollWithParent: Bool?
     let zIndex: Double?
-    
+
     var enableDragStartGesture: Bool?
     let enableDragGesture: Bool?
     let enableDragEndGesture: Bool?
-    var enableRotateStartGesture: Bool?
     let enableRotateGesture: Bool?
     let enableRotateEndGesture: Bool?
-    var enableMagnifyStartGesture: Bool?
     let enableMagnifyGesture: Bool?
     let enableMagnifyEndGesture: Bool?
     let enableTapGesture: Bool?
@@ -252,14 +246,12 @@ struct UpdateSpatializedDynamic3DElementProperties: SpatializedElementProperties
     let visible: Bool?
     let scrollWithParent: Bool?
     let zIndex: Double?
-    
+
     var enableDragStartGesture: Bool?
     let enableDragGesture: Bool?
     let enableDragEndGesture: Bool?
-    var enableRotateStartGesture: Bool?
     let enableRotateGesture: Bool?
     let enableRotateEndGesture: Bool?
-    var enableMagnifyStartGesture: Bool?
     let enableMagnifyGesture: Bool?
     let enableMagnifyEndGesture: Bool?
     let enableTapGesture: Bool?
@@ -291,12 +283,12 @@ enum BaseplateVisibilityJSB: String, Codable {
     case automatic
     case visible
     case hidden
-    
+
     var toSDK: Visibility {
         switch self {
-            case .automatic: return .automatic
-            case .visible: return .visible
-            case .hidden: return .hidden
+        case .automatic: return .automatic
+        case .visible: return .visible
+        case .hidden: return .hidden
         }
     }
 }
@@ -304,11 +296,11 @@ enum BaseplateVisibilityJSB: String, Codable {
 enum WorldScalingJSB: String, Codable {
     case automatic
     case dynamic
-    
+
     var toSDK: WorldScalingBehavior {
         switch self {
-            case .automatic: return .automatic
-            case .dynamic: return .dynamic
+        case .automatic: return .automatic
+        case .dynamic: return .dynamic
         }
     }
 }
@@ -317,12 +309,12 @@ enum WorldAlignmentJSB: String, Codable {
     case adaptive
     case automatic
     case gravityAligned
-    
+
     var toSDK: WorldAlignmentBehavior {
         switch self {
-            case .adaptive: return .adaptive
-            case .automatic: return .automatic
-            case .gravityAligned: return .gravityAligned
+        case .adaptive: return .adaptive
+        case .automatic: return .automatic
+        case .gravityAligned: return .gravityAligned
         }
     }
 }

package/web-spatial/SpatialObject.swift

@@ -15,26 +15,36 @@ class WeakReference<T: AnyObject> {
 
 class SpatialObjectWeakRefManager {
     static var weakRefObjects = [String: WeakReference<AnyObject>]()
-    
+    private static let serialQueue = DispatchQueue(label: "com.xrsdk.spatialObjectWeakRefQueue")
+
     static func setWeakRef<T: AnyObject>(_ id: String, _ object: T) {
-        weakRefObjects[id] = WeakReference(object as AnyObject)
+        serialQueue.sync {
+            weakRefObjects[id] = WeakReference(object as AnyObject)
+        }
     }
-    
+
     static func getWeakRef(_ id: String) -> AnyObject? {
-        return weakRefObjects[id]?.value
+        serialQueue.sync {
+            weakRefObjects[id]?.value
+        }
     }
-    
+
     static func removeWeakRef(_ id: String) {
-        weakRefObjects.removeValue(forKey: id)
+        serialQueue.sync {
+            weakRefObjects.removeValue(forKey: id)
+        }
     }
 }
 
 class SpatialObject: SpatialObjectProtocol {
-    internal var listeners: [String : [(Any, Any) -> Void]] = [:]
-    static var objects = [String: (any SpatialObjectProtocol)]()
-    
+    var listeners: [String: [(Any, Any) -> Void]] = [:]
+    static var objects = [String: any SpatialObjectProtocol]()
+    static let serialQueue = DispatchQueue(label: "com.xrsdk.spatialObjectQueue")
+
     static func get(_ id: String) -> (any SpatialObjectProtocol)? {
-        return objects[id]
+        serialQueue.sync {
+            objects[id]
+        }
     }
 
     static func getRefObject(_ id: String) -> SpatialObject? {
@@ -69,14 +79,18 @@ class SpatialObject: SpatialObjectProtocol {
     init() {
         spatialId = UUID().uuidString
         id = spatialId
-        SpatialObject.objects[spatialId] = self
+        SpatialObject.serialQueue.sync {
+            SpatialObject.objects[spatialId] = self
+        }
         SpatialObjectWeakRefManager.setWeakRef(spatialId, self)
     }
 
     init(_ _id: String) {
         spatialId = _id
         id = spatialId
-        SpatialObject.objects[spatialId] = self
+        SpatialObject.serialQueue.sync {
+            SpatialObject.objects[spatialId] = self
+        }
         SpatialObjectWeakRefManager.setWeakRef(spatialId, self)
     }
 
@@ -99,10 +113,12 @@ class SpatialObject: SpatialObjectProtocol {
         _isDestroyed = true
 
         emit(event: Events.Destroyed.rawValue, data: ["object": self])
-        SpatialObject.objects.removeValue(forKey: spatialId)
+        SpatialObject.serialQueue.sync {
+            SpatialObject.objects.removeValue(forKey: spatialId)
+        }
 
         listeners = [:]
     }
 
-    internal func onDestroy() {}
+    func onDestroy() {}
 }

package/web-spatial/WebMsgCommand.swift

@@ -3,44 +3,43 @@
 import SwiftUI
 
 enum WebSpatialGestureType: String, Encodable {
-    case spatialtap = "spatialtap"
-    case spatialdragstart = "spatialdragstart"
-    case spatialdrag = "spatialdrag"
-    case spatialdragend = "spatialdragend"
-    case spatialrotatestart = "spatialrotatestart"
-    case spatialrotate = "spatialrotate"
-    case spatialrotateend = "spatialrotateend"
-    case spatialmagnifystart = "spatialmagnifystart"
-    case spatialmagnify = "spatialmagnify"
-    case spatialmagnifyend = "spatialmagnifyend"
+    case spatialtap
+    case spatialdragstart
+    case spatialdrag
+    case spatialdragend
+    case spatialrotate
+    case spatialrotateend
+    case spatialmagnify
+    case spatialmagnifyend
 }
 
 enum SpatialWebMsgType: String, Encodable {
-    case cubeInfo = "cubeInfo"
-    case transform = "transform"
-    case modelloaded = "modelloaded"
-    case modelloadfailed = "modelloadfailed"
-    case spatialtap = "spatialtap"
-    case spatialdrag = "spatialdrag"
-    case spatialdragend = "spatialdragend"
-    case spatialrotate = "spatialrotate"
-    case spatialrotateend = "spatialrotateend"
-    case spatialmagnify = "spatialmagnify"
-    case spatialmagnifyend = "spatialmagnifyend"
-    
-    case objectdestroy = "objectdestroy"
+    case cubeInfo
+    case transform
+    case modelloaded
+    case modelloadfailed
+    case spatialtap
+    case spatialdragstart
+    case spatialdrag
+    case spatialdragend
+    case spatialrotate
+    case spatialrotateend
+    case spatialmagnify
+    case spatialmagnifyend
+
+    case objectdestroy
 }
 
 // notify Spatialized3DElement Container Cube, used for ref.current.getBoundingClientCube()
 struct SpatiaizedContainerClientCube: Encodable {
-    let type: SpatialWebMsgType = SpatialWebMsgType.cubeInfo
+    let type: SpatialWebMsgType = .cubeInfo
     let origin: Point3D
     let size: Size3D
 }
 
 // notify Spatialized3DElement Container Transform to SpatialScene, used for ref.current.convertToSpatialScene()
 struct SpatiaizedContainerTransform: Encodable {
-    let type: SpatialWebMsgType = SpatialWebMsgType.transform
+    let type: SpatialWebMsgType = .transform
     let detail: AffineTransform3D
 }
 
@@ -50,70 +49,73 @@ struct WebSpatialTapGuestureEventDetail: Encodable {
 
 // notify SpatializedElement/SpatialEntity tapped
 struct WebSpatialTapGuestureEvent: Encodable {
-    let type: SpatialWebMsgType = SpatialWebMsgType.spatialtap
+    let type: SpatialWebMsgType = .spatialtap
     let detail: WebSpatialTapGuestureEventDetail
 }
 
-struct WebSpatialDragGuestureEventDetail: Encodable {
-    let location3D: Point3D
+struct WebSpatialDragStartGuestureEventDetail: Encodable {
     let startLocation3D: Point3D
+}
+
+struct WebSpatialDragStartGuestureEvent: Encodable {
+    let type: SpatialWebMsgType = .spatialdragstart
+    let detail: WebSpatialDragStartGuestureEventDetail
+}
+
+struct WebSpatialDragGuestureEventDetail: Encodable {
     let translation3D: Vector3D
-    let predictedEndTranslation3D: Vector3D
-    let predictedEndLocation3D: Point3D
-    let velocity: CGSize
 }
 
 struct WebSpatialDragGuestureEvent: Encodable {
-    let type: SpatialWebMsgType = SpatialWebMsgType.spatialdrag
+    let type: SpatialWebMsgType = .spatialdrag
     let detail: WebSpatialDragGuestureEventDetail
 }
 
 struct WebSpatialDragEndGuestureEvent: Encodable {
-    let type: SpatialWebMsgType = SpatialWebMsgType.spatialdragend
-    let detail: WebSpatialDragGuestureEventDetail
+    let type: SpatialWebMsgType = .spatialdragend
+}
+
+struct Quaternion: Encodable {
+    let x: Double
+    let y: Double
+    let z: Double
+    let w: Double
 }
 
 struct WebSpatialRotateGuestureEventDetail: Encodable {
-    let rotation: Rotation3D
-    let startAnchor3D: UnitPoint3D
-    let startLocation3D: Point3D
-    
+    let quaternion: Quaternion
 }
+
 struct WebSpatialRotateGuestureEvent: Encodable {
-    let type: SpatialWebMsgType = SpatialWebMsgType.spatialrotate
+    let type: SpatialWebMsgType = .spatialrotate
     let detail: WebSpatialRotateGuestureEventDetail
 }
 
 struct WebSpatialRotateEndGuestureEvent: Encodable {
-    let type: SpatialWebMsgType = SpatialWebMsgType.spatialrotateend
-    let detail: WebSpatialRotateGuestureEventDetail
+    let type: SpatialWebMsgType = .spatialrotateend
 }
 
 struct WebSpatialMagnifyGuestureEventDetail: Encodable {
     let magnification: CGFloat
-    let velocity: CGFloat
-    let startLocation3D: Point3D
-    let startAnchor3D: UnitPoint3D
 }
 
 struct WebSpatialMagnifyGuestureEvent: Encodable {
-    let type: SpatialWebMsgType = SpatialWebMsgType.spatialmagnify
+    let type: SpatialWebMsgType = .spatialmagnify
     let detail: WebSpatialMagnifyGuestureEventDetail
 }
 
 struct WebSpatialMagnifyEndGuestureEvent: Encodable {
-    let type: SpatialWebMsgType = SpatialWebMsgType.spatialmagnifyend
-    let detail: WebSpatialMagnifyGuestureEventDetail
+    let type: SpatialWebMsgType = .spatialmagnifyend
 }
 
 struct ModelLoadSuccess: Encodable {
-    let type: SpatialWebMsgType = SpatialWebMsgType.modelloaded
+    let type: SpatialWebMsgType = .modelloaded
 }
 
 struct ModelLoadFailure: Encodable {
-    let type: SpatialWebMsgType = SpatialWebMsgType.modelloadfailed
+    let type: SpatialWebMsgType = .modelloadfailed
 }
 
 struct SpatialObjectDestroiedEvent: Encodable {
-    let type: SpatialWebMsgType = SpatialWebMsgType.objectdestroy
+    let type: SpatialWebMsgType = .objectdestroy
 }

package/web-spatial/manager/Dynamic3DManager.swift

@@ -75,8 +75,8 @@ class Dynamic3DManager {
             loadComplete(.failure(NSError(domain: "Invalid URL", code: 0, userInfo: [NSLocalizedDescriptionKey: "Failed to create URL from string: \(urlString)"])))
             return
         }
-        var documentsUrl = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
-        documentsUrl.appendPathComponent(url.lastPathComponent)
+        // Use an immutable URL to avoid capturing a mutable var in concurrent code
+        let documentsUrl = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent(url.lastPathComponent)
         let session = URLSession(configuration: URLSessionConfiguration.default)
         var request = URLRequest(url: url)
         request.httpMethod = "GET"
@@ -95,17 +95,15 @@ class Dynamic3DManager {
                 loadComplete(.failure(NSError(domain: "Download Error", code: 0, userInfo: [NSLocalizedDescriptionKey: "Download location is nil"])))
                 return
             }
-            let fileManager = FileManager.default
-            do {
-                if fileManager.fileExists(atPath: documentsUrl.path) {
-                    try fileManager.removeItem(atPath: documentsUrl.path)
+            Task {
+                do {
+                    try await FileCoordinator.shared.moveReplacingIfExists(from: location, to: documentsUrl)
+                    print("load complete")
+                    loadComplete(.success(documentsUrl))
+                } catch {
+                    print("File operation error: \(error)")
+                    loadComplete(.failure(error))
                 }
-                try fileManager.moveItem(at: location, to: documentsUrl)
-                print("load complete")
-                loadComplete(.success(documentsUrl))
-            } catch {
-                print("File operation error: \(error)")
-                loadComplete(.failure(error))
             }
 
         })

package/web-spatial/manager/FileCoordinator.swift

@@ -0,0 +1,20 @@
+import Foundation
+
+actor FileCoordinator {
+    static let shared = FileCoordinator()
+
+    func moveReplacingIfExists(from sourceURL: URL, to destinationURL: URL) throws {
+        let fm = FileManager.default
+        if fm.fileExists(atPath: destinationURL.path) {
+            try fm.removeItem(at: destinationURL)
+        }
+        try fm.moveItem(at: sourceURL, to: destinationURL)
+    }
+
+    func removeIfExists(at url: URL) throws {
+        let fm = FileManager.default
+        if fm.fileExists(atPath: url.path) {
+            try fm.removeItem(at: url)
+        }
+    }
+}

package/web-spatial/manager/WKWebViewManager.swift

@@ -28,11 +28,19 @@ class WKWebViewManager {
         // TODO: get native api instead of PACKAGE_VERSION
         controller.webview!.customUserAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7; wv) AppleWebKit\(webviewVersion)WebSpatial/\("PACKAGE_VERSION") SpatialID/\(spatialId!)"
         controller.webview!.uiDelegate = controller
-        controller.webview!.allowsBackForwardNavigationGestures = true
+        controller.webview!.allowsBackForwardNavigationGestures = false
         controller.webview!.isInspectable = true
         controller.webview!.allowsLinkPreview = true
         controller.webview!.navigationDelegate = controller
         controller.webview!.scrollView.delegate = controller
+
+        if let webview = controller.webview {
+//            webview.scrollView.isScrollEnabled = false
+            webview.scrollView.bounces = false
+            webview.scrollView.showsVerticalScrollIndicator = false
+            webview.scrollView.showsHorizontalScrollIndicator = false
+        }
+
         controller.startObserving()
         return controller.webview!
     }

package/web-spatial/manifest.swift

@@ -5,7 +5,10 @@ var pwaManager = PWAManager()
 
 struct PWAManager: Codable {
     var isLocal: Bool = false
-    var start_url: String = "http://localhost:5173/src/reality/gestures"
+
+    var start_url: String = "http://localhost:5173"
+
+//    var start_url: String = "http://localhost:5173/webspatial/avp/materialApiTest"
 
     var scope: String = ""
     var id: String = "com.webspatial.pico"