livekit-client 2.17.1 → 2.17.3

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 (145) hide show
  1. package/README.md +7 -5
  2. package/dist/livekit-client.e2ee.worker.js +1 -1
  3. package/dist/livekit-client.e2ee.worker.js.map +1 -1
  4. package/dist/livekit-client.e2ee.worker.mjs +21 -14
  5. package/dist/livekit-client.e2ee.worker.mjs.map +1 -1
  6. package/dist/livekit-client.esm.mjs +2087 -1920
  7. package/dist/livekit-client.esm.mjs.map +1 -1
  8. package/dist/livekit-client.umd.js +1 -1
  9. package/dist/livekit-client.umd.js.map +1 -1
  10. package/dist/src/e2ee/E2eeManager.d.ts +2 -0
  11. package/dist/src/e2ee/E2eeManager.d.ts.map +1 -1
  12. package/dist/src/e2ee/KeyProvider.d.ts +2 -0
  13. package/dist/src/e2ee/KeyProvider.d.ts.map +1 -1
  14. package/dist/src/e2ee/events.d.ts +1 -1
  15. package/dist/src/e2ee/events.d.ts.map +1 -1
  16. package/dist/src/e2ee/types.d.ts +1 -0
  17. package/dist/src/e2ee/types.d.ts.map +1 -1
  18. package/dist/src/e2ee/worker/ParticipantKeyHandler.d.ts +2 -2
  19. package/dist/src/e2ee/worker/ParticipantKeyHandler.d.ts.map +1 -1
  20. package/dist/src/index.d.ts +7 -6
  21. package/dist/src/index.d.ts.map +1 -1
  22. package/dist/src/logger.d.ts +2 -1
  23. package/dist/src/logger.d.ts.map +1 -1
  24. package/dist/src/room/PCTransport.d.ts +1 -4
  25. package/dist/src/room/PCTransport.d.ts.map +1 -1
  26. package/dist/src/room/PCTransportManager.d.ts.map +1 -1
  27. package/dist/src/room/RTCEngine.d.ts.map +1 -1
  28. package/dist/src/room/Room.d.ts.map +1 -1
  29. package/dist/src/room/data-stream/incoming/IncomingDataStreamManager.d.ts.map +1 -1
  30. package/dist/src/room/data-stream/incoming/StreamReader.d.ts +2 -4
  31. package/dist/src/room/data-stream/incoming/StreamReader.d.ts.map +1 -1
  32. package/dist/src/room/data-track/depacketizer.d.ts +51 -0
  33. package/dist/src/room/data-track/depacketizer.d.ts.map +1 -0
  34. package/dist/src/room/data-track/e2ee.d.ts +12 -0
  35. package/dist/src/room/data-track/e2ee.d.ts.map +1 -0
  36. package/dist/src/room/data-track/frame.d.ts +7 -0
  37. package/dist/src/room/data-track/frame.d.ts.map +1 -0
  38. package/dist/src/room/data-track/handle.d.ts +6 -7
  39. package/dist/src/room/data-track/handle.d.ts.map +1 -1
  40. package/dist/src/room/data-track/outgoing/OutgoingDataTrackManager.d.ts +76 -0
  41. package/dist/src/room/data-track/outgoing/OutgoingDataTrackManager.d.ts.map +1 -0
  42. package/dist/src/room/data-track/outgoing/errors.d.ts +64 -0
  43. package/dist/src/room/data-track/outgoing/errors.d.ts.map +1 -0
  44. package/dist/src/room/data-track/outgoing/pipeline.d.ts +22 -0
  45. package/dist/src/room/data-track/outgoing/pipeline.d.ts.map +1 -0
  46. package/dist/src/room/data-track/outgoing/types.d.ts +31 -0
  47. package/dist/src/room/data-track/outgoing/types.d.ts.map +1 -0
  48. package/dist/src/room/data-track/packet/index.d.ts +3 -3
  49. package/dist/src/room/data-track/packet/index.d.ts.map +1 -1
  50. package/dist/src/room/data-track/packetizer.d.ts +43 -0
  51. package/dist/src/room/data-track/packetizer.d.ts.map +1 -0
  52. package/dist/src/room/data-track/track.d.ts +30 -0
  53. package/dist/src/room/data-track/track.d.ts.map +1 -0
  54. package/dist/src/room/data-track/utils.d.ts +34 -2
  55. package/dist/src/room/data-track/utils.d.ts.map +1 -1
  56. package/dist/src/room/debounce.d.ts +11 -0
  57. package/dist/src/room/debounce.d.ts.map +1 -0
  58. package/dist/src/room/events.d.ts +1 -1
  59. package/dist/src/room/participant/LocalParticipant.d.ts.map +1 -1
  60. package/dist/src/room/track/LocalAudioTrack.d.ts +1 -1
  61. package/dist/src/room/track/LocalAudioTrack.d.ts.map +1 -1
  62. package/dist/src/room/track/LocalTrack.d.ts +2 -1
  63. package/dist/src/room/track/LocalTrack.d.ts.map +1 -1
  64. package/dist/src/room/types.d.ts +0 -2
  65. package/dist/src/room/types.d.ts.map +1 -1
  66. package/dist/src/room/utils.d.ts +6 -1
  67. package/dist/src/room/utils.d.ts.map +1 -1
  68. package/dist/src/utils/subscribeToEvents.d.ts +12 -0
  69. package/dist/src/utils/subscribeToEvents.d.ts.map +1 -0
  70. package/dist/src/utils/throws.d.ts +4 -2
  71. package/dist/src/utils/throws.d.ts.map +1 -1
  72. package/dist/ts4.2/e2ee/E2eeManager.d.ts +2 -0
  73. package/dist/ts4.2/e2ee/KeyProvider.d.ts +2 -0
  74. package/dist/ts4.2/e2ee/events.d.ts +1 -1
  75. package/dist/ts4.2/e2ee/types.d.ts +1 -0
  76. package/dist/ts4.2/e2ee/worker/ParticipantKeyHandler.d.ts +2 -2
  77. package/dist/ts4.2/index.d.ts +7 -3
  78. package/dist/ts4.2/logger.d.ts +2 -1
  79. package/dist/ts4.2/room/PCTransport.d.ts +1 -6
  80. package/dist/ts4.2/room/data-stream/incoming/StreamReader.d.ts +2 -4
  81. package/dist/ts4.2/room/data-track/depacketizer.d.ts +51 -0
  82. package/dist/ts4.2/room/data-track/e2ee.d.ts +12 -0
  83. package/dist/ts4.2/room/data-track/frame.d.ts +7 -0
  84. package/dist/ts4.2/room/data-track/handle.d.ts +6 -7
  85. package/dist/ts4.2/room/data-track/outgoing/OutgoingDataTrackManager.d.ts +77 -0
  86. package/dist/ts4.2/room/data-track/outgoing/errors.d.ts +64 -0
  87. package/dist/ts4.2/room/data-track/outgoing/pipeline.d.ts +22 -0
  88. package/dist/ts4.2/room/data-track/outgoing/types.d.ts +31 -0
  89. package/dist/ts4.2/room/data-track/packet/index.d.ts +3 -3
  90. package/dist/ts4.2/room/data-track/packetizer.d.ts +43 -0
  91. package/dist/ts4.2/room/data-track/track.d.ts +30 -0
  92. package/dist/ts4.2/room/data-track/utils.d.ts +34 -2
  93. package/dist/ts4.2/room/debounce.d.ts +11 -0
  94. package/dist/ts4.2/room/events.d.ts +1 -1
  95. package/dist/ts4.2/room/track/LocalAudioTrack.d.ts +1 -1
  96. package/dist/ts4.2/room/track/LocalTrack.d.ts +2 -1
  97. package/dist/ts4.2/room/types.d.ts +0 -2
  98. package/dist/ts4.2/room/utils.d.ts +6 -1
  99. package/dist/ts4.2/utils/subscribeToEvents.d.ts +12 -0
  100. package/dist/ts4.2/utils/throws.d.ts +4 -2
  101. package/package.json +4 -5
  102. package/src/e2ee/E2eeManager.ts +9 -5
  103. package/src/e2ee/KeyProvider.ts +10 -1
  104. package/src/e2ee/events.ts +1 -1
  105. package/src/e2ee/types.ts +1 -0
  106. package/src/e2ee/worker/ParticipantKeyHandler.ts +7 -4
  107. package/src/e2ee/worker/e2ee.worker.ts +20 -10
  108. package/src/index.ts +15 -5
  109. package/src/logger.ts +1 -0
  110. package/src/room/PCTransport.ts +2 -1
  111. package/src/room/PCTransportManager.ts +27 -9
  112. package/src/room/RTCEngine.ts +13 -2
  113. package/src/room/Room.ts +11 -5
  114. package/src/room/data-stream/incoming/IncomingDataStreamManager.ts +5 -25
  115. package/src/room/data-stream/incoming/StreamReader.ts +56 -73
  116. package/src/room/data-track/depacketizer.test.ts +442 -0
  117. package/src/room/data-track/depacketizer.ts +298 -0
  118. package/src/room/data-track/e2ee.ts +14 -0
  119. package/src/room/data-track/frame.ts +8 -0
  120. package/src/room/data-track/handle.test.ts +1 -1
  121. package/src/room/data-track/handle.ts +9 -14
  122. package/src/room/data-track/outgoing/OutgoingDataTrackManager.test.ts +392 -0
  123. package/src/room/data-track/outgoing/OutgoingDataTrackManager.ts +302 -0
  124. package/src/room/data-track/outgoing/errors.ts +157 -0
  125. package/src/room/data-track/outgoing/pipeline.ts +76 -0
  126. package/src/room/data-track/outgoing/types.ts +37 -0
  127. package/src/room/data-track/packet/index.test.ts +9 -9
  128. package/src/room/data-track/packet/index.ts +11 -9
  129. package/src/room/data-track/packet/serializable.ts +1 -1
  130. package/src/room/data-track/packetizer.test.ts +131 -0
  131. package/src/room/data-track/packetizer.ts +132 -0
  132. package/src/room/data-track/track.ts +50 -0
  133. package/src/room/data-track/utils.test.ts +27 -1
  134. package/src/room/data-track/utils.ts +125 -5
  135. package/src/room/debounce.ts +115 -0
  136. package/src/room/events.ts +1 -1
  137. package/src/room/participant/LocalParticipant.ts +2 -0
  138. package/src/room/track/LocalAudioTrack.ts +10 -10
  139. package/src/room/track/LocalTrack.ts +14 -5
  140. package/src/room/track/LocalVideoTrack.ts +1 -1
  141. package/src/room/track/RemoteVideoTrack.ts +1 -1
  142. package/src/room/types.ts +0 -2
  143. package/src/room/utils.ts +7 -2
  144. package/src/utils/subscribeToEvents.ts +63 -0
  145. package/src/utils/throws.ts +3 -1
@@ -0,0 +1,298 @@
1
+ import { LoggerNames, getLogger } from '../../logger';
2
+ import { type Throws } from '../../utils/throws';
3
+ import { LivekitReasonedError } from '../errors';
4
+ import { type DataTrackFrame } from './frame';
5
+ import { DataTrackPacket, FrameMarker } from './packet';
6
+ import { DataTrackExtensions } from './packet/extensions';
7
+ import { U16_MAX_SIZE, WrapAroundUnsignedInt } from './utils';
8
+
9
+ const log = getLogger(LoggerNames.DataTracks);
10
+
11
+ type PartialFrame = {
12
+ /** Frame number from the start packet. */
13
+ frameNumber: number;
14
+ /** Sequence of the start packet. */
15
+ startSequence: WrapAroundUnsignedInt<typeof U16_MAX_SIZE>;
16
+ /** Extensions from the start packet. */
17
+ extensions: DataTrackExtensions;
18
+ /** Mapping between sequence number and packet payload. */
19
+ payloads: Map<number, Uint8Array>;
20
+ };
21
+
22
+ /** An error indicating a frame was dropped. */
23
+ export class DataTrackDepacketizerDropError<
24
+ Reason extends DataTrackDepacketizerDropReason,
25
+ > extends LivekitReasonedError<Reason> {
26
+ readonly name = 'DataTrackDepacketizerDropError';
27
+
28
+ reason: Reason;
29
+
30
+ reasonName: string;
31
+
32
+ frameNumber: number;
33
+
34
+ constructor(message: string, reason: Reason, frameNumber: number, options?: { cause?: unknown }) {
35
+ super(19, `Frame ${frameNumber} dropped: ${message}`, options);
36
+ this.reason = reason;
37
+ this.reasonName = DataTrackDepacketizerDropReason[reason];
38
+ this.frameNumber = frameNumber;
39
+ }
40
+
41
+ static interrupted(frameNumber: number) {
42
+ return new DataTrackDepacketizerDropError(
43
+ 'Interrupted by the start of a new frame',
44
+ DataTrackDepacketizerDropReason.Interrupted,
45
+ frameNumber,
46
+ );
47
+ }
48
+
49
+ static unknownFrame(frameNumber: number) {
50
+ return new DataTrackDepacketizerDropError(
51
+ 'Initial packet was never received.',
52
+ DataTrackDepacketizerDropReason.UnknownFrame,
53
+ frameNumber,
54
+ );
55
+ }
56
+
57
+ static bufferFull(frameNumber: number) {
58
+ return new DataTrackDepacketizerDropError(
59
+ 'Reorder buffer is full.',
60
+ DataTrackDepacketizerDropReason.BufferFull,
61
+ frameNumber,
62
+ );
63
+ }
64
+
65
+ static incomplete(frameNumber: number, receivedPackets: number, expectedPackets: number) {
66
+ return new DataTrackDepacketizerDropError(
67
+ `Not all packets received before final packet. Received ${receivedPackets} packets, expected ${expectedPackets} packets.`,
68
+ DataTrackDepacketizerDropReason.Incomplete,
69
+ frameNumber,
70
+ );
71
+ }
72
+ }
73
+
74
+ /** Reason why a frame was dropped. */
75
+ export enum DataTrackDepacketizerDropReason {
76
+ Interrupted = 0,
77
+ UnknownFrame = 1,
78
+ BufferFull = 2,
79
+ Incomplete = 3,
80
+ }
81
+
82
+ type PushOptions = {
83
+ /** If true, throws an error instead of logging a warning when a new frame is encountered half way
84
+ * through processing a pre-existing frame. */
85
+ errorOnPartialFrames: boolean;
86
+ };
87
+
88
+ export default class DataTrackDepacketizer {
89
+ /** Maximum number of packets to buffer per frame before dropping. */
90
+ static MAX_BUFFER_PACKETS = 128;
91
+
92
+ private partial: PartialFrame | null = null;
93
+
94
+ /** Should be repeatedly called with received {@link DataTrackPacket}s - intermediate calls
95
+ * aggregate the packet's state internally, and return null.
96
+ *
97
+ * Once this method is called with the final packet to form a frame, a new {@link DataTrackFrame}
98
+ * is returned.*/
99
+ push(
100
+ packet: DataTrackPacket,
101
+ options?: PushOptions,
102
+ ): Throws<
103
+ DataTrackFrame | null,
104
+ | DataTrackDepacketizerDropError<DataTrackDepacketizerDropReason.Interrupted>
105
+ | DataTrackDepacketizerDropError<DataTrackDepacketizerDropReason.BufferFull>
106
+ | DataTrackDepacketizerDropError<DataTrackDepacketizerDropReason.UnknownFrame>
107
+ | DataTrackDepacketizerDropError<DataTrackDepacketizerDropReason.Incomplete>
108
+ > {
109
+ switch (packet.header.marker) {
110
+ case FrameMarker.Single:
111
+ return this.frameFromSingle(packet, options);
112
+ case FrameMarker.Start:
113
+ return this.beginPartial(packet, options);
114
+ case FrameMarker.Inter:
115
+ case FrameMarker.Final:
116
+ return this.pushToPartial(packet);
117
+ }
118
+ }
119
+
120
+ reset() {
121
+ this.partial = null;
122
+ }
123
+
124
+ private frameFromSingle(
125
+ packet: DataTrackPacket,
126
+ options?: PushOptions,
127
+ ): Throws<
128
+ DataTrackFrame | null,
129
+ DataTrackDepacketizerDropError<DataTrackDepacketizerDropReason.Interrupted>
130
+ > {
131
+ if (packet.header.marker !== FrameMarker.Single) {
132
+ // @throws-transformer ignore - this should be treated as a "panic" and not be caught
133
+ throw new Error(
134
+ `Depacketizer.frameFromSingle: packet.header.marker was not FrameMarker.Single, found ${packet.header.marker}.`,
135
+ );
136
+ }
137
+
138
+ if (this.partial) {
139
+ if (options?.errorOnPartialFrames) {
140
+ const frameNumber = this.partial.frameNumber;
141
+ this.reset();
142
+ throw DataTrackDepacketizerDropError.interrupted(frameNumber);
143
+ } else {
144
+ log.warn(
145
+ `Data track frame ${this.partial.frameNumber} was interrupted by the start of a new frame, dropping.`,
146
+ );
147
+ }
148
+ }
149
+ this.reset();
150
+
151
+ return { payload: packet.payload, extensions: packet.header.extensions };
152
+ }
153
+
154
+ /** Begin assembling a new packet. */
155
+ private beginPartial(
156
+ packet: DataTrackPacket,
157
+ options?: PushOptions,
158
+ ): Throws<null, DataTrackDepacketizerDropError<DataTrackDepacketizerDropReason.Interrupted>> {
159
+ if (packet.header.marker !== FrameMarker.Start) {
160
+ // @throws-transformer ignore - this should be treated as a "panic" and not be caught
161
+ throw new Error(
162
+ `Depacketizer.beginPartial: packet.header.marker was not FrameMarker.Start, found ${packet.header.marker}.`,
163
+ );
164
+ }
165
+
166
+ if (this.partial) {
167
+ if (options?.errorOnPartialFrames) {
168
+ const frameNumber = this.partial.frameNumber;
169
+ this.reset();
170
+ throw DataTrackDepacketizerDropError.interrupted(frameNumber);
171
+ } else {
172
+ log.warn(
173
+ `Data track frame ${this.partial.frameNumber} was interrupted by the start of a new frame, dropping.`,
174
+ );
175
+ }
176
+ }
177
+ this.reset();
178
+
179
+ const startSequence = packet.header.sequence;
180
+
181
+ this.partial = {
182
+ frameNumber: packet.header.frameNumber.value,
183
+ startSequence,
184
+ extensions: packet.header.extensions,
185
+ payloads: new Map([[startSequence.value, packet.payload]]),
186
+ };
187
+
188
+ return null;
189
+ }
190
+
191
+ /** Push to the existing partial frame. */
192
+ private pushToPartial(
193
+ packet: DataTrackPacket,
194
+ ): Throws<
195
+ DataTrackFrame | null,
196
+ | DataTrackDepacketizerDropError<DataTrackDepacketizerDropReason.Interrupted>
197
+ | DataTrackDepacketizerDropError<DataTrackDepacketizerDropReason.UnknownFrame>
198
+ | DataTrackDepacketizerDropError<DataTrackDepacketizerDropReason.BufferFull>
199
+ | DataTrackDepacketizerDropError<DataTrackDepacketizerDropReason.Incomplete>
200
+ > {
201
+ if (packet.header.marker !== FrameMarker.Inter && packet.header.marker !== FrameMarker.Final) {
202
+ // @throws-transformer ignore - this should be treated as a "panic" and not be caught
203
+ throw new Error(
204
+ `Depacketizer.pushToPartial: packet.header.marker was not FrameMarker.Inter or FrameMarker.Final, found ${packet.header.marker}.`,
205
+ );
206
+ }
207
+
208
+ if (!this.partial) {
209
+ this.reset();
210
+ throw DataTrackDepacketizerDropError.unknownFrame(packet.header.frameNumber.value);
211
+ }
212
+
213
+ if (packet.header.frameNumber.value !== this.partial.frameNumber) {
214
+ const frameNumber = this.partial.frameNumber;
215
+ this.reset();
216
+ throw DataTrackDepacketizerDropError.interrupted(frameNumber);
217
+ }
218
+
219
+ // NOTE: this check will block reprocessing packets with duplicate sequence values if the
220
+ // buffer is full already, which could maybe be problematic for very large frames.
221
+ if (this.partial.payloads.size >= DataTrackDepacketizer.MAX_BUFFER_PACKETS) {
222
+ const frameNumber = this.partial.frameNumber;
223
+ this.reset();
224
+ throw DataTrackDepacketizerDropError.bufferFull(frameNumber);
225
+ }
226
+
227
+ // Note: receiving a packet with a duplicate `sequence` value is something that likely won't
228
+ // happen in actual use, but even if it does (maybe a low level network retransmission?) the
229
+ // last packet with a given sequence received should always win.
230
+ if (this.partial.payloads.has(packet.header.sequence.value)) {
231
+ log.warn(
232
+ `Data track frame ${this.partial.frameNumber} received duplicate packet for sequence ${packet.header.sequence.value}, so replacing with newly received packet.`,
233
+ );
234
+ }
235
+ this.partial.payloads.set(packet.header.sequence.value, packet.payload);
236
+
237
+ if (packet.header.marker === FrameMarker.Final) {
238
+ return this.finalize(this.partial, packet.header.sequence.value);
239
+ }
240
+
241
+ return null;
242
+ }
243
+
244
+ /** Try to reassemble the complete frame. */
245
+ private finalize(
246
+ partial: PartialFrame,
247
+ endSequence: number,
248
+ ): Throws<
249
+ DataTrackFrame,
250
+ DataTrackDepacketizerDropError<DataTrackDepacketizerDropReason.Incomplete>
251
+ > {
252
+ const received = partial.payloads.size;
253
+
254
+ let payloadLengthBytes = 0;
255
+ for (const p of partial.payloads.values()) {
256
+ payloadLengthBytes += p.length;
257
+ }
258
+ const payload = new Uint8Array(payloadLengthBytes);
259
+
260
+ let sequencePointer = partial.startSequence.clone();
261
+ let payloadOffsetPointerBytes = 0;
262
+ while (true) {
263
+ const partialPayload = partial.payloads.get(sequencePointer.value);
264
+ if (!partialPayload) {
265
+ break;
266
+ }
267
+ partial.payloads.delete(sequencePointer.value);
268
+
269
+ const payloadRemainingBytes = payload.length - payloadOffsetPointerBytes;
270
+ if (partialPayload.length > payloadRemainingBytes) {
271
+ // @throws-transformer ignore - this should be treated as a "panic" and not be caught
272
+ throw new Error(
273
+ `Depacketizer.finalize: Expected at least ${partialPayload.length} more bytes left in the payload buffer, only got ${payloadRemainingBytes} bytes.`,
274
+ );
275
+ }
276
+
277
+ payload.set(partialPayload, payloadOffsetPointerBytes);
278
+ payloadOffsetPointerBytes += partialPayload.length;
279
+
280
+ // NOTE: sequencePointer could wrap around, which is why this isn't a "<"
281
+ if (sequencePointer.value != endSequence) {
282
+ sequencePointer.increment();
283
+ continue;
284
+ }
285
+
286
+ // The packet is done processing, reset the state so another frame can be processed next.
287
+ this.reset();
288
+ return { payload, extensions: partial.extensions };
289
+ }
290
+
291
+ this.reset();
292
+ throw DataTrackDepacketizerDropError.incomplete(
293
+ partial.frameNumber,
294
+ received,
295
+ endSequence - partial.startSequence.value + 1,
296
+ );
297
+ }
298
+ }
@@ -0,0 +1,14 @@
1
+ export type EncryptedPayload = {
2
+ payload: Uint8Array;
3
+ iv: Uint8Array; // NOTE: should be 12 bytes long
4
+ keyIndex: number;
5
+ };
6
+
7
+ export type EncryptionProvider = {
8
+ // FIXME: add in explicit `Throws<..., EncryptionError>`?
9
+ encrypt(payload: Uint8Array): EncryptedPayload;
10
+ };
11
+
12
+ export type DecryptionProvider = {
13
+ decrypt(payload: Uint8Array, senderIdentity: string): Uint8Array;
14
+ };
@@ -0,0 +1,8 @@
1
+ import { DataTrackExtensions } from './packet/extensions';
2
+ import DataTrackPacketizer from './packetizer';
3
+
4
+ /** A pair of payload bytes and packet extensions which can be fed into a {@link DataTrackPacketizer}. */
5
+ export type DataTrackFrame = {
6
+ payload: Uint8Array;
7
+ extensions: DataTrackExtensions;
8
+ };
@@ -4,7 +4,7 @@ import { DataTrackHandle } from './handle';
4
4
 
5
5
  describe('DataTrackHandle', () => {
6
6
  it('should parse handle raw inputs', () => {
7
- expect(DataTrackHandle.fromNumber(3).value).toEqual(3);
7
+ expect(DataTrackHandle.fromNumber(3)).toEqual(3);
8
8
  expect(() => DataTrackHandle.fromNumber(0)).toThrow('0x0 is a reserved value');
9
9
  expect(() => DataTrackHandle.fromNumber(9999999)).toThrow(
10
10
  'Value too large to be a valid track handle',
@@ -41,10 +41,9 @@ export class DataTrackHandleError<
41
41
  }
42
42
  }
43
43
 
44
- export class DataTrackHandle {
45
- public value: number;
46
-
47
- static fromNumber(
44
+ export type DataTrackHandle = number;
45
+ export const DataTrackHandle = {
46
+ fromNumber(
48
47
  raw: number,
49
48
  ): Throws<
50
49
  DataTrackHandle,
@@ -57,24 +56,20 @@ export class DataTrackHandle {
57
56
  if (raw > U16_MAX_SIZE) {
58
57
  throw DataTrackHandleError.tooLarge();
59
58
  }
60
- return new DataTrackHandle(raw);
61
- }
62
-
63
- constructor(raw: number) {
64
- this.value = raw;
65
- }
66
- }
59
+ return raw;
60
+ },
61
+ };
67
62
 
68
63
  /** Manage allocating new handles which don't conflict over the lifetime of the client. */
69
64
  export class DataTrackHandleAllocator {
70
- static value = 0;
65
+ value = 0;
71
66
 
72
67
  /** Returns a unique track handle for the next publication, if one can be obtained. */
73
- static get(): DataTrackHandle | null {
68
+ get(): DataTrackHandle | null {
74
69
  this.value += 1;
75
70
  if (this.value > U16_MAX_SIZE) {
76
71
  return null;
77
72
  }
78
- return new DataTrackHandle(this.value);
73
+ return this.value;
79
74
  }
80
75
  }