@dcl/sdk 7.5.8-11020113946.commit-53f6ae5 → 7.5.8-11033502112.commit-95b8f41

package/network/message-bus-sync.js

@@ -8,6 +8,7 @@ import { definePlayerHelper } from '../players';
 import { serializeCrdtMessages } from '../internal/transports/logger';
 // user that we asked for the inital crdt state
 export function addSyncTransport(engine, sendBinary, getUserData) {
+    const DEBUG_NETWORK_MESSAGES = () => globalThis.DEBUG_NETWORK_MESSAGES ?? true;
     // Profile Info
     const myProfile = {};
     fetchProfile(myProfile, getUserData);
@@ -21,17 +22,20 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
         pendingMessageBusMessagesToSend.length = 0;
         return messages;
     }
+    let transportInitialzed = false;
     // Add Sync Transport
     const transport = {
         filter: syncFilter(engine),
         send: async (message) => {
-            if (message.byteLength) {
-                // console.log(Array.from(serializeCrdtMessages('[send CRDT]: ', message, engine)))
+            if (message.byteLength && transportInitialzed) {
+                DEBUG_NETWORK_MESSAGES() &&
+                    console.log(...Array.from(serializeCrdtMessages('[NetworkMessage sent]:', message, engine)));
                 binaryMessageBus.emit(CommsMessage.CRDT, message);
             }
             const messages = getMessagesToSend();
             const response = await sendBinary({ data: messages });
             binaryMessageBus.__processMessages(response.data);
+            transportInitialzed = true;
         },
         type: 'network'
     };
@@ -42,10 +46,11 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
         const { sender, data } = decodeCRDTState(value);
         if (sender !== myProfile.userId)
             return;
-        console.log('[Processing CRDT State]', data.byteLength);
+        DEBUG_NETWORK_MESSAGES() && console.log('[Processing CRDT State]', data.byteLength);
         transport.onmessage(data);
     });
-    binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, (_, userId) => {
+    binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, (message, userId) => {
+        transport.onmessage(message);
         binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, engineToCrdt(engine)));
     });
     const players = definePlayerHelper(engine);
@@ -53,20 +58,20 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
     players.onEnterScene((player) => {
         if (player.userId === myProfile.userId && !requestCrdtStateWhenConnected) {
             if (RealmInfo.getOrNull(engine.RootEntity)?.isConnectedSceneRoom) {
-                console.log('Requesting state');
-                binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, new Uint8Array());
+                DEBUG_NETWORK_MESSAGES() && console.log('Requesting state');
+                binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, engineToCrdt(engine));
             }
             else {
-                console.log('Waiting to be conneted');
+                DEBUG_NETWORK_MESSAGES() && console.log('Waiting to be conneted');
                 requestCrdtStateWhenConnected = true;
             }
         }
     });
     RealmInfo.onChange(engine.RootEntity, (value) => {
         if (value?.isConnectedSceneRoom && requestCrdtStateWhenConnected) {
-            console.log('Requesting state.');
+            DEBUG_NETWORK_MESSAGES() && console.log('Requesting state.');
             requestCrdtStateWhenConnected = false;
-            binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, new Uint8Array());
+            binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, engineToCrdt(engine));
         }
     });
     players.onLeaveScene((userId) => {
@@ -76,7 +81,8 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
     });
     // Process CRDT messages here
     binaryMessageBus.on(CommsMessage.CRDT, (value) => {
-        console.log(Array.from(serializeCrdtMessages('[NetworkMessage]', value, engine)));
+        DEBUG_NETWORK_MESSAGES() &&
+            console.log(Array.from(serializeCrdtMessages('[NetworkMessage received]:', value, engine)));
         transport.onmessage(value);
     });
     return {
@@ -113,4 +119,4 @@ function encodeCRDTState(address, data) {
     serializedMessage.set(data, addressBuffer.byteLength + 1);
     return serializedMessage;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"message-bus-sync.js","sourceRoot":"","sources":["../src/network/message-bus-sync.ts"],"names":[],"mappings":"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","sourcesContent":["import { IEngine, Transport, RealmInfo } from '@dcl/ecs'\nimport { type SendBinaryRequest, type SendBinaryResponse } from '~system/CommunicationsController'\n\nimport { syncFilter } from './filter'\nimport { engineToCrdt } from './state'\nimport { BinaryMessageBus, CommsMessage, decodeString, encodeString } from './binary-message-bus'\nimport { fetchProfile } from './utils'\nimport { entityUtils } from './entities'\nimport { GetUserDataRequest, GetUserDataResponse } from '~system/UserIdentity'\nimport { definePlayerHelper } from '../players'\nimport { serializeCrdtMessages } from '../internal/transports/logger'\n\nexport type IProfile = { networkId: number; userId: string }\n// user that we asked for the inital crdt state\nexport function addSyncTransport(\n  engine: IEngine,\n  sendBinary: (msg: SendBinaryRequest) => Promise<SendBinaryResponse>,\n  getUserData: (value: GetUserDataRequest) => Promise<GetUserDataResponse>\n) {\n  // Profile Info\n  const myProfile: IProfile = {} as IProfile\n  fetchProfile(myProfile!, getUserData)\n\n  // Entity utils\n  const entityDefinitions = entityUtils(engine, myProfile)\n\n  // List of MessageBuss messsages to be sent on every frame to comms\n  const pendingMessageBusMessagesToSend: Uint8Array[] = []\n  const binaryMessageBus = BinaryMessageBus((message) => pendingMessageBusMessagesToSend.push(message))\n\n  function getMessagesToSend() {\n    const messages = [...pendingMessageBusMessagesToSend]\n    pendingMessageBusMessagesToSend.length = 0\n    return messages\n  }\n\n  // Add Sync Transport\n  const transport: Transport = {\n    filter: syncFilter(engine),\n    send: async (message: Uint8Array) => {\n      if (message.byteLength) {\n        // console.log(Array.from(serializeCrdtMessages('[send CRDT]: ', message, engine)))\n        binaryMessageBus.emit(CommsMessage.CRDT, message)\n      }\n      const messages = getMessagesToSend()\n      const response = await sendBinary({ data: messages })\n      binaryMessageBus.__processMessages(response.data)\n    },\n    type: 'network'\n  }\n  engine.addTransport(transport)\n  // End add sync transport\n\n  // If we dont have any state initialized, and recieve a state message.\n  binaryMessageBus.on(CommsMessage.RES_CRDT_STATE, (value) => {\n    const { sender, data } = decodeCRDTState(value)\n    if (sender !== myProfile.userId) return\n    console.log('[Processing CRDT State]', data.byteLength)\n    transport.onmessage!(data)\n  })\n\n  binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, (_, userId) => {\n    binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, engineToCrdt(engine)))\n  })\n\n  const players = definePlayerHelper(engine)\n\n  let requestCrdtStateWhenConnected = false\n\n  players.onEnterScene((player) => {\n    if (player.userId === myProfile.userId && !requestCrdtStateWhenConnected) {\n      if (RealmInfo.getOrNull(engine.RootEntity)?.isConnectedSceneRoom) {\n        console.log('Requesting state')\n        binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, new Uint8Array())\n      } else {\n        console.log('Waiting to be conneted')\n        requestCrdtStateWhenConnected = true\n      }\n    }\n  })\n\n  RealmInfo.onChange(engine.RootEntity, (value) => {\n    if (value?.isConnectedSceneRoom && requestCrdtStateWhenConnected) {\n      console.log('Requesting state.')\n      requestCrdtStateWhenConnected = false\n      binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, new Uint8Array())\n    }\n  })\n\n  players.onLeaveScene((userId) => {\n    if (userId === myProfile.userId) {\n      requestCrdtStateWhenConnected = false\n    }\n  })\n\n  // Process CRDT messages here\n  binaryMessageBus.on(CommsMessage.CRDT, (value) => {\n    console.log(Array.from(serializeCrdtMessages('[NetworkMessage]', value, engine)))\n    transport.onmessage!(value)\n  })\n\n  return {\n    ...entityDefinitions,\n    myProfile\n  }\n}\n\n/**\n * Messages Protocol Encoding\n *\n * CRDT: Plain Uint8Array\n *\n * CRDT_STATE_RES { sender: string, data: Uint8Array}\n */\nfunction decodeCRDTState(data: Uint8Array) {\n  let offset = 0\n  const r = new Uint8Array(data)\n  const view = new DataView(r.buffer)\n  const senderLength = view.getUint8(offset)\n  offset += 1\n  const sender = decodeString(data.subarray(1, senderLength + 1))\n  offset += senderLength\n  const state = r.subarray(offset)\n\n  return { sender, data: state }\n}\n\nfunction encodeCRDTState(address: string, data: Uint8Array) {\n  // address to uint8array\n  const addressBuffer = encodeString(address)\n  const addressOffset = 1\n  const messageLength = addressOffset + addressBuffer.byteLength + data.byteLength\n\n  const serializedMessage = new Uint8Array(messageLength)\n  serializedMessage.set(new Uint8Array([addressBuffer.byteLength]), 0)\n  serializedMessage.set(addressBuffer, 1)\n  serializedMessage.set(data, addressBuffer.byteLength + 1)\n  return serializedMessage\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"message-bus-sync.js","sourceRoot":"","sources":["../src/network/message-bus-sync.ts"],"names":[],"mappings":"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","sourcesContent":["import { IEngine, Transport, RealmInfo } from '@dcl/ecs'\nimport { type SendBinaryRequest, type SendBinaryResponse } from '~system/CommunicationsController'\n\nimport { syncFilter } from './filter'\nimport { engineToCrdt } from './state'\nimport { BinaryMessageBus, CommsMessage, decodeString, encodeString } from './binary-message-bus'\nimport { fetchProfile } from './utils'\nimport { entityUtils } from './entities'\nimport { GetUserDataRequest, GetUserDataResponse } from '~system/UserIdentity'\nimport { definePlayerHelper } from '../players'\nimport { serializeCrdtMessages } from '../internal/transports/logger'\n\nexport type IProfile = { networkId: number; userId: string }\n// user that we asked for the inital crdt state\nexport function addSyncTransport(\n  engine: IEngine,\n  sendBinary: (msg: SendBinaryRequest) => Promise<SendBinaryResponse>,\n  getUserData: (value: GetUserDataRequest) => Promise<GetUserDataResponse>\n) {\n  const DEBUG_NETWORK_MESSAGES = () => (globalThis as any).DEBUG_NETWORK_MESSAGES ?? true\n  // Profile Info\n  const myProfile: IProfile = {} as IProfile\n  fetchProfile(myProfile!, getUserData)\n\n  // Entity utils\n  const entityDefinitions = entityUtils(engine, myProfile)\n\n  // List of MessageBuss messsages to be sent on every frame to comms\n  const pendingMessageBusMessagesToSend: Uint8Array[] = []\n  const binaryMessageBus = BinaryMessageBus((message) => pendingMessageBusMessagesToSend.push(message))\n\n  function getMessagesToSend() {\n    const messages = [...pendingMessageBusMessagesToSend]\n    pendingMessageBusMessagesToSend.length = 0\n    return messages\n  }\n\n  let transportInitialzed = false\n  // Add Sync Transport\n  const transport: Transport = {\n    filter: syncFilter(engine),\n    send: async (message: Uint8Array) => {\n      if (message.byteLength && transportInitialzed) {\n        DEBUG_NETWORK_MESSAGES() &&\n          console.log(...Array.from(serializeCrdtMessages('[NetworkMessage sent]:', message, engine)))\n        binaryMessageBus.emit(CommsMessage.CRDT, message)\n      }\n      const messages = getMessagesToSend()\n      const response = await sendBinary({ data: messages })\n      binaryMessageBus.__processMessages(response.data)\n      transportInitialzed = true\n    },\n    type: 'network'\n  }\n  engine.addTransport(transport)\n  // End add sync transport\n\n  // If we dont have any state initialized, and recieve a state message.\n  binaryMessageBus.on(CommsMessage.RES_CRDT_STATE, (value) => {\n    const { sender, data } = decodeCRDTState(value)\n    if (sender !== myProfile.userId) return\n    DEBUG_NETWORK_MESSAGES() && console.log('[Processing CRDT State]', data.byteLength)\n    transport.onmessage!(data)\n  })\n\n  binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, (message, userId) => {\n    transport.onmessage!(message)\n    binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, engineToCrdt(engine)))\n  })\n\n  const players = definePlayerHelper(engine)\n\n  let requestCrdtStateWhenConnected = false\n\n  players.onEnterScene((player) => {\n    if (player.userId === myProfile.userId && !requestCrdtStateWhenConnected) {\n      if (RealmInfo.getOrNull(engine.RootEntity)?.isConnectedSceneRoom) {\n        DEBUG_NETWORK_MESSAGES() && console.log('Requesting state')\n        binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, engineToCrdt(engine))\n      } else {\n        DEBUG_NETWORK_MESSAGES() && console.log('Waiting to be conneted')\n        requestCrdtStateWhenConnected = true\n      }\n    }\n  })\n\n  RealmInfo.onChange(engine.RootEntity, (value) => {\n    if (value?.isConnectedSceneRoom && requestCrdtStateWhenConnected) {\n      DEBUG_NETWORK_MESSAGES() && console.log('Requesting state.')\n      requestCrdtStateWhenConnected = false\n      binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, engineToCrdt(engine))\n    }\n  })\n\n  players.onLeaveScene((userId) => {\n    if (userId === myProfile.userId) {\n      requestCrdtStateWhenConnected = false\n    }\n  })\n\n  // Process CRDT messages here\n  binaryMessageBus.on(CommsMessage.CRDT, (value) => {\n    DEBUG_NETWORK_MESSAGES() &&\n      console.log(Array.from(serializeCrdtMessages('[NetworkMessage received]:', value, engine)))\n    transport.onmessage!(value)\n  })\n\n  return {\n    ...entityDefinitions,\n    myProfile\n  }\n}\n\n/**\n * Messages Protocol Encoding\n *\n * CRDT: Plain Uint8Array\n *\n * CRDT_STATE_RES { sender: string, data: Uint8Array}\n */\nfunction decodeCRDTState(data: Uint8Array) {\n  let offset = 0\n  const r = new Uint8Array(data)\n  const view = new DataView(r.buffer)\n  const senderLength = view.getUint8(offset)\n  offset += 1\n  const sender = decodeString(data.subarray(1, senderLength + 1))\n  offset += senderLength\n  const state = r.subarray(offset)\n\n  return { sender, data: state }\n}\n\nfunction encodeCRDTState(address: string, data: Uint8Array) {\n  // address to uint8array\n  const addressBuffer = encodeString(address)\n  const addressOffset = 1\n  const messageLength = addressOffset + addressBuffer.byteLength + data.byteLength\n\n  const serializedMessage = new Uint8Array(messageLength)\n  serializedMessage.set(new Uint8Array([addressBuffer.byteLength]), 0)\n  serializedMessage.set(addressBuffer, 1)\n  serializedMessage.set(data, addressBuffer.byteLength + 1)\n  return serializedMessage\n}\n"]}

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@dcl/sdk",
   "description": "",
-  "version": "7.5.8-11020113946.commit-53f6ae5",
+  "version": "7.5.8-11033502112.commit-95b8f41",
   "author": "Decentraland",
   "dependencies": {
-    "@dcl/ecs": "7.5.8-11020113946.commit-53f6ae5",
+    "@dcl/ecs": "7.5.8-11033502112.commit-95b8f41",
     "@dcl/ecs-math": "2.0.2",
     "@dcl/explorer": "1.0.164509-20240802172549.commit-fb95b9b",
-    "@dcl/js-runtime": "7.5.8-11020113946.commit-53f6ae5",
-    "@dcl/react-ecs": "7.5.8-11020113946.commit-53f6ae5",
-    "@dcl/sdk-commands": "7.5.8-11020113946.commit-53f6ae5",
+    "@dcl/js-runtime": "7.5.8-11033502112.commit-95b8f41",
+    "@dcl/react-ecs": "7.5.8-11033502112.commit-95b8f41",
+    "@dcl/sdk-commands": "7.5.8-11033502112.commit-95b8f41",
     "text-encoding": "0.7.0"
   },
   "keywords": [],
@@ -35,5 +35,5 @@
   },
   "types": "./index.d.ts",
   "typings": "./index.d.ts",
-  "commit": "53f6ae5fc2241d00eb0b1e8251cf611e7e8f2efd"
+  "commit": "95b8f418948408f82dc030ac9dda7bfc055e3207"
 }

package/src/network/message-bus-sync.ts

@@ -17,6 +17,7 @@ export function addSyncTransport(
   sendBinary: (msg: SendBinaryRequest) => Promise<SendBinaryResponse>,
   getUserData: (value: GetUserDataRequest) => Promise<GetUserDataResponse>
 ) {
+  const DEBUG_NETWORK_MESSAGES = () => (globalThis as any).DEBUG_NETWORK_MESSAGES ?? true
   // Profile Info
   const myProfile: IProfile = {} as IProfile
   fetchProfile(myProfile!, getUserData)
@@ -34,17 +35,20 @@ export function addSyncTransport(
     return messages
   }
 
+  let transportInitialzed = false
   // Add Sync Transport
   const transport: Transport = {
     filter: syncFilter(engine),
     send: async (message: Uint8Array) => {
-      if (message.byteLength) {
-        // console.log(Array.from(serializeCrdtMessages('[send CRDT]: ', message, engine)))
+      if (message.byteLength && transportInitialzed) {
+        DEBUG_NETWORK_MESSAGES() &&
+          console.log(...Array.from(serializeCrdtMessages('[NetworkMessage sent]:', message, engine)))
         binaryMessageBus.emit(CommsMessage.CRDT, message)
       }
       const messages = getMessagesToSend()
       const response = await sendBinary({ data: messages })
       binaryMessageBus.__processMessages(response.data)
+      transportInitialzed = true
     },
     type: 'network'
   }
@@ -55,11 +59,12 @@ export function addSyncTransport(
   binaryMessageBus.on(CommsMessage.RES_CRDT_STATE, (value) => {
     const { sender, data } = decodeCRDTState(value)
     if (sender !== myProfile.userId) return
-    console.log('[Processing CRDT State]', data.byteLength)
+    DEBUG_NETWORK_MESSAGES() && console.log('[Processing CRDT State]', data.byteLength)
     transport.onmessage!(data)
   })
 
-  binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, (_, userId) => {
+  binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, (message, userId) => {
+    transport.onmessage!(message)
     binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, engineToCrdt(engine)))
   })
 
@@ -70,10 +75,10 @@ export function addSyncTransport(
   players.onEnterScene((player) => {
     if (player.userId === myProfile.userId && !requestCrdtStateWhenConnected) {
       if (RealmInfo.getOrNull(engine.RootEntity)?.isConnectedSceneRoom) {
-        console.log('Requesting state')
-        binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, new Uint8Array())
+        DEBUG_NETWORK_MESSAGES() && console.log('Requesting state')
+        binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, engineToCrdt(engine))
       } else {
-        console.log('Waiting to be conneted')
+        DEBUG_NETWORK_MESSAGES() && console.log('Waiting to be conneted')
         requestCrdtStateWhenConnected = true
       }
     }
@@ -81,9 +86,9 @@ export function addSyncTransport(
 
   RealmInfo.onChange(engine.RootEntity, (value) => {
     if (value?.isConnectedSceneRoom && requestCrdtStateWhenConnected) {
-      console.log('Requesting state.')
+      DEBUG_NETWORK_MESSAGES() && console.log('Requesting state.')
       requestCrdtStateWhenConnected = false
-      binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, new Uint8Array())
+      binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, engineToCrdt(engine))
     }
   })
 
@@ -95,7 +100,8 @@ export function addSyncTransport(
 
   // Process CRDT messages here
   binaryMessageBus.on(CommsMessage.CRDT, (value) => {
-    console.log(Array.from(serializeCrdtMessages('[NetworkMessage]', value, engine)))
+    DEBUG_NETWORK_MESSAGES() &&
+      console.log(Array.from(serializeCrdtMessages('[NetworkMessage received]:', value, engine)))
     transport.onmessage!(value)
   })