@dcl/sdk 7.6.3-11407444266.commit-d9e3bec → 7.6.3-11411638449.commit-c070ea9

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.
@@ -1,2 +1,2 @@
1
- declare const getChildren: (parent: import("@dcl/ecs").Entity) => Iterable<import("@dcl/ecs").Entity>, syncEntity: (entityId: import("@dcl/ecs").Entity, componentIds: number[], entityEnumId?: number | undefined) => void, parentEntity: (entity: import("@dcl/ecs").Entity, parent: import("@dcl/ecs").Entity) => void, getParent: (child: import("@dcl/ecs").Entity) => import("@dcl/ecs").Entity | undefined, myProfile: import("./message-bus-sync").IProfile, removeParent: (entity: import("@dcl/ecs").Entity) => void, getFirstChild: (entity: import("@dcl/ecs").Entity) => import("@dcl/ecs").Entity;
2
- export { getFirstChild, getChildren, syncEntity, parentEntity, getParent, myProfile, removeParent };
1
+ declare const getChildren: (parent: import("@dcl/ecs").Entity) => Iterable<import("@dcl/ecs").Entity>, syncEntity: (entityId: import("@dcl/ecs").Entity, componentIds: number[], entityEnumId?: number | undefined) => void, parentEntity: (entity: import("@dcl/ecs").Entity, parent: import("@dcl/ecs").Entity) => void, getParent: (child: import("@dcl/ecs").Entity) => import("@dcl/ecs").Entity | undefined, myProfile: import("./message-bus-sync").IProfile, removeParent: (entity: import("@dcl/ecs").Entity) => void, getFirstChild: (entity: import("@dcl/ecs").Entity) => import("@dcl/ecs").Entity, isStateSyncronized: () => boolean;
2
+ export { getFirstChild, getChildren, syncEntity, parentEntity, getParent, myProfile, removeParent, isStateSyncronized };
package/network/index.js CHANGED
@@ -3,6 +3,6 @@ import { engine } from '@dcl/ecs';
3
3
  import { addSyncTransport } from './message-bus-sync';
4
4
  import { getUserData } from '~system/UserIdentity';
5
5
  // initialize sync transport for sdk engine
6
- const { getChildren, syncEntity, parentEntity, getParent, myProfile, removeParent, getFirstChild } = addSyncTransport(engine, sendBinary, getUserData);
7
- export { getFirstChild, getChildren, syncEntity, parentEntity, getParent, myProfile, removeParent };
8
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvbmV0d29yay9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDN0QsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFVBQVUsQ0FBQTtBQUNqQyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUNyRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFFbEQsMkNBQTJDO0FBQzNDLE1BQU0sRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLFlBQVksRUFBRSxhQUFhLEVBQUUsR0FBRyxnQkFBZ0IsQ0FDbkgsTUFBTSxFQUNOLFVBQVUsRUFDVixXQUFXLENBQ1osQ0FBQTtBQUVELE9BQU8sRUFBRSxhQUFhLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLFNBQVMsRUFBRSxZQUFZLEVBQUUsQ0FBQSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHNlbmRCaW5hcnkgfSBmcm9tICd+c3lzdGVtL0NvbW11bmljYXRpb25zQ29udHJvbGxlcidcbmltcG9ydCB7IGVuZ2luZSB9IGZyb20gJ0BkY2wvZWNzJ1xuaW1wb3J0IHsgYWRkU3luY1RyYW5zcG9ydCB9IGZyb20gJy4vbWVzc2FnZS1idXMtc3luYydcbmltcG9ydCB7IGdldFVzZXJEYXRhIH0gZnJvbSAnfnN5c3RlbS9Vc2VySWRlbnRpdHknXG5cbi8vIGluaXRpYWxpemUgc3luYyB0cmFuc3BvcnQgZm9yIHNkayBlbmdpbmVcbmNvbnN0IHsgZ2V0Q2hpbGRyZW4sIHN5bmNFbnRpdHksIHBhcmVudEVudGl0eSwgZ2V0UGFyZW50LCBteVByb2ZpbGUsIHJlbW92ZVBhcmVudCwgZ2V0Rmlyc3RDaGlsZCB9ID0gYWRkU3luY1RyYW5zcG9ydChcbiAgZW5naW5lLFxuICBzZW5kQmluYXJ5LFxuICBnZXRVc2VyRGF0YVxuKVxuXG5leHBvcnQgeyBnZXRGaXJzdENoaWxkLCBnZXRDaGlsZHJlbiwgc3luY0VudGl0eSwgcGFyZW50RW50aXR5LCBnZXRQYXJlbnQsIG15UHJvZmlsZSwgcmVtb3ZlUGFyZW50IH1cbiJdfQ==
6
+ const { getChildren, syncEntity, parentEntity, getParent, myProfile, removeParent, getFirstChild, isStateSyncronized } = addSyncTransport(engine, sendBinary, getUserData);
7
+ export { getFirstChild, getChildren, syncEntity, parentEntity, getParent, myProfile, removeParent, isStateSyncronized };
8
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvbmV0d29yay9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDN0QsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFVBQVUsQ0FBQTtBQUNqQyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUNyRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFFbEQsMkNBQTJDO0FBQzNDLE1BQU0sRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLFlBQVksRUFBRSxhQUFhLEVBQUUsa0JBQWtCLEVBQUUsR0FDcEgsZ0JBQWdCLENBQUMsTUFBTSxFQUFFLFVBQVUsRUFBRSxXQUFXLENBQUMsQ0FBQTtBQUVuRCxPQUFPLEVBQUUsYUFBYSxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsWUFBWSxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLGtCQUFrQixFQUFFLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBzZW5kQmluYXJ5IH0gZnJvbSAnfnN5c3RlbS9Db21tdW5pY2F0aW9uc0NvbnRyb2xsZXInXG5pbXBvcnQgeyBlbmdpbmUgfSBmcm9tICdAZGNsL2VjcydcbmltcG9ydCB7IGFkZFN5bmNUcmFuc3BvcnQgfSBmcm9tICcuL21lc3NhZ2UtYnVzLXN5bmMnXG5pbXBvcnQgeyBnZXRVc2VyRGF0YSB9IGZyb20gJ35zeXN0ZW0vVXNlcklkZW50aXR5J1xuXG4vLyBpbml0aWFsaXplIHN5bmMgdHJhbnNwb3J0IGZvciBzZGsgZW5naW5lXG5jb25zdCB7IGdldENoaWxkcmVuLCBzeW5jRW50aXR5LCBwYXJlbnRFbnRpdHksIGdldFBhcmVudCwgbXlQcm9maWxlLCByZW1vdmVQYXJlbnQsIGdldEZpcnN0Q2hpbGQsIGlzU3RhdGVTeW5jcm9uaXplZCB9ID1cbiAgYWRkU3luY1RyYW5zcG9ydChlbmdpbmUsIHNlbmRCaW5hcnksIGdldFVzZXJEYXRhKVxuXG5leHBvcnQgeyBnZXRGaXJzdENoaWxkLCBnZXRDaGlsZHJlbiwgc3luY0VudGl0eSwgcGFyZW50RW50aXR5LCBnZXRQYXJlbnQsIG15UHJvZmlsZSwgcmVtb3ZlUGFyZW50LCBpc1N0YXRlU3luY3Jvbml6ZWQgfVxuIl19
@@ -8,6 +8,7 @@ export type IProfile = {
8
8
  };
9
9
  export declare function addSyncTransport(engine: IEngine, sendBinary: (msg: SendBinaryRequest) => Promise<SendBinaryResponse>, getUserData: (value: GetUserDataRequest) => Promise<GetUserDataResponse>): {
10
10
  myProfile: IProfile;
11
+ isStateSyncronized: () => boolean;
11
12
  syncEntity: (entityId: import("@dcl/ecs").Entity, componentIds: number[], entityEnumId?: number | undefined) => void;
12
13
  getChildren: (parent: import("@dcl/ecs").Entity) => Iterable<import("@dcl/ecs").Entity>;
13
14
  getParent: (child: import("@dcl/ecs").Entity) => import("@dcl/ecs").Entity | undefined;
@@ -1,4 +1,4 @@
1
- import { RealmInfo } from '@dcl/ecs';
1
+ import { RealmInfo, PlayerIdentityData } from '@dcl/ecs';
2
2
  import { syncFilter } from './filter';
3
3
  import { engineToCrdt } from './state';
4
4
  import { BinaryMessageBus, CommsMessage, decodeString, encodeString } from './binary-message-bus';
@@ -22,6 +22,8 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
22
22
  pendingMessageBusMessagesToSend.length = 0;
23
23
  return messages;
24
24
  }
25
+ const players = definePlayerHelper(engine);
26
+ let stateIsSyncronized = false;
25
27
  let transportInitialzed = false;
26
28
  // Add Sync Transport
27
29
  const transport = {
@@ -41,55 +43,89 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
41
43
  };
42
44
  engine.addTransport(transport);
43
45
  // End add sync transport
44
- // If we dont have any state initialized, and recieve a state message.
46
+ // Receive & Process CRDT_STATE
45
47
  binaryMessageBus.on(CommsMessage.RES_CRDT_STATE, (value) => {
46
48
  const { sender, data } = decodeCRDTState(value);
47
49
  if (sender !== myProfile.userId)
48
50
  return;
49
51
  DEBUG_NETWORK_MESSAGES() && console.log('[Processing CRDT State]', data.byteLength);
50
52
  transport.onmessage(data);
53
+ stateIsSyncronized = true;
51
54
  });
52
- binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, (message, userId) => {
55
+ // Answer to REQ_CRDT_STATE
56
+ binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, async (message, userId) => {
57
+ console.log(`Sending CRDT State to: ${userId}`);
53
58
  transport.onmessage(message);
54
59
  binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, engineToCrdt(engine)));
55
60
  });
56
- const players = definePlayerHelper(engine);
57
- let requestCrdtStateWhenConnected = false;
58
- players.onEnterScene((player) => {
59
- DEBUG_NETWORK_MESSAGES() && console.log('[onEnterScene]', player.userId);
60
- if (player.userId === myProfile.userId && !requestCrdtStateWhenConnected) {
61
- if (RealmInfo.getOrNull(engine.RootEntity)?.isConnectedSceneRoom) {
62
- DEBUG_NETWORK_MESSAGES() && console.log('Requesting state');
63
- binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, engineToCrdt(engine));
61
+ // Process CRDT messages here
62
+ binaryMessageBus.on(CommsMessage.CRDT, (value) => {
63
+ DEBUG_NETWORK_MESSAGES() &&
64
+ console.log(Array.from(serializeCrdtMessages('[NetworkMessage received]:', value, engine)));
65
+ transport.onmessage(value);
66
+ });
67
+ async function requestState(retryCount = 1) {
68
+ let players = Array.from(engine.getEntitiesWith(PlayerIdentityData));
69
+ DEBUG_NETWORK_MESSAGES() && console.log(`Requesting state. Players connected: ${players.length - 1}`);
70
+ if (!RealmInfo.getOrNull(engine.RootEntity)?.isConnectedSceneRoom) {
71
+ DEBUG_NETWORK_MESSAGES() && console.log(`Aborting Requesting state?. Disconnected`);
72
+ return;
73
+ }
74
+ binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, engineToCrdt(engine));
75
+ // Wait ~5s for the response.
76
+ await sleep(5000);
77
+ players = Array.from(engine.getEntitiesWith(PlayerIdentityData));
78
+ if (!stateIsSyncronized) {
79
+ if (players.length > 1 && retryCount <= 2) {
80
+ DEBUG_NETWORK_MESSAGES() &&
81
+ console.log(`Requesting state again ${retryCount} (no response). Players connected: ${players.length - 1}`);
82
+ void requestState(retryCount + 1);
64
83
  }
65
84
  else {
66
- DEBUG_NETWORK_MESSAGES() && console.log('Waiting to be conneted');
67
- requestCrdtStateWhenConnected = true;
85
+ DEBUG_NETWORK_MESSAGES() && console.log('No active players. State syncronized');
86
+ stateIsSyncronized = true;
68
87
  }
69
88
  }
89
+ }
90
+ players.onEnterScene((player) => {
91
+ DEBUG_NETWORK_MESSAGES() && console.log('[onEnterScene]', player.userId);
70
92
  });
93
+ // Asks for the REQ_CRDT_STATE when its connected to comms
71
94
  RealmInfo.onChange(engine.RootEntity, (value) => {
72
- if (value?.isConnectedSceneRoom && requestCrdtStateWhenConnected) {
73
- DEBUG_NETWORK_MESSAGES() && console.log('Requesting state.');
74
- requestCrdtStateWhenConnected = false;
75
- binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, engineToCrdt(engine));
95
+ if (!value?.isConnectedSceneRoom) {
96
+ DEBUG_NETWORK_MESSAGES() && console.log('Disconnected from comms');
97
+ stateIsSyncronized = false;
98
+ }
99
+ if (value?.isConnectedSceneRoom) {
100
+ DEBUG_NETWORK_MESSAGES() && console.log('Connected to comms');
101
+ }
102
+ if (value?.isConnectedSceneRoom && !stateIsSyncronized) {
103
+ void requestState();
76
104
  }
77
105
  });
78
106
  players.onLeaveScene((userId) => {
79
107
  DEBUG_NETWORK_MESSAGES() && console.log('[onLeaveScene]', userId);
80
- if (userId === myProfile.userId) {
81
- requestCrdtStateWhenConnected = false;
82
- }
83
- });
84
- // Process CRDT messages here
85
- binaryMessageBus.on(CommsMessage.CRDT, (value) => {
86
- DEBUG_NETWORK_MESSAGES() &&
87
- console.log(Array.from(serializeCrdtMessages('[NetworkMessage received]:', value, engine)));
88
- transport.onmessage(value);
89
108
  });
109
+ function isStateSyncronized() {
110
+ return stateIsSyncronized;
111
+ }
112
+ function sleep(ms) {
113
+ return new Promise((resolve) => {
114
+ let timer = 0;
115
+ function sleepSystem(dt) {
116
+ timer += dt;
117
+ if (timer * 1000 >= ms) {
118
+ engine.removeSystem(sleepSystem);
119
+ resolve();
120
+ }
121
+ }
122
+ engine.addSystem(sleepSystem);
123
+ });
124
+ }
90
125
  return {
91
126
  ...entityDefinitions,
92
- myProfile
127
+ myProfile,
128
+ isStateSyncronized
93
129
  };
94
130
  }
95
131
  /**
@@ -121,4 +157,4 @@ function encodeCRDTState(address, data) {
121
157
  serializedMessage.set(data, addressBuffer.byteLength + 1);
122
158
  return serializedMessage;
123
159
  }
124
- //# 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    DEBUG_NETWORK_MESSAGES() && console.log('[onEnterScene]', player.userId)\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    DEBUG_NETWORK_MESSAGES() && console.log('[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"]}
160
+ //# 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 ?? 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  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 (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  // 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)\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)))\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"]}
package/package.json CHANGED
@@ -1,15 +1,15 @@
1
1
  {
2
2
  "name": "@dcl/sdk",
3
3
  "description": "",
4
- "version": "7.6.3-11407444266.commit-d9e3bec",
4
+ "version": "7.6.3-11411638449.commit-c070ea9",
5
5
  "author": "Decentraland",
6
6
  "dependencies": {
7
- "@dcl/ecs": "7.6.3-11407444266.commit-d9e3bec",
7
+ "@dcl/ecs": "7.6.3-11411638449.commit-c070ea9",
8
8
  "@dcl/ecs-math": "2.0.2",
9
9
  "@dcl/explorer": "1.0.164509-20240802172549.commit-fb95b9b",
10
- "@dcl/js-runtime": "7.6.3-11407444266.commit-d9e3bec",
11
- "@dcl/react-ecs": "7.6.3-11407444266.commit-d9e3bec",
12
- "@dcl/sdk-commands": "7.6.3-11407444266.commit-d9e3bec",
10
+ "@dcl/js-runtime": "7.6.3-11411638449.commit-c070ea9",
11
+ "@dcl/react-ecs": "7.6.3-11411638449.commit-c070ea9",
12
+ "@dcl/sdk-commands": "7.6.3-11411638449.commit-c070ea9",
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": "d9e3bec5637b6cef47ac088cda87fbdd3c8b9aff"
38
+ "commit": "c070ea9e2c24483892875d921f621668a85f3a9a"
39
39
  }
@@ -4,10 +4,7 @@ import { addSyncTransport } from './message-bus-sync'
4
4
  import { getUserData } from '~system/UserIdentity'
5
5
 
6
6
  // initialize sync transport for sdk engine
7
- const { getChildren, syncEntity, parentEntity, getParent, myProfile, removeParent, getFirstChild } = addSyncTransport(
8
- engine,
9
- sendBinary,
10
- getUserData
11
- )
7
+ const { getChildren, syncEntity, parentEntity, getParent, myProfile, removeParent, getFirstChild, isStateSyncronized } =
8
+ addSyncTransport(engine, sendBinary, getUserData)
12
9
 
13
- export { getFirstChild, getChildren, syncEntity, parentEntity, getParent, myProfile, removeParent }
10
+ export { getFirstChild, getChildren, syncEntity, parentEntity, getParent, myProfile, removeParent, isStateSyncronized }
@@ -1,4 +1,4 @@
1
- import { IEngine, Transport, RealmInfo } from '@dcl/ecs'
1
+ import { IEngine, Transport, RealmInfo, PlayerIdentityData } from '@dcl/ecs'
2
2
  import { type SendBinaryRequest, type SendBinaryResponse } from '~system/CommunicationsController'
3
3
 
4
4
  import { syncFilter } from './filter'
@@ -34,8 +34,11 @@ export function addSyncTransport(
34
34
  pendingMessageBusMessagesToSend.length = 0
35
35
  return messages
36
36
  }
37
+ const players = definePlayerHelper(engine)
37
38
 
39
+ let stateIsSyncronized = false
38
40
  let transportInitialzed = false
41
+
39
42
  // Add Sync Transport
40
43
  const transport: Transport = {
41
44
  filter: syncFilter(engine),
@@ -55,61 +58,103 @@ export function addSyncTransport(
55
58
  engine.addTransport(transport)
56
59
  // End add sync transport
57
60
 
58
- // If we dont have any state initialized, and recieve a state message.
61
+ // Receive & Process CRDT_STATE
59
62
  binaryMessageBus.on(CommsMessage.RES_CRDT_STATE, (value) => {
60
63
  const { sender, data } = decodeCRDTState(value)
61
64
  if (sender !== myProfile.userId) return
62
65
  DEBUG_NETWORK_MESSAGES() && console.log('[Processing CRDT State]', data.byteLength)
63
66
  transport.onmessage!(data)
67
+ stateIsSyncronized = true
64
68
  })
65
69
 
66
- binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, (message, userId) => {
70
+ // Answer to REQ_CRDT_STATE
71
+ binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, async (message, userId) => {
72
+ console.log(`Sending CRDT State to: ${userId}`)
67
73
  transport.onmessage!(message)
68
74
  binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, engineToCrdt(engine)))
69
75
  })
70
76
 
71
- const players = definePlayerHelper(engine)
77
+ // Process CRDT messages here
78
+ binaryMessageBus.on(CommsMessage.CRDT, (value) => {
79
+ DEBUG_NETWORK_MESSAGES() &&
80
+ console.log(Array.from(serializeCrdtMessages('[NetworkMessage received]:', value, engine)))
81
+ transport.onmessage!(value)
82
+ })
72
83
 
73
- let requestCrdtStateWhenConnected = false
84
+ async function requestState(retryCount: number = 1) {
85
+ let players = Array.from(engine.getEntitiesWith(PlayerIdentityData))
86
+ DEBUG_NETWORK_MESSAGES() && console.log(`Requesting state. Players connected: ${players.length - 1}`)
74
87
 
75
- players.onEnterScene((player) => {
76
- DEBUG_NETWORK_MESSAGES() && console.log('[onEnterScene]', player.userId)
77
- if (player.userId === myProfile.userId && !requestCrdtStateWhenConnected) {
78
- if (RealmInfo.getOrNull(engine.RootEntity)?.isConnectedSceneRoom) {
79
- DEBUG_NETWORK_MESSAGES() && console.log('Requesting state')
80
- binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, engineToCrdt(engine))
88
+ if (!RealmInfo.getOrNull(engine.RootEntity)?.isConnectedSceneRoom) {
89
+ DEBUG_NETWORK_MESSAGES() && console.log(`Aborting Requesting state?. Disconnected`)
90
+ return
91
+ }
92
+
93
+ binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, engineToCrdt(engine))
94
+
95
+ // Wait ~5s for the response.
96
+ await sleep(5000)
97
+
98
+ players = Array.from(engine.getEntitiesWith(PlayerIdentityData))
99
+
100
+ if (!stateIsSyncronized) {
101
+ if (players.length > 1 && retryCount <= 2) {
102
+ DEBUG_NETWORK_MESSAGES() &&
103
+ console.log(`Requesting state again ${retryCount} (no response). Players connected: ${players.length - 1}`)
104
+ void requestState(retryCount + 1)
81
105
  } else {
82
- DEBUG_NETWORK_MESSAGES() && console.log('Waiting to be conneted')
83
- requestCrdtStateWhenConnected = true
106
+ DEBUG_NETWORK_MESSAGES() && console.log('No active players. State syncronized')
107
+ stateIsSyncronized = true
84
108
  }
85
109
  }
110
+ }
111
+
112
+ players.onEnterScene((player) => {
113
+ DEBUG_NETWORK_MESSAGES() && console.log('[onEnterScene]', player.userId)
86
114
  })
87
115
 
116
+ // Asks for the REQ_CRDT_STATE when its connected to comms
88
117
  RealmInfo.onChange(engine.RootEntity, (value) => {
89
- if (value?.isConnectedSceneRoom && requestCrdtStateWhenConnected) {
90
- DEBUG_NETWORK_MESSAGES() && console.log('Requesting state.')
91
- requestCrdtStateWhenConnected = false
92
- binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, engineToCrdt(engine))
118
+ if (!value?.isConnectedSceneRoom) {
119
+ DEBUG_NETWORK_MESSAGES() && console.log('Disconnected from comms')
120
+ stateIsSyncronized = false
121
+ }
122
+
123
+ if (value?.isConnectedSceneRoom) {
124
+ DEBUG_NETWORK_MESSAGES() && console.log('Connected to comms')
125
+ }
126
+
127
+ if (value?.isConnectedSceneRoom && !stateIsSyncronized) {
128
+ void requestState()
93
129
  }
94
130
  })
95
131
 
96
132
  players.onLeaveScene((userId) => {
97
133
  DEBUG_NETWORK_MESSAGES() && console.log('[onLeaveScene]', userId)
98
- if (userId === myProfile.userId) {
99
- requestCrdtStateWhenConnected = false
100
- }
101
134
  })
102
135
 
103
- // Process CRDT messages here
104
- binaryMessageBus.on(CommsMessage.CRDT, (value) => {
105
- DEBUG_NETWORK_MESSAGES() &&
106
- console.log(Array.from(serializeCrdtMessages('[NetworkMessage received]:', value, engine)))
107
- transport.onmessage!(value)
108
- })
136
+ function isStateSyncronized() {
137
+ return stateIsSyncronized
138
+ }
139
+
140
+ function sleep(ms: number) {
141
+ return new Promise<void>((resolve) => {
142
+ let timer = 0
143
+ function sleepSystem(dt: number) {
144
+ timer += dt
145
+ if (timer * 1000 >= ms) {
146
+ engine.removeSystem(sleepSystem)
147
+ resolve()
148
+ }
149
+ }
150
+ engine.addSystem(sleepSystem)
151
+ })
152
+ }
109
153
 
110
154
  return {
111
155
  ...entityDefinitions,
112
- myProfile
156
+ myProfile,
157
+ isStateSyncronized
113
158
  }
114
159
  }
115
160