@dcl/ecs 7.22.4-24525731607.commit-cda77a9 → 7.22.5-24776890516.commit-b10e9ab

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.
Files changed (149) hide show
  1. package/dist/components/generated/component-names.gen.js +0 -3
  2. package/dist/components/generated/global.gen.d.ts +0 -6
  3. package/dist/components/generated/global.gen.js +0 -3
  4. package/dist/components/generated/index.gen.d.ts +0 -12
  5. package/dist/components/generated/index.gen.js +0 -15
  6. package/dist/components/generated/pb/decentraland/common/colors.gen.d.ts +0 -15
  7. package/dist/components/generated/pb/decentraland/common/colors.gen.js +0 -47
  8. package/dist/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.d.ts +0 -8
  9. package/dist/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.js +0 -9
  10. package/dist/components/generated/pb/decentraland/sdk/components/common/input_action.gen.d.ts +2 -12
  11. package/dist/components/generated/pb/decentraland/sdk/components/common/input_action.gen.js +0 -11
  12. package/dist/components/generated/pb/decentraland/sdk/components/pointer_events.gen.d.ts +1 -5
  13. package/dist/components/generated/pb/decentraland/sdk/components/pointer_events.gen.js +1 -20
  14. package/dist/components/generated/pb/decentraland/sdk/components/virtual_camera.gen.d.ts +0 -3
  15. package/dist/components/generated/pb/decentraland/sdk/components/virtual_camera.gen.js +1 -10
  16. package/dist/components/generated/types.gen.d.ts +0 -2
  17. package/dist/components/generated/types.gen.js +0 -3
  18. package/dist/components/index.d.ts +5 -6
  19. package/dist/components/index.js +5 -8
  20. package/dist/components/manual/CreatedBy.d.ts +9 -0
  21. package/dist/components/manual/CreatedBy.js +8 -0
  22. package/dist/components/manual/Transform.d.ts +9 -13
  23. package/dist/components/manual/Transform.js +3 -11
  24. package/dist/components/types.d.ts +1 -2
  25. package/dist/engine/component.d.ts +52 -1
  26. package/dist/engine/grow-only-value-set-component-definition.js +45 -2
  27. package/dist/engine/lww-element-set-component-definition.d.ts +5 -3
  28. package/dist/engine/lww-element-set-component-definition.js +70 -35
  29. package/dist/index.d.ts +2 -4
  30. package/dist/index.js +1 -4
  31. package/dist/runtime/helpers/index.d.ts +0 -1
  32. package/dist/runtime/helpers/index.js +0 -1
  33. package/dist/runtime/helpers/tree.d.ts +0 -6
  34. package/dist/runtime/helpers/tree.js +2 -2
  35. package/dist/runtime/initialization/index.d.ts +0 -7
  36. package/dist/runtime/initialization/index.js +0 -6
  37. package/dist/serialization/crdt/authoritativePutComponent.d.ts +15 -0
  38. package/dist/serialization/crdt/authoritativePutComponent.js +47 -0
  39. package/dist/serialization/crdt/index.d.ts +1 -0
  40. package/dist/serialization/crdt/index.js +1 -0
  41. package/dist/serialization/crdt/types.d.ts +25 -3
  42. package/dist/serialization/crdt/types.js +3 -1
  43. package/dist/systems/crdt/index.d.ts +0 -1
  44. package/dist/systems/crdt/index.js +55 -146
  45. package/dist/systems/events.d.ts +0 -65
  46. package/dist/systems/events.js +8 -70
  47. package/dist-cjs/components/generated/component-names.gen.js +0 -3
  48. package/dist-cjs/components/generated/global.gen.d.ts +0 -6
  49. package/dist-cjs/components/generated/global.gen.js +1 -5
  50. package/dist-cjs/components/generated/index.gen.d.ts +0 -12
  51. package/dist-cjs/components/generated/index.gen.js +2 -20
  52. package/dist-cjs/components/generated/pb/decentraland/common/colors.gen.d.ts +0 -15
  53. package/dist-cjs/components/generated/pb/decentraland/common/colors.gen.js +1 -48
  54. package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.d.ts +0 -8
  55. package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_shape.gen.js +1 -10
  56. package/dist-cjs/components/generated/pb/decentraland/sdk/components/common/input_action.gen.d.ts +2 -12
  57. package/dist-cjs/components/generated/pb/decentraland/sdk/components/common/input_action.gen.js +1 -12
  58. package/dist-cjs/components/generated/pb/decentraland/sdk/components/pointer_events.gen.d.ts +1 -5
  59. package/dist-cjs/components/generated/pb/decentraland/sdk/components/pointer_events.gen.js +1 -20
  60. package/dist-cjs/components/generated/pb/decentraland/sdk/components/virtual_camera.gen.d.ts +0 -3
  61. package/dist-cjs/components/generated/pb/decentraland/sdk/components/virtual_camera.gen.js +1 -10
  62. package/dist-cjs/components/generated/types.gen.d.ts +0 -2
  63. package/dist-cjs/components/generated/types.gen.js +0 -5
  64. package/dist-cjs/components/index.d.ts +5 -6
  65. package/dist-cjs/components/index.js +7 -11
  66. package/dist-cjs/components/manual/CreatedBy.d.ts +9 -0
  67. package/dist-cjs/components/manual/CreatedBy.js +10 -0
  68. package/dist-cjs/components/manual/Transform.d.ts +9 -13
  69. package/dist-cjs/components/manual/Transform.js +3 -34
  70. package/dist-cjs/components/types.d.ts +1 -2
  71. package/dist-cjs/engine/component.d.ts +52 -1
  72. package/dist-cjs/engine/grow-only-value-set-component-definition.js +44 -1
  73. package/dist-cjs/engine/lww-element-set-component-definition.d.ts +5 -3
  74. package/dist-cjs/engine/lww-element-set-component-definition.js +73 -36
  75. package/dist-cjs/index.d.ts +2 -4
  76. package/dist-cjs/index.js +2 -5
  77. package/dist-cjs/runtime/helpers/index.d.ts +0 -1
  78. package/dist-cjs/runtime/helpers/index.js +0 -1
  79. package/dist-cjs/runtime/helpers/tree.d.ts +0 -6
  80. package/dist-cjs/runtime/helpers/tree.js +2 -3
  81. package/dist-cjs/runtime/initialization/index.d.ts +0 -7
  82. package/dist-cjs/runtime/initialization/index.js +1 -7
  83. package/dist-cjs/serialization/crdt/authoritativePutComponent.d.ts +15 -0
  84. package/dist-cjs/serialization/crdt/authoritativePutComponent.js +50 -0
  85. package/dist-cjs/serialization/crdt/index.d.ts +1 -0
  86. package/dist-cjs/serialization/crdt/index.js +1 -0
  87. package/dist-cjs/serialization/crdt/types.d.ts +25 -3
  88. package/dist-cjs/serialization/crdt/types.js +3 -1
  89. package/dist-cjs/systems/crdt/index.d.ts +0 -1
  90. package/dist-cjs/systems/crdt/index.js +55 -169
  91. package/dist-cjs/systems/events.d.ts +0 -65
  92. package/dist-cjs/systems/events.js +8 -70
  93. package/package.json +2 -3
  94. package/dist/components/extended/AudioAnalysis.d.ts +0 -55
  95. package/dist/components/extended/AudioAnalysis.js +0 -66
  96. package/dist/components/extended/ParticleSystem.d.ts +0 -24
  97. package/dist/components/extended/ParticleSystem.js +0 -23
  98. package/dist/components/generated/AudioAnalysis.gen.d.ts +0 -1
  99. package/dist/components/generated/AudioAnalysis.gen.js +0 -25
  100. package/dist/components/generated/AvatarLocomotionSettings.gen.d.ts +0 -1
  101. package/dist/components/generated/AvatarLocomotionSettings.gen.js +0 -25
  102. package/dist/components/generated/ParticleSystem.gen.d.ts +0 -1
  103. package/dist/components/generated/ParticleSystem.gen.js +0 -25
  104. package/dist/components/generated/pb/decentraland/common/floats.gen.d.ts +0 -16
  105. package/dist/components/generated/pb/decentraland/common/floats.gen.js +0 -50
  106. package/dist/components/generated/pb/decentraland/sdk/components/audio_analysis.gen.d.ts +0 -37
  107. package/dist/components/generated/pb/decentraland/sdk/components/audio_analysis.gen.js +0 -161
  108. package/dist/components/generated/pb/decentraland/sdk/components/avatar_locomotion_settings.gen.d.ts +0 -35
  109. package/dist/components/generated/pb/decentraland/sdk/components/avatar_locomotion_settings.gen.js +0 -123
  110. package/dist/components/generated/pb/decentraland/sdk/components/particle_system.gen.d.ts +0 -241
  111. package/dist/components/generated/pb/decentraland/sdk/components/particle_system.gen.js +0 -717
  112. package/dist/runtime/helpers/vectors.d.ts +0 -1
  113. package/dist/runtime/helpers/vectors.js +0 -36
  114. package/dist/serialization/crdt/network/utils.d.ts +0 -9
  115. package/dist/serialization/crdt/network/utils.js +0 -60
  116. package/dist/systems/physics-force.d.ts +0 -1
  117. package/dist/systems/physics-force.js +0 -140
  118. package/dist/systems/physics-impulse.d.ts +0 -12
  119. package/dist/systems/physics-impulse.js +0 -85
  120. package/dist/systems/physics.d.ts +0 -77
  121. package/dist/systems/physics.js +0 -18
  122. package/dist-cjs/components/extended/AudioAnalysis.d.ts +0 -55
  123. package/dist-cjs/components/extended/AudioAnalysis.js +0 -70
  124. package/dist-cjs/components/extended/ParticleSystem.d.ts +0 -24
  125. package/dist-cjs/components/extended/ParticleSystem.js +0 -28
  126. package/dist-cjs/components/generated/AudioAnalysis.gen.d.ts +0 -1
  127. package/dist-cjs/components/generated/AudioAnalysis.gen.js +0 -28
  128. package/dist-cjs/components/generated/AvatarLocomotionSettings.gen.d.ts +0 -1
  129. package/dist-cjs/components/generated/AvatarLocomotionSettings.gen.js +0 -28
  130. package/dist-cjs/components/generated/ParticleSystem.gen.d.ts +0 -1
  131. package/dist-cjs/components/generated/ParticleSystem.gen.js +0 -28
  132. package/dist-cjs/components/generated/pb/decentraland/common/floats.gen.d.ts +0 -16
  133. package/dist-cjs/components/generated/pb/decentraland/common/floats.gen.js +0 -56
  134. package/dist-cjs/components/generated/pb/decentraland/sdk/components/audio_analysis.gen.d.ts +0 -37
  135. package/dist-cjs/components/generated/pb/decentraland/sdk/components/audio_analysis.gen.js +0 -167
  136. package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_locomotion_settings.gen.d.ts +0 -35
  137. package/dist-cjs/components/generated/pb/decentraland/sdk/components/avatar_locomotion_settings.gen.js +0 -129
  138. package/dist-cjs/components/generated/pb/decentraland/sdk/components/particle_system.gen.d.ts +0 -241
  139. package/dist-cjs/components/generated/pb/decentraland/sdk/components/particle_system.gen.js +0 -723
  140. package/dist-cjs/runtime/helpers/vectors.d.ts +0 -1
  141. package/dist-cjs/runtime/helpers/vectors.js +0 -39
  142. package/dist-cjs/serialization/crdt/network/utils.d.ts +0 -9
  143. package/dist-cjs/serialization/crdt/network/utils.js +0 -67
  144. package/dist-cjs/systems/physics-force.d.ts +0 -1
  145. package/dist-cjs/systems/physics-force.js +0 -167
  146. package/dist-cjs/systems/physics-impulse.d.ts +0 -12
  147. package/dist-cjs/systems/physics-impulse.js +0 -112
  148. package/dist-cjs/systems/physics.d.ts +0 -77
  149. package/dist-cjs/systems/physics.js +0 -23
@@ -2,12 +2,6 @@ import { Entity } from '../../engine/entity';
2
2
  import { ComponentDefinition, IEngine } from '../../engine';
3
3
  import { Vector3Type } from '../../schemas/custom/Vector3';
4
4
  import { QuaternionType } from '../../schemas/custom/Quaternion';
5
- /**
6
- * @public
7
- * Rotate a vector by a quaternion
8
- * Uses the formula: v' = q * v * q^(-1), optimized version
9
- */
10
- export declare function rotateVectorByQuaternion(v: Vector3Type, q: QuaternionType): Vector3Type;
11
5
  /**
12
6
  * Get an iterator of entities that follow a tree structure for a component
13
7
  * @public
@@ -35,11 +35,11 @@ function multiplyQuaternions(q1, q2) {
35
35
  };
36
36
  }
37
37
  /**
38
- * @public
38
+ * @internal
39
39
  * Rotate a vector by a quaternion
40
40
  * Uses the formula: v' = q * v * q^(-1), optimized version
41
41
  */
42
- export function rotateVectorByQuaternion(v, q) {
42
+ function rotateVectorByQuaternion(v, q) {
43
43
  // Extract quaternion components
44
44
  const qx = q.x, qy = q.y, qz = q.z, qw = q.w;
45
45
  // Calculate cross product terms (q.xyz × v) * 2
@@ -12,7 +12,6 @@ import { AssetLoadLoadingStateSystem } from '../../systems/assetLoad';
12
12
  import { TweenSystem } from '../../systems/tween';
13
13
  import { TriggerAreaEventsSystem } from '../../systems/triggerArea';
14
14
  import { createTimers, Timers } from '../helpers/timers';
15
- import { PhysicsSystem } from '../../systems/physics';
16
15
  /**
17
16
  * @public
18
17
  * The engine is the part of the scene that sits in the middle and manages all of the other parts.
@@ -78,12 +77,6 @@ export { TriggerAreaEventsSystem };
78
77
  */
79
78
  export declare const timers: Timers;
80
79
  export { Timers, createTimers };
81
- /**
82
- * @public
83
- * Physics helpers for applying impulses and forces to the player.
84
- */
85
- export declare const Physics: PhysicsSystem;
86
- export { PhysicsSystem };
87
80
  /**
88
81
  * @public
89
82
  * Runs an async function
@@ -14,7 +14,6 @@ import { pointerEventColliderChecker } from '../../systems/pointer-event-collide
14
14
  import { createTriggerAreaEventsSystem } from '../../systems/triggerArea';
15
15
  import { createTimers } from '../helpers/timers';
16
16
  import { setGlobalPolyfill } from '../globals';
17
- import { createPhysicsSystem } from '../../systems/physics';
18
17
  /**
19
18
  * @public
20
19
  * The engine is the part of the scene that sits in the middle and manages all of the other parts.
@@ -78,11 +77,6 @@ setGlobalPolyfill('setTimeout', timers.setTimeout);
78
77
  setGlobalPolyfill('clearTimeout', timers.clearTimeout);
79
78
  setGlobalPolyfill('setInterval', timers.setInterval);
80
79
  setGlobalPolyfill('clearInterval', timers.clearInterval);
81
- /**
82
- * @public
83
- * Physics helpers for applying impulses and forces to the player.
84
- */
85
- export const Physics = /* @__PURE__ */ createPhysicsSystem(engine);
86
80
  /**
87
81
  * Adds pointer event collider system only in DEV env
88
82
  */
@@ -0,0 +1,15 @@
1
+ import { Entity } from '../../engine/entity';
2
+ import { ByteBuffer } from '../ByteBuffer';
3
+ import { AuthoritativePutComponentMessage } from './types';
4
+ /**
5
+ * @public
6
+ */
7
+ export declare namespace AuthoritativePutComponentOperation {
8
+ const MESSAGE_HEADER_LENGTH = 16;
9
+ /**
10
+ * Call this function for an optimal writing data passing the ByteBuffer
11
+ * already allocated
12
+ */
13
+ function write(entity: Entity, timestamp: number, componentId: number, data: Uint8Array, buf: ByteBuffer): void;
14
+ function read(buf: ByteBuffer): AuthoritativePutComponentMessage | null;
15
+ }
@@ -0,0 +1,47 @@
1
+ import { CrdtMessageProtocol } from './crdtMessageProtocol';
2
+ import { CrdtMessageType, CRDT_MESSAGE_HEADER_LENGTH } from './types';
3
+ /**
4
+ * @public
5
+ */
6
+ export var AuthoritativePutComponentOperation;
7
+ (function (AuthoritativePutComponentOperation) {
8
+ AuthoritativePutComponentOperation.MESSAGE_HEADER_LENGTH = 16;
9
+ /**
10
+ * Call this function for an optimal writing data passing the ByteBuffer
11
+ * already allocated
12
+ */
13
+ function write(entity, timestamp, componentId, data, buf) {
14
+ // reserve the beginning
15
+ const startMessageOffset = buf.incrementWriteOffset(CRDT_MESSAGE_HEADER_LENGTH + AuthoritativePutComponentOperation.MESSAGE_HEADER_LENGTH);
16
+ // write body
17
+ buf.writeBuffer(data, false);
18
+ const messageLength = buf.currentWriteOffset() - startMessageOffset;
19
+ // Write CrdtMessage header
20
+ buf.setUint32(startMessageOffset, messageLength);
21
+ buf.setUint32(startMessageOffset + 4, CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT);
22
+ // Write ComponentOperation header
23
+ buf.setUint32(startMessageOffset + 8, entity);
24
+ buf.setUint32(startMessageOffset + 12, componentId);
25
+ buf.setUint32(startMessageOffset + 16, timestamp);
26
+ const newLocal = messageLength - AuthoritativePutComponentOperation.MESSAGE_HEADER_LENGTH - CRDT_MESSAGE_HEADER_LENGTH;
27
+ buf.setUint32(startMessageOffset + 20, newLocal);
28
+ }
29
+ AuthoritativePutComponentOperation.write = write;
30
+ function read(buf) {
31
+ const header = CrdtMessageProtocol.readHeader(buf);
32
+ if (!header) {
33
+ return null;
34
+ }
35
+ if (header.type !== CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT) {
36
+ throw new Error('AuthoritativePutComponentOperation tried to read another message type.');
37
+ }
38
+ return {
39
+ ...header,
40
+ entityId: buf.readUint32(),
41
+ componentId: buf.readUint32(),
42
+ timestamp: buf.readUint32(),
43
+ data: buf.readBuffer()
44
+ };
45
+ }
46
+ AuthoritativePutComponentOperation.read = read;
47
+ })(AuthoritativePutComponentOperation || (AuthoritativePutComponentOperation = {}));
@@ -7,3 +7,4 @@ export * from './network/deleteComponentNetwork';
7
7
  export * from './network/deleteEntityNetwork';
8
8
  export * from './types';
9
9
  export * from './crdtMessageProtocol';
10
+ export * from './authoritativePutComponent';
@@ -7,3 +7,4 @@ export * from './network/deleteComponentNetwork';
7
7
  export * from './network/deleteEntityNetwork';
8
8
  export * from './types';
9
9
  export * from './crdtMessageProtocol';
10
+ export * from './authoritativePutComponent';
@@ -11,7 +11,8 @@ export declare enum CrdtMessageType {
11
11
  PUT_COMPONENT_NETWORK = 5,
12
12
  DELETE_COMPONENT_NETWORK = 6,
13
13
  DELETE_ENTITY_NETWORK = 7,
14
- MAX_MESSAGE_TYPE = 8
14
+ AUTHORITATIVE_PUT_COMPONENT = 8,
15
+ MAX_MESSAGE_TYPE = 9
15
16
  }
16
17
  /**
17
18
  * Min length = 8 bytes
@@ -48,6 +49,23 @@ export type PutNetworkComponentMessageBody = Omit<PutComponentMessageBody, 'type
48
49
  type: CrdtMessageType.PUT_COMPONENT_NETWORK;
49
50
  networkId: number;
50
51
  };
52
+ /**
53
+ * Server authoritative message - identical to PutComponentMessageBody but with forced processing
54
+ * Min. length = header (8 bytes) + 16 bytes = 24 bytes
55
+ *
56
+ * @param entity - Uint32 number of the entity
57
+ * @param componentId - Uint32 number of id
58
+ * @param timestamp - Uint32 Lamport timestamp (server's authoritative timestamp)
59
+ * @param data - Uint8[] data of component => length(4 bytes) + block of bytes[0..length-1]
60
+ * @public
61
+ */
62
+ export type AuthoritativePutComponentMessageBody = {
63
+ type: CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT;
64
+ entityId: Entity;
65
+ componentId: number;
66
+ timestamp: number;
67
+ data: Uint8Array;
68
+ };
51
69
  /**
52
70
  * Min. length = header (8 bytes) + 16 bytes = 24 bytes
53
71
  *
@@ -114,6 +132,10 @@ export type AppendValueMessage = CrdtMessageHeader & AppendValueMessageBody;
114
132
  * @public
115
133
  */
116
134
  export type PutComponentMessage = CrdtMessageHeader & PutComponentMessageBody;
135
+ /**
136
+ * @public
137
+ */
138
+ export type AuthoritativePutComponentMessage = CrdtMessageHeader & AuthoritativePutComponentMessageBody;
117
139
  /**
118
140
  * @public
119
141
  */
@@ -137,7 +159,7 @@ export type DeleteEntityNetworkMessage = CrdtMessageHeader & DeleteEntityNetwork
137
159
  /**
138
160
  * @public
139
161
  */
140
- export type CrdtMessage = PutComponentMessage | DeleteComponentMessage | AppendValueMessage | DeleteEntityMessage | PutNetworkComponentMessage | DeleteComponentNetworkMessage | DeleteEntityNetworkMessage;
162
+ export type CrdtMessage = PutComponentMessage | AuthoritativePutComponentMessage | DeleteComponentMessage | AppendValueMessage | DeleteEntityMessage | PutNetworkComponentMessage | DeleteComponentNetworkMessage | DeleteEntityNetworkMessage;
141
163
  /**
142
164
  * @public
143
165
  */
@@ -145,7 +167,7 @@ export type CrdtNetworkMessageBody = PutNetworkComponentMessageBody | DeleteComp
145
167
  /**
146
168
  * @public
147
169
  */
148
- export type CrdtMessageBody = PutComponentMessageBody | DeleteComponentMessageBody | DeleteEntityMessageBody | AppendValueMessageBody | CrdtNetworkMessageBody;
170
+ export type CrdtMessageBody = PutComponentMessageBody | AuthoritativePutComponentMessageBody | DeleteComponentMessageBody | DeleteEntityMessageBody | AppendValueMessageBody | CrdtNetworkMessageBody;
149
171
  export declare enum ProcessMessageResultType {
150
172
  /**
151
173
  * Typical message and new state set.
@@ -13,7 +13,9 @@ export var CrdtMessageType;
13
13
  CrdtMessageType[CrdtMessageType["PUT_COMPONENT_NETWORK"] = 5] = "PUT_COMPONENT_NETWORK";
14
14
  CrdtMessageType[CrdtMessageType["DELETE_COMPONENT_NETWORK"] = 6] = "DELETE_COMPONENT_NETWORK";
15
15
  CrdtMessageType[CrdtMessageType["DELETE_ENTITY_NETWORK"] = 7] = "DELETE_ENTITY_NETWORK";
16
- CrdtMessageType[CrdtMessageType["MAX_MESSAGE_TYPE"] = 8] = "MAX_MESSAGE_TYPE";
16
+ // Server authoritative operation - forces component state regardless of timestamp
17
+ CrdtMessageType[CrdtMessageType["AUTHORITATIVE_PUT_COMPONENT"] = 8] = "AUTHORITATIVE_PUT_COMPONENT";
18
+ CrdtMessageType[CrdtMessageType["MAX_MESSAGE_TYPE"] = 9] = "MAX_MESSAGE_TYPE";
17
19
  })(CrdtMessageType || (CrdtMessageType = {}));
18
20
  /**
19
21
  * @public
@@ -1,7 +1,6 @@
1
1
  import { Entity } from '../../engine/entity';
2
2
  import type { ComponentDefinition } from '../../engine';
3
3
  import { CrdtMessageType } from '../../serialization/crdt/types';
4
- export declare const LIVEKIT_MAX_SIZE = 12;
5
4
  /**
6
5
  * @public
7
6
  */
@@ -1,24 +1,17 @@
1
1
  import { EntityState } from '../../engine/entity';
2
2
  import { ReadWriteByteBuffer } from '../../serialization/ByteBuffer';
3
- import { AppendValueOperation, CrdtMessageProtocol, DeleteComponentNetwork, DeleteEntityNetwork } from '../../serialization/crdt';
3
+ import { AppendValueOperation, CrdtMessageProtocol } from '../../serialization/crdt';
4
4
  import { DeleteComponent } from '../../serialization/crdt/deleteComponent';
5
5
  import { DeleteEntity } from '../../serialization/crdt/deleteEntity';
6
6
  import { PutComponentOperation } from '../../serialization/crdt/putComponent';
7
+ import { AuthoritativePutComponentOperation } from '../../serialization/crdt/authoritativePutComponent';
7
8
  import { CrdtMessageType } from '../../serialization/crdt/types';
8
- import { PutNetworkComponentOperation } from '../../serialization/crdt/network/putComponentNetwork';
9
- import { NetworkEntity as defineNetworkEntity, NetworkParent as defineNetworkParent, Transform as defineTransform } from '../../components';
10
- import * as networkUtils from '../../serialization/crdt/network/utils';
11
- // NetworkMessages can only have a MAX_SIZE of 12kb. So we need to send it in chunks.
12
- export const LIVEKIT_MAX_SIZE = 12;
13
9
  /**
14
10
  * @internal
15
11
  */
16
12
  export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
17
13
  const transports = [];
18
- // Components that we used on this system
19
- const NetworkEntity = defineNetworkEntity(engine);
20
- const NetworkParent = defineNetworkParent(engine);
21
- const Transform = defineTransform(engine);
14
+ // No network components needed - pure CRDT processing only
22
15
  // Messages that we received at transport.onMessage waiting to be processed
23
16
  const receivedMessages = [];
24
17
  // Messages already processed by the engine but that we need to broadcast to other transports.
@@ -43,27 +36,20 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
43
36
  if (header.type === CrdtMessageType.DELETE_COMPONENT) {
44
37
  message = DeleteComponent.read(buffer);
45
38
  }
46
- else if (header.type === CrdtMessageType.DELETE_COMPONENT_NETWORK) {
47
- message = DeleteComponentNetwork.read(buffer);
48
- }
49
39
  else if (header.type === CrdtMessageType.PUT_COMPONENT) {
50
40
  message = PutComponentOperation.read(buffer);
51
41
  }
52
- else if (header.type === CrdtMessageType.PUT_COMPONENT_NETWORK) {
53
- message = PutNetworkComponentOperation.read(buffer);
42
+ else if (header.type === CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT) {
43
+ message = AuthoritativePutComponentOperation.read(buffer);
54
44
  }
55
45
  else if (header.type === CrdtMessageType.DELETE_ENTITY) {
56
46
  message = DeleteEntity.read(buffer);
57
47
  }
58
- else if (header.type === CrdtMessageType.DELETE_ENTITY_NETWORK) {
59
- message = DeleteEntityNetwork.read(buffer);
60
- }
61
48
  else if (header.type === CrdtMessageType.APPEND_VALUE) {
62
49
  message = AppendValueOperation.read(buffer);
63
- // Unknown message, we skip it
64
50
  }
65
51
  else {
66
- // consume the message
52
+ // Unknown message, we skip it (including NETWORK messages)
67
53
  buffer.incrementReadOffset(header.length);
68
54
  }
69
55
  if (message) {
@@ -84,22 +70,6 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
84
70
  const messagesToProcess = value.splice(0, value.length);
85
71
  return messagesToProcess;
86
72
  }
87
- /**
88
- * Find the local entityId associated to the network component message.
89
- * It's a mapping Network -> to Local
90
- * If it's not a network message, return the entityId received by the message
91
- */
92
- function findNetworkId(msg) {
93
- const hasNetworkId = 'networkId' in msg;
94
- if (hasNetworkId) {
95
- for (const [entityId, network] of engine.getEntitiesWith(NetworkEntity)) {
96
- if (network.networkId === msg.networkId && network.entityId === msg.entityId) {
97
- return { entityId, network };
98
- }
99
- }
100
- }
101
- return { entityId: msg.entityId };
102
- }
103
73
  /**
104
74
  * This fn will be called on every tick.
105
75
  * Process all the messages queue received by the transport
@@ -108,46 +78,52 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
108
78
  const messagesToProcess = getMessages(receivedMessages);
109
79
  const entitiesShouldBeCleaned = [];
110
80
  for (const msg of messagesToProcess) {
111
- let { entityId, network } = findNetworkId(msg);
112
- // We receive a new Entity. Create the localEntity and map it to the NetworkEntity component
113
- if (networkUtils.isNetworkMessage(msg) && !network) {
114
- entityId = engine.addEntity();
115
- network = { entityId: msg.entityId, networkId: msg.networkId };
116
- NetworkEntity.createOrReplace(entityId, network);
117
- }
118
- if (msg.type === CrdtMessageType.DELETE_ENTITY || msg.type === CrdtMessageType.DELETE_ENTITY_NETWORK) {
119
- entitiesShouldBeCleaned.push(entityId);
81
+ // Simple CRDT processing - no network logic
82
+ if (msg.type === CrdtMessageType.DELETE_ENTITY) {
83
+ entitiesShouldBeCleaned.push(msg.entityId);
120
84
  broadcastMessages.push(msg);
121
85
  }
122
86
  else {
123
- const entityState = engine.entityContainer.getEntityState(entityId);
124
- // Skip updates from removed entityes
87
+ const entityState = engine.entityContainer.getEntityState(msg.entityId);
88
+ // Skip updates from removed entities
125
89
  if (entityState === EntityState.Removed)
126
90
  continue;
127
- // Entities with unknown entities should update its entity state
91
+ // Entities with unknown state should update its entity state
128
92
  if (entityState === EntityState.Unknown) {
129
- engine.entityContainer.updateUsedEntity(entityId);
130
- }
131
- const component = engine.getComponentOrNull(msg.componentId);
132
- /* istanbul ignore else */
133
- if (component) {
134
- if (msg.type === CrdtMessageType.PUT_COMPONENT &&
135
- component.componentId === Transform.componentId &&
136
- NetworkEntity.has(entityId) &&
137
- NetworkParent.has(entityId)) {
138
- msg.data = networkUtils.fixTransformParent(msg);
93
+ engine.entityContainer.updateUsedEntity(msg.entityId);
94
+ }
95
+ // Only process component-related messages (not DELETE_ENTITY)
96
+ if ('componentId' in msg) {
97
+ const component = engine.getComponentOrNull(msg.componentId);
98
+ if (component) {
99
+ // Handle authoritative messages differently - they force the state regardless of timestamp
100
+ const tryUpdate = () => {
101
+ try {
102
+ return msg.type === CrdtMessageType.AUTHORITATIVE_PUT_COMPONENT
103
+ ? component.__forceUpdateFromCrdt(msg)
104
+ : component.updateFromCrdt(msg);
105
+ }
106
+ catch (e) {
107
+ console.error('[receiveMessages] ERROR processing message', msg, e);
108
+ return null;
109
+ }
110
+ };
111
+ const result = tryUpdate();
112
+ if (!result)
113
+ continue;
114
+ const [conflictMessage, value] = result;
115
+ if (!conflictMessage) {
116
+ // Add message to broadcast queue when no conflict
117
+ broadcastMessages.push(msg);
118
+ onProcessEntityComponentChange && onProcessEntityComponentChange(msg.entityId, msg.type, component, value);
119
+ }
139
120
  }
140
- const [conflictMessage, value] = component.updateFromCrdt({ ...msg, entityId });
141
- if (!conflictMessage) {
142
- // Add message to transport queue to be processed by others transports
121
+ else {
122
+ // Component not found - still broadcast for editor compatibility
123
+ /* istanbul ignore next */
143
124
  broadcastMessages.push(msg);
144
- onProcessEntityComponentChange && onProcessEntityComponentChange(entityId, msg.type, component, value);
145
125
  }
146
126
  }
147
- else {
148
- // TODO: test this line, it is fundammental to make the editor work
149
- broadcastMessages.push(msg);
150
- }
151
127
  }
152
128
  }
153
129
  // the last stage of the syncrhonization is to delete the entities
@@ -161,16 +137,17 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
161
137
  }
162
138
  }
163
139
  /**
164
- * Iterates the dirty map and generates crdt messages to be send
140
+ * Simple CRDT message broadcasting - no network-specific logic
165
141
  */
166
142
  async function sendMessages(entitiesDeletedThisTick) {
167
- // CRDT Messages will be the merge between the recieved transport messages and the new crdt messages
143
+ // Get messages from broadcast queue and component updates
168
144
  const crdtMessages = getMessages(broadcastMessages);
169
145
  const buffer = new ReadWriteByteBuffer();
146
+ // Generate CRDT messages from component updates
170
147
  for (const component of engine.componentsIter()) {
171
148
  for (const message of component.getCrdtUpdates()) {
172
149
  const offset = buffer.currentWriteOffset();
173
- // Avoid creating messages if there is no transport that will handle it
150
+ // Only create messages if there's a transport that will handle it
174
151
  if (transports.some((t) => t.filter(message))) {
175
152
  if (message.type === CrdtMessageType.PUT_COMPONENT) {
176
153
  PutComponentOperation.write(message.entityId, message.timestamp, message.componentId, message.data, buffer);
@@ -194,7 +171,7 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
194
171
  }
195
172
  }
196
173
  }
197
- // After all updates, I execute the DeletedEntity messages
174
+ // Handle deleted entities
198
175
  for (const entityId of entitiesDeletedThisTick) {
199
176
  const offset = buffer.currentWriteOffset();
200
177
  DeleteEntity.write(entityId, buffer);
@@ -205,87 +182,19 @@ export function crdtSceneSystem(engine, onProcessEntityComponentChange) {
205
182
  });
206
183
  onProcessEntityComponentChange && onProcessEntityComponentChange(entityId, CrdtMessageType.DELETE_ENTITY);
207
184
  }
208
- // Send CRDT messages to transports
209
- const transportBuffer = new ReadWriteByteBuffer();
210
- for (const index in transports) {
211
- const __NetworkMessagesBuffer = [];
212
- const transportIndex = Number(index);
213
- const transport = transports[transportIndex];
214
- const isRendererTransport = transport.type === 'renderer';
215
- const isNetworkTransport = transport.type === 'network';
216
- // Reset Buffer for each Transport
217
- transportBuffer.resetBuffer();
218
- const buffer = new ReadWriteByteBuffer();
219
- // Then we send all the new crdtMessages that the transport needs to process
185
+ // Simple transport broadcasting - no network-specific transforms
186
+ for (const transport of transports) {
187
+ const transportBuffer = new ReadWriteByteBuffer();
220
188
  for (const message of crdtMessages) {
221
189
  // Avoid echo messages
222
- if (message.transportId === transportIndex)
190
+ if (message.transportId === transports.indexOf(transport))
223
191
  continue;
224
- // Redundant message for the transport
225
- if (!transport.filter(message))
226
- continue;
227
- // Check if adding this message would exceed the size limit
228
- const currentBufferSize = transportBuffer.toBinary().byteLength;
229
- const messageSize = message.messageBuffer.byteLength;
230
- if (isNetworkTransport && (currentBufferSize + messageSize) / 1024 > LIVEKIT_MAX_SIZE) {
231
- // If the current buffer has content, save it as a chunk
232
- if (currentBufferSize > 0) {
233
- __NetworkMessagesBuffer.push(transportBuffer.toCopiedBinary());
234
- transportBuffer.resetBuffer();
235
- }
236
- // If the message itself is larger than the limit, we need to handle it specially
237
- // For now, we'll skip it to prevent infinite loops
238
- if (messageSize / 1024 > LIVEKIT_MAX_SIZE) {
239
- console.error(`Message too large (${messageSize} bytes), skipping message for entity ${message.entityId}`);
240
- continue;
241
- }
192
+ // Check if transport wants this message
193
+ if (transport.filter(message)) {
194
+ transportBuffer.writeBuffer(message.messageBuffer, false);
242
195
  }
243
- const { entityId } = findNetworkId(message);
244
- const transformNeedsFix = 'componentId' in message &&
245
- message.componentId === Transform.componentId &&
246
- Transform.has(entityId) &&
247
- NetworkParent.has(entityId) &&
248
- NetworkEntity.has(entityId);
249
- // If there was a LOCAL change in the transform. Add the parent to that transform
250
- if (isRendererTransport && message.type === CrdtMessageType.PUT_COMPONENT && transformNeedsFix) {
251
- const parent = findNetworkId(NetworkParent.get(entityId));
252
- const transformData = networkUtils.fixTransformParent(message, Transform.get(entityId), parent.entityId);
253
- const offset = buffer.currentWriteOffset();
254
- PutComponentOperation.write(entityId, message.timestamp, message.componentId, transformData, buffer);
255
- transportBuffer.writeBuffer(buffer.buffer().subarray(offset, buffer.currentWriteOffset()), false);
256
- continue;
257
- }
258
- if (isRendererTransport && networkUtils.isNetworkMessage(message)) {
259
- // If it's the renderer transport and its a NetworkMessage, we need to fix the entityId field and convert it to a known Message.
260
- // PUT_NETWORK_COMPONENT -> PUT_COMPONENT
261
- let transformData = 'data' in message ? message.data : new Uint8Array();
262
- if (transformNeedsFix) {
263
- const parent = findNetworkId(NetworkParent.get(entityId));
264
- transformData = networkUtils.fixTransformParent(message, Transform.get(entityId), parent.entityId);
265
- }
266
- networkUtils.networkMessageToLocal({ ...message, data: transformData }, entityId, buffer, transportBuffer);
267
- // Iterate the next message
268
- continue;
269
- }
270
- // If its a network transport and its a PUT_COMPONENT that has a NetworkEntity component, we need to send this message
271
- // through comms with the EntityID and NetworkID from ther NetworkEntity so everyone can recieve this message and map to their custom entityID.
272
- if (isNetworkTransport && !networkUtils.isNetworkMessage(message)) {
273
- const networkData = NetworkEntity.getOrNull(message.entityId);
274
- // If it has networkData convert the message to PUT_NETWORK_COMPONENT.
275
- if (networkData) {
276
- networkUtils.localMessageToNetwork(message, networkData, buffer, transportBuffer);
277
- // Iterate the next message
278
- continue;
279
- }
280
- }
281
- // Common message
282
- transportBuffer.writeBuffer(message.messageBuffer, false);
283
- }
284
- if (isNetworkTransport && transportBuffer.currentWriteOffset()) {
285
- __NetworkMessagesBuffer.push(transportBuffer.toBinary());
286
196
  }
287
- const message = isNetworkTransport ? __NetworkMessagesBuffer : transportBuffer.toBinary();
288
- await transport.send(message);
197
+ await transport.send(transportBuffer.toBinary());
289
198
  }
290
199
  }
291
200
  /**
@@ -17,7 +17,6 @@ export type EventSystemOptions = {
17
17
  showFeedback?: boolean;
18
18
  showHighlight?: boolean;
19
19
  maxPlayerDistance?: number;
20
- priority?: number;
21
20
  };
22
21
  export declare const getDefaultOpts: (opts?: Partial<EventSystemOptions>) => EventSystemOptions;
23
22
  /**
@@ -48,30 +47,6 @@ export interface PointerEventsSystem {
48
47
  * @param entity - Entity where the callback was attached
49
48
  */
50
49
  removeOnPointerHoverLeave(entity: Entity): void;
51
- /**
52
- * @public
53
- * Remove the callback for onProximityDown event
54
- * @param entity - Entity where the callback was attached
55
- */
56
- removeOnProximityDown(entity: Entity): void;
57
- /**
58
- * @public
59
- * Remove the callback for onProximityUp event
60
- * @param entity - Entity where the callback was attached
61
- */
62
- removeOnProximityUp(entity: Entity): void;
63
- /**
64
- * @public
65
- * Remove the callback for onProximityEnter event
66
- * @param entity - Entity where the callback was attached
67
- */
68
- removeOnProximityEnter(entity: Entity): void;
69
- /**
70
- * @public
71
- * Remove the callback for onProximityLeave event
72
- * @param entity - Entity where the callback was attached
73
- */
74
- removeOnProximityLeave(entity: Entity): void;
75
50
  /**
76
51
  * @public
77
52
  * Execute callback when the user press the InputButton pointing at the entity
@@ -126,46 +101,6 @@ export interface PointerEventsSystem {
126
101
  entity: Entity;
127
102
  opts?: Partial<EventSystemOptions>;
128
103
  }, cb: EventSystemCallback): void;
129
- /**
130
- * @public
131
- * Execute callback when the user presses the proximity button on the entity
132
- * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
133
- * @param cb - Function to execute when click fires
134
- */
135
- onProximityDown(pointerData: {
136
- entity: Entity;
137
- opts?: Partial<EventSystemOptions>;
138
- }, cb: EventSystemCallback): void;
139
- /**
140
- * @public
141
- * Execute callback when the user releases the proximity button on the entity
142
- * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
143
- * @param cb - Function to execute when event fires
144
- */
145
- onProximityUp(pointerData: {
146
- entity: Entity;
147
- opts?: Partial<EventSystemOptions>;
148
- }, cb: EventSystemCallback): void;
149
- /**
150
- * @public
151
- * Execute callback when the entity enters the proximity zone of the user
152
- * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
153
- * @param cb - Function to execute when event fires
154
- */
155
- onProximityEnter(pointerData: {
156
- entity: Entity;
157
- opts?: Partial<EventSystemOptions>;
158
- }, cb: EventSystemCallback): void;
159
- /**
160
- * @public
161
- * Execute callback when the entity leaves the proximity zone of the user
162
- * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
163
- * @param cb - Function to execute when event fires
164
- */
165
- onProximityLeave(pointerData: {
166
- entity: Entity;
167
- opts?: Partial<EventSystemOptions>;
168
- }, cb: EventSystemCallback): void;
169
104
  }
170
105
  /**
171
106
  * @public