@dcl/sdk 7.5.7-10289449044.commit-c15b62f → 7.5.7-10312762318.commit-2f6b9a0
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,7 +1,7 @@
|
|
1
1
|
import { syncFilter } from './filter';
|
2
2
|
import { engineToCrdt } from './state';
|
3
3
|
import { BinaryMessageBus, CommsMessage } from './binary-message-bus';
|
4
|
-
import { definePlayersInScene, fetchProfile, setInitialized, stateInitialized, stateInitializedChecker
|
4
|
+
import { definePlayersInScene, fetchProfile, setInitialized, stateInitialized, stateInitializedChecker } from './utils';
|
5
5
|
import { entityUtils } from './entities';
|
6
6
|
// user that we asked for the inital crdt state
|
7
7
|
export function addSyncTransport(engine, sendBinary, getUserData) {
|
@@ -23,7 +23,7 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
|
|
23
23
|
const transport = {
|
24
24
|
filter: syncFilter(engine),
|
25
25
|
send: async (message) => {
|
26
|
-
if (
|
26
|
+
if (message.byteLength) {
|
27
27
|
// console.log(Array.from(serializeCrdtMessages('[send CRDT]: ', message, engine)))
|
28
28
|
binaryMessageBus.emit(CommsMessage.CRDT, message);
|
29
29
|
}
|
@@ -41,24 +41,23 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
|
|
41
41
|
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, new Uint8Array());
|
42
42
|
// If we dont have any state initialized, and recieve a state message.
|
43
43
|
binaryMessageBus.on(CommsMessage.RES_CRDT_STATE, (value) => {
|
44
|
-
// console.log(Array.from(serializeCrdtMessages('[binaryMessageBus]: ', value, engine)))
|
45
44
|
if (!stateInitialized) {
|
46
45
|
setInitialized();
|
47
46
|
transport.onmessage(value);
|
48
47
|
}
|
49
48
|
});
|
50
|
-
// If we are the oldest user and we recieve a req of a state we send it.
|
51
49
|
binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, () => {
|
52
|
-
// TODO:
|
53
|
-
//
|
54
|
-
//
|
50
|
+
// TODO: maybe remove this line ?
|
51
|
+
// If we send an outdated CRDT, the other clients will ignore it.
|
52
|
+
// But maybe, two clients enters at the same time with custom network entities
|
53
|
+
// and if the state was not initialized, those entities were never sent.
|
55
54
|
if (stateInitialized) {
|
56
55
|
binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, engineToCrdt(engine));
|
57
56
|
}
|
58
57
|
});
|
59
58
|
// Process CRDT messages here
|
60
59
|
binaryMessageBus.on(CommsMessage.CRDT, (value) => {
|
61
|
-
// console.log(Array.from(serializeCrdtMessages('[CRDT
|
60
|
+
// console.log(Array.from(serializeCrdtMessages('[receive CRDT]: ', value, engine)))
|
62
61
|
transport.onmessage(value);
|
63
62
|
});
|
64
63
|
return {
|
@@ -66,4 +65,4 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
|
|
66
65
|
myProfile
|
67
66
|
};
|
68
67
|
}
|
69
|
-
//# sourceMappingURL=data:application/json;base64,
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVzc2FnZS1idXMtc3luYy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9uZXR3b3JrL21lc3NhZ2UtYnVzLXN5bmMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLFVBQVUsQ0FBQTtBQUNyQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sU0FBUyxDQUFBO0FBQ3RDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxZQUFZLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUNyRSxPQUFPLEVBQ0wsb0JBQW9CLEVBQ3BCLFlBQVksRUFFWixjQUFjLEVBQ2QsZ0JBQWdCLEVBQ2hCLHVCQUF1QixFQUV4QixNQUFNLFNBQVMsQ0FBQTtBQUNoQixPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBS3hDLCtDQUErQztBQUMvQyxNQUFNLFVBQVUsZ0JBQWdCLENBQzlCLE1BQWUsRUFDZixVQUFtRSxFQUNuRSxXQUF3RTtJQUV4RSxvQkFBb0IsQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUM1QixlQUFlO0lBQ2YsTUFBTSxTQUFTLEdBQWEsRUFBYyxDQUFBO0lBQzFDLFlBQVksQ0FBQyxTQUFVLEVBQUUsV0FBVyxDQUFDLENBQUE7SUFFckMsZUFBZTtJQUNmLE1BQU0saUJBQWlCLEdBQUcsV0FBVyxDQUFDLE1BQU0sRUFBRSxTQUFTLENBQUMsQ0FBQTtJQUV4RCxtRUFBbUU7SUFDbkUsTUFBTSwrQkFBK0IsR0FBaUIsRUFBRSxDQUFBO0lBQ3hELE1BQU0sZ0JBQWdCLEdBQUcsZ0JBQWdCLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLCtCQUErQixDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFBO0lBQ3JHLFNBQVMsaUJBQWlCO1FBQ3hCLE1BQU0sUUFBUSxHQUFHLENBQUMsR0FBRywrQkFBK0IsQ0FBQyxDQUFBO1FBQ3JELCtCQUErQixDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUE7UUFDMUMsT0FBTyxRQUFRLENBQUE7SUFDakIsQ0FBQztJQUVELHFCQUFxQjtJQUNyQixNQUFNLFNBQVMsR0FBYztRQUMzQixNQUFNLEVBQUUsVUFBVSxDQUFDLE1BQU0sQ0FBQztRQUMxQixJQUFJLEVBQUUsS0FBSyxFQUFFLE9BQW1CLEVBQUUsRUFBRTtZQUNsQyxJQUFJLE9BQU8sQ0FBQyxVQUFVLEVBQUU7Z0JBQ3RCLG1GQUFtRjtnQkFDbkYsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLENBQUE7YUFDbEQ7WUFDRCxNQUFNLFFBQVEsR0FBRyxpQkFBaUIsRUFBRSxDQUFBO1lBQ3BDLE1BQU0sUUFBUSxHQUFHLE1BQU0sVUFBVSxDQUFDLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxDQUFDLENBQUE7WUFDckQsZ0JBQWdCLENBQUMsaUJBQWlCLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQ25ELENBQUM7UUFDRCxJQUFJLEVBQUUsU0FBUztLQUNoQixDQUFBO0lBQ0QsTUFBTSxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQTtJQUM5Qix5QkFBeUI7SUFFekIsK0JBQStCO0lBQy9CLE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLENBQUMsdUJBQXVCLENBQUMsTUFBTSxFQUFFLFNBQVMsRUFBRSxpQkFBaUIsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFBO0lBRWhHLHdCQUF3QjtJQUN4QixnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLGNBQWMsRUFBRSxJQUFJLFVBQVUsRUFBRSxDQUFDLENBQUE7SUFFcEUsc0VBQXNFO0lBQ3RFLGdCQUFnQixDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsY0FBYyxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7UUFDekQsSUFBSSxDQUFDLGdCQUFnQixFQUFFO1lBQ3JCLGNBQWMsRUFBRSxDQUFBO1lBQ2hCLFNBQVMsQ0FBQyxTQUFVLENBQUMsS0FBSyxDQUFDLENBQUE7U0FDNUI7SUFDSCxDQUFDLENBQUMsQ0FBQTtJQUVGLGdCQUFnQixDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsY0FBYyxFQUFFLEdBQUcsRUFBRTtRQUNwRCxpQ0FBaUM7UUFDakMsaUVBQWlFO1FBQ2pFLDhFQUE4RTtRQUM5RSx3RUFBd0U7UUFDeEUsSUFBSSxnQkFBZ0IsRUFBRTtZQUNwQixnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLGNBQWMsRUFBRSxZQUFZLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQTtTQUN6RTtJQUNILENBQUMsQ0FBQyxDQUFBO0lBRUYsNkJBQTZCO0lBQzdCLGdCQUFnQixDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsSUFBSSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7UUFDL0Msb0ZBQW9GO1FBQ3BGLFNBQVMsQ0FBQyxTQUFVLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDN0IsQ0FBQyxDQUFDLENBQUE7SUFFRixPQUFPO1FBQ0wsR0FBRyxpQkFBaUI7UUFDcEIsU0FBUztLQUNWLENBQUE7QUFDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSUVuZ2luZSwgVHJhbnNwb3J0IH0gZnJvbSAnQGRjbC9lY3MnXG5pbXBvcnQgdHlwZSB7IFNlbmRCaW5hcnlSZXF1ZXN0LCBTZW5kQmluYXJ5UmVzcG9uc2UgfSBmcm9tICd+c3lzdGVtL0NvbW11bmljYXRpb25zQ29udHJvbGxlcidcblxuaW1wb3J0IHsgc3luY0ZpbHRlciB9IGZyb20gJy4vZmlsdGVyJ1xuaW1wb3J0IHsgZW5naW5lVG9DcmR0IH0gZnJvbSAnLi9zdGF0ZSdcbmltcG9ydCB7IEJpbmFyeU1lc3NhZ2VCdXMsIENvbW1zTWVzc2FnZSB9IGZyb20gJy4vYmluYXJ5LW1lc3NhZ2UtYnVzJ1xuaW1wb3J0IHtcbiAgZGVmaW5lUGxheWVyc0luU2NlbmUsXG4gIGZldGNoUHJvZmlsZSxcbiAgb2xkZXN0VXNlciBhcyBfb2xkZXN0VXNlcixcbiAgc2V0SW5pdGlhbGl6ZWQsXG4gIHN0YXRlSW5pdGlhbGl6ZWQsXG4gIHN0YXRlSW5pdGlhbGl6ZWRDaGVja2VyLFxuICBzeW5jVHJhbnNwb3J0SXNSZWFkeVxufSBmcm9tICcuL3V0aWxzJ1xuaW1wb3J0IHsgZW50aXR5VXRpbHMgfSBmcm9tICcuL2VudGl0aWVzJ1xuaW1wb3J0IHsgR2V0VXNlckRhdGFSZXF1ZXN0LCBHZXRVc2VyRGF0YVJlc3BvbnNlIH0gZnJvbSAnfnN5c3RlbS9Vc2VySWRlbnRpdHknXG4vLyBpbXBvcnQgeyBzZXJpYWxpemVDcmR0TWVzc2FnZXMgfSBmcm9tICcuLi9pbnRlcm5hbC90cmFuc3BvcnRzL2xvZ2dlcidcblxuZXhwb3J0IHR5cGUgSVByb2ZpbGUgPSB7IG5ldHdvcmtJZDogbnVtYmVyOyB1c2VySWQ6IHN0cmluZyB9XG4vLyB1c2VyIHRoYXQgd2UgYXNrZWQgZm9yIHRoZSBpbml0YWwgY3JkdCBzdGF0ZVxuZXhwb3J0IGZ1bmN0aW9uIGFkZFN5bmNUcmFuc3BvcnQoXG4gIGVuZ2luZTogSUVuZ2luZSxcbiAgc2VuZEJpbmFyeTogKG1zZzogU2VuZEJpbmFyeVJlcXVlc3QpID0+IFByb21pc2U8U2VuZEJpbmFyeVJlc3BvbnNlPixcbiAgZ2V0VXNlckRhdGE6ICh2YWx1ZTogR2V0VXNlckRhdGFSZXF1ZXN0KSA9PiBQcm9taXNlPEdldFVzZXJEYXRhUmVzcG9uc2U+XG4pIHtcbiAgZGVmaW5lUGxheWVyc0luU2NlbmUoZW5naW5lKVxuICAvLyBQcm9maWxlIEluZm9cbiAgY29uc3QgbXlQcm9maWxlOiBJUHJvZmlsZSA9IHt9IGFzIElQcm9maWxlXG4gIGZldGNoUHJvZmlsZShteVByb2ZpbGUhLCBnZXRVc2VyRGF0YSlcblxuICAvLyBFbnRpdHkgdXRpbHNcbiAgY29uc3QgZW50aXR5RGVmaW5pdGlvbnMgPSBlbnRpdHlVdGlscyhlbmdpbmUsIG15UHJvZmlsZSlcblxuICAvLyBMaXN0IG9mIE1lc3NhZ2VCdXNzIG1lc3NzYWdlcyB0byBiZSBzZW50IG9uIGV2ZXJ5IGZyYW1lIHRvIGNvbW1zXG4gIGNvbnN0IHBlbmRpbmdNZXNzYWdlQnVzTWVzc2FnZXNUb1NlbmQ6IFVpbnQ4QXJyYXlbXSA9IFtdXG4gIGNvbnN0IGJpbmFyeU1lc3NhZ2VCdXMgPSBCaW5hcnlNZXNzYWdlQnVzKChtZXNzYWdlKSA9PiBwZW5kaW5nTWVzc2FnZUJ1c01lc3NhZ2VzVG9TZW5kLnB1c2gobWVzc2FnZSkpXG4gIGZ1bmN0aW9uIGdldE1lc3NhZ2VzVG9TZW5kKCkge1xuICAgIGNvbnN0IG1lc3NhZ2VzID0gWy4uLnBlbmRpbmdNZXNzYWdlQnVzTWVzc2FnZXNUb1NlbmRdXG4gICAgcGVuZGluZ01lc3NhZ2VCdXNNZXNzYWdlc1RvU2VuZC5sZW5ndGggPSAwXG4gICAgcmV0dXJuIG1lc3NhZ2VzXG4gIH1cblxuICAvLyBBZGQgU3luYyBUcmFuc3BvcnRcbiAgY29uc3QgdHJhbnNwb3J0OiBUcmFuc3BvcnQgPSB7XG4gICAgZmlsdGVyOiBzeW5jRmlsdGVyKGVuZ2luZSksXG4gICAgc2VuZDogYXN5bmMgKG1lc3NhZ2U6IFVpbnQ4QXJyYXkpID0+IHtcbiAgICAgIGlmIChtZXNzYWdlLmJ5dGVMZW5ndGgpIHtcbiAgICAgICAgLy8gY29uc29sZS5sb2coQXJyYXkuZnJvbShzZXJpYWxpemVDcmR0TWVzc2FnZXMoJ1tzZW5kIENSRFRdOiAnLCBtZXNzYWdlLCBlbmdpbmUpKSlcbiAgICAgICAgYmluYXJ5TWVzc2FnZUJ1cy5lbWl0KENvbW1zTWVzc2FnZS5DUkRULCBtZXNzYWdlKVxuICAgICAgfVxuICAgICAgY29uc3QgbWVzc2FnZXMgPSBnZXRNZXNzYWdlc1RvU2VuZCgpXG4gICAgICBjb25zdCByZXNwb25zZSA9IGF3YWl0IHNlbmRCaW5hcnkoeyBkYXRhOiBtZXNzYWdlcyB9KVxuICAgICAgYmluYXJ5TWVzc2FnZUJ1cy5fX3Byb2Nlc3NNZXNzYWdlcyhyZXNwb25zZS5kYXRhKVxuICAgIH0sXG4gICAgdHlwZTogJ25ldHdvcmsnXG4gIH1cbiAgZW5naW5lLmFkZFRyYW5zcG9ydCh0cmFuc3BvcnQpXG4gIC8vIEVuZCBhZGQgc3luYyB0cmFuc3BvcnRcblxuICAvLyBBZGQgc3RhdGUgaW50aWFsaXplZCBjaGVja2VyXG4gIGVuZ2luZS5hZGRTeXN0ZW0oKCkgPT4gc3RhdGVJbml0aWFsaXplZENoZWNrZXIoZW5naW5lLCBteVByb2ZpbGUsIGVudGl0eURlZmluaXRpb25zLnN5bmNFbnRpdHkpKVxuXG4gIC8vIFJlcXVlc3QgaW5pdGlhbCBzdGF0ZVxuICBiaW5hcnlNZXNzYWdlQnVzLmVtaXQoQ29tbXNNZXNzYWdlLlJFUV9DUkRUX1NUQVRFLCBuZXcgVWludDhBcnJheSgpKVxuXG4gIC8vIElmIHdlIGRvbnQgaGF2ZSBhbnkgc3RhdGUgaW5pdGlhbGl6ZWQsIGFuZCByZWNpZXZlIGEgc3RhdGUgbWVzc2FnZS5cbiAgYmluYXJ5TWVzc2FnZUJ1cy5vbihDb21tc01lc3NhZ2UuUkVTX0NSRFRfU1RBVEUsICh2YWx1ZSkgPT4ge1xuICAgIGlmICghc3RhdGVJbml0aWFsaXplZCkge1xuICAgICAgc2V0SW5pdGlhbGl6ZWQoKVxuICAgICAgdHJhbnNwb3J0Lm9ubWVzc2FnZSEodmFsdWUpXG4gICAgfVxuICB9KVxuXG4gIGJpbmFyeU1lc3NhZ2VCdXMub24oQ29tbXNNZXNzYWdlLlJFUV9DUkRUX1NUQVRFLCAoKSA9PiB7XG4gICAgLy8gVE9ETzogbWF5YmUgcmVtb3ZlIHRoaXMgbGluZSA/XG4gICAgLy8gSWYgd2Ugc2VuZCBhbiBvdXRkYXRlZCBDUkRULCB0aGUgb3RoZXIgY2xpZW50cyB3aWxsIGlnbm9yZSBpdC5cbiAgICAvLyBCdXQgbWF5YmUsIHR3byBjbGllbnRzIGVudGVycyBhdCB0aGUgc2FtZSB0aW1lIHdpdGggY3VzdG9tIG5ldHdvcmsgZW50aXRpZXNcbiAgICAvLyBhbmQgaWYgdGhlIHN0YXRlIHdhcyBub3QgaW5pdGlhbGl6ZWQsIHRob3NlIGVudGl0aWVzIHdlcmUgbmV2ZXIgc2VudC5cbiAgICBpZiAoc3RhdGVJbml0aWFsaXplZCkge1xuICAgICAgYmluYXJ5TWVzc2FnZUJ1cy5lbWl0KENvbW1zTWVzc2FnZS5SRVNfQ1JEVF9TVEFURSwgZW5naW5lVG9DcmR0KGVuZ2luZSkpXG4gICAgfVxuICB9KVxuXG4gIC8vIFByb2Nlc3MgQ1JEVCBtZXNzYWdlcyBoZXJlXG4gIGJpbmFyeU1lc3NhZ2VCdXMub24oQ29tbXNNZXNzYWdlLkNSRFQsICh2YWx1ZSkgPT4ge1xuICAgIC8vIGNvbnNvbGUubG9nKEFycmF5LmZyb20oc2VyaWFsaXplQ3JkdE1lc3NhZ2VzKCdbcmVjZWl2ZSBDUkRUXTogJywgdmFsdWUsIGVuZ2luZSkpKVxuICAgIHRyYW5zcG9ydC5vbm1lc3NhZ2UhKHZhbHVlKVxuICB9KVxuXG4gIHJldHVybiB7XG4gICAgLi4uZW50aXR5RGVmaW5pdGlvbnMsXG4gICAgbXlQcm9maWxlXG4gIH1cbn1cbiJdfQ==
|
package/network/utils.js
CHANGED
@@ -68,7 +68,7 @@ export function syncTransportIsReady(engine) {
|
|
68
68
|
const EngineInfo = engine.getComponent(_EngineInfo.componentId);
|
69
69
|
if (!INITIAL_CRDT_RENDERER_MESSAGES_SENT) {
|
70
70
|
const engineInfo = EngineInfo.getOrNull(engine.RootEntity);
|
71
|
-
if (engineInfo && engineInfo.tickNumber >
|
71
|
+
if (engineInfo && engineInfo.tickNumber > 1) {
|
72
72
|
INITIAL_CRDT_RENDERER_MESSAGES_SENT = true;
|
73
73
|
}
|
74
74
|
}
|
@@ -114,4 +114,4 @@ export function stateInitializedChecker(engine, _profile, _syncEntity) {
|
|
114
114
|
}
|
115
115
|
void enterScene();
|
116
116
|
}
|
117
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/network/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  EngineInfo as _EngineInfo,\n  Entity,\n  IEngine,\n  NetworkEntity as _NetworkEntity,\n  Schemas,\n  LastWriteWinElementSetComponentDefinition,\n  PBEngineInfo\n} from '@dcl/ecs'\nimport { componentNumberFromName } from '@dcl/ecs/dist/components/component-number'\n\nimport type { GetUserDataRequest, GetUserDataResponse } from '~system/UserIdentity'\nimport { SyncEntity } from './entities'\nimport { IProfile } from './message-bus-sync'\n\n// Component to track all the players and when they enter to the scene.\n// Know who is in charge of sending the initial state (oldest one)\nexport const definePlayersInScene = (engine: IEngine) =>\n  engine.defineComponent('players-scene', {\n    timestamp: Schemas.Number,\n    userId: Schemas.String\n  })\n\n// Already initialized my state. Ignore new states messages.\nexport let stateInitialized = false\n\n// My player entity to check if I'm the oldest player in the scend\nexport let playerSceneEntity: Entity\n\nexport function setInitialized() {\n  stateInitialized = true\n}\n\n// Flag to avoid sending over the wire all the initial messages that the engine add's to the rendererTransport\n// INITIAL_CRDT_MESSAGES that are being processed on the onStart loop, before the onUpdate.\nexport let INITIAL_CRDT_RENDERER_MESSAGES_SENT = false\n\n// Retrieve userId to start sending this info as the networkId\nexport function fetchProfile(\n  myProfile: IProfile,\n  getUserData: (value: GetUserDataRequest) => Promise<GetUserDataResponse>\n) {\n  void getUserData({}).then(({ data }) => {\n    if (data?.userId) {\n      const userId = data.userId\n      const networkId = componentNumberFromName(data.userId)\n      myProfile.networkId = networkId\n      myProfile.userId = userId\n    } else {\n      throw new Error(`Couldn't fetch profile data`)\n    }\n  })\n}\n\n/**\n * Add's the user information about when he joined the scene.\n * It's used to check who is the oldest one, to sync the state\n */\nexport function createPlayerTimestampData(engine: IEngine, profile: IProfile, syncEntity: SyncEntity) {\n  if (!profile?.userId) return undefined\n  const PlayersInScene = definePlayersInScene(engine)\n  const entity = engine.addEntity()\n  PlayersInScene.create(entity, { timestamp: Date.now(), userId: profile.userId })\n  syncEntity(entity, [PlayersInScene.componentId])\n  playerSceneEntity = entity\n  return playerSceneEntity\n}\n\n/**\n * Check if I'm the older user to send the initial state\n */\nexport function oldestUser(engine: IEngine, profile: IProfile, syncEntity: SyncEntity): boolean {\n  const PlayersInScene = definePlayersInScene(engine)\n  // When the user leaves the scene but it's still connected.\n  if (!PlayersInScene.has(playerSceneEntity)) {\n    createPlayerTimestampData(engine, profile, syncEntity)\n    return oldestUser(engine, profile, syncEntity)\n  }\n  const { timestamp } = PlayersInScene.get(playerSceneEntity)\n  for (const [_, player] of engine.getEntitiesWith(PlayersInScene)) {\n    if (player.timestamp < timestamp) return false\n  }\n  return true\n}\n\n/**\n * Ignore CRDT's initial messages from the renderer.\n */\nexport function syncTransportIsReady(engine: IEngine) {\n  const EngineInfo = engine.getComponent(\n    _EngineInfo.componentId\n  ) as LastWriteWinElementSetComponentDefinition<PBEngineInfo>\n  if (!INITIAL_CRDT_RENDERER_MESSAGES_SENT) {\n    const engineInfo = EngineInfo.getOrNull(engine.RootEntity)\n    if (engineInfo && engineInfo.tickNumber > 2) {\n      INITIAL_CRDT_RENDERER_MESSAGES_SENT = true\n    }\n  }\n  return INITIAL_CRDT_RENDERER_MESSAGES_SENT\n}\n\n/**\n * Check if we are already initialized\n * Add the playerSceneData component and syncronize it till we receive the state.\n * This fn should be added as a system so it runs on every tick\n */\n// TODO: Had to comment all the logic because getConnectedPlayers was not working as expected\n// A lot of raise conditions. For now we will go with the approach that every client that it's initialized will send his crdt state.\nexport function stateInitializedChecker(engine: IEngine, _profile: IProfile, _syncEntity: SyncEntity) {\n  // const PlayersInScene = definePlayersInScene(engine)\n  const EngineInfo = engine.getComponent(_EngineInfo.componentId) as typeof _EngineInfo\n  // const NetworkEntity = engine.getComponent(_NetworkEntity.componentId) as INetowrkEntity\n  async function enterScene() {\n    // if (!playerSceneEntity) {\n    //   createPlayerTimestampData(engine, profile, syncEntity)\n    // }\n\n    /**\n     * Keeps PlayersInScene up-to-date with the current players.\n     */\n    // const connectedPlayers = await getConnectedPlayers({})\n    // for (const [entity, player] of engine.getEntitiesWith(PlayersInScene)) {\n    //   if (!connectedPlayers.players.find(($) => $.userId === player.userId)) {\n    //     PlayersInScene.deleteFrom(entity)\n    //   }\n    // }\n\n    // Wait for comms to be ready ?? ~3000ms\n    if ((EngineInfo.getOrNull(engine.RootEntity)?.tickNumber ?? 0) > 100) {\n      setInitialized()\n      return\n    }\n\n    // If we already have data from players, dont send the heartbeat messages\n    // if (connectedPlayers.players.length) return\n\n    // if (!stateInitialized && playerSceneEntity) {\n    //   // Send this data to all the players connected (new and old)\n    //   // So everyone can decide if it's the oldest one or no.\n    //   // It's for the case that multiple users enters ~ at the same time.\n    //   PlayersInScene.getMutable(playerSceneEntity)\n    // }\n  }\n  void enterScene()\n}\n"]}
|
117
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/network/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  EngineInfo as _EngineInfo,\n  Entity,\n  IEngine,\n  NetworkEntity as _NetworkEntity,\n  Schemas,\n  LastWriteWinElementSetComponentDefinition,\n  PBEngineInfo\n} from '@dcl/ecs'\nimport { componentNumberFromName } from '@dcl/ecs/dist/components/component-number'\n\nimport type { GetUserDataRequest, GetUserDataResponse } from '~system/UserIdentity'\nimport { SyncEntity } from './entities'\nimport { IProfile } from './message-bus-sync'\n\n// Component to track all the players and when they enter to the scene.\n// Know who is in charge of sending the initial state (oldest one)\nexport const definePlayersInScene = (engine: IEngine) =>\n  engine.defineComponent('players-scene', {\n    timestamp: Schemas.Number,\n    userId: Schemas.String\n  })\n\n// Already initialized my state. Ignore new states messages.\nexport let stateInitialized = false\n\n// My player entity to check if I'm the oldest player in the scend\nexport let playerSceneEntity: Entity\n\nexport function setInitialized() {\n  stateInitialized = true\n}\n\n// Flag to avoid sending over the wire all the initial messages that the engine add's to the rendererTransport\n// INITIAL_CRDT_MESSAGES that are being processed on the onStart loop, before the onUpdate.\nexport let INITIAL_CRDT_RENDERER_MESSAGES_SENT = false\n\n// Retrieve userId to start sending this info as the networkId\nexport function fetchProfile(\n  myProfile: IProfile,\n  getUserData: (value: GetUserDataRequest) => Promise<GetUserDataResponse>\n) {\n  void getUserData({}).then(({ data }) => {\n    if (data?.userId) {\n      const userId = data.userId\n      const networkId = componentNumberFromName(data.userId)\n      myProfile.networkId = networkId\n      myProfile.userId = userId\n    } else {\n      throw new Error(`Couldn't fetch profile data`)\n    }\n  })\n}\n\n/**\n * Add's the user information about when he joined the scene.\n * It's used to check who is the oldest one, to sync the state\n */\nexport function createPlayerTimestampData(engine: IEngine, profile: IProfile, syncEntity: SyncEntity) {\n  if (!profile?.userId) return undefined\n  const PlayersInScene = definePlayersInScene(engine)\n  const entity = engine.addEntity()\n  PlayersInScene.create(entity, { timestamp: Date.now(), userId: profile.userId })\n  syncEntity(entity, [PlayersInScene.componentId])\n  playerSceneEntity = entity\n  return playerSceneEntity\n}\n\n/**\n * Check if I'm the older user to send the initial state\n */\nexport function oldestUser(engine: IEngine, profile: IProfile, syncEntity: SyncEntity): boolean {\n  const PlayersInScene = definePlayersInScene(engine)\n  // When the user leaves the scene but it's still connected.\n  if (!PlayersInScene.has(playerSceneEntity)) {\n    createPlayerTimestampData(engine, profile, syncEntity)\n    return oldestUser(engine, profile, syncEntity)\n  }\n  const { timestamp } = PlayersInScene.get(playerSceneEntity)\n  for (const [_, player] of engine.getEntitiesWith(PlayersInScene)) {\n    if (player.timestamp < timestamp) return false\n  }\n  return true\n}\n\n/**\n * Ignore CRDT's initial messages from the renderer.\n */\nexport function syncTransportIsReady(engine: IEngine) {\n  const EngineInfo = engine.getComponent(\n    _EngineInfo.componentId\n  ) as LastWriteWinElementSetComponentDefinition<PBEngineInfo>\n  if (!INITIAL_CRDT_RENDERER_MESSAGES_SENT) {\n    const engineInfo = EngineInfo.getOrNull(engine.RootEntity)\n    if (engineInfo && engineInfo.tickNumber > 1) {\n      INITIAL_CRDT_RENDERER_MESSAGES_SENT = true\n    }\n  }\n  return INITIAL_CRDT_RENDERER_MESSAGES_SENT\n}\n\n/**\n * Check if we are already initialized\n * Add the playerSceneData component and syncronize it till we receive the state.\n * This fn should be added as a system so it runs on every tick\n */\n// TODO: Had to comment all the logic because getConnectedPlayers was not working as expected\n// A lot of raise conditions. For now we will go with the approach that every client that it's initialized will send his crdt state.\nexport function stateInitializedChecker(engine: IEngine, _profile: IProfile, _syncEntity: SyncEntity) {\n  // const PlayersInScene = definePlayersInScene(engine)\n  const EngineInfo = engine.getComponent(_EngineInfo.componentId) as typeof _EngineInfo\n  // const NetworkEntity = engine.getComponent(_NetworkEntity.componentId) as INetowrkEntity\n  async function enterScene() {\n    // if (!playerSceneEntity) {\n    //   createPlayerTimestampData(engine, profile, syncEntity)\n    // }\n\n    /**\n     * Keeps PlayersInScene up-to-date with the current players.\n     */\n    // const connectedPlayers = await getConnectedPlayers({})\n    // for (const [entity, player] of engine.getEntitiesWith(PlayersInScene)) {\n    //   if (!connectedPlayers.players.find(($) => $.userId === player.userId)) {\n    //     PlayersInScene.deleteFrom(entity)\n    //   }\n    // }\n\n    // Wait for comms to be ready ?? ~3000ms\n    if ((EngineInfo.getOrNull(engine.RootEntity)?.tickNumber ?? 0) > 100) {\n      setInitialized()\n      return\n    }\n\n    // If we already have data from players, dont send the heartbeat messages\n    // if (connectedPlayers.players.length) return\n\n    // if (!stateInitialized && playerSceneEntity) {\n    //   // Send this data to all the players connected (new and old)\n    //   // So everyone can decide if it's the oldest one or no.\n    //   // It's for the case that multiple users enters ~ at the same time.\n    //   PlayersInScene.getMutable(playerSceneEntity)\n    // }\n  }\n  void enterScene()\n}\n"]}
|
package/package.json
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
{
|
2
2
|
"name": "@dcl/sdk",
|
3
3
|
"description": "",
|
4
|
-
"version": "7.5.7-
|
4
|
+
"version": "7.5.7-10312762318.commit-2f6b9a0",
|
5
5
|
"author": "Decentraland",
|
6
6
|
"dependencies": {
|
7
|
-
"@dcl/ecs": "7.5.7-
|
7
|
+
"@dcl/ecs": "7.5.7-10312762318.commit-2f6b9a0",
|
8
8
|
"@dcl/ecs-math": "2.0.2",
|
9
9
|
"@dcl/explorer": "1.0.164427-20240726154521.commit-bf9648c",
|
10
|
-
"@dcl/js-runtime": "7.5.7-
|
11
|
-
"@dcl/react-ecs": "7.5.7-
|
12
|
-
"@dcl/sdk-commands": "7.5.7-
|
10
|
+
"@dcl/js-runtime": "7.5.7-10312762318.commit-2f6b9a0",
|
11
|
+
"@dcl/react-ecs": "7.5.7-10312762318.commit-2f6b9a0",
|
12
|
+
"@dcl/sdk-commands": "7.5.7-10312762318.commit-2f6b9a0",
|
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": "2f6b9a042ab7db93be07ea4cfdb9fb86be1d0cb3"
|
39
39
|
}
|
@@ -15,6 +15,7 @@ import {
|
|
15
15
|
} from './utils'
|
16
16
|
import { entityUtils } from './entities'
|
17
17
|
import { GetUserDataRequest, GetUserDataResponse } from '~system/UserIdentity'
|
18
|
+
// import { serializeCrdtMessages } from '../internal/transports/logger'
|
18
19
|
|
19
20
|
export type IProfile = { networkId: number; userId: string }
|
20
21
|
// user that we asked for the inital crdt state
|
@@ -44,7 +45,7 @@ export function addSyncTransport(
|
|
44
45
|
const transport: Transport = {
|
45
46
|
filter: syncFilter(engine),
|
46
47
|
send: async (message: Uint8Array) => {
|
47
|
-
if (
|
48
|
+
if (message.byteLength) {
|
48
49
|
// console.log(Array.from(serializeCrdtMessages('[send CRDT]: ', message, engine)))
|
49
50
|
binaryMessageBus.emit(CommsMessage.CRDT, message)
|
50
51
|
}
|
@@ -65,18 +66,17 @@ export function addSyncTransport(
|
|
65
66
|
|
66
67
|
// If we dont have any state initialized, and recieve a state message.
|
67
68
|
binaryMessageBus.on(CommsMessage.RES_CRDT_STATE, (value) => {
|
68
|
-
// console.log(Array.from(serializeCrdtMessages('[binaryMessageBus]: ', value, engine)))
|
69
69
|
if (!stateInitialized) {
|
70
70
|
setInitialized()
|
71
71
|
transport.onmessage!(value)
|
72
72
|
}
|
73
73
|
})
|
74
74
|
|
75
|
-
// If we are the oldest user and we recieve a req of a state we send it.
|
76
75
|
binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, () => {
|
77
|
-
// TODO:
|
78
|
-
//
|
79
|
-
//
|
76
|
+
// TODO: maybe remove this line ?
|
77
|
+
// If we send an outdated CRDT, the other clients will ignore it.
|
78
|
+
// But maybe, two clients enters at the same time with custom network entities
|
79
|
+
// and if the state was not initialized, those entities were never sent.
|
80
80
|
if (stateInitialized) {
|
81
81
|
binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, engineToCrdt(engine))
|
82
82
|
}
|
@@ -84,8 +84,7 @@ export function addSyncTransport(
|
|
84
84
|
|
85
85
|
// Process CRDT messages here
|
86
86
|
binaryMessageBus.on(CommsMessage.CRDT, (value) => {
|
87
|
-
// console.log(Array.from(serializeCrdtMessages('[CRDT
|
88
|
-
|
87
|
+
// console.log(Array.from(serializeCrdtMessages('[receive CRDT]: ', value, engine)))
|
89
88
|
transport.onmessage!(value)
|
90
89
|
})
|
91
90
|
|
package/src/network/utils.ts
CHANGED
@@ -92,7 +92,7 @@ export function syncTransportIsReady(engine: IEngine) {
|
|
92
92
|
) as LastWriteWinElementSetComponentDefinition<PBEngineInfo>
|
93
93
|
if (!INITIAL_CRDT_RENDERER_MESSAGES_SENT) {
|
94
94
|
const engineInfo = EngineInfo.getOrNull(engine.RootEntity)
|
95
|
-
if (engineInfo && engineInfo.tickNumber >
|
95
|
+
if (engineInfo && engineInfo.tickNumber > 1) {
|
96
96
|
INITIAL_CRDT_RENDERER_MESSAGES_SENT = true
|
97
97
|
}
|
98
98
|
}
|