@dcl/ecs 7.28.1-34901226656.commit-44656ea → 7.28.1-34955459026.commit-7db2d46

package/dist/systems/crdt/index.js

@@ -1,24 +1,17 @@
 import { EntityState } from '../../engine/entity';
 import { ReadWriteByteBuffer } from '../../serialization/ByteBuffer';
-import { AppendValueOperation, CrdtMessageProtocol, DeleteComponentNetwork, DeleteEntityNetwork } from '../../serialization/crdt';
+import { AppendValueOperation, CrdtMessageProtocol } from '../../serialization/crdt';
 import { DeleteComponent } from '../../serialization/crdt/deleteComponent';
 import { DeleteEntity } from '../../serialization/crdt/deleteEntity';
 import { PutComponentOperation } from '../../serialization/crdt/putComponent';
+import { AuthoritativePutComponentOperation } from '../../serialization/crdt/authoritativePutComponent';
 import { CrdtMessageType } from '../../serialization/crdt/types';
-import { PutNetworkComponentOperation } from '../../serialization/crdt/network/putComponentNetwork';
-import { NetworkEntity as defineNetworkEntity, NetworkParent as defineNetworkParent, Transform as defineTransform } from '../../components';
-import * as networkUtils from '../../serialization/crdt/network/utils';
-// NetworkMessages can only have a MAX_SIZE of 12kb. So we need to send it in chunks.
-export const LIVEKIT_MAX_SIZE = 12;
 /**
  * @internal
  */
 export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
     const transports = [];
-    // Components that we used on this system
-    const NetworkEntity = defineNetworkEntity(engine);
-    const NetworkParent = defineNetworkParent(engine);
-    const Transform = defineTransform(engine);
+    // No network components needed - pure CRDT processing only
     // Messages that we received at transport.onMessage waiting to be processed
     const receivedMessages = [];
     // Messages already processed by the engine but that we need to broadcast to other transports.
@@ -43,27 +36,20 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
                 if (header.type === CrdtMessageType.DELETE_COMPONENT) {
                     message = DeleteComponent.read(buffer);
                 }
-                else if (header.type === CrdtMessageType.DELETE_COMPONENT_NETWORK) {
-                    message = DeleteComponentNetwork.read(buffer);
-                }
                 else if (header.type === CrdtMessageType.PUT_COMPONENT) {
                     message = PutComponentOperation.read(buffer);
                 }
-                else if (header.type === CrdtMessageType.PUT_COMPONENT_NETWORK) {
-                    message = PutNetworkComponentOperation.read(buffer);
+                else if (header.type === CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT) {
+                    message = AuthoritativePutComponentOperation.read(buffer);
                 }
                 else if (header.type === CrdtMessageType.DELETE_ENTITY) {
                     message = DeleteEntity.read(buffer);
                 }
-                else if (header.type === CrdtMessageType.DELETE_ENTITY_NETWORK) {
-                    message = DeleteEntityNetwork.read(buffer);
-                }
                 else if (header.type === CrdtMessageType.APPEND_VALUE) {
                     message = AppendValueOperation.read(buffer);
-                    // Unknown message, we skip it
                 }
                 else {
-                    // consume the message
+                    // Unknown message, we skip it (including NETWORK messages)
                     buffer.incrementReadOffset(header.length);
                 }
                 if (message) {
@@ -85,20 +71,12 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
         return messagesToProcess;
     }
     /**
-     * Find the local entityId associated to the network component message.
-     * It's a mapping Network -> to Local
-     * If it's not a network message, return the entityId received by the message
+     * Reserved-range entities (root/player/camera + avatars, entity number <
+     * RESERVED_STATIC_ENTITIES) are host-owned: only a transport flagged with
+     * `allowReservedEntities` (the host/renderer) may mutate or delete them.
      */
-    function findNetworkId(msg) {
-        const hasNetworkId = 'networkId' in msg;
-        if (hasNetworkId) {
-            for (const [entityId, network] of engine.getEntitiesWith(NetworkEntity)) {
-                if (network.networkId === msg.networkId && network.entityId === msg.entityId) {
-                    return { entityId, network };
-                }
-            }
-        }
-        return { entityId: msg.entityId };
+    function isTrustedForReservedEntities(transportId) {
+        return transportId !== undefined && !!transports[transportId]?.allowReservedEntities;
     }
     /**
      * This fn will be called on every tick.
@@ -108,46 +86,68 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
         const messagesToProcess = getMessages(receivedMessages);
         const entitiesShouldBeCleaned = [];
         for (const msg of messagesToProcess) {
-            let { entityId, network } = findNetworkId(msg);
-            // We receive a new Entity. Create the localEntity and map it to the NetworkEntity component
-            if (networkUtils.isNetworkMessage(msg) && !network) {
-                entityId = engine.addEntity();
-                network = { entityId: msg.entityId, networkId: msg.networkId };
-                NetworkEntity.createOrReplace(entityId, network);
-            }
-            if (msg.type === CrdtMessageType.DELETE_ENTITY || msg.type === CrdtMessageType.DELETE_ENTITY_NETWORK) {
-                entitiesShouldBeCleaned.push(entityId);
+            // Simple CRDT processing - no network logic
+            if (msg.type === CrdtMessageType.DELETE_ENTITY) {
+                // Reject an inbound DELETE_ENTITY on a reserved entity from an untrusted
+                // transport (a comms peer, or a scene-added transport). The allocator half
+                // is already guarded (engine.removeEntity is a no-op on this range); this
+                // closes the receive-side half.
+                const isReserved = engine.entityContainer.getEntityState(msg.entityId) === EntityState.Reserved;
+                if (isReserved && !isTrustedForReservedEntities(msg.transportId)) {
+                    continue;
+                }
+                entitiesShouldBeCleaned.push(msg.entityId);
                 broadcastMessages.push(msg);
             }
             else {
-                const entityState = engine.entityContainer.getEntityState(entityId);
-                // Skip updates from removed entityes
+                const entityState = engine.entityContainer.getEntityState(msg.entityId);
+                // Skip updates from removed entities
                 if (entityState === EntityState.Removed)
                     continue;
-                // Entities with unknown entities should update its entity state
+                // Reject component operations (PUT/DELETE/APPEND, including AUTHORITATIVE_PUT
+                // which bypasses timestamps entirely) on reserved entities from untrusted
+                // transports. Dropping before updateFromCrdt keeps local LWW timestamps
+                // unpoisoned by forged high timestamps, and also prevents the
+                // unknown-component rebroadcast below from relaying forged reserved-entity
+                // data to other transports (including the renderer).
+                if (entityState === EntityState.Reserved && !isTrustedForReservedEntities(msg.transportId))
+                    continue;
+                // Entities with unknown state should update its entity state
                 if (entityState === EntityState.Unknown) {
-                    engine.entityContainer.updateUsedEntity(entityId);
-                }
-                const component = engine.getComponentOrNull(msg.componentId);
-                /* istanbul ignore else */
-                if (component) {
-                    if (msg.type === CrdtMessageType.PUT_COMPONENT &&
-                        component.componentId === Transform.componentId &&
-                        NetworkEntity.has(entityId) &&
-                        NetworkParent.has(entityId)) {
-                        msg.data = networkUtils.fixTransformParent(msg);
+                    engine.entityContainer.updateUsedEntity(msg.entityId);
+                }
+                // Only process component-related messages (not DELETE_ENTITY)
+                if ('componentId' in msg) {
+                    const component = engine.getComponentOrNull(msg.componentId);
+                    if (component) {
+                        // Handle authoritative messages differently - they force the state regardless of timestamp
+                        const tryUpdate = () => {
+                            try {
+                                return msg.type === CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT
+                                    ? component.__forceUpdateFromCrdt(msg)
+                                    : component.updateFromCrdt(msg);
+                            }
+                            catch (e) {
+                                console.error('[receiveMessages] ERROR processing message', msg, e);
+                                return null;
+                            }
+                        };
+                        const result = tryUpdate();
+                        if (!result)
+                            continue;
+                        const [conflictMessage, value] = result;
+                        if (!conflictMessage) {
+                            // Add message to broadcast queue when no conflict
+                            broadcastMessages.push(msg);
+                            onProcessEntityComponentChange && onProcessEntityComponentChange(msg.entityId, msg.type, component, value);
+                        }
                     }
-                    const [conflictMessage, value] = component.updateFromCrdt({ ...msg, entityId });
-                    if (!conflictMessage) {
-                        // Add message to transport queue to be processed by others transports
+                    else {
+                        // Component not found - still broadcast for editor compatibility
+                        /* istanbul ignore next */
                         broadcastMessages.push(msg);
-                        onProcessEntityComponentChange && onProcessEntityComponentChange(entityId, msg.type, component, value);
                     }
                 }
-                else {
-                    // TODO: test this line, it is fundammental to make the editor work
-                    broadcastMessages.push(msg);
-                }
             }
         }
         // the last stage of the syncrhonization is to delete the entities
@@ -161,16 +161,17 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
         }
     }
     /**
-     * Iterates the dirty map and generates crdt messages to be send
+     * Simple CRDT message broadcasting - no network-specific logic
      */
     async function sendMessages(entitiesDeletedThisTick) {
-        // CRDT Messages will be the merge between the recieved transport messages and the new crdt messages
+        // Get messages from broadcast queue and component updates
         const crdtMessages = getMessages(broadcastMessages);
         const buffer = new ReadWriteByteBuffer();
+        // Generate CRDT messages from component updates
         for (const component of engine.componentsIter()) {
             for (const message of component.getCrdtUpdates()) {
                 const offset = buffer.currentWriteOffset();
-                // Avoid creating messages if there is no transport that will handle it
+                // Only create messages if there's a transport that will handle it
                 if (transports.some((t) => t.filter(message))) {
                     if (message.type === CrdtMessageType.PUT_COMPONENT) {
                         PutComponentOperation.write(message.entityId, message.timestamp, message.componentId, message.data, buffer);
@@ -194,7 +195,7 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
                 }
             }
         }
-        // After all updates, I execute the DeletedEntity messages
+        // Handle deleted entities
         for (const entityId of entitiesDeletedThisTick) {
             const offset = buffer.currentWriteOffset();
             DeleteEntity.write(entityId, buffer);
@@ -205,87 +206,19 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
             });
             onProcessEntityComponentChange && onProcessEntityComponentChange(entityId, CrdtMessageType.DELETE_ENTITY);
         }
-        // Send CRDT messages to transports
-        const transportBuffer = new ReadWriteByteBuffer();
-        for (const index in transports) {
-            const __NetworkMessagesBuffer = [];
-            const transportIndex = Number(index);
-            const transport = transports[transportIndex];
-            const isRendererTransport = transport.type === 'renderer';
-            const isNetworkTransport = transport.type === 'network';
-            // Reset Buffer for each Transport
-            transportBuffer.resetBuffer();
-            const buffer = new ReadWriteByteBuffer();
-            // Then we send all the new crdtMessages that the transport needs to process
+        // Simple transport broadcasting - no network-specific transforms
+        for (const transport of transports) {
+            const transportBuffer = new ReadWriteByteBuffer();
             for (const message of crdtMessages) {
                 // Avoid echo messages
-                if (message.transportId === transportIndex)
+                if (message.transportId === transports.indexOf(transport))
                     continue;
-                // Redundant message for the transport
-                if (!transport.filter(message))
-                    continue;
-                // Check if adding this message would exceed the size limit
-                const currentBufferSize = transportBuffer.toBinary().byteLength;
-                const messageSize = message.messageBuffer.byteLength;
-                if (isNetworkTransport && (currentBufferSize + messageSize) / 1024 > LIVEKIT_MAX_SIZE) {
-                    // If the current buffer has content, save it as a chunk
-                    if (currentBufferSize > 0) {
-                        __NetworkMessagesBuffer.push(transportBuffer.toCopiedBinary());
-                        transportBuffer.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 message for entity ${message.entityId}`);
-                        continue;
-                    }
+                // Check if transport wants this message
+                if (transport.filter(message)) {
+                    transportBuffer.writeBuffer(message.messageBuffer, false);
                 }
-                const { entityId } = findNetworkId(message);
-                const transformNeedsFix = 'componentId' in message &&
-                    message.componentId === Transform.componentId &&
-                    Transform.has(entityId) &&
-                    NetworkParent.has(entityId) &&
-                    NetworkEntity.has(entityId);
-                // If there was a LOCAL change in the transform. Add the parent to that transform
-                if (isRendererTransport && message.type === CrdtMessageType.PUT_COMPONENT && transformNeedsFix) {
-                    const parent = findNetworkId(NetworkParent.get(entityId));
-                    const transformData = networkUtils.fixTransformParent(message, Transform.get(entityId), parent.entityId);
-                    const offset = buffer.currentWriteOffset();
-                    PutComponentOperation.write(entityId, message.timestamp, message.componentId, transformData, buffer);
-                    transportBuffer.writeBuffer(buffer.buffer().subarray(offset, buffer.currentWriteOffset()), false);
-                    continue;
-                }
-                if (isRendererTransport && networkUtils.isNetworkMessage(message)) {
-                    // If it's the renderer transport and its a NetworkMessage, we need to fix the entityId field and convert it to a known Message.
-                    // PUT_NETWORK_COMPONENT -> PUT_COMPONENT
-                    let transformData = 'data' in message ? message.data : new Uint8Array();
-                    if (transformNeedsFix) {
-                        const parent = findNetworkId(NetworkParent.get(entityId));
-                        transformData = networkUtils.fixTransformParent(message, Transform.get(entityId), parent.entityId);
-                    }
-                    networkUtils.networkMessageToLocal({ ...message, data: transformData }, entityId, buffer, transportBuffer);
-                    // Iterate the next message
-                    continue;
-                }
-                // If its a network transport and its a PUT_COMPONENT that has a NetworkEntity component, we need to send this message
-                // through comms with the EntityID and NetworkID from ther NetworkEntity so everyone can recieve this message and map to their custom entityID.
-                if (isNetworkTransport && !networkUtils.isNetworkMessage(message)) {
-                    const networkData = NetworkEntity.getOrNull(message.entityId);
-                    // If it has networkData convert the message to PUT_NETWORK_COMPONENT.
-                    if (networkData) {
-                        networkUtils.localMessageToNetwork(message, networkData, buffer, transportBuffer);
-                        // Iterate the next message
-                        continue;
-                    }
-                }
-                // Common message
-                transportBuffer.writeBuffer(message.messageBuffer, false);
-            }
-            if (isNetworkTransport && transportBuffer.currentWriteOffset()) {
-                __NetworkMessagesBuffer.push(transportBuffer.toBinary());
             }
-            const message = isNetworkTransport ? __NetworkMessagesBuffer : transportBuffer.toBinary();
-            await transport.send(message);
+            await transport.send(transportBuffer.toBinary());
         }
     }
     /**

package/dist/systems/crdt/types.d.ts

@@ -29,4 +29,14 @@ export type Transport = {
     onmessage?(message: Uint8Array): void;
     filter(message: Omit<TransportMessage, 'messageBuffer'>): boolean;
     type?: string;
+    /**
+     * Whether this transport is allowed to mutate reserved-range entities
+     * (root/player/camera + avatars, entity number below `RESERVED_STATIC_ENTITIES`).
+     * Only the trusted host/renderer transport sets this. An inbound DELETE_ENTITY
+     * or component operation (PUT_COMPONENT, DELETE_COMPONENT, APPEND_VALUE,
+     * AUTHORITATIVE_PUT_COMPONENT) on a reserved entity from a transport without
+     * this flag (a comms peer, or any scene-added transport) is rejected — see
+     * `receiveMessages`.
+     */
+    allowReservedEntities?: boolean;
 };

package/dist/systems/cyclicParentingChecker.js

@@ -16,17 +16,22 @@ import * as components from '../components';
  */
 export function cyclicParentingChecker(engine) {
     const Transform = components.Transform(engine);
+    // Reused by every walk: the checker is synchronous, so only one is ever in
+    // flight. A cycle anywhere above the entity has to end the walk, not only one
+    // the entity is part of, otherwise the ancestors repeat forever.
+    const visited = new Set();
     return () => {
         for (const entity of Transform.dirtyIterator()) {
+            visited.clear();
+            visited.add(entity);
             let transform = Transform.getOrNull(entity);
             while (transform && transform.parent) {
-                if (transform.parent === entity) {
+                if (visited.has(transform.parent)) {
                     console.error(`There is a cyclic parent with entity ${entity}`);
                     break;
                 }
-                else {
-                    transform = Transform.getOrNull(transform.parent);
-                }
+                visited.add(transform.parent);
+                transform = Transform.getOrNull(transform.parent);
             }
         }
     };

package/dist/systems/events.d.ts

@@ -50,24 +50,6 @@ export interface PointerEventsSystem {
      * @param entity - Entity where the callback was attached
      */
     removeOnPointerHoverLeave(entity: Entity): void;
-    /**
-     * @public
-     * Remove the callback for onPointerDrag event
-     * @param entity - Entity where the callback was attached
-     */
-    removeOnPointerDrag(entity: Entity): void;
-    /**
-     * @public
-     * Remove the callback for onPointerDragLocked event
-     * @param entity - Entity where the callback was attached
-     */
-    removeOnPointerDragLocked(entity: Entity): void;
-    /**
-     * @public
-     * Remove the callback for onPointerDragEnd event
-     * @param entity - Entity where the callback was attached
-     */
-    removeOnPointerDragEnd(entity: Entity): void;
     /**
      * @public
      * Remove the callback for onProximityDown event
@@ -146,36 +128,6 @@ export interface PointerEventsSystem {
         entity: Entity;
         opts?: Partial<EventSystemOptions>;
     }, cb: EventSystemCallback): void;
-    /**
-     * @public
-     * Execute callback while the user holds the button pressed and moves the pointer, having pressed it on the entity
-     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
-     * @param cb - Function to execute on every drag update
-     */
-    onPointerDrag(pointerData: {
-        entity: Entity;
-        opts?: Partial<EventSystemOptions>;
-    }, cb: EventSystemCallback): void;
-    /**
-     * @public
-     * Same as onPointerDrag, but the cursor is locked in place for the duration of the drag
-     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
-     * @param cb - Function to execute on every drag update
-     */
-    onPointerDragLocked(pointerData: {
-        entity: Entity;
-        opts?: Partial<EventSystemOptions>;
-    }, cb: EventSystemCallback): void;
-    /**
-     * @public
-     * Execute callback when the user releases the button after a drag that started on the entity
-     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
-     * @param cb - Function to execute when the drag ends
-     */
-    onPointerDragEnd(pointerData: {
-        entity: Entity;
-        opts?: Partial<EventSystemOptions>;
-    }, cb: EventSystemCallback): void;
     /**
      * @public
      * Execute callback when the user presses the proximity button on the entity