Fix delete component network message

packages/@dcl/ecs/src/serialization/crdt/message.ts

@@ -6,6 +6,8 @@ import { DeleteComponent } from './deleteComponent'
 import { DeleteEntity } from './deleteEntity'
 import { AppendValueOperation } from './appendValue'
 import { PutNetworkComponentOperation } from './network/putComponentNetwork'
+import { DeleteComponentNetwork } from './network/deleteComponentNetwork'
+import { DeleteEntityNetwork } from './network/deleteEntityNetwork'
 
 export function readMessage(buf: ByteBuffer): CrdtMessage | null {
   const header = CrdtMessageProtocol.getHeader(buf)
@@ -17,10 +19,14 @@ export function readMessage(buf: ByteBuffer): CrdtMessage | null {
     return PutNetworkComponentOperation.read(buf)
   } else if (header.type === CrdtMessageType.DELETE_COMPONENT) {
     return DeleteComponent.read(buf)
+  } else if (header.type === CrdtMessageType.DELETE_COMPONENT_NETWORK) {
+    return DeleteComponentNetwork.read(buf)
   } else if (header.type === CrdtMessageType.APPEND_VALUE) {
     return AppendValueOperation.read(buf)
   } else if (header.type === CrdtMessageType.DELETE_ENTITY) {
     return DeleteEntity.read(buf)
+  } else if (header.type === CrdtMessageType.DELETE_ENTITY_NETWORK) {
+    return DeleteEntityNetwork.read(buf)
   }
 
   return null

packages/@dcl/ecs/src/serialization/crdt/network/deleteComponentNetwork.ts

@@ -40,14 +40,12 @@ export namespace DeleteComponentNetwork {
       throw new Error('DeleteComponentOperation tried to read another message type.')
     }
 
-    const msg = {
+    return {
       ...header,
       entityId: buf.readUint32() as Entity,
       componentId: buf.readUint32(),
       timestamp: buf.readUint32(),
       networkId: buf.readUint32()
     }
-
-    return msg
   }
 }

packages/@dcl/ecs/src/serialization/crdt/network/putComponentNetwork.ts

@@ -1,7 +1,7 @@
 import { CrdtMessageProtocol } from '../crdtMessageProtocol'
 import { Entity } from '../../../engine/entity'
 import { ByteBuffer } from '../../ByteBuffer'
-import { CrdtMessageType, CRDT_MESSAGE_HEADER_LENGTH, PutComponentMessage } from '../types'
+import { CrdtMessageType, CRDT_MESSAGE_HEADER_LENGTH, PutComponentMessage, PutNetworkComponentMessage } from '../types'
 
 /**
  * @public
@@ -37,11 +37,11 @@ export namespace PutNetworkComponentOperation {
     buf.setUint32(startMessageOffset + 12, componentId)
     buf.setUint32(startMessageOffset + 16, timestamp)
     buf.setUint32(startMessageOffset + 20, networkId)
-    const newLocal = messageLength - MESSAGE_HEADER_LENGTH - CRDT_MESSAGE_HEADER_LENGTH
-    buf.setUint32(startMessageOffset + 24, newLocal)
+    const dataLength = messageLength - MESSAGE_HEADER_LENGTH - CRDT_MESSAGE_HEADER_LENGTH
+    buf.setUint32(startMessageOffset + 24, dataLength)
   }
 
-  export function read(buf: ByteBuffer): (PutComponentMessage & { networkId: number }) | null {
+  export function read(buf: ByteBuffer): PutNetworkComponentMessage | null {
     const header = CrdtMessageProtocol.readHeader(buf)
 
     if (!header) {

packages/@dcl/ecs/src/serialization/crdt/network/utils.ts

@@ -81,7 +81,6 @@ export function fixTransformParent(
   if (!transform) throw new Error('Invalid parent transform')
   // Generate new transform raw data with the parent
   const newTransform = { ...transform, parent }
-  console.log('Fix transform', message.entityId, newTransform)
   buffer.resetBuffer()
   TransformSchema.serialize(newTransform, buffer)
   return buffer.toBinary()

packages/@dcl/ecs/src/systems/crdt/index.ts

@@ -307,7 +307,6 @@ export function crdtSceneSystem(engine: PreEngine, onProcessEntityComponentChang
             continue
           }
         }
-
         // Common message
         transportBuffer.writeBuffer(message.messageBuffer, false)
       }

packages/@dcl/playground-assets/etc/playground-assets.api.md

@@ -1393,6 +1393,21 @@ export interface INetowrkEntityType {
     networkId: number;
 }
 
+// Warning: (ae-missing-release-tag) "INetowrkParent" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type INetowrkParent = LastWriteWinElementSetComponentDefinition<INetowrkParentType>;
+
+// Warning: (ae-missing-release-tag) "INetowrkParentType" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface INetowrkParentType {
+    // (undocumented)
+    entityId: Entity;
+    // (undocumented)
+    networkId: number;
+}
+
 // Warning: (tsdoc-html-tag-missing-string) The HTML element has an invalid attribute: Expecting an HTML string starting with a single-quote or double-quote character
 // Warning: (tsdoc-escape-greater-than) The ">" character should be escaped using a backslash to avoid confusion with an HTML tag
 // Warning: (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
@@ -1868,6 +1883,9 @@ export interface NameType {
 // @alpha
 export const NetworkEntity: INetowrkEntity;
 
+// @alpha
+export const NetworkParent: INetowrkParent;
+
 // @public (undocumented)
 export const enum NftFrameType {
     // (undocumented)
@@ -3300,9 +3318,7 @@ export namespace PutNetworkComponentOperation {
     const // (undocumented)
     MESSAGE_HEADER_LENGTH = 20;
     // (undocumented)
-    export function read(buf: ByteBuffer): (PutComponentMessage & {
-        networkId: number;
-    }) | null;
+    export function read(buf: ByteBuffer): PutNetworkComponentMessage | null;
     export function write(entity: Entity, timestamp: number, componentId: number, networkId: number, data: Uint8Array, buf: ByteBuffer): void;
 }
 

packages/@dcl/sdk/src/index.ts

@@ -43,5 +43,4 @@ export async function onStart() {
       }
     }
   }
-  console.log('[onStart]: Finished', response.data)
 }

packages/@dcl/sdk/src/network/filter.ts

@@ -5,8 +5,9 @@ import {
   EntityUtils,
   RESERVED_STATIC_ENTITIES,
   CrdtMessageType,
-  SyncComponents,
-  NetworkEntity
+  SyncComponents as _SyncComponents,
+  NetworkEntity as _NetworkEntity,
+  engine
 } from '@dcl/ecs'
 
 export function syncFilter(message: Omit<TransportMessage, 'messageBuffer'>) {
@@ -23,11 +24,16 @@ export function syncFilter(message: Omit<TransportMessage, 'messageBuffer'>) {
     return false
   }
 
-  // Network Entity Always
-  if (message.type === CrdtMessageType.DELETE_ENTITY) {
+  const NetworkEntity = engine.getComponent(_NetworkEntity.componentId) as typeof _NetworkEntity
+  const network = NetworkEntity.getOrNull(message.entityId)
+  // Delete Network Entity Always
+  if (
+    message.type === CrdtMessageType.DELETE_ENTITY_NETWORK ||
+    (network && message.type === CrdtMessageType.DELETE_ENTITY)
+  ) {
     return true
   }
-
+  const SyncComponents = engine.getComponent(_SyncComponents.componentId) as typeof _SyncComponents
   const sync = SyncComponents.getOrNull(message.entityId)
   if (!sync) return false
 

packages/@dcl/sdk/src/network/message-bus-sync.ts

@@ -8,7 +8,7 @@ import { BinaryMessageBus, CommsMessage } from './binary-message-bus'
 import {
   definePlayersInScene,
   fetchProfile,
-  oldestUser,
+  oldestUser as _oldestUser,
   setInitialized,
   stateInitialized,
   stateInitializedChecker,

packages/@dcl/sdk/src/network/utils.ts

@@ -1,8 +1,15 @@
-import { EngineInfo, Entity, IEngine, Schemas } from '@dcl/ecs'
+import {
+  EngineInfo as _EngineInfo,
+  Entity,
+  IEngine,
+  NetworkEntity as _NetworkEntity,
+  Schemas,
+  LastWriteWinElementSetComponentDefinition,
+  PBEngineInfo
+} from '@dcl/ecs'
 import { componentNumberFromName } from '@dcl/ecs/dist/components/component-number'
 
 import { getUserData } from '~system/UserIdentity'
-import { getConnectedPlayers } from '~system/Players'
 import { SyncEntity } from './entities'
 import { IProfile } from './message-bus-sync'
 
@@ -60,7 +67,6 @@ export function createPlayerTimestampData(engine: IEngine, profile: IProfile, sy
  * Check if I'm the older user to send the initial state
  */
 export function oldestUser(engine: IEngine, profile: IProfile, syncEntity: SyncEntity): boolean {
-  console.log('[ME]: ', profile)
   const PlayersInScene = definePlayersInScene(engine)
   // When the user leaves the scene but it's still connected.
   if (!PlayersInScene.has(playerSceneEntity)) {
@@ -69,7 +75,6 @@ export function oldestUser(engine: IEngine, profile: IProfile, syncEntity: SyncE
   }
   const { timestamp } = PlayersInScene.get(playerSceneEntity)
   for (const [_, player] of engine.getEntitiesWith(PlayersInScene)) {
-    console.log(player)
     if (player.timestamp < timestamp) return false
   }
   return true
@@ -79,6 +84,9 @@ export function oldestUser(engine: IEngine, profile: IProfile, syncEntity: SyncE
  * Ignore CRDT's initial messages from the renderer.
  */
 export function syncTransportIsReady(engine: IEngine) {
+  const EngineInfo = engine.getComponent(
+    _EngineInfo.componentId
+  ) as LastWriteWinElementSetComponentDefinition<PBEngineInfo>
   if (!INITIAL_CRDT_RENDERER_MESSAGES_SENT) {
     const engineInfo = EngineInfo.getOrNull(engine.RootEntity)
     if (engineInfo && engineInfo.tickNumber > 2) {
@@ -93,22 +101,26 @@ export function syncTransportIsReady(engine: IEngine) {
  * Add the playerSceneData component and syncronize it till we receive the state.
  * This fn should be added as a system so it runs on every tick
  */
-export function stateInitializedChecker(engine: IEngine, profile: IProfile, syncEntity: SyncEntity) {
-  const PlayersInScene = definePlayersInScene(engine)
+// TODO: Had to comment all the logic because getConnectedPlayers was not working as expected
+// A lot of raise conditions. For now we will go with the approach that every client that it's initialized will send his crdt state.
+export function stateInitializedChecker(engine: IEngine, _profile: IProfile, _syncEntity: SyncEntity) {
+  // const PlayersInScene = definePlayersInScene(engine)
+  const EngineInfo = engine.getComponent(_EngineInfo.componentId) as typeof _EngineInfo
+  // const NetworkEntity = engine.getComponent(_NetworkEntity.componentId) as INetowrkEntity
   async function enterScene() {
-    if (!playerSceneEntity) {
-      createPlayerTimestampData(engine, profile, syncEntity)
-    }
+    // if (!playerSceneEntity) {
+    //   createPlayerTimestampData(engine, profile, syncEntity)
+    // }
 
     /**
      * Keeps PlayersInScene up-to-date with the current players.
      */
-    const connectedPlayers = await getConnectedPlayers({})
-    for (const [entity, player] of engine.getEntitiesWith(PlayersInScene)) {
-      if (!connectedPlayers.players.find(($) => $.userId === player.userId)) {
-        PlayersInScene.deleteFrom(entity)
-      }
-    }
+    // const connectedPlayers = await getConnectedPlayers({})
+    // for (const [entity, player] of engine.getEntitiesWith(PlayersInScene)) {
+    //   if (!connectedPlayers.players.find(($) => $.userId === player.userId)) {
+    //     PlayersInScene.deleteFrom(entity)
+    //   }
+    // }
 
     // Wait for comms to be ready ?? ~3000ms
     if ((EngineInfo.getOrNull(engine.RootEntity)?.tickNumber ?? 0) > 100) {
@@ -117,14 +129,14 @@ export function stateInitializedChecker(engine: IEngine, profile: IProfile, sync
     }
 
     // If we already have data from players, dont send the heartbeat messages
-    if (connectedPlayers.players.length) return
+    // if (connectedPlayers.players.length) return
 
-    if (!stateInitialized && playerSceneEntity) {
-      // Send this data to all the players connected (new and old)
-      // So everyone can decide if it's the oldest one or no.
-      // It's for the case that multiple users enters ~ at the same time.
-      PlayersInScene.getMutable(playerSceneEntity)
-    }
+    // if (!stateInitialized && playerSceneEntity) {
+    //   // Send this data to all the players connected (new and old)
+    //   // So everyone can decide if it's the oldest one or no.
+    //   // It's for the case that multiple users enters ~ at the same time.
+    //   PlayersInScene.getMutable(playerSceneEntity)
+    // }
   }
   void enterScene()
 }

test/build-ecs/fixtures/sdk7-humming-birds-sync/src/create-cube.ts

@@ -124,12 +124,15 @@ export function cubeSystem() {
   for (const [entity, grabbed] of engine.getEntitiesWith(Grabbed)) {
     if (grabbed.userId === myProfile.userId) {
       if (inputSystem.isTriggered(InputAction.IA_JUMP, PointerEventType.PET_DOWN)) {
-        Grabbed.getMutable(entity).userId = ''
+        // Grabbed.getMutable(entity).userId = ''
         // TODO: Fix deleteFrom not working.
-        // Grabbed.deleteFrom(entity)
+        Grabbed.deleteFrom(entity)
         continue
       }
       const { x, y, z } = Transform.get(engine.PlayerEntity).position
+      if (JSON.stringify(Transform.get(entity).position) === JSON.stringify({ x, y, z })) {
+        continue
+      }
       Transform.getMutable(entity).position = { x, y, z }
       const textEntity = getFirstChild(entity)!
       TextShape.getMutable(textEntity).text = `${x.toFixed(1)}, ${y.toFixed(1)}, ${z.toFixed(1)}`

test/build-ecs/fixtures/sdk7-humming-birds-sync/src/index.ts

@@ -30,7 +30,7 @@ export async function main() {
   const userId = (await getUserData({})).data?.userId ?? ''
   setupUi(userId)
   engine.addSystem(moveHummingBirds)
-  gameStatusServer()
+  // gameStatusServer()
   // createMovingPlatforms()
   // createCubes()
 

test/sdk/network/parent.spec.ts

@@ -4,4 +4,5 @@ import { addSyncTransport } from '../../../packages/@dcl/sdk/network'
 describe('Network Parenting', () => {
   const engineA = Engine()
   const engineB = Engine()
+  addSyncTransport()
 })