@dcl/ecs 7.22.6-25321038582.commit-63ddb3f → 7.22.6-25375246959.commit-ec25d50

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createComponentDefinitionFromSchema = exports.createGetCrdtMessagesForLww = exports.createUpdateLwwFromCrdt = exports.createForceUpdateLwwFromCrdt = exports.createCrdtRuleValidator = exports.createDumpLwwFunctionFromCrdt = exports.incrementTimestamp = void 0;
+exports.createComponentDefinitionFromSchema = exports.createGetCrdtMessagesForLww = exports.createUpdateLwwFromCrdt = exports.createDumpLwwFunctionFromCrdt = exports.incrementTimestamp = void 0;
 const ByteBuffer_1 = require("../serialization/ByteBuffer");
 const crdt_1 = require("../serialization/crdt");
 const utils_1 = require("../systems/crdt/utils");
@@ -35,12 +35,16 @@ function createDumpLwwFunctionFromCrdt(componentId, timestamps, schema, data) {
     };
 }
 exports.createDumpLwwFunctionFromCrdt = createDumpLwwFunctionFromCrdt;
-const __GLOBAL_ENTITY = '__GLOBAL_ENTITY';
-function createCrdtRuleValidator(timestamps, schema, data, lastSentData) {
+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);
@@ -50,6 +54,7 @@ function createCrdtRuleValidator(timestamps, schema, data, lastSentData) {
         }
         // Outdated Message. Resend our state message through the wire.
         if (currentTimestamp > timestamp) {
+            // console.log('2', currentTimestamp, timestamp)
             return crdt_1.ProcessMessageResultType.StateOutdatedTimestamp;
         }
         // Deletes are idempotent
@@ -66,6 +71,7 @@ function createCrdtRuleValidator(timestamps, schema, data, lastSentData) {
             currentDataGreater = (0, utils_1.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 crdt_1.ProcessMessageResultType.NoChanges;
         }
@@ -74,37 +80,10 @@ function createCrdtRuleValidator(timestamps, schema, data, lastSentData) {
             return crdt_1.ProcessMessageResultType.StateOutdatedData;
         }
         else {
-            // Current data is lower
+            // Curent data is lower
             return crdt_1.ProcessMessageResultType.StateUpdatedData;
         }
     }
-    return crdtRuleForCurrentState;
-}
-exports.createCrdtRuleValidator = createCrdtRuleValidator;
-function createForceUpdateLwwFromCrdt(componentId, timestamps, schema, data) {
-    /**
-     * Force update component state regardless of timestamp - used for server authoritative messages
-     */
-    return (msg) => {
-        const buffer = new ByteBuffer_1.ReadWriteByteBuffer(msg.data);
-        const deserializedValue = schema.deserialize(buffer);
-        data.set(msg.entityId, deserializedValue);
-        timestamps.set(msg.entityId, msg.timestamp);
-        return [null, deserializedValue];
-    };
-}
-exports.createForceUpdateLwwFromCrdt = createForceUpdateLwwFromCrdt;
-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 !== crdt_1.CrdtMessageType.PUT_COMPONENT &&
@@ -213,7 +192,6 @@ function createComponentDefinitionFromSchema(componentName, componentId, schema)
     const timestamps = new Map();
     const lastSentData = new Map();
     const onChangeCallbacks = new Map();
-    const validateCallbacks = new Map();
     return {
         get componentId() {
             return componentId;
@@ -308,39 +286,7 @@ function createComponentDefinitionFromSchema(componentName, componentId, schema)
         },
         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 ByteBuffer_1.ReadWriteByteBuffer();
-                schema.serialize((0, readonly_1.deepReadonly)(componentData), buffer);
-                return { data: buffer.toBinary(), timestamp };
-            }
-            return null;
-        },
         onChange(entity, cb) {
             const cbs = onChangeCallbacks.get(entity) ?? [];
             cbs.push(cb);

package/dist-cjs/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, AudioStreamComponentDefinitionExtended, ISyncComponents, TweenComponentDefinitionExtended, INetowrkEntity, INetowrkParent, VirtualCameraComponentDefinitionExtended, InputModifierComponentDefinitionExtended, LightSourceComponentDefinitionExtended, TriggerAreaComponentDefinitionExtended, ParticleSystemComponentDefinitionExtended, ICreatedBy } from './components/types';
+import { MaterialComponentDefinitionExtended, MeshColliderComponentDefinitionExtended, MeshRendererComponentDefinitionExtended, TransformComponentExtended, AnimatorComponentDefinitionExtended, AudioSourceComponentDefinitionExtended, 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;
@@ -49,7 +49,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-cjs/index.js

@@ -26,7 +26,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreatedBy = exports.NetworkParent = exports.NetworkEntity = exports.SyncComponents = exports.ParticleSystem = exports.TriggerArea = exports.LightSource = exports.InputModifier = exports.VirtualCamera = exports.Tween = exports.Tags = exports.Name = exports.MeshCollider = exports.MeshRenderer = exports.Material = exports.AudioStream = exports.AudioSource = exports.Animator = exports.Transform = exports.components = exports.cyclicParentingChecker = void 0;
+exports.NetworkParent = exports.NetworkEntity = exports.SyncComponents = exports.ParticleSystem = exports.TriggerArea = exports.LightSource = exports.InputModifier = exports.VirtualCamera = exports.Tween = exports.Tags = exports.Name = exports.MeshCollider = exports.MeshRenderer = exports.Material = exports.AudioStream = exports.AudioSource = exports.Animator = exports.Transform = exports.components = exports.cyclicParentingChecker = void 0;
 // The order of the following imports matters. Please do not auto-sort
 __exportStar(require("./engine"), exports);
 __exportStar(require("./schemas"), exports);
@@ -83,7 +83,6 @@ exports.NetworkEntity = components.NetworkEntity(initialization_1.engine);
  * Tag a entity to be syncronized through comms
  */
 exports.NetworkParent = components.NetworkParent(initialization_1.engine);
-exports.CreatedBy = components.CreatedBy(initialization_1.engine);
 // export components for global engine
 __exportStar(require("./components/generated/global.gen"), exports);
 __exportStar(require("./components/generated/types.gen"), exports);

package/dist-cjs/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-cjs/serialization/crdt/index.js

@@ -23,4 +23,3 @@ __exportStar(require("./network/deleteComponentNetwork"), exports);
 __exportStar(require("./network/deleteEntityNetwork"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./crdtMessageProtocol"), exports);
-__exportStar(require("./authoritativePutComponent"), exports);

package/dist-cjs/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-cjs/serialization/crdt/network/utils.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixTransformParent = exports.localMessageToNetwork = exports.networkMessageToLocal = exports.isNetworkMessage = void 0;
+const ByteBuffer_1 = require("../../ByteBuffer");
+const putComponent_1 = require("../putComponent");
+const types_1 = require("../types");
+const deleteComponent_1 = require("../deleteComponent");
+const deleteEntity_1 = require("../deleteEntity");
+const putComponentNetwork_1 = require("./putComponentNetwork");
+const deleteComponentNetwork_1 = require("./deleteComponentNetwork");
+const deleteEntityNetwork_1 = require("./deleteEntityNetwork");
+const Transform_1 = require("../../../components/manual/Transform");
+/* istanbul ignore next */
+function isNetworkMessage(message) {
+    return [
+        types_1.CrdtMessageType.DELETE_COMPONENT_NETWORK,
+        types_1.CrdtMessageType.DELETE_ENTITY_NETWORK,
+        types_1.CrdtMessageType.PUT_COMPONENT_NETWORK
+    ].includes(message.type);
+}
+exports.isNetworkMessage = isNetworkMessage;
+/* istanbul ignore next */
+function networkMessageToLocal(message, localEntityId, buffer, destinationBuffer) {
+    const offset = buffer.currentWriteOffset();
+    if (message.type === types_1.CrdtMessageType.PUT_COMPONENT_NETWORK) {
+        putComponent_1.PutComponentOperation.write(localEntityId, message.timestamp, message.componentId, message.data, buffer);
+    }
+    else if (message.type === types_1.CrdtMessageType.DELETE_COMPONENT_NETWORK) {
+        deleteComponent_1.DeleteComponent.write(localEntityId, message.componentId, message.timestamp, buffer);
+    }
+    else if (message.type === types_1.CrdtMessageType.DELETE_ENTITY_NETWORK) {
+        deleteEntity_1.DeleteEntity.write(localEntityId, buffer);
+    }
+    destinationBuffer.writeBuffer(buffer.buffer().subarray(offset, buffer.currentWriteOffset()), false);
+}
+exports.networkMessageToLocal = networkMessageToLocal;
+/* istanbul ignore next */
+function localMessageToNetwork(message, network, buffer, destinationBuffer) {
+    const offset = buffer.currentWriteOffset();
+    if (message.type === types_1.CrdtMessageType.PUT_COMPONENT) {
+        putComponentNetwork_1.PutNetworkComponentOperation.write(network.entityId, message.timestamp, message.componentId, network.networkId, message.data, buffer);
+    }
+    else if (message.type === types_1.CrdtMessageType.DELETE_COMPONENT) {
+        deleteComponentNetwork_1.DeleteComponentNetwork.write(network.entityId, message.componentId, message.timestamp, network.networkId, buffer);
+    }
+    else if (message.type === types_1.CrdtMessageType.DELETE_ENTITY) {
+        deleteEntityNetwork_1.DeleteEntityNetwork.write(network.entityId, network.networkId, buffer);
+    }
+    destinationBuffer.writeBuffer(buffer.buffer().subarray(offset, buffer.currentWriteOffset()), false);
+}
+exports.localMessageToNetwork = localMessageToNetwork;
+const buffer = new ByteBuffer_1.ReadWriteByteBuffer();
+/* istanbul ignore next */
+function fixTransformParent(message, transformValue, parent) {
+    buffer.resetBuffer();
+    let transform = transformValue;
+    if (!transform && 'data' in message) {
+        transform = Transform_1.TransformSchema.deserialize(new ByteBuffer_1.ReadWriteByteBuffer(message.data));
+    }
+    if (!transform)
+        throw new Error('Invalid parent transform');
+    // Generate new transform raw data with the parent
+    const newTransform = { ...transform, parent };
+    Transform_1.TransformSchema.serialize(newTransform, buffer);
+    return buffer.toBinary();
+}
+exports.fixTransformParent = fixTransformParent;

package/dist-cjs/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-cjs/serialization/crdt/types.js

@@ -16,9 +16,7 @@ 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 = exports.CrdtMessageType || (exports.CrdtMessageType = {}));
 /**
  * @public

package/dist-cjs/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
  */