livekit-client 2.18.0 → 2.18.2

package/src/room/RTCEngine.ts

@@ -8,6 +8,7 @@ import {
   DataChannelReceiveState,
   DataPacket,
   DataPacket_Kind,
+  DataTrackSubscriberHandles,
   DisconnectReason,
   EncryptedPacket,
   EncryptedPacketPayload,
@@ -17,6 +18,7 @@ import {
   LeaveRequest_Action,
   MediaSectionsRequirement,
   ParticipantInfo,
+  PublishDataTrackResponse,
   ReconnectReason,
   type ReconnectResponse,
   RequestResponse,
@@ -24,6 +26,8 @@ import {
   RoomMovedResponse,
   RpcAck,
   RpcResponse,
+  ServerInfo,
+  SessionDescription,
   SignalTarget,
   SpeakerInfo,
   type StreamStateUpdate,
@@ -35,6 +39,7 @@ import {
   type TrackPublishedResponse,
   TrackUnpublishedResponse,
   Transcription,
+  UnpublishDataTrackResponse,
   UpdateSubscription,
   type UserPacket,
 } from '@livekit/protocol';
@@ -58,6 +63,7 @@ import PCTransport, { PCEvents } from './PCTransport';
 import { PCTransportManager, PCTransportState } from './PCTransportManager';
 import type { ReconnectContext, ReconnectPolicy } from './ReconnectPolicy';
 import { DEFAULT_MAX_AGE_MS, type RegionUrlProvider } from './RegionUrlProvider';
+import { DataTrackInfo } from './data-track/types';
 import { roomConnectOptionDefaults } from './defaults';
 import {
   ConnectionError,
@@ -80,6 +86,7 @@ import type { TrackPublishOptions, VideoCodec } from './track/options';
 import { getTrackPublicationInfo } from './track/utils';
 import type { LoggerOptions } from './types';
 import {
+  isCompressionStreamSupported,
   isVideoCodec,
   isVideoTrack,
   isWeb,
@@ -91,11 +98,14 @@ import {
 
 const lossyDataChannel = '_lossy';
 const reliableDataChannel = '_reliable';
+const dataTrackDataChannel = '_data_track';
 const minReconnectWait = 2 * 1000;
 const leaveReconnect = 'leave-reconnect';
 const reliabeReceiveStateTTL = 30_000;
 const lossyDataChannelBufferThresholdMin = 8 * 1024;
 const lossyDataChannelBufferThresholdMax = 256 * 1024;
+const initialMediaSectionsAudio = 3;
+const initialMediaSectionsVideo = 3;
 
 enum PCState {
   New,
@@ -105,6 +115,12 @@ enum PCState {
   Closed,
 }
 
+export enum DataChannelKind {
+  RELIABLE = DataPacket_Kind.RELIABLE,
+  LOSSY = DataPacket_Kind.LOSSY,
+  DATA_TRACK_LOSSY,
+}
+
 /** @internal */
 export default class RTCEngine extends (EventEmitter as new () => TypedEventEmitter<EngineEventCallbacks>) {
   client: SignalClient;
@@ -149,11 +165,16 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
 
   private reliableDC?: RTCDataChannel;
 
-  private dcBufferStatus: Map<DataPacket_Kind, boolean>;
-
   // @ts-ignore noUnusedLocals
   private reliableDCSub?: RTCDataChannel;
 
+  private dataTrackDC?: RTCDataChannel;
+
+  // @ts-ignore noUnusedLocals
+  private dataTrackDCSub?: RTCDataChannel;
+
+  private dcBufferStatus: Map<DataChannelKind, boolean>;
+
   private subscriberPrimary: boolean = false;
 
   private pcState: PCState = PCState.New;
@@ -239,8 +260,9 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     this.closingLock = new Mutex();
     this.dataProcessLock = new Mutex();
     this.dcBufferStatus = new Map([
-      [DataPacket_Kind.LOSSY, true],
-      [DataPacket_Kind.RELIABLE, true],
+      [DataChannelKind.RELIABLE, true],
+      [DataChannelKind.LOSSY, true],
+      [DataChannelKind.DATA_TRACK_LOSSY, true],
     ]);
 
     this.client.onParticipantUpdate = (updates) =>
@@ -255,6 +277,9 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     this.client.onStreamStateUpdate = (update) => this.emit(EngineEvent.StreamStateChanged, update);
     this.client.onRequestResponse = (response) =>
       this.emit(EngineEvent.SignalRequestResponse, response);
+    this.client.onParticipantUpdate = (updates) =>
+      this.emit(EngineEvent.ParticipantUpdate, updates);
+    this.client.onJoined = (joinResponse) => this.emit(EngineEvent.Joined, joinResponse);
   }
 
   /** @internal */
@@ -274,7 +299,7 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     abortSignal?: AbortSignal,
     /** setting this to true results in dual peer connection mode being used */
     useV0Path: boolean = false,
-  ): Promise<JoinResponse> {
+  ): Promise<{ joinResponse: JoinResponse; serverInfo: Partial<ServerInfo> }> {
     this._isNewlyCreated = false;
     this.url = url;
     this.token = token;
@@ -284,26 +309,68 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
       this.joinAttempts += 1;
 
       this.setupSignalClientCallbacks();
-      const joinResponse = await this.client.join(url, token, opts, abortSignal, useV0Path);
+      let offerProto: SessionDescription | undefined;
+      if (!useV0Path && isCompressionStreamSupported()) {
+        if (!this.pcManager) {
+          await this.configure();
+          this.createDataChannels();
+          this.addMediaSections(initialMediaSectionsAudio, initialMediaSectionsVideo);
+        }
+        const offer = await this.pcManager?.publisher.createInitialOffer();
+        if (offer) {
+          offerProto = toProtoSessionDescription(offer.offer, offer.offerId);
+        }
+      }
+      if (abortSignal?.aborted) {
+        throw ConnectionError.cancelled('Connection aborted');
+      }
+      const joinResponse = await this.client.join(
+        url,
+        token,
+        opts,
+        abortSignal,
+        useV0Path,
+        offerProto,
+      );
       this._isClosed = false;
       this.latestJoinResponse = joinResponse;
+      this.participantSid = joinResponse.participant?.sid;
 
       this.subscriberPrimary = joinResponse.subscriberPrimary;
-      if (!this.pcManager) {
-        await this.configure(joinResponse, !useV0Path);
-      }
-
-      // create offer
-      if (!this.subscriberPrimary || joinResponse.fastPublish) {
-        this.negotiate().catch((err) => {
-          log.error(err, this.logContext);
-        });
+      if (!useV0Path && isCompressionStreamSupported()) {
+        this.pcManager?.updateConfiguration(this.makeRTCConfiguration(joinResponse));
+      } else {
+        if (!this.pcManager) {
+          await this.configure(joinResponse, !useV0Path);
+        }
+        // create offer
+        if (!this.subscriberPrimary || joinResponse.fastPublish) {
+          this.negotiate().catch((err) => {
+            log.error(err, this.logContext);
+          });
+        }
       }
 
       this.registerOnLineListener();
       this.clientConfiguration = joinResponse.clientConfiguration;
       this.emit(EngineEvent.SignalConnected, joinResponse);
-      return joinResponse;
+
+      let serverInfo: Partial<ServerInfo> | undefined = joinResponse.serverInfo;
+      if (!serverInfo) {
+        serverInfo = { version: joinResponse.serverVersion, region: joinResponse.serverRegion };
+      }
+      this.log.debug(
+        `connected to Livekit Server ${Object.entries(serverInfo)
+          .map(([key, value]) => `${key}: ${value}`)
+          .join(', ')}`,
+        {
+          room: joinResponse.room?.name,
+          roomSid: joinResponse.room?.sid,
+          identity: joinResponse.participant?.identity,
+        },
+      );
+
+      return { joinResponse, serverInfo };
     } catch (e) {
       if (e instanceof ConnectionError) {
         if (e.reason === ConnectionErrorReason.ServerUnreachable) {
@@ -362,11 +429,15 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     dcCleanup(this.lossyDCSub);
     dcCleanup(this.reliableDC);
     dcCleanup(this.reliableDCSub);
+    dcCleanup(this.dataTrackDC);
+    dcCleanup(this.dataTrackDCSub);
 
     this.lossyDC = undefined;
     this.lossyDCSub = undefined;
     this.reliableDC = undefined;
     this.reliableDCSub = undefined;
+    this.dataTrackDC = undefined;
+    this.dataTrackDCSub = undefined;
     this.reliableMessageBuffer = new DataPacketBuffer();
     this.reliableDataSequence = 1;
     this.reliableReceivedState.clear();
@@ -452,25 +523,28 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     this.regionUrlProvider = provider;
   }
 
-  private async configure(joinResponse: JoinResponse, useSinglePeerConnection: boolean) {
+  private async configure(joinResponse?: JoinResponse, useSinglePeerConnection?: boolean) {
     // already configured
     if (this.pcManager && this.pcManager.currentState !== PCTransportState.NEW) {
       return;
     }
 
-    this.participantSid = joinResponse.participant?.sid;
-
-    const rtcConfig = this.makeRTCConfiguration(joinResponse);
-
-    this.pcManager = new PCTransportManager(
-      rtcConfig,
-      useSinglePeerConnection
-        ? 'publisher-only'
-        : joinResponse.subscriberPrimary
-          ? 'subscriber-primary'
-          : 'publisher-primary',
-      this.loggerOptions,
-    );
+    if (!joinResponse) {
+      const rtcConfig = this.makeRTCConfiguration();
+      this.pcManager = new PCTransportManager('publisher-only', this.loggerOptions, rtcConfig);
+    } else {
+      this.participantSid = joinResponse.participant?.sid;
+      const rtcConfig = this.makeRTCConfiguration(joinResponse);
+      this.pcManager = new PCTransportManager(
+        useSinglePeerConnection
+          ? 'publisher-only'
+          : joinResponse.subscriberPrimary
+            ? 'subscriber-primary'
+            : 'publisher-primary',
+        this.loggerOptions,
+        rtcConfig,
+      );
+    }
 
     this.emit(EngineEvent.TransportsCreated, this.pcManager.publisher, this.pcManager.subscriber);
 
@@ -494,7 +568,7 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
         const shouldEmit = this.pcState === PCState.New;
         this.pcState = PCState.Connected;
         if (shouldEmit) {
-          this.emit(EngineEvent.Connected, joinResponse);
+          this.emit(EngineEvent.Connected, this.latestJoinResponse!);
         }
       } else if (connectionState === PCTransportState.FAILED) {
         // on Safari, PeerConnection will switch to 'disconnected' during renegotiation
@@ -529,10 +603,6 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
       if (ev.streams.length === 0) return;
       this.emit(EngineEvent.MediaTrackAdded, ev.track, ev.streams[0], ev.receiver);
     };
-
-    if (!supportOptionalDatachannel(joinResponse.serverInfo?.protocol)) {
-      this.createDataChannels();
-    }
   }
 
   private setupSignalClientCallbacks() {
@@ -621,17 +691,22 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     };
 
     this.client.onMediaSectionsRequirement = (requirement: MediaSectionsRequirement) => {
-      const transceiverInit: RTCRtpTransceiverInit = { direction: 'recvonly' };
-      for (let i: number = 0; i < requirement.numAudios; i++) {
-        this.pcManager?.addPublisherTransceiverOfKind('audio', transceiverInit);
-      }
-      for (let i: number = 0; i < requirement.numVideos; i++) {
-        this.pcManager?.addPublisherTransceiverOfKind('video', transceiverInit);
-      }
-
+      this.addMediaSections(requirement.numAudios, requirement.numVideos);
       this.negotiate();
     };
 
+    this.client.onPublishDataTrackResponse = (event: PublishDataTrackResponse) => {
+      this.emit(EngineEvent.PublishDataTrackResponse, event);
+    };
+
+    this.client.onUnPublishDataTrackResponse = (event: UnpublishDataTrackResponse) => {
+      this.emit(EngineEvent.UnPublishDataTrackResponse, event);
+    };
+
+    this.client.onDataTrackSubscriberHandles = (event: DataTrackSubscriberHandles) => {
+      this.emit(EngineEvent.DataTrackSubscriberHandles, event);
+    };
+
     this.client.onClose = () => {
       this.handleDisconnect('signal', ReconnectReason.RR_SIGNAL_DISCONNECTED);
     };
@@ -665,7 +740,9 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     };
   }
 
-  private makeRTCConfiguration(serverResponse: JoinResponse | ReconnectResponse): RTCConfiguration {
+  private makeRTCConfiguration(
+    serverResponse?: JoinResponse | ReconnectResponse,
+  ): RTCConfiguration {
     const rtcConfig = { ...this.rtcConfig };
 
     if (this.signalOpts?.e2eeEnabled) {
@@ -675,6 +752,15 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
       rtcConfig.encodedInsertableStreams = true;
     }
 
+    // @ts-ignore
+    rtcConfig.sdpSemantics = 'unified-plan';
+    // @ts-ignore
+    rtcConfig.continualGatheringPolicy = 'gather_continually';
+
+    if (!serverResponse) {
+      return rtcConfig;
+    }
+
     // update ICE servers before creating PeerConnection
     if (serverResponse.iceServers && !rtcConfig.iceServers) {
       const rtcIceServers: RTCIceServer[] = [];
@@ -698,14 +784,19 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
       rtcConfig.iceTransportPolicy = 'relay';
     }
 
-    // @ts-ignore
-    rtcConfig.sdpSemantics = 'unified-plan';
-    // @ts-ignore
-    rtcConfig.continualGatheringPolicy = 'gather_continually';
-
     return rtcConfig;
   }
 
+  private addMediaSections(numAudios: number, numVideos: number) {
+    const transceiverInit: RTCRtpTransceiverInit = { direction: 'recvonly' };
+    for (let i: number = 0; i < numAudios; i++) {
+      this.pcManager?.addPublisherTransceiverOfKind('audio', transceiverInit);
+    }
+    for (let i: number = 0; i < numVideos; i++) {
+      this.pcManager?.addPublisherTransceiverOfKind('video', transceiverInit);
+    }
+  }
+
   private createDataChannels() {
     if (!this.pcManager) {
       return;
@@ -720,6 +811,10 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
       this.reliableDC.onmessage = null;
       this.reliableDC.onerror = null;
     }
+    if (this.dataTrackDC) {
+      this.dataTrackDC.onmessage = null;
+      this.dataTrackDC.onerror = null;
+    }
 
     // create data channels
     this.lossyDC = this.pcManager.createPublisherDataChannel(lossyDataChannel, {
@@ -729,29 +824,39 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     this.reliableDC = this.pcManager.createPublisherDataChannel(reliableDataChannel, {
       ordered: true,
     });
+    this.dataTrackDC = this.pcManager.createPublisherDataChannel(dataTrackDataChannel, {
+      ordered: false,
+      maxRetransmits: 0,
+    });
 
     // also handle messages over the pub channel, for backwards compatibility
     this.lossyDC.onmessage = this.handleDataMessage;
     this.reliableDC.onmessage = this.handleDataMessage;
+    this.dataTrackDC.onmessage = this.handleDataTrackMessage;
 
     // handle datachannel errors
     this.lossyDC.onerror = this.handleDataError;
     this.reliableDC.onerror = this.handleDataError;
+    this.dataTrackDC.onerror = this.handleDataError;
 
     // set up dc buffer threshold, set to 64kB (otherwise 0 by default)
     this.lossyDC.bufferedAmountLowThreshold = 65535;
     this.reliableDC.bufferedAmountLowThreshold = 65535;
+    this.dataTrackDC.bufferedAmountLowThreshold = 65535;
 
     // handle buffer amount low events
-    this.lossyDC.onbufferedamountlow = this.handleBufferedAmountLow;
-    this.reliableDC.onbufferedamountlow = this.handleBufferedAmountLow;
+    this.lossyDC.onbufferedamountlow = () => this.handleBufferedAmountLow(DataChannelKind.LOSSY);
+    this.reliableDC.onbufferedamountlow = () =>
+      this.handleBufferedAmountLow(DataChannelKind.RELIABLE);
+    this.dataTrackDC.onbufferedamountlow = () =>
+      this.handleBufferedAmountLow(DataChannelKind.DATA_TRACK_LOSSY);
 
     this.cleanupLossyDataStats();
     this.lossyDataStatInterval = setInterval(() => {
       this.lossyDataStatByterate = this.lossyDataStatCurrentBytes;
       this.lossyDataStatCurrentBytes = 0;
 
-      const dc = this.dataChannelForKind(DataPacket_Kind.LOSSY);
+      const dc = this.dataChannelForKind(DataChannelKind.LOSSY);
       if (dc) {
         // control buffered latency to ~100ms
         const threshold = this.lossyDataStatByterate / 10;
@@ -767,15 +872,21 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     if (!channel) {
       return;
     }
+    let handler;
     if (channel.label === reliableDataChannel) {
       this.reliableDCSub = channel;
+      handler = this.handleDataMessage;
     } else if (channel.label === lossyDataChannel) {
       this.lossyDCSub = channel;
+      handler = this.handleDataMessage;
+    } else if (channel.label === dataTrackDataChannel) {
+      this.dataTrackDCSub = channel;
+      handler = this.handleDataTrackMessage;
     } else {
       return;
     }
     this.log.debug(`on data channel ${channel.id}, ${channel.label}`, this.logContext);
-    channel.onmessage = this.handleDataMessage;
+    channel.onmessage = handler;
   };
 
   private handleDataMessage = async (message: MessageEvent) => {
@@ -840,6 +951,21 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     }
   };
 
+  private handleDataTrackMessage = async (message: MessageEvent) => {
+    // Decode / normalize into a common format
+    let buffer: ArrayBuffer | undefined;
+    if (message.data instanceof ArrayBuffer) {
+      buffer = message.data;
+    } else if (message.data instanceof Blob) {
+      buffer = await message.data.arrayBuffer();
+    } else {
+      this.log.error('unsupported data type', { ...this.logContext, data: message.data });
+      return;
+    }
+
+    this.emit('dataTrackPacketReceived', new Uint8Array(buffer));
+  };
+
   private handleDataError = (event: Event) => {
     const channel = event.currentTarget as RTCDataChannel;
     const channelKind = channel.maxRetransmits === 0 ? 'lossy' : 'reliable';
@@ -855,11 +981,7 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     }
   };
 
-  private handleBufferedAmountLow = (event: Event) => {
-    const channel = event.currentTarget as RTCDataChannel;
-    const channelKind =
-      channel.maxRetransmits === 0 ? DataPacket_Kind.LOSSY : DataPacket_Kind.RELIABLE;
-
+  private handleBufferedAmountLow = (channelKind: DataChannelKind) => {
     this.updateAndEmitDCBufferStatus(channelKind);
   };
 
@@ -1107,13 +1229,15 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
           throw new SignalReconnectError();
         }
         // in case a regionUrl is passed, the region URL takes precedence
-        joinResponse = await this.join(
-          regionUrl ?? this.url,
-          this.token,
-          this.signalOpts,
-          undefined,
-          !this.options.singlePeerConnection,
-        );
+        joinResponse = (
+          await this.join(
+            regionUrl ?? this.url,
+            this.token,
+            this.signalOpts,
+            undefined,
+            !this.options.singlePeerConnection,
+          )
+        ).joinResponse;
       } catch (e) {
         if (e instanceof ConnectionError && e.reason === ConnectionErrorReason.NotAllowed) {
           throw new UnexpectedConnectionState('could not reconnect, token might be expired');
@@ -1288,7 +1412,7 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
       },
     });
 
-    await this.sendDataPacket(packet, DataPacket_Kind.RELIABLE);
+    await this.sendDataPacket(packet, DataChannelKind.RELIABLE);
   }
 
   /** @internal */
@@ -1303,11 +1427,11 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
         }),
       },
     });
-    await this.sendDataPacket(packet, DataPacket_Kind.RELIABLE);
+    await this.sendDataPacket(packet, DataChannelKind.RELIABLE);
   }
 
   /* @internal */
-  async sendDataPacket(packet: DataPacket, kind: DataPacket_Kind) {
+  async sendDataPacket(packet: DataPacket, kind: DataChannelKind) {
     // make sure we do have a data connection
     await this.ensurePublisherConnected(kind);
 
@@ -1326,57 +1450,93 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
       }
     }
 
-    if (kind === DataPacket_Kind.RELIABLE) {
+    if (kind === DataChannelKind.RELIABLE) {
       packet.sequence = this.reliableDataSequence;
       this.reliableDataSequence += 1;
     }
 
     const msg = packet.toBinary();
 
+    switch (kind) {
+      case DataChannelKind.LOSSY:
+      case DataChannelKind.DATA_TRACK_LOSSY:
+        return this.sendLossyBytes(msg, kind);
+
+      case DataChannelKind.RELIABLE:
+        const dc = this.dataChannelForKind(kind);
+        if (dc) {
+          await this.waitForBufferStatusLow(kind);
+          this.reliableMessageBuffer.push({ data: msg, sequence: packet.sequence });
+
+          if (this.attemptingReconnect) {
+            return;
+          }
+
+          dc.send(msg);
+        }
+
+        this.updateAndEmitDCBufferStatus(kind);
+        break;
+    }
+  }
+
+  /* @internal */
+  async sendLossyBytes(
+    bytes: Uint8Array,
+    kind: Exclude<DataChannelKind, DataChannelKind.RELIABLE>,
+    bufferStatusLowBehavior: 'drop' | 'wait' = 'drop',
+  ) {
+    // make sure we do have a data connection
+    await this.ensurePublisherConnected(kind);
+
     const dc = this.dataChannelForKind(kind);
     if (dc) {
-      if (kind === DataPacket_Kind.RELIABLE) {
-        await this.waitForBufferStatusLow(kind);
-        this.reliableMessageBuffer.push({ data: msg, sequence: packet.sequence });
-      } else {
-        // lossy channel, drop messages to reduce latency
-        if (!this.isBufferStatusLow(kind)) {
-          this.lossyDataDropCount += 1;
-          if (this.lossyDataDropCount % 100 === 0) {
-            this.log.warn(
-              `dropping lossy data channel messages, total dropped: ${this.lossyDataDropCount}`,
-              this.logContext,
-            );
-          }
-          return;
+      if (!this.isBufferStatusLow(kind)) {
+        // Depending on the exact circumstance that data is being sent, either drop or wait for the
+        // buffer status to not be low before continuing.
+        switch (bufferStatusLowBehavior) {
+          case 'wait':
+            await this.waitForBufferStatusLow(kind);
+            break;
+          case 'drop':
+            // this.log.warn(`dropping lossy data channel message`, this.logContext);
+            // Drop messages to reduce latency
+            this.lossyDataDropCount += 1;
+            if (this.lossyDataDropCount % 100 === 0) {
+              this.log.warn(
+                `dropping lossy data channel messages, total dropped: ${this.lossyDataDropCount}`,
+                this.logContext,
+              );
+            }
+            return;
         }
-        this.lossyDataStatCurrentBytes += msg.byteLength;
       }
+      this.lossyDataStatCurrentBytes += bytes.byteLength;
 
       if (this.attemptingReconnect) {
         return;
       }
 
-      dc.send(msg);
+      dc.send(bytes);
     }
 
     this.updateAndEmitDCBufferStatus(kind);
   }
 
   private async resendReliableMessagesForResume(lastMessageSeq: number) {
-    await this.ensurePublisherConnected(DataPacket_Kind.RELIABLE);
-    const dc = this.dataChannelForKind(DataPacket_Kind.RELIABLE);
+    await this.ensurePublisherConnected(DataChannelKind.RELIABLE);
+    const dc = this.dataChannelForKind(DataChannelKind.RELIABLE);
     if (dc) {
       this.reliableMessageBuffer.popToSequence(lastMessageSeq);
       this.reliableMessageBuffer.getAll().forEach((msg) => {
         dc.send(msg.data);
       });
     }
-    this.updateAndEmitDCBufferStatus(DataPacket_Kind.RELIABLE);
+    this.updateAndEmitDCBufferStatus(DataChannelKind.RELIABLE);
   }
 
-  private updateAndEmitDCBufferStatus = (kind: DataPacket_Kind) => {
-    if (kind === DataPacket_Kind.RELIABLE) {
+  private updateAndEmitDCBufferStatus = (kind: DataChannelKind) => {
+    if (kind === DataChannelKind.RELIABLE) {
       const dc = this.dataChannelForKind(kind);
       if (dc) {
         this.reliableMessageBuffer.alignBufferedAmount(dc.bufferedAmount);
@@ -1390,25 +1550,38 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     }
   };
 
-  private isBufferStatusLow = (kind: DataPacket_Kind): boolean | undefined => {
+  private isBufferStatusLow = (kind: DataChannelKind): boolean | undefined => {
     const dc = this.dataChannelForKind(kind);
     if (dc) {
       return dc.bufferedAmount <= dc.bufferedAmountLowThreshold;
     }
   };
 
-  waitForBufferStatusLow(kind: DataPacket_Kind): TypedPromise<void, UnexpectedConnectionState> {
-    return new TypedPromise(async (resolve, reject) => {
+  async waitForBufferStatusLow(kind: DataChannelKind) {
+    return new TypedPromise<void, UnexpectedConnectionState>(async (resolve, reject) => {
+      if (this.isClosed) {
+        reject(new UnexpectedConnectionState('engine closed'));
+      }
       if (this.isBufferStatusLow(kind)) {
         resolve();
       } else {
         const onClosing = () => reject(new UnexpectedConnectionState('engine closed'));
         this.once(EngineEvent.Closing, onClosing);
-        while (!this.dcBufferStatus.get(kind)) {
-          await sleep(10);
+        const dc = this.dataChannelForKind(kind);
+        if (!dc) {
+          reject(new UnexpectedConnectionState(`DataChannel not found, kind: ${kind}`));
+          return;
         }
-        this.off(EngineEvent.Closing, onClosing);
-        resolve();
+        dc.addEventListener(
+          'bufferedamountlow',
+          () => {
+            this.off(EngineEvent.Closing, onClosing);
+            resolve();
+          },
+          {
+            once: true,
+          },
+        );
       }
     });
   }
@@ -1417,7 +1590,7 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
    * @internal
    */
   async ensureDataTransportConnected(
-    kind: DataPacket_Kind,
+    kind: DataChannelKind,
     subscriber: boolean = this.subscriberPrimary,
   ) {
     if (!this.pcManager) {
@@ -1472,7 +1645,7 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     );
   }
 
-  private async ensurePublisherConnected(kind: DataPacket_Kind) {
+  private async ensurePublisherConnected(kind: DataChannelKind) {
     if (!this.publisherConnectionPromise) {
       this.publisherConnectionPromise = this.ensureDataTransportConnected(kind, false);
     }
@@ -1513,7 +1686,8 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
       if (
         this.pcManager.publisher.getTransceivers().length == 0 &&
         !this.lossyDC &&
-        !this.reliableDC
+        !this.reliableDC &&
+        !this.dataTrackDC
       ) {
         this.createDataChannels();
       }
@@ -1573,26 +1747,35 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
     });
   }
 
-  dataChannelForKind(kind: DataPacket_Kind, sub?: boolean): RTCDataChannel | undefined {
-    if (!sub) {
-      if (kind === DataPacket_Kind.LOSSY) {
-        return this.lossyDC;
-      }
-      if (kind === DataPacket_Kind.RELIABLE) {
-        return this.reliableDC;
-      }
-    } else {
-      if (kind === DataPacket_Kind.LOSSY) {
-        return this.lossyDCSub;
-      }
-      if (kind === DataPacket_Kind.RELIABLE) {
-        return this.reliableDCSub;
-      }
+  dataChannelForKind(kind: DataChannelKind, sub?: boolean): RTCDataChannel | undefined {
+    switch (kind) {
+      case DataChannelKind.RELIABLE:
+        if (!sub) {
+          return this.reliableDC;
+        } else {
+          return this.reliableDCSub;
+        }
+      case DataChannelKind.LOSSY:
+        if (!sub) {
+          return this.lossyDC;
+        } else {
+          return this.lossyDCSub;
+        }
+      case DataChannelKind.DATA_TRACK_LOSSY:
+        if (!sub) {
+          return this.dataTrackDC;
+        } else {
+          return this.dataTrackDCSub;
+        }
     }
   }
 
   /** @internal */
-  sendSyncState(remoteTracks: RemoteTrackPublication[], localTracks: LocalTrackPublication[]) {
+  sendSyncState(
+    remoteTracks: RemoteTrackPublication[],
+    localTracks: LocalTrackPublication[],
+    localDataTrackInfos: Array<DataTrackInfo>,
+  ) {
     if (!this.pcManager) {
       this.log.warn('sync state cannot be sent without peer connection setup', this.logContext);
       return;
@@ -1664,6 +1847,9 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
             lastSeq: seq,
           });
         }),
+        publishDataTracks: localDataTrackInfos.map((info) => {
+          return new PublishDataTrackResponse({ info: DataTrackInfo.toProtobuf(info) });
+        }),
       }),
     );
   }
@@ -1687,10 +1873,10 @@ export default class RTCEngine extends (EventEmitter as new () => TypedEventEmit
         );
       }
     };
-    getInfo(this.dataChannelForKind(DataPacket_Kind.LOSSY), SignalTarget.PUBLISHER);
-    getInfo(this.dataChannelForKind(DataPacket_Kind.RELIABLE), SignalTarget.PUBLISHER);
-    getInfo(this.dataChannelForKind(DataPacket_Kind.LOSSY, true), SignalTarget.SUBSCRIBER);
-    getInfo(this.dataChannelForKind(DataPacket_Kind.RELIABLE, true), SignalTarget.SUBSCRIBER);
+    getInfo(this.dataChannelForKind(DataChannelKind.LOSSY), SignalTarget.PUBLISHER);
+    getInfo(this.dataChannelForKind(DataChannelKind.RELIABLE), SignalTarget.PUBLISHER);
+    getInfo(this.dataChannelForKind(DataChannelKind.LOSSY, true), SignalTarget.SUBSCRIBER);
+    getInfo(this.dataChannelForKind(DataChannelKind.RELIABLE, true), SignalTarget.SUBSCRIBER);
     return infos;
   }
 
@@ -1797,7 +1983,7 @@ export type EngineEventCallbacks = {
   /** @internal */
   trackSenderAdded: (track: Track, sender: RTCRtpSender) => void;
   rtpVideoMapUpdate: (rtpMap: Map<number, VideoCodec>) => void;
-  dcBufferStatusChanged: (isLow: boolean, kind: DataPacket_Kind) => void;
+  dcBufferStatusChanged: (isLow: boolean, kind: DataChannelKind) => void;
   participantUpdate: (infos: ParticipantInfo[]) => void;
   roomUpdate: (room: RoomModel) => void;
   roomMoved: (room: RoomMovedResponse) => void;
@@ -1813,12 +1999,13 @@ export type EngineEventCallbacks = {
   offline: () => void;
   signalRequestResponse: (response: RequestResponse) => void;
   signalConnected: (joinResp: JoinResponse) => void;
+  publishDataTrackResponse: (event: PublishDataTrackResponse) => void;
+  unPublishDataTrackResponse: (event: UnpublishDataTrackResponse) => void;
+  dataTrackSubscriberHandles: (event: DataTrackSubscriberHandles) => void;
+  dataTrackPacketReceived: (packet: Uint8Array) => void;
+  joined: (joinResponse: JoinResponse) => void;
 };
 
-function supportOptionalDatachannel(protocol: number | undefined): boolean {
-  return protocol !== undefined && protocol > 13;
-}
-
 function applyUserDataCompat(newObj: DataPacket, oldObj: UserPacket) {
   const participantIdentity = newObj.participantIdentity
     ? newObj.participantIdentity