@dcl/ecs 7.28.0 → 7.28.1-34624845556.commit-7d0808b

package/dist-cjs/systems/crdt/index.js

@@ -1,50 +1,20 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.crdtSceneSystem = exports.LIVEKIT_MAX_SIZE = void 0;
+exports.crdtSceneSystem = void 0;
 const entity_1 = require("../../engine/entity");
 const ByteBuffer_1 = require("../../serialization/ByteBuffer");
 const crdt_1 = require("../../serialization/crdt");
 const deleteComponent_1 = require("../../serialization/crdt/deleteComponent");
 const deleteEntity_1 = require("../../serialization/crdt/deleteEntity");
 const putComponent_1 = require("../../serialization/crdt/putComponent");
+const authoritativePutComponent_1 = require("../../serialization/crdt/authoritativePutComponent");
 const types_1 = require("../../serialization/crdt/types");
-const putComponentNetwork_1 = require("../../serialization/crdt/network/putComponentNetwork");
-const components_1 = require("../../components");
-const networkUtils = __importStar(require("../../serialization/crdt/network/utils"));
-// NetworkMessages can only have a MAX_SIZE of 12kb. So we need to send it in chunks.
-exports.LIVEKIT_MAX_SIZE = 12;
 /**
  * @internal
  */
 function crdtSceneSystem(engine, onProcessEntityComponentChange) {
     const transports = [];
-    // Components that we used on this system
-    const NetworkEntity = (0, components_1.NetworkEntity)(engine);
-    const NetworkParent = (0, components_1.NetworkParent)(engine);
-    const Transform = (0, components_1.Transform)(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.
@@ -69,27 +39,20 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
                 if (header.type === types_1.CrdtMessageType.DELETE_COMPONENT) {
                     message = deleteComponent_1.DeleteComponent.read(buffer);
                 }
-                else if (header.type === types_1.CrdtMessageType.DELETE_COMPONENT_NETWORK) {
-                    message = crdt_1.DeleteComponentNetwork.read(buffer);
-                }
                 else if (header.type === types_1.CrdtMessageType.PUT_COMPONENT) {
                     message = putComponent_1.PutComponentOperation.read(buffer);
                 }
-                else if (header.type === types_1.CrdtMessageType.PUT_COMPONENT_NETWORK) {
-                    message = putComponentNetwork_1.PutNetworkComponentOperation.read(buffer);
+                else if (header.type === types_1.CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT) {
+                    message = authoritativePutComponent_1.AuthoritativePutComponentOperation.read(buffer);
                 }
                 else if (header.type === types_1.CrdtMessageType.DELETE_ENTITY) {
                     message = deleteEntity_1.DeleteEntity.read(buffer);
                 }
-                else if (header.type === types_1.CrdtMessageType.DELETE_ENTITY_NETWORK) {
-                    message = crdt_1.DeleteEntityNetwork.read(buffer);
-                }
                 else if (header.type === types_1.CrdtMessageType.APPEND_VALUE) {
                     message = crdt_1.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) {
@@ -111,20 +74,12 @@ 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.
@@ -134,46 +89,68 @@ 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 === types_1.CrdtMessageType.DELETE_ENTITY || msg.type === types_1.CrdtMessageType.DELETE_ENTITY_NETWORK) {
-                entitiesShouldBeCleaned.push(entityId);
+            // Simple CRDT processing - no network logic
+            if (msg.type === types_1.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) === entity_1.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 === entity_1.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 === entity_1.EntityState.Reserved && !isTrustedForReservedEntities(msg.transportId))
+                    continue;
+                // Entities with unknown state should update its entity state
                 if (entityState === entity_1.EntityState.Unknown) {
-                    engine.entityContainer.updateUsedEntity(entityId);
-                }
-                const component = engine.getComponentOrNull(msg.componentId);
-                /* istanbul ignore else */
-                if (component) {
-                    if (msg.type === types_1.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 === types_1.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
@@ -187,16 +164,17 @@ 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 ByteBuffer_1.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 === types_1.CrdtMessageType.PUT_COMPONENT) {
                         putComponent_1.PutComponentOperation.write(message.entityId, message.timestamp, message.componentId, message.data, buffer);
@@ -220,7 +198,7 @@ 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_1.DeleteEntity.write(entityId, buffer);
@@ -231,87 +209,19 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
             });
             onProcessEntityComponentChange && onProcessEntityComponentChange(entityId, types_1.CrdtMessageType.DELETE_ENTITY);
         }
-        // Send CRDT messages to transports
-        const transportBuffer = new ByteBuffer_1.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 ByteBuffer_1.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 ByteBuffer_1.ReadWriteByteBuffer();
             for (const message of crdtMessages) {
                 // Avoid echo messages
-                if (message.transportId === transportIndex)
-                    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 > exports.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 > exports.LIVEKIT_MAX_SIZE) {
-                        console.error(`Message too large (${messageSize} bytes), skipping message for entity ${message.entityId}`);
-                        continue;
-                    }
-                }
-                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 === types_1.CrdtMessageType.PUT_COMPONENT && transformNeedsFix) {
-                    const parent = findNetworkId(NetworkParent.get(entityId));
-                    const transformData = networkUtils.fixTransformParent(message, Transform.get(entityId), parent.entityId);
-                    const offset = buffer.currentWriteOffset();
-                    putComponent_1.PutComponentOperation.write(entityId, message.timestamp, message.componentId, transformData, buffer);
-                    transportBuffer.writeBuffer(buffer.buffer().subarray(offset, buffer.currentWriteOffset()), false);
+                if (message.transportId === transports.indexOf(transport))
                     continue;
+                // Check if transport wants this message
+                if (transport.filter(message)) {
+                    transportBuffer.writeBuffer(message.messageBuffer, false);
                 }
-                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-cjs/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-cjs/systems/events.js

@@ -52,6 +52,16 @@ function createPointerEventsSystem(engine, inputSystem) {
     function getEvent(entity) {
         return eventsMap.get(entity) || eventsMap.set(entity, new Map()).get(entity);
     }
+    // A cursor handler and a proximity handler are separate registrations that
+    // produce separate PointerEvents entries, so they need separate slots here
+    // too. Keying on the event type alone made onProximityDown evict whatever
+    // onPointerDown had left.
+    function eventKey(type, interactionType) {
+        return `${type}:${interactionType}`;
+    }
+    function setEvent(entity, type, cb, opts, interactionType = 0 /* InteractionType.CURSOR */) {
+        getEvent(entity).set(eventKey(type, interactionType), { cb, opts, eventType: type });
+    }
     function setPointerEvent(entity, type, opts, interactionType = 0 /* InteractionType.CURSOR */) {
         const pointerEvent = PointerEvents.getMutableOrNull(entity) || PointerEvents.create(entity);
         pointerEvent.pointerEvents.push({
@@ -69,13 +79,27 @@ function createPointerEventsSystem(engine, inputSystem) {
             interactionType: interactionType ?? 0 /* InteractionType.CURSOR */
         });
     }
-    function removePointerEvent(entity, type, button, interactionType = 0 /* InteractionType.CURSOR */) {
+    function removePointerEvent(entity, type, opts, interactionType = 0 /* InteractionType.CURSOR */) {
         const pointerEvent = PointerEvents.getMutableOrNull(entity);
         if (!pointerEvent)
             return;
-        pointerEvent.pointerEvents = pointerEvent.pointerEvents.filter((pointer) => !(pointer.eventInfo?.button === button &&
-            pointer.eventType === type &&
-            pointer.interactionType === interactionType));
+        const sameSlot = (pointer) => pointer.eventType === type && pointer.interactionType === interactionType;
+        // onClick and onPointerDown both describe themselves as PET_DOWN, so the event
+        // type and button alone do not say which registration an entry belongs to. Match
+        // everything the entry was built from, or removing one handler can take the
+        // other's descriptor and leave the renderer advertising the wrong interaction.
+        const index = pointerEvent.pointerEvents.findIndex((pointer) => sameSlot(pointer) &&
+            pointer.eventInfo?.button === opts.button &&
+            pointer.eventInfo?.hoverText === opts.hoverText &&
+            pointer.eventInfo?.showFeedback === opts.showFeedback &&
+            pointer.eventInfo?.showHighlight === opts.showHighlight &&
+            pointer.eventInfo?.maxDistance === opts.maxDistance &&
+            pointer.eventInfo?.maxPlayerDistance === opts.maxPlayerDistance &&
+            pointer.eventInfo?.priority === opts.priority &&
+            pointer.eventInfo?.maxCameraDistance === opts.maxCameraDistance);
+        if (index === -1)
+            return;
+        pointerEvent.pointerEvents.splice(index, 1);
     }
     function getPointerEvent(eventType) {
         if (eventType === EventType.Up) {
@@ -97,11 +121,16 @@ function createPointerEventsSystem(engine, inputSystem) {
     }
     function removeEvent(entity, type, interactionType = 0 /* InteractionType.CURSOR */) {
         const event = getEvent(entity);
-        const pointerEvent = event.get(type);
-        if (pointerEvent?.opts.hoverText) {
-            removePointerEvent(entity, getPointerEvent(type), pointerEvent.opts.button);
+        const key = eventKey(type, interactionType);
+        const pointerEvent = event.get(key);
+        // Every registration adds an entry, not only the ones carrying a hoverText,
+        // so every removal has to take one away. Gating on hoverText left the
+        // renderer showing an interaction whose callback was already gone, and made
+        // re-registering grow the component by one entry each time.
+        if (pointerEvent) {
+            removePointerEvent(entity, getPointerEvent(type), pointerEvent.opts, interactionType);
         }
-        event.delete(type);
+        event.delete(key);
     }
     engine.addSystem(function PointerEventSystem() {
         for (const [entity, event] of eventsMap) {
@@ -109,7 +138,7 @@ function createPointerEventsSystem(engine, inputSystem) {
                 eventsMap.delete(entity);
                 continue;
             }
-            for (const [eventType, { cb, opts }] of event) {
+            for (const [, { cb, opts, eventType }] of event) {
                 if (eventType === EventType.Click) {
                     const command = inputSystem.getClick(opts.button, entity);
                     if (command)
@@ -137,7 +166,7 @@ function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = (0, exports.getDefaultOpts)(opts);
         removeEvent(entity, EventType.Down);
-        getEvent(entity).set(EventType.Down, { cb, opts: options });
+        setEvent(entity, EventType.Down, cb, options);
         setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options);
     };
     const onPointerUp = (...args) => {
@@ -148,7 +177,7 @@ function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = (0, exports.getDefaultOpts)(opts);
         removeEvent(entity, EventType.Up);
-        getEvent(entity).set(EventType.Up, { cb, opts: options });
+        setEvent(entity, EventType.Up, cb, options);
         setPointerEvent(entity, 0 /* PointerEventType.PET_UP */, options);
     };
     const onPointerHoverEnter = (...args) => {
@@ -156,7 +185,7 @@ function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = (0, exports.getDefaultOpts)(opts);
         removeEvent(entity, EventType.HoverEnter);
-        getEvent(entity).set(EventType.HoverEnter, { cb, opts: options });
+        setEvent(entity, EventType.HoverEnter, cb, options);
         setPointerEvent(entity, 2 /* PointerEventType.PET_HOVER_ENTER */, options);
     };
     const onPointerHoverLeave = (...args) => {
@@ -164,7 +193,7 @@ function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = (0, exports.getDefaultOpts)(opts);
         removeEvent(entity, EventType.HoverLeave);
-        getEvent(entity).set(EventType.HoverLeave, { cb, opts: options });
+        setEvent(entity, EventType.HoverLeave, cb, options);
         setPointerEvent(entity, 3 /* PointerEventType.PET_HOVER_LEAVE */, options);
     };
     const onProximityDown = (...args) => {
@@ -172,7 +201,7 @@ function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = (0, exports.getDefaultOpts)(opts);
         removeEvent(entity, EventType.Down, 1 /* InteractionType.PROXIMITY */);
-        getEvent(entity).set(EventType.Down, { cb, opts: options });
+        setEvent(entity, EventType.Down, cb, options, 1 /* InteractionType.PROXIMITY */);
         setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options, 1 /* InteractionType.PROXIMITY */);
     };
     const onProximityUp = (...args) => {
@@ -180,7 +209,7 @@ function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = (0, exports.getDefaultOpts)(opts);
         removeEvent(entity, EventType.Up, 1 /* InteractionType.PROXIMITY */);
-        getEvent(entity).set(EventType.Up, { cb, opts: options });
+        setEvent(entity, EventType.Up, cb, options, 1 /* InteractionType.PROXIMITY */);
         setPointerEvent(entity, 0 /* PointerEventType.PET_UP */, options, 1 /* InteractionType.PROXIMITY */);
     };
     const onProximityEnter = (...args) => {
@@ -188,7 +217,7 @@ function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = (0, exports.getDefaultOpts)(opts);
         removeEvent(entity, EventType.ProximityEnter, 1 /* InteractionType.PROXIMITY */);
-        getEvent(entity).set(EventType.ProximityEnter, { cb, opts: options });
+        setEvent(entity, EventType.ProximityEnter, cb, options, 1 /* InteractionType.PROXIMITY */);
         setPointerEvent(entity, 4 /* PointerEventType.PET_PROXIMITY_ENTER */, options, 1 /* InteractionType.PROXIMITY */);
     };
     const onProximityLeave = (...args) => {
@@ -196,7 +225,7 @@ function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = (0, exports.getDefaultOpts)(opts);
         removeEvent(entity, EventType.ProximityLeave, 1 /* InteractionType.PROXIMITY */);
-        getEvent(entity).set(EventType.ProximityLeave, { cb, opts: options });
+        setEvent(entity, EventType.ProximityLeave, cb, options, 1 /* InteractionType.PROXIMITY */);
         setPointerEvent(entity, 5 /* PointerEventType.PET_PROXIMITY_LEAVE */, options, 1 /* InteractionType.PROXIMITY */);
     };
     return {
@@ -233,7 +262,7 @@ function createPointerEventsSystem(engine, inputSystem) {
             // Clear previous event with over feedback included
             removeEvent(entity, EventType.Click);
             // Set new event
-            getEvent(entity).set(EventType.Click, { cb, opts: options });
+            setEvent(entity, EventType.Click, cb, options);
             setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options);
         },
         onPointerDown,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dcl/ecs",
   "description": "Decentraland ECS",
-  "version": "7.28.0",
+  "version": "7.28.1-34624845556.commit-7d0808b",
   "author": "DCL",
   "bugs": "https://github.com/decentraland/ecs/issues",
   "files": [
@@ -34,5 +34,5 @@
   "dependencies": {},
   "types": "./dist/index.d.ts",
   "typings": "./dist/index.d.ts",
-  "commit": "2a59cb6c6005b4f6b5c2391d6138778e85e1ae65"
+  "commit": "7d0808ba51c39d887e075b28eb5fe3b756ec1afd"
 }

package/dist/serialization/crdt/network/utils.d.ts

@@ -1,9 +0,0 @@
-import { Entity } from '../../../engine';
-import { ReceiveMessage, TransformType } from '../../../runtime/types';
-import { ReceiveNetworkMessage } from '../../../systems/crdt/types';
-import { ByteBuffer } from '../../ByteBuffer';
-import { INetowrkEntityType } from '../../../components/types';
-export declare function isNetworkMessage(message: ReceiveMessage): message is ReceiveNetworkMessage;
-export declare function networkMessageToLocal(message: ReceiveNetworkMessage, localEntityId: Entity, buffer: ByteBuffer, destinationBuffer: ByteBuffer): void;
-export declare function localMessageToNetwork(message: ReceiveMessage, network: INetowrkEntityType, buffer: ByteBuffer, destinationBuffer: ByteBuffer): void;
-export declare function fixTransformParent(message: ReceiveMessage, transformValue?: TransformType, parent?: Entity): Uint8Array;

package/dist/serialization/crdt/network/utils.js

@@ -1,60 +0,0 @@
-import { ReadWriteByteBuffer } from '../../ByteBuffer';
-import { PutComponentOperation } from '../putComponent';
-import { CrdtMessageType } from '../types';
-import { DeleteComponent } from '../deleteComponent';
-import { DeleteEntity } from '../deleteEntity';
-import { PutNetworkComponentOperation } from './putComponentNetwork';
-import { DeleteComponentNetwork } from './deleteComponentNetwork';
-import { DeleteEntityNetwork } from './deleteEntityNetwork';
-import { TransformSchema } from '../../../components/manual/Transform';
-/* istanbul ignore next */
-export function isNetworkMessage(message) {
-    return [
-        CrdtMessageType.DELETE_COMPONENT_NETWORK,
-        CrdtMessageType.DELETE_ENTITY_NETWORK,
-        CrdtMessageType.PUT_COMPONENT_NETWORK
-    ].includes(message.type);
-}
-/* istanbul ignore next */
-export function networkMessageToLocal(message, localEntityId, buffer, destinationBuffer) {
-    const offset = buffer.currentWriteOffset();
-    if (message.type === CrdtMessageType.PUT_COMPONENT_NETWORK) {
-        PutComponentOperation.write(localEntityId, message.timestamp, message.componentId, message.data, buffer);
-    }
-    else if (message.type === CrdtMessageType.DELETE_COMPONENT_NETWORK) {
-        DeleteComponent.write(localEntityId, message.componentId, message.timestamp, buffer);
-    }
-    else if (message.type === CrdtMessageType.DELETE_ENTITY_NETWORK) {
-        DeleteEntity.write(localEntityId, buffer);
-    }
-    destinationBuffer.writeBuffer(buffer.buffer().subarray(offset, buffer.currentWriteOffset()), false);
-}
-/* istanbul ignore next */
-export function localMessageToNetwork(message, network, buffer, destinationBuffer) {
-    const offset = buffer.currentWriteOffset();
-    if (message.type === CrdtMessageType.PUT_COMPONENT) {
-        PutNetworkComponentOperation.write(network.entityId, message.timestamp, message.componentId, network.networkId, message.data, buffer);
-    }
-    else if (message.type === CrdtMessageType.DELETE_COMPONENT) {
-        DeleteComponentNetwork.write(network.entityId, message.componentId, message.timestamp, network.networkId, buffer);
-    }
-    else if (message.type === CrdtMessageType.DELETE_ENTITY) {
-        DeleteEntityNetwork.write(network.entityId, network.networkId, buffer);
-    }
-    destinationBuffer.writeBuffer(buffer.buffer().subarray(offset, buffer.currentWriteOffset()), false);
-}
-const buffer = new ReadWriteByteBuffer();
-/* istanbul ignore next */
-export function fixTransformParent(message, transformValue, parent) {
-    buffer.resetBuffer();
-    let transform = transformValue;
-    if (!transform && 'data' in message) {
-        transform = TransformSchema.deserialize(new ReadWriteByteBuffer(message.data));
-    }
-    if (!transform)
-        throw new Error('Invalid parent transform');
-    // Generate new transform raw data with the parent
-    const newTransform = { ...transform, parent };
-    TransformSchema.serialize(newTransform, buffer);
-    return buffer.toBinary();
-}

package/dist-cjs/serialization/crdt/network/utils.d.ts

@@ -1,9 +0,0 @@
-import { Entity } from '../../../engine';
-import { ReceiveMessage, TransformType } from '../../../runtime/types';
-import { ReceiveNetworkMessage } from '../../../systems/crdt/types';
-import { ByteBuffer } from '../../ByteBuffer';
-import { INetowrkEntityType } from '../../../components/types';
-export declare function isNetworkMessage(message: ReceiveMessage): message is ReceiveNetworkMessage;
-export declare function networkMessageToLocal(message: ReceiveNetworkMessage, localEntityId: Entity, buffer: ByteBuffer, destinationBuffer: ByteBuffer): void;
-export declare function localMessageToNetwork(message: ReceiveMessage, network: INetowrkEntityType, buffer: ByteBuffer, destinationBuffer: ByteBuffer): void;
-export declare function fixTransformParent(message: ReceiveMessage, transformValue?: TransformType, parent?: Entity): Uint8Array;