@dcl/ecs 7.24.2-27962061844.commit-196680f → 7.24.2-28088915032.commit-e2f7e10

package/dist/engine/grow-only-value-set-component-definition.js

@@ -1,8 +1,7 @@
 import { ReadWriteByteBuffer } from '../serialization/ByteBuffer';
-import { AppendValueOperation, CrdtMessageType, ProcessMessageResultType } from '../serialization/crdt';
+import { AppendValueOperation, CrdtMessageType } from '../serialization/crdt';
 import { __DEV__ } from '../runtime/invariant';
 const emptyReadonlySet = freezeSet(new Set());
-const __GLOBAL_ENTITY = '__GLOBAL_ENTITY';
 function frozenError() {
     throw new Error('The set is frozen');
 }
@@ -23,7 +22,6 @@ export function createValueSetComponentDefinitionFromSchema(componentName, compo
     const dirtyIterator = new Set();
     const queuedCommands = [];
     const onChangeCallbacks = new Map();
-    const validateCallbacks = new Map();
     // only sort the array if the latest (N) element has a timestamp <= N-1
     function shouldSort(row) {
         const len = row.raw.length;
@@ -82,11 +80,8 @@ export function createValueSetComponentDefinitionFromSchema(componentName, compo
         has(entity) {
             return data.has(entity);
         },
-        entityDeleted(entity, markAsDirty) {
+        entityDeleted(entity) {
             data.delete(entity);
-            if (markAsDirty) {
-                // For grow-only sets, we don't need to mark as dirty since deletion doesn't generate CRDT messages
-            }
         },
         get(entity) {
             const values = data.get(entity);
@@ -157,44 +152,6 @@ export function createValueSetComponentDefinitionFromSchema(componentName, compo
             for (const cb of cbs) {
                 cb(value);
             }
-        },
-        __dry_run_updateFromCrdt(_body) {
-            return ProcessMessageResultType.StateUpdatedData;
-        },
-        validateBeforeChange(entityOrCb, cb) {
-            if (arguments.length === 1) {
-                // Second overload: just callback (global validation)
-                validateCallbacks.set(__GLOBAL_ENTITY, entityOrCb);
-            }
-            else {
-                if (cb) {
-                    validateCallbacks.set(entityOrCb, cb);
-                }
-            }
-        },
-        __run_validateBeforeChange(entity, newValue, senderAddress, createdBy) {
-            const cb = entity && validateCallbacks.get(entity);
-            const globalCb = validateCallbacks.get(__GLOBAL_ENTITY);
-            const currentValue = [...this.get(entity).values()];
-            const value = { entity, currentValue: currentValue, newValue, senderAddress, createdBy };
-            const globalResult = globalCb?.(value) ?? true;
-            const entityResult = (globalResult && cb?.(value)) ?? true;
-            return globalResult && entityResult;
-        },
-        getCrdtState(entity) {
-            const row = data.get(entity);
-            if (!row || row.raw.length === 0) {
-                return null;
-            }
-            // For GrowOnlySet, we need to return the complete CRDT messages for all values
-            // This is complex because GrowOnlySet uses APPEND messages, not a single PUT
-            // For now, return null to indicate this component type doesn't support simple corrections
-            return null;
-        },
-        __forceUpdateFromCrdt(_msg) {
-            // GrowOnlySet doesn't support authoritative corrections in the same way as LWW
-            // since it uses APPEND_VALUE messages instead of PUT_COMPONENT messages
-            return [null, undefined];
         }
     };
     return ret;

package/dist/engine/lww-element-set-component-definition.d.ts

@@ -1,10 +1,8 @@
 import { ISchema } from '../schemas';
 import { ByteBuffer } from '../serialization/ByteBuffer';
-import { PutComponentMessageBody, DeleteComponentMessageBody, ProcessMessageResultType, CrdtMessageBody, PutNetworkComponentMessageBody, DeleteComponentNetworkMessageBody, AuthoritativePutComponentMessageBody } from '../serialization/crdt';
+import { PutComponentMessageBody, DeleteComponentMessageBody, CrdtMessageBody } from '../serialization/crdt';
 import { Entity } from './entity';
 export declare function incrementTimestamp(entity: Entity, timestamps: Map<Entity, number>): number;
 export declare function createDumpLwwFunctionFromCrdt(componentId: number, timestamps: Map<Entity, number>, schema: Pick<ISchema<any>, 'serialize' | 'deserialize'>, data: Map<Entity, unknown>): (buffer: ByteBuffer, filterEntity?: ((entity: Entity) => boolean) | undefined) => void;
-export declare function createCrdtRuleValidator(timestamps: Map<Entity, number>, schema: Pick<ISchema<any>, 'serialize' | 'deserialize'>, data: Map<Entity, unknown>, lastSentData: Map<Entity, Uint8Array>): (message: PutComponentMessageBody | DeleteComponentMessageBody | PutNetworkComponentMessageBody | DeleteComponentNetworkMessageBody) => ProcessMessageResultType;
-export declare function createForceUpdateLwwFromCrdt(componentId: number, timestamps: Map<Entity, number>, schema: Pick<ISchema<any>, 'serialize' | 'deserialize'>, data: Map<Entity, unknown>): (msg: AuthoritativePutComponentMessageBody) => [null, any];
 export declare function createUpdateLwwFromCrdt(componentId: number, timestamps: Map<Entity, number>, schema: Pick<ISchema<any>, 'serialize' | 'deserialize'>, data: Map<Entity, unknown>, lastSentData: Map<Entity, Uint8Array>): (msg: CrdtMessageBody) => [null | PutComponentMessageBody | DeleteComponentMessageBody, any];
 export declare function createGetCrdtMessagesForLww(componentId: number, timestamps: Map<Entity, number>, dirtyIterator: Set<Entity>, schema: Pick<ISchema<any>, 'serialize'>, data: Map<Entity, unknown>, lastSentData: Map<Entity, Uint8Array>): () => Generator<PutComponentMessageBody | DeleteComponentMessageBody, void, unknown>;

package/dist/engine/lww-element-set-component-definition.js

@@ -30,12 +30,16 @@ export function createDumpLwwFunctionFromCrdt(componentId, timestamps, schema, d
         }
     };
 }
-const __GLOBAL_ENTITY = '__GLOBAL_ENTITY';
-export function createCrdtRuleValidator(timestamps, schema, data, lastSentData) {
+export function createUpdateLwwFromCrdt(componentId, timestamps, schema, data, lastSentData) {
     /**
-     * Shared CRDT conflict resolution logic
-     * @public
-     */
+     * Process the received message only if the lamport number recieved is higher
+     * than the stored one. If its lower, we spread it to the network to correct the peer.
+     * If they are equal, the bigger raw data wins.
+  
+      * Returns the recieved data if the lamport number was bigger than ours.
+      * If it was an outdated message, then we return void
+      * @public
+      */
     function crdtRuleForCurrentState(message) {
         const { entityId, timestamp } = message;
         const currentTimestamp = timestamps.get(entityId);
@@ -45,6 +49,7 @@ export function createCrdtRuleValidator(timestamps, schema, data, lastSentData)
         }
         // Outdated Message. Resend our state message through the wire.
         if (currentTimestamp > timestamp) {
+            // console.log('2', currentTimestamp, timestamp)
             return ProcessMessageResultType.StateOutdatedTimestamp;
         }
         // Deletes are idempotent
@@ -61,6 +66,7 @@ export function createCrdtRuleValidator(timestamps, schema, data, lastSentData)
             currentDataGreater = dataCompare(null, message.data);
         }
         // Same data, same timestamp. Weirdo echo message.
+        // console.log('3', currentDataGreater, writeBuffer.toBinary(), (message as any).data || null)
         if (currentDataGreater === 0) {
             return ProcessMessageResultType.NoChanges;
         }
@@ -69,35 +75,10 @@ export function createCrdtRuleValidator(timestamps, schema, data, lastSentData)
             return ProcessMessageResultType.StateOutdatedData;
         }
         else {
-            // Current data is lower
+            // Curent data is lower
             return ProcessMessageResultType.StateUpdatedData;
         }
     }
-    return crdtRuleForCurrentState;
-}
-export function createForceUpdateLwwFromCrdt(componentId, timestamps, schema, data) {
-    /**
-     * Force update component state regardless of timestamp - used for server authoritative messages
-     */
-    return (msg) => {
-        const buffer = new ReadWriteByteBuffer(msg.data);
-        const deserializedValue = schema.deserialize(buffer);
-        data.set(msg.entityId, deserializedValue);
-        timestamps.set(msg.entityId, msg.timestamp);
-        return [null, deserializedValue];
-    };
-}
-export function createUpdateLwwFromCrdt(componentId, timestamps, schema, data, lastSentData) {
-    /**
-     * Process the received message only if the lamport number recieved is higher
-     * than the stored one. If its lower, we spread it to the network to correct the peer.
-     * If they are equal, the bigger raw data wins.
-  
-      * Returns the recieved data if the lamport number was bigger than ours.
-      * If it was an outdated message, then we return void
-      * @public
-      */
-    const crdtRuleForCurrentState = createCrdtRuleValidator(timestamps, schema, data, lastSentData);
     return (msg) => {
         /* istanbul ignore next */
         if (msg.type !== CrdtMessageType.PUT_COMPONENT &&
@@ -115,10 +96,7 @@ export function createUpdateLwwFromCrdt(componentId, timestamps, schema, data, l
                 if (msg.type === CrdtMessageType.PUT_COMPONENT || msg.type === CrdtMessageType.PUT_COMPONENT_NETWORK) {
                     const buf = new ReadWriteByteBuffer(msg.data);
                     data.set(entity, schema.deserialize(buf));
-                    // do NOT seed lastSentData from an INCOMING message!!!!
-                    // seeding it from received bytes makes the engine
-                    // believe it already sent this state, which kills valid re-broadcasting 🧨
-                    lastSentData.delete(entity);
+                    lastSentData.set(entity, new Uint8Array(msg.data));
                 }
                 else {
                     data.delete(entity);
@@ -207,7 +185,6 @@ export function createComponentDefinitionFromSchema(componentName, componentId,
     const timestamps = new Map();
     const lastSentData = new Map();
     const onChangeCallbacks = new Map();
-    const validateCallbacks = new Map();
     return {
         get componentId() {
             return componentId;
@@ -302,39 +279,7 @@ export function createComponentDefinitionFromSchema(componentName, componentId,
         },
         getCrdtUpdates: createGetCrdtMessagesForLww(componentId, timestamps, dirtyIterator, schema, data, lastSentData),
         updateFromCrdt: createUpdateLwwFromCrdt(componentId, timestamps, schema, data, lastSentData),
-        __forceUpdateFromCrdt: createForceUpdateLwwFromCrdt(componentId, timestamps, schema, data),
-        __dry_run_updateFromCrdt: createCrdtRuleValidator(timestamps, schema, data, lastSentData),
         dumpCrdtStateToBuffer: createDumpLwwFunctionFromCrdt(componentId, timestamps, schema, data),
-        validateBeforeChange(entityOrCb, cb) {
-            if (arguments.length === 1) {
-                // Second overload: just callback (global validation)
-                validateCallbacks.set(__GLOBAL_ENTITY, entityOrCb);
-            }
-            else {
-                if (cb) {
-                    validateCallbacks.set(entityOrCb, cb);
-                }
-            }
-        },
-        __run_validateBeforeChange(entity, newValue, senderAddress, createdBy) {
-            const cb = entity && validateCallbacks.get(entity);
-            const globalCb = validateCallbacks.get(__GLOBAL_ENTITY);
-            const currentValue = data.get(entity);
-            const value = { entity, currentValue, newValue, senderAddress, createdBy };
-            const globalResult = globalCb?.(value) ?? true;
-            const entityResult = (globalResult && cb?.(value)) ?? true;
-            return globalResult && entityResult;
-        },
-        getCrdtState(entity) {
-            const componentData = data.get(entity);
-            const timestamp = timestamps.get(entity);
-            if (componentData && timestamp !== undefined) {
-                const buffer = new ReadWriteByteBuffer();
-                schema.serialize(deepReadonly(componentData), buffer);
-                return { data: buffer.toBinary(), timestamp };
-            }
-            return null;
-        },
         onChange(entity, cb) {
             const cbs = onChangeCallbacks.get(entity) ?? [];
             cbs.push(cb);

package/dist/index.d.ts

@@ -15,7 +15,7 @@ export * from './systems/triggerArea';
 export * from './systems/physics';
 export * from './engine/entity';
 export * from './components/types';
-import { MaterialComponentDefinitionExtended, MeshColliderComponentDefinitionExtended, MeshRendererComponentDefinitionExtended, TransformComponentExtended, AnimatorComponentDefinitionExtended, AudioSourceComponentDefinitionExtended, AudioAnalysisComponentDefinitionExtended, AudioStreamComponentDefinitionExtended, ISyncComponents, TweenComponentDefinitionExtended, INetowrkEntity, INetowrkParent, VirtualCameraComponentDefinitionExtended, InputModifierComponentDefinitionExtended, LightSourceComponentDefinitionExtended, TriggerAreaComponentDefinitionExtended, ParticleSystemComponentDefinitionExtended, ICreatedBy } from './components/types';
+import { MaterialComponentDefinitionExtended, MeshColliderComponentDefinitionExtended, MeshRendererComponentDefinitionExtended, TransformComponentExtended, AnimatorComponentDefinitionExtended, AudioSourceComponentDefinitionExtended, AudioAnalysisComponentDefinitionExtended, AudioStreamComponentDefinitionExtended, ISyncComponents, TweenComponentDefinitionExtended, INetowrkEntity, INetowrkParent, VirtualCameraComponentDefinitionExtended, InputModifierComponentDefinitionExtended, LightSourceComponentDefinitionExtended, TriggerAreaComponentDefinitionExtended, ParticleSystemComponentDefinitionExtended } from './components/types';
 import { NameComponent } from './components/manual/Name';
 import { TagsComponentDefinitionExtended } from './components/manual/Tags';
 export declare const Transform: TransformComponentExtended;
@@ -50,7 +50,6 @@ export declare const NetworkEntity: INetowrkEntity;
  * Tag a entity to be syncronized through comms
  */
 export declare const NetworkParent: INetowrkParent;
-export declare const CreatedBy: ICreatedBy;
 export * from './components/generated/global.gen';
 export * from './components/generated/types.gen';
 export * from './serialization/crdt';

package/dist/index.js

@@ -55,7 +55,6 @@ export const NetworkEntity = /* @__PURE__*/ components.NetworkEntity(engine);
  * Tag a entity to be syncronized through comms
  */
 export const NetworkParent = /* @__PURE__*/ components.NetworkParent(engine);
-export const CreatedBy = /* @__PURE__*/ components.CreatedBy(engine);
 // export components for global engine
 export * from './components/generated/global.gen';
 export * from './components/generated/types.gen';

package/dist/serialization/crdt/index.d.ts

@@ -7,4 +7,3 @@ export * from './network/deleteComponentNetwork';
 export * from './network/deleteEntityNetwork';
 export * from './types';
 export * from './crdtMessageProtocol';
-export * from './authoritativePutComponent';

package/dist/serialization/crdt/index.js

@@ -7,4 +7,3 @@ export * from './network/deleteComponentNetwork';
 export * from './network/deleteEntityNetwork';
 export * from './types';
 export * from './crdtMessageProtocol';
-export * from './authoritativePutComponent';

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

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,60 @@
+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/serialization/crdt/types.d.ts

@@ -11,8 +11,7 @@ export declare enum CrdtMessageType {
     PUT_COMPONENT_NETWORK = 5,
     DELETE_COMPONENT_NETWORK = 6,
     DELETE_ENTITY_NETWORK = 7,
-    AUTHORITATIVE_PUT_COMPONENT = 8,
-    MAX_MESSAGE_TYPE = 9
+    MAX_MESSAGE_TYPE = 8
 }
 /**
  * Min length = 8 bytes
@@ -49,23 +48,6 @@ export type PutNetworkComponentMessageBody = Omit<PutComponentMessageBody, 'type
     type: CrdtMessageType.PUT_COMPONENT_NETWORK;
     networkId: number;
 };
-/**
- * Server authoritative message - identical to PutComponentMessageBody but with forced processing
- * Min. length = header (8 bytes) + 16 bytes = 24 bytes
- *
- * @param entity - Uint32 number of the entity
- * @param componentId - Uint32 number of id
- * @param timestamp - Uint32 Lamport timestamp (server's authoritative timestamp)
- * @param data - Uint8[] data of component => length(4 bytes) + block of bytes[0..length-1]
- * @public
- */
-export type AuthoritativePutComponentMessageBody = {
-    type: CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT;
-    entityId: Entity;
-    componentId: number;
-    timestamp: number;
-    data: Uint8Array;
-};
 /**
  * Min. length = header (8 bytes) + 16 bytes = 24 bytes
  *
@@ -132,10 +114,6 @@ export type AppendValueMessage = CrdtMessageHeader & AppendValueMessageBody;
  * @public
  */
 export type PutComponentMessage = CrdtMessageHeader & PutComponentMessageBody;
-/**
- * @public
- */
-export type AuthoritativePutComponentMessage = CrdtMessageHeader & AuthoritativePutComponentMessageBody;
 /**
  * @public
  */
@@ -159,7 +137,7 @@ export type DeleteEntityNetworkMessage = CrdtMessageHeader & DeleteEntityNetwork
 /**
  * @public
  */
-export type CrdtMessage = PutComponentMessage | AuthoritativePutComponentMessage | DeleteComponentMessage | AppendValueMessage | DeleteEntityMessage | PutNetworkComponentMessage | DeleteComponentNetworkMessage | DeleteEntityNetworkMessage;
+export type CrdtMessage = PutComponentMessage | DeleteComponentMessage | AppendValueMessage | DeleteEntityMessage | PutNetworkComponentMessage | DeleteComponentNetworkMessage | DeleteEntityNetworkMessage;
 /**
  * @public
  */
@@ -167,7 +145,7 @@ export type CrdtNetworkMessageBody = PutNetworkComponentMessageBody | DeleteComp
 /**
  * @public
  */
-export type CrdtMessageBody = PutComponentMessageBody | AuthoritativePutComponentMessageBody | DeleteComponentMessageBody | DeleteEntityMessageBody | AppendValueMessageBody | CrdtNetworkMessageBody;
+export type CrdtMessageBody = PutComponentMessageBody | DeleteComponentMessageBody | DeleteEntityMessageBody | AppendValueMessageBody | CrdtNetworkMessageBody;
 export declare enum ProcessMessageResultType {
     /**
      * Typical message and new state set.

package/dist/serialization/crdt/types.js

@@ -13,9 +13,7 @@ export var CrdtMessageType;
     CrdtMessageType[CrdtMessageType["PUT_COMPONENT_NETWORK"] = 5] = "PUT_COMPONENT_NETWORK";
     CrdtMessageType[CrdtMessageType["DELETE_COMPONENT_NETWORK"] = 6] = "DELETE_COMPONENT_NETWORK";
     CrdtMessageType[CrdtMessageType["DELETE_ENTITY_NETWORK"] = 7] = "DELETE_ENTITY_NETWORK";
-    // Server authoritative operation - forces component state regardless of timestamp
-    CrdtMessageType[CrdtMessageType["AUTHORITATIVE_PUT_COMPONENT"] = 8] = "AUTHORITATIVE_PUT_COMPONENT";
-    CrdtMessageType[CrdtMessageType["MAX_MESSAGE_TYPE"] = 9] = "MAX_MESSAGE_TYPE";
+    CrdtMessageType[CrdtMessageType["MAX_MESSAGE_TYPE"] = 8] = "MAX_MESSAGE_TYPE";
 })(CrdtMessageType || (CrdtMessageType = {}));
 /**
  * @public

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

@@ -1,6 +1,7 @@
 import { Entity } from '../../engine/entity';
 import type { ComponentDefinition } from '../../engine';
 import { CrdtMessageType } from '../../serialization/crdt/types';
+export declare const LIVEKIT_MAX_SIZE = 12;
 /**
  * @public
  */