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

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/events.js

@@ -25,6 +25,16 @@ export 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({
@@ -42,13 +52,27 @@ export 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) {
@@ -70,11 +94,16 @@ export 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) {
@@ -82,7 +111,7 @@ export 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)
@@ -110,7 +139,7 @@ export function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = 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) => {
@@ -121,7 +150,7 @@ export function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = 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) => {
@@ -129,7 +158,7 @@ export function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = 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) => {
@@ -137,7 +166,7 @@ export function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = 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) => {
@@ -145,7 +174,7 @@ export function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = 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) => {
@@ -153,7 +182,7 @@ export function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = 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) => {
@@ -161,7 +190,7 @@ export function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = 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) => {
@@ -169,7 +198,7 @@ export function createPointerEventsSystem(engine, inputSystem) {
         const { entity, opts } = data;
         const options = 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 {
@@ -206,7 +235,7 @@ export 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/dist-cjs/components/index.d.ts

@@ -23,6 +23,7 @@ import { TriggerAreaComponentDefinitionExtended } from './extended/TriggerArea';
 import { ParticleSystemComponentDefinitionExtended } from './extended/ParticleSystem';
 import { TouchScreenControlsComponentDefinitionExtended } from './extended/TouchScreenControls';
 import { TagsComponentDefinitionExtended } from './manual/Tags';
+import { ICreatedByType } from './manual/CreatedBy';
 export * from './generated/index.gen';
 export type { GrowOnlyValueSetComponentDefinition, LastWriteWinElementSetComponentDefinition, LwwComponentGetter, GSetComponentGetter };
 export declare const Transform: LwwComponentGetter<TransformComponentExtended>;
@@ -57,5 +58,9 @@ export declare const NetworkEntity: (engine: Pick<IEngine, 'defineComponent'>) =
  * @alpha
  */
 export declare const NetworkParent: (engine: Pick<IEngine, 'defineComponent'>) => LastWriteWinElementSetComponentDefinition<INetowrkParentType>;
+/**
+ * @public
+ */
+export declare const CreatedBy: (engine: Pick<IEngine, 'defineComponent'>) => LastWriteWinElementSetComponentDefinition<ICreatedByType>;
 export { MediaState };
 export type { AudioAnalysisView };

package/dist-cjs/components/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MediaState = exports.NetworkParent = exports.NetworkEntity = exports.SyncComponents = exports.Tags = exports.Name = exports.TouchScreenControls = exports.ParticleSystem = exports.TriggerArea = exports.LightSource = exports.InputModifier = exports.VirtualCamera = exports.Tween = exports.MeshCollider = exports.MeshRenderer = exports.AudioStream = exports.AudioAnalysis = exports.AudioSource = exports.Animator = exports.Material = exports.Transform = void 0;
+exports.MediaState = exports.CreatedBy = exports.NetworkParent = exports.NetworkEntity = exports.SyncComponents = exports.Tags = exports.Name = exports.TouchScreenControls = exports.ParticleSystem = exports.TriggerArea = exports.LightSource = exports.InputModifier = exports.VirtualCamera = exports.Tween = exports.MeshCollider = exports.MeshRenderer = exports.AudioStream = exports.AudioAnalysis = exports.AudioSource = exports.Animator = exports.Material = exports.Transform = void 0;
 const Animator_1 = require("./extended/Animator");
 const AudioSource_1 = require("./extended/AudioSource");
 const AudioAnalysis_1 = require("./extended/AudioAnalysis");
@@ -40,6 +40,7 @@ const TriggerArea_1 = require("./extended/TriggerArea");
 const ParticleSystem_1 = require("./extended/ParticleSystem");
 const TouchScreenControls_1 = require("./extended/TouchScreenControls");
 const Tags_1 = __importDefault(require("./manual/Tags"));
+const CreatedBy_1 = __importDefault(require("./manual/CreatedBy"));
 __exportStar(require("./generated/index.gen"), exports);
 /* @__PURE__ */
 const Transform = (engine) => (0, Transform_1.defineTransformComponent)(engine);
@@ -104,12 +105,15 @@ exports.SyncComponents = SyncComponents;
 /**
  * @alpha
  */
-/* @__PURE__ */
 const NetworkEntity = (engine) => (0, NetworkEntity_1.default)(engine);
 exports.NetworkEntity = NetworkEntity;
 /**
  * @alpha
  */
-/* @__PURE__ */
 const NetworkParent = (engine) => (0, NetworkParent_1.default)(engine);
 exports.NetworkParent = NetworkParent;
+/**
+ * @public
+ */
+const CreatedBy = (engine) => (0, CreatedBy_1.default)(engine);
+exports.CreatedBy = CreatedBy;

package/dist-cjs/components/manual/CreatedBy.d.ts

@@ -0,0 +1,9 @@
+import { IEngine, LastWriteWinElementSetComponentDefinition } from '../../engine/types';
+export interface ICreatedByType {
+    address: string;
+}
+export type ICreatedBy = LastWriteWinElementSetComponentDefinition<ICreatedByType>;
+declare function defineCreatedBy(engine: Pick<IEngine, 'defineComponent'>): import("../../engine/types").MapComponentDefinition<import("../..").MapResult<{
+    address: import("../../schemas").ISchema<string>;
+}>>;
+export default defineCreatedBy;

package/dist-cjs/components/manual/CreatedBy.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const schemas_1 = require("../../schemas");
+function defineCreatedBy(engine) {
+    const CreatedBy = engine.defineComponent('core-schema::Created-By', {
+        address: schemas_1.Schemas.String
+    });
+    return CreatedBy;
+}
+exports.default = defineCreatedBy;

package/dist-cjs/components/manual/Transform.d.ts

@@ -1,5 +1,6 @@
 import { LastWriteWinElementSetComponentDefinition, IEngine } from '../../engine';
 import { Entity } from '../../engine/entity';
+import type { ISchema } from '../../schemas/ISchema';
 import type { Vector3Type } from '../../schemas/custom/Vector3';
 /**
  * @public
@@ -24,6 +25,10 @@ export interface TransformComponentExtended extends TransformComponent {
      */
     localToWorldDirection(entity: Entity, localDirection: Vector3Type): Vector3Type;
 }
+/**
+ * @public
+ */
+export declare const COMPONENT_ID = 1;
 /**
  * @public
  */
@@ -46,6 +51,10 @@ export type TransformType = {
     };
     parent?: Entity;
 };
+/** @public */
+export declare const TRANSFORM_LENGTH = 44;
+/** @public */
+export declare const TransformSchema: ISchema<TransformType>;
 /**
  * @public
  */

package/dist-cjs/components/manual/Transform.js

@@ -29,12 +29,12 @@ exports.defineTransformComponent = exports.TransformSchema = exports.TRANSFORM_L
 // getters via __importStar in CJS), so by the time methods are called all exports are available.
 const treeHelpers = __importStar(require("../../runtime/helpers/tree"));
 /**
- * @internal
+ * @public
  */
 exports.COMPONENT_ID = 1;
-/** @internal */
+/** @public */
 exports.TRANSFORM_LENGTH = 44;
-/** @internal */
+/** @public */
 exports.TransformSchema = {
     serialize(value, builder) {
         const ptr = builder.incrementWriteOffset(exports.TRANSFORM_LENGTH);

package/dist-cjs/components/types.d.ts

@@ -13,6 +13,7 @@ export type { TagsComponentDefinitionExtended, TagsType } from './manual/Tags';
 export type { ISyncComponents, ISyncComponentsType } from './manual/SyncComponents';
 export type { INetowrkEntity, INetowrkEntityType } from './manual/NetworkEntity';
 export type { INetowrkParent, INetowrkParentType } from './manual/NetworkParent';
+export type { ICreatedBy, ICreatedByType } from './manual/CreatedBy';
 export type { InputModifierHelper, InputModifierComponentDefinitionExtended } from './extended/InputModifier';
 export type { LightSourceHelper, LightSourceComponentDefinitionExtended } from './extended/LightSource';
 export type { TriggerAreaComponentDefinitionExtended } from './extended/TriggerArea';