@dcl/ecs 7.0.6-4087883663.commit-054d424 → 7.0.6-4106696113.commit-cda3cfd

package/dist/engine/input.js

@@ -43,12 +43,29 @@ export function createInputSystem(engine) {
             InternalInputStateComponent.getMutable(engine.RootEntity).timestampLastUpdate = state.currentTimestamp;
         }
     }
+    function* commandIterator() {
+        for (const [, value] of engine.getEntitiesWith(PointerEventsResult)) {
+            yield* value.commands;
+        }
+    }
+    function findLastAction(pointerEventType, inputAction, entity) {
+        let commandToReturn = undefined;
+        for (const command of commandIterator()) {
+            if (command.button === inputAction &&
+                command.state === pointerEventType &&
+                (!entity || (command.hit && entity === command.hit.entityId))) {
+                if (!commandToReturn || command.timestamp >= commandToReturn.timestamp)
+                    commandToReturn = command;
+            }
+        }
+        return commandToReturn;
+    }
     function buttonStateUpdateSystem() {
         const component = PointerEventsResult.getOrNull(engine.RootEntity);
         if (!component)
             return;
         const state = InternalInputStateComponent.getMutable(engine.RootEntity);
-        for (const command of component.commands) {
+        for (const command of commandIterator()) {
             if (command.timestamp > state.buttonState[command.button].ts) {
                 if (command.state === 1 /* PointerEventType.PET_DOWN */) {
                     state.buttonState[command.button].value = true;
@@ -73,16 +90,12 @@ export function createInputSystem(engine) {
         return null;
     }
     function findClick(inputAction, entity) {
-        const component = PointerEventsResult.getOrNull(engine.RootEntity);
-        if (!component)
-            return null;
-        const commands = component.commands;
         // We search the last DOWN command sorted by timestamp
-        const down = findLastAction(commands, 1 /* PointerEventType.PET_DOWN */, inputAction, entity);
+        const down = findLastAction(1 /* PointerEventType.PET_DOWN */, inputAction, entity);
         // We search the last UP command sorted by timestamp
         if (!down)
             return null;
-        const up = findLastAction(commands, 0 /* PointerEventType.PET_UP */, inputAction, entity);
+        const up = findLastAction(0 /* PointerEventType.PET_UP */, inputAction, entity);
         if (!up)
             return null;
         const state = InternalInputStateComponent.get(engine.RootEntity);
@@ -105,11 +118,8 @@ export function createInputSystem(engine) {
         return null;
     }
     function findInputCommand(inputAction, pointerEventType, entity) {
-        const component = PointerEventsResult.getOrNull(engine.RootEntity);
-        if (!component)
-            return null;
         // We search the last pointer Event command sorted by timestamp
-        const command = findLastAction(component.commands, pointerEventType, inputAction, entity);
+        const command = findLastAction(pointerEventType, inputAction, entity);
         if (!command)
             return null;
         const state = InternalInputStateComponent.get(engine.RootEntity);
@@ -143,15 +153,3 @@ export function createInputSystem(engine) {
         isTriggered
     };
 }
-function findLastAction(commands, pointerEventType, inputAction, entity) {
-    let commandToReturn = undefined;
-    for (const command of commands) {
-        if (command.button === inputAction &&
-            command.state === pointerEventType &&
-            (!entity || (command.hit && entity === command.hit.entityId))) {
-            if (!commandToReturn || command.timestamp >= commandToReturn.timestamp)
-                commandToReturn = command;
-        }
-    }
-    return commandToReturn;
-}

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

@@ -0,0 +1 @@
+export {};

package/dist/serialization/crdt/crdtMessageProtocol.js

@@ -0,0 +1,68 @@
+import { CRDT_MESSAGE_HEADER_LENGTH } from './types';
+/**
+ * @internal
+ */
+export var CrdtMessageProtocol;
+(function (CrdtMessageProtocol) {
+    /**
+     * Validate if the message incoming is completed
+     * @param buf - ByteBuffer
+     */
+    function validate(buf) {
+        const rem = buf.remainingBytes();
+        if (rem < CRDT_MESSAGE_HEADER_LENGTH) {
+            return false;
+        }
+        const messageLength = buf.getUint32(buf.currentReadOffset());
+        if (rem < messageLength) {
+            return false;
+        }
+        return true;
+    }
+    CrdtMessageProtocol.validate = validate;
+    /**
+     * Get the current header, consuming the bytes involved.
+     * @param buf - ByteBuffer
+     * @returns header or null if there is no validated message
+     */
+    function readHeader(buf) {
+        if (!validate(buf)) {
+            return null;
+        }
+        return {
+            length: buf.readUint32(),
+            type: buf.readUint32()
+        };
+    }
+    CrdtMessageProtocol.readHeader = readHeader;
+    /**
+     * Get the current header, without consuming the bytes involved.
+     * @param buf - ByteBuffer
+     * @returns header or null if there is no validated message
+     */
+    function getHeader(buf) {
+        if (!validate(buf)) {
+            return null;
+        }
+        const currentOffset = buf.currentReadOffset();
+        return {
+            length: buf.getUint32(currentOffset),
+            type: buf.getUint32(currentOffset + 4)
+        };
+    }
+    CrdtMessageProtocol.getHeader = getHeader;
+    /**
+     * Consume the incoming message without processing it.
+     * @param buf - ByteBuffer
+     * @returns true in case of success or false if there is no valid message.
+     */
+    function consumeMessage(buf) {
+        const header = getHeader(buf);
+        if (!header) {
+            return false;
+        }
+        buf.incrementReadOffset(header.length);
+        return true;
+    }
+    CrdtMessageProtocol.consumeMessage = consumeMessage;
+})(CrdtMessageProtocol || (CrdtMessageProtocol = {}));

package/dist/serialization/crdt/deleteComponent.js

@@ -1,12 +1,11 @@
-import { CrdtMessageProtocol } from '.';
+import { CrdtMessageProtocol } from './crdtMessageProtocol';
 import { CrdtMessageType, CRDT_MESSAGE_HEADER_LENGTH } from './types';
 /**
  * @internal
  */
 export var DeleteComponent;
 (function (DeleteComponent) {
-    // TODO: change timestamp to 32 bit and remove buffer length (-8 bytes)
-    DeleteComponent.MESSAGE_HEADER_LENGTH = 20;
+    DeleteComponent.MESSAGE_HEADER_LENGTH = 12;
     /**
      * Write DeleteComponent message
      */
@@ -20,10 +19,7 @@ export var DeleteComponent;
         // Write ComponentOperation header
         buf.setUint32(startMessageOffset + 8, entity);
         buf.setUint32(startMessageOffset + 12, componentId);
-        // TODO: change timestamp to 32bit (-4 bytes)
-        buf.setUint64(startMessageOffset + 16, BigInt(timestamp));
-        // TODO: remove buffer length (-4 bytes)
-        buf.setUint32(startMessageOffset + 24, 0);
+        buf.setUint32(startMessageOffset + 16, timestamp);
     }
     DeleteComponent.write = write;
     function read(buf) {
@@ -38,10 +34,8 @@ export var DeleteComponent;
             ...header,
             entityId: buf.readUint32(),
             componentId: buf.readUint32(),
-            timestamp: Number(buf.readUint64())
+            timestamp: buf.readUint32()
         };
-        // TODO: remove buffer length
-        buf.incrementReadOffset(4);
         return msg;
     }
     DeleteComponent.read = read;

package/dist/serialization/crdt/deleteEntity.js

@@ -1,4 +1,4 @@
-import { CrdtMessageProtocol } from '.';
+import { CrdtMessageProtocol } from './crdtMessageProtocol';
 import { CrdtMessageType, CRDT_MESSAGE_HEADER_LENGTH } from './types';
 /**
  * @internal
@@ -20,7 +20,7 @@ export var DeleteEntity;
             return null;
         }
         if (header.type !== CrdtMessageType.DELETE_ENTITY) {
-            throw new Error('DeleteComponentOperation tried to read another message type.');
+            throw new Error('DeleteEntity tried to read another message type.');
         }
         return {
             ...header,

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

@@ -1,4 +1,5 @@
-export * from './types';
 export * from './deleteComponent';
-export * from './putComponent';
 export * from './deleteEntity';
+export * from './putComponent';
+export * from './types';
+export * from './crdtMessageProtocol';

package/dist/serialization/crdt/index.js

@@ -1,72 +1,5 @@
-import { CRDT_MESSAGE_HEADER_LENGTH } from './types';
-export * from './types';
 export * from './deleteComponent';
-export * from './putComponent';
 export * from './deleteEntity';
-/**
- * @internal
- */
-export var CrdtMessageProtocol;
-(function (CrdtMessageProtocol) {
-    /**
-     * Validate if the message incoming is completed
-     * @param buf - ByteBuffer
-     */
-    function validate(buf) {
-        const rem = buf.remainingBytes();
-        if (rem < CRDT_MESSAGE_HEADER_LENGTH) {
-            return false;
-        }
-        const messageLength = buf.getUint32(buf.currentReadOffset());
-        if (rem < messageLength) {
-            return false;
-        }
-        return true;
-    }
-    CrdtMessageProtocol.validate = validate;
-    /**
-     * Get the current header, consuming the bytes involved.
-     * @param buf - ByteBuffer
-     * @returns header or null if there is no validated message
-     */
-    function readHeader(buf) {
-        if (!validate(buf)) {
-            return null;
-        }
-        return {
-            length: buf.readUint32(),
-            type: buf.readUint32()
-        };
-    }
-    CrdtMessageProtocol.readHeader = readHeader;
-    /**
-     * Get the current header, without consuming the bytes involved.
-     * @param buf - ByteBuffer
-     * @returns header or null if there is no validated message
-     */
-    function getHeader(buf) {
-        if (!validate(buf)) {
-            return null;
-        }
-        const currentOffset = buf.currentReadOffset();
-        return {
-            length: buf.getUint32(currentOffset),
-            type: buf.getUint32(currentOffset + 4)
-        };
-    }
-    CrdtMessageProtocol.getHeader = getHeader;
-    /**
-     * Consume the incoming message without processing it.
-     * @param buf - ByteBuffer
-     * @returns true in case of success or false if there is no valid message.
-     */
-    function consumeMessage(buf) {
-        const header = getHeader(buf);
-        if (!header) {
-            return false;
-        }
-        buf.incrementReadOffset(header.length);
-        return true;
-    }
-    CrdtMessageProtocol.consumeMessage = consumeMessage;
-})(CrdtMessageProtocol || (CrdtMessageProtocol = {}));
+export * from './putComponent';
+export * from './types';
+export * from './crdtMessageProtocol';

package/dist/serialization/crdt/message.js

@@ -1,5 +1,8 @@
-import { CrdtMessageProtocol, DeleteComponent, DeleteEntity, PutComponentOperation } from '.';
+import { CrdtMessageProtocol } from './crdtMessageProtocol';
 import { CrdtMessageType } from './types';
+import { PutComponentOperation } from './putComponent';
+import { DeleteComponent } from './deleteComponent';
+import { DeleteEntity } from './deleteEntity';
 export function readMessage(buf) {
     const header = CrdtMessageProtocol.getHeader(buf);
     if (!header)

package/dist/serialization/crdt/putComponent.js

@@ -1,11 +1,11 @@
-import { CrdtMessageProtocol } from '.';
+import { CrdtMessageProtocol } from './crdtMessageProtocol';
 import { CrdtMessageType, CRDT_MESSAGE_HEADER_LENGTH } from './types';
 /**
  * @internal
  */
 export var PutComponentOperation;
 (function (PutComponentOperation) {
-    PutComponentOperation.MESSAGE_HEADER_LENGTH = 20;
+    PutComponentOperation.MESSAGE_HEADER_LENGTH = 16;
     /**
      * Call this function for an optimal writing data passing the ByteBuffer
      *  already allocated
@@ -22,9 +22,9 @@ export var PutComponentOperation;
         // Write ComponentOperation header
         buf.setUint32(startMessageOffset + 8, entity);
         buf.setUint32(startMessageOffset + 12, componentDefinition.componentId);
-        buf.setUint64(startMessageOffset + 16, BigInt(timestamp));
+        buf.setUint32(startMessageOffset + 16, timestamp);
         const newLocal = messageLength - PutComponentOperation.MESSAGE_HEADER_LENGTH - CRDT_MESSAGE_HEADER_LENGTH;
-        buf.setUint32(startMessageOffset + 24, newLocal);
+        buf.setUint32(startMessageOffset + 20, newLocal);
     }
     PutComponentOperation.write = write;
     function read(buf) {
@@ -39,7 +39,7 @@ export var PutComponentOperation;
             ...header,
             entityId: buf.readUint32(),
             componentId: buf.readUint32(),
-            timestamp: Number(buf.readUint64()),
+            timestamp: buf.readUint32(),
             data: buf.readBuffer()
         };
     }

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

@@ -10,11 +10,11 @@ export declare enum CrdtMessageType {
     MAX_MESSAGE_TYPE = 4
 }
 /**
- * Min. length = header (8 bytes) + 20 bytes = 28 bytes
+ * Min. length = header (8 bytes) + 16 bytes = 24 bytes
  *
- * @param entity - uint32 number of the entity
- * @param componentId - uint32 number of id
- * @param timestamp - Uint64 Lamport timestamp
+ * @param entity - Uint32 number of the entity
+ * @param componentId - Uint32 number of id
+ * @param timestamp - Uint32 Lamport timestamp
  * @param data - Uint8[] data of component => length(4 bytes) + block of bytes[0..length-1]
  * @public
  */
@@ -26,6 +26,9 @@ export type PutComponentMessageBody = {
     data: Uint8Array;
 };
 /**
+ * @param entity - Uint32 number of the entity
+ * @param componentId - Uint32 number of id
+ * @param timestamp - Uint32 Lamport timestamp
  * @public
  */
 export type DeleteComponentMessageBody = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/ecs",
-  "version": "7.0.6-4087883663.commit-054d424",
+  "version": "7.0.6-4106696113.commit-cda3cfd",
   "description": "Decentraland ECS",
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
@@ -27,7 +27,7 @@
     "ts-proto": "^1.112.0"
   },
   "dependencies": {
-    "@dcl/crdt": "7.0.6-4087883663.commit-054d424",
+    "@dcl/crdt": "7.0.6-4106696113.commit-cda3cfd",
     "@dcl/js-runtime": "file:../js-runtime",
     "@dcl/protocol": "1.0.0-4085628047.commit-0f6384e"
   },
@@ -41,5 +41,5 @@
     "displayName": "ECS",
     "tsconfig": "./tsconfig.json"
   },
-  "commit": "054d424646fc6082e7a29ebf4cc5903454205935"
+  "commit": "cda3cfd5ce0ddeb287ff28c1e4f1ad3329c017c0"
 }