Merge branch 'main' of https://github.com/ptcrealitylab/vuforia-spati…

…al-edge-server into main
ptcrealitylab · Mar 1, 2024 · a7d09f1 · a7d09f1
2 parents 1754c61 + cabba89
commit a7d09f1
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 48 deletions.
diff --git a/addons/vuforia-spatial-core-addon b/addons/vuforia-spatial-core-addon
diff --git a/libraries/objectDefaultFiles/object.js b/libraries/objectDefaultFiles/object.js
@@ -909,20 +909,22 @@
          * Subscribes this socket to data values being written to nodes on this frame
          */
         this.sendRealityEditorSubscribe = function () {
-            var timeoutFunction = function() {
-                if (spatialObject.object) {
-                    self.ioObject.emit(getIoTitle('/subscribe/realityEditor'), JSON.stringify({
-                        object: spatialObject.object,
-                        frame: spatialObject.frame,
-                        protocol: spatialObject.protocol
-                    }));
+            let timeout = 10;
+            function subscribe() {
+                if (self.ioObject.socket.readyState !== self.ioObject.socket.OPEN) {
+                    if (timeout < 1000) {
+                        timeout *= 10;
+                    }
+                    setTimeout(subscribe, timeout);
+                    return;
                 }
-            };
-            // Call it a few times to help ensure it succeeds
-            setTimeout(timeoutFunction, 10);
-            setTimeout(timeoutFunction, 50);
-            setTimeout(timeoutFunction, 100);
-            setTimeout(timeoutFunction, 1000);
+                self.ioObject.emit(getIoTitle('/subscribe/realityEditor'), JSON.stringify({
+                    object: spatialObject.object,
+                    frame: spatialObject.frame,
+                    protocol: spatialObject.protocol
+                }));
+            }
+            subscribe();
         };
         this.sendRealityEditorSubscribe();
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "cors": "^2.8.5",
     "decompress-zip": "github:hobinjk-ptc/decompress-zip",
     "directory-tree": "^3.5.1",
-    "express": "^4.18.2",
+    "express": "^4.18.3",
     "express-handlebars": "^5.3.5",
     "formidable": "^2.1.1",
     "ip": "^2.0.1",
+1 −1		tools/spatialDraw/DrawingManager.js
+1 −0		tools/spatialDraw/index.html
+21 −0		tools/spatialDraw/index.js