@dcl/ecs 7.3.40-7698451743.commit-c9c61fe → 7.3.40-7717066166.commit-ece036d

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

@@ -24,6 +24,7 @@ function createValueSetComponentDefinitionFromSchema(componentName, componentId,
     const data = new Map();
     const dirtyIterator = new Set();
     const queuedCommands = [];
+    const onChangeCallbacks = new Map();
     // only sort the array if the latest (N) element has a timestamp <= N-1
     function shouldSort(row) {
         const len = row.raw.length;
@@ -126,7 +127,8 @@ function createValueSetComponentDefinitionFromSchema(componentName, componentId,
         updateFromCrdt(_body) {
             if (_body.type === crdt_1.CrdtMessageType.APPEND_VALUE) {
                 const buf = new ByteBuffer_1.ReadWriteByteBuffer(_body.data);
-                append(_body.entityId, schema.deserialize(buf));
+                const { value } = append(_body.entityId, schema.deserialize(buf));
+                return [null, value];
             }
             return [null, undefined];
         },
@@ -140,6 +142,12 @@ function createValueSetComponentDefinitionFromSchema(componentName, componentId,
                     crdt_1.AppendValueOperation.write(entity, 0, componentId, buf.toBinary(), buffer);
                 }
             }
+        },
+        onChange(entity, cb) {
+            onChangeCallbacks.set(entity, cb);
+        },
+        __onChangeCallbacks(entity) {
+            return onChangeCallbacks.get(entity);
         }
     };
     return ret;

package/dist-cjs/engine/index.js

@@ -37,11 +37,12 @@ const entity_1 = require("./entity");
 const systems_1 = require("./systems");
 const grow_only_value_set_component_definition_1 = require("./grow-only-value-set-component-definition");
 const tree_1 = require("../runtime/helpers/tree");
+const crdt_2 = require("../serialization/crdt");
 __exportStar(require("./input"), exports);
 __exportStar(require("./readonly"), exports);
 __exportStar(require("./types"), exports);
-function preEngine() {
-    const entityContainer = (0, entity_1.EntityContainer)();
+function preEngine(options) {
+    const entityContainer = options?.entityContainer ?? (0, entity_1.createEntityContainer)();
     const componentsDefinition = new Map();
     const systems = (0, systems_1.SystemContainer)();
     let sealed = false;
@@ -57,8 +58,9 @@ function preEngine() {
     }
     function removeEntity(entity) {
         for (const [, component] of componentsDefinition) {
-            // TODO: hack for the moment. It should be enough to delete the entity, but the renderer is not cleaning the components.
-            // So we still need the NetworkEntity to forward this message to the SyncTransport.
+            // TODO: hack for the moment.
+            // We still need the NetworkEntity to forward this message to the SyncTransport.
+            // If we remove it then we can't notify the other users which entity was deleted.
             if (component.componentName === 'core-schema::Network-Entity')
                 continue;
             component.entityDeleted(entity, true);
@@ -159,8 +161,8 @@ function preEngine() {
         }
     }
     function getEntityOrNullByName(value) {
-        const LabelComponent = components.Name({ defineComponent });
-        for (const [entity, name] of getEntitiesWith(LabelComponent)) {
+        const NameComponent = components.Name({ defineComponent });
+        for (const [entity, name] of getEntitiesWith(NameComponent)) {
             if (name.value === value)
                 return entity;
         }
@@ -226,8 +228,25 @@ function preEngine() {
  * @deprecated Prevent manual usage prefer "engine" for scene development
  */
 function Engine(options) {
-    const partialEngine = preEngine();
-    const crdtSystem = (0, crdt_1.crdtSceneSystem)(partialEngine, options?.onChangeFunction || null);
+    const partialEngine = preEngine(options);
+    const onChangeFunction = (entity, operation, component, componentValue) => {
+        if (operation === crdt_2.CrdtMessageType.DELETE_ENTITY) {
+            for (const component of partialEngine.componentsIter()) {
+                const onChange = component?.__onChangeCallbacks(entity);
+                if (onChange) {
+                    onChange(undefined);
+                }
+            }
+        }
+        else {
+            const onChange = component?.__onChangeCallbacks(entity);
+            if (onChange) {
+                onChange(componentValue);
+            }
+        }
+        return options?.onChangeFunction(entity, operation, component, componentValue);
+    };
+    const crdtSystem = (0, crdt_1.crdtSceneSystem)(partialEngine, onChangeFunction);
     async function update(dt) {
         await crdtSystem.receiveMessages();
         for (const system of partialEngine.getSystems()) {

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

@@ -177,6 +177,7 @@ function createComponentDefinitionFromSchema(componentName, componentId, schema)
     const data = new Map();
     const dirtyIterator = new Set();
     const timestamps = new Map();
+    const onChangeCallbacks = new Map();
     return {
         get componentId() {
             return componentId;
@@ -268,7 +269,13 @@ function createComponentDefinitionFromSchema(componentName, componentId, schema)
         },
         getCrdtUpdates: createGetCrdtMessagesForLww(componentId, timestamps, dirtyIterator, schema, data),
         updateFromCrdt: createUpdateLwwFromCrdt(componentId, timestamps, schema, data),
-        dumpCrdtStateToBuffer: createDumpLwwFunctionFromCrdt(componentId, timestamps, schema, data)
+        dumpCrdtStateToBuffer: createDumpLwwFunctionFromCrdt(componentId, timestamps, schema, data),
+        onChange(entity, cb) {
+            onChangeCallbacks.set(entity, cb);
+        },
+        __onChangeCallbacks(entity) {
+            return onChangeCallbacks.get(entity);
+        }
     };
 }
 exports.createComponentDefinitionFromSchema = createComponentDefinitionFromSchema;

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

@@ -3,7 +3,7 @@ import { MapResult, Spec } from '../schemas/Map';
 import { OnChangeFunction } from '../systems/crdt';
 import { Transport } from '../systems/crdt/types';
 import { ComponentDefinition, GrowOnlyValueSetComponentDefinition, LastWriteWinElementSetComponentDefinition } from './component';
-import { Entity, EntityState } from './entity';
+import { Entity, IEntityContainer, EntityState } from './entity';
 import { ValueSetOptions } from './grow-only-value-set-component-definition';
 import { ReadonlyComponentSchema } from './readonly';
 import { SystemFn } from './systems';
@@ -38,6 +38,7 @@ export interface MapComponentDefinition<T> extends LastWriteWinElementSetCompone
  */
 export interface IEngineOptions {
     onChangeFunction: OnChangeFunction;
+    entityContainer?: IEntityContainer;
 }
 /**
  * @public

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

@@ -165,7 +165,7 @@ function crdtSceneSystem(engine, onProcessEntityComponentChange) {
                     if (!conflictMessage) {
                         // Add message to transport queue to be processed by others transports
                         broadcastMessages.push(msg);
-                        onProcessEntityComponentChange && onProcessEntityComponentChange(msg.entityId, msg.type, component, value);
+                        onProcessEntityComponentChange && onProcessEntityComponentChange(entityId, msg.type, component, value);
                     }
                 }
                 else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dcl/ecs",
   "description": "Decentraland ECS",
-  "version": "7.3.40-7698451743.commit-c9c61fe",
+  "version": "7.3.40-7717066166.commit-ece036d",
   "author": "DCL",
   "bugs": "https://github.com/decentraland/ecs/issues",
   "files": [
@@ -33,5 +33,5 @@
   },
   "types": "./dist/index.d.ts",
   "typings": "./dist/index.d.ts",
-  "commit": "c9c61fe791438f55937546344bdd16b4f8f0cd6c"
+  "commit": "ece036db9e954a6f07bc175aa6f139d48680be87"
 }