hotfix: support multiple scenes in world (#6099)

* support multiple scenes in world

* dont wait to attach transport to set the worker on the local storage
# Conflicts:
#	browser-interface/packages/shared/world/SceneWorker.ts

Author: aixaCode

browser-interface/packages/shared/scene-loader/world-loader-impl/index.ts

@@ -22,9 +22,10 @@ function getParcels(position: Vector2, loadingRadius: number): string[] {
 export async function createWorldLoader(options: { urns: string[] }): Promise<ISceneLoader> {
   const mappingScene = new Map<string, LoadableScene>()
   const scenes = await Promise.all(options.urns.map((urn) => getPortableExperienceFromUrn(urn)))
-
-  for (const parcel of scenes[0].entity.metadata.scene.parcels) {
-    mappingScene.set(parcel, scenes[0])
+  for (const scene of scenes) {
+    for (const parcel of scene.entity.metadata.scene.parcels) {
+      mappingScene.set(parcel, scene)
+    }
   }
 
   const emptyParcelController = new EmptyParcelController({ rootUrl: getResourcesURL('.') })

browser-interface/packages/shared/world/SceneWorker.ts

@@ -12,6 +12,7 @@ import {
   getAssetBundlesBaseUrl,
   PIPE_SCENE_CONSOLE,
   playerHeight,
+  PREVIEW,
   WSS_ENABLED
 } from 'config'
 import { gridToWorld } from 'lib/decentraland/parcels/gridToWorld'
@@ -42,6 +43,8 @@ import { joinBuffers } from 'lib/javascript/uint8arrays'
 import { nativeMsgBridge } from 'unity-interface/nativeMessagesBridge'
 import { _INTERNAL_WEB_TRANSPORT_ALLOC_SIZE } from 'renderer-protocol/transports/webTransport'
 import { createInternalEngine } from './runtime-7/engine'
+import { initSourcemap } from './runtime-7/sourcemap'
+import { forceStopScene } from './parcelSceneManager'
 
 export enum SceneWorkerReadyState {
   LOADING = 1 << 0,
@@ -114,7 +117,6 @@ export class SceneWorker {
   private rpcServer!: RpcServer<PortContext>
 
   private sceneStarted: boolean = false
-
   private position: Vector3 = new Vector3()
   private readonly lastSentPosition = new Vector3(0, 0, 0)
   private readonly lastSentRotation = new Quaternion(0, 0, 0, 1)
@@ -130,7 +132,7 @@ export class SceneWorker {
     const sceneNumber = globalSceneNumberCounter
     const scenePort = await rpcClient.createPort(`scene-${sceneNumber}`)
     const worker = new SceneWorker(loadableScene, sceneNumber, scenePort)
-    await worker.attachTransport()
+    worker.attachTransport().catch(() => forceStopScene(loadableScene.id))
     return worker
   }
 
@@ -194,7 +196,8 @@ export class SceneWorker {
       readFile: this.readFile.bind(this),
       initialEntitiesTick0: Uint8Array.of(),
       hasMainCrdt: false,
-      internalEngine: undefined
+      internalEngine: undefined,
+      sourcemap: undefined
     }
 
     // if the scene metadata has a base parcel, then we set it as the position
@@ -230,7 +233,27 @@ export class SceneWorker {
     }
   }
 
-  async readFile(fileName: string) {
+  async loadSourcemap() {
+    try {
+      // Only sdk7 scenes
+      if (!this.rpcContext.sdk7) return
+
+      // Only preview or production scenes with the DEBUG_MOD or DEBUG_SCENE_LOG param
+      if (!PREVIEW && !DEBUG_SCENE_LOG) return
+
+      const mainFile = PREVIEW
+        ? this.loadableScene.entity.metadata.main
+        : `${this.loadableScene.entity.metadata.main}.map`
+      const file = await this.readFile(mainFile, 'text')
+      if (!file?.content) return
+      return (await initSourcemap(file.content, PREVIEW)) ?? undefined
+    } catch (_) {}
+  }
+
+  async readFile<T extends 'text' | 'arraybuffer' = 'arraybuffer'>(
+    fileName: string,
+    type?: T
+  ): Promise<T extends 'text' ? { hash: string; content: string } : { hash: string; content: Uint8Array }> {
     // filenames are lower cased as per https://adr.decentraland.org/adr/ADR-80
     const normalized = fileName.toLowerCase()
 
@@ -245,8 +268,11 @@ export class SceneWorker {
         const response = await fetch(url)
 
         if (!response.ok) throw new Error(`Error fetching file ${file} from ${url}`)
+        if (!type || type === 'arraybuffer') {
+          return { hash, content: new Uint8Array(await response.arrayBuffer()) } as any
+        }
 
-        return { hash, content: new Uint8Array(await response.arrayBuffer()) }
+        return { hash, content: await response.text() } as any
       }
     }
 
@@ -407,6 +433,7 @@ export class SceneWorker {
         this.metadata.scene.parcels,
         showAsPortableExperience
       )
+      this.rpcContext.sourcemap = await this.loadSourcemap()
     }
     sceneEvents.emit(SCENE_LOAD, signalSceneLoad(this.loadableScene))
   }