@dcl/sdk 7.7.1 → 7.7.2-12951019665.commit-c8695cd
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/internal/transports/logger.js +3 -2
- package/internal/transports/rendererTransport.js +1 -1
- package/network/binary-message-bus.d.ts +2 -2
- package/network/binary-message-bus.js +3 -3
- package/network/message-bus-sync.js +25 -12
- package/package.json +6 -6
- package/src/internal/transports/logger.ts +2 -1
- package/src/internal/transports/rendererTransport.ts +1 -1
- package/src/network/binary-message-bus.ts +5 -3
- package/src/network/message-bus-sync.ts +27 -13
|
@@ -17,9 +17,10 @@ export function* serializeCrdtMessages(prefix, data, engine) {
|
|
|
17
17
|
message.type === CrdtMessageType.APPEND_VALUE) {
|
|
18
18
|
const { componentId, timestamp } = message;
|
|
19
19
|
const data = 'data' in message ? message.data : undefined;
|
|
20
|
+
const bytes = data ? `${data.byteLength / 1024}KB` : '';
|
|
20
21
|
try {
|
|
21
22
|
const c = engine.getComponent(componentId);
|
|
22
|
-
yield `${preface} c=${c.componentName} t=${timestamp} data=${JSON.stringify((data && c.schema.deserialize(new ReadWriteByteBuffer(data))) || null)}`;
|
|
23
|
+
yield `${preface} c=${c.componentName} t=${timestamp} ${bytes} data=${JSON.stringify((data && c.schema.deserialize(new ReadWriteByteBuffer(data))) || null)}`;
|
|
23
24
|
}
|
|
24
25
|
catch {
|
|
25
26
|
yield `${preface} c=${componentId} t=${timestamp} data=?`;
|
|
@@ -34,4 +35,4 @@ export function* serializeCrdtMessages(prefix, data, engine) {
|
|
|
34
35
|
}
|
|
35
36
|
}
|
|
36
37
|
}
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ludGVybmFsL3RyYW5zcG9ydHMvbG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBd0IsZUFBZSxFQUFFLE1BQU0sVUFBVSxDQUFBO0FBQ2hFLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHdDQUF3QyxDQUFBO0FBQzVFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSwwQ0FBMEMsQ0FBQTtBQUV0RSxNQUFNLFNBQVMsQ0FBQyxDQUFDLHFCQUFxQixDQUFDLE1BQWMsRUFBRSxJQUFnQixFQUFFLE1BQWU7SUFDdEYsTUFBTSxNQUFNLEdBQUcsSUFBSSxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUU1QyxJQUFJLE9BQTJCLENBQUE7SUFFL0IsT0FBTyxDQUFDLE9BQU8sR0FBRyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRTtRQUN0QyxNQUFNLEdBQUcsR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFBO1FBQzVCLE1BQU0sT0FBTyxHQUFHLEdBQUcsTUFBTSxLQUFLLGVBQWUsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxFQUFFLENBQUE7UUFDdEUsSUFBSSxPQUFPLENBQUMsSUFBSSxLQUFLLGVBQWUsQ0FBQyxhQUFhLElBQUksT0FBTyxDQUFDLElBQUksS0FBSyxlQUFlLENBQUMscUJBQXFCLEVBQUU7WUFDNUcsTUFBTSxHQUFHLE9BQU8sRUFBRSxDQUFBO1NBQ25CO1FBRUQsSUFDRSxPQUFPLENBQUMsSUFBSSxLQUFLLGVBQWUsQ0FBQyxhQUFhO1lBQzlDLE9BQU8sQ0FBQyxJQUFJLEtBQUssZUFBZSxDQUFDLHFCQUFxQjtZQUN0RCxPQUFPLENBQUMsSUFBSSxLQUFLLGVBQWUsQ0FBQyx3QkFBd0I7WUFDekQsT0FBTyxDQUFDLElBQUksS0FBSyxlQUFlLENBQUMsZ0JBQWdCO1lBQ2pELE9BQU8sQ0FBQyxJQUFJLEtBQUssZUFBZSxDQUFDLFlBQVksRUFDN0M7WUFDQSxNQUFNLEVBQUUsV0FBVyxFQUFFLFNBQVMsRUFBRSxHQUFHLE9BQU8sQ0FBQTtZQUMxQyxNQUFNLElBQUksR0FBRyxNQUFNLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUE7WUFDekQsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtZQUV2RCxJQUFJO2dCQUNGLE1BQU0sQ0FBQyxHQUFHLE1BQU0sQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUE7Z0JBQzFDLE1BQU0sR0FBRyxPQUFPLE1BQU0sQ0FBQyxDQUFDLGFBQWEsTUFBTSxTQUFTLElBQUksS0FBSyxTQUFTLElBQUksQ0FBQyxTQUFTLENBQ2xGLENBQUMsSUFBSSxJQUFJLENBQUMsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLElBQUksbUJBQW1CLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFJLElBQUksQ0FDdEUsRUFBRSxDQUFBO2FBQ0o7WUFBQyxNQUFNO2dCQUNOLE1BQU0sR0FBRyxPQUFPLE1BQU0sV0FBVyxNQUFNLFNBQVMsU0FBUyxDQUFBO2FBQzFEO1NBQ0Y7YUFBTSxJQUNMLE9BQU8sQ0FBQyxJQUFJLEtBQUssZUFBZSxDQUFDLGFBQWE7WUFDOUMsT0FBTyxDQUFDLElBQUksS0FBSyxlQUFlLENBQUMscUJBQXFCLEVBQ3REO1lBQ0EsTUFBTSxPQUFPLENBQUE7U0FDZDthQUFNO1lBQ0wsTUFBTSxHQUFHLE9BQU8sMEJBQTBCLENBQUE7U0FDM0M7S0FDRjtBQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJRW5naW5lLCBDcmR0TWVzc2FnZSwgQ3JkdE1lc3NhZ2VUeXBlIH0gZnJvbSAnQGRjbC9lY3MnXG5pbXBvcnQgeyBSZWFkV3JpdGVCeXRlQnVmZmVyIH0gZnJvbSAnQGRjbC9lY3MvZGlzdC9zZXJpYWxpemF0aW9uL0J5dGVCdWZmZXInXG5pbXBvcnQgeyByZWFkTWVzc2FnZSB9IGZyb20gJ0BkY2wvZWNzL2Rpc3Qvc2VyaWFsaXphdGlvbi9jcmR0L21lc3NhZ2UnXG5cbmV4cG9ydCBmdW5jdGlvbiogc2VyaWFsaXplQ3JkdE1lc3NhZ2VzKHByZWZpeDogc3RyaW5nLCBkYXRhOiBVaW50OEFycmF5LCBlbmdpbmU6IElFbmdpbmUpIHtcbiAgY29uc3QgYnVmZmVyID0gbmV3IFJlYWRXcml0ZUJ5dGVCdWZmZXIoZGF0YSlcblxuICBsZXQgbWVzc2FnZTogQ3JkdE1lc3NhZ2UgfCBudWxsXG5cbiAgd2hpbGUgKChtZXNzYWdlID0gcmVhZE1lc3NhZ2UoYnVmZmVyKSkpIHtcbiAgICBjb25zdCBlbnQgPSBtZXNzYWdlLmVudGl0eUlkXG4gICAgY29uc3QgcHJlZmFjZSA9IGAke3ByZWZpeH06ICR7Q3JkdE1lc3NhZ2VUeXBlW21lc3NhZ2UudHlwZV19IGU9JHtlbnR9YFxuICAgIGlmIChtZXNzYWdlLnR5cGUgPT09IENyZHRNZXNzYWdlVHlwZS5ERUxFVEVfRU5USVRZIHx8IG1lc3NhZ2UudHlwZSA9PT0gQ3JkdE1lc3NhZ2VUeXBlLkRFTEVURV9FTlRJVFlfTkVUV09SSykge1xuICAgICAgeWllbGQgYCR7cHJlZmFjZX1gXG4gICAgfVxuXG4gICAgaWYgKFxuICAgICAgbWVzc2FnZS50eXBlID09PSBDcmR0TWVzc2FnZVR5cGUuUFVUX0NPTVBPTkVOVCB8fFxuICAgICAgbWVzc2FnZS50eXBlID09PSBDcmR0TWVzc2FnZVR5cGUuUFVUX0NPTVBPTkVOVF9ORVRXT1JLIHx8XG4gICAgICBtZXNzYWdlLnR5cGUgPT09IENyZHRNZXNzYWdlVHlwZS5ERUxFVEVfQ09NUE9ORU5UX05FVFdPUksgfHxcbiAgICAgIG1lc3NhZ2UudHlwZSA9PT0gQ3JkdE1lc3NhZ2VUeXBlLkRFTEVURV9DT01QT05FTlQgfHxcbiAgICAgIG1lc3NhZ2UudHlwZSA9PT0gQ3JkdE1lc3NhZ2VUeXBlLkFQUEVORF9WQUxVRVxuICAgICkge1xuICAgICAgY29uc3QgeyBjb21wb25lbnRJZCwgdGltZXN0YW1wIH0gPSBtZXNzYWdlXG4gICAgICBjb25zdCBkYXRhID0gJ2RhdGEnIGluIG1lc3NhZ2UgPyBtZXNzYWdlLmRhdGEgOiB1bmRlZmluZWRcbiAgICAgIGNvbnN0IGJ5dGVzID0gZGF0YSA/IGAke2RhdGEuYnl0ZUxlbmd0aCAvIDEwMjR9S0JgIDogJydcblxuICAgICAgdHJ5IHtcbiAgICAgICAgY29uc3QgYyA9IGVuZ2luZS5nZXRDb21wb25lbnQoY29tcG9uZW50SWQpXG4gICAgICAgIHlpZWxkIGAke3ByZWZhY2V9IGM9JHtjLmNvbXBvbmVudE5hbWV9IHQ9JHt0aW1lc3RhbXB9ICR7Ynl0ZXN9IGRhdGE9JHtKU09OLnN0cmluZ2lmeShcbiAgICAgICAgICAoZGF0YSAmJiBjLnNjaGVtYS5kZXNlcmlhbGl6ZShuZXcgUmVhZFdyaXRlQnl0ZUJ1ZmZlcihkYXRhKSkpIHx8IG51bGxcbiAgICAgICAgKX1gXG4gICAgICB9IGNhdGNoIHtcbiAgICAgICAgeWllbGQgYCR7cHJlZmFjZX0gYz0ke2NvbXBvbmVudElkfSB0PSR7dGltZXN0YW1wfSBkYXRhPT9gXG4gICAgICB9XG4gICAgfSBlbHNlIGlmIChcbiAgICAgIG1lc3NhZ2UudHlwZSA9PT0gQ3JkdE1lc3NhZ2VUeXBlLkRFTEVURV9FTlRJVFkgfHxcbiAgICAgIG1lc3NhZ2UudHlwZSA9PT0gQ3JkdE1lc3NhZ2VUeXBlLkRFTEVURV9FTlRJVFlfTkVUV09SS1xuICAgICkge1xuICAgICAgeWllbGQgcHJlZmFjZVxuICAgIH0gZWxzZSB7XG4gICAgICB5aWVsZCBgJHtwcmVmYWNlfSBVbmtub3duIENyZHRNZXNzYWdlVHlwZWBcbiAgICB9XG4gIH1cbn1cbiJdfQ==
|
|
@@ -37,4 +37,4 @@ export function createRendererTransport(engineApi) {
|
|
|
37
37
|
};
|
|
38
38
|
return rendererTransport;
|
|
39
39
|
}
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVuZGVyZXJUcmFuc3BvcnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW50ZXJuYWwvdHJhbnNwb3J0cy9yZW5kZXJlclRyYW5zcG9ydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQTtBQU9oRixNQUFNLFVBQVUsdUJBQXVCLENBQUMsU0FBZ0M7SUFDdEUsS0FBSyxVQUFVLGNBQWMsQ0FBQyxPQUFtQjtRQUMvQyxNQUFNLFFBQVEsR0FBRyxNQUFNLFNBQVMsQ0FBQyxrQkFBa0IsQ0FBQztZQUNsRCxJQUFJLEVBQUUsSUFBSSxVQUFVLENBQUMsT0FBTyxDQUFDO1NBQzlCLENBQUMsQ0FBQTtRQUNGLElBQUksUUFBUSxJQUFJLFFBQVEsQ0FBQyxJQUFJLElBQUksUUFBUSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUU7WUFDckQsSUFBSSxpQkFBaUIsQ0FBQyxTQUFTLEVBQUU7Z0JBQy9CLEtBQUssTUFBTSxTQUFTLElBQUksUUFBUSxDQUFDLElBQUksRUFBRTtvQkFDckMsaUJBQWlCLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFBO2lCQUN2QzthQUNGO1NBQ0Y7SUFDSCxDQUFDO0lBRUQsTUFBTSxpQkFBaUIsR0FBYztRQUNuQyxLQUFLLENBQUMsSUFBSSxDQUFDLE9BQU87WUFDaEIsSUFBSTtnQkFDRixNQUFNLGNBQWMsQ0FBQyxPQUFxQixDQUFDLENBQUE7YUFDNUM7WUFBQyxPQUFPLEtBQUssRUFBRTtnQkFDZCx5Q0FBeUM7Z0JBQ3pDLHNDQUFzQztnQkFDdEMsT0FBTyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQTtnQkFDcEIsUUFBUSxDQUFBO2FBQ1Q7UUFDSCxDQUFDO1FBQ0QsTUFBTSxDQUFDLE9BQXlCO1lBQzlCLGtEQUFrRDtZQUNsRDtZQUNFLDhDQUE4QztZQUM3QyxPQUFlLENBQUMsV0FBVyxHQUFHLG9CQUFvQixFQUNuRDtnQkFDQSxPQUFPLEtBQUssQ0FBQTthQUNiO1lBRUQsT0FBTyxDQUFDLENBQUMsT0FBTyxDQUFBO1FBQ2xCLENBQUM7UUFDRCxJQUFJLEVBQUUsVUFBVTtLQUNqQixDQUFBO0lBRUQsT0FBTyxpQkFBaUIsQ0FBQTtBQUMxQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVHJhbnNwb3J0LCBUcmFuc3BvcnRNZXNzYWdlIH0gZnJvbSAnQGRjbC9lY3MnXG5pbXBvcnQgeyBNQVhfU1RBVElDX0NPTVBPTkVOVCB9IGZyb20gJ0BkY2wvZWNzL2Rpc3QvY29tcG9uZW50cy9jb21wb25lbnQtbnVtYmVyJ1xuaW1wb3J0IHR5cGUgeyBDcmR0U2VuZFRvUmVuZGVyZXJSZXF1ZXN0LCBDcmR0U2VuZFRvUmVzcG9uc2UgfSBmcm9tICd+c3lzdGVtL0VuZ2luZUFwaSdcblxuZXhwb3J0IHR5cGUgRW5naW5lQXBpRm9yVHJhbnNwb3J0ID0ge1xuICBjcmR0U2VuZFRvUmVuZGVyZXIoYm9keTogQ3JkdFNlbmRUb1JlbmRlcmVyUmVxdWVzdCk6IFByb21pc2U8Q3JkdFNlbmRUb1Jlc3BvbnNlPlxufVxuXG5leHBvcnQgZnVuY3Rpb24gY3JlYXRlUmVuZGVyZXJUcmFuc3BvcnQoZW5naW5lQXBpOiBFbmdpbmVBcGlGb3JUcmFuc3BvcnQpOiBUcmFuc3BvcnQge1xuICBhc3luYyBmdW5jdGlvbiBzZW5kVG9SZW5kZXJlcihtZXNzYWdlOiBVaW50OEFycmF5KSB7XG4gICAgY29uc3QgcmVzcG9uc2UgPSBhd2FpdCBlbmdpbmVBcGkuY3JkdFNlbmRUb1JlbmRlcmVyKHtcbiAgICAgIGRhdGE6IG5ldyBVaW50OEFycmF5KG1lc3NhZ2UpXG4gICAgfSlcbiAgICBpZiAocmVzcG9uc2UgJiYgcmVzcG9uc2UuZGF0YSAmJiByZXNwb25zZS5kYXRhLmxlbmd0aCkge1xuICAgICAgaWYgKHJlbmRlcmVyVHJhbnNwb3J0Lm9ubWVzc2FnZSkge1xuICAgICAgICBmb3IgKGNvbnN0IGJ5dGVBcnJheSBvZiByZXNwb25zZS5kYXRhKSB7XG4gICAgICAgICAgcmVuZGVyZXJUcmFuc3BvcnQub25tZXNzYWdlKGJ5dGVBcnJheSlcbiAgICAgICAgfVxuICAgICAgfVxuICAgIH1cbiAgfVxuXG4gIGNvbnN0IHJlbmRlcmVyVHJhbnNwb3J0OiBUcmFuc3BvcnQgPSB7XG4gICAgYXN5bmMgc2VuZChtZXNzYWdlKSB7XG4gICAgICB0cnkge1xuICAgICAgICBhd2FpdCBzZW5kVG9SZW5kZXJlcihtZXNzYWdlIGFzIFVpbnQ4QXJyYXkpXG4gICAgICB9IGNhdGNoIChlcnJvcikge1xuICAgICAgICAvLyB0aGlzIGlzIHRoZSBjb25zb2xlLmVycm9yIG9mIHRoZSBzY2VuZVxuICAgICAgICAvLyBlc2xpbnQtZGlzYWJsZS1uZXh0LWxpbmUgbm8tY29uc29sZVxuICAgICAgICBjb25zb2xlLmVycm9yKGVycm9yKVxuICAgICAgICBkZWJ1Z2dlclxuICAgICAgfVxuICAgIH0sXG4gICAgZmlsdGVyKG1lc3NhZ2U6IFRyYW5zcG9ydE1lc3NhZ2UpIHtcbiAgICAgIC8vIE9ubHkgc2VuZCByZW5kZXJlciBjb21wb25lbnRzIChQcm90byBHZW5lcmF0ZWQpXG4gICAgICBpZiAoXG4gICAgICAgIC8vIGZpbHRlciBvdXQgbWVzc2FnZXMgZm9yIG5vbi1jb3JlIGNvbXBvbmVudHNcbiAgICAgICAgKG1lc3NhZ2UgYXMgYW55KS5jb21wb25lbnRJZCA+IE1BWF9TVEFUSUNfQ09NUE9ORU5UXG4gICAgICApIHtcbiAgICAgICAgcmV0dXJuIGZhbHNlXG4gICAgICB9XG5cbiAgICAgIHJldHVybiAhIW1lc3NhZ2VcbiAgICB9LFxuICAgIHR5cGU6ICdyZW5kZXJlcidcbiAgfVxuXG4gIHJldHVybiByZW5kZXJlclRyYW5zcG9ydFxufVxuIl19
|
|
@@ -3,9 +3,9 @@ export declare enum CommsMessage {
|
|
|
3
3
|
REQ_CRDT_STATE = 2,
|
|
4
4
|
RES_CRDT_STATE = 3
|
|
5
5
|
}
|
|
6
|
-
export declare function BinaryMessageBus<T extends CommsMessage>(send: (message: Uint8Array) => void): {
|
|
6
|
+
export declare function BinaryMessageBus<T extends CommsMessage>(send: (message: Uint8Array, toPeerAddress?: string[]) => void): {
|
|
7
7
|
on: <K extends T>(message: K, callback: (value: Uint8Array, sender: string) => void) => void;
|
|
8
|
-
emit: <K_1 extends T>(message: K_1, value: Uint8Array) => void;
|
|
8
|
+
emit: <K_1 extends T>(message: K_1, value: Uint8Array, toPeerAddress?: string[]) => void;
|
|
9
9
|
__processMessages: (messages: Uint8Array[]) => void;
|
|
10
10
|
};
|
|
11
11
|
export declare function craftCommsMessage<T extends CommsMessage>(messageType: T, payload: Uint8Array): Uint8Array;
|
|
@@ -11,8 +11,8 @@ export function BinaryMessageBus(send) {
|
|
|
11
11
|
on: (message, callback) => {
|
|
12
12
|
mapping.set(message, callback);
|
|
13
13
|
},
|
|
14
|
-
emit: (message, value) => {
|
|
15
|
-
send(craftCommsMessage(message, value));
|
|
14
|
+
emit: (message, value, toPeerAddress) => {
|
|
15
|
+
send(craftCommsMessage(message, value), toPeerAddress);
|
|
16
16
|
},
|
|
17
17
|
__processMessages: (messages) => {
|
|
18
18
|
for (const message of messages) {
|
|
@@ -65,4 +65,4 @@ export function encodeString(s) {
|
|
|
65
65
|
buffer.writeUtf8String(s);
|
|
66
66
|
return buffer.readBuffer();
|
|
67
67
|
}
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmluYXJ5LW1lc3NhZ2UtYnVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL25ldHdvcmsvYmluYXJ5LW1lc3NhZ2UtYnVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHdDQUF3QyxDQUFBO0FBRTVFLE1BQU0sQ0FBTixJQUFZLFlBSVg7QUFKRCxXQUFZLFlBQVk7SUFDdEIsK0NBQVEsQ0FBQTtJQUNSLG1FQUFrQixDQUFBO0lBQ2xCLG1FQUFrQixDQUFBO0FBQ3BCLENBQUMsRUFKVyxZQUFZLEtBQVosWUFBWSxRQUl2QjtBQUVELE1BQU0sVUFBVSxnQkFBZ0IsQ0FDOUIsSUFBNkQ7SUFFN0QsTUFBTSxPQUFPLEdBQXdELElBQUksR0FBRyxFQUFFLENBQUE7SUFDOUUsT0FBTztRQUNMLEVBQUUsRUFBRSxDQUFjLE9BQVUsRUFBRSxRQUFxRCxFQUFFLEVBQUU7WUFDckYsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsUUFBUSxDQUFDLENBQUE7UUFDaEMsQ0FBQztRQUNELElBQUksRUFBRSxDQUFjLE9BQVUsRUFBRSxLQUFpQixFQUFFLGFBQXdCLEVBQUUsRUFBRTtZQUM3RSxJQUFJLENBQUMsaUJBQWlCLENBQUksT0FBTyxFQUFFLEtBQUssQ0FBQyxFQUFFLGFBQWEsQ0FBQyxDQUFBO1FBQzNELENBQUM7UUFDRCxpQkFBaUIsRUFBRSxDQUFDLFFBQXNCLEVBQUUsRUFBRTtZQUM1QyxLQUFLLE1BQU0sT0FBTyxJQUFJLFFBQVEsRUFBRTtnQkFDOUIsTUFBTSxRQUFRLEdBQUcsa0JBQWtCLENBQUksT0FBTyxDQUFDLENBQUE7Z0JBQy9DLElBQUksQ0FBQyxRQUFRO29CQUFFLFNBQVE7Z0JBQ3ZCLE1BQU0sRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxHQUFHLFFBQVEsQ0FBQTtnQkFDOUMsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQTtnQkFDbkMsSUFBSSxFQUFFO29CQUFFLEVBQUUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUE7YUFDekI7UUFDSCxDQUFDO0tBQ0YsQ0FBQTtBQUNILENBQUM7QUFFRCxNQUFNLFVBQVUsaUJBQWlCLENBQXlCLFdBQWMsRUFBRSxPQUFtQjtJQUMzRixNQUFNLEdBQUcsR0FBRyxJQUFJLFVBQVUsQ0FBQyxPQUFPLENBQUMsVUFBVSxHQUFHLENBQUMsQ0FBQyxDQUFBO0lBQ2xELEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFBO0lBQ3RCLEdBQUcsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFBO0lBQ25CLE9BQU8sR0FBRyxDQUFBO0FBQ1osQ0FBQztBQUVELE1BQU0sVUFBVSxrQkFBa0IsQ0FDaEMsSUFBZ0I7SUFFaEIsSUFBSTtRQUNGLElBQUksTUFBTSxHQUFHLENBQUMsQ0FBQTtRQUNkLE1BQU0sQ0FBQyxHQUFHLElBQUksVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQzlCLE1BQU0sSUFBSSxHQUFHLElBQUksUUFBUSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUNuQyxNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFBO1FBQzFDLE1BQU0sSUFBSSxDQUFDLENBQUE7UUFDWCxNQUFNLE1BQU0sR0FBRyxZQUFZLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsWUFBWSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDL0QsTUFBTSxJQUFJLFlBQVksQ0FBQTtRQUN0QixNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBTSxDQUFBO1FBQzlDLE1BQU0sSUFBSSxDQUFDLENBQUE7UUFDWCxNQUFNLE9BQU8sR0FBRyxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFBO1FBRWxDLE9BQU87WUFDTCxNQUFNO1lBQ04sV0FBVztZQUNYLElBQUksRUFBRSxPQUFPO1NBQ2QsQ0FBQTtLQUNGO0lBQUMsT0FBTyxDQUFDLEVBQUU7UUFDVixPQUFPLENBQUMsS0FBSyxDQUFDLHVCQUF1QixFQUFFLENBQUMsQ0FBQyxDQUFBO0tBQzFDO0FBQ0gsQ0FBQztBQUVELE1BQU0sVUFBVSxZQUFZLENBQUMsSUFBZ0I7SUFDM0MsTUFBTSxNQUFNLEdBQUcsSUFBSSxtQkFBbUIsRUFBRSxDQUFBO0lBQ3hDLE1BQU0sQ0FBQyxXQUFXLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFBO0lBQzlCLE9BQU8sTUFBTSxDQUFDLGNBQWMsRUFBRSxDQUFBO0FBQ2hDLENBQUM7QUFFRCxNQUFNLFVBQVUsWUFBWSxDQUFDLENBQVM7SUFDcEMsTUFBTSxNQUFNLEdBQUcsSUFBSSxtQkFBbUIsRUFBRSxDQUFBO0lBQ3hDLE1BQU0sQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDekIsT0FBTyxNQUFNLENBQUMsVUFBVSxFQUFFLENBQUE7QUFDNUIsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJlYWRXcml0ZUJ5dGVCdWZmZXIgfSBmcm9tICdAZGNsL2Vjcy9kaXN0L3NlcmlhbGl6YXRpb24vQnl0ZUJ1ZmZlcidcblxuZXhwb3J0IGVudW0gQ29tbXNNZXNzYWdlIHtcbiAgQ1JEVCA9IDEsXG4gIFJFUV9DUkRUX1NUQVRFID0gMixcbiAgUkVTX0NSRFRfU1RBVEUgPSAzXG59XG5cbmV4cG9ydCBmdW5jdGlvbiBCaW5hcnlNZXNzYWdlQnVzPFQgZXh0ZW5kcyBDb21tc01lc3NhZ2U+KFxuICBzZW5kOiAobWVzc2FnZTogVWludDhBcnJheSwgdG9QZWVyQWRkcmVzcz86IHN0cmluZ1tdKSA9PiB2b2lkXG4pIHtcbiAgY29uc3QgbWFwcGluZzogTWFwPFQsICh2YWx1ZTogVWludDhBcnJheSwgc2VuZGVyOiBzdHJpbmcpID0+IHZvaWQ+ID0gbmV3IE1hcCgpXG4gIHJldHVybiB7XG4gICAgb246IDxLIGV4dGVuZHMgVD4obWVzc2FnZTogSywgY2FsbGJhY2s6ICh2YWx1ZTogVWludDhBcnJheSwgc2VuZGVyOiBzdHJpbmcpID0+IHZvaWQpID0+IHtcbiAgICAgIG1hcHBpbmcuc2V0KG1lc3NhZ2UsIGNhbGxiYWNrKVxuICAgIH0sXG4gICAgZW1pdDogPEsgZXh0ZW5kcyBUPihtZXNzYWdlOiBLLCB2YWx1ZTogVWludDhBcnJheSwgdG9QZWVyQWRkcmVzcz86IHN0cmluZ1tdKSA9PiB7XG4gICAgICBzZW5kKGNyYWZ0Q29tbXNNZXNzYWdlPFQ+KG1lc3NhZ2UsIHZhbHVlKSwgdG9QZWVyQWRkcmVzcylcbiAgICB9LFxuICAgIF9fcHJvY2Vzc01lc3NhZ2VzOiAobWVzc2FnZXM6IFVpbnQ4QXJyYXlbXSkgPT4ge1xuICAgICAgZm9yIChjb25zdCBtZXNzYWdlIG9mIG1lc3NhZ2VzKSB7XG4gICAgICAgIGNvbnN0IGNvbW1zTXNnID0gZGVjb2RlQ29tbXNNZXNzYWdlPFQ+KG1lc3NhZ2UpXG4gICAgICAgIGlmICghY29tbXNNc2cpIGNvbnRpbnVlXG4gICAgICAgIGNvbnN0IHsgc2VuZGVyLCBtZXNzYWdlVHlwZSwgZGF0YSB9ID0gY29tbXNNc2dcbiAgICAgICAgY29uc3QgZm4gPSBtYXBwaW5nLmdldChtZXNzYWdlVHlwZSlcbiAgICAgICAgaWYgKGZuKSBmbihkYXRhLCBzZW5kZXIpXG4gICAgICB9XG4gICAgfVxuICB9XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBjcmFmdENvbW1zTWVzc2FnZTxUIGV4dGVuZHMgQ29tbXNNZXNzYWdlPihtZXNzYWdlVHlwZTogVCwgcGF5bG9hZDogVWludDhBcnJheSk6IFVpbnQ4QXJyYXkge1xuICBjb25zdCBtc2cgPSBuZXcgVWludDhBcnJheShwYXlsb2FkLmJ5dGVMZW5ndGggKyAxKVxuICBtc2cuc2V0KFttZXNzYWdlVHlwZV0pXG4gIG1zZy5zZXQocGF5bG9hZCwgMSlcbiAgcmV0dXJuIG1zZ1xufVxuXG5leHBvcnQgZnVuY3Rpb24gZGVjb2RlQ29tbXNNZXNzYWdlPFQgZXh0ZW5kcyBDb21tc01lc3NhZ2U+KFxuICBkYXRhOiBVaW50OEFycmF5XG4pOiB7IHNlbmRlcjogc3RyaW5nOyBtZXNzYWdlVHlwZTogVDsgZGF0YTogVWludDhBcnJheSB9IHwgdW5kZWZpbmVkIHtcbiAgdHJ5IHtcbiAgICBsZXQgb2Zmc2V0ID0gMFxuICAgIGNvbnN0IHIgPSBuZXcgVWludDhBcnJheShkYXRhKVxuICAgIGNvbnN0IHZpZXcgPSBuZXcgRGF0YVZpZXcoci5idWZmZXIpXG4gICAgY29uc3Qgc2VuZGVyTGVuZ3RoID0gdmlldy5nZXRVaW50OChvZmZzZXQpXG4gICAgb2Zmc2V0ICs9IDFcbiAgICBjb25zdCBzZW5kZXIgPSBkZWNvZGVTdHJpbmcoZGF0YS5zdWJhcnJheSgxLCBzZW5kZXJMZW5ndGggKyAxKSlcbiAgICBvZmZzZXQgKz0gc2VuZGVyTGVuZ3RoXG4gICAgY29uc3QgbWVzc2FnZVR5cGUgPSB2aWV3LmdldFVpbnQ4KG9mZnNldCkgYXMgVFxuICAgIG9mZnNldCArPSAxXG4gICAgY29uc3QgbWVzc2FnZSA9IHIuc3ViYXJyYXkob2Zmc2V0KVxuXG4gICAgcmV0dXJuIHtcbiAgICAgIHNlbmRlcixcbiAgICAgIG1lc3NhZ2VUeXBlLFxuICAgICAgZGF0YTogbWVzc2FnZVxuICAgIH1cbiAgfSBjYXRjaCAoZSkge1xuICAgIGNvbnNvbGUuZXJyb3IoJ0ludmFsaWQgQ29tbXMgbWVzc2FnZScsIGUpXG4gIH1cbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGRlY29kZVN0cmluZyhkYXRhOiBVaW50OEFycmF5KTogc3RyaW5nIHtcbiAgY29uc3QgYnVmZmVyID0gbmV3IFJlYWRXcml0ZUJ5dGVCdWZmZXIoKVxuICBidWZmZXIud3JpdGVCdWZmZXIoZGF0YSwgdHJ1ZSlcbiAgcmV0dXJuIGJ1ZmZlci5yZWFkVXRmOFN0cmluZygpXG59XG5cbmV4cG9ydCBmdW5jdGlvbiBlbmNvZGVTdHJpbmcoczogc3RyaW5nKTogVWludDhBcnJheSB7XG4gIGNvbnN0IGJ1ZmZlciA9IG5ldyBSZWFkV3JpdGVCeXRlQnVmZmVyKClcbiAgYnVmZmVyLndyaXRlVXRmOFN0cmluZyhzKVxuICByZXR1cm4gYnVmZmVyLnJlYWRCdWZmZXIoKVxufVxuIl19
|
|
@@ -8,7 +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 ??
|
|
11
|
+
const DEBUG_NETWORK_MESSAGES = () => globalThis.DEBUG_NETWORK_MESSAGES ?? false;
|
|
12
12
|
// Profile Info
|
|
13
13
|
const myProfile = {};
|
|
14
14
|
fetchProfile(myProfile, getUserData);
|
|
@@ -16,7 +16,9 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
|
|
|
16
16
|
const entityDefinitions = entityUtils(engine, myProfile);
|
|
17
17
|
// List of MessageBuss messsages to be sent on every frame to comms
|
|
18
18
|
const pendingMessageBusMessagesToSend = [];
|
|
19
|
-
const binaryMessageBus = BinaryMessageBus((
|
|
19
|
+
const binaryMessageBus = BinaryMessageBus((data, address) => {
|
|
20
|
+
pendingMessageBusMessagesToSend.push({ data: [data], address: address ?? [] });
|
|
21
|
+
});
|
|
20
22
|
function getMessagesToSend() {
|
|
21
23
|
const messages = [...pendingMessageBusMessagesToSend];
|
|
22
24
|
pendingMessageBusMessagesToSend.length = 0;
|
|
@@ -28,14 +30,25 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
|
|
|
28
30
|
// Add Sync Transport
|
|
29
31
|
const transport = {
|
|
30
32
|
filter: syncFilter(engine),
|
|
31
|
-
send: async (
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
33
|
+
send: async (messages) => {
|
|
34
|
+
for (const message of [messages].flat()) {
|
|
35
|
+
if (message.byteLength && transportInitialzed) {
|
|
36
|
+
DEBUG_NETWORK_MESSAGES() &&
|
|
37
|
+
console.log(...Array.from(serializeCrdtMessages('[NetworkMessage sent]:', message, engine)));
|
|
38
|
+
binaryMessageBus.emit(CommsMessage.CRDT, message);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
const peerMessages = getMessagesToSend();
|
|
42
|
+
let totalSize = 0;
|
|
43
|
+
for (const message of peerMessages) {
|
|
44
|
+
for (const data of message.data) {
|
|
45
|
+
totalSize += data.byteLength;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
if (totalSize) {
|
|
49
|
+
DEBUG_NETWORK_MESSAGES() && console.log('Sending network messages: ', totalSize / 1024, 'KB');
|
|
36
50
|
}
|
|
37
|
-
const
|
|
38
|
-
const response = await sendBinary({ data: messages });
|
|
51
|
+
const response = await sendBinary({ data: [], peerData: peerMessages });
|
|
39
52
|
binaryMessageBus.__processMessages(response.data);
|
|
40
53
|
transportInitialzed = true;
|
|
41
54
|
},
|
|
@@ -48,7 +61,7 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
|
|
|
48
61
|
const { sender, data } = decodeCRDTState(value);
|
|
49
62
|
if (sender !== myProfile.userId)
|
|
50
63
|
return;
|
|
51
|
-
DEBUG_NETWORK_MESSAGES() && console.log('[Processing CRDT State]', data.byteLength);
|
|
64
|
+
DEBUG_NETWORK_MESSAGES() && console.log('[Processing CRDT State]', data.byteLength / 1024, 'KB');
|
|
52
65
|
transport.onmessage(data);
|
|
53
66
|
stateIsSyncronized = true;
|
|
54
67
|
});
|
|
@@ -56,7 +69,7 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
|
|
|
56
69
|
binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, async (message, userId) => {
|
|
57
70
|
console.log(`Sending CRDT State to: ${userId}`);
|
|
58
71
|
transport.onmessage(message);
|
|
59
|
-
binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, engineToCrdt(engine)));
|
|
72
|
+
binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, engineToCrdt(engine)), [userId]);
|
|
60
73
|
});
|
|
61
74
|
// Process CRDT messages here
|
|
62
75
|
binaryMessageBus.on(CommsMessage.CRDT, (value) => {
|
|
@@ -157,4 +170,4 @@ function encodeCRDTState(address, data) {
|
|
|
157
170
|
serializedMessage.set(data, addressBuffer.byteLength + 1);
|
|
158
171
|
return serializedMessage;
|
|
159
172
|
}
|
|
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"]}
|
|
173
|
+
//# 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 (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"]}
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcl/sdk",
|
|
3
3
|
"description": "",
|
|
4
|
-
"version": "7.7.
|
|
4
|
+
"version": "7.7.2-12951019665.commit-c8695cd",
|
|
5
5
|
"author": "Decentraland",
|
|
6
6
|
"dependencies": {
|
|
7
|
-
"@dcl/ecs": "7.7.
|
|
7
|
+
"@dcl/ecs": "7.7.2-12951019665.commit-c8695cd",
|
|
8
8
|
"@dcl/ecs-math": "2.1.0",
|
|
9
9
|
"@dcl/explorer": "1.0.164509-20240802172549.commit-fb95b9b",
|
|
10
|
-
"@dcl/js-runtime": "7.7.
|
|
11
|
-
"@dcl/react-ecs": "7.7.
|
|
12
|
-
"@dcl/sdk-commands": "7.7.
|
|
10
|
+
"@dcl/js-runtime": "7.7.2-12951019665.commit-c8695cd",
|
|
11
|
+
"@dcl/react-ecs": "7.7.2-12951019665.commit-c8695cd",
|
|
12
|
+
"@dcl/sdk-commands": "7.7.2-12951019665.commit-c8695cd",
|
|
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": "c8695cd9b94e87ad567520089969583d9d36637f"
|
|
39
39
|
}
|
|
@@ -23,10 +23,11 @@ export function* serializeCrdtMessages(prefix: string, data: Uint8Array, engine:
|
|
|
23
23
|
) {
|
|
24
24
|
const { componentId, timestamp } = message
|
|
25
25
|
const data = 'data' in message ? message.data : undefined
|
|
26
|
+
const bytes = data ? `${data.byteLength / 1024}KB` : ''
|
|
26
27
|
|
|
27
28
|
try {
|
|
28
29
|
const c = engine.getComponent(componentId)
|
|
29
|
-
yield `${preface} c=${c.componentName} t=${timestamp} data=${JSON.stringify(
|
|
30
|
+
yield `${preface} c=${c.componentName} t=${timestamp} ${bytes} data=${JSON.stringify(
|
|
30
31
|
(data && c.schema.deserialize(new ReadWriteByteBuffer(data))) || null
|
|
31
32
|
)}`
|
|
32
33
|
} catch {
|
|
@@ -23,7 +23,7 @@ export function createRendererTransport(engineApi: EngineApiForTransport): Trans
|
|
|
23
23
|
const rendererTransport: Transport = {
|
|
24
24
|
async send(message) {
|
|
25
25
|
try {
|
|
26
|
-
await sendToRenderer(message)
|
|
26
|
+
await sendToRenderer(message as Uint8Array)
|
|
27
27
|
} catch (error) {
|
|
28
28
|
// this is the console.error of the scene
|
|
29
29
|
// eslint-disable-next-line no-console
|
|
@@ -6,14 +6,16 @@ export enum CommsMessage {
|
|
|
6
6
|
RES_CRDT_STATE = 3
|
|
7
7
|
}
|
|
8
8
|
|
|
9
|
-
export function BinaryMessageBus<T extends CommsMessage>(
|
|
9
|
+
export function BinaryMessageBus<T extends CommsMessage>(
|
|
10
|
+
send: (message: Uint8Array, toPeerAddress?: string[]) => void
|
|
11
|
+
) {
|
|
10
12
|
const mapping: Map<T, (value: Uint8Array, sender: string) => void> = new Map()
|
|
11
13
|
return {
|
|
12
14
|
on: <K extends T>(message: K, callback: (value: Uint8Array, sender: string) => void) => {
|
|
13
15
|
mapping.set(message, callback)
|
|
14
16
|
},
|
|
15
|
-
emit: <K extends T>(message: K, value: Uint8Array) => {
|
|
16
|
-
send(craftCommsMessage<T>(message, value))
|
|
17
|
+
emit: <K extends T>(message: K, value: Uint8Array, toPeerAddress?: string[]) => {
|
|
18
|
+
send(craftCommsMessage<T>(message, value), toPeerAddress)
|
|
17
19
|
},
|
|
18
20
|
__processMessages: (messages: Uint8Array[]) => {
|
|
19
21
|
for (const message of messages) {
|
|
@@ -17,7 +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 ??
|
|
20
|
+
const DEBUG_NETWORK_MESSAGES = () => (globalThis as any).DEBUG_NETWORK_MESSAGES ?? false
|
|
21
21
|
// Profile Info
|
|
22
22
|
const myProfile: IProfile = {} as IProfile
|
|
23
23
|
fetchProfile(myProfile!, getUserData)
|
|
@@ -26,10 +26,13 @@ export function addSyncTransport(
|
|
|
26
26
|
const entityDefinitions = entityUtils(engine, myProfile)
|
|
27
27
|
|
|
28
28
|
// List of MessageBuss messsages to be sent on every frame to comms
|
|
29
|
-
const pendingMessageBusMessagesToSend: Uint8Array[] = []
|
|
30
|
-
const binaryMessageBus = BinaryMessageBus((message) => pendingMessageBusMessagesToSend.push(message))
|
|
29
|
+
const pendingMessageBusMessagesToSend: { data: Uint8Array[]; address: string[] }[] = []
|
|
31
30
|
|
|
32
|
-
|
|
31
|
+
const binaryMessageBus = BinaryMessageBus((data, address) => {
|
|
32
|
+
pendingMessageBusMessagesToSend.push({ data: [data], address: address ?? [] })
|
|
33
|
+
})
|
|
34
|
+
|
|
35
|
+
function getMessagesToSend(): typeof pendingMessageBusMessagesToSend {
|
|
33
36
|
const messages = [...pendingMessageBusMessagesToSend]
|
|
34
37
|
pendingMessageBusMessagesToSend.length = 0
|
|
35
38
|
return messages
|
|
@@ -42,14 +45,25 @@ export function addSyncTransport(
|
|
|
42
45
|
// Add Sync Transport
|
|
43
46
|
const transport: Transport = {
|
|
44
47
|
filter: syncFilter(engine),
|
|
45
|
-
send: async (
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
48
|
+
send: async (messages) => {
|
|
49
|
+
for (const message of [messages].flat()) {
|
|
50
|
+
if (message.byteLength && transportInitialzed) {
|
|
51
|
+
DEBUG_NETWORK_MESSAGES() &&
|
|
52
|
+
console.log(...Array.from(serializeCrdtMessages('[NetworkMessage sent]:', message, engine)))
|
|
53
|
+
binaryMessageBus.emit(CommsMessage.CRDT, message)
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
const peerMessages = getMessagesToSend()
|
|
57
|
+
let totalSize = 0
|
|
58
|
+
for (const message of peerMessages) {
|
|
59
|
+
for (const data of message.data) {
|
|
60
|
+
totalSize += data.byteLength
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
if (totalSize) {
|
|
64
|
+
DEBUG_NETWORK_MESSAGES() && console.log('Sending network messages: ', totalSize / 1024, 'KB')
|
|
50
65
|
}
|
|
51
|
-
const
|
|
52
|
-
const response = await sendBinary({ data: messages })
|
|
66
|
+
const response = await sendBinary({ data: [], peerData: peerMessages })
|
|
53
67
|
binaryMessageBus.__processMessages(response.data)
|
|
54
68
|
transportInitialzed = true
|
|
55
69
|
},
|
|
@@ -62,7 +76,7 @@ export function addSyncTransport(
|
|
|
62
76
|
binaryMessageBus.on(CommsMessage.RES_CRDT_STATE, (value) => {
|
|
63
77
|
const { sender, data } = decodeCRDTState(value)
|
|
64
78
|
if (sender !== myProfile.userId) return
|
|
65
|
-
DEBUG_NETWORK_MESSAGES() && console.log('[Processing CRDT State]', data.byteLength)
|
|
79
|
+
DEBUG_NETWORK_MESSAGES() && console.log('[Processing CRDT State]', data.byteLength / 1024, 'KB')
|
|
66
80
|
transport.onmessage!(data)
|
|
67
81
|
stateIsSyncronized = true
|
|
68
82
|
})
|
|
@@ -71,7 +85,7 @@ export function addSyncTransport(
|
|
|
71
85
|
binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, async (message, userId) => {
|
|
72
86
|
console.log(`Sending CRDT State to: ${userId}`)
|
|
73
87
|
transport.onmessage!(message)
|
|
74
|
-
binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, engineToCrdt(engine)))
|
|
88
|
+
binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, engineToCrdt(engine)), [userId])
|
|
75
89
|
})
|
|
76
90
|
|
|
77
91
|
// Process CRDT messages here
|