@dcl/sdk 7.5.8-10967536696.commit-cfc4ce5 → 7.5.8-11020113946.commit-53f6ae5
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/entities.js +3 -20
- package/network/message-bus-sync.d.ts +1 -1
- package/network/message-bus-sync.js +67 -19
- package/network/state.d.ts +1 -0
- package/network/state.js +25 -12
- package/network/utils.d.ts +0 -29
- package/network/utils.js +1 -102
- package/package.json +6 -6
- package/players/index.d.ts +9 -1
- package/players/index.js +2 -2
- package/src/network/entities.ts +2 -35
- package/src/network/message-bus-sync.ts +75 -30
- package/src/network/state.ts +42 -12
- package/src/network/utils.ts +1 -124
- package/src/players/index.ts +1 -1
- package/src/testing/runtime.ts +3 -3
- package/testing/runtime.js +4 -4
package/network/entities.js
CHANGED
@@ -1,4 +1,5 @@
|
|
1
|
-
import { NetworkEntity as _NetworkEntity, NetworkParent as _NetworkParent, Transform as _Transform, SyncComponents as _SyncComponents
|
1
|
+
import { NetworkEntity as _NetworkEntity, NetworkParent as _NetworkParent, Transform as _Transform, SyncComponents as _SyncComponents } from '@dcl/ecs';
|
2
|
+
import { NOT_SYNC_COMPONENTS } from './state';
|
2
3
|
export function entityUtils(engine, profile) {
|
3
4
|
const NetworkEntity = engine.getComponent(_NetworkEntity.componentId);
|
4
5
|
const NetworkParent = engine.getComponent(_NetworkParent.componentId);
|
@@ -28,24 +29,6 @@ export function entityUtils(engine, profile) {
|
|
28
29
|
}
|
29
30
|
}
|
30
31
|
}
|
31
|
-
const NOT_SYNC_COMPONENTS = [
|
32
|
-
VideoEvent,
|
33
|
-
VideoPlayer,
|
34
|
-
TweenState,
|
35
|
-
AudioEvent,
|
36
|
-
AudioSource,
|
37
|
-
EngineInfo,
|
38
|
-
GltfContainerLoadingState,
|
39
|
-
PointerEventsResult,
|
40
|
-
RaycastResult,
|
41
|
-
RealmInfo,
|
42
|
-
UiDropdown,
|
43
|
-
UiDropdownResult,
|
44
|
-
UiInput,
|
45
|
-
UiInputResult,
|
46
|
-
UiTransform,
|
47
|
-
UiText
|
48
|
-
];
|
49
32
|
for (const component of NOT_SYNC_COMPONENTS) {
|
50
33
|
if (componentsIdsMutable.includes(component.componentId)) {
|
51
34
|
console.log(`⚠️ ${component.componentName} can't be sync through the network!`);
|
@@ -127,4 +110,4 @@ export function entityUtils(engine, profile) {
|
|
127
110
|
getFirstChild
|
128
111
|
};
|
129
112
|
}
|
130
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"entities.js","sourceRoot":"","sources":["../src/network/entities.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Entity,\n  IEngine,\n  NetworkEntity as _NetworkEntity,\n  INetowrkEntity,\n  NetworkParent as _NetworkParent,\n  Transform as _Transform,\n  SyncComponents as _SyncComponents,\n  INetowrkParent,\n  TransformComponent,\n  ISyncComponents,\n  VideoEvent,\n  TweenState,\n  AudioEvent,\n  AudioSource,\n  EngineInfo,\n  GltfContainerLoadingState,\n  PointerEventsResult,\n  RaycastResult,\n  RealmInfo,\n  VideoPlayer,\n  UiDropdown,\n  UiDropdownResult,\n  UiInput,\n  UiInputResult,\n  UiText,\n  UiTransform\n} from '@dcl/ecs'\nimport { IProfile } from './message-bus-sync'\n\nexport type SyncEntity = (entityId: Entity, componentIds: number[], entityEnumId?: number) => void\n\nexport function entityUtils(engine: IEngine, profile: IProfile) {\n  const NetworkEntity = engine.getComponent(_NetworkEntity.componentId) as INetowrkEntity\n  const NetworkParent = engine.getComponent(_NetworkParent.componentId) as INetowrkParent\n  const Transform = engine.getComponent(_Transform.componentId) as TransformComponent\n  const SyncComponents = engine.getComponent(_SyncComponents.componentId) as ISyncComponents\n\n  /**\n   * Create a network entity (sync) through comms, and sync the received components\n   */\n  function syncEntity(entityId: Entity, componentIds: number[], entityEnumId?: number) {\n    let componentsIdsMutable = [...componentIds]\n    // Profile not initialized\n    if (!profile?.networkId) {\n      throw new Error('Profile not initialized. Call syncEntity inside the main() function.')\n    }\n\n    // We use the networkId generated by the user address to identify this entity through the network\n    const networkValue = { entityId, networkId: profile.networkId }\n\n    // If there is an entityEnumId, it means is the same entity for all the clients created on the main funciton.\n    // So the networkId should be the same in all the clients to avoid re-creating this entity.\n    // For this case we use networkId = 0.\n    if (entityEnumId !== undefined) {\n      networkValue.networkId = 0\n      networkValue.entityId = entityEnumId as Entity\n\n      // Check if this enum is already used\n      for (const [_, network] of engine.getEntitiesWith(NetworkEntity)) {\n        if (network.networkId === networkValue.networkId && network.entityId === networkValue.entityId) {\n          throw new Error('syncEntity failed because the id provided is already in use')\n        }\n      }\n    }\n\n    const NOT_SYNC_COMPONENTS = [\n      VideoEvent,\n      VideoPlayer,\n      TweenState,\n      AudioEvent,\n      AudioSource,\n      EngineInfo,\n      GltfContainerLoadingState,\n      PointerEventsResult,\n      RaycastResult,\n      RealmInfo,\n      UiDropdown,\n      UiDropdownResult,\n      UiInput,\n      UiInputResult,\n      UiTransform,\n      UiText\n    ]\n    for (const component of NOT_SYNC_COMPONENTS) {\n      if (componentsIdsMutable.includes(component.componentId)) {\n        console.log(`⚠️ ${component.componentName} can't be sync through the network!`)\n        componentsIdsMutable = componentsIdsMutable.filter(($) => $ !== component.componentId)\n      }\n    }\n\n    // If is not defined, then is a entity created in runtime (what we called dynamic/runtime entities).\n    NetworkEntity.createOrReplace(entityId, networkValue)\n    SyncComponents.createOrReplace(entityId, { componentIds: componentsIdsMutable })\n  }\n\n  /**\n   * Returns an iterable of all the childrens of the given entity.\n   * for (const children of getChildren(parent)) { console.log(children) }\n   * or just => const childrens: Entity[] = Array.from(getChildren(parent))\n   */\n  function* getChildren(parent: Entity): Iterable<Entity> {\n    const network = NetworkEntity.getOrNull(parent)\n    if (network) {\n      for (const [entity, parent] of engine.getEntitiesWith(NetworkParent)) {\n        if (parent.entityId === network.entityId && parent.networkId === network.networkId) {\n          yield entity\n        }\n      }\n    }\n  }\n\n  function getFirstChild(entity: Entity) {\n    return Array.from(getChildren(entity))[0]\n  }\n\n  /**\n   * Returns the parent entity of the given entity.\n   */\n  function getParent(child: Entity): Entity | undefined {\n    const parent = NetworkParent.getOrNull(child)\n    if (!parent) return undefined\n    for (const [entity, network] of engine.getEntitiesWith(NetworkEntity)) {\n      if (parent.networkId === network.networkId && parent.entityId === network.entityId) {\n        return entity\n      }\n    }\n    return undefined\n  }\n\n  /**\n   * Adds the network parenting to sync entities.\n   * Equivalent to Transform.parent for local entities\n   */\n  function parentEntity(entity: Entity, parent: Entity) {\n    const network = NetworkEntity.getOrNull(parent)\n    if (!network) {\n      throw new Error('Entity is not sync. Call syncEntity on the parent.')\n    }\n\n    // Create network parent component\n    NetworkParent.createOrReplace(entity, network)\n\n    // If we dont have a transform for this entity, create an empty one to send it to the renderer\n    if (!Transform.getOrNull(entity)) {\n      Transform.create(entity)\n    } else {\n      // We force to send a tick update of the transform so we can send the NEW parent to the renderer\n      Transform.getMutable(entity)\n    }\n  }\n\n  /**\n   * Removes the network parenting from an entity\n   */\n  function removeParent(entity: Entity) {\n    const network = NetworkEntity.getOrNull(entity)\n\n    if (!network) {\n      throw new Error('Entity is not sync')\n    }\n\n    NetworkParent.deleteFrom(entity)\n  }\n\n  return {\n    syncEntity,\n    getChildren,\n    getParent,\n    parentEntity,\n    removeParent,\n    getFirstChild\n  }\n}\n"]}
|
113
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"entities.js","sourceRoot":"","sources":["../src/network/entities.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Entity,\n  IEngine,\n  NetworkEntity as _NetworkEntity,\n  INetowrkEntity,\n  NetworkParent as _NetworkParent,\n  Transform as _Transform,\n  SyncComponents as _SyncComponents,\n  INetowrkParent,\n  TransformComponent,\n  ISyncComponents\n} from '@dcl/ecs'\nimport { IProfile } from './message-bus-sync'\nimport { NOT_SYNC_COMPONENTS } from './state'\n\nexport type SyncEntity = (entityId: Entity, componentIds: number[], entityEnumId?: number) => void\n\nexport function entityUtils(engine: IEngine, profile: IProfile) {\n  const NetworkEntity = engine.getComponent(_NetworkEntity.componentId) as INetowrkEntity\n  const NetworkParent = engine.getComponent(_NetworkParent.componentId) as INetowrkParent\n  const Transform = engine.getComponent(_Transform.componentId) as TransformComponent\n  const SyncComponents = engine.getComponent(_SyncComponents.componentId) as ISyncComponents\n\n  /**\n   * Create a network entity (sync) through comms, and sync the received components\n   */\n  function syncEntity(entityId: Entity, componentIds: number[], entityEnumId?: number) {\n    let componentsIdsMutable = [...componentIds]\n    // Profile not initialized\n    if (!profile?.networkId) {\n      throw new Error('Profile not initialized. Call syncEntity inside the main() function.')\n    }\n\n    // We use the networkId generated by the user address to identify this entity through the network\n    const networkValue = { entityId, networkId: profile.networkId }\n\n    // If there is an entityEnumId, it means is the same entity for all the clients created on the main funciton.\n    // So the networkId should be the same in all the clients to avoid re-creating this entity.\n    // For this case we use networkId = 0.\n    if (entityEnumId !== undefined) {\n      networkValue.networkId = 0\n      networkValue.entityId = entityEnumId as Entity\n\n      // Check if this enum is already used\n      for (const [_, network] of engine.getEntitiesWith(NetworkEntity)) {\n        if (network.networkId === networkValue.networkId && network.entityId === networkValue.entityId) {\n          throw new Error('syncEntity failed because the id provided is already in use')\n        }\n      }\n    }\n\n    for (const component of NOT_SYNC_COMPONENTS) {\n      if (componentsIdsMutable.includes(component.componentId)) {\n        console.log(`⚠️ ${component.componentName} can't be sync through the network!`)\n        componentsIdsMutable = componentsIdsMutable.filter(($) => $ !== component.componentId)\n      }\n    }\n\n    // If is not defined, then is a entity created in runtime (what we called dynamic/runtime entities).\n    NetworkEntity.createOrReplace(entityId, networkValue)\n    SyncComponents.createOrReplace(entityId, { componentIds: componentsIdsMutable })\n  }\n\n  /**\n   * Returns an iterable of all the childrens of the given entity.\n   * for (const children of getChildren(parent)) { console.log(children) }\n   * or just => const childrens: Entity[] = Array.from(getChildren(parent))\n   */\n  function* getChildren(parent: Entity): Iterable<Entity> {\n    const network = NetworkEntity.getOrNull(parent)\n    if (network) {\n      for (const [entity, parent] of engine.getEntitiesWith(NetworkParent)) {\n        if (parent.entityId === network.entityId && parent.networkId === network.networkId) {\n          yield entity\n        }\n      }\n    }\n  }\n\n  function getFirstChild(entity: Entity) {\n    return Array.from(getChildren(entity))[0]\n  }\n\n  /**\n   * Returns the parent entity of the given entity.\n   */\n  function getParent(child: Entity): Entity | undefined {\n    const parent = NetworkParent.getOrNull(child)\n    if (!parent) return undefined\n    for (const [entity, network] of engine.getEntitiesWith(NetworkEntity)) {\n      if (parent.networkId === network.networkId && parent.entityId === network.entityId) {\n        return entity\n      }\n    }\n    return undefined\n  }\n\n  /**\n   * Adds the network parenting to sync entities.\n   * Equivalent to Transform.parent for local entities\n   */\n  function parentEntity(entity: Entity, parent: Entity) {\n    const network = NetworkEntity.getOrNull(parent)\n    if (!network) {\n      throw new Error('Entity is not sync. Call syncEntity on the parent.')\n    }\n\n    // Create network parent component\n    NetworkParent.createOrReplace(entity, network)\n\n    // If we dont have a transform for this entity, create an empty one to send it to the renderer\n    if (!Transform.getOrNull(entity)) {\n      Transform.create(entity)\n    } else {\n      // We force to send a tick update of the transform so we can send the NEW parent to the renderer\n      Transform.getMutable(entity)\n    }\n  }\n\n  /**\n   * Removes the network parenting from an entity\n   */\n  function removeParent(entity: Entity) {\n    const network = NetworkEntity.getOrNull(entity)\n\n    if (!network) {\n      throw new Error('Entity is not sync')\n    }\n\n    NetworkParent.deleteFrom(entity)\n  }\n\n  return {\n    syncEntity,\n    getChildren,\n    getParent,\n    parentEntity,\n    removeParent,\n    getFirstChild\n  }\n}\n"]}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/// <reference types="@dcl/js-runtime" />
|
2
2
|
import { IEngine } from '@dcl/ecs';
|
3
|
-
import type
|
3
|
+
import { type SendBinaryRequest, type SendBinaryResponse } from '~system/CommunicationsController';
|
4
4
|
import { GetUserDataRequest, GetUserDataResponse } from '~system/UserIdentity';
|
5
5
|
export type IProfile = {
|
6
6
|
networkId: number;
|
@@ -1,11 +1,13 @@
|
|
1
|
+
import { RealmInfo } from '@dcl/ecs';
|
1
2
|
import { syncFilter } from './filter';
|
2
3
|
import { engineToCrdt } from './state';
|
3
|
-
import { BinaryMessageBus, CommsMessage } from './binary-message-bus';
|
4
|
-
import {
|
4
|
+
import { BinaryMessageBus, CommsMessage, decodeString, encodeString } from './binary-message-bus';
|
5
|
+
import { fetchProfile } from './utils';
|
5
6
|
import { entityUtils } from './entities';
|
7
|
+
import { definePlayerHelper } from '../players';
|
8
|
+
import { serializeCrdtMessages } from '../internal/transports/logger';
|
6
9
|
// user that we asked for the inital crdt state
|
7
10
|
export function addSyncTransport(engine, sendBinary, getUserData) {
|
8
|
-
definePlayersInScene(engine);
|
9
11
|
// Profile Info
|
10
12
|
const myProfile = {};
|
11
13
|
fetchProfile(myProfile, getUserData);
|
@@ -35,29 +37,46 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
|
|
35
37
|
};
|
36
38
|
engine.addTransport(transport);
|
37
39
|
// End add sync transport
|
38
|
-
// Add state intialized checker
|
39
|
-
engine.addSystem(() => stateInitializedChecker(engine, myProfile, entityDefinitions.syncEntity));
|
40
|
-
// Request initial state
|
41
|
-
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, new Uint8Array());
|
42
40
|
// If we dont have any state initialized, and recieve a state message.
|
43
41
|
binaryMessageBus.on(CommsMessage.RES_CRDT_STATE, (value) => {
|
44
|
-
|
45
|
-
|
46
|
-
|
42
|
+
const { sender, data } = decodeCRDTState(value);
|
43
|
+
if (sender !== myProfile.userId)
|
44
|
+
return;
|
45
|
+
console.log('[Processing CRDT State]', data.byteLength);
|
46
|
+
transport.onmessage(data);
|
47
|
+
});
|
48
|
+
binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, (_, userId) => {
|
49
|
+
binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, engineToCrdt(engine)));
|
50
|
+
});
|
51
|
+
const players = definePlayerHelper(engine);
|
52
|
+
let requestCrdtStateWhenConnected = false;
|
53
|
+
players.onEnterScene((player) => {
|
54
|
+
if (player.userId === myProfile.userId && !requestCrdtStateWhenConnected) {
|
55
|
+
if (RealmInfo.getOrNull(engine.RootEntity)?.isConnectedSceneRoom) {
|
56
|
+
console.log('Requesting state');
|
57
|
+
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, new Uint8Array());
|
58
|
+
}
|
59
|
+
else {
|
60
|
+
console.log('Waiting to be conneted');
|
61
|
+
requestCrdtStateWhenConnected = true;
|
62
|
+
}
|
47
63
|
}
|
48
64
|
});
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
65
|
+
RealmInfo.onChange(engine.RootEntity, (value) => {
|
66
|
+
if (value?.isConnectedSceneRoom && requestCrdtStateWhenConnected) {
|
67
|
+
console.log('Requesting state.');
|
68
|
+
requestCrdtStateWhenConnected = false;
|
69
|
+
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, new Uint8Array());
|
70
|
+
}
|
71
|
+
});
|
72
|
+
players.onLeaveScene((userId) => {
|
73
|
+
if (userId === myProfile.userId) {
|
74
|
+
requestCrdtStateWhenConnected = false;
|
56
75
|
}
|
57
76
|
});
|
58
77
|
// Process CRDT messages here
|
59
78
|
binaryMessageBus.on(CommsMessage.CRDT, (value) => {
|
60
|
-
|
79
|
+
console.log(Array.from(serializeCrdtMessages('[NetworkMessage]', value, engine)));
|
61
80
|
transport.onmessage(value);
|
62
81
|
});
|
63
82
|
return {
|
@@ -65,4 +84,33 @@ export function addSyncTransport(engine, sendBinary, getUserData) {
|
|
65
84
|
myProfile
|
66
85
|
};
|
67
86
|
}
|
68
|
-
|
87
|
+
/**
|
88
|
+
* Messages Protocol Encoding
|
89
|
+
*
|
90
|
+
* CRDT: Plain Uint8Array
|
91
|
+
*
|
92
|
+
* CRDT_STATE_RES { sender: string, data: Uint8Array}
|
93
|
+
*/
|
94
|
+
function decodeCRDTState(data) {
|
95
|
+
let offset = 0;
|
96
|
+
const r = new Uint8Array(data);
|
97
|
+
const view = new DataView(r.buffer);
|
98
|
+
const senderLength = view.getUint8(offset);
|
99
|
+
offset += 1;
|
100
|
+
const sender = decodeString(data.subarray(1, senderLength + 1));
|
101
|
+
offset += senderLength;
|
102
|
+
const state = r.subarray(offset);
|
103
|
+
return { sender, data: state };
|
104
|
+
}
|
105
|
+
function encodeCRDTState(address, data) {
|
106
|
+
// address to uint8array
|
107
|
+
const addressBuffer = encodeString(address);
|
108
|
+
const addressOffset = 1;
|
109
|
+
const messageLength = addressOffset + addressBuffer.byteLength + data.byteLength;
|
110
|
+
const serializedMessage = new Uint8Array(messageLength);
|
111
|
+
serializedMessage.set(new Uint8Array([addressBuffer.byteLength]), 0);
|
112
|
+
serializedMessage.set(addressBuffer, 1);
|
113
|
+
serializedMessage.set(data, addressBuffer.byteLength + 1);
|
114
|
+
return serializedMessage;
|
115
|
+
}
|
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"]}
|
package/network/state.d.ts
CHANGED
@@ -1,2 +1,3 @@
|
|
1
1
|
import { IEngine } from '@dcl/ecs';
|
2
|
+
export declare const NOT_SYNC_COMPONENTS: (import("@dcl/ecs").AudioSourceComponentDefinitionExtended | import("@dcl/ecs").GrowOnlyValueSetComponentDefinition<import("@dcl/ecs").PBAudioEvent> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBEngineInfo> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBGltfContainerLoadingState> | import("@dcl/ecs").GrowOnlyValueSetComponentDefinition<import("@dcl/ecs").PBPointerEventsResult> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBRaycastResult> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBRealmInfo> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBTweenState> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBUiDropdown> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBUiDropdownResult> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBUiInput> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBUiInputResult> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBUiText> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBUiTransform> | import("@dcl/ecs").GrowOnlyValueSetComponentDefinition<import("@dcl/ecs").PBVideoEvent> | import("@dcl/ecs").LastWriteWinElementSetComponentDefinition<import("@dcl/ecs").PBVideoPlayer>)[];
|
2
3
|
export declare function engineToCrdt(engine: IEngine): Uint8Array;
|
package/network/state.js
CHANGED
@@ -1,22 +1,35 @@
|
|
1
1
|
import { ReadWriteByteBuffer } from '@dcl/ecs/dist/serialization/ByteBuffer';
|
2
|
-
import { CrdtMessageProtocol, CrdtMessageType, PutComponentOperation, PutNetworkComponentOperation,
|
2
|
+
import { CrdtMessageProtocol, CrdtMessageType, PutComponentOperation, PutNetworkComponentOperation, NetworkEntity as _NetworkEntity, VideoEvent, AudioEvent, AudioSource, EngineInfo, GltfContainerLoadingState, PointerEventsResult, RaycastResult, RealmInfo, TweenState, UiDropdown, UiDropdownResult, UiInput, UiInputResult, UiText, UiTransform, VideoPlayer } from '@dcl/ecs';
|
3
|
+
export const NOT_SYNC_COMPONENTS = [
|
4
|
+
VideoEvent,
|
5
|
+
VideoPlayer,
|
6
|
+
TweenState,
|
7
|
+
AudioEvent,
|
8
|
+
AudioSource,
|
9
|
+
EngineInfo,
|
10
|
+
GltfContainerLoadingState,
|
11
|
+
PointerEventsResult,
|
12
|
+
RaycastResult,
|
13
|
+
RealmInfo,
|
14
|
+
UiDropdown,
|
15
|
+
UiDropdownResult,
|
16
|
+
UiInput,
|
17
|
+
UiInputResult,
|
18
|
+
UiTransform,
|
19
|
+
UiText
|
20
|
+
];
|
21
|
+
const NOT_SYNC_COMPONENTS_IDS = NOT_SYNC_COMPONENTS.map(($) => $.componentId);
|
3
22
|
export function engineToCrdt(engine) {
|
4
23
|
const crdtBuffer = new ReadWriteByteBuffer();
|
5
24
|
const networkBuffer = new ReadWriteByteBuffer();
|
6
|
-
const SyncComponents = engine.getComponent(_SyncComponents.componentId);
|
7
25
|
const NetworkEntity = engine.getComponent(_NetworkEntity.componentId);
|
8
26
|
for (const itComponentDefinition of engine.componentsIter()) {
|
27
|
+
if (NOT_SYNC_COMPONENTS_IDS.includes(itComponentDefinition.componentId)) {
|
28
|
+
continue;
|
29
|
+
}
|
9
30
|
itComponentDefinition.dumpCrdtStateToBuffer(crdtBuffer, (entity) => {
|
10
31
|
const isNetworkEntity = NetworkEntity.has(entity);
|
11
|
-
|
12
|
-
return false;
|
13
|
-
}
|
14
|
-
const isDynamicEntity = NetworkEntity.get(entity).networkId;
|
15
|
-
if (isDynamicEntity) {
|
16
|
-
return true;
|
17
|
-
}
|
18
|
-
// For the static entities we only send the updates of the SyncComponents
|
19
|
-
return SyncComponents.get(entity).componentIds.includes(itComponentDefinition.componentId);
|
32
|
+
return isNetworkEntity;
|
20
33
|
});
|
21
34
|
}
|
22
35
|
let header;
|
@@ -37,4 +50,4 @@ export function engineToCrdt(engine) {
|
|
37
50
|
}
|
38
51
|
return networkBuffer.toBinary();
|
39
52
|
}
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvbmV0d29yay9zdGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQTtBQUM1RSxPQUFPLEVBRUwsbUJBQW1CLEVBQ25CLGVBQWUsRUFFZixxQkFBcUIsRUFDckIsNEJBQTRCLEVBRTVCLGFBQWEsSUFBSSxjQUFjLEVBRS9CLFVBQVUsRUFDVixVQUFVLEVBQ1YsV0FBVyxFQUNYLFVBQVUsRUFDVix5QkFBeUIsRUFDekIsbUJBQW1CLEVBQ25CLGFBQWEsRUFDYixTQUFTLEVBQ1QsVUFBVSxFQUNWLFVBQVUsRUFDVixnQkFBZ0IsRUFDaEIsT0FBTyxFQUNQLGFBQWEsRUFDYixNQUFNLEVBQ04sV0FBVyxFQUNYLFdBQVcsRUFDWixNQUFNLFVBQVUsQ0FBQTtBQUVqQixNQUFNLENBQUMsTUFBTSxtQkFBbUIsR0FBRztJQUNqQyxVQUFVO0lBQ1YsV0FBVztJQUNYLFVBQVU7SUFDVixVQUFVO0lBQ1YsV0FBVztJQUNYLFVBQVU7SUFDVix5QkFBeUI7SUFDekIsbUJBQW1CO0lBQ25CLGFBQWE7SUFDYixTQUFTO0lBQ1QsVUFBVTtJQUNWLGdCQUFnQjtJQUNoQixPQUFPO0lBQ1AsYUFBYTtJQUNiLFdBQVc7SUFDWCxNQUFNO0NBQ1AsQ0FBQTtBQUVELE1BQU0sdUJBQXVCLEdBQUcsbUJBQW1CLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLENBQUE7QUFFN0UsTUFBTSxVQUFVLFlBQVksQ0FBQyxNQUFlO0lBQzFDLE1BQU0sVUFBVSxHQUFHLElBQUksbUJBQW1CLEVBQUUsQ0FBQTtJQUM1QyxNQUFNLGFBQWEsR0FBRyxJQUFJLG1CQUFtQixFQUFFLENBQUE7SUFDL0MsTUFBTSxhQUFhLEdBQUcsTUFBTSxDQUFDLFlBQVksQ0FBQyxjQUFjLENBQUMsV0FBVyxDQUFtQixDQUFBO0lBRXZGLEtBQUssTUFBTSxxQkFBcUIsSUFBSSxNQUFNLENBQUMsY0FBYyxFQUFFLEVBQUU7UUFDM0QsSUFBSSx1QkFBdUIsQ0FBQyxRQUFRLENBQUMscUJBQXFCLENBQUMsV0FBVyxDQUFDLEVBQUU7WUFDdkUsU0FBUTtTQUNUO1FBQ0QscUJBQXFCLENBQUMscUJBQXFCLENBQUMsVUFBVSxFQUFFLENBQUMsTUFBTSxFQUFFLEVBQUU7WUFDakUsTUFBTSxlQUFlLEdBQUcsYUFBYSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQTtZQUNqRCxPQUFPLGVBQWUsQ0FBQTtRQUN4QixDQUFDLENBQUMsQ0FBQTtLQUNIO0lBRUQsSUFBSSxNQUFnQyxDQUFBO0lBQ3BDLE9BQU8sQ0FBQyxNQUFNLEdBQUcsbUJBQW1CLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxDQUFDLEVBQUU7UUFDM0QsSUFBSSxNQUFNLENBQUMsSUFBSSxLQUFLLGVBQWUsQ0FBQyxhQUFhLEVBQUU7WUFDakQsTUFBTSxPQUFPLEdBQUcscUJBQXFCLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBRSxDQUFBO1lBQ3ZELE1BQU0sYUFBYSxHQUFHLGFBQWEsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFBO1lBQy9ELElBQUksYUFBYSxFQUFFO2dCQUNqQiw0QkFBNEIsQ0FBQyxLQUFLLENBQ2hDLGFBQWEsQ0FBQyxRQUFRLEVBQ3RCLE9BQU8sQ0FBQyxTQUFTLEVBQ2pCLE9BQU8sQ0FBQyxXQUFXLEVBQ25CLGFBQWEsQ0FBQyxTQUFTLEVBQ3ZCLE9BQU8sQ0FBQyxJQUFJLEVBQ1osYUFBYSxDQUNkLENBQUE7YUFDRjtpQkFBTTtnQkFDTCxxQkFBcUIsQ0FBQyxLQUFLLENBQ3pCLE9BQU8sQ0FBQyxRQUFRLEVBQ2hCLE9BQU8sQ0FBQyxTQUFTLEVBQ2pCLE9BQU8sQ0FBQyxXQUFXLEVBQ25CLE9BQU8sQ0FBQyxJQUFJLEVBQ1osYUFBYSxDQUNkLENBQUE7YUFDRjtTQUNGO2FBQU07WUFDTCxVQUFVLENBQUMsbUJBQW1CLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFBO1NBQzlDO0tBQ0Y7SUFFRCxPQUFPLGFBQWEsQ0FBQyxRQUFRLEVBQUUsQ0FBQTtBQUNqQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgUmVhZFdyaXRlQnl0ZUJ1ZmZlciB9IGZyb20gJ0BkY2wvZWNzL2Rpc3Qvc2VyaWFsaXphdGlvbi9CeXRlQnVmZmVyJ1xuaW1wb3J0IHtcbiAgQ3JkdE1lc3NhZ2VIZWFkZXIsXG4gIENyZHRNZXNzYWdlUHJvdG9jb2wsXG4gIENyZHRNZXNzYWdlVHlwZSxcbiAgSUVuZ2luZSxcbiAgUHV0Q29tcG9uZW50T3BlcmF0aW9uLFxuICBQdXROZXR3b3JrQ29tcG9uZW50T3BlcmF0aW9uLFxuICBTeW5jQ29tcG9uZW50cyBhcyBfU3luY0NvbXBvbmVudHMsXG4gIE5ldHdvcmtFbnRpdHkgYXMgX05ldHdvcmtFbnRpdHksXG4gIElOZXRvd3JrRW50aXR5LFxuICBWaWRlb0V2ZW50LFxuICBBdWRpb0V2ZW50LFxuICBBdWRpb1NvdXJjZSxcbiAgRW5naW5lSW5mbyxcbiAgR2x0ZkNvbnRhaW5lckxvYWRpbmdTdGF0ZSxcbiAgUG9pbnRlckV2ZW50c1Jlc3VsdCxcbiAgUmF5Y2FzdFJlc3VsdCxcbiAgUmVhbG1JbmZvLFxuICBUd2VlblN0YXRlLFxuICBVaURyb3Bkb3duLFxuICBVaURyb3Bkb3duUmVzdWx0LFxuICBVaUlucHV0LFxuICBVaUlucHV0UmVzdWx0LFxuICBVaVRleHQsXG4gIFVpVHJhbnNmb3JtLFxuICBWaWRlb1BsYXllclxufSBmcm9tICdAZGNsL2VjcydcblxuZXhwb3J0IGNvbnN0IE5PVF9TWU5DX0NPTVBPTkVOVFMgPSBbXG4gIFZpZGVvRXZlbnQsXG4gIFZpZGVvUGxheWVyLFxuICBUd2VlblN0YXRlLFxuICBBdWRpb0V2ZW50LFxuICBBdWRpb1NvdXJjZSxcbiAgRW5naW5lSW5mbyxcbiAgR2x0ZkNvbnRhaW5lckxvYWRpbmdTdGF0ZSxcbiAgUG9pbnRlckV2ZW50c1Jlc3VsdCxcbiAgUmF5Y2FzdFJlc3VsdCxcbiAgUmVhbG1JbmZvLFxuICBVaURyb3Bkb3duLFxuICBVaURyb3Bkb3duUmVzdWx0LFxuICBVaUlucHV0LFxuICBVaUlucHV0UmVzdWx0LFxuICBVaVRyYW5zZm9ybSxcbiAgVWlUZXh0XG5dXG5cbmNvbnN0IE5PVF9TWU5DX0NPTVBPTkVOVFNfSURTID0gTk9UX1NZTkNfQ09NUE9ORU5UUy5tYXAoKCQpID0+ICQuY29tcG9uZW50SWQpXG5cbmV4cG9ydCBmdW5jdGlvbiBlbmdpbmVUb0NyZHQoZW5naW5lOiBJRW5naW5lKTogVWludDhBcnJheSB7XG4gIGNvbnN0IGNyZHRCdWZmZXIgPSBuZXcgUmVhZFdyaXRlQnl0ZUJ1ZmZlcigpXG4gIGNvbnN0IG5ldHdvcmtCdWZmZXIgPSBuZXcgUmVhZFdyaXRlQnl0ZUJ1ZmZlcigpXG4gIGNvbnN0IE5ldHdvcmtFbnRpdHkgPSBlbmdpbmUuZ2V0Q29tcG9uZW50KF9OZXR3b3JrRW50aXR5LmNvbXBvbmVudElkKSBhcyBJTmV0b3dya0VudGl0eVxuXG4gIGZvciAoY29uc3QgaXRDb21wb25lbnREZWZpbml0aW9uIG9mIGVuZ2luZS5jb21wb25lbnRzSXRlcigpKSB7XG4gICAgaWYgKE5PVF9TWU5DX0NPTVBPTkVOVFNfSURTLmluY2x1ZGVzKGl0Q29tcG9uZW50RGVmaW5pdGlvbi5jb21wb25lbnRJZCkpIHtcbiAgICAgIGNvbnRpbnVlXG4gICAgfVxuICAgIGl0Q29tcG9uZW50RGVmaW5pdGlvbi5kdW1wQ3JkdFN0YXRlVG9CdWZmZXIoY3JkdEJ1ZmZlciwgKGVudGl0eSkgPT4ge1xuICAgICAgY29uc3QgaXNOZXR3b3JrRW50aXR5ID0gTmV0d29ya0VudGl0eS5oYXMoZW50aXR5KVxuICAgICAgcmV0dXJuIGlzTmV0d29ya0VudGl0eVxuICAgIH0pXG4gIH1cblxuICBsZXQgaGVhZGVyOiBDcmR0TWVzc2FnZUhlYWRlciB8IG51bGxcbiAgd2hpbGUgKChoZWFkZXIgPSBDcmR0TWVzc2FnZVByb3RvY29sLmdldEhlYWRlcihjcmR0QnVmZmVyKSkpIHtcbiAgICBpZiAoaGVhZGVyLnR5cGUgPT09IENyZHRNZXNzYWdlVHlwZS5QVVRfQ09NUE9ORU5UKSB7XG4gICAgICBjb25zdCBtZXNzYWdlID0gUHV0Q29tcG9uZW50T3BlcmF0aW9uLnJlYWQoY3JkdEJ1ZmZlcikhXG4gICAgICBjb25zdCBuZXR3b3JrRW50aXR5ID0gTmV0d29ya0VudGl0eS5nZXRPck51bGwobWVzc2FnZS5lbnRpdHlJZClcbiAgICAgIGlmIChuZXR3b3JrRW50aXR5KSB7XG4gICAgICAgIFB1dE5ldHdvcmtDb21wb25lbnRPcGVyYXRpb24ud3JpdGUoXG4gICAgICAgICAgbmV0d29ya0VudGl0eS5lbnRpdHlJZCxcbiAgICAgICAgICBtZXNzYWdlLnRpbWVzdGFtcCxcbiAgICAgICAgICBtZXNzYWdlLmNvbXBvbmVudElkLFxuICAgICAgICAgIG5ldHdvcmtFbnRpdHkubmV0d29ya0lkLFxuICAgICAgICAgIG1lc3NhZ2UuZGF0YSxcbiAgICAgICAgICBuZXR3b3JrQnVmZmVyXG4gICAgICAgIClcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIFB1dENvbXBvbmVudE9wZXJhdGlvbi53cml0ZShcbiAgICAgICAgICBtZXNzYWdlLmVudGl0eUlkLFxuICAgICAgICAgIG1lc3NhZ2UudGltZXN0YW1wLFxuICAgICAgICAgIG1lc3NhZ2UuY29tcG9uZW50SWQsXG4gICAgICAgICAgbWVzc2FnZS5kYXRhLFxuICAgICAgICAgIG5ldHdvcmtCdWZmZXJcbiAgICAgICAgKVxuICAgICAgfVxuICAgIH0gZWxzZSB7XG4gICAgICBjcmR0QnVmZmVyLmluY3JlbWVudFJlYWRPZmZzZXQoaGVhZGVyLmxlbmd0aClcbiAgICB9XG4gIH1cblxuICByZXR1cm4gbmV0d29ya0J1ZmZlci50b0JpbmFyeSgpXG59XG4iXX0=
|
package/network/utils.d.ts
CHANGED
@@ -1,33 +1,4 @@
|
|
1
1
|
/// <reference types="@dcl/js-runtime" />
|
2
|
-
import { Entity, IEngine } from '@dcl/ecs';
|
3
2
|
import type { GetUserDataRequest, GetUserDataResponse } from '~system/UserIdentity';
|
4
|
-
import { SyncEntity } from './entities';
|
5
3
|
import { IProfile } from './message-bus-sync';
|
6
|
-
export declare const definePlayersInScene: (engine: IEngine) => import("@dcl/ecs").MapComponentDefinition<import("@dcl/ecs").MapResult<{
|
7
|
-
timestamp: import("@dcl/ecs").ISchema<number>;
|
8
|
-
userId: import("@dcl/ecs").ISchema<string>;
|
9
|
-
}>>;
|
10
|
-
export declare let stateInitialized: boolean;
|
11
|
-
export declare let playerSceneEntity: Entity;
|
12
|
-
export declare function setInitialized(): void;
|
13
|
-
export declare let INITIAL_CRDT_RENDERER_MESSAGES_SENT: boolean;
|
14
4
|
export declare function fetchProfile(myProfile: IProfile, getUserData: (value: GetUserDataRequest) => Promise<GetUserDataResponse>): void;
|
15
|
-
/**
|
16
|
-
* Add's the user information about when he joined the scene.
|
17
|
-
* It's used to check who is the oldest one, to sync the state
|
18
|
-
*/
|
19
|
-
export declare function createPlayerTimestampData(engine: IEngine, profile: IProfile, syncEntity: SyncEntity): Entity | undefined;
|
20
|
-
/**
|
21
|
-
* Check if I'm the older user to send the initial state
|
22
|
-
*/
|
23
|
-
export declare function oldestUser(engine: IEngine, profile: IProfile, syncEntity: SyncEntity): boolean;
|
24
|
-
/**
|
25
|
-
* Ignore CRDT's initial messages from the renderer.
|
26
|
-
*/
|
27
|
-
export declare function syncTransportIsReady(engine: IEngine): boolean;
|
28
|
-
/**
|
29
|
-
* Check if we are already initialized
|
30
|
-
* Add the playerSceneData component and syncronize it till we receive the state.
|
31
|
-
* This fn should be added as a system so it runs on every tick
|
32
|
-
*/
|
33
|
-
export declare function stateInitializedChecker(engine: IEngine, _profile: IProfile, _syncEntity: SyncEntity): void;
|
package/network/utils.js
CHANGED
@@ -1,21 +1,4 @@
|
|
1
|
-
import { EngineInfo as _EngineInfo, Schemas } from '@dcl/ecs';
|
2
1
|
import { componentNumberFromName } from '@dcl/ecs/dist/components/component-number';
|
3
|
-
// Component to track all the players and when they enter to the scene.
|
4
|
-
// Know who is in charge of sending the initial state (oldest one)
|
5
|
-
export const definePlayersInScene = (engine) => engine.defineComponent('players-scene', {
|
6
|
-
timestamp: Schemas.Number,
|
7
|
-
userId: Schemas.String
|
8
|
-
});
|
9
|
-
// Already initialized my state. Ignore new states messages.
|
10
|
-
export let stateInitialized = false;
|
11
|
-
// My player entity to check if I'm the oldest player in the scend
|
12
|
-
export let playerSceneEntity;
|
13
|
-
export function setInitialized() {
|
14
|
-
stateInitialized = true;
|
15
|
-
}
|
16
|
-
// Flag to avoid sending over the wire all the initial messages that the engine add's to the rendererTransport
|
17
|
-
// INITIAL_CRDT_MESSAGES that are being processed on the onStart loop, before the onUpdate.
|
18
|
-
export let INITIAL_CRDT_RENDERER_MESSAGES_SENT = false;
|
19
2
|
// Retrieve userId to start sending this info as the networkId
|
20
3
|
export function fetchProfile(myProfile, getUserData) {
|
21
4
|
void getUserData({}).then(({ data }) => {
|
@@ -30,88 +13,4 @@ export function fetchProfile(myProfile, getUserData) {
|
|
30
13
|
}
|
31
14
|
});
|
32
15
|
}
|
33
|
-
|
34
|
-
* Add's the user information about when he joined the scene.
|
35
|
-
* It's used to check who is the oldest one, to sync the state
|
36
|
-
*/
|
37
|
-
export function createPlayerTimestampData(engine, profile, syncEntity) {
|
38
|
-
if (!profile?.userId)
|
39
|
-
return undefined;
|
40
|
-
const PlayersInScene = definePlayersInScene(engine);
|
41
|
-
const entity = engine.addEntity();
|
42
|
-
PlayersInScene.create(entity, { timestamp: Date.now(), userId: profile.userId });
|
43
|
-
syncEntity(entity, [PlayersInScene.componentId]);
|
44
|
-
playerSceneEntity = entity;
|
45
|
-
return playerSceneEntity;
|
46
|
-
}
|
47
|
-
/**
|
48
|
-
* Check if I'm the older user to send the initial state
|
49
|
-
*/
|
50
|
-
export function oldestUser(engine, profile, syncEntity) {
|
51
|
-
const PlayersInScene = definePlayersInScene(engine);
|
52
|
-
// When the user leaves the scene but it's still connected.
|
53
|
-
if (!PlayersInScene.has(playerSceneEntity)) {
|
54
|
-
createPlayerTimestampData(engine, profile, syncEntity);
|
55
|
-
return oldestUser(engine, profile, syncEntity);
|
56
|
-
}
|
57
|
-
const { timestamp } = PlayersInScene.get(playerSceneEntity);
|
58
|
-
for (const [_, player] of engine.getEntitiesWith(PlayersInScene)) {
|
59
|
-
if (player.timestamp < timestamp)
|
60
|
-
return false;
|
61
|
-
}
|
62
|
-
return true;
|
63
|
-
}
|
64
|
-
/**
|
65
|
-
* Ignore CRDT's initial messages from the renderer.
|
66
|
-
*/
|
67
|
-
export function syncTransportIsReady(engine) {
|
68
|
-
const EngineInfo = engine.getComponent(_EngineInfo.componentId);
|
69
|
-
if (!INITIAL_CRDT_RENDERER_MESSAGES_SENT) {
|
70
|
-
const engineInfo = EngineInfo.getOrNull(engine.RootEntity);
|
71
|
-
if (engineInfo && engineInfo.tickNumber > 1) {
|
72
|
-
INITIAL_CRDT_RENDERER_MESSAGES_SENT = true;
|
73
|
-
}
|
74
|
-
}
|
75
|
-
return INITIAL_CRDT_RENDERER_MESSAGES_SENT;
|
76
|
-
}
|
77
|
-
/**
|
78
|
-
* Check if we are already initialized
|
79
|
-
* Add the playerSceneData component and syncronize it till we receive the state.
|
80
|
-
* This fn should be added as a system so it runs on every tick
|
81
|
-
*/
|
82
|
-
// TODO: Had to comment all the logic because getConnectedPlayers was not working as expected
|
83
|
-
// 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.
|
84
|
-
export function stateInitializedChecker(engine, _profile, _syncEntity) {
|
85
|
-
// const PlayersInScene = definePlayersInScene(engine)
|
86
|
-
const EngineInfo = engine.getComponent(_EngineInfo.componentId);
|
87
|
-
// const NetworkEntity = engine.getComponent(_NetworkEntity.componentId) as INetowrkEntity
|
88
|
-
async function enterScene() {
|
89
|
-
// if (!playerSceneEntity) {
|
90
|
-
// createPlayerTimestampData(engine, profile, syncEntity)
|
91
|
-
// }
|
92
|
-
/**
|
93
|
-
* Keeps PlayersInScene up-to-date with the current players.
|
94
|
-
*/
|
95
|
-
// const connectedPlayers = await getConnectedPlayers({})
|
96
|
-
// for (const [entity, player] of engine.getEntitiesWith(PlayersInScene)) {
|
97
|
-
// if (!connectedPlayers.players.find(($) => $.userId === player.userId)) {
|
98
|
-
// PlayersInScene.deleteFrom(entity)
|
99
|
-
// }
|
100
|
-
// }
|
101
|
-
// Wait for comms to be ready ?? ~3000ms
|
102
|
-
if ((EngineInfo.getOrNull(engine.RootEntity)?.tickNumber ?? 0) > 100) {
|
103
|
-
setInitialized();
|
104
|
-
return;
|
105
|
-
}
|
106
|
-
// If we already have data from players, dont send the heartbeat messages
|
107
|
-
// if (connectedPlayers.players.length) return
|
108
|
-
// if (!stateInitialized && playerSceneEntity) {
|
109
|
-
// // Send this data to all the players connected (new and old)
|
110
|
-
// // So everyone can decide if it's the oldest one or no.
|
111
|
-
// // It's for the case that multiple users enters ~ at the same time.
|
112
|
-
// PlayersInScene.getMutable(playerSceneEntity)
|
113
|
-
// }
|
114
|
-
}
|
115
|
-
void enterScene();
|
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 > 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"]}
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvbmV0d29yay91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQTtBQUtuRiw4REFBOEQ7QUFDOUQsTUFBTSxVQUFVLFlBQVksQ0FDMUIsU0FBbUIsRUFDbkIsV0FBd0U7SUFFeEUsS0FBSyxXQUFXLENBQUMsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFO1FBQ3JDLElBQUksSUFBSSxFQUFFLE1BQU0sRUFBRTtZQUNoQixNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFBO1lBQzFCLE1BQU0sU0FBUyxHQUFHLHVCQUF1QixDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQTtZQUN0RCxTQUFTLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQTtZQUMvQixTQUFTLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQTtTQUMxQjthQUFNO1lBQ0wsTUFBTSxJQUFJLEtBQUssQ0FBQyw2QkFBNkIsQ0FBQyxDQUFBO1NBQy9DO0lBQ0gsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgRW5naW5lSW5mbyBhcyBfRW5naW5lSW5mbywgTmV0d29ya0VudGl0eSBhcyBfTmV0d29ya0VudGl0eSB9IGZyb20gJ0BkY2wvZWNzJ1xuaW1wb3J0IHsgY29tcG9uZW50TnVtYmVyRnJvbU5hbWUgfSBmcm9tICdAZGNsL2Vjcy9kaXN0L2NvbXBvbmVudHMvY29tcG9uZW50LW51bWJlcidcblxuaW1wb3J0IHR5cGUgeyBHZXRVc2VyRGF0YVJlcXVlc3QsIEdldFVzZXJEYXRhUmVzcG9uc2UgfSBmcm9tICd+c3lzdGVtL1VzZXJJZGVudGl0eSdcbmltcG9ydCB7IElQcm9maWxlIH0gZnJvbSAnLi9tZXNzYWdlLWJ1cy1zeW5jJ1xuXG4vLyBSZXRyaWV2ZSB1c2VySWQgdG8gc3RhcnQgc2VuZGluZyB0aGlzIGluZm8gYXMgdGhlIG5ldHdvcmtJZFxuZXhwb3J0IGZ1bmN0aW9uIGZldGNoUHJvZmlsZShcbiAgbXlQcm9maWxlOiBJUHJvZmlsZSxcbiAgZ2V0VXNlckRhdGE6ICh2YWx1ZTogR2V0VXNlckRhdGFSZXF1ZXN0KSA9PiBQcm9taXNlPEdldFVzZXJEYXRhUmVzcG9uc2U+XG4pIHtcbiAgdm9pZCBnZXRVc2VyRGF0YSh7fSkudGhlbigoeyBkYXRhIH0pID0+IHtcbiAgICBpZiAoZGF0YT8udXNlcklkKSB7XG4gICAgICBjb25zdCB1c2VySWQgPSBkYXRhLnVzZXJJZFxuICAgICAgY29uc3QgbmV0d29ya0lkID0gY29tcG9uZW50TnVtYmVyRnJvbU5hbWUoZGF0YS51c2VySWQpXG4gICAgICBteVByb2ZpbGUubmV0d29ya0lkID0gbmV0d29ya0lkXG4gICAgICBteVByb2ZpbGUudXNlcklkID0gdXNlcklkXG4gICAgfSBlbHNlIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcihgQ291bGRuJ3QgZmV0Y2ggcHJvZmlsZSBkYXRhYClcbiAgICB9XG4gIH0pXG59XG4iXX0=
|
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-11020113946.commit-53f6ae5",
|
5
5
|
"author": "Decentraland",
|
6
6
|
"dependencies": {
|
7
|
-
"@dcl/ecs": "7.5.8-
|
7
|
+
"@dcl/ecs": "7.5.8-11020113946.commit-53f6ae5",
|
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-11020113946.commit-53f6ae5",
|
11
|
+
"@dcl/react-ecs": "7.5.8-11020113946.commit-53f6ae5",
|
12
|
+
"@dcl/sdk-commands": "7.5.8-11020113946.commit-53f6ae5",
|
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": "53f6ae5fc2241d00eb0b1e8251cf611e7e8f2efd"
|
39
39
|
}
|
package/players/index.d.ts
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
import { Entity, TransformType } from '@dcl/ecs';
|
1
|
+
import { Entity, IEngine, TransformType } from '@dcl/ecs';
|
2
2
|
import { PBAvatarBase, PBAvatarEquippedData } from '@dcl/ecs/dist/components';
|
3
3
|
type GetPlayerDataReq = {
|
4
4
|
userId: string;
|
@@ -13,6 +13,14 @@ type GetPlayerDataRes = {
|
|
13
13
|
emotes: PBAvatarEquippedData['emoteUrns'];
|
14
14
|
position: TransformType['position'] | undefined;
|
15
15
|
};
|
16
|
+
export declare function definePlayerHelper(engine: IEngine): {
|
17
|
+
onEnterScene(cb: (player: GetPlayerDataRes) => void): void;
|
18
|
+
onLeaveScene(cb: (userId: string) => void): void;
|
19
|
+
/**
|
20
|
+
* Returns the info of the player if it's in the scene.
|
21
|
+
*/
|
22
|
+
getPlayer(user?: GetPlayerDataReq): GetPlayerDataRes | null;
|
23
|
+
};
|
16
24
|
declare const players: {
|
17
25
|
onEnterScene(cb: (player: GetPlayerDataRes) => void): void;
|
18
26
|
onLeaveScene(cb: (userId: string) => void): void;
|
package/players/index.js
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
import { engine } from '@dcl/ecs';
|
2
2
|
import { PlayerIdentityData as definePlayerIdenityData, AvatarBase as defineAvatarBase, AvatarEquippedData as defineAvatarEquippedData, Transform as defineTransform } from '@dcl/ecs/dist/components';
|
3
|
-
function definePlayerHelper(engine) {
|
3
|
+
export function definePlayerHelper(engine) {
|
4
4
|
const Transform = defineTransform(engine);
|
5
5
|
const PlayerIdentityData = definePlayerIdenityData(engine);
|
6
6
|
const AvatarEquippedData = defineAvatarEquippedData(engine);
|
@@ -75,4 +75,4 @@ const players = definePlayerHelper(engine);
|
|
75
75
|
const { getPlayer, onEnterScene, onLeaveScene } = players;
|
76
76
|
export { getPlayer, onEnterScene, onLeaveScene };
|
77
77
|
export default players;
|
78
|
-
//# sourceMappingURL=data:application/json;base64,
|
78
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/players/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { Entity, IEngine, TransformType, engine } from '@dcl/ecs'\nimport {\n  PlayerIdentityData as definePlayerIdenityData,\n  AvatarBase as defineAvatarBase,\n  AvatarEquippedData as defineAvatarEquippedData,\n  PBAvatarBase,\n  PBAvatarEquippedData,\n  Transform as defineTransform\n} from '@dcl/ecs/dist/components'\n\ntype GetPlayerDataReq = {\n  userId: string\n}\ntype GetPlayerDataRes = {\n  entity: Entity\n  name: string\n  isGuest: boolean\n  userId: string\n  avatar?: PBAvatarBase\n  wearables: PBAvatarEquippedData['wearableUrns']\n  emotes: PBAvatarEquippedData['emoteUrns']\n  position: TransformType['position'] | undefined\n}\n\nexport function definePlayerHelper(engine: IEngine) {\n  const Transform = defineTransform(engine)\n  const PlayerIdentityData = definePlayerIdenityData(engine)\n  const AvatarEquippedData = defineAvatarEquippedData(engine)\n  const AvatarBase = defineAvatarBase(engine)\n  const playerEntities = new Map<Entity, string>()\n\n  const onEnterSceneCb: ((player: GetPlayerDataRes) => void)[] = []\n  const onLeaveSceneCb: ((userId: string) => void)[] = []\n\n  engine.addSystem(() => {\n    const players = Array.from(engine.getEntitiesWith(PlayerIdentityData, AvatarBase))\n    if (players.length === playerEntities.size) return\n\n    for (const [entity, identity] of players) {\n      if (!playerEntities.has(entity)) {\n        playerEntities.set(entity, identity.address)\n\n        // Call onEnter callback\n        if (onEnterSceneCb.length) {\n          onEnterSceneCb.forEach((cb) => cb(getPlayer({ userId: identity.address })!))\n        }\n\n        // Check for changes/remove callbacks\n        AvatarBase.onChange(entity, (value) => {\n          if (!value && onLeaveSceneCb.length && playerEntities.get(entity)) {\n            onLeaveSceneCb.forEach((cb) => cb(playerEntities.get(entity)!))\n            playerEntities.delete(entity)\n          }\n        })\n      }\n    }\n  })\n\n  return {\n    onEnterScene(cb: (player: GetPlayerDataRes) => void) {\n      onEnterSceneCb.push(cb)\n    },\n    onLeaveScene(cb: (userId: string) => void) {\n      onLeaveSceneCb.push(cb)\n    },\n    /**\n     * Returns the info of the player if it's in the scene.\n     */\n    getPlayer(user?: GetPlayerDataReq): GetPlayerDataRes | null {\n      function getEntity() {\n        if (!user?.userId) return engine.PlayerEntity\n        for (const [entity, data] of engine.getEntitiesWith(PlayerIdentityData)) {\n          if (data.address === user.userId) {\n            return entity\n          }\n        }\n        return undefined\n      }\n\n      const userEntity = getEntity()\n      if (!userEntity) return null\n\n      const playerData = PlayerIdentityData.getOrNull(userEntity)\n      const avatarData = AvatarBase.getOrNull(userEntity)\n      const wearablesData = AvatarEquippedData.getOrNull(userEntity)\n\n      if (!playerData && !avatarData && !wearablesData) return null\n\n      return {\n        entity: userEntity,\n        name: avatarData?.name ?? '',\n        isGuest: !!playerData?.isGuest,\n        userId: playerData?.address ?? '',\n        avatar: avatarData ?? undefined,\n        wearables: wearablesData?.wearableUrns ?? [],\n        emotes: wearablesData?.emoteUrns ?? [],\n        position: Transform.getOrNull(userEntity)?.position\n      }\n    }\n  }\n}\n\nconst players = definePlayerHelper(engine)\nconst { getPlayer, onEnterScene, onLeaveScene } = players\n\nexport { getPlayer, onEnterScene, onLeaveScene }\nexport default players\n"]}
|
package/src/network/entities.ts
CHANGED
@@ -8,25 +8,10 @@ import {
|
|
8
8
|
SyncComponents as _SyncComponents,
|
9
9
|
INetowrkParent,
|
10
10
|
TransformComponent,
|
11
|
-
ISyncComponents
|
12
|
-
VideoEvent,
|
13
|
-
TweenState,
|
14
|
-
AudioEvent,
|
15
|
-
AudioSource,
|
16
|
-
EngineInfo,
|
17
|
-
GltfContainerLoadingState,
|
18
|
-
PointerEventsResult,
|
19
|
-
RaycastResult,
|
20
|
-
RealmInfo,
|
21
|
-
VideoPlayer,
|
22
|
-
UiDropdown,
|
23
|
-
UiDropdownResult,
|
24
|
-
UiInput,
|
25
|
-
UiInputResult,
|
26
|
-
UiText,
|
27
|
-
UiTransform
|
11
|
+
ISyncComponents
|
28
12
|
} from '@dcl/ecs'
|
29
13
|
import { IProfile } from './message-bus-sync'
|
14
|
+
import { NOT_SYNC_COMPONENTS } from './state'
|
30
15
|
|
31
16
|
export type SyncEntity = (entityId: Entity, componentIds: number[], entityEnumId?: number) => void
|
32
17
|
|
@@ -64,24 +49,6 @@ export function entityUtils(engine: IEngine, profile: IProfile) {
|
|
64
49
|
}
|
65
50
|
}
|
66
51
|
|
67
|
-
const NOT_SYNC_COMPONENTS = [
|
68
|
-
VideoEvent,
|
69
|
-
VideoPlayer,
|
70
|
-
TweenState,
|
71
|
-
AudioEvent,
|
72
|
-
AudioSource,
|
73
|
-
EngineInfo,
|
74
|
-
GltfContainerLoadingState,
|
75
|
-
PointerEventsResult,
|
76
|
-
RaycastResult,
|
77
|
-
RealmInfo,
|
78
|
-
UiDropdown,
|
79
|
-
UiDropdownResult,
|
80
|
-
UiInput,
|
81
|
-
UiInputResult,
|
82
|
-
UiTransform,
|
83
|
-
UiText
|
84
|
-
]
|
85
52
|
for (const component of NOT_SYNC_COMPONENTS) {
|
86
53
|
if (componentsIdsMutable.includes(component.componentId)) {
|
87
54
|
console.log(`⚠️ ${component.componentName} can't be sync through the network!`)
|
@@ -1,20 +1,14 @@
|
|
1
|
-
import { IEngine, Transport } from '@dcl/ecs'
|
2
|
-
import type
|
1
|
+
import { IEngine, Transport, RealmInfo } from '@dcl/ecs'
|
2
|
+
import { type SendBinaryRequest, type SendBinaryResponse } from '~system/CommunicationsController'
|
3
3
|
|
4
4
|
import { syncFilter } from './filter'
|
5
5
|
import { engineToCrdt } from './state'
|
6
|
-
import { BinaryMessageBus, CommsMessage } from './binary-message-bus'
|
7
|
-
import {
|
8
|
-
definePlayersInScene,
|
9
|
-
fetchProfile,
|
10
|
-
oldestUser as _oldestUser,
|
11
|
-
setInitialized,
|
12
|
-
stateInitialized,
|
13
|
-
stateInitializedChecker
|
14
|
-
} from './utils'
|
6
|
+
import { BinaryMessageBus, CommsMessage, decodeString, encodeString } from './binary-message-bus'
|
7
|
+
import { fetchProfile } from './utils'
|
15
8
|
import { entityUtils } from './entities'
|
16
9
|
import { GetUserDataRequest, GetUserDataResponse } from '~system/UserIdentity'
|
17
|
-
|
10
|
+
import { definePlayerHelper } from '../players'
|
11
|
+
import { serializeCrdtMessages } from '../internal/transports/logger'
|
18
12
|
|
19
13
|
export type IProfile = { networkId: number; userId: string }
|
20
14
|
// user that we asked for the inital crdt state
|
@@ -23,7 +17,6 @@ export function addSyncTransport(
|
|
23
17
|
sendBinary: (msg: SendBinaryRequest) => Promise<SendBinaryResponse>,
|
24
18
|
getUserData: (value: GetUserDataRequest) => Promise<GetUserDataResponse>
|
25
19
|
) {
|
26
|
-
definePlayersInScene(engine)
|
27
20
|
// Profile Info
|
28
21
|
const myProfile: IProfile = {} as IProfile
|
29
22
|
fetchProfile(myProfile!, getUserData)
|
@@ -34,6 +27,7 @@ export function addSyncTransport(
|
|
34
27
|
// List of MessageBuss messsages to be sent on every frame to comms
|
35
28
|
const pendingMessageBusMessagesToSend: Uint8Array[] = []
|
36
29
|
const binaryMessageBus = BinaryMessageBus((message) => pendingMessageBusMessagesToSend.push(message))
|
30
|
+
|
37
31
|
function getMessagesToSend() {
|
38
32
|
const messages = [...pendingMessageBusMessagesToSend]
|
39
33
|
pendingMessageBusMessagesToSend.length = 0
|
@@ -57,33 +51,51 @@ export function addSyncTransport(
|
|
57
51
|
engine.addTransport(transport)
|
58
52
|
// End add sync transport
|
59
53
|
|
60
|
-
// Add state intialized checker
|
61
|
-
engine.addSystem(() => stateInitializedChecker(engine, myProfile, entityDefinitions.syncEntity))
|
62
|
-
|
63
|
-
// Request initial state
|
64
|
-
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, new Uint8Array())
|
65
|
-
|
66
54
|
// If we dont have any state initialized, and recieve a state message.
|
67
55
|
binaryMessageBus.on(CommsMessage.RES_CRDT_STATE, (value) => {
|
68
|
-
|
69
|
-
|
70
|
-
|
56
|
+
const { sender, data } = decodeCRDTState(value)
|
57
|
+
if (sender !== myProfile.userId) return
|
58
|
+
console.log('[Processing CRDT State]', data.byteLength)
|
59
|
+
transport.onmessage!(data)
|
60
|
+
})
|
61
|
+
|
62
|
+
binaryMessageBus.on(CommsMessage.REQ_CRDT_STATE, (_, userId) => {
|
63
|
+
binaryMessageBus.emit(CommsMessage.RES_CRDT_STATE, encodeCRDTState(userId, engineToCrdt(engine)))
|
64
|
+
})
|
65
|
+
|
66
|
+
const players = definePlayerHelper(engine)
|
67
|
+
|
68
|
+
let requestCrdtStateWhenConnected = false
|
69
|
+
|
70
|
+
players.onEnterScene((player) => {
|
71
|
+
if (player.userId === myProfile.userId && !requestCrdtStateWhenConnected) {
|
72
|
+
if (RealmInfo.getOrNull(engine.RootEntity)?.isConnectedSceneRoom) {
|
73
|
+
console.log('Requesting state')
|
74
|
+
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, new Uint8Array())
|
75
|
+
} else {
|
76
|
+
console.log('Waiting to be conneted')
|
77
|
+
requestCrdtStateWhenConnected = true
|
78
|
+
}
|
71
79
|
}
|
72
80
|
})
|
73
81
|
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
82
|
+
RealmInfo.onChange(engine.RootEntity, (value) => {
|
83
|
+
if (value?.isConnectedSceneRoom && requestCrdtStateWhenConnected) {
|
84
|
+
console.log('Requesting state.')
|
85
|
+
requestCrdtStateWhenConnected = false
|
86
|
+
binaryMessageBus.emit(CommsMessage.REQ_CRDT_STATE, new Uint8Array())
|
87
|
+
}
|
88
|
+
})
|
89
|
+
|
90
|
+
players.onLeaveScene((userId) => {
|
91
|
+
if (userId === myProfile.userId) {
|
92
|
+
requestCrdtStateWhenConnected = false
|
81
93
|
}
|
82
94
|
})
|
83
95
|
|
84
96
|
// Process CRDT messages here
|
85
97
|
binaryMessageBus.on(CommsMessage.CRDT, (value) => {
|
86
|
-
|
98
|
+
console.log(Array.from(serializeCrdtMessages('[NetworkMessage]', value, engine)))
|
87
99
|
transport.onmessage!(value)
|
88
100
|
})
|
89
101
|
|
@@ -92,3 +104,36 @@ export function addSyncTransport(
|
|
92
104
|
myProfile
|
93
105
|
}
|
94
106
|
}
|
107
|
+
|
108
|
+
/**
|
109
|
+
* Messages Protocol Encoding
|
110
|
+
*
|
111
|
+
* CRDT: Plain Uint8Array
|
112
|
+
*
|
113
|
+
* CRDT_STATE_RES { sender: string, data: Uint8Array}
|
114
|
+
*/
|
115
|
+
function decodeCRDTState(data: Uint8Array) {
|
116
|
+
let offset = 0
|
117
|
+
const r = new Uint8Array(data)
|
118
|
+
const view = new DataView(r.buffer)
|
119
|
+
const senderLength = view.getUint8(offset)
|
120
|
+
offset += 1
|
121
|
+
const sender = decodeString(data.subarray(1, senderLength + 1))
|
122
|
+
offset += senderLength
|
123
|
+
const state = r.subarray(offset)
|
124
|
+
|
125
|
+
return { sender, data: state }
|
126
|
+
}
|
127
|
+
|
128
|
+
function encodeCRDTState(address: string, data: Uint8Array) {
|
129
|
+
// address to uint8array
|
130
|
+
const addressBuffer = encodeString(address)
|
131
|
+
const addressOffset = 1
|
132
|
+
const messageLength = addressOffset + addressBuffer.byteLength + data.byteLength
|
133
|
+
|
134
|
+
const serializedMessage = new Uint8Array(messageLength)
|
135
|
+
serializedMessage.set(new Uint8Array([addressBuffer.byteLength]), 0)
|
136
|
+
serializedMessage.set(addressBuffer, 1)
|
137
|
+
serializedMessage.set(data, addressBuffer.byteLength + 1)
|
138
|
+
return serializedMessage
|
139
|
+
}
|
package/src/network/state.ts
CHANGED
@@ -8,28 +8,58 @@ import {
|
|
8
8
|
PutNetworkComponentOperation,
|
9
9
|
SyncComponents as _SyncComponents,
|
10
10
|
NetworkEntity as _NetworkEntity,
|
11
|
-
|
12
|
-
|
11
|
+
INetowrkEntity,
|
12
|
+
VideoEvent,
|
13
|
+
AudioEvent,
|
14
|
+
AudioSource,
|
15
|
+
EngineInfo,
|
16
|
+
GltfContainerLoadingState,
|
17
|
+
PointerEventsResult,
|
18
|
+
RaycastResult,
|
19
|
+
RealmInfo,
|
20
|
+
TweenState,
|
21
|
+
UiDropdown,
|
22
|
+
UiDropdownResult,
|
23
|
+
UiInput,
|
24
|
+
UiInputResult,
|
25
|
+
UiText,
|
26
|
+
UiTransform,
|
27
|
+
VideoPlayer
|
13
28
|
} from '@dcl/ecs'
|
14
29
|
|
30
|
+
export const NOT_SYNC_COMPONENTS = [
|
31
|
+
VideoEvent,
|
32
|
+
VideoPlayer,
|
33
|
+
TweenState,
|
34
|
+
AudioEvent,
|
35
|
+
AudioSource,
|
36
|
+
EngineInfo,
|
37
|
+
GltfContainerLoadingState,
|
38
|
+
PointerEventsResult,
|
39
|
+
RaycastResult,
|
40
|
+
RealmInfo,
|
41
|
+
UiDropdown,
|
42
|
+
UiDropdownResult,
|
43
|
+
UiInput,
|
44
|
+
UiInputResult,
|
45
|
+
UiTransform,
|
46
|
+
UiText
|
47
|
+
]
|
48
|
+
|
49
|
+
const NOT_SYNC_COMPONENTS_IDS = NOT_SYNC_COMPONENTS.map(($) => $.componentId)
|
50
|
+
|
15
51
|
export function engineToCrdt(engine: IEngine): Uint8Array {
|
16
52
|
const crdtBuffer = new ReadWriteByteBuffer()
|
17
53
|
const networkBuffer = new ReadWriteByteBuffer()
|
18
|
-
const SyncComponents = engine.getComponent(_SyncComponents.componentId) as ISyncComponents
|
19
54
|
const NetworkEntity = engine.getComponent(_NetworkEntity.componentId) as INetowrkEntity
|
20
55
|
|
21
56
|
for (const itComponentDefinition of engine.componentsIter()) {
|
57
|
+
if (NOT_SYNC_COMPONENTS_IDS.includes(itComponentDefinition.componentId)) {
|
58
|
+
continue
|
59
|
+
}
|
22
60
|
itComponentDefinition.dumpCrdtStateToBuffer(crdtBuffer, (entity) => {
|
23
61
|
const isNetworkEntity = NetworkEntity.has(entity)
|
24
|
-
|
25
|
-
return false
|
26
|
-
}
|
27
|
-
const isDynamicEntity = NetworkEntity.get(entity).networkId
|
28
|
-
if (isDynamicEntity) {
|
29
|
-
return true
|
30
|
-
}
|
31
|
-
// For the static entities we only send the updates of the SyncComponents
|
32
|
-
return SyncComponents.get(entity).componentIds.includes(itComponentDefinition.componentId)
|
62
|
+
return isNetworkEntity
|
33
63
|
})
|
34
64
|
}
|
35
65
|
|
package/src/network/utils.ts
CHANGED
@@ -1,40 +1,9 @@
|
|
1
|
-
import {
|
2
|
-
EngineInfo as _EngineInfo,
|
3
|
-
Entity,
|
4
|
-
IEngine,
|
5
|
-
NetworkEntity as _NetworkEntity,
|
6
|
-
Schemas,
|
7
|
-
LastWriteWinElementSetComponentDefinition,
|
8
|
-
PBEngineInfo
|
9
|
-
} from '@dcl/ecs'
|
1
|
+
import { EngineInfo as _EngineInfo, NetworkEntity as _NetworkEntity } from '@dcl/ecs'
|
10
2
|
import { componentNumberFromName } from '@dcl/ecs/dist/components/component-number'
|
11
3
|
|
12
4
|
import type { GetUserDataRequest, GetUserDataResponse } from '~system/UserIdentity'
|
13
|
-
import { SyncEntity } from './entities'
|
14
5
|
import { IProfile } from './message-bus-sync'
|
15
6
|
|
16
|
-
// Component to track all the players and when they enter to the scene.
|
17
|
-
// Know who is in charge of sending the initial state (oldest one)
|
18
|
-
export const definePlayersInScene = (engine: IEngine) =>
|
19
|
-
engine.defineComponent('players-scene', {
|
20
|
-
timestamp: Schemas.Number,
|
21
|
-
userId: Schemas.String
|
22
|
-
})
|
23
|
-
|
24
|
-
// Already initialized my state. Ignore new states messages.
|
25
|
-
export let stateInitialized = false
|
26
|
-
|
27
|
-
// My player entity to check if I'm the oldest player in the scend
|
28
|
-
export let playerSceneEntity: Entity
|
29
|
-
|
30
|
-
export function setInitialized() {
|
31
|
-
stateInitialized = true
|
32
|
-
}
|
33
|
-
|
34
|
-
// Flag to avoid sending over the wire all the initial messages that the engine add's to the rendererTransport
|
35
|
-
// INITIAL_CRDT_MESSAGES that are being processed on the onStart loop, before the onUpdate.
|
36
|
-
export let INITIAL_CRDT_RENDERER_MESSAGES_SENT = false
|
37
|
-
|
38
7
|
// Retrieve userId to start sending this info as the networkId
|
39
8
|
export function fetchProfile(
|
40
9
|
myProfile: IProfile,
|
@@ -51,95 +20,3 @@ export function fetchProfile(
|
|
51
20
|
}
|
52
21
|
})
|
53
22
|
}
|
54
|
-
|
55
|
-
/**
|
56
|
-
* Add's the user information about when he joined the scene.
|
57
|
-
* It's used to check who is the oldest one, to sync the state
|
58
|
-
*/
|
59
|
-
export function createPlayerTimestampData(engine: IEngine, profile: IProfile, syncEntity: SyncEntity) {
|
60
|
-
if (!profile?.userId) return undefined
|
61
|
-
const PlayersInScene = definePlayersInScene(engine)
|
62
|
-
const entity = engine.addEntity()
|
63
|
-
PlayersInScene.create(entity, { timestamp: Date.now(), userId: profile.userId })
|
64
|
-
syncEntity(entity, [PlayersInScene.componentId])
|
65
|
-
playerSceneEntity = entity
|
66
|
-
return playerSceneEntity
|
67
|
-
}
|
68
|
-
|
69
|
-
/**
|
70
|
-
* Check if I'm the older user to send the initial state
|
71
|
-
*/
|
72
|
-
export function oldestUser(engine: IEngine, profile: IProfile, syncEntity: SyncEntity): boolean {
|
73
|
-
const PlayersInScene = definePlayersInScene(engine)
|
74
|
-
// When the user leaves the scene but it's still connected.
|
75
|
-
if (!PlayersInScene.has(playerSceneEntity)) {
|
76
|
-
createPlayerTimestampData(engine, profile, syncEntity)
|
77
|
-
return oldestUser(engine, profile, syncEntity)
|
78
|
-
}
|
79
|
-
const { timestamp } = PlayersInScene.get(playerSceneEntity)
|
80
|
-
for (const [_, player] of engine.getEntitiesWith(PlayersInScene)) {
|
81
|
-
if (player.timestamp < timestamp) return false
|
82
|
-
}
|
83
|
-
return true
|
84
|
-
}
|
85
|
-
|
86
|
-
/**
|
87
|
-
* Ignore CRDT's initial messages from the renderer.
|
88
|
-
*/
|
89
|
-
export function syncTransportIsReady(engine: IEngine) {
|
90
|
-
const EngineInfo = engine.getComponent(
|
91
|
-
_EngineInfo.componentId
|
92
|
-
) as LastWriteWinElementSetComponentDefinition<PBEngineInfo>
|
93
|
-
if (!INITIAL_CRDT_RENDERER_MESSAGES_SENT) {
|
94
|
-
const engineInfo = EngineInfo.getOrNull(engine.RootEntity)
|
95
|
-
if (engineInfo && engineInfo.tickNumber > 1) {
|
96
|
-
INITIAL_CRDT_RENDERER_MESSAGES_SENT = true
|
97
|
-
}
|
98
|
-
}
|
99
|
-
return INITIAL_CRDT_RENDERER_MESSAGES_SENT
|
100
|
-
}
|
101
|
-
|
102
|
-
/**
|
103
|
-
* Check if we are already initialized
|
104
|
-
* Add the playerSceneData component and syncronize it till we receive the state.
|
105
|
-
* This fn should be added as a system so it runs on every tick
|
106
|
-
*/
|
107
|
-
// TODO: Had to comment all the logic because getConnectedPlayers was not working as expected
|
108
|
-
// 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.
|
109
|
-
export function stateInitializedChecker(engine: IEngine, _profile: IProfile, _syncEntity: SyncEntity) {
|
110
|
-
// const PlayersInScene = definePlayersInScene(engine)
|
111
|
-
const EngineInfo = engine.getComponent(_EngineInfo.componentId) as typeof _EngineInfo
|
112
|
-
// const NetworkEntity = engine.getComponent(_NetworkEntity.componentId) as INetowrkEntity
|
113
|
-
async function enterScene() {
|
114
|
-
// if (!playerSceneEntity) {
|
115
|
-
// createPlayerTimestampData(engine, profile, syncEntity)
|
116
|
-
// }
|
117
|
-
|
118
|
-
/**
|
119
|
-
* Keeps PlayersInScene up-to-date with the current players.
|
120
|
-
*/
|
121
|
-
// const connectedPlayers = await getConnectedPlayers({})
|
122
|
-
// for (const [entity, player] of engine.getEntitiesWith(PlayersInScene)) {
|
123
|
-
// if (!connectedPlayers.players.find(($) => $.userId === player.userId)) {
|
124
|
-
// PlayersInScene.deleteFrom(entity)
|
125
|
-
// }
|
126
|
-
// }
|
127
|
-
|
128
|
-
// Wait for comms to be ready ?? ~3000ms
|
129
|
-
if ((EngineInfo.getOrNull(engine.RootEntity)?.tickNumber ?? 0) > 100) {
|
130
|
-
setInitialized()
|
131
|
-
return
|
132
|
-
}
|
133
|
-
|
134
|
-
// If we already have data from players, dont send the heartbeat messages
|
135
|
-
// if (connectedPlayers.players.length) return
|
136
|
-
|
137
|
-
// if (!stateInitialized && playerSceneEntity) {
|
138
|
-
// // Send this data to all the players connected (new and old)
|
139
|
-
// // So everyone can decide if it's the oldest one or no.
|
140
|
-
// // It's for the case that multiple users enters ~ at the same time.
|
141
|
-
// PlayersInScene.getMutable(playerSceneEntity)
|
142
|
-
// }
|
143
|
-
}
|
144
|
-
void enterScene()
|
145
|
-
}
|
package/src/players/index.ts
CHANGED
@@ -22,7 +22,7 @@ type GetPlayerDataRes = {
|
|
22
22
|
position: TransformType['position'] | undefined
|
23
23
|
}
|
24
24
|
|
25
|
-
function definePlayerHelper(engine: IEngine) {
|
25
|
+
export function definePlayerHelper(engine: IEngine) {
|
26
26
|
const Transform = defineTransform(engine)
|
27
27
|
const PlayerIdentityData = definePlayerIdenityData(engine)
|
28
28
|
const AvatarEquippedData = defineAvatarEquippedData(engine)
|
package/src/testing/runtime.ts
CHANGED
@@ -50,7 +50,7 @@ export function createTestRuntime(testingModule: TestingModule, engine: IEngine)
|
|
50
50
|
// continue to run until it reaches a yield point
|
51
51
|
function scheduleValue(value: any, env: RunnerEnvironment) {
|
52
52
|
if (value && typeof value === 'object' && typeof value.then === 'function') {
|
53
|
-
|
53
|
+
console.log('⏱️ yield promise')
|
54
54
|
// if the value is a promise, schedule it to be awaited after the current frame is finished
|
55
55
|
nextTickFuture.push(async () => {
|
56
56
|
try {
|
@@ -60,14 +60,14 @@ export function createTestRuntime(testingModule: TestingModule, engine: IEngine)
|
|
60
60
|
}
|
61
61
|
})
|
62
62
|
} else if (typeof value === 'function') {
|
63
|
-
|
63
|
+
console.log('⏱️ yield function')
|
64
64
|
// if the value is a function, schedule it to be called on the next frame
|
65
65
|
nextTickFuture.push(() => {
|
66
66
|
scheduleValue(value(), env)
|
67
67
|
})
|
68
68
|
return
|
69
69
|
} else if (typeof value === 'undefined' || value === null) {
|
70
|
-
|
70
|
+
console.log('⏱️ yield')
|
71
71
|
// if the value is undefined or null, continue processing the generator the next frame
|
72
72
|
nextTickFuture.push(() => {
|
73
73
|
consumeGenerator(env)
|
package/testing/runtime.js
CHANGED
@@ -33,7 +33,7 @@ export function createTestRuntime(testingModule, engine) {
|
|
33
33
|
// continue to run until it reaches a yield point
|
34
34
|
function scheduleValue(value, env) {
|
35
35
|
if (value && typeof value === 'object' && typeof value.then === 'function') {
|
36
|
-
|
36
|
+
console.log('⏱️ yield promise');
|
37
37
|
// if the value is a promise, schedule it to be awaited after the current frame is finished
|
38
38
|
nextTickFuture.push(async () => {
|
39
39
|
try {
|
@@ -45,7 +45,7 @@ export function createTestRuntime(testingModule, engine) {
|
|
45
45
|
});
|
46
46
|
}
|
47
47
|
else if (typeof value === 'function') {
|
48
|
-
|
48
|
+
console.log('⏱️ yield function');
|
49
49
|
// if the value is a function, schedule it to be called on the next frame
|
50
50
|
nextTickFuture.push(() => {
|
51
51
|
scheduleValue(value(), env);
|
@@ -53,7 +53,7 @@ export function createTestRuntime(testingModule, engine) {
|
|
53
53
|
return;
|
54
54
|
}
|
55
55
|
else if (typeof value === 'undefined' || value === null) {
|
56
|
-
|
56
|
+
console.log('⏱️ yield');
|
57
57
|
// if the value is undefined or null, continue processing the generator the next frame
|
58
58
|
nextTickFuture.push(() => {
|
59
59
|
consumeGenerator(env);
|
@@ -194,4 +194,4 @@ function globalFail(error) {
|
|
194
194
|
// for now, the failure is only writing to the console.error.
|
195
195
|
console.error(error);
|
196
196
|
}
|
197
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../src/testing/runtime.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * This module provides a createTestRuntime function that returns an object with a test function that can be used to define tests.\n */\n\nimport { IEngine, Transform } from '@dcl/ecs'\nimport { assertEquals } from './assert'\nimport type { TestingModule, TestFunction, TestHelpers } from './types'\n\n// This function creates a test runtime that can be used to define and run tests.\n// It takes a `TestingModule` instance (loaded from require('~system/Testing')) and an `IEngine` instance (from Decentraland's SDK).\n// It returns an object with a `test` function that can be used to define tests.\n/* @__PURE__ */\nexport function createTestRuntime(testingModule: TestingModule, engine: IEngine) {\n  type TestPlanEntry = { name: string; fn: TestFunction }\n  type RunnerEnvironment = {\n    resolve: () => void\n    reject: (error: any) => void\n    helpers: TestHelpers\n    generator: Generator\n  }\n\n  // this flag ensures no tests are added asynchronously\n  let runtimeFrozen = false\n\n  let currentFrameCounter = 0\n  let currentFrameTime = 0\n\n  // array to hold the scheduled tests\n  const scheduledTests: TestPlanEntry[] = []\n\n  // an array of promises that are resolved on the next frame (after the current frame is finished)\n  const nextTickFuture: Array<(dt: number) => void> = []\n\n  // this function returns a promise that resolves on the next frame\n  async function nextTick() {\n    return new Promise<number>((resolve) => {\n      nextTickFuture.push(resolve)\n    })\n  }\n\n  // add a system to the engine that resolves all promises in the `nextTickFuture` array\n  engine.addSystem(function TestingFrameworkCoroutineRunner(dt) {\n    currentFrameCounter++\n    currentFrameTime += dt\n    // resolve all nextTick futures.\n    nextTickFuture.splice(0, nextTickFuture.length).forEach((_) => _(dt))\n  })\n\n  // this function schedules a value to be processed on the next frame, the test runner will\n  // continue to run until it reaches a yield point\n  function scheduleValue(value: any, env: RunnerEnvironment) {\n    if (value && typeof value === 'object' && typeof value.then === 'function') {\n      // console.log('⏱️ yield promise')\n      // if the value is a promise, schedule it to be awaited after the current frame is finished\n      nextTickFuture.push(async () => {\n        try {\n          scheduleValue(await value, env)\n        } catch (err) {\n          env.reject(err)\n        }\n      })\n    } else if (typeof value === 'function') {\n      // console.log('⏱️ yield function')\n      // if the value is a function, schedule it to be called on the next frame\n      nextTickFuture.push(() => {\n        scheduleValue(value(), env)\n      })\n      return\n    } else if (typeof value === 'undefined' || value === null) {\n      // console.log('⏱️ yield')\n      // if the value is undefined or null, continue processing the generator the next frame\n      nextTickFuture.push(() => {\n        consumeGenerator(env)\n      })\n    } else throw new Error(`Unexpected value from test generator: ${value}`)\n  }\n\n  // this function processes a generator function by scheduling its values to be processed on the next frame\n  function consumeGenerator(env: RunnerEnvironment) {\n    try {\n      const ret = env.generator.next()\n      if (!ret.done) {\n        scheduleValue(ret.value, env)\n      } else {\n        env.resolve()\n      }\n    } catch (err) {\n      env.reject(err)\n    }\n  }\n\n  // this function schedules a test run on the next frame\n  function scheduleNextRun() {\n    if (scheduledTests.length) {\n      nextTickFuture.push(runTests)\n    }\n  }\n\n  // this function runs the scheduled tests\n  function runTests() {\n    if (scheduledTests.length) {\n      const entry = scheduledTests.shift()!\n      const initialFrame = currentFrameCounter\n      const startTime = currentFrameTime\n\n      let resolved = false\n\n      // this function should be called only once. it makes the current test pass\n      const resolve = () => {\n        if (resolved) throw new Error('resolved twice')\n        resolved = true\n\n        console.log(`🟢 Test passed ${entry.name}`)\n\n        testingModule\n          .logTestResult({\n            name: entry.name,\n            ok: true,\n            totalFrames: currentFrameCounter - initialFrame,\n            totalTime: currentFrameTime - startTime\n          })\n          .finally(scheduleNextRun)\n      }\n\n      const reject = (err: any) => {\n        if (resolved) throw new Error('resolved twice')\n        resolved = true\n\n        console.log(`🔴 Test failed ${entry.name}`)\n        console.error(err)\n\n        testingModule\n          .logTestResult({\n            name: entry.name,\n            ok: false,\n            error: err.toString(),\n            stack: err && typeof err === 'object' && err.stack,\n            totalFrames: currentFrameCounter - initialFrame,\n            totalTime: currentFrameTime - startTime\n          })\n          .finally(scheduleNextRun)\n      }\n\n      try {\n        console.log(`🧪 Running test ${entry.name}`)\n\n        const testHelpers: TestHelpers = {\n          async setCameraTransform(transform) {\n            await testingModule.setCameraTransform(transform)\n            await nextTick()\n\n            const TransformComponent = engine.getComponent(Transform.componentId) as typeof Transform\n            const actualTransform = TransformComponent.get(engine.CameraEntity)\n\n            assertEquals(actualTransform.position, transform.position, \"positions don't match\")\n            assertEquals(actualTransform.rotation, transform.rotation, \"rotations don't match\")\n          }\n        }\n\n        const returnValue = entry.fn(testHelpers)\n\n        if (returnValue && typeof returnValue === 'object') {\n          if (isGenerator(returnValue)) {\n            const env: RunnerEnvironment = {\n              generator: returnValue,\n              helpers: testHelpers,\n              resolve,\n              reject\n            }\n            consumeGenerator(env)\n          } else if (isPromise(returnValue)) {\n            returnValue.then(resolve).catch(reject)\n          } else {\n            throw new Error(`Unknown test result type: ${returnValue}`)\n          }\n        } else {\n          resolve()\n        }\n      } catch (err: any) {\n        reject(err)\n      }\n    }\n  }\n\n  // schedule the test runner start for the next frame\n  nextTickFuture.push(() => {\n    // once we run the next tick, the test runtime becomes frozen. that means no new\n    // test definitions are accepted\n    runtimeFrozen = true\n\n    if (!scheduledTests.length) return\n\n    // inform the test runner about the plans for this test run\n    testingModule.plan({ tests: scheduledTests }).then(scheduleNextRun).catch(globalFail)\n  })\n\n  // this is the function that is used to plan a test functionn\n  /* @__PURE__ */\n  function test(name: string, fn: TestFunction) {\n    if (runtimeFrozen) throw new Error(\"New tests can't be added at this stage.\")\n\n    if (scheduledTests.some(($) => $.name === name)) throw new Error(`Test with name ${name} already exists`)\n\n    scheduledTests.push({ fn, name })\n  }\n\n  return {\n    test\n  }\n}\n\nfunction isGenerator(t: any): t is Generator {\n  return t && typeof t === 'object' && typeof t[Symbol.iterator] === 'function'\n}\n\nfunction isPromise(t: any): t is Promise<unknown> {\n  return t && typeof t === 'object' && typeof t.then === 'function'\n}\n\nfunction globalFail(error: any) {\n  // for now, the failure is only writing to the console.error.\n  console.error(error)\n}\n"]}
|
197
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../src/testing/runtime.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * This module provides a createTestRuntime function that returns an object with a test function that can be used to define tests.\n */\n\nimport { IEngine, Transform } from '@dcl/ecs'\nimport { assertEquals } from './assert'\nimport type { TestingModule, TestFunction, TestHelpers } from './types'\n\n// This function creates a test runtime that can be used to define and run tests.\n// It takes a `TestingModule` instance (loaded from require('~system/Testing')) and an `IEngine` instance (from Decentraland's SDK).\n// It returns an object with a `test` function that can be used to define tests.\n/* @__PURE__ */\nexport function createTestRuntime(testingModule: TestingModule, engine: IEngine) {\n  type TestPlanEntry = { name: string; fn: TestFunction }\n  type RunnerEnvironment = {\n    resolve: () => void\n    reject: (error: any) => void\n    helpers: TestHelpers\n    generator: Generator\n  }\n\n  // this flag ensures no tests are added asynchronously\n  let runtimeFrozen = false\n\n  let currentFrameCounter = 0\n  let currentFrameTime = 0\n\n  // array to hold the scheduled tests\n  const scheduledTests: TestPlanEntry[] = []\n\n  // an array of promises that are resolved on the next frame (after the current frame is finished)\n  const nextTickFuture: Array<(dt: number) => void> = []\n\n  // this function returns a promise that resolves on the next frame\n  async function nextTick() {\n    return new Promise<number>((resolve) => {\n      nextTickFuture.push(resolve)\n    })\n  }\n\n  // add a system to the engine that resolves all promises in the `nextTickFuture` array\n  engine.addSystem(function TestingFrameworkCoroutineRunner(dt) {\n    currentFrameCounter++\n    currentFrameTime += dt\n    // resolve all nextTick futures.\n    nextTickFuture.splice(0, nextTickFuture.length).forEach((_) => _(dt))\n  })\n\n  // this function schedules a value to be processed on the next frame, the test runner will\n  // continue to run until it reaches a yield point\n  function scheduleValue(value: any, env: RunnerEnvironment) {\n    if (value && typeof value === 'object' && typeof value.then === 'function') {\n      console.log('⏱️ yield promise')\n      // if the value is a promise, schedule it to be awaited after the current frame is finished\n      nextTickFuture.push(async () => {\n        try {\n          scheduleValue(await value, env)\n        } catch (err) {\n          env.reject(err)\n        }\n      })\n    } else if (typeof value === 'function') {\n      console.log('⏱️ yield function')\n      // if the value is a function, schedule it to be called on the next frame\n      nextTickFuture.push(() => {\n        scheduleValue(value(), env)\n      })\n      return\n    } else if (typeof value === 'undefined' || value === null) {\n      console.log('⏱️ yield')\n      // if the value is undefined or null, continue processing the generator the next frame\n      nextTickFuture.push(() => {\n        consumeGenerator(env)\n      })\n    } else throw new Error(`Unexpected value from test generator: ${value}`)\n  }\n\n  // this function processes a generator function by scheduling its values to be processed on the next frame\n  function consumeGenerator(env: RunnerEnvironment) {\n    try {\n      const ret = env.generator.next()\n      if (!ret.done) {\n        scheduleValue(ret.value, env)\n      } else {\n        env.resolve()\n      }\n    } catch (err) {\n      env.reject(err)\n    }\n  }\n\n  // this function schedules a test run on the next frame\n  function scheduleNextRun() {\n    if (scheduledTests.length) {\n      nextTickFuture.push(runTests)\n    }\n  }\n\n  // this function runs the scheduled tests\n  function runTests() {\n    if (scheduledTests.length) {\n      const entry = scheduledTests.shift()!\n      const initialFrame = currentFrameCounter\n      const startTime = currentFrameTime\n\n      let resolved = false\n\n      // this function should be called only once. it makes the current test pass\n      const resolve = () => {\n        if (resolved) throw new Error('resolved twice')\n        resolved = true\n\n        console.log(`🟢 Test passed ${entry.name}`)\n\n        testingModule\n          .logTestResult({\n            name: entry.name,\n            ok: true,\n            totalFrames: currentFrameCounter - initialFrame,\n            totalTime: currentFrameTime - startTime\n          })\n          .finally(scheduleNextRun)\n      }\n\n      const reject = (err: any) => {\n        if (resolved) throw new Error('resolved twice')\n        resolved = true\n\n        console.log(`🔴 Test failed ${entry.name}`)\n        console.error(err)\n\n        testingModule\n          .logTestResult({\n            name: entry.name,\n            ok: false,\n            error: err.toString(),\n            stack: err && typeof err === 'object' && err.stack,\n            totalFrames: currentFrameCounter - initialFrame,\n            totalTime: currentFrameTime - startTime\n          })\n          .finally(scheduleNextRun)\n      }\n\n      try {\n        console.log(`🧪 Running test ${entry.name}`)\n\n        const testHelpers: TestHelpers = {\n          async setCameraTransform(transform) {\n            await testingModule.setCameraTransform(transform)\n            await nextTick()\n\n            const TransformComponent = engine.getComponent(Transform.componentId) as typeof Transform\n            const actualTransform = TransformComponent.get(engine.CameraEntity)\n\n            assertEquals(actualTransform.position, transform.position, \"positions don't match\")\n            assertEquals(actualTransform.rotation, transform.rotation, \"rotations don't match\")\n          }\n        }\n\n        const returnValue = entry.fn(testHelpers)\n\n        if (returnValue && typeof returnValue === 'object') {\n          if (isGenerator(returnValue)) {\n            const env: RunnerEnvironment = {\n              generator: returnValue,\n              helpers: testHelpers,\n              resolve,\n              reject\n            }\n            consumeGenerator(env)\n          } else if (isPromise(returnValue)) {\n            returnValue.then(resolve).catch(reject)\n          } else {\n            throw new Error(`Unknown test result type: ${returnValue}`)\n          }\n        } else {\n          resolve()\n        }\n      } catch (err: any) {\n        reject(err)\n      }\n    }\n  }\n\n  // schedule the test runner start for the next frame\n  nextTickFuture.push(() => {\n    // once we run the next tick, the test runtime becomes frozen. that means no new\n    // test definitions are accepted\n    runtimeFrozen = true\n\n    if (!scheduledTests.length) return\n\n    // inform the test runner about the plans for this test run\n    testingModule.plan({ tests: scheduledTests }).then(scheduleNextRun).catch(globalFail)\n  })\n\n  // this is the function that is used to plan a test functionn\n  /* @__PURE__ */\n  function test(name: string, fn: TestFunction) {\n    if (runtimeFrozen) throw new Error(\"New tests can't be added at this stage.\")\n\n    if (scheduledTests.some(($) => $.name === name)) throw new Error(`Test with name ${name} already exists`)\n\n    scheduledTests.push({ fn, name })\n  }\n\n  return {\n    test\n  }\n}\n\nfunction isGenerator(t: any): t is Generator {\n  return t && typeof t === 'object' && typeof t[Symbol.iterator] === 'function'\n}\n\nfunction isPromise(t: any): t is Promise<unknown> {\n  return t && typeof t === 'object' && typeof t.then === 'function'\n}\n\nfunction globalFail(error: any) {\n  // for now, the failure is only writing to the console.error.\n  console.error(error)\n}\n"]}
|