@dcl/ecs 7.26.1-31715266070.commit-0ddb8e7 → 7.26.1-32157237851.commit-e712ef7

package/dist/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.d.ts

@@ -1,13 +1,5 @@
 import _m0 from "protobufjs/minimal";
 import { Color3 } from "../../common/colors.gen";
-/** Mask for which bones an animation applies to. */
-/**
- * @public
- */
-export declare const enum AvatarEmoteMask {
-    AEM_FULL_BODY = 0,
-    AEM_UPPER_BODY = 1
-}
 /**
  * The AvatarShape component contains the information required to draw and animate avatar, acting as
  * a simplified GLTF container for this specific case.

package/dist/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.js

@@ -3,15 +3,6 @@ import Long from "long";
 import _m0 from "protobufjs/minimal";
 import { Color3 } from "../../common/colors.gen";
 const protobufPackageSarasa = "decentraland.sdk.components";
-/** Mask for which bones an animation applies to. */
-/**
- * @public
- */
-export var AvatarEmoteMask;
-(function (AvatarEmoteMask) {
-    AvatarEmoteMask[AvatarEmoteMask["AEM_FULL_BODY"] = 0] = "AEM_FULL_BODY";
-    AvatarEmoteMask[AvatarEmoteMask["AEM_UPPER_BODY"] = 1] = "AEM_UPPER_BODY";
-})(AvatarEmoteMask || (AvatarEmoteMask = {}));
 function createBasePBAvatarShape() {
     return {
         id: "",

package/dist/engine/entity.js

@@ -56,6 +56,16 @@ export var EntityState;
      */
     EntityState[EntityState["Reserved"] = 3] = "Reserved";
 })(EntityState || (EntityState = {}));
+/**
+ * True when `entity`'s NUMBER falls in the renderer-reserved range, at any version.
+ *
+ * Masks rather than calling `EntityUtils.fromEntityId`, which allocates a tuple per call to
+ * read one number; this runs on every inbound CRDT message. `entity & MAX_U16` already lands
+ * in [0, 65535], so the `>>> 0` fromEntityId applies is a no-op here.
+ */
+function isReservedEntity(entity, reservedStaticEntities) {
+    return (entity & MAX_U16) < reservedStaticEntities;
+}
 /**
  * @public
  */
@@ -90,7 +100,11 @@ export function createEntityContainer(opts) {
             return generateNewEntity();
         }
         for (const [number, version] of removedEntities.getMap()) {
-            if (version < MAX_U16) {
+            // Never recycle a renderer-reserved number: the renderer reissues those slots as
+            // toEntityId(number, version + 1) too, from the same stored version, so it would hand
+            // the scene an id belonging to a live remote player. Belt-and-braces — every writer
+            // into `removedEntities` refuses reserved numbers, so this cannot fire today.
+            if (number >= reservedStaticEntities && version < MAX_U16) {
                 const entity = EntityUtils.toEntityId(number, version + 1);
                 // If the entity is not being used, we can re-use it
                 // If the entity was removed in this tick, we're not counting for the usedEntities, but we have it in the toRemoveEntityArray
@@ -103,7 +117,7 @@ export function createEntityContainer(opts) {
         return generateNewEntity();
     }
     function removeEntity(entity) {
-        if (entity < reservedStaticEntities)
+        if (isReservedEntity(entity, reservedStaticEntities))
             return false;
         if (usedEntities.has(entity)) {
             usedEntities.delete(entity);
@@ -126,6 +140,12 @@ export function createEntityContainer(opts) {
         return arr;
     }
     function updateRemovedEntity(entity) {
+        // Called for EVERY inbound DELETE_ENTITY, including the renderer's tombstones for
+        // departed remote players — so this is the door reserved numbers would otherwise enter
+        // the free list through. They need no tombstone: getEntityState reports them Reserved
+        // before it consults `removedEntities`, so `Removed` is unreachable for them anyway.
+        if (isReservedEntity(entity, reservedStaticEntities))
+            return false;
         const [n, v] = EntityUtils.fromEntityId(entity);
         // Update the removed entities map
         removedEntities.addTo(n, v);
@@ -136,6 +156,11 @@ export function createEntityContainer(opts) {
         return true;
     }
     function updateUsedEntity(entity) {
+        // Same invariant as updateRemovedEntity. Unreachable from the CRDT path today
+        // (getEntityState returns `Reserved`, never `Unknown`), but the `v > 0` branch below
+        // would seed `removedEntities` with a reserved number.
+        if (isReservedEntity(entity, reservedStaticEntities))
+            return false;
         const [n, v] = EntityUtils.fromEntityId(entity);
         // if the entity was removed then abort fast
         if (removedEntities.has(n, v))
@@ -151,10 +176,12 @@ export function createEntityContainer(opts) {
         return true;
     }
     function getEntityState(entity) {
-        const [n, v] = EntityUtils.fromEntityId(entity);
-        if (n < reservedStaticEntities) {
+        // Same guard as the three above, so `Engine.removeEntity` — which classifies via
+        // getEntityState — cannot disagree with whether this container releases the id.
+        if (isReservedEntity(entity, reservedStaticEntities)) {
             return EntityState.Reserved;
         }
+        const [n, v] = EntityUtils.fromEntityId(entity);
         if (usedEntities.has(entity)) {
             return EntityState.UsedEntity;
         }

package/dist/engine/index.js

@@ -4,7 +4,7 @@ import { checkNotThenable } from '../runtime/invariant';
 import { Schemas } from '../schemas';
 import { crdtSceneSystem } from '../systems/crdt';
 import { createComponentDefinitionFromSchema } from './lww-element-set-component-definition';
-import { createEntityContainer } from './entity';
+import { EntityState, EntityUtils, createEntityContainer } from './entity';
 import { SystemContainer, SYSTEMS_REGULAR_PRIORITY } from './systems';
 import { createValueSetComponentDefinitionFromSchema } from './grow-only-value-set-component-definition';
 import { removeEntityWithChildren as removeEntityWithChildrenEngine } from '../runtime/helpers/tree';
@@ -12,6 +12,8 @@ import { CrdtMessageType } from '../serialization/crdt';
 export * from './input';
 export * from './readonly';
 export * from './types';
+/** RootEntity 0, PlayerEntity 1, CameraEntity 2 — see the engineInstance fields below. */
+const NAMED_STATIC_ENTITIES = 3;
 function preEngine(options) {
     const entityContainer = options?.entityContainer ?? createEntityContainer();
     const componentsDefinition = new Map();
@@ -28,6 +30,18 @@ function preEngine(options) {
         return entity;
     }
     function removeEntity(entity) {
+        // The renderer streams the avatar range and drops the scene's deletes there, so purging
+        // locally is permanent: a one-shot component like PlayerIdentityData is never re-sent, and
+        // the entity is left as a moving Transform with no identity. The three named static
+        // entities are reserved too, but the renderer DOES apply scene deletes on them — that is
+        // how InputModifier.deleteFrom(engine.PlayerEntity) clears an input lock — so they must
+        // still be purged. Asking the container keeps this in step with whether it releases the
+        // id, including for a custom container with a different reserved range.
+        const [entityNumber] = EntityUtils.fromEntityId(entity);
+        const isAvatarEntity = entityNumber >= NAMED_STATIC_ENTITIES && entityContainer.getEntityState(entity) === EntityState.Reserved;
+        const released = entityContainer.removeEntity(entity);
+        if (isAvatarEntity)
+            return released;
         for (const [, component] of componentsDefinition) {
             // TODO: hack for the moment.
             // We still need the NetworkEntity to forward this message to the SyncTransport.
@@ -36,7 +50,7 @@ function preEngine(options) {
                 continue;
             component.entityDeleted(entity, true);
         }
-        return entityContainer.removeEntity(entity);
+        return released;
     }
     function removeEntityWithChildren(entity) {
         return removeEntityWithChildrenEngine({ removeEntity, defineComponentFromSchema, getEntitiesWith, defineComponent }, entity);
@@ -260,7 +274,12 @@ export function Engine(options) {
         RootEntity: 0,
         PlayerEntity: 1,
         CameraEntity: 2,
-        getEntityState: partialEngine.entityContainer.getEntityState,
+        // Delegated, not aliased. A detached `entityContainer.getEntityState` reference binds
+        // `this` to the engine, so a custom IEntityContainer that uses `this` silently reports the
+        // wrong state through the public API while the engine itself, which calls the container
+        // directly, reports the right one. Harmless for the built-in closure-based container, but
+        // removeEntity now classifies through getEntityState, so the two must never diverge.
+        getEntityState: (entity) => partialEngine.entityContainer.getEntityState(entity),
         addTransport: crdtSystem.addTransport,
         entityContainer: partialEngine.entityContainer
     };

package/dist/engine/types.d.ts

@@ -55,11 +55,18 @@ export interface IEngine {
      * @public
      * Remove all components of an entity
      * @param entity - entity
+     * @returns whether the entity id was released for reuse. Ids in the renderer-reserved range
+     *   are never released, at any version. Components are still purged for
+     *   RootEntity/PlayerEntity/CameraEntity, but not for the avatar range.
      */
-    removeEntity(entity: Entity): void;
+    removeEntity(entity: Entity): boolean;
     /**
      * Remove all components of each entity in the tree made with Transform parenting
      * @param entity - the root entity of the tree
+     *
+     * May complete only partially and does not report it: nodes in the renderer-reserved range
+     * are refused by `removeEntity`, so a reserved node anywhere in the tree survives while its
+     * descendants are removed — leaving its `Transform.parent` pointing at a removed entity.
      */
     removeEntityWithChildren(entity: Entity): void;
     /**

package/dist/systems/triggerArea.js

@@ -177,7 +177,8 @@ export function createTriggerAreaEventsSystem(engine) {
             // Pass 2: synthesize per-tick onStay callbacks
             // -----------------------------------------------------------------------
             // Only run if an onStay callback is registered and there are tracked triggerers.
-            if (data.triggerCallbackMap.has(1 /* TriggerAreaEventType.TAET_STAY */) && data.insideTriggerers.size > 0) {
+            if (data.triggerCallbackMap.has(1 /* TriggerAreaEventType.TAET_STAY */) &&
+                data.insideTriggerers.size > 0) {
                 const onStay = data.triggerCallbackMap.get(1 /* TriggerAreaEventType.TAET_STAY */);
                 const currentTimestamp = Date.now();
                 for (const [triggererEntity, cachedResult] of data.insideTriggerers) {

package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.d.ts

@@ -1,13 +1,5 @@
 import _m0 from "protobufjs/minimal";
 import { Color3 } from "../../common/colors.gen";
-/** Mask for which bones an animation applies to. */
-/**
- * @public
- */
-export declare const enum AvatarEmoteMask {
-    AEM_FULL_BODY = 0,
-    AEM_UPPER_BODY = 1
-}
 /**
  * The AvatarShape component contains the information required to draw and animate avatar, acting as
  * a simplified GLTF container for this specific case.

package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.js

@@ -3,21 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PBAvatarShape = exports.AvatarEmoteMask = void 0;
+exports.PBAvatarShape = void 0;
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
 const colors_gen_1 = require("../../common/colors.gen");
 const protobufPackageSarasa = "decentraland.sdk.components";
-/** Mask for which bones an animation applies to. */
-/**
- * @public
- */
-var AvatarEmoteMask;
-(function (AvatarEmoteMask) {
-    AvatarEmoteMask[AvatarEmoteMask["AEM_FULL_BODY"] = 0] = "AEM_FULL_BODY";
-    AvatarEmoteMask[AvatarEmoteMask["AEM_UPPER_BODY"] = 1] = "AEM_UPPER_BODY";
-})(AvatarEmoteMask = exports.AvatarEmoteMask || (exports.AvatarEmoteMask = {}));
 function createBasePBAvatarShape() {
     return {
         id: "",

package/dist-cjs/engine/entity.js

@@ -59,6 +59,16 @@ var EntityState;
      */
     EntityState[EntityState["Reserved"] = 3] = "Reserved";
 })(EntityState = exports.EntityState || (exports.EntityState = {}));
+/**
+ * True when `entity`'s NUMBER falls in the renderer-reserved range, at any version.
+ *
+ * Masks rather than calling `EntityUtils.fromEntityId`, which allocates a tuple per call to
+ * read one number; this runs on every inbound CRDT message. `entity & MAX_U16` already lands
+ * in [0, 65535], so the `>>> 0` fromEntityId applies is a no-op here.
+ */
+function isReservedEntity(entity, reservedStaticEntities) {
+    return (entity & exports.MAX_U16) < reservedStaticEntities;
+}
 /**
  * @public
  */
@@ -93,7 +103,11 @@ function createEntityContainer(opts) {
             return generateNewEntity();
         }
         for (const [number, version] of removedEntities.getMap()) {
-            if (version < exports.MAX_U16) {
+            // Never recycle a renderer-reserved number: the renderer reissues those slots as
+            // toEntityId(number, version + 1) too, from the same stored version, so it would hand
+            // the scene an id belonging to a live remote player. Belt-and-braces — every writer
+            // into `removedEntities` refuses reserved numbers, so this cannot fire today.
+            if (number >= reservedStaticEntities && version < exports.MAX_U16) {
                 const entity = EntityUtils.toEntityId(number, version + 1);
                 // If the entity is not being used, we can re-use it
                 // If the entity was removed in this tick, we're not counting for the usedEntities, but we have it in the toRemoveEntityArray
@@ -106,7 +120,7 @@ function createEntityContainer(opts) {
         return generateNewEntity();
     }
     function removeEntity(entity) {
-        if (entity < reservedStaticEntities)
+        if (isReservedEntity(entity, reservedStaticEntities))
             return false;
         if (usedEntities.has(entity)) {
             usedEntities.delete(entity);
@@ -129,6 +143,12 @@ function createEntityContainer(opts) {
         return arr;
     }
     function updateRemovedEntity(entity) {
+        // Called for EVERY inbound DELETE_ENTITY, including the renderer's tombstones for
+        // departed remote players — so this is the door reserved numbers would otherwise enter
+        // the free list through. They need no tombstone: getEntityState reports them Reserved
+        // before it consults `removedEntities`, so `Removed` is unreachable for them anyway.
+        if (isReservedEntity(entity, reservedStaticEntities))
+            return false;
         const [n, v] = EntityUtils.fromEntityId(entity);
         // Update the removed entities map
         removedEntities.addTo(n, v);
@@ -139,6 +159,11 @@ function createEntityContainer(opts) {
         return true;
     }
     function updateUsedEntity(entity) {
+        // Same invariant as updateRemovedEntity. Unreachable from the CRDT path today
+        // (getEntityState returns `Reserved`, never `Unknown`), but the `v > 0` branch below
+        // would seed `removedEntities` with a reserved number.
+        if (isReservedEntity(entity, reservedStaticEntities))
+            return false;
         const [n, v] = EntityUtils.fromEntityId(entity);
         // if the entity was removed then abort fast
         if (removedEntities.has(n, v))
@@ -154,10 +179,12 @@ function createEntityContainer(opts) {
         return true;
     }
     function getEntityState(entity) {
-        const [n, v] = EntityUtils.fromEntityId(entity);
-        if (n < reservedStaticEntities) {
+        // Same guard as the three above, so `Engine.removeEntity` — which classifies via
+        // getEntityState — cannot disagree with whether this container releases the id.
+        if (isReservedEntity(entity, reservedStaticEntities)) {
             return EntityState.Reserved;
         }
+        const [n, v] = EntityUtils.fromEntityId(entity);
         if (usedEntities.has(entity)) {
             return EntityState.UsedEntity;
         }

package/dist-cjs/engine/index.js

@@ -41,6 +41,8 @@ const crdt_2 = require("../serialization/crdt");
 __exportStar(require("./input"), exports);
 __exportStar(require("./readonly"), exports);
 __exportStar(require("./types"), exports);
+/** RootEntity 0, PlayerEntity 1, CameraEntity 2 — see the engineInstance fields below. */
+const NAMED_STATIC_ENTITIES = 3;
 function preEngine(options) {
     const entityContainer = options?.entityContainer ?? (0, entity_1.createEntityContainer)();
     const componentsDefinition = new Map();
@@ -57,6 +59,18 @@ function preEngine(options) {
         return entity;
     }
     function removeEntity(entity) {
+        // The renderer streams the avatar range and drops the scene's deletes there, so purging
+        // locally is permanent: a one-shot component like PlayerIdentityData is never re-sent, and
+        // the entity is left as a moving Transform with no identity. The three named static
+        // entities are reserved too, but the renderer DOES apply scene deletes on them — that is
+        // how InputModifier.deleteFrom(engine.PlayerEntity) clears an input lock — so they must
+        // still be purged. Asking the container keeps this in step with whether it releases the
+        // id, including for a custom container with a different reserved range.
+        const [entityNumber] = entity_1.EntityUtils.fromEntityId(entity);
+        const isAvatarEntity = entityNumber >= NAMED_STATIC_ENTITIES && entityContainer.getEntityState(entity) === entity_1.EntityState.Reserved;
+        const released = entityContainer.removeEntity(entity);
+        if (isAvatarEntity)
+            return released;
         for (const [, component] of componentsDefinition) {
             // TODO: hack for the moment.
             // We still need the NetworkEntity to forward this message to the SyncTransport.
@@ -65,7 +79,7 @@ function preEngine(options) {
                 continue;
             component.entityDeleted(entity, true);
         }
-        return entityContainer.removeEntity(entity);
+        return released;
     }
     function removeEntityWithChildren(entity) {
         return (0, tree_1.removeEntityWithChildren)({ removeEntity, defineComponentFromSchema, getEntitiesWith, defineComponent }, entity);
@@ -289,7 +303,12 @@ function Engine(options) {
         RootEntity: 0,
         PlayerEntity: 1,
         CameraEntity: 2,
-        getEntityState: partialEngine.entityContainer.getEntityState,
+        // Delegated, not aliased. A detached `entityContainer.getEntityState` reference binds
+        // `this` to the engine, so a custom IEntityContainer that uses `this` silently reports the
+        // wrong state through the public API while the engine itself, which calls the container
+        // directly, reports the right one. Harmless for the built-in closure-based container, but
+        // removeEntity now classifies through getEntityState, so the two must never diverge.
+        getEntityState: (entity) => partialEngine.entityContainer.getEntityState(entity),
         addTransport: crdtSystem.addTransport,
         entityContainer: partialEngine.entityContainer
     };

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

@@ -55,11 +55,18 @@ export interface IEngine {
      * @public
      * Remove all components of an entity
      * @param entity - entity
+     * @returns whether the entity id was released for reuse. Ids in the renderer-reserved range
+     *   are never released, at any version. Components are still purged for
+     *   RootEntity/PlayerEntity/CameraEntity, but not for the avatar range.
      */
-    removeEntity(entity: Entity): void;
+    removeEntity(entity: Entity): boolean;
     /**
      * Remove all components of each entity in the tree made with Transform parenting
      * @param entity - the root entity of the tree
+     *
+     * May complete only partially and does not report it: nodes in the renderer-reserved range
+     * are refused by `removeEntity`, so a reserved node anywhere in the tree survives while its
+     * descendants are removed — leaving its `Transform.parent` pointing at a removed entity.
      */
     removeEntityWithChildren(entity: Entity): void;
     /**

package/dist-cjs/systems/triggerArea.js

@@ -203,7 +203,8 @@ function createTriggerAreaEventsSystem(engine) {
             // Pass 2: synthesize per-tick onStay callbacks
             // -----------------------------------------------------------------------
             // Only run if an onStay callback is registered and there are tracked triggerers.
-            if (data.triggerCallbackMap.has(1 /* TriggerAreaEventType.TAET_STAY */) && data.insideTriggerers.size > 0) {
+            if (data.triggerCallbackMap.has(1 /* TriggerAreaEventType.TAET_STAY */) &&
+                data.insideTriggerers.size > 0) {
                 const onStay = data.triggerCallbackMap.get(1 /* TriggerAreaEventType.TAET_STAY */);
                 const currentTimestamp = Date.now();
                 for (const [triggererEntity, cachedResult] of data.insideTriggerers) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dcl/ecs",
   "description": "Decentraland ECS",
-  "version": "7.26.1-31715266070.commit-0ddb8e7",
+  "version": "7.26.1-32157237851.commit-e712ef7",
   "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": "0ddb8e747bcf2d28e5bd201fe4e898d4ec08036d"
+  "commit": "e712ef71c81b53f1125e7b9658f3751ab455b63e"
 }