@dcl/sdk 7.8.16-15972842923.commit-84d35a3 → 7.8.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/network/message-bus-sync.js +7 -6
- package/network/state.d.ts +1 -1
- package/network/state.js +24 -5
- package/package.json +6 -6
- package/src/network/message-bus-sync.ts +7 -5
- package/src/network/state.ts +31 -10
|
@@ -66,10 +66,11 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
|
|
|
66
66
|
stateIsSyncronized = true;
|
|
67
67
|
});
|
|
68
68
|
// Answer to REQ_CRDT_STATE
|
|
69
|
-
binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, async (
|
|
70
|
-
console.log(`Sending CRDT State to: ${userId}`);
|
|
71
|
-
|
|
72
|
-
|
|
69
|
+
binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, async (_, userId) => {
|
|
70
|
+
DEBUG_NETWORK_MESSAGES() && console.log(`Sending CRDT State to: ${userId}`);
|
|
71
|
+
for (const chunk of engineToCrdt(engine)) {
|
|
72
|
+
binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, chunk), [userId]);
|
|
73
|
+
}
|
|
73
74
|
});
|
|
74
75
|
// Process CRDT messages here
|
|
75
76
|
binaryMessageBus.on(CommsMessage.CRDT, (value) => {
|
|
@@ -84,7 +85,7 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
|
|
|
84
85
|
DEBUG_NETWORK_MESSAGES() && console.log(`Aborting Requesting state?. Disconnected`);
|
|
85
86
|
return;
|
|
86
87
|
}
|
|
87
|
-
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE,
|
|
88
|
+
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, new Uint8Array());
|
|
88
89
|
// Wait ~5s for the response.
|
|
89
90
|
await sleep(5000);
|
|
90
91
|
players = Array.from(engine.getEntitiesWith(PlayerIdentityData));
|
|
@@ -170,4 +171,4 @@ function encodeCRDTState(address, data) {
|
|
|
170
171
|
serializedMessage.set(data, addressBuffer.byteLength + 1);
|
|
171
172
|
return serializedMessage;
|
|
172
173
|
}
|
|
173
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"message-bus-sync.js","sourceRoot":"","sources":["../src/network/message-bus-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,SAAS,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAG5E,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACjG,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAA;AAGrE,+CAA+C;AAC/C,MAAM,UAAU,gBAAgB,CAC9B,MAAe,EACf,UAAmE,EACnE,WAAwE;IAExE,MAAM,sBAAsB,GAAG,GAAG,EAAE,CAAE,UAAkB,CAAC,sBAAsB,IAAI,KAAK,CAAA;IACxF,eAAe;IACf,MAAM,SAAS,GAAa,EAAc,CAAA;IAC1C,YAAY,CAAC,SAAU,EAAE,WAAW,CAAC,CAAA;IAErC,eAAe;IACf,MAAM,iBAAiB,GAAG,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IAExD,mEAAmE;IACnE,MAAM,+BAA+B,GAAgD,EAAE,CAAA;IAEvF,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QAC1D,+BAA+B,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE,EAAE,CAAC,CAAA;IAChF,CAAC,CAAC,CAAA;IAEF,SAAS,iBAAiB;QACxB,MAAM,QAAQ,GAAG,CAAC,GAAG,+BAA+B,CAAC,CAAA;QACrD,+BAA+B,CAAC,MAAM,GAAG,CAAC,CAAA;QAC1C,OAAO,QAAQ,CAAA;IACjB,CAAC;IACD,MAAM,OAAO,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAA;IAE1C,IAAI,kBAAkB,GAAG,KAAK,CAAA;IAC9B,IAAI,mBAAmB,GAAG,KAAK,CAAA;IAE/B,qBAAqB;IACrB,MAAM,SAAS,GAAc;QAC3B,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC;QAC1B,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACvB,KAAK,MAAM,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE;gBACvC,IAAI,OAAO,CAAC,UAAU,IAAI,mBAAmB,EAAE;oBAC7C,sBAAsB,EAAE;wBACtB,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,wBAAwB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;oBAC9F,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;iBAClD;aACF;YACD,MAAM,YAAY,GAAG,iBAAiB,EAAE,CAAA;YACxC,IAAI,SAAS,GAAG,CAAC,CAAA;YACjB,KAAK,MAAM,OAAO,IAAI,YAAY,EAAE;gBAClC,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE;oBAC/B,SAAS,IAAI,IAAI,CAAC,UAAU,CAAA;iBAC7B;aACF;YACD,IAAI,SAAS,EAAE;gBACb,sBAAsB,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,SAAS,GAAG,IAAI,EAAE,IAAI,CAAC,CAAA;aAC9F;YACD,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAA;YACvE,gBAAgB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YACjD,mBAAmB,GAAG,IAAI,CAAA;QAC5B,CAAC;QACD,IAAI,EAAE,SAAS;KAChB,CAAA;IACD,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;IAC9B,yBAAyB;IAEzB,+BAA+B;IAC/B,gBAAgB,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE;QACzD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA;QAC/C,IAAI,MAAM,KAAK,SAAS,CAAC,MAAM;YAAE,OAAM;QACvC,sBAAsB,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,IAAI,CAAC,UAAU,GAAG,IAAI,EAAE,IAAI,CAAC,CAAA;QAChG,SAAS,CAAC,SAAU,CAAC,IAAI,CAAC,CAAA;QAC1B,kBAAkB,GAAG,IAAI,CAAA;IAC3B,CAAC,CAAC,CAAA;IAEF,2BAA2B;IAC3B,gBAAgB,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACzE,OAAO,CAAC,GAAG,CAAC,0BAA0B,MAAM,EAAE,CAAC,CAAA;QAC/C,SAAS,CAAC,SAAU,CAAC,OAAO,CAAC,CAAA;QAC7B,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAA;IAC7G,CAAC,CAAC,CAAA;IAEF,6BAA6B;IAC7B,gBAAgB,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;QAC/C,sBAAsB,EAAE;YACtB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,4BAA4B,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;QAC7F,SAAS,CAAC,SAAU,CAAC,KAAK,CAAC,CAAA;IAC7B,CAAC,CAAC,CAAA;IAEF,KAAK,UAAU,YAAY,CAAC,aAAqB,CAAC;QAChD,IAAI,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAA;QACpE,sBAAsB,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,wCAAwC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAA;QAErG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,oBAAoB,EAAE;YACjE,sBAAsB,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAA;YACnF,OAAM;SACP;QAED,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAA;QAExE,6BAA6B;QAC7B,MAAM,KAAK,CAAC,IAAI,CAAC,CAAA;QAEjB,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAA;QAEhE,IAAI,CAAC,kBAAkB,EAAE;YACvB,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,IAAI,CAAC,EAAE;gBACzC,sBAAsB,EAAE;oBACtB,OAAO,CAAC,GAAG,CAAC,0BAA0B,UAAU,sCAAsC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAA;gBAC7G,KAAK,YAAY,CAAC,UAAU,GAAG,CAAC,CAAC,CAAA;aAClC;iBAAM;gBACL,sBAAsB,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAA;gBAC/E,kBAAkB,GAAG,IAAI,CAAA;aAC1B;SACF;IACH,CAAC;IAED,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE;QAC9B,sBAAsB,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;IAC1E,CAAC,CAAC,CAAA;IAEF,0DAA0D;IAC1D,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE;QAC9C,IAAI,CAAC,KAAK,EAAE,oBAAoB,EAAE;YAChC,sBAAsB,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAA;YAClE,kBAAkB,GAAG,KAAK,CAAA;SAC3B;QAED,IAAI,KAAK,EAAE,oBAAoB,EAAE;YAC/B,sBAAsB,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;SAC9D;QAED,IAAI,KAAK,EAAE,oBAAoB,IAAI,CAAC,kBAAkB,EAAE;YACtD,KAAK,YAAY,EAAE,CAAA;SACpB;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE;QAC9B,sBAAsB,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAA;IACnE,CAAC,CAAC,CAAA;IAEF,SAAS,kBAAkB;QACzB,OAAO,kBAAkB,CAAA;IAC3B,CAAC;IAED,SAAS,KAAK,CAAC,EAAU;QACvB,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YACnC,IAAI,KAAK,GAAG,CAAC,CAAA;YACb,SAAS,WAAW,CAAC,EAAU;gBAC7B,KAAK,IAAI,EAAE,CAAA;gBACX,IAAI,KAAK,GAAG,IAAI,IAAI,EAAE,EAAE;oBACtB,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;oBAChC,OAAO,EAAE,CAAA;iBACV;YACH,CAAC;YACD,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;QAC/B,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,OAAO;QACL,GAAG,iBAAiB;QACpB,SAAS;QACT,kBAAkB;KACnB,CAAA;AACH,CAAC;AAED;;;;;;GAMG;AACH,SAAS,eAAe,CAAC,IAAgB;IACvC,IAAI,MAAM,GAAG,CAAC,CAAA;IACd,MAAM,CAAC,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,CAAA;IAC9B,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IACnC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IAC1C,MAAM,IAAI,CAAC,CAAA;IACX,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,YAAY,GAAG,CAAC,CAAC,CAAC,CAAA;IAC/D,MAAM,IAAI,YAAY,CAAA;IACtB,MAAM,KAAK,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IAEhC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;AAChC,CAAC;AAED,SAAS,eAAe,CAAC,OAAe,EAAE,IAAgB;IACxD,wBAAwB;IACxB,MAAM,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;IAC3C,MAAM,aAAa,GAAG,CAAC,CAAA;IACvB,MAAM,aAAa,GAAG,aAAa,GAAG,aAAa,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAA;IAEhF,MAAM,iBAAiB,GAAG,IAAI,UAAU,CAAC,aAAa,CAAC,CAAA;IACvD,iBAAiB,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IACpE,iBAAiB,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC,CAAA;IACvC,iBAAiB,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,UAAU,GAAG,CAAC,CAAC,CAAA;IACzD,OAAO,iBAAiB,CAAA;AAC1B,CAAC","sourcesContent":["import { IEngine, Transport, RealmInfo, PlayerIdentityData } 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 ?? false\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: { data: Uint8Array[]; address: string[] }[] = []\n\n  const binaryMessageBus = BinaryMessageBus((data, address) => {\n    pendingMessageBusMessagesToSend.push({ data: [data], address: address ?? [] })\n  })\n\n  function getMessagesToSend(): typeof pendingMessageBusMessagesToSend {\n    const messages = [...pendingMessageBusMessagesToSend]\n    pendingMessageBusMessagesToSend.length = 0\n    return messages\n  }\n  const players = definePlayerHelper(engine)\n\n  let stateIsSyncronized = false\n  let transportInitialzed = false\n\n  // Add Sync Transport\n  const transport: Transport = {\n    filter: syncFilter(engine),\n    send: async (messages) => {\n      for (const message of [messages].flat()) {\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      }\n      const peerMessages = getMessagesToSend()\n      let totalSize = 0\n      for (const message of peerMessages) {\n        for (const data of message.data) {\n          totalSize += data.byteLength\n        }\n      }\n      if (totalSize) {\n        DEBUG_NETWORK_MESSAGES() && console.log('Sending network messages: ', totalSize / 1024, 'KB')\n      }\n      const response = await sendBinary({ data: [], peerData: peerMessages })\n      binaryMessageBus.__processMessages(response.data)\n      transportInitialzed = true\n    },\n    type: 'network'\n  }\n  engine.addTransport(transport)\n  // End add sync transport\n\n  // Receive & Process CRDT_STATE\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 / 1024, 'KB')\n    transport.onmessage!(data)\n    stateIsSyncronized = true\n  })\n\n  // Answer to REQ_CRDT_STATE\n  binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, async (message, userId) => {\n    console.log(`Sending CRDT State to: ${userId}`)\n    transport.onmessage!(message)\n    binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, engineToCrdt(engine)), [userId])\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  async function requestState(retryCount: number = 1) {\n    let players = Array.from(engine.getEntitiesWith(PlayerIdentityData))\n    DEBUG_NETWORK_MESSAGES() && console.log(`Requesting state. Players connected: ${players.length - 1}`)\n\n    if (!RealmInfo.getOrNull(engine.RootEntity)?.isConnectedSceneRoom) {\n      DEBUG_NETWORK_MESSAGES() && console.log(`Aborting Requesting state?. Disconnected`)\n      return\n    }\n\n    binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, engineToCrdt(engine))\n\n    // Wait ~5s for the response.\n    await sleep(5000)\n\n    players = Array.from(engine.getEntitiesWith(PlayerIdentityData))\n\n    if (!stateIsSyncronized) {\n      if (players.length > 1 && retryCount <= 2) {\n        DEBUG_NETWORK_MESSAGES() &&\n          console.log(`Requesting state again ${retryCount} (no response). Players connected: ${players.length - 1}`)\n        void requestState(retryCount + 1)\n      } else {\n        DEBUG_NETWORK_MESSAGES() && console.log('No active players. State syncronized')\n        stateIsSyncronized = true\n      }\n    }\n  }\n\n  players.onEnterScene((player) => {\n    DEBUG_NETWORK_MESSAGES() && console.log('[onEnterScene]', player.userId)\n  })\n\n  // Asks for the REQ_CRDT_STATE when its connected to comms\n  RealmInfo.onChange(engine.RootEntity, (value) => {\n    if (!value?.isConnectedSceneRoom) {\n      DEBUG_NETWORK_MESSAGES() && console.log('Disconnected from comms')\n      stateIsSyncronized = false\n    }\n\n    if (value?.isConnectedSceneRoom) {\n      DEBUG_NETWORK_MESSAGES() && console.log('Connected to comms')\n    }\n\n    if (value?.isConnectedSceneRoom && !stateIsSyncronized) {\n      void requestState()\n    }\n  })\n\n  players.onLeaveScene((userId) => {\n    DEBUG_NETWORK_MESSAGES() && console.log('[onLeaveScene]', userId)\n  })\n\n  function isStateSyncronized() {\n    return stateIsSyncronized\n  }\n\n  function sleep(ms: number) {\n    return new Promise<void>((resolve) => {\n      let timer = 0\n      function sleepSystem(dt: number) {\n        timer += dt\n        if (timer * 1000 >= ms) {\n          engine.removeSystem(sleepSystem)\n          resolve()\n        }\n      }\n      engine.addSystem(sleepSystem)\n    })\n  }\n\n  return {\n    ...entityDefinitions,\n    myProfile,\n    isStateSyncronized\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"]}
|
|
174
|
+
//# 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, PlayerIdentityData } 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 ?? false\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: { data: Uint8Array[]; address: string[] }[] = []\n\n  const binaryMessageBus = BinaryMessageBus((data, address) => {\n    pendingMessageBusMessagesToSend.push({ data: [data], address: address ?? [] })\n  })\n\n  function getMessagesToSend(): typeof pendingMessageBusMessagesToSend {\n    const messages = [...pendingMessageBusMessagesToSend]\n    pendingMessageBusMessagesToSend.length = 0\n    return messages\n  }\n  const players = definePlayerHelper(engine)\n\n  let stateIsSyncronized = false\n  let transportInitialzed = false\n\n  // Add Sync Transport\n  const transport: Transport = {\n    filter: syncFilter(engine),\n    send: async (messages) => {\n      for (const message of [messages].flat()) {\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      }\n      const peerMessages = getMessagesToSend()\n      let totalSize = 0\n      for (const message of peerMessages) {\n        for (const data of message.data) {\n          totalSize += data.byteLength\n        }\n      }\n      if (totalSize) {\n        DEBUG_NETWORK_MESSAGES() && console.log('Sending network messages: ', totalSize / 1024, 'KB')\n      }\n      const response = await sendBinary({ data: [], peerData: peerMessages })\n      binaryMessageBus.__processMessages(response.data)\n      transportInitialzed = true\n    },\n    type: 'network'\n  }\n  engine.addTransport(transport)\n  // End add sync transport\n\n  // Receive & Process CRDT_STATE\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 / 1024, 'KB')\n    transport.onmessage!(data)\n    stateIsSyncronized = true\n  })\n\n  // Answer to REQ_CRDT_STATE\n  binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, async (_, userId) => {\n    DEBUG_NETWORK_MESSAGES() && console.log(`Sending CRDT State to: ${userId}`)\n\n    for (const chunk of engineToCrdt(engine)) {\n      binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, chunk), [userId])\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  async function requestState(retryCount: number = 1) {\n    let players = Array.from(engine.getEntitiesWith(PlayerIdentityData))\n    DEBUG_NETWORK_MESSAGES() && console.log(`Requesting state. Players connected: ${players.length - 1}`)\n\n    if (!RealmInfo.getOrNull(engine.RootEntity)?.isConnectedSceneRoom) {\n      DEBUG_NETWORK_MESSAGES() && console.log(`Aborting Requesting state?. Disconnected`)\n      return\n    }\n\n    binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, new Uint8Array())\n\n    // Wait ~5s for the response.\n    await sleep(5000)\n\n    players = Array.from(engine.getEntitiesWith(PlayerIdentityData))\n\n    if (!stateIsSyncronized) {\n      if (players.length > 1 && retryCount <= 2) {\n        DEBUG_NETWORK_MESSAGES() &&\n          console.log(`Requesting state again ${retryCount} (no response). Players connected: ${players.length - 1}`)\n        void requestState(retryCount + 1)\n      } else {\n        DEBUG_NETWORK_MESSAGES() && console.log('No active players. State syncronized')\n        stateIsSyncronized = true\n      }\n    }\n  }\n\n  players.onEnterScene((player) => {\n    DEBUG_NETWORK_MESSAGES() && console.log('[onEnterScene]', player.userId)\n  })\n\n  // Asks for the REQ_CRDT_STATE when its connected to comms\n  RealmInfo.onChange(engine.RootEntity, (value) => {\n    if (!value?.isConnectedSceneRoom) {\n      DEBUG_NETWORK_MESSAGES() && console.log('Disconnected from comms')\n      stateIsSyncronized = false\n    }\n\n    if (value?.isConnectedSceneRoom) {\n      DEBUG_NETWORK_MESSAGES() && console.log('Connected to comms')\n    }\n\n    if (value?.isConnectedSceneRoom && !stateIsSyncronized) {\n      void requestState()\n    }\n  })\n\n  players.onLeaveScene((userId) => {\n    DEBUG_NETWORK_MESSAGES() && console.log('[onLeaveScene]', userId)\n  })\n\n  function isStateSyncronized() {\n    return stateIsSyncronized\n  }\n\n  function sleep(ms: number) {\n    return new Promise<void>((resolve) => {\n      let timer = 0\n      function sleepSystem(dt: number) {\n        timer += dt\n        if (timer * 1000 >= ms) {\n          engine.removeSystem(sleepSystem)\n          resolve()\n        }\n      }\n      engine.addSystem(sleepSystem)\n    })\n  }\n\n  return {\n    ...entityDefinitions,\n    myProfile,\n    isStateSyncronized\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/network/state.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { IEngine } from '@dcl/ecs';
|
|
2
2
|
export declare const NOT_SYNC_COMPONENTS: (import("@dcl/ecs").GrowOnlyValueSetComponentDefinition<import("@dcl/ecs").PBAudioEvent> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBEngineInfo> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBGltfContainerLoadingState> | import("@dcl/ecs").GrowOnlyValueSetComponentDefinition<import("@dcl/ecs").PBPointerEventsResult> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBRaycastResult> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBRealmInfo> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBTweenState> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBUiDropdown> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBUiDropdownResult> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBUiInput> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBUiInputResult> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBUiText> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBUiTransform> | import("@dcl/ecs").GrowOnlyValueSetComponentDefinition<import("@dcl/ecs").PBVideoEvent>)[];
|
|
3
3
|
export declare const NOT_SYNC_COMPONENTS_IDS: number[];
|
|
4
|
-
export declare function engineToCrdt(engine: IEngine): Uint8Array;
|
|
4
|
+
export declare function engineToCrdt(engine: IEngine): Uint8Array[];
|
package/network/state.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ReadWriteByteBuffer } from '@dcl/ecs/dist/serialization/ByteBuffer';
|
|
2
2
|
import { CrdtMessageProtocol, CrdtMessageType, PutComponentOperation, PutNetworkComponentOperation, NetworkEntity as _NetworkEntity, VideoEvent, AudioEvent, EngineInfo, GltfContainerLoadingState, PointerEventsResult, RaycastResult, RealmInfo, TweenState, UiDropdown, UiDropdownResult, UiInput, UiInputResult, UiText, UiTransform } from '@dcl/ecs';
|
|
3
|
+
import { LIVEKIT_MAX_SIZE } from '@dcl/ecs/dist/systems/crdt';
|
|
3
4
|
export const NOT_SYNC_COMPONENTS = [
|
|
4
5
|
VideoEvent,
|
|
5
6
|
TweenState,
|
|
@@ -21,6 +22,7 @@ export function engineToCrdt(engine) {
|
|
|
21
22
|
const crdtBuffer = new ReadWriteByteBuffer();
|
|
22
23
|
const networkBuffer = new ReadWriteByteBuffer();
|
|
23
24
|
const NetworkEntity = engine.getComponent(_NetworkEntity.componentId);
|
|
25
|
+
const chunks = [];
|
|
24
26
|
for (const itComponentDefinition of engine.componentsIter()) {
|
|
25
27
|
if (NOT_SYNC_COMPONENTS_IDS.includes(itComponentDefinition.componentId)) {
|
|
26
28
|
continue;
|
|
@@ -35,17 +37,34 @@ export function engineToCrdt(engine) {
|
|
|
35
37
|
if (header.type === CrdtMessageType.PUT_COMPONENT) {
|
|
36
38
|
const message = PutComponentOperation.read(crdtBuffer);
|
|
37
39
|
const networkEntity = NetworkEntity.getOrNull(message.entityId);
|
|
40
|
+
// Check if adding this message would exceed the size limit
|
|
41
|
+
const currentBufferSize = networkBuffer.toBinary().byteLength;
|
|
42
|
+
const messageSize = message.data.byteLength;
|
|
43
|
+
if ((currentBufferSize + messageSize) / 1024 > LIVEKIT_MAX_SIZE) {
|
|
44
|
+
// If the current buffer has content, save it as a chunk
|
|
45
|
+
if (currentBufferSize > 0) {
|
|
46
|
+
chunks.push(networkBuffer.toCopiedBinary());
|
|
47
|
+
networkBuffer.resetBuffer();
|
|
48
|
+
}
|
|
49
|
+
// If the message itself is larger than the limit, we need to handle it specially
|
|
50
|
+
// For now, we'll skip it to prevent infinite loops
|
|
51
|
+
if (messageSize / 1024 > LIVEKIT_MAX_SIZE) {
|
|
52
|
+
console.error(`Message too large (${messageSize} bytes), skipping component ${message.componentId} for entity ${message.entityId}`);
|
|
53
|
+
continue;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
38
56
|
if (networkEntity) {
|
|
39
57
|
PutNetworkComponentOperation.write(networkEntity.entityId, message.timestamp, message.componentId, networkEntity.networkId, message.data, networkBuffer);
|
|
40
58
|
}
|
|
41
|
-
else {
|
|
42
|
-
PutComponentOperation.write(message.entityId, message.timestamp, message.componentId, message.data, networkBuffer);
|
|
43
|
-
}
|
|
44
59
|
}
|
|
45
60
|
else {
|
|
46
61
|
crdtBuffer.incrementReadOffset(header.length);
|
|
47
62
|
}
|
|
48
63
|
}
|
|
49
|
-
|
|
64
|
+
// Add any remaining data as the final chunk
|
|
65
|
+
if (networkBuffer.currentWriteOffset() > 0) {
|
|
66
|
+
chunks.push(networkBuffer.toBinary());
|
|
67
|
+
}
|
|
68
|
+
return chunks;
|
|
50
69
|
}
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvbmV0d29yay9zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQTtBQUM1RSxPQUFPLEVBRUwsbUJBQW1CLEVBQ25CLGVBQWUsRUFFZixxQkFBcUIsRUFDckIsNEJBQTRCLEVBRTVCLGFBQWEsSUFBSSxjQUFjLEVBRS9CLFVBQVUsRUFDVixVQUFVLEVBQ1YsVUFBVSxFQUNWLHlCQUF5QixFQUN6QixtQkFBbUIsRUFDbkIsYUFBYSxFQUNiLFNBQVMsRUFDVCxVQUFVLEVBQ1YsVUFBVSxFQUNWLGdCQUFnQixFQUNoQixPQUFPLEVBQ1AsYUFBYSxFQUNiLE1BQU0sRUFDTixXQUFXLEVBQ1osTUFBTSxVQUFVLENBQUE7QUFDakIsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sNEJBQTRCLENBQUE7QUFFN0QsTUFBTSxDQUFDLE1BQU0sbUJBQW1CLEdBQUc7SUFDakMsVUFBVTtJQUNWLFVBQVU7SUFDVixVQUFVO0lBQ1YsVUFBVTtJQUNWLHlCQUF5QjtJQUN6QixtQkFBbUI7SUFDbkIsYUFBYTtJQUNiLFNBQVM7SUFDVCxVQUFVO0lBQ1YsZ0JBQWdCO0lBQ2hCLE9BQU87SUFDUCxhQUFhO0lBQ2IsV0FBVztJQUNYLE1BQU07Q0FDUCxDQUFBO0FBRUQsTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQUcsbUJBQW1CLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLENBQUE7QUFFcEYsTUFBTSxVQUFVLFlBQVksQ0FBQyxNQUFlO0lBQzFDLE1BQU0sVUFBVSxHQUFHLElBQUksbUJBQW1CLEVBQUUsQ0FBQTtJQUM1QyxNQUFNLGFBQWEsR0FBRyxJQUFJLG1CQUFtQixFQUFFLENBQUE7SUFDL0MsTUFBTSxhQUFhLEdBQUcsTUFBTSxDQUFDLFlBQVksQ0FBQyxjQUFjLENBQUMsV0FBVyxDQUFtQixDQUFBO0lBQ3ZGLE1BQU0sTUFBTSxHQUFpQixFQUFFLENBQUE7SUFFL0IsS0FBSyxNQUFNLHFCQUFxQixJQUFJLE1BQU0sQ0FBQyxjQUFjLEVBQUUsRUFBRTtRQUMzRCxJQUFJLHVCQUF1QixDQUFDLFFBQVEsQ0FBQyxxQkFBcUIsQ0FBQyxXQUFXLENBQUMsRUFBRTtZQUN2RSxTQUFRO1NBQ1Q7UUFDRCxxQkFBcUIsQ0FBQyxxQkFBcUIsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxNQUFNLEVBQUUsRUFBRTtZQUNqRSxNQUFNLGVBQWUsR0FBRyxhQUFhLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFBO1lBQ2pELE9BQU8sZUFBZSxDQUFBO1FBQ3hCLENBQUMsQ0FBQyxDQUFBO0tBQ0g7SUFFRCxJQUFJLE1BQWdDLENBQUE7SUFDcEMsT0FBTyxDQUFDLE1BQU0sR0FBRyxtQkFBbUIsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLENBQUMsRUFBRTtRQUMzRCxJQUFJLE1BQU0sQ0FBQyxJQUFJLEtBQUssZUFBZSxDQUFDLGFBQWEsRUFBRTtZQUNqRCxNQUFNLE9BQU8sR0FBRyxxQkFBcUIsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFFLENBQUE7WUFDdkQsTUFBTSxhQUFhLEdBQUcsYUFBYSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUE7WUFFL0QsMkRBQTJEO1lBQzNELE1BQU0saUJBQWlCLEdBQUcsYUFBYSxDQUFDLFFBQVEsRUFBRSxDQUFDLFVBQVUsQ0FBQTtZQUM3RCxNQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQTtZQUUzQyxJQUFJLENBQUMsaUJBQWlCLEdBQUcsV0FBVyxDQUFDLEdBQUcsSUFBSSxHQUFHLGdCQUFnQixFQUFFO2dCQUMvRCx3REFBd0Q7Z0JBQ3hELElBQUksaUJBQWlCLEdBQUcsQ0FBQyxFQUFFO29CQUN6QixNQUFNLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxjQUFjLEVBQUUsQ0FBQyxDQUFBO29CQUMzQyxhQUFhLENBQUMsV0FBVyxFQUFFLENBQUE7aUJBQzVCO2dCQUVELGlGQUFpRjtnQkFDakYsbURBQW1EO2dCQUNuRCxJQUFJLFdBQVcsR0FBRyxJQUFJLEdBQUcsZ0JBQWdCLEVBQUU7b0JBQ3pDLE9BQU8sQ0FBQyxLQUFLLENBQ1gsc0JBQXNCLFdBQVcsK0JBQStCLE9BQU8sQ0FBQyxXQUFXLGVBQWUsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUNySCxDQUFBO29CQUNELFNBQVE7aUJBQ1Q7YUFDRjtZQUVELElBQUksYUFBYSxFQUFFO2dCQUNqQiw0QkFBNEIsQ0FBQyxLQUFLLENBQ2hDLGFBQWEsQ0FBQyxRQUFRLEVBQ3RCLE9BQU8sQ0FBQyxTQUFTLEVBQ2pCLE9BQU8sQ0FBQyxXQUFXLEVBQ25CLGFBQWEsQ0FBQyxTQUFTLEVBQ3ZCLE9BQU8sQ0FBQyxJQUFJLEVBQ1osYUFBYSxDQUNkLENBQUE7YUFDRjtTQUNGO2FBQU07WUFDTCxVQUFVLENBQUMsbUJBQW1CLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFBO1NBQzlDO0tBQ0Y7SUFFRCw0Q0FBNEM7SUFDNUMsSUFBSSxhQUFhLENBQUMsa0JBQWtCLEVBQUUsR0FBRyxDQUFDLEVBQUU7UUFDMUMsTUFBTSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQTtLQUN0QztJQUVELE9BQU8sTUFBTSxDQUFBO0FBQ2YsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJlYWRXcml0ZUJ5dGVCdWZmZXIgfSBmcm9tICdAZGNsL2Vjcy9kaXN0L3NlcmlhbGl6YXRpb24vQnl0ZUJ1ZmZlcidcbmltcG9ydCB7XG4gIENyZHRNZXNzYWdlSGVhZGVyLFxuICBDcmR0TWVzc2FnZVByb3RvY29sLFxuICBDcmR0TWVzc2FnZVR5cGUsXG4gIElFbmdpbmUsXG4gIFB1dENvbXBvbmVudE9wZXJhdGlvbixcbiAgUHV0TmV0d29ya0NvbXBvbmVudE9wZXJhdGlvbixcbiAgU3luY0NvbXBvbmVudHMgYXMgX1N5bmNDb21wb25lbnRzLFxuICBOZXR3b3JrRW50aXR5IGFzIF9OZXR3b3JrRW50aXR5LFxuICBJTmV0b3dya0VudGl0eSxcbiAgVmlkZW9FdmVudCxcbiAgQXVkaW9FdmVudCxcbiAgRW5naW5lSW5mbyxcbiAgR2x0ZkNvbnRhaW5lckxvYWRpbmdTdGF0ZSxcbiAgUG9pbnRlckV2ZW50c1Jlc3VsdCxcbiAgUmF5Y2FzdFJlc3VsdCxcbiAgUmVhbG1JbmZvLFxuICBUd2VlblN0YXRlLFxuICBVaURyb3Bkb3duLFxuICBVaURyb3Bkb3duUmVzdWx0LFxuICBVaUlucHV0LFxuICBVaUlucHV0UmVzdWx0LFxuICBVaVRleHQsXG4gIFVpVHJhbnNmb3JtXG59IGZyb20gJ0BkY2wvZWNzJ1xuaW1wb3J0IHsgTElWRUtJVF9NQVhfU0laRSB9IGZyb20gJ0BkY2wvZWNzL2Rpc3Qvc3lzdGVtcy9jcmR0J1xuXG5leHBvcnQgY29uc3QgTk9UX1NZTkNfQ09NUE9ORU5UUyA9IFtcbiAgVmlkZW9FdmVudCxcbiAgVHdlZW5TdGF0ZSxcbiAgQXVkaW9FdmVudCxcbiAgRW5naW5lSW5mbyxcbiAgR2x0ZkNvbnRhaW5lckxvYWRpbmdTdGF0ZSxcbiAgUG9pbnRlckV2ZW50c1Jlc3VsdCxcbiAgUmF5Y2FzdFJlc3VsdCxcbiAgUmVhbG1JbmZvLFxuICBVaURyb3Bkb3duLFxuICBVaURyb3Bkb3duUmVzdWx0LFxuICBVaUlucHV0LFxuICBVaUlucHV0UmVzdWx0LFxuICBVaVRyYW5zZm9ybSxcbiAgVWlUZXh0XG5dXG5cbmV4cG9ydCBjb25zdCBOT1RfU1lOQ19DT01QT05FTlRTX0lEUyA9IE5PVF9TWU5DX0NPTVBPTkVOVFMubWFwKCgkKSA9PiAkLmNvbXBvbmVudElkKVxuXG5leHBvcnQgZnVuY3Rpb24gZW5naW5lVG9DcmR0KGVuZ2luZTogSUVuZ2luZSk6IFVpbnQ4QXJyYXlbXSB7XG4gIGNvbnN0IGNyZHRCdWZmZXIgPSBuZXcgUmVhZFdyaXRlQnl0ZUJ1ZmZlcigpXG4gIGNvbnN0IG5ldHdvcmtCdWZmZXIgPSBuZXcgUmVhZFdyaXRlQnl0ZUJ1ZmZlcigpXG4gIGNvbnN0IE5ldHdvcmtFbnRpdHkgPSBlbmdpbmUuZ2V0Q29tcG9uZW50KF9OZXR3b3JrRW50aXR5LmNvbXBvbmVudElkKSBhcyBJTmV0b3dya0VudGl0eVxuICBjb25zdCBjaHVua3M6IFVpbnQ4QXJyYXlbXSA9IFtdXG5cbiAgZm9yIChjb25zdCBpdENvbXBvbmVudERlZmluaXRpb24gb2YgZW5naW5lLmNvbXBvbmVudHNJdGVyKCkpIHtcbiAgICBpZiAoTk9UX1NZTkNfQ09NUE9ORU5UU19JRFMuaW5jbHVkZXMoaXRDb21wb25lbnREZWZpbml0aW9uLmNvbXBvbmVudElkKSkge1xuICAgICAgY29udGludWVcbiAgICB9XG4gICAgaXRDb21wb25lbnREZWZpbml0aW9uLmR1bXBDcmR0U3RhdGVUb0J1ZmZlcihjcmR0QnVmZmVyLCAoZW50aXR5KSA9PiB7XG4gICAgICBjb25zdCBpc05ldHdvcmtFbnRpdHkgPSBOZXR3b3JrRW50aXR5LmhhcyhlbnRpdHkpXG4gICAgICByZXR1cm4gaXNOZXR3b3JrRW50aXR5XG4gICAgfSlcbiAgfVxuXG4gIGxldCBoZWFkZXI6IENyZHRNZXNzYWdlSGVhZGVyIHwgbnVsbFxuICB3aGlsZSAoKGhlYWRlciA9IENyZHRNZXNzYWdlUHJvdG9jb2wuZ2V0SGVhZGVyKGNyZHRCdWZmZXIpKSkge1xuICAgIGlmIChoZWFkZXIudHlwZSA9PT0gQ3JkdE1lc3NhZ2VUeXBlLlBVVF9DT01QT05FTlQpIHtcbiAgICAgIGNvbnN0IG1lc3NhZ2UgPSBQdXRDb21wb25lbnRPcGVyYXRpb24ucmVhZChjcmR0QnVmZmVyKSFcbiAgICAgIGNvbnN0IG5ldHdvcmtFbnRpdHkgPSBOZXR3b3JrRW50aXR5LmdldE9yTnVsbChtZXNzYWdlLmVudGl0eUlkKVxuXG4gICAgICAvLyBDaGVjayBpZiBhZGRpbmcgdGhpcyBtZXNzYWdlIHdvdWxkIGV4Y2VlZCB0aGUgc2l6ZSBsaW1pdFxuICAgICAgY29uc3QgY3VycmVudEJ1ZmZlclNpemUgPSBuZXR3b3JrQnVmZmVyLnRvQmluYXJ5KCkuYnl0ZUxlbmd0aFxuICAgICAgY29uc3QgbWVzc2FnZVNpemUgPSBtZXNzYWdlLmRhdGEuYnl0ZUxlbmd0aFxuXG4gICAgICBpZiAoKGN1cnJlbnRCdWZmZXJTaXplICsgbWVzc2FnZVNpemUpIC8gMTAyNCA+IExJVkVLSVRfTUFYX1NJWkUpIHtcbiAgICAgICAgLy8gSWYgdGhlIGN1cnJlbnQgYnVmZmVyIGhhcyBjb250ZW50LCBzYXZlIGl0IGFzIGEgY2h1bmtcbiAgICAgICAgaWYgKGN1cnJlbnRCdWZmZXJTaXplID4gMCkge1xuICAgICAgICAgIGNodW5rcy5wdXNoKG5ldHdvcmtCdWZmZXIudG9Db3BpZWRCaW5hcnkoKSlcbiAgICAgICAgICBuZXR3b3JrQnVmZmVyLnJlc2V0QnVmZmVyKClcbiAgICAgICAgfVxuXG4gICAgICAgIC8vIElmIHRoZSBtZXNzYWdlIGl0c2VsZiBpcyBsYXJnZXIgdGhhbiB0aGUgbGltaXQsIHdlIG5lZWQgdG8gaGFuZGxlIGl0IHNwZWNpYWxseVxuICAgICAgICAvLyBGb3Igbm93LCB3ZSdsbCBza2lwIGl0IHRvIHByZXZlbnQgaW5maW5pdGUgbG9vcHNcbiAgICAgICAgaWYgKG1lc3NhZ2VTaXplIC8gMTAyNCA+IExJVkVLSVRfTUFYX1NJWkUpIHtcbiAgICAgICAgICBjb25zb2xlLmVycm9yKFxuICAgICAgICAgICAgYE1lc3NhZ2UgdG9vIGxhcmdlICgke21lc3NhZ2VTaXplfSBieXRlcyksIHNraXBwaW5nIGNvbXBvbmVudCAke21lc3NhZ2UuY29tcG9uZW50SWR9IGZvciBlbnRpdHkgJHttZXNzYWdlLmVudGl0eUlkfWBcbiAgICAgICAgICApXG4gICAgICAgICAgY29udGludWVcbiAgICAgICAgfVxuICAgICAgfVxuXG4gICAgICBpZiAobmV0d29ya0VudGl0eSkge1xuICAgICAgICBQdXROZXR3b3JrQ29tcG9uZW50T3BlcmF0aW9uLndyaXRlKFxuICAgICAgICAgIG5ldHdvcmtFbnRpdHkuZW50aXR5SWQsXG4gICAgICAgICAgbWVzc2FnZS50aW1lc3RhbXAsXG4gICAgICAgICAgbWVzc2FnZS5jb21wb25lbnRJZCxcbiAgICAgICAgICBuZXR3b3JrRW50aXR5Lm5ldHdvcmtJZCxcbiAgICAgICAgICBtZXNzYWdlLmRhdGEsXG4gICAgICAgICAgbmV0d29ya0J1ZmZlclxuICAgICAgICApXG4gICAgICB9XG4gICAgfSBlbHNlIHtcbiAgICAgIGNyZHRCdWZmZXIuaW5jcmVtZW50UmVhZE9mZnNldChoZWFkZXIubGVuZ3RoKVxuICAgIH1cbiAgfVxuXG4gIC8vIEFkZCBhbnkgcmVtYWluaW5nIGRhdGEgYXMgdGhlIGZpbmFsIGNodW5rXG4gIGlmIChuZXR3b3JrQnVmZmVyLmN1cnJlbnRXcml0ZU9mZnNldCgpID4gMCkge1xuICAgIGNodW5rcy5wdXNoKG5ldHdvcmtCdWZmZXIudG9CaW5hcnkoKSlcbiAgfVxuXG4gIHJldHVybiBjaHVua3Ncbn1cbiJdfQ==
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcl/sdk",
|
|
3
3
|
"description": "",
|
|
4
|
-
"version": "7.8.16
|
|
4
|
+
"version": "7.8.16",
|
|
5
5
|
"author": "Decentraland",
|
|
6
6
|
"dependencies": {
|
|
7
|
-
"@dcl/ecs": "7.8.16
|
|
7
|
+
"@dcl/ecs": "7.8.16",
|
|
8
8
|
"@dcl/ecs-math": "2.1.0",
|
|
9
9
|
"@dcl/explorer": "1.0.164509-20240802172549.commit-fb95b9b",
|
|
10
|
-
"@dcl/js-runtime": "7.8.16
|
|
11
|
-
"@dcl/react-ecs": "7.8.16
|
|
12
|
-
"@dcl/sdk-commands": "7.8.16
|
|
10
|
+
"@dcl/js-runtime": "7.8.16",
|
|
11
|
+
"@dcl/react-ecs": "7.8.16",
|
|
12
|
+
"@dcl/sdk-commands": "7.8.16",
|
|
13
13
|
"text-encoding": "0.7.0"
|
|
14
14
|
},
|
|
15
15
|
"keywords": [],
|
|
@@ -35,5 +35,5 @@
|
|
|
35
35
|
},
|
|
36
36
|
"types": "./index.d.ts",
|
|
37
37
|
"typings": "./index.d.ts",
|
|
38
|
-
"commit": "
|
|
38
|
+
"commit": "63d01086f02007e5332dbaa79ba561efee52e544"
|
|
39
39
|
}
|
|
@@ -82,10 +82,12 @@ export function addSyncTransport(
|
|
|
82
82
|
})
|
|
83
83
|
|
|
84
84
|
// Answer to REQ_CRDT_STATE
|
|
85
|
-
binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, async (
|
|
86
|
-
console.log(`Sending CRDT State to: ${userId}`)
|
|
87
|
-
|
|
88
|
-
|
|
85
|
+
binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, async (_, userId) => {
|
|
86
|
+
DEBUG_NETWORK_MESSAGES() && console.log(`Sending CRDT State to: ${userId}`)
|
|
87
|
+
|
|
88
|
+
for (const chunk of engineToCrdt(engine)) {
|
|
89
|
+
binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, chunk), [userId])
|
|
90
|
+
}
|
|
89
91
|
})
|
|
90
92
|
|
|
91
93
|
// Process CRDT messages here
|
|
@@ -104,7 +106,7 @@ export function addSyncTransport(
|
|
|
104
106
|
return
|
|
105
107
|
}
|
|
106
108
|
|
|
107
|
-
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE,
|
|
109
|
+
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, new Uint8Array())
|
|
108
110
|
|
|
109
111
|
// Wait ~5s for the response.
|
|
110
112
|
await sleep(5000)
|
package/src/network/state.ts
CHANGED
|
@@ -24,6 +24,7 @@ import {
|
|
|
24
24
|
UiText,
|
|
25
25
|
UiTransform
|
|
26
26
|
} from '@dcl/ecs'
|
|
27
|
+
import { LIVEKIT_MAX_SIZE } from '@dcl/ecs/dist/systems/crdt'
|
|
27
28
|
|
|
28
29
|
export const NOT_SYNC_COMPONENTS = [
|
|
29
30
|
VideoEvent,
|
|
@@ -44,10 +45,11 @@ export const NOT_SYNC_COMPONENTS = [
|
|
|
44
45
|
|
|
45
46
|
export const NOT_SYNC_COMPONENTS_IDS = NOT_SYNC_COMPONENTS.map(($) => $.componentId)
|
|
46
47
|
|
|
47
|
-
export function engineToCrdt(engine: IEngine): Uint8Array {
|
|
48
|
+
export function engineToCrdt(engine: IEngine): Uint8Array[] {
|
|
48
49
|
const crdtBuffer = new ReadWriteByteBuffer()
|
|
49
50
|
const networkBuffer = new ReadWriteByteBuffer()
|
|
50
51
|
const NetworkEntity = engine.getComponent(_NetworkEntity.componentId) as INetowrkEntity
|
|
52
|
+
const chunks: Uint8Array[] = []
|
|
51
53
|
|
|
52
54
|
for (const itComponentDefinition of engine.componentsIter()) {
|
|
53
55
|
if (NOT_SYNC_COMPONENTS_IDS.includes(itComponentDefinition.componentId)) {
|
|
@@ -64,6 +66,28 @@ export function engineToCrdt(engine: IEngine): Uint8Array {
|
|
|
64
66
|
if (header.type === CrdtMessageType.PUT_COMPONENT) {
|
|
65
67
|
const message = PutComponentOperation.read(crdtBuffer)!
|
|
66
68
|
const networkEntity = NetworkEntity.getOrNull(message.entityId)
|
|
69
|
+
|
|
70
|
+
// Check if adding this message would exceed the size limit
|
|
71
|
+
const currentBufferSize = networkBuffer.toBinary().byteLength
|
|
72
|
+
const messageSize = message.data.byteLength
|
|
73
|
+
|
|
74
|
+
if ((currentBufferSize + messageSize) / 1024 > LIVEKIT_MAX_SIZE) {
|
|
75
|
+
// If the current buffer has content, save it as a chunk
|
|
76
|
+
if (currentBufferSize > 0) {
|
|
77
|
+
chunks.push(networkBuffer.toCopiedBinary())
|
|
78
|
+
networkBuffer.resetBuffer()
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
// If the message itself is larger than the limit, we need to handle it specially
|
|
82
|
+
// For now, we'll skip it to prevent infinite loops
|
|
83
|
+
if (messageSize / 1024 > LIVEKIT_MAX_SIZE) {
|
|
84
|
+
console.error(
|
|
85
|
+
`Message too large (${messageSize} bytes), skipping component ${message.componentId} for entity ${message.entityId}`
|
|
86
|
+
)
|
|
87
|
+
continue
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
|
|
67
91
|
if (networkEntity) {
|
|
68
92
|
PutNetworkComponentOperation.write(
|
|
69
93
|
networkEntity.entityId,
|
|
@@ -73,19 +97,16 @@ export function engineToCrdt(engine: IEngine): Uint8Array {
|
|
|
73
97
|
message.data,
|
|
74
98
|
networkBuffer
|
|
75
99
|
)
|
|
76
|
-
} else {
|
|
77
|
-
PutComponentOperation.write(
|
|
78
|
-
message.entityId,
|
|
79
|
-
message.timestamp,
|
|
80
|
-
message.componentId,
|
|
81
|
-
message.data,
|
|
82
|
-
networkBuffer
|
|
83
|
-
)
|
|
84
100
|
}
|
|
85
101
|
} else {
|
|
86
102
|
crdtBuffer.incrementReadOffset(header.length)
|
|
87
103
|
}
|
|
88
104
|
}
|
|
89
105
|
|
|
90
|
-
|
|
106
|
+
// Add any remaining data as the final chunk
|
|
107
|
+
if (networkBuffer.currentWriteOffset() > 0) {
|
|
108
|
+
chunks.push(networkBuffer.toBinary())
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
return chunks
|
|
91
112
|
}
|