@dcl/sdk 7.5.8-11016067531.commit-0b941aa → 7.5.8-11033502112.commit-95b8f41
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 +17 -11
- package/package.json +6 -6
- package/src/network/message-bus-sync.ts +16 -10
@@ -8,6 +8,7 @@ import { definePlayerHelper } from '../players';
|
|
8
8
|
import { serializeCrdtMessages } from '../internal/transports/logger';
|
9
9
|
// user that we asked for the inital crdt state
|
10
10
|
export function addSyncTransport(engine, sendBinary, getUserData) {
|
11
|
+
const DEBUG_NETWORK_MESSAGES = () => globalThis.DEBUG_NETWORK_MESSAGES ?? true;
|
11
12
|
// Profile Info
|
12
13
|
const myProfile = {};
|
13
14
|
fetchProfile(myProfile, getUserData);
|
@@ -21,17 +22,20 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
|
|
21
22
|
pendingMessageBusMessagesToSend.length = 0;
|
22
23
|
return messages;
|
23
24
|
}
|
25
|
+
let transportInitialzed = false;
|
24
26
|
// Add Sync Transport
|
25
27
|
const transport = {
|
26
28
|
filter: syncFilter(engine),
|
27
29
|
send: async (message) => {
|
28
|
-
if (message.byteLength) {
|
29
|
-
|
30
|
+
if (message.byteLength && transportInitialzed) {
|
31
|
+
DEBUG_NETWORK_MESSAGES() &&
|
32
|
+
console.log(...Array.from(serializeCrdtMessages('[NetworkMessage sent]:', message, engine)));
|
30
33
|
binaryMessageBus.emit(CommsMessage.CRDT, message);
|
31
34
|
}
|
32
35
|
const messages = getMessagesToSend();
|
33
36
|
const response = await sendBinary({ data: messages });
|
34
37
|
binaryMessageBus.__processMessages(response.data);
|
38
|
+
transportInitialzed = true;
|
35
39
|
},
|
36
40
|
type: 'network'
|
37
41
|
};
|
@@ -42,10 +46,11 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
|
|
42
46
|
const { sender, data } = decodeCRDTState(value);
|
43
47
|
if (sender !== myProfile.userId)
|
44
48
|
return;
|
45
|
-
console.log('[Processing CRDT State]', data.byteLength);
|
49
|
+
DEBUG_NETWORK_MESSAGES() && console.log('[Processing CRDT State]', data.byteLength);
|
46
50
|
transport.onmessage(data);
|
47
51
|
});
|
48
|
-
binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, (
|
52
|
+
binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, (message, userId) => {
|
53
|
+
transport.onmessage(message);
|
49
54
|
binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, engineToCrdt(engine)));
|
50
55
|
});
|
51
56
|
const players = definePlayerHelper(engine);
|
@@ -53,20 +58,20 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
|
|
53
58
|
players.onEnterScene((player) => {
|
54
59
|
if (player.userId === myProfile.userId && !requestCrdtStateWhenConnected) {
|
55
60
|
if (RealmInfo.getOrNull(engine.RootEntity)?.isConnectedSceneRoom) {
|
56
|
-
console.log('Requesting state');
|
57
|
-
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE,
|
61
|
+
DEBUG_NETWORK_MESSAGES() && console.log('Requesting state');
|
62
|
+
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, engineToCrdt(engine));
|
58
63
|
}
|
59
64
|
else {
|
60
|
-
console.log('Waiting to be conneted');
|
65
|
+
DEBUG_NETWORK_MESSAGES() && console.log('Waiting to be conneted');
|
61
66
|
requestCrdtStateWhenConnected = true;
|
62
67
|
}
|
63
68
|
}
|
64
69
|
});
|
65
70
|
RealmInfo.onChange(engine.RootEntity, (value) => {
|
66
71
|
if (value?.isConnectedSceneRoom && requestCrdtStateWhenConnected) {
|
67
|
-
console.log('Requesting state.');
|
72
|
+
DEBUG_NETWORK_MESSAGES() && console.log('Requesting state.');
|
68
73
|
requestCrdtStateWhenConnected = false;
|
69
|
-
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE,
|
74
|
+
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, engineToCrdt(engine));
|
70
75
|
}
|
71
76
|
});
|
72
77
|
players.onLeaveScene((userId) => {
|
@@ -76,7 +81,8 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
|
|
76
81
|
});
|
77
82
|
// Process CRDT messages here
|
78
83
|
binaryMessageBus.on(CommsMessage.CRDT, (value) => {
|
79
|
-
|
84
|
+
DEBUG_NETWORK_MESSAGES() &&
|
85
|
+
console.log(Array.from(serializeCrdtMessages('[NetworkMessage received]:', value, engine)));
|
80
86
|
transport.onmessage(value);
|
81
87
|
});
|
82
88
|
return {
|
@@ -113,4 +119,4 @@ function encodeCRDTState(address, data) {
|
|
113
119
|
serializedMessage.set(data, addressBuffer.byteLength + 1);
|
114
120
|
return serializedMessage;
|
115
121
|
}
|
116
|
-
//# 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"]}
|
122
|
+
//# 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
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
{
|
2
2
|
"name": "@dcl/sdk",
|
3
3
|
"description": "",
|
4
|
-
"version": "7.5.8-
|
4
|
+
"version": "7.5.8-11033502112.commit-95b8f41",
|
5
5
|
"author": "Decentraland",
|
6
6
|
"dependencies": {
|
7
|
-
"@dcl/ecs": "7.5.8-
|
7
|
+
"@dcl/ecs": "7.5.8-11033502112.commit-95b8f41",
|
8
8
|
"@dcl/ecs-math": "2.0.2",
|
9
9
|
"@dcl/explorer": "1.0.164509-20240802172549.commit-fb95b9b",
|
10
|
-
"@dcl/js-runtime": "7.5.8-
|
11
|
-
"@dcl/react-ecs": "7.5.8-
|
12
|
-
"@dcl/sdk-commands": "7.5.8-
|
10
|
+
"@dcl/js-runtime": "7.5.8-11033502112.commit-95b8f41",
|
11
|
+
"@dcl/react-ecs": "7.5.8-11033502112.commit-95b8f41",
|
12
|
+
"@dcl/sdk-commands": "7.5.8-11033502112.commit-95b8f41",
|
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": "95b8f418948408f82dc030ac9dda7bfc055e3207"
|
39
39
|
}
|
@@ -17,6 +17,7 @@ export function addSyncTransport(
|
|
17
17
|
sendBinary: (msg: SendBinaryRequest) => Promise<SendBinaryResponse>,
|
18
18
|
getUserData: (value: GetUserDataRequest) => Promise<GetUserDataResponse>
|
19
19
|
) {
|
20
|
+
const DEBUG_NETWORK_MESSAGES = () => (globalThis as any).DEBUG_NETWORK_MESSAGES ?? true
|
20
21
|
// Profile Info
|
21
22
|
const myProfile: IProfile = {} as IProfile
|
22
23
|
fetchProfile(myProfile!, getUserData)
|
@@ -34,17 +35,20 @@ export function addSyncTransport(
|
|
34
35
|
return messages
|
35
36
|
}
|
36
37
|
|
38
|
+
let transportInitialzed = false
|
37
39
|
// Add Sync Transport
|
38
40
|
const transport: Transport = {
|
39
41
|
filter: syncFilter(engine),
|
40
42
|
send: async (message: Uint8Array) => {
|
41
|
-
if (message.byteLength) {
|
42
|
-
|
43
|
+
if (message.byteLength && transportInitialzed) {
|
44
|
+
DEBUG_NETWORK_MESSAGES() &&
|
45
|
+
console.log(...Array.from(serializeCrdtMessages('[NetworkMessage sent]:', message, engine)))
|
43
46
|
binaryMessageBus.emit(CommsMessage.CRDT, message)
|
44
47
|
}
|
45
48
|
const messages = getMessagesToSend()
|
46
49
|
const response = await sendBinary({ data: messages })
|
47
50
|
binaryMessageBus.__processMessages(response.data)
|
51
|
+
transportInitialzed = true
|
48
52
|
},
|
49
53
|
type: 'network'
|
50
54
|
}
|
@@ -55,11 +59,12 @@ export function addSyncTransport(
|
|
55
59
|
binaryMessageBus.on(CommsMessage.RES_CRDT_STATE, (value) => {
|
56
60
|
const { sender, data } = decodeCRDTState(value)
|
57
61
|
if (sender !== myProfile.userId) return
|
58
|
-
console.log('[Processing CRDT State]', data.byteLength)
|
62
|
+
DEBUG_NETWORK_MESSAGES() && console.log('[Processing CRDT State]', data.byteLength)
|
59
63
|
transport.onmessage!(data)
|
60
64
|
})
|
61
65
|
|
62
|
-
binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, (
|
66
|
+
binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, (message, userId) => {
|
67
|
+
transport.onmessage!(message)
|
63
68
|
binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, engineToCrdt(engine)))
|
64
69
|
})
|
65
70
|
|
@@ -70,10 +75,10 @@ export function addSyncTransport(
|
|
70
75
|
players.onEnterScene((player) => {
|
71
76
|
if (player.userId === myProfile.userId && !requestCrdtStateWhenConnected) {
|
72
77
|
if (RealmInfo.getOrNull(engine.RootEntity)?.isConnectedSceneRoom) {
|
73
|
-
console.log('Requesting state')
|
74
|
-
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE,
|
78
|
+
DEBUG_NETWORK_MESSAGES() && console.log('Requesting state')
|
79
|
+
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, engineToCrdt(engine))
|
75
80
|
} else {
|
76
|
-
console.log('Waiting to be conneted')
|
81
|
+
DEBUG_NETWORK_MESSAGES() && console.log('Waiting to be conneted')
|
77
82
|
requestCrdtStateWhenConnected = true
|
78
83
|
}
|
79
84
|
}
|
@@ -81,9 +86,9 @@ export function addSyncTransport(
|
|
81
86
|
|
82
87
|
RealmInfo.onChange(engine.RootEntity, (value) => {
|
83
88
|
if (value?.isConnectedSceneRoom && requestCrdtStateWhenConnected) {
|
84
|
-
console.log('Requesting state.')
|
89
|
+
DEBUG_NETWORK_MESSAGES() && console.log('Requesting state.')
|
85
90
|
requestCrdtStateWhenConnected = false
|
86
|
-
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE,
|
91
|
+
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, engineToCrdt(engine))
|
87
92
|
}
|
88
93
|
})
|
89
94
|
|
@@ -95,7 +100,8 @@ export function addSyncTransport(
|
|
95
100
|
|
96
101
|
// Process CRDT messages here
|
97
102
|
binaryMessageBus.on(CommsMessage.CRDT, (value) => {
|
98
|
-
|
103
|
+
DEBUG_NETWORK_MESSAGES() &&
|
104
|
+
console.log(Array.from(serializeCrdtMessages('[NetworkMessage received]:', value, engine)))
|
99
105
|
transport.onmessage!(value)
|
100
106
|
})
|
101
107
|
|