@dcl/sdk 7.14.1-19936146810.commit-178bdd0 → 7.14.1-20045215093.commit-89d4260
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 -3
- package/network/filter.js +4 -3
- package/network/state.d.ts +5 -2
- package/network/state.js +12 -2
- package/package.json +6 -6
- package/src/network/entities.ts +2 -2
- package/src/network/filter.ts +3 -3
- package/src/network/state.ts +20 -3
package/network/entities.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { NetworkEntity as _NetworkEntity, NetworkParent as _NetworkParent, Transform as _Transform, SyncComponents as _SyncComponents } from '@dcl/ecs';
|
|
2
|
-
import {
|
|
2
|
+
import { getDesyncedComponents } from './state';
|
|
3
3
|
export function entityUtils(engine, profile) {
|
|
4
4
|
const NetworkEntity = engine.getComponent(_NetworkEntity.componentId);
|
|
5
5
|
const NetworkParent = engine.getComponent(_NetworkParent.componentId);
|
|
@@ -29,7 +29,7 @@ export function entityUtils(engine, profile) {
|
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
|
-
for (const component of
|
|
32
|
+
for (const component of getDesyncedComponents(engine)) {
|
|
33
33
|
if (componentsIdsMutable.includes(component.componentId)) {
|
|
34
34
|
console.log(`⚠️ ${component.componentName} can't be sync through the network!`);
|
|
35
35
|
componentsIdsMutable = componentsIdsMutable.filter(($) => $ !== component.componentId);
|
|
@@ -110,4 +110,4 @@ export function entityUtils(engine, profile) {
|
|
|
110
110
|
getFirstChild
|
|
111
111
|
};
|
|
112
112
|
}
|
|
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"]}
|
|
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 { getDesyncedComponents } 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 getDesyncedComponents(engine)) {\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"]}
|
package/network/filter.js
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { EntityUtils, RESERVED_STATIC_ENTITIES, CrdtMessageType, SyncComponents as _SyncComponents, NetworkEntity as _NetworkEntity, NetworkParent as _NetworkParent } from '@dcl/ecs';
|
|
2
|
-
import {
|
|
2
|
+
import { shouldSyncComponent } from './state';
|
|
3
3
|
export function syncFilter(engine) {
|
|
4
4
|
const NetworkEntity = engine.getComponent(_NetworkEntity.componentId);
|
|
5
5
|
const SyncComponents = engine.getComponent(_SyncComponents.componentId);
|
|
6
6
|
return function (message) {
|
|
7
7
|
const componentId = message.componentId;
|
|
8
|
-
|
|
8
|
+
const component = componentId ? engine.getComponentOrNull(componentId) : null;
|
|
9
|
+
if (component && !shouldSyncComponent(component)) {
|
|
9
10
|
return false;
|
|
10
11
|
}
|
|
11
12
|
const [entityId] = EntityUtils.fromEntityId(message.entityId);
|
|
@@ -39,4 +40,4 @@ export function syncFilter(engine) {
|
|
|
39
40
|
return false;
|
|
40
41
|
};
|
|
41
42
|
}
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL25ldHdvcmsvZmlsdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFFTCxXQUFXLEVBQ1gsd0JBQXdCLEVBQ3hCLGVBQWUsRUFDZixjQUFjLElBQUksZUFBZSxFQUNqQyxhQUFhLElBQUksY0FBYyxFQUMvQixhQUFhLElBQUksY0FBYyxFQUVoQyxNQUFNLFVBQVUsQ0FBQTtBQUNqQixPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxTQUFTLENBQUE7QUFFN0MsTUFBTSxVQUFVLFVBQVUsQ0FBQyxNQUFlO0lBQ3hDLE1BQU0sYUFBYSxHQUFHLE1BQU0sQ0FBQyxZQUFZLENBQUMsY0FBYyxDQUFDLFdBQVcsQ0FBMEIsQ0FBQTtJQUM5RixNQUFNLGNBQWMsR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLGVBQWUsQ0FBQyxXQUFXLENBQTJCLENBQUE7SUFFakcsT0FBTyxVQUFVLE9BQWdEO1FBQy9ELE1BQU0sV0FBVyxHQUFJLE9BQWUsQ0FBQyxXQUFXLENBQUE7UUFDaEQsTUFBTSxTQUFTLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsa0JBQWtCLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQTtRQUM3RSxJQUFJLFNBQVMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLFNBQVMsQ0FBQyxFQUFFO1lBQ2hELE9BQU8sS0FBSyxDQUFBO1NBQ2I7UUFFRCxNQUFNLENBQUMsUUFBUSxDQUFDLEdBQUcsV0FBVyxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUE7UUFFN0QsMENBQTBDO1FBQzFDLElBQUksUUFBUSxHQUFHLHdCQUF3QixFQUFFO1lBQ3ZDLE9BQU8sS0FBSyxDQUFBO1NBQ2I7UUFFRCxNQUFNLE9BQU8sR0FBRyxhQUFhLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUN6RCwrQkFBK0I7UUFDL0IsSUFDRSxPQUFPLENBQUMsSUFBSSxLQUFLLGVBQWUsQ0FBQyxxQkFBcUI7WUFDdEQsQ0FBQyxPQUFPLElBQUksT0FBTyxDQUFDLElBQUksS0FBSyxlQUFlLENBQUMsYUFBYSxDQUFDLEVBQzNEO1lBQ0EsT0FBTyxJQUFJLENBQUE7U0FDWjtRQUVELE1BQU0sSUFBSSxHQUFHLGNBQWMsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFBO1FBQ3ZELElBQUksQ0FBQyxJQUFJO1lBQUUsT0FBTyxLQUFLLENBQUE7UUFFdkIsa0JBQWtCO1FBQ2xCLElBQUssT0FBZSxDQUFDLFNBQVMsSUFBSSxDQUFDLEVBQUU7WUFDbkMsT0FBTyxJQUFJLENBQUE7U0FDWjtRQUVELElBQUksV0FBVyxLQUFLLGFBQWEsQ0FBQyxXQUFXLEVBQUU7WUFDN0MsT0FBTyxLQUFLLENBQUE7U0FDYjtRQUVELHFGQUFxRjtRQUNyRixJQUFJLFdBQVcsS0FBSyxjQUFjLENBQUMsV0FBVyxJQUFJLFdBQVcsS0FBSyxjQUFjLENBQUMsV0FBVyxFQUFFO1lBQzVGLE9BQU8sSUFBSSxDQUFBO1NBQ1o7UUFFRCxJQUFJLFdBQVcsSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsRUFBRTtZQUMxRCxPQUFPLElBQUksQ0FBQTtTQUNaO1FBRUQsT0FBTyxLQUFLLENBQUE7SUFDZCxDQUFDLENBQUE7QUFDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgVHJhbnNwb3J0TWVzc2FnZSxcbiAgRW50aXR5VXRpbHMsXG4gIFJFU0VSVkVEX1NUQVRJQ19FTlRJVElFUyxcbiAgQ3JkdE1lc3NhZ2VUeXBlLFxuICBTeW5jQ29tcG9uZW50cyBhcyBfU3luY0NvbXBvbmVudHMsXG4gIE5ldHdvcmtFbnRpdHkgYXMgX05ldHdvcmtFbnRpdHksXG4gIE5ldHdvcmtQYXJlbnQgYXMgX05ldHdvcmtQYXJlbnQsXG4gIElFbmdpbmVcbn0gZnJvbSAnQGRjbC9lY3MnXG5pbXBvcnQgeyBzaG91bGRTeW5jQ29tcG9uZW50IH0gZnJvbSAnLi9zdGF0ZSdcblxuZXhwb3J0IGZ1bmN0aW9uIHN5bmNGaWx0ZXIoZW5naW5lOiBJRW5naW5lKSB7XG4gIGNvbnN0IE5ldHdvcmtFbnRpdHkgPSBlbmdpbmUuZ2V0Q29tcG9uZW50KF9OZXR3b3JrRW50aXR5LmNvbXBvbmVudElkKSBhcyB0eXBlb2YgX05ldHdvcmtFbnRpdHlcbiAgY29uc3QgU3luY0NvbXBvbmVudHMgPSBlbmdpbmUuZ2V0Q29tcG9uZW50KF9TeW5jQ29tcG9uZW50cy5jb21wb25lbnRJZCkgYXMgdHlwZW9mIF9TeW5jQ29tcG9uZW50c1xuXG4gIHJldHVybiBmdW5jdGlvbiAobWVzc2FnZTogT21pdDxUcmFuc3BvcnRNZXNzYWdlLCAnbWVzc2FnZUJ1ZmZlcic+KSB7XG4gICAgY29uc3QgY29tcG9uZW50SWQgPSAobWVzc2FnZSBhcyBhbnkpLmNvbXBvbmVudElkXG4gICAgY29uc3QgY29tcG9uZW50ID0gY29tcG9uZW50SWQgPyBlbmdpbmUuZ2V0Q29tcG9uZW50T3JOdWxsKGNvbXBvbmVudElkKSA6IG51bGxcbiAgICBpZiAoY29tcG9uZW50ICYmICFzaG91bGRTeW5jQ29tcG9uZW50KGNvbXBvbmVudCkpIHtcbiAgICAgIHJldHVybiBmYWxzZVxuICAgIH1cblxuICAgIGNvbnN0IFtlbnRpdHlJZF0gPSBFbnRpdHlVdGlscy5mcm9tRW50aXR5SWQobWVzc2FnZS5lbnRpdHlJZClcblxuICAgIC8vIGZpbHRlciBtZXNzYWdlcyBmcm9tIHJlc2VydmVkIGVudGl0aWVzLlxuICAgIGlmIChlbnRpdHlJZCA8IFJFU0VSVkVEX1NUQVRJQ19FTlRJVElFUykge1xuICAgICAgcmV0dXJuIGZhbHNlXG4gICAgfVxuXG4gICAgY29uc3QgbmV0d29yayA9IE5ldHdvcmtFbnRpdHkuZ2V0T3JOdWxsKG1lc3NhZ2UuZW50aXR5SWQpXG4gICAgLy8gRGVsZXRlIE5ldHdvcmsgRW50aXR5IEFsd2F5c1xuICAgIGlmIChcbiAgICAgIG1lc3NhZ2UudHlwZSA9PT0gQ3JkdE1lc3NhZ2VUeXBlLkRFTEVURV9FTlRJVFlfTkVUV09SSyB8fFxuICAgICAgKG5ldHdvcmsgJiYgbWVzc2FnZS50eXBlID09PSBDcmR0TWVzc2FnZVR5cGUuREVMRVRFX0VOVElUWSlcbiAgICApIHtcbiAgICAgIHJldHVybiB0cnVlXG4gICAgfVxuXG4gICAgY29uc3Qgc3luYyA9IFN5bmNDb21wb25lbnRzLmdldE9yTnVsbChtZXNzYWdlLmVudGl0eUlkKVxuICAgIGlmICghc3luYykgcmV0dXJuIGZhbHNlXG5cbiAgICAvLyBGaXJzdCBjb21wb25lbnRcbiAgICBpZiAoKG1lc3NhZ2UgYXMgYW55KS50aW1lc3RhbXAgPD0gMSkge1xuICAgICAgcmV0dXJuIHRydWVcbiAgICB9XG5cbiAgICBpZiAoY29tcG9uZW50SWQgPT09IE5ldHdvcmtFbnRpdHkuY29tcG9uZW50SWQpIHtcbiAgICAgIHJldHVybiBmYWxzZVxuICAgIH1cblxuICAgIC8vIElmIHRoZXJlIGlzIGEgY2hhbmdlIGluIHRoZSBuZXR3b3JrIHBhcmVudCBvciBzeW5jQ29tcG9uZW50cyB3ZSBzaG91bGQgYWx3YXlzIHN5bmNcbiAgICBpZiAoY29tcG9uZW50SWQgPT09IF9OZXR3b3JrUGFyZW50LmNvbXBvbmVudElkIHx8IGNvbXBvbmVudElkID09PSBTeW5jQ29tcG9uZW50cy5jb21wb25lbnRJZCkge1xuICAgICAgcmV0dXJuIHRydWVcbiAgICB9XG5cbiAgICBpZiAoY29tcG9uZW50SWQgJiYgc3luYy5jb21wb25lbnRJZHMuaW5jbHVkZXMoY29tcG9uZW50SWQpKSB7XG4gICAgICByZXR1cm4gdHJ1ZVxuICAgIH1cblxuICAgIHJldHVybiBmYWxzZVxuICB9XG59XG4iXX0=
|
package/network/state.d.ts
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
import { IEngine } from '@dcl/ecs';
|
|
2
|
-
export declare const NOT_SYNC_COMPONENTS:
|
|
1
|
+
import { IEngine, ComponentDefinition } from '@dcl/ecs';
|
|
2
|
+
export declare const NOT_SYNC_COMPONENTS: ComponentDefinition<unknown>[];
|
|
3
3
|
export declare const NOT_SYNC_COMPONENTS_IDS: number[];
|
|
4
|
+
export declare const NOT_SYNC_COMPONENTS_NAMES: string[];
|
|
5
|
+
export declare function shouldSyncComponent(component: ComponentDefinition<unknown>): boolean;
|
|
6
|
+
export declare function getDesyncedComponents(engine: IEngine): ComponentDefinition<unknown>[];
|
|
4
7
|
export declare function engineToCrdt(engine: IEngine): Uint8Array[];
|
package/network/state.js
CHANGED
|
@@ -18,13 +18,23 @@ export const NOT_SYNC_COMPONENTS = [
|
|
|
18
18
|
UiText
|
|
19
19
|
];
|
|
20
20
|
export const NOT_SYNC_COMPONENTS_IDS = NOT_SYNC_COMPONENTS.map(($) => $.componentId);
|
|
21
|
+
export const NOT_SYNC_COMPONENTS_NAMES = [
|
|
22
|
+
'asset-packs::Script' // ComponentName from: https://github.com/decentraland/asset-packs/blob/main/src/enums.ts
|
|
23
|
+
];
|
|
24
|
+
export function shouldSyncComponent(component) {
|
|
25
|
+
return !(NOT_SYNC_COMPONENTS_IDS.includes(component.componentId) ||
|
|
26
|
+
NOT_SYNC_COMPONENTS_NAMES.includes(component.componentName));
|
|
27
|
+
}
|
|
28
|
+
export function getDesyncedComponents(engine) {
|
|
29
|
+
return [...NOT_SYNC_COMPONENTS, ...NOT_SYNC_COMPONENTS_NAMES.map(($) => engine.getComponentOrNull($))].filter(Boolean);
|
|
30
|
+
}
|
|
21
31
|
export function engineToCrdt(engine) {
|
|
22
32
|
const crdtBuffer = new ReadWriteByteBuffer();
|
|
23
33
|
const networkBuffer = new ReadWriteByteBuffer();
|
|
24
34
|
const NetworkEntity = engine.getComponent(_NetworkEntity.componentId);
|
|
25
35
|
const chunks = [];
|
|
26
36
|
for (const itComponentDefinition of engine.componentsIter()) {
|
|
27
|
-
if (
|
|
37
|
+
if (!shouldSyncComponent(itComponentDefinition)) {
|
|
28
38
|
continue;
|
|
29
39
|
}
|
|
30
40
|
itComponentDefinition.dumpCrdtStateToBuffer(crdtBuffer, (entity) => {
|
|
@@ -67,4 +77,4 @@ export function engineToCrdt(engine) {
|
|
|
67
77
|
}
|
|
68
78
|
return chunks;
|
|
69
79
|
}
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"state.js","sourceRoot":"","sources":["../src/network/state.ts"],"names":[],"mappings":"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","sourcesContent":["import { ReadWriteByteBuffer } from '@dcl/ecs/dist/serialization/ByteBuffer'\nimport {\n  CrdtMessageHeader,\n  CrdtMessageProtocol,\n  CrdtMessageType,\n  IEngine,\n  PutComponentOperation,\n  PutNetworkComponentOperation,\n  SyncComponents as _SyncComponents,\n  NetworkEntity as _NetworkEntity,\n  INetowrkEntity,\n  VideoEvent,\n  AudioEvent,\n  EngineInfo,\n  GltfContainerLoadingState,\n  PointerEventsResult,\n  RaycastResult,\n  RealmInfo,\n  TweenState,\n  UiDropdown,\n  UiDropdownResult,\n  UiInput,\n  UiInputResult,\n  UiText,\n  UiTransform,\n  ComponentDefinition\n} from '@dcl/ecs'\nimport { LIVEKIT_MAX_SIZE } from '@dcl/ecs/dist/systems/crdt'\n\nexport const NOT_SYNC_COMPONENTS: ComponentDefinition<unknown>[] = [\n  VideoEvent,\n  TweenState,\n  AudioEvent,\n  EngineInfo,\n  GltfContainerLoadingState,\n  PointerEventsResult,\n  RaycastResult,\n  RealmInfo,\n  UiDropdown,\n  UiDropdownResult,\n  UiInput,\n  UiInputResult,\n  UiTransform,\n  UiText\n]\n\nexport const NOT_SYNC_COMPONENTS_IDS = NOT_SYNC_COMPONENTS.map(($) => $.componentId)\nexport const NOT_SYNC_COMPONENTS_NAMES: string[] = [\n  'asset-packs::Script' // ComponentName from: https://github.com/decentraland/asset-packs/blob/main/src/enums.ts\n]\n\nexport function shouldSyncComponent(component: ComponentDefinition<unknown>): boolean {\n  return !(\n    NOT_SYNC_COMPONENTS_IDS.includes(component.componentId) ||\n    NOT_SYNC_COMPONENTS_NAMES.includes(component.componentName)\n  )\n}\n\nexport function getDesyncedComponents(engine: IEngine): ComponentDefinition<unknown>[] {\n  return [...NOT_SYNC_COMPONENTS, ...NOT_SYNC_COMPONENTS_NAMES.map(($) => engine.getComponentOrNull($))].filter(\n    Boolean\n  ) as ComponentDefinition<unknown>[]\n}\n\nexport function engineToCrdt(engine: IEngine): Uint8Array[] {\n  const crdtBuffer = new ReadWriteByteBuffer()\n  const networkBuffer = new ReadWriteByteBuffer()\n  const NetworkEntity = engine.getComponent(_NetworkEntity.componentId) as INetowrkEntity\n  const chunks: Uint8Array[] = []\n\n  for (const itComponentDefinition of engine.componentsIter()) {\n    if (!shouldSyncComponent(itComponentDefinition)) {\n      continue\n    }\n    itComponentDefinition.dumpCrdtStateToBuffer(crdtBuffer, (entity) => {\n      const isNetworkEntity = NetworkEntity.has(entity)\n      return isNetworkEntity\n    })\n  }\n\n  let header: CrdtMessageHeader | null\n  while ((header = CrdtMessageProtocol.getHeader(crdtBuffer))) {\n    if (header.type === CrdtMessageType.PUT_COMPONENT) {\n      const message = PutComponentOperation.read(crdtBuffer)!\n      const networkEntity = NetworkEntity.getOrNull(message.entityId)\n\n      // Check if adding this message would exceed the size limit\n      const currentBufferSize = networkBuffer.toBinary().byteLength\n      const messageSize = message.data.byteLength\n\n      if ((currentBufferSize + messageSize) / 1024 > LIVEKIT_MAX_SIZE) {\n        // If the current buffer has content, save it as a chunk\n        if (currentBufferSize > 0) {\n          chunks.push(networkBuffer.toCopiedBinary())\n          networkBuffer.resetBuffer()\n        }\n\n        // If the message itself is larger than the limit, we need to handle it specially\n        // For now, we'll skip it to prevent infinite loops\n        if (messageSize / 1024 > LIVEKIT_MAX_SIZE) {\n          console.error(\n            `Message too large (${messageSize} bytes), skipping component ${message.componentId} for entity ${message.entityId}`\n          )\n          continue\n        }\n      }\n\n      if (networkEntity) {\n        PutNetworkComponentOperation.write(\n          networkEntity.entityId,\n          message.timestamp,\n          message.componentId,\n          networkEntity.networkId,\n          message.data,\n          networkBuffer\n        )\n      }\n    } else {\n      crdtBuffer.incrementReadOffset(header.length)\n    }\n  }\n\n  // Add any remaining data as the final chunk\n  if (networkBuffer.currentWriteOffset() > 0) {\n    chunks.push(networkBuffer.toBinary())\n  }\n\n  return chunks\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcl/sdk",
|
|
3
3
|
"description": "",
|
|
4
|
-
"version": "7.14.1-
|
|
4
|
+
"version": "7.14.1-20045215093.commit-89d4260",
|
|
5
5
|
"author": "Decentraland",
|
|
6
6
|
"dependencies": {
|
|
7
|
-
"@dcl/ecs": "7.14.1-
|
|
7
|
+
"@dcl/ecs": "7.14.1-20045215093.commit-89d4260",
|
|
8
8
|
"@dcl/ecs-math": "2.1.0",
|
|
9
9
|
"@dcl/explorer": "1.0.164509-20240802172549.commit-fb95b9b",
|
|
10
|
-
"@dcl/js-runtime": "7.14.1-
|
|
11
|
-
"@dcl/react-ecs": "7.14.1-
|
|
12
|
-
"@dcl/sdk-commands": "7.14.1-
|
|
10
|
+
"@dcl/js-runtime": "7.14.1-20045215093.commit-89d4260",
|
|
11
|
+
"@dcl/react-ecs": "7.14.1-20045215093.commit-89d4260",
|
|
12
|
+
"@dcl/sdk-commands": "7.14.1-20045215093.commit-89d4260",
|
|
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": "89d426007b332d3ae47c6d00f44138046533f854"
|
|
39
39
|
}
|
package/src/network/entities.ts
CHANGED
|
@@ -11,7 +11,7 @@ import {
|
|
|
11
11
|
ISyncComponents
|
|
12
12
|
} from '@dcl/ecs'
|
|
13
13
|
import { IProfile } from './message-bus-sync'
|
|
14
|
-
import {
|
|
14
|
+
import { getDesyncedComponents } from './state'
|
|
15
15
|
|
|
16
16
|
export type SyncEntity = (entityId: Entity, componentIds: number[], entityEnumId?: number) => void
|
|
17
17
|
|
|
@@ -49,7 +49,7 @@ export function entityUtils(engine: IEngine, profile: IProfile) {
|
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
|
|
52
|
-
for (const component of
|
|
52
|
+
for (const component of getDesyncedComponents(engine)) {
|
|
53
53
|
if (componentsIdsMutable.includes(component.componentId)) {
|
|
54
54
|
console.log(`⚠️ ${component.componentName} can't be sync through the network!`)
|
|
55
55
|
componentsIdsMutable = componentsIdsMutable.filter(($) => $ !== component.componentId)
|
package/src/network/filter.ts
CHANGED
|
@@ -8,7 +8,7 @@ import {
|
|
|
8
8
|
NetworkParent as _NetworkParent,
|
|
9
9
|
IEngine
|
|
10
10
|
} from '@dcl/ecs'
|
|
11
|
-
import {
|
|
11
|
+
import { shouldSyncComponent } from './state'
|
|
12
12
|
|
|
13
13
|
export function syncFilter(engine: IEngine) {
|
|
14
14
|
const NetworkEntity = engine.getComponent(_NetworkEntity.componentId) as typeof _NetworkEntity
|
|
@@ -16,8 +16,8 @@ export function syncFilter(engine: IEngine) {
|
|
|
16
16
|
|
|
17
17
|
return function (message: Omit<TransportMessage, 'messageBuffer'>) {
|
|
18
18
|
const componentId = (message as any).componentId
|
|
19
|
-
|
|
20
|
-
if (
|
|
19
|
+
const component = componentId ? engine.getComponentOrNull(componentId) : null
|
|
20
|
+
if (component && !shouldSyncComponent(component)) {
|
|
21
21
|
return false
|
|
22
22
|
}
|
|
23
23
|
|
package/src/network/state.ts
CHANGED
|
@@ -22,11 +22,12 @@ import {
|
|
|
22
22
|
UiInput,
|
|
23
23
|
UiInputResult,
|
|
24
24
|
UiText,
|
|
25
|
-
UiTransform
|
|
25
|
+
UiTransform,
|
|
26
|
+
ComponentDefinition
|
|
26
27
|
} from '@dcl/ecs'
|
|
27
28
|
import { LIVEKIT_MAX_SIZE } from '@dcl/ecs/dist/systems/crdt'
|
|
28
29
|
|
|
29
|
-
export const NOT_SYNC_COMPONENTS = [
|
|
30
|
+
export const NOT_SYNC_COMPONENTS: ComponentDefinition<unknown>[] = [
|
|
30
31
|
VideoEvent,
|
|
31
32
|
TweenState,
|
|
32
33
|
AudioEvent,
|
|
@@ -44,6 +45,22 @@ export const NOT_SYNC_COMPONENTS = [
|
|
|
44
45
|
]
|
|
45
46
|
|
|
46
47
|
export const NOT_SYNC_COMPONENTS_IDS = NOT_SYNC_COMPONENTS.map(($) => $.componentId)
|
|
48
|
+
export const NOT_SYNC_COMPONENTS_NAMES: string[] = [
|
|
49
|
+
'asset-packs::Script' // ComponentName from: https://github.com/decentraland/asset-packs/blob/main/src/enums.ts
|
|
50
|
+
]
|
|
51
|
+
|
|
52
|
+
export function shouldSyncComponent(component: ComponentDefinition<unknown>): boolean {
|
|
53
|
+
return !(
|
|
54
|
+
NOT_SYNC_COMPONENTS_IDS.includes(component.componentId) ||
|
|
55
|
+
NOT_SYNC_COMPONENTS_NAMES.includes(component.componentName)
|
|
56
|
+
)
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
export function getDesyncedComponents(engine: IEngine): ComponentDefinition<unknown>[] {
|
|
60
|
+
return [...NOT_SYNC_COMPONENTS, ...NOT_SYNC_COMPONENTS_NAMES.map(($) => engine.getComponentOrNull($))].filter(
|
|
61
|
+
Boolean
|
|
62
|
+
) as ComponentDefinition<unknown>[]
|
|
63
|
+
}
|
|
47
64
|
|
|
48
65
|
export function engineToCrdt(engine: IEngine): Uint8Array[] {
|
|
49
66
|
const crdtBuffer = new ReadWriteByteBuffer()
|
|
@@ -52,7 +69,7 @@ export function engineToCrdt(engine: IEngine): Uint8Array[] {
|
|
|
52
69
|
const chunks: Uint8Array[] = []
|
|
53
70
|
|
|
54
71
|
for (const itComponentDefinition of engine.componentsIter()) {
|
|
55
|
-
if (
|
|
72
|
+
if (!shouldSyncComponent(itComponentDefinition)) {
|
|
56
73
|
continue
|
|
57
74
|
}
|
|
58
75
|
itComponentDefinition.dumpCrdtStateToBuffer(crdtBuffer, (entity) => {
|