fix duplicate engines

decentraland · Jun 27, 2023 · e40f5b5 · e40f5b5
1 parent d28ca95
commit e40f5b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/packages/@dcl/inspector/src/hooks/sdk/useSdkContext.ts b/packages/@dcl/inspector/src/hooks/sdk/useSdkContext.ts
@@ -18,12 +18,13 @@ export const useSdkContext = () => {
   const [catalog] = useCatalog()
   const dispatch = useAppDispatch()
   let sdkInitialized = false
+
   useEffect(() => {
     dispatch(connectDataLayer())
   }, [dispatch])
 
   useEffect(() => {
-    if (!catalog.length || !canvas || !preferences || sdkInitialized) return
+    if (!catalog.length || !canvas || !preferences || sdkInitialized || !!sdk) return
     sdkInitialized = true
     createSdkContext(canvas, catalog, preferences)
       .then((ctx) => {

diff --git a/packages/@dcl/inspector/src/lib/data-layer/host/stream.ts b/packages/@dcl/inspector/src/lib/data-layer/host/stream.ts
@@ -11,7 +11,6 @@ export function stream(
   addUndoCrdt: () => void
 ): AsyncGenerator<{ data: Uint8Array }> {
   const queue = new AsyncQueue<{ data: Uint8Array }>((_) => {})
-
   const engineSerialized = serializeEngine(ctx.engine)
   // first we send the fully serialized state over the wire
   queue.enqueue({ data: engineSerialized })
@@ -29,20 +28,16 @@ export function stream(
   Object.assign(transport, { name: 'DataLayerHost' })
   ctx.engine.addTransport(transport)
 
-  async function processMessage(message: Uint8Array) {
+  function processMessage(message: Uint8Array) {
     transport.onmessage!(message)
-    await ctx.engine.update(1)
+    void ctx.engine.update(1)
     addUndoCrdt()
   }
 
-  function closeCallback() {
-    if (!queue.closed) queue.close()
-  }
-
   // and lastly wire the new messages from the renderer engine
   consumeAllMessagesInto(stream, processMessage).catch((err) => {
-    console.error('x failed: ', err)
-    closeCallback()
+    console.error('Faile to consume stream from data layer ', err)
+    queue.close()
   })
 
   // Send initial message (engineSerialized)