Fix objFromName race condition

Author: brentyi

viser/_message_api.py

@@ -66,7 +66,8 @@ def _encode_rgb(
     if isinstance(rgb, onp.ndarray):
         assert rgb.shape == (3,)
     rgb_fixed = tuple(
-        value if onp.issubdtype(type(value), onp.integer) else int(value * 255) for value in rgb
+        value if onp.issubdtype(type(value), onp.integer) else int(value * 255)
+        for value in rgb
     )
     assert len(rgb_fixed) == 3
     return int(rgb_fixed[0] * (256**2) + rgb_fixed[1] * 256 + rgb_fixed[2])

viser/client/src/SceneTree.tsx

@@ -127,7 +127,7 @@ export function useSceneTreeState() {
           }),
         resetScene: () =>
           set((state) => {
-            Object.assign(state, cleanSceneTreeState);
+            state = { ...state, ...cleanSceneTreeState }; // eslint-disable-line @typescript-eslint/no-unused-vars
           }),
       }))
     )
@@ -178,15 +178,14 @@ export const SceneNodeThreeObject = React.memo(
     const sceneNode = props.useSceneTree(
       (state) => state.nodeFromName[props.name]
     );
-    const obj = props.useSceneTree((state) => state.objFromName[props.name]);
     const setObj = props.useSceneTree((state) => state.setObj);
     const clearObj = props.useSceneTree((state) => state.clearObj);
     const ref = React.useRef<THREE.Object3D>(null);
 
     React.useEffect(() => {
       ref.current && setObj(props.name, ref.current);
       return () => clearObj(props.name);
-    }, [obj]); // This `obj` dependency is needed for when resetScene() clears the world axis obj.
+    });
 
     return (
       <>

viser/client/src/WebsocketInterface.tsx

@@ -438,8 +438,6 @@ export default function WebsocketInterface(props: {
         });
         try {
           messageQueue.push(await messagePromise);
-          // handleMessage(await messagePromise);
-          // handleMessage(await messagePromise);
         } finally {
           orderLock.acquired && orderLock.release();
         }