@dcl/ecs 7.24.4-28553021180.commit-e8ab68c → 7.24.4-28592331167.commit-697ce9e

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) {
@@ -84,22 +70,6 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
         const messagesToProcess = value.splice(0, value.length);
         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
-     */
-    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 };
-    }
     /**
      * This fn will be called on every tick.
      * Process all the messages queue received by the transport
@@ -108,46 +78,52 @@ 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) {
+                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
+                // 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 +137,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 +171,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 +182,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/triggerArea.js

@@ -177,7 +177,8 @@ export function createTriggerAreaEventsSystem(engine) {
             // Pass 2: synthesize per-tick onStay callbacks
             // -----------------------------------------------------------------------
             // Only run if an onStay callback is registered and there are tracked triggerers.
-            if (data.triggerCallbackMap.has(1 /* TriggerAreaEventType.TAET_STAY */) && data.insideTriggerers.size > 0) {
+            if (data.triggerCallbackMap.has(1 /* TriggerAreaEventType.TAET_STAY */) &&
+                data.insideTriggerers.size > 0) {
                 const onStay = data.triggerCallbackMap.get(1 /* TriggerAreaEventType.TAET_STAY */);
                 const currentTimestamp = Date.now();
                 for (const [triggererEntity, cachedResult] of data.insideTriggerers) {

package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_modifier_area.gen.d.ts

@@ -8,9 +8,7 @@ export declare const enum AvatarModifierType {
     /** AMT_HIDE_AVATARS - avatars are invisible */
     AMT_HIDE_AVATARS = 0,
     /** AMT_DISABLE_PASSPORTS - selecting (e.g. clicking) an avatar will not bring up their profile. */
-    AMT_DISABLE_PASSPORTS = 1,
-    /** AMT_HIDE_NAMETAGS - the name tag displayed above an avatar is hidden. */
-    AMT_HIDE_NAMETAGS = 2
+    AMT_DISABLE_PASSPORTS = 1
 }
 /**
  * The AvatarModifierArea component can be attached to an Entity to define a region of space where

package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_modifier_area.gen.js

@@ -18,8 +18,6 @@ var AvatarModifierType;
     AvatarModifierType[AvatarModifierType["AMT_HIDE_AVATARS"] = 0] = "AMT_HIDE_AVATARS";
     /** AMT_DISABLE_PASSPORTS - selecting (e.g. clicking) an avatar will not bring up their profile. */
     AvatarModifierType[AvatarModifierType["AMT_DISABLE_PASSPORTS"] = 1] = "AMT_DISABLE_PASSPORTS";
-    /** AMT_HIDE_NAMETAGS - the name tag displayed above an avatar is hidden. */
-    AvatarModifierType[AvatarModifierType["AMT_HIDE_NAMETAGS"] = 2] = "AMT_HIDE_NAMETAGS";
 })(AvatarModifierType = exports.AvatarModifierType || (exports.AvatarModifierType = {}));
 function createBasePBAvatarModifierArea() {
     return { area: undefined, excludeIds: [], modifiers: [] };

package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.d.ts

@@ -1,13 +1,5 @@
 import _m0 from "protobufjs/minimal";
 import { Color3 } from "../../common/colors.gen";
-/** Mask for which bones an animation applies to. */
-/**
- * @public
- */
-export declare const enum AvatarEmoteMask {
-    AEM_FULL_BODY = 0,
-    AEM_UPPER_BODY = 1
-}
 /**
  * The AvatarShape component contains the information required to draw and animate avatar, acting as
  * a simplified GLTF container for this specific case.

package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.js

@@ -3,21 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PBAvatarShape = exports.AvatarEmoteMask = void 0;
+exports.PBAvatarShape = void 0;
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
 const colors_gen_1 = require("../../common/colors.gen");
 const protobufPackageSarasa = "decentraland.sdk.components";
-/** Mask for which bones an animation applies to. */
-/**
- * @public
- */
-var AvatarEmoteMask;
-(function (AvatarEmoteMask) {
-    AvatarEmoteMask[AvatarEmoteMask["AEM_FULL_BODY"] = 0] = "AEM_FULL_BODY";
-    AvatarEmoteMask[AvatarEmoteMask["AEM_UPPER_BODY"] = 1] = "AEM_UPPER_BODY";
-})(AvatarEmoteMask = exports.AvatarEmoteMask || (exports.AvatarEmoteMask = {}));
 function createBasePBAvatarShape() {
     return {
         id: "",

package/dist-cjs/components/generated/pb/decentraland/sdk/components/virtual_camera.gen.d.ts

@@ -6,7 +6,6 @@ import { CameraTransition } from "./common/camera_transition.gen";
  * an 'instant' transition (like using speed/time = 0)
  * * The lookAtEntity defines to which entity the Camera has to look at constantly (independent from
  * the holding entity transform).
- * * The fov defines the Field of View of the virtual camera
  */
 /**
  * @public
@@ -14,8 +13,6 @@ import { CameraTransition } from "./common/camera_transition.gen";
 export interface PBVirtualCamera {
     defaultTransition?: CameraTransition | undefined;
     lookAtEntity?: number | undefined;
-    /** default: 60 */
-    fov?: number | undefined;
 }
 /**
  * @public

package/dist-cjs/components/generated/pb/decentraland/sdk/components/virtual_camera.gen.js

@@ -9,7 +9,7 @@ const minimal_1 = __importDefault(require("protobufjs/minimal"));
 const camera_transition_gen_1 = require("./common/camera_transition.gen");
 const protobufPackageSarasa = "decentraland.sdk.components";
 function createBasePBVirtualCamera() {
-    return { defaultTransition: undefined, lookAtEntity: undefined, fov: undefined };
+    return { defaultTransition: undefined, lookAtEntity: undefined };
 }
 /**
  * @public
@@ -23,9 +23,6 @@ var PBVirtualCamera;
         if (message.lookAtEntity !== undefined) {
             writer.uint32(16).uint32(message.lookAtEntity);
         }
-        if (message.fov !== undefined) {
-            writer.uint32(29).float(message.fov);
-        }
         return writer;
     }
     PBVirtualCamera.encode = encode;
@@ -48,12 +45,6 @@ var PBVirtualCamera;
                     }
                     message.lookAtEntity = reader.uint32();
                     continue;
-                case 3:
-                    if (tag !== 29) {
-                        break;
-                    }
-                    message.fov = reader.float();
-                    continue;
             }
             if ((tag & 7) === 4 || tag === 0) {
                 break;