@dcl/ecs 7.0.6-4177592674.commit-39cdc99 → 7.0.6-4183962432.commit-2fbe270

package/dist/systems/crdt/index.js

@@ -1,6 +1,6 @@
 import { EntityState } from '../../engine/entity';
 import { ReadWriteByteBuffer } from '../../serialization/ByteBuffer';
-import { CrdtMessageProtocol } from '../../serialization/crdt';
+import { AppendValueOperation, CrdtMessageProtocol } from '../../serialization/crdt';
 import { DeleteComponent } from '../../serialization/crdt/deleteComponent';
 import { DeleteEntity } from '../../serialization/crdt/deleteEntity';
 import { PutComponentOperation } from '../../serialization/crdt/putComponent';
@@ -35,7 +35,6 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
                 if (header.type === CrdtMessageType.DELETE_COMPONENT) {
                     const message = DeleteComponent.read(buffer);
                     receivedMessages.push({
-                        ...header,
                         ...message,
                         transportId,
                         messageBuffer: buffer.buffer().subarray(offset, buffer.currentReadOffset())
@@ -44,7 +43,6 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
                 else if (header.type === CrdtMessageType.PUT_COMPONENT) {
                     const message = PutComponentOperation.read(buffer);
                     receivedMessages.push({
-                        ...header,
                         ...message,
                         transportId,
                         messageBuffer: buffer.buffer().subarray(offset, buffer.currentReadOffset())
@@ -53,7 +51,14 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
                 else if (header.type === CrdtMessageType.DELETE_ENTITY) {
                     const message = DeleteEntity.read(buffer);
                     receivedMessages.push({
-                        ...header,
+                        ...message,
+                        transportId,
+                        messageBuffer: buffer.buffer().subarray(offset, buffer.currentReadOffset())
+                    });
+                }
+                else if (header.type === CrdtMessageType.APPEND_VALUE) {
+                    const message = AppendValueOperation.read(buffer);
+                    receivedMessages.push({
                         ...message,
                         transportId,
                         messageBuffer: buffer.buffer().subarray(offset, buffer.currentReadOffset())
@@ -99,13 +104,13 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
                 }
                 const component = engine.getComponentOrNull(msg.componentId);
                 if (component) {
-                    const [conflictMessage] = component.updateFromCrdt(msg);
+                    const [conflictMessage, value] = component.updateFromCrdt(msg);
                     if (conflictMessage) {
                         const offset = bufferForOutdated.currentWriteOffset();
                         if (conflictMessage.type === CrdtMessageType.PUT_COMPONENT) {
                             PutComponentOperation.write(msg.entityId, conflictMessage.timestamp, conflictMessage.componentId, conflictMessage.data, bufferForOutdated);
                         }
-                        else {
+                        else if (conflictMessage.type === CrdtMessageType.DELETE_COMPONENT) {
                             DeleteComponent.write(msg.entityId, component.componentId, conflictMessage.timestamp, bufferForOutdated);
                         }
                         outdatedMessages.push({
@@ -116,7 +121,7 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
                     else {
                         // Add message to transport queue to be processed by others transports
                         broadcastMessages.push(msg);
-                        onProcessEntityComponentChange && onProcessEntityComponentChange(msg.entityId, msg.type, component);
+                        onProcessEntityComponentChange && onProcessEntityComponentChange(msg.entityId, msg.type, component, value);
                     }
                 }
             }
@@ -155,11 +160,19 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
                     else if (message.type === CrdtMessageType.DELETE_COMPONENT) {
                         DeleteComponent.write(message.entityId, component.componentId, message.timestamp, buffer);
                     }
+                    else if (message.type === CrdtMessageType.APPEND_VALUE) {
+                        AppendValueOperation.write(message.entityId, message.timestamp, message.componentId, message.data, buffer);
+                    }
                     crdtMessages.push({
                         ...message,
                         messageBuffer: buffer.buffer().subarray(offset, buffer.currentWriteOffset())
                     });
-                    onProcessEntityComponentChange && onProcessEntityComponentChange(message.entityId, message.type, component);
+                    if (onProcessEntityComponentChange) {
+                        const rawValue = message.type === CrdtMessageType.PUT_COMPONENT || message.type === CrdtMessageType.APPEND_VALUE
+                            ? component.get(message.entityId)
+                            : undefined;
+                        onProcessEntityComponentChange(message.entityId, message.type, component, rawValue);
+                    }
                 }
             }
         }

package/dist/systems/events.d.ts

@@ -1,10 +1,10 @@
 import { InputAction } from '../components/generated/pb/decentraland/sdk/components/common/input_action.gen';
-import { PBPointerEventsResult_PointerCommand } from '../components/generated/pb/decentraland/sdk/components/pointer_events_result.gen';
+import { PBPointerEventsResult } from '../components/generated/pb/decentraland/sdk/components/pointer_events_result.gen';
 import { Entity } from '../engine/entity';
 /**
  * @public
  */
-export type EventSystemCallback = (event: PBPointerEventsResult_PointerCommand) => void;
+export type EventSystemCallback = (event: PBPointerEventsResult) => void;
 /**
  * @public
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/ecs",
-  "version": "7.0.6-4177592674.commit-39cdc99",
+  "version": "7.0.6-4183962432.commit-2fbe270",
   "description": "Decentraland ECS",
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@dcl/js-runtime": "file:../js-runtime",
-    "@dcl/protocol": "1.0.0-4114477251.commit-ccb88d6"
+    "@dcl/protocol": "1.0.0-4177500465.commit-247c87f"
   },
   "files": [
     "dist",
@@ -40,5 +40,5 @@
     "displayName": "ECS",
     "tsconfig": "./tsconfig.json"
   },
-  "commit": "39cdc99ea857c63f707ec9188836116d838fa10e"
+  "commit": "2fbe270d3909a3f1cb2a1794544288e5e5d602aa"
 }