@dcl/sdk 7.20.2-22169778016.commit-030cbfe → 7.20.2-22231111352.commit-d2f6f0a

package/network/state.js

@@ -1,6 +1,6 @@
 import { ReadWriteByteBuffer } from '@dcl/ecs/dist/serialization/ByteBuffer';
 import { CrdtMessageProtocol, CrdtMessageType, PutComponentOperation, PutNetworkComponentOperation, NetworkEntity as _NetworkEntity, VideoEvent, AudioEvent, EngineInfo, GltfContainerLoadingState, PointerEventsResult, RaycastResult, RealmInfo, TweenState, UiDropdown, UiDropdownResult, UiInput, UiInputResult, UiText, UiTransform } from '@dcl/ecs';
-import { LIVEKIT_MAX_SIZE } from './server';
+import { LIVEKIT_MAX_SIZE } from '@dcl/ecs/dist/systems/crdt';
 export const NOT_SYNC_COMPONENTS = [
     VideoEvent,
     TweenState,
@@ -38,7 +38,8 @@ export function engineToCrdt(engine) {
             continue;
         }
         itComponentDefinition.dumpCrdtStateToBuffer(crdtBuffer, (entity) => {
-            return NetworkEntity.has(entity);
+            const isNetworkEntity = NetworkEntity.has(entity);
+            return isNetworkEntity;
         });
     }
     let header;
@@ -56,6 +57,7 @@ export function engineToCrdt(engine) {
                     networkBuffer.resetBuffer();
                 }
                 // If the message itself is larger than the limit, we need to handle it specially
+                // For now, we'll skip it to prevent infinite loops
                 if (messageSize / 1024 > LIVEKIT_MAX_SIZE) {
                     console.error(`Message too large (${messageSize} bytes), skipping component ${message.componentId} for entity ${message.entityId}`);
                     continue;
@@ -75,4 +77,4 @@ export function engineToCrdt(engine) {
     }
     return chunks;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"state.js","sourceRoot":"","sources":["../src/network/state.ts"],"names":[],"mappings":"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","sourcesContent":["import { ReadWriteByteBuffer } from '@dcl/ecs/dist/serialization/ByteBuffer'\nimport {\n  CrdtMessageHeader,\n  CrdtMessageProtocol,\n  CrdtMessageType,\n  IEngine,\n  PutComponentOperation,\n  PutNetworkComponentOperation,\n  SyncComponents as _SyncComponents,\n  NetworkEntity as _NetworkEntity,\n  INetowrkEntity,\n  VideoEvent,\n  AudioEvent,\n  EngineInfo,\n  GltfContainerLoadingState,\n  PointerEventsResult,\n  RaycastResult,\n  RealmInfo,\n  TweenState,\n  UiDropdown,\n  UiDropdownResult,\n  UiInput,\n  UiInputResult,\n  UiText,\n  UiTransform,\n  ComponentDefinition\n} from '@dcl/ecs'\nimport { LIVEKIT_MAX_SIZE } from './server'\n\nexport const NOT_SYNC_COMPONENTS: ComponentDefinition<unknown>[] = [\n  VideoEvent,\n  TweenState,\n  AudioEvent,\n  EngineInfo,\n  GltfContainerLoadingState,\n  PointerEventsResult,\n  RaycastResult,\n  RealmInfo,\n  UiDropdown,\n  UiDropdownResult,\n  UiInput,\n  UiInputResult,\n  UiTransform,\n  UiText\n]\n\nexport const NOT_SYNC_COMPONENTS_IDS = NOT_SYNC_COMPONENTS.map(($) => $.componentId)\nexport const NOT_SYNC_COMPONENTS_NAMES: string[] = [\n  'asset-packs::Script' // ComponentName from: https://github.com/decentraland/asset-packs/blob/main/src/enums.ts\n]\n\nexport function shouldSyncComponent(component: ComponentDefinition<unknown>): boolean {\n  return !(\n    NOT_SYNC_COMPONENTS_IDS.includes(component.componentId) ||\n    NOT_SYNC_COMPONENTS_NAMES.includes(component.componentName)\n  )\n}\n\nexport function getDesyncedComponents(engine: IEngine): ComponentDefinition<unknown>[] {\n  return [...NOT_SYNC_COMPONENTS, ...NOT_SYNC_COMPONENTS_NAMES.map(($) => engine.getComponentOrNull($))].filter(\n    Boolean\n  ) as ComponentDefinition<unknown>[]\n}\n\nexport function engineToCrdt(engine: IEngine): Uint8Array[] {\n  const crdtBuffer = new ReadWriteByteBuffer()\n  const networkBuffer = new ReadWriteByteBuffer()\n  const NetworkEntity = engine.getComponent(_NetworkEntity.componentId) as INetowrkEntity\n  const chunks: Uint8Array[] = []\n\n  for (const itComponentDefinition of engine.componentsIter()) {\n    if (!shouldSyncComponent(itComponentDefinition)) {\n      continue\n    }\n\n    itComponentDefinition.dumpCrdtStateToBuffer(crdtBuffer, (entity) => {\n      return NetworkEntity.has(entity)\n    })\n  }\n\n  let header: CrdtMessageHeader | null\n  while ((header = CrdtMessageProtocol.getHeader(crdtBuffer))) {\n    if (header.type === CrdtMessageType.PUT_COMPONENT) {\n      const message = PutComponentOperation.read(crdtBuffer)!\n      const networkEntity = NetworkEntity.getOrNull(message.entityId)\n\n      // Check if adding this message would exceed the size limit\n      const currentBufferSize = networkBuffer.toBinary().byteLength\n      const messageSize = message.data.byteLength\n\n      if ((currentBufferSize + messageSize) / 1024 > LIVEKIT_MAX_SIZE) {\n        // If the current buffer has content, save it as a chunk\n        if (currentBufferSize > 0) {\n          chunks.push(networkBuffer.toCopiedBinary())\n          networkBuffer.resetBuffer()\n        }\n\n        // If the message itself is larger than the limit, we need to handle it specially\n        if (messageSize / 1024 > LIVEKIT_MAX_SIZE) {\n          console.error(\n            `Message too large (${messageSize} bytes), skipping component ${message.componentId} for entity ${message.entityId}`\n          )\n          continue\n        }\n      }\n\n      if (networkEntity) {\n        PutNetworkComponentOperation.write(\n          networkEntity.entityId,\n          message.timestamp,\n          message.componentId,\n          networkEntity.networkId,\n          message.data,\n          networkBuffer\n        )\n      }\n    } else {\n      crdtBuffer.incrementReadOffset(header.length)\n    }\n  }\n\n  // Add any remaining data as the final chunk\n  if (networkBuffer.currentWriteOffset() > 0) {\n    chunks.push(networkBuffer.toBinary())\n  }\n\n  return chunks\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"state.js","sourceRoot":"","sources":["../src/network/state.ts"],"names":[],"mappings":"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","sourcesContent":["import { ReadWriteByteBuffer } from '@dcl/ecs/dist/serialization/ByteBuffer'\nimport {\n  CrdtMessageHeader,\n  CrdtMessageProtocol,\n  CrdtMessageType,\n  IEngine,\n  PutComponentOperation,\n  PutNetworkComponentOperation,\n  SyncComponents as _SyncComponents,\n  NetworkEntity as _NetworkEntity,\n  INetowrkEntity,\n  VideoEvent,\n  AudioEvent,\n  EngineInfo,\n  GltfContainerLoadingState,\n  PointerEventsResult,\n  RaycastResult,\n  RealmInfo,\n  TweenState,\n  UiDropdown,\n  UiDropdownResult,\n  UiInput,\n  UiInputResult,\n  UiText,\n  UiTransform,\n  ComponentDefinition\n} from '@dcl/ecs'\nimport { LIVEKIT_MAX_SIZE } from '@dcl/ecs/dist/systems/crdt'\n\nexport const NOT_SYNC_COMPONENTS: ComponentDefinition<unknown>[] = [\n  VideoEvent,\n  TweenState,\n  AudioEvent,\n  EngineInfo,\n  GltfContainerLoadingState,\n  PointerEventsResult,\n  RaycastResult,\n  RealmInfo,\n  UiDropdown,\n  UiDropdownResult,\n  UiInput,\n  UiInputResult,\n  UiTransform,\n  UiText\n]\n\nexport const NOT_SYNC_COMPONENTS_IDS = NOT_SYNC_COMPONENTS.map(($) => $.componentId)\nexport const NOT_SYNC_COMPONENTS_NAMES: string[] = [\n  'asset-packs::Script' // ComponentName from: https://github.com/decentraland/asset-packs/blob/main/src/enums.ts\n]\n\nexport function shouldSyncComponent(component: ComponentDefinition<unknown>): boolean {\n  return !(\n    NOT_SYNC_COMPONENTS_IDS.includes(component.componentId) ||\n    NOT_SYNC_COMPONENTS_NAMES.includes(component.componentName)\n  )\n}\n\nexport function getDesyncedComponents(engine: IEngine): ComponentDefinition<unknown>[] {\n  return [...NOT_SYNC_COMPONENTS, ...NOT_SYNC_COMPONENTS_NAMES.map(($) => engine.getComponentOrNull($))].filter(\n    Boolean\n  ) as ComponentDefinition<unknown>[]\n}\n\nexport function engineToCrdt(engine: IEngine): Uint8Array[] {\n  const crdtBuffer = new ReadWriteByteBuffer()\n  const networkBuffer = new ReadWriteByteBuffer()\n  const NetworkEntity = engine.getComponent(_NetworkEntity.componentId) as INetowrkEntity\n  const chunks: Uint8Array[] = []\n\n  for (const itComponentDefinition of engine.componentsIter()) {\n    if (!shouldSyncComponent(itComponentDefinition)) {\n      continue\n    }\n    itComponentDefinition.dumpCrdtStateToBuffer(crdtBuffer, (entity) => {\n      const isNetworkEntity = NetworkEntity.has(entity)\n      return isNetworkEntity\n    })\n  }\n\n  let header: CrdtMessageHeader | null\n  while ((header = CrdtMessageProtocol.getHeader(crdtBuffer))) {\n    if (header.type === CrdtMessageType.PUT_COMPONENT) {\n      const message = PutComponentOperation.read(crdtBuffer)!\n      const networkEntity = NetworkEntity.getOrNull(message.entityId)\n\n      // Check if adding this message would exceed the size limit\n      const currentBufferSize = networkBuffer.toBinary().byteLength\n      const messageSize = message.data.byteLength\n\n      if ((currentBufferSize + messageSize) / 1024 > LIVEKIT_MAX_SIZE) {\n        // If the current buffer has content, save it as a chunk\n        if (currentBufferSize > 0) {\n          chunks.push(networkBuffer.toCopiedBinary())\n          networkBuffer.resetBuffer()\n        }\n\n        // If the message itself is larger than the limit, we need to handle it specially\n        // For now, we'll skip it to prevent infinite loops\n        if (messageSize / 1024 > LIVEKIT_MAX_SIZE) {\n          console.error(\n            `Message too large (${messageSize} bytes), skipping component ${message.componentId} for entity ${message.entityId}`\n          )\n          continue\n        }\n      }\n\n      if (networkEntity) {\n        PutNetworkComponentOperation.write(\n          networkEntity.entityId,\n          message.timestamp,\n          message.componentId,\n          networkEntity.networkId,\n          message.data,\n          networkBuffer\n        )\n      }\n    } else {\n      crdtBuffer.incrementReadOffset(header.length)\n    }\n  }\n\n  // Add any remaining data as the final chunk\n  if (networkBuffer.currentWriteOffset() > 0) {\n    chunks.push(networkBuffer.toBinary())\n  }\n\n  return chunks\n}\n"]}

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@dcl/sdk",
   "description": "",
-  "version": "7.20.2-22169778016.commit-030cbfe",
+  "version": "7.20.2-22231111352.commit-d2f6f0a",
   "author": "Decentraland",
   "dependencies": {
-    "@dcl/ecs": "7.20.2-22169778016.commit-030cbfe",
+    "@dcl/ecs": "7.20.2-22231111352.commit-d2f6f0a",
     "@dcl/ecs-math": "2.1.0",
     "@dcl/explorer": "1.0.164509-20240802172549.commit-fb95b9b",
-    "@dcl/js-runtime": "7.20.2-22169778016.commit-030cbfe",
-    "@dcl/react-ecs": "7.20.2-22169778016.commit-030cbfe",
-    "@dcl/sdk-commands": "7.20.2-22169778016.commit-030cbfe",
+    "@dcl/js-runtime": "7.20.2-22231111352.commit-d2f6f0a",
+    "@dcl/react-ecs": "7.20.2-22231111352.commit-d2f6f0a",
+    "@dcl/sdk-commands": "7.20.2-22231111352.commit-d2f6f0a",
     "text-encoding": "0.7.0"
   },
   "keywords": [],
@@ -35,5 +35,5 @@
   },
   "types": "./index.d.ts",
   "typings": "./index.d.ts",
-  "commit": "030cbfee8a40495d9916ade20280282e63e3cc8b"
+  "commit": "d2f6f0a879331345b3f46766f176294cc562da7b"
 }

package/src/network/binary-message-bus.ts

@@ -1,12 +1,9 @@
 import { ReadWriteByteBuffer } from '@dcl/ecs/dist/serialization/ByteBuffer'
 
 export enum CommsMessage {
-  CRDT = 7,
-  REQ_CRDT_STATE = 8,
-  RES_CRDT_STATE = 9,
-  CRDT_SERVER = 4,
-  CRDT_AUTHORITATIVE = 5,
-  CUSTOM_EVENT = 6
+  CRDT = 1,
+  REQ_CRDT_STATE = 2,
+  RES_CRDT_STATE = 3
 }
 
 export function BinaryMessageBus<T extends CommsMessage>(
@@ -23,9 +20,7 @@ export function BinaryMessageBus<T extends CommsMessage>(
     __processMessages: (messages: Uint8Array[]) => {
       for (const message of messages) {
         const commsMsg = decodeCommsMessage<T>(message)
-        if (!commsMsg) {
-          continue
-        }
+        if (!commsMsg) continue
         const { sender, messageType, data } = commsMsg
         const fn = mapping.get(messageType)
         if (fn) fn(data, sender)

package/src/network/index.ts

@@ -2,46 +2,9 @@ import { sendBinary } from '~system/CommunicationsController'
 import { engine } from '@dcl/ecs'
 import { addSyncTransport } from './message-bus-sync'
 import { getUserData } from '~system/UserIdentity'
-import { isServer as isServerApi } from '~system/EngineApi'
-import { Atom } from '../atom'
-
-// Create isServer atom for consistent state
-const isServerAtom = Atom<boolean>(false)
-void isServerApi({}).then((response) => {
-  isServerAtom.swap(!!response.isServer)
-})
-
-// Helper function to check if running on server
-export function isServer(): boolean {
-  return isServerAtom.getOrNull() ?? false
-}
 
 // initialize sync transport for sdk engine
-const {
-  getChildren,
-  syncEntity,
-  parentEntity,
-  getParent,
-  myProfile,
-  removeParent,
-  getFirstChild,
-  isStateSyncronized,
-  binaryMessageBus,
-  eventBus
-} = addSyncTransport(engine, sendBinary, getUserData, isServerApi, 'network')
-
-// Re-export the room messaging system
-export { registerMessages, getRoom } from './events'
+const { getChildren, syncEntity, parentEntity, getParent, myProfile, removeParent, getFirstChild, isStateSyncronized } =
+  addSyncTransport(engine, sendBinary, getUserData)
 
-export {
-  getFirstChild,
-  getChildren,
-  syncEntity,
-  parentEntity,
-  getParent,
-  myProfile,
-  removeParent,
-  isStateSyncronized,
-  binaryMessageBus,
-  eventBus
-}
+export { getFirstChild, getChildren, syncEntity, parentEntity, getParent, myProfile, removeParent, isStateSyncronized }

package/src/network/message-bus-sync.ts

@@ -1,53 +1,27 @@
-import { IEngine, Transport, RealmInfo } from '@dcl/ecs'
+import { IEngine, Transport, RealmInfo, PlayerIdentityData } from '@dcl/ecs'
 import { type SendBinaryRequest, type SendBinaryResponse } from '~system/CommunicationsController'
 
 import { syncFilter } from './filter'
 import { engineToCrdt } from './state'
-import { BinaryMessageBus, CommsMessage } from './binary-message-bus'
+import { BinaryMessageBus, CommsMessage, decodeString, encodeString } from './binary-message-bus'
 import { fetchProfile } from './utils'
 import { entityUtils } from './entities'
-import { createServerValidator } from './server'
 import { GetUserDataRequest, GetUserDataResponse } from '~system/UserIdentity'
 import { definePlayerHelper } from '../players'
 import { serializeCrdtMessages } from '../internal/transports/logger'
-import { IsServerRequest, IsServerResponse } from '~system/EngineApi'
-import { Atom } from '../atom'
-import { setGlobalRoom, Room } from './events/implementation'
 
 export type IProfile = { networkId: number; userId: string }
 // user that we asked for the inital crdt state
-export const AUTH_SERVER_PEER_ID = 'authoritative-server'
-export const DEBUG_NETWORK_MESSAGES = () => (globalThis as any).DEBUG_NETWORK_MESSAGES ?? false
-
-// Test environment detection without 'as any'
-const isTestEnvironment = (): boolean => {
-  try {
-    if (typeof globalThis === 'undefined') return false
-    const globalWithProcess = globalThis as unknown as { process?: { env?: { NODE_ENV?: string } } }
-    return globalWithProcess.process?.env?.NODE_ENV === 'test'
-  } catch {
-    return false
-  }
-}
-
 export function addSyncTransport(
   engine: IEngine,
   sendBinary: (msg: SendBinaryRequest) => Promise<SendBinaryResponse>,
-  getUserData: (value: GetUserDataRequest) => Promise<GetUserDataResponse>,
-  isServerFn: (request: IsServerRequest) => Promise<IsServerResponse>,
-  name: string
+  getUserData: (value: GetUserDataRequest) => Promise<GetUserDataResponse>
 ) {
+  const DEBUG_NETWORK_MESSAGES = () => (globalThis as any).DEBUG_NETWORK_MESSAGES ?? false
   // Profile Info
   const myProfile: IProfile = {} as IProfile
   fetchProfile(myProfile!, getUserData)
 
-  const isServerAtom = Atom<boolean>()
-  const isRoomReadyAtom = Atom<boolean>(false)
-
-  void isServerFn({}).then(($: IsServerResponse) => {
-    return isServerAtom.swap(!!$.isServer)
-  })
-
   // Entity utils
   const entityDefinitions = entityUtils(engine, myProfile)
 
@@ -66,196 +40,108 @@ export function addSyncTransport(
   const players = definePlayerHelper(engine)
 
   let stateIsSyncronized = false
+  let transportInitialzed = false
 
-  /**
-   * We need to wait till 2 ticks that is when the engine is ready to send new messages.
-   * The first tick is for the client engine processing the CRDT messages,
-   * and the second one are the messages created by the main() function.
-   * So to avoid sending those messages, that all the clients have, through the network we put this validation here.
-   */
-  let tick = 0
-  const TRANSPORT_INITIALIZED_NUMBER = isTestEnvironment() ? 0 : 2
   // Add Sync Transport
   const transport: Transport = {
     filter: syncFilter(engine),
     send: async (messages) => {
-      if (tick <= TRANSPORT_INITIALIZED_NUMBER) tick++
-      for (const message of tick > TRANSPORT_INITIALIZED_NUMBER ? [messages].flat() : []) {
-        if (message.byteLength) {
+      for (const message of [messages].flat()) {
+        if (message.byteLength && transportInitialzed) {
           DEBUG_NETWORK_MESSAGES() &&
             console.log(...Array.from(serializeCrdtMessages('[NetworkMessage sent]:', message, engine)))
-
-          // Convert regular messages to network messages for broadcasting with chunking
-          for (const chunk of serverValidator.convertRegularToNetworkMessage(message)) {
-            binaryMessageBus.emit(CommsMessage.CRDT, chunk)
-          }
+          binaryMessageBus.emit(CommsMessage.CRDT, message)
         }
       }
       const peerMessages = getMessagesToSend()
+      let totalSize = 0
+      for (const message of peerMessages) {
+        for (const data of message.data) {
+          totalSize += data.byteLength
+        }
+      }
+      if (totalSize) {
+        DEBUG_NETWORK_MESSAGES() && console.log('Sending network messages: ', totalSize / 1024, 'KB')
+      }
       const response = await sendBinary({ data: [], peerData: peerMessages })
       binaryMessageBus.__processMessages(response.data)
+      transportInitialzed = true
     },
-    type: name
+    type: 'network'
   }
-
-  // Server validation setup
-  const serverValidator = createServerValidator({
-    engine,
-    binaryMessageBus
-  })
-
-  // Initialize Event Bus with registered schemas
-  const eventBus = new Room(engine, binaryMessageBus, isServerAtom, isRoomReadyAtom)
-
-  // Set global eventBus instance
-  setGlobalRoom(eventBus)
-
   engine.addTransport(transport)
   // End add sync transport
 
   // Receive & Process CRDT_STATE
-  binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, async (data, sender) => {
-    DEBUG_NETWORK_MESSAGES() && console.log('[REQ_CRDT_STATE]', sender, Date.now())
-    for (const chunk of engineToCrdt(engine)) {
-      DEBUG_NETWORK_MESSAGES() && console.log('[Emiting:]', sender, Date.now())
-      binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, chunk, [sender])
-    }
-  })
-  binaryMessageBus.on(CommsMessage.RES_CRDT_STATE, async (data, sender) => {
-    requestingState = false
-    elapsedTimeSinceRequest = 0
-    if (isServerAtom.getOrNull() || sender !== AUTH_SERVER_PEER_ID) return
+  binaryMessageBus.on(CommsMessage.RES_CRDT_STATE, (value) => {
+    const { sender, data } = decodeCRDTState(value)
+    if (sender !== myProfile.userId) return
     DEBUG_NETWORK_MESSAGES() && console.log('[Processing CRDT State]', data.byteLength / 1024, 'KB')
-    transport.onmessage!(serverValidator.processClientMessages(data, sender))
+    transport.onmessage!(data)
     stateIsSyncronized = true
+  })
+
+  // Answer to REQ_CRDT_STATE
+  binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, async (_, userId) => {
+    DEBUG_NETWORK_MESSAGES() && console.log(`Sending CRDT State to: ${userId}`)
 
-    // IMPORTANT: Only mark room as ready AFTER state is synchronized
-    // This ensures comms is truly connected and working
-    const realmInfo = RealmInfo.getOrNull(engine.RootEntity)
-    if (realmInfo && checkRoomReady(realmInfo)) {
-      DEBUG_NETWORK_MESSAGES() && console.log('[isRoomReady] Marking room as ready after state sync')
-      isRoomReadyAtom.swap(true)
+    for (const chunk of engineToCrdt(engine)) {
+      binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, chunk), [userId])
     }
   })
 
-  // received message from the network
-  binaryMessageBus.on(CommsMessage.CRDT, (value, sender) => {
-    const isServer = isServerAtom.getOrNull()
+  // Process CRDT messages here
+  binaryMessageBus.on(CommsMessage.CRDT, (value) => {
     DEBUG_NETWORK_MESSAGES() &&
-      console.log(
-        transport.type,
-        ...Array.from(serializeCrdtMessages('[NetworkMessage received]:', value, engine)),
-        isServer
-      )
-    if (isServer) {
-      transport.onmessage!(serverValidator.processServerMessages(value, sender))
-    } else if (sender === AUTH_SERVER_PEER_ID) {
-      // Process network messages from server and convert to regular messages
-      transport.onmessage!(serverValidator.processClientMessages(value, sender))
-    }
+      console.log(Array.from(serializeCrdtMessages('[NetworkMessage received]:', value, engine)))
+    transport.onmessage!(value)
   })
 
-  // received authoritative message from server - force apply to fix invalid local state
-  binaryMessageBus.on(CommsMessage.CRDT_AUTHORITATIVE, (value, sender) => {
-    // Only accept authoritative messages from authoritative server
-    if (sender !== AUTH_SERVER_PEER_ID) return
-
-    // DEBUG_NETWORK_MESSAGES() &&
-    console.log('[AUTHORITATIVE] Received authoritative message from server:', value.byteLength, 'bytes')
+  async function requestState(retryCount: number = 1) {
+    let players = Array.from(engine.getEntitiesWith(PlayerIdentityData))
+    DEBUG_NETWORK_MESSAGES() && console.log(`Requesting state. Players connected: ${players.length - 1}`)
 
-    // Process authoritative messages by forcing them through normal CRDT processing
-    // but with a timestamp that's guaranteed to be accepted
-    const authoritativeBuffer = serverValidator.processClientMessages(value, sender, true)
-    if (authoritativeBuffer.byteLength > 0) {
-      // Apply authoritative message through normal transport, but the server's messages
-      // should be processed as authoritative with special timestamp handling
-      transport.onmessage!(authoritativeBuffer)
-
-      DEBUG_NETWORK_MESSAGES() && console.log('[AUTHORITATIVE] Applied server authoritative message to local state')
+    if (!RealmInfo.getOrNull(engine.RootEntity)?.isConnectedSceneRoom) {
+      DEBUG_NETWORK_MESSAGES() && console.log(`Aborting Requesting state?. Disconnected`)
+      return
     }
-  })
 
-  players.onEnterScene((player) => {
-    DEBUG_NETWORK_MESSAGES() && console.log('[onEnterScene]', player.userId)
-    if (!isServerAtom.getOrNull() && myProfile.userId === player.userId) {
-      requestState()
-    }
-  })
+    binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, new Uint8Array())
 
-  // Helper to check room ready conditions
-  function checkRoomReady(realmInfo: ReturnType<typeof RealmInfo.getOrNull>): boolean {
-    if (!realmInfo) return false
+    // Wait ~5s for the response.
+    await sleep(5000)
 
-    try {
-      // Check if room instance exists
-      if (!eventBus) return false
+    players = Array.from(engine.getEntitiesWith(PlayerIdentityData))
 
-      return !!(realmInfo.commsAdapter && realmInfo.isConnectedSceneRoom && realmInfo.room)
-    } catch {
-      return false
+    if (!stateIsSyncronized) {
+      if (players.length > 1 && retryCount <= 2) {
+        DEBUG_NETWORK_MESSAGES() &&
+          console.log(`Requesting state again ${retryCount} (no response). Players connected: ${players.length - 1}`)
+        void requestState(retryCount + 1)
+      } else {
+        DEBUG_NETWORK_MESSAGES() && console.log('No active players. State syncronized')
+        stateIsSyncronized = true
+      }
     }
   }
 
+  players.onEnterScene((player) => {
+    DEBUG_NETWORK_MESSAGES() && console.log('[onEnterScene]', player.userId)
+  })
+
   // Asks for the REQ_CRDT_STATE when its connected to comms
   RealmInfo.onChange(engine.RootEntity, (value) => {
-    const isServer = isServerAtom.getOrNull()
-
     if (!value?.isConnectedSceneRoom) {
-      // Only react when actually transitioning from ready to not ready
-      if (isRoomReadyAtom.getOrNull() === true) {
-        DEBUG_NETWORK_MESSAGES() && console.log('Disconnected from comms')
-        isRoomReadyAtom.swap(false)
-        if (!isServer) {
-          stateIsSyncronized = false
-        }
-      }
+      DEBUG_NETWORK_MESSAGES() && console.log('Disconnected from comms')
+      stateIsSyncronized = false
     }
 
     if (value?.isConnectedSceneRoom) {
-      requestState()
-
-      // For servers, mark as ready immediately when connected
-      // (servers don't need to sync state from anyone)
-      if (isServer && checkRoomReady(value) && isRoomReadyAtom.getOrNull() === false) {
-        DEBUG_NETWORK_MESSAGES() && console.log('[isRoomReady] Server marking room as ready')
-        isRoomReadyAtom.swap(true)
-      }
-      // For clients, room will be marked ready after receiving CRDT state (above)
+      DEBUG_NETWORK_MESSAGES() && console.log('Connected to comms')
     }
-  })
 
-  let requestingState = false
-  let elapsedTimeSinceRequest = 0
-  const STATE_REQUEST_RETRY_INTERVAL = 2.0 // seconds
-
-  /**
-   * Why we have to request the state if we have a server that can send us the state when we joined?
-   * The thing is that when the server detects a new JOIN_PARTICIPANT on livekit room, it sends automatically the state to that peer.
-   * But in unity, it takes more time, so that message is not being delivered to the client.
-   * So instead, when we are finally connected to the room, we request the state, and then the server answers with the state :)
-   *
-   * If no response is received within 2 seconds, the request is automatically retried.
-   */
-  function requestState() {
-    if (isServerAtom.getOrNull()) return
-    if (RealmInfo.getOrNull(engine.RootEntity)?.isConnectedSceneRoom && !requestingState) {
-      requestingState = true
-      elapsedTimeSinceRequest = 0
-      DEBUG_NETWORK_MESSAGES() && console.log('Requesting state...')
-      binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, new Uint8Array())
-    }
-  }
-
-  // System to retry state request if no response is received within the retry interval
-  engine.addSystem((dt: number) => {
-    if (requestingState && !stateIsSyncronized) {
-      elapsedTimeSinceRequest += dt
-      if (elapsedTimeSinceRequest >= STATE_REQUEST_RETRY_INTERVAL) {
-        DEBUG_NETWORK_MESSAGES() && console.log('State request timed out, retrying...')
-        elapsedTimeSinceRequest = 0
-        requestingState = false
-        requestState()
-      }
+    if (value?.isConnectedSceneRoom && !stateIsSyncronized) {
+      void requestState()
     }
   })
 
@@ -267,12 +153,56 @@ export function addSyncTransport(
     return stateIsSyncronized
   }
 
+  function sleep(ms: number) {
+    return new Promise<void>((resolve) => {
+      let timer = 0
+      function sleepSystem(dt: number) {
+        timer += dt
+        if (timer * 1000 >= ms) {
+          engine.removeSystem(sleepSystem)
+          resolve()
+        }
+      }
+      engine.addSystem(sleepSystem)
+    })
+  }
+
   return {
     ...entityDefinitions,
     myProfile,
-    isStateSyncronized,
-    binaryMessageBus,
-    eventBus,
-    isRoomReadyAtom
+    isStateSyncronized
   }
 }
+
+/**
+ * Messages Protocol Encoding
+ *
+ * CRDT: Plain Uint8Array
+ *
+ * CRDT_STATE_RES { sender: string, data: Uint8Array}
+ */
+function decodeCRDTState(data: Uint8Array) {
+  let offset = 0
+  const r = new Uint8Array(data)
+  const view = new DataView(r.buffer)
+  const senderLength = view.getUint8(offset)
+  offset += 1
+  const sender = decodeString(data.subarray(1, senderLength + 1))
+  offset += senderLength
+  const state = r.subarray(offset)
+
+  return { sender, data: state }
+}
+
+function encodeCRDTState(address: string, data: Uint8Array) {
+  // address to uint8array
+  const addressBuffer = encodeString(address)
+  const addressOffset = 1
+  const messageLength = addressOffset + addressBuffer.byteLength + data.byteLength
+
+  const serializedMessage = new Uint8Array(messageLength)
+  serializedMessage.set(new Uint8Array([addressBuffer.byteLength]), 0)
+  serializedMessage.set(addressBuffer, 1)
+  serializedMessage.set(data, addressBuffer.byteLength + 1)
+  return serializedMessage
+}

package/src/network/state.ts

@@ -25,7 +25,7 @@ import {
   UiTransform,
   ComponentDefinition
 } from '@dcl/ecs'
-import { LIVEKIT_MAX_SIZE } from './server'
+import { LIVEKIT_MAX_SIZE } from '@dcl/ecs/dist/systems/crdt'
 
 export const NOT_SYNC_COMPONENTS: ComponentDefinition<unknown>[] = [
   VideoEvent,
@@ -72,9 +72,9 @@ export function engineToCrdt(engine: IEngine): Uint8Array[] {
     if (!shouldSyncComponent(itComponentDefinition)) {
       continue
     }
-
     itComponentDefinition.dumpCrdtStateToBuffer(crdtBuffer, (entity) => {
-      return NetworkEntity.has(entity)
+      const isNetworkEntity = NetworkEntity.has(entity)
+      return isNetworkEntity
     })
   }
 
@@ -96,6 +96,7 @@ export function engineToCrdt(engine: IEngine): Uint8Array[] {
         }
 
         // If the message itself is larger than the limit, we need to handle it specially
+        // For now, we'll skip it to prevent infinite loops
         if (messageSize / 1024 > LIVEKIT_MAX_SIZE) {
           console.error(
             `Message too large (${messageSize} bytes), skipping component ${message.componentId} for entity ${message.entityId}`

package/atom.d.ts

@@ -1,19 +0,0 @@
-declare class SimpleObservable<T> {
-    private observers;
-    private onceObservers;
-    add(callback: (value: T) => void): (value: T) => void;
-    addOnce(callback: (value: T) => void): void;
-    remove(callback: (value: T) => void): void;
-    notifyObservers(value: T): void;
-}
-declare const EMPTY: unique symbol;
-type EMPTY = typeof EMPTY;
-export type Atom<T> = {
-    deref(): Promise<T>;
-    getOrNull(): T | null;
-    observable: SimpleObservable<T>;
-    swap(value: T): T | void;
-    pipe(fn: (value: T) => void | Promise<void>): Promise<void>;
-};
-export declare function Atom<T>(initialValue?: T | EMPTY): Atom<T>;
-export {};