livekit-client 2.18.7 → 2.18.9

package/dist/livekit-client.esm.mjs

@@ -8152,16 +8152,45 @@ var LoggerNames;
   LoggerNames["E2EE"] = "lk-e2ee";
   LoggerNames["DataTracks"] = "livekit-data-tracks";
 })(LoggerNames || (LoggerNames = {}));
-let livekitLogger = loglevelExports.getLogger('livekit');
+let livekitLogger = loglevelExports.getLogger(LoggerNames.Default);
 const livekitLoggers = Object.values(LoggerNames).map(name => loglevelExports.getLogger(name));
 livekitLogger.setDefaultLevel(LogLevel.info);
 /**
  * @internal
+ *
+ * Get a named logger. When `ctxFn` is supplied, every log call
+ * automatically:
+ * 1. prepends a `[key=value ...]` prefix derived from `ctxFn()` to the
+ *    message string, so identifiers are visible in browser devtools
+ *    without expanding the structured context object, and
+ * 2. merges `ctxFn()` into the structured context passed to any
+ *    `setLogExtension` consumer, so ingestion pipelines continue to
+ *    receive the full metadata unchanged.
  */
-function getLogger(name) {
+function getLogger(name, ctxFn) {
   const logger = loglevelExports.getLogger(name);
   logger.setDefaultLevel(livekitLogger.getLevel());
-  return logger;
+  if (!ctxFn) {
+    return logger;
+  }
+  return wrapWithContext(logger, ctxFn);
+}
+function wrapWithContext(base, ctxFn) {
+  // Resolve the underlying method on every call so that later
+  // setLogExtension installations (which replace the base logger's
+  // methods via loglevel's methodFactory) are picked up.
+  const wrap = method => (msg, extra) => {
+    const ctx = ctxFn();
+    const merged = ctx || extra ? Object.assign(Object.assign({}, ctx), extra) : undefined;
+    base[method](msg, merged);
+  };
+  const proxy = Object.create(base);
+  proxy.trace = wrap('trace');
+  proxy.debug = wrap('debug');
+  proxy.info = wrap('info');
+  proxy.warn = wrap('warn');
+  proxy.error = wrap('error');
+  return proxy;
 }
 function setLogLevel(level, loggerName) {
   if (loggerName) {
@@ -8194,7 +8223,7 @@ function setLogExtension(extension, logger) {
     logR.setLevel(logR.getLevel());
   });
 }
-const workerLogger = loglevelExports.getLogger('lk-e2ee');const maxRetryDelay = 7000;
+const workerLogger = loglevelExports.getLogger(LoggerNames.E2EE);const maxRetryDelay = 7000;
 const DEFAULT_RETRY_DELAYS_IN_MS = [0, 300, 2 * 2 * 300, 3 * 3 * 300, 4 * 4 * 300, maxRetryDelay, maxRetryDelay, maxRetryDelay, maxRetryDelay, maxRetryDelay];
 class DefaultReconnectPolicy {
   constructor(retryDelays) {
@@ -11744,7 +11773,7 @@ function getMatch(exp, ua) {
 }
 function getOSVersion(ua) {
   return ua.includes('mac os') ? getMatch(/\(.+?(\d+_\d+(:?_\d+)?)/, ua, 1).replace(/_/g, '.') : undefined;
-}var version$1 = "2.18.7";const version = version$1;
+}var version$1 = "2.18.9";const version = version$1;
 const protocolVersion = 16;/** Base error that all LiveKit specific custom errors inherit from. */
 class LivekitError extends Error {
   constructor(code, message, options) {
@@ -15115,6 +15144,9 @@ class DataTrackHandleAllocator {
     }
     return this.value;
   }
+  reset() {
+    this.value = 0;
+  }
 }const DataTrackInfo = {
   from(protocolInfo) {
     return {
@@ -15328,8 +15360,8 @@ class SignalClient {
       this.onClose = undefined;
       this.onMediaSectionsRequirement = undefined;
     };
-    this.log = getLogger((_a = loggerOptions.loggerName) !== null && _a !== void 0 ? _a : LoggerNames.Signal);
     this.loggerContextCb = loggerOptions.loggerContextCb;
+    this.log = getLogger((_a = loggerOptions.loggerName) !== null && _a !== void 0 ? _a : LoggerNames.Signal, () => this.logContext);
     this.useJSON = useJSON;
     this.requestQueue = new AsyncQueue();
     this.queuedRequests = [];
@@ -15359,7 +15391,7 @@ class SignalClient {
   reconnect(url, token, sid, reason) {
     return __awaiter(this, void 0, void 0, function* () {
       if (!this.options) {
-        this.log.warn('attempted to reconnect without signal options being set, ignoring', this.logContext);
+        this.log.warn('attempted to reconnect without signal options being set, ignoring');
         return;
       }
       this.state = SignalConnectionState.RECONNECTING;
@@ -15424,10 +15456,10 @@ class SignalClient {
             if (redactedUrl.searchParams.has('access_token')) {
               redactedUrl.searchParams.set('access_token', '<redacted>');
             }
-            this.log.debug("connecting to ".concat(redactedUrl), Object.assign({
+            this.log.info("signal connecting to ".concat(redactedUrl), {
               reconnect: opts.reconnect,
               reconnectReason: opts.reconnectReason
-            }, this.logContext));
+            });
             if (this.ws) {
               yield this.close(false);
             }
@@ -15439,12 +15471,12 @@ class SignalClient {
                   reject(ConnectionError.internal("Websocket got closed during a (re)connection attempt: ".concat(closeInfo.reason)));
                 }
                 if (closeInfo.closeCode !== 1000) {
-                  this.log.warn("websocket closed", Object.assign(Object.assign({}, this.logContext), {
+                  this.log.warn("websocket closed", {
                     reason: closeInfo.reason,
                     code: closeInfo.closeCode,
                     wasClean: closeInfo.closeCode === 1000,
                     state: this.state
-                  }));
+                  });
                   if (this.state === SignalConnectionState.CONNECTED) {
                     this.handleOnClose((_a = closeInfo.reason) !== null && _a !== void 0 ? _a : 'Unexpected WS error');
                   }
@@ -15492,10 +15524,10 @@ class SignalClient {
                 this.pingTimeoutDuration = firstSignalResponse.message.value.pingTimeout;
                 this.pingIntervalDuration = firstSignalResponse.message.value.pingInterval;
                 if (this.pingTimeoutDuration && this.pingTimeoutDuration > 0) {
-                  this.log.debug('ping config', Object.assign(Object.assign({}, this.logContext), {
+                  this.log.debug('ping config', {
                     timeout: this.pingTimeoutDuration,
                     interval: this.pingIntervalDuration
-                  }));
+                  });
                 }
                 if (this.onJoined) {
                   this.onJoined(firstSignalResponse.message.value);
@@ -15566,9 +15598,9 @@ class SignalClient {
             yield Promise.race([closePromise, sleep(MAX_WS_CLOSE_TIME)]);
           }
         } catch (e) {
-          _this3.log.debug('websocket error while closing', Object.assign(Object.assign({}, _this3.logContext), {
+          _this3.log.debug('websocket error while closing', {
             error: e
-          }));
+          });
         } finally {
           if (updateState) {
             _this3.state = SignalConnectionState.DISCONNECTED;
@@ -15580,9 +15612,9 @@ class SignalClient {
   }
   // initial offer after joining
   sendOffer(offer, offerId) {
-    this.log.debug('sending offer', Object.assign(Object.assign({}, this.logContext), {
+    this.log.debug('sending offer', {
       offerSdp: offer.sdp
-    }));
+    });
     this.sendRequest({
       case: 'offer',
       value: toProtoSessionDescription(offer, offerId)
@@ -15590,18 +15622,18 @@ class SignalClient {
   }
   // answer a server-initiated offer
   sendAnswer(answer, offerId) {
-    this.log.debug('sending answer', Object.assign(Object.assign({}, this.logContext), {
+    this.log.debug('sending answer', {
       answerSdp: answer.sdp
-    }));
+    });
     return this.sendRequest({
       case: 'answer',
       value: toProtoSessionDescription(answer, offerId)
     });
   }
   sendIceCandidate(candidate, target) {
-    this.log.debug('sending ice candidate', Object.assign(Object.assign({}, this.logContext), {
+    this.log.debug('sending ice candidate', {
       candidate
-    }));
+    });
     return this.sendRequest({
       case: 'trickle',
       value: new TrickleRequest({
@@ -15776,7 +15808,7 @@ class SignalClient {
           return;
         }
         if (!_this5.streamWriter) {
-          _this5.log.error("cannot send signal request before connected, type: ".concat(message === null || message === void 0 ? void 0 : message.case), _this5.logContext);
+          _this5.log.error("cannot send signal request before connected, type: ".concat(message === null || message === void 0 ? void 0 : message.case));
           return;
         }
         const req = new SignalRequest({
@@ -15789,9 +15821,9 @@ class SignalClient {
             yield _this5.streamWriter.write(req.toBinary());
           }
         } catch (e) {
-          _this5.log.error('error sending signal message', Object.assign(Object.assign({}, _this5.logContext), {
+          _this5.log.error('error sending signal message', {
             error: e
-          }));
+          });
         }
       }();
     });
@@ -15800,7 +15832,7 @@ class SignalClient {
     var _a, _b;
     const msg = res.message;
     if (msg == undefined) {
-      this.log.debug('received unsupported message', this.logContext);
+      this.log.debug('received unsupported message');
       return;
     }
     let pingHandled = false;
@@ -15907,9 +15939,9 @@ class SignalClient {
         this.onDataTrackSubscriberHandles(msg.value);
       }
     } else {
-      this.log.debug('unsupported message', Object.assign(Object.assign({}, this.logContext), {
+      this.log.debug('unsupported message', {
         msgCase: msg.case
-      }));
+      });
     }
     if (!pingHandled) {
       this.resetPingTimeout();
@@ -15928,18 +15960,18 @@ class SignalClient {
       if (this.state === SignalConnectionState.DISCONNECTED) return;
       const onCloseCallback = this.onClose;
       yield this.close(undefined, reason);
-      this.log.debug("websocket connection closed: ".concat(reason), Object.assign(Object.assign({}, this.logContext), {
+      this.log.info("websocket connection closed: ".concat(reason), {
         reason
-      }));
+      });
       if (onCloseCallback) {
         onCloseCallback(reason);
       }
     });
   }
   handleWSError(error) {
-    this.log.error('websocket error', Object.assign(Object.assign({}, this.logContext), {
+    this.log.error('websocket error', {
       error
-    }));
+    });
   }
   /**
    * Resets the ping timeout and starts a new timeout.
@@ -15948,11 +15980,11 @@ class SignalClient {
   resetPingTimeout() {
     this.clearPingTimeout();
     if (!this.pingTimeoutDuration) {
-      this.log.warn('ping timeout duration not set', this.logContext);
+      this.log.warn('ping timeout duration not set');
       return;
     }
     this.pingTimeout = CriticalTimers.setTimeout(() => {
-      this.log.warn("ping timeout triggered. last pong received at: ".concat(new Date(Date.now() - this.pingTimeoutDuration * 1000).toUTCString()), this.logContext);
+      this.log.warn("ping timeout triggered. last pong received at: ".concat(new Date(Date.now() - this.pingTimeoutDuration * 1000).toUTCString()));
       this.handleOnClose('ping timeout');
     }, this.pingTimeoutDuration * 1000);
   }
@@ -15968,16 +16000,16 @@ class SignalClient {
     this.clearPingInterval();
     this.resetPingTimeout();
     if (!this.pingIntervalDuration) {
-      this.log.warn('ping interval duration not set', this.logContext);
+      this.log.warn('ping interval duration not set');
       return;
     }
-    this.log.debug('start ping interval', this.logContext);
+    this.log.debug('start ping interval');
     this.pingInterval = CriticalTimers.setInterval(() => {
       this.sendPing();
     }, this.pingIntervalDuration * 1000);
   }
   clearPingInterval() {
-    this.log.debug('clearing ping interval', this.logContext);
+    this.log.debug('clearing ping interval');
     this.clearPingTimeout();
     if (this.pingInterval) {
       CriticalTimers.clearInterval(this.pingInterval);
@@ -15992,6 +16024,7 @@ class SignalClient {
    */
   handleSignalConnected(connection, timeoutHandle, firstMessage) {
     this.state = SignalConnectionState.CONNECTED;
+    this.log.info('signal connected');
     clearTimeout(timeoutHandle);
     this.startPingInterval();
     this.startReadingLoop(connection.readable.getReader(), firstMessage);
@@ -16018,7 +16051,7 @@ class SignalClient {
         };
       } else {
         // in reconnecting, any message received means signal reconnected and we still need to process it
-        this.log.debug('declaring signal reconnected without reconnect response received', this.logContext);
+        this.log.debug('declaring signal reconnected without reconnect response received');
         return {
           isValid: true,
           response: undefined,
@@ -17124,6 +17157,11 @@ const debounceInterval = 20;
 const PCEvents = {
   NegotiationStarted: 'negotiationStarted',
   NegotiationComplete: 'negotiationComplete',
+  // Fired with the offerId for every successful publisher answer application,
+  // including answers that immediately recurse into another offer via
+  // `renegotiate`. Use this rather than NegotiationComplete to know that a
+  // specific offer has been negotiated end-to-end.
+  OfferAnswered: 'offerAnswered',
   RTPVideoPayloadTypes: 'rtpVideoPayloadTypes'
 };
 /** @internal */
@@ -17141,6 +17179,7 @@ class PCTransport extends eventsExports.EventEmitter {
     this.log = livekitLogger;
     this.ddExtID = 0;
     this.latestOfferId = 0;
+    this.latestAcknowledgedOfferId = 0;
     this.pendingCandidates = [];
     this.restartingIce = false;
     this.renegotiate = false;
@@ -17313,6 +17352,13 @@ class PCTransport extends eventsExports.EventEmitter {
       });
       this.pendingCandidates = [];
       this.restartingIce = false;
+      // Fire OfferAnswered for every successfully applied answer, including the
+      // ones that recurse into another offer via `renegotiate`. Callers waiting
+      // on a specific offerId can resolve as soon as their offer's answer is in.
+      if (sd.type === 'answer') {
+        this.latestAcknowledgedOfferId = offerId;
+        this.emit(PCEvents.OfferAnswered, offerId);
+      }
       if (this.renegotiate) {
         this.renegotiate = false;
         yield this.createAndSendOffer();
@@ -17984,41 +18030,47 @@ class PCTransportManager {
   }
   negotiate(abortController) {
     return __awaiter(this, void 0, void 0, function* () {
-      return new TypedPromise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-        let negotiationTimeout = setTimeout(() => {
-          reject(new NegotiationError('negotiation timed out'));
-        }, this.peerConnectionTimeout);
+      return new TypedPromise((resolve, reject) => {
+        // Capture the publisher's latest offer id at request time. We are done
+        // when an offer with a higher id has had its answer successfully
+        // applied — that offer is the one that includes any transceiver/SDP
+        // changes that motivated this negotiate call. Concurrent callers each
+        // get their own checkpoint and resolve independently.
+        const checkpoint = this.publisher.latestOfferId;
+        // Race: an answer past our checkpoint already arrived before we had a
+        // chance to subscribe.
+        if (this.publisher.latestAcknowledgedOfferId > checkpoint) {
+          this.log.debug("negotiation already handled in more recent acknowledged offer", this.logContext);
+          resolve();
+          return;
+        }
+        let cleanedUp = false;
         const cleanup = () => {
-          clearTimeout(negotiationTimeout);
-          this.publisher.off(PCEvents.NegotiationStarted, onNegotiationStarted);
-          abortController.signal.removeEventListener('abort', abortHandler);
+          if (cleanedUp) return;
+          cleanedUp = true;
+          clearTimeout(deadlineTimer);
+          this.publisher.off(PCEvents.OfferAnswered, onAnswered);
+          abortController.signal.removeEventListener('abort', onAbort);
+        };
+        const onAnswered = offerId => {
+          if (offerId > checkpoint) {
+            cleanup();
+            resolve();
+          }
         };
-        const abortHandler = () => {
+        const onAbort = () => {
           cleanup();
           reject(new NegotiationError('negotiation aborted'));
         };
-        // Reset the timeout each time a renegotiation cycle starts. This
-        // prevents premature timeouts when the negotiation machinery is
-        // actively renegotiating (offers going out, answers coming back) but
-        // NegotiationComplete hasn't fired yet because new requirements keep
-        // arriving between offer/answer round-trips.
-        const onNegotiationStarted = () => {
-          if (abortController.signal.aborted) {
-            return;
-          }
-          clearTimeout(negotiationTimeout);
-          negotiationTimeout = setTimeout(() => {
-            cleanup();
-            reject(new NegotiationError('negotiation timed out'));
-          }, this.peerConnectionTimeout);
-        };
-        abortController.signal.addEventListener('abort', abortHandler);
-        this.publisher.on(PCEvents.NegotiationStarted, onNegotiationStarted);
-        this.publisher.once(PCEvents.NegotiationComplete, () => {
+        // Single hard deadline as a backstop. Not reset on cycle progress —
+        // progress is tracked via OfferAnswered, not NegotiationStarted.
+        const deadlineTimer = setTimeout(() => {
           cleanup();
-          resolve();
-        });
-        yield this.publisher.negotiate(e => {
+          reject(new NegotiationError('negotiation timed out'));
+        }, this.peerConnectionTimeout);
+        abortController.signal.addEventListener('abort', onAbort);
+        this.publisher.on(PCEvents.OfferAnswered, onAnswered);
+        this.publisher.negotiate(e => {
           cleanup();
           if (e instanceof Error) {
             reject(e);
@@ -18026,7 +18078,7 @@ class PCTransportManager {
             reject(new Error(String(e)));
           }
         });
-      }));
+      });
     });
   }
   addPublisherTransceiver(track, transceiverInit) {
@@ -20347,7 +20399,7 @@ class RTCEngine extends eventsExports.EventEmitter {
         } else {
           return;
         }
-        _this.log.debug("on data channel ".concat(channel.id, ", ").concat(channel.label), _this.logContext);
+        _this.log.debug("on data channel ".concat(channel.id, ", ").concat(channel.label));
         channel.onmessage = handler;
       }();
     });
@@ -20363,9 +20415,9 @@ class RTCEngine extends eventsExports.EventEmitter {
         } else if (message.data instanceof Blob) {
           buffer = yield message.data.arrayBuffer();
         } else {
-          this.log.error('unsupported data type', Object.assign(Object.assign({}, this.logContext), {
+          this.log.error('unsupported data type', {
             data: message.data
-          }));
+          });
           return;
         }
         const dp = DataPacket.fromBinary(new Uint8Array(buffer));
@@ -20382,7 +20434,7 @@ class RTCEngine extends eventsExports.EventEmitter {
           this.emit(EngineEvent.ActiveSpeakersUpdate, dp.value.value.speakers);
         } else if (((_b = dp.value) === null || _b === void 0 ? void 0 : _b.case) === 'encryptedPacket') {
           if (!this.e2eeManager) {
-            this.log.error('Received encrypted packet but E2EE not set up', this.logContext);
+            this.log.error('Received encrypted packet but E2EE not set up');
             return;
           }
           const decryptedData = yield (_c = this.e2eeManager) === null || _c === void 0 ? void 0 : _c.handleEncryptedData(dp.value.value.encryptedValue, dp.value.value.iv, dp.participantIdentity, dp.value.value.keyIndex);
@@ -20416,9 +20468,9 @@ class RTCEngine extends eventsExports.EventEmitter {
       } else if (message.data instanceof Blob) {
         buffer = yield message.data.arrayBuffer();
       } else {
-        this.log.error('unsupported data type', Object.assign(Object.assign({}, this.logContext), {
+        this.log.error('unsupported data type', {
           data: message.data
-        }));
+        });
         return;
       }
       this.emit('dataTrackPacketReceived', new Uint8Array(buffer));
@@ -20430,13 +20482,13 @@ class RTCEngine extends eventsExports.EventEmitter {
         const {
           error
         } = event.error;
-        this.log.error("DataChannel error on ".concat(channelKind, ": ").concat(event.message), Object.assign(Object.assign({}, this.logContext), {
+        this.log.error("DataChannel error on ".concat(channelKind, ": ").concat(event.message), {
           error
-        }));
+        });
       } else {
-        this.log.error("Unknown DataChannel error on ".concat(channelKind), Object.assign(Object.assign({}, this.logContext), {
+        this.log.error("Unknown DataChannel error on ".concat(channelKind), {
           event
-        }));
+        });
       }
     };
     this.handleBufferedAmountLow = channelKind => {
@@ -20449,13 +20501,13 @@ class RTCEngine extends eventsExports.EventEmitter {
       if (this._isClosed) {
         return;
       }
-      this.log.warn("".concat(connection, " disconnected"), this.logContext);
+      this.log.warn("".concat(connection, " disconnected"));
       if (this.reconnectAttempts === 0) {
         // only reset start time on the first try
         this.reconnectStart = Date.now();
       }
       const disconnect = duration => {
-        this.log.warn("could not recover connection after ".concat(this.reconnectAttempts, " attempts, ").concat(duration, "ms. giving up"), this.logContext);
+        this.log.warn("could not recover connection after ".concat(this.reconnectAttempts, " attempts, ").concat(duration, "ms. giving up"));
         this.emit(EngineEvent.Disconnected);
         this.close();
       };
@@ -20471,7 +20523,7 @@ class RTCEngine extends eventsExports.EventEmitter {
       if (connection === leaveReconnect) {
         delay = 0;
       }
-      this.log.debug("reconnecting in ".concat(delay, "ms"), this.logContext);
+      this.log.debug("reconnecting in ".concat(delay, "ms"));
       this.clearReconnectTimeout();
       if (this.token) {
         // token may have been refreshed, we do not want to recreate the regionUrlProvider
@@ -20555,7 +20607,7 @@ class RTCEngine extends eventsExports.EventEmitter {
         }
       }
     });
-    this.log = getLogger((_a = options.loggerName) !== null && _a !== void 0 ? _a : LoggerNames.Engine);
+    this.log = getLogger((_a = options.loggerName) !== null && _a !== void 0 ? _a : LoggerNames.Engine, () => this.logContext);
     this.loggerOptions = {
       loggerName: options.loggerName,
       loggerContextCb: () => this.logContext
@@ -20599,7 +20651,7 @@ class RTCEngine extends eventsExports.EventEmitter {
       var _this2 = this;
       let useV0Path = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
       return function* () {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c;
         _this2._isNewlyCreated = false;
         _this2.url = url;
         _this2.token = token;
@@ -20641,7 +20693,7 @@ class RTCEngine extends eventsExports.EventEmitter {
             // create offer
             if (!_this2.subscriberPrimary || joinResponse.fastPublish) {
               _this2.negotiate().catch(err => {
-                livekitLogger.error(err, _this2.logContext);
+                _this2.log.error(err);
               });
             }
           }
@@ -20655,14 +20707,10 @@ class RTCEngine extends eventsExports.EventEmitter {
               region: joinResponse.serverRegion
             };
           }
-          _this2.log.debug("connected to Livekit Server ".concat(Object.entries(serverInfo).map(_ref2 => {
+          _this2.log.info("connected to Livekit Server ".concat(Object.entries(serverInfo).map(_ref2 => {
             let [key, value] = _ref2;
             return "".concat(key, ": ").concat(value);
-          }).join(', ')), {
-            room: (_d = joinResponse.room) === null || _d === void 0 ? void 0 : _d.name,
-            roomSid: (_e = joinResponse.room) === null || _e === void 0 ? void 0 : _e.sid,
-            identity: (_f = joinResponse.participant) === null || _f === void 0 ? void 0 : _f.identity
-          });
+          }).join(', ')));
           return {
             joinResponse,
             serverInfo
@@ -20670,7 +20718,7 @@ class RTCEngine extends eventsExports.EventEmitter {
         } catch (e) {
           if (e instanceof ConnectionError) {
             if (e.reason === ConnectionErrorReason.ServerUnreachable) {
-              _this2.log.warn("Couldn't connect to server, attempt ".concat(_this2.joinAttempts, " of ").concat(_this2.maxJoinAttempts), _this2.logContext);
+              _this2.log.warn("Couldn't connect to server, attempt ".concat(_this2.joinAttempts, " of ").concat(_this2.maxJoinAttempts));
               if (_this2.joinAttempts < _this2.maxJoinAttempts) {
                 return _this2.join(url, token, opts, abortSignal, useV0Path);
               }
@@ -20807,9 +20855,9 @@ class RTCEngine extends eventsExports.EventEmitter {
       this.pcManager.removeTrack(sender);
       return true;
     } catch (e) {
-      this.log.warn('failed to remove track', Object.assign(Object.assign({}, this.logContext), {
+      this.log.warn('failed to remove track', {
         error: e
-      }));
+      });
     }
     return false;
   }
@@ -20854,7 +20902,7 @@ class RTCEngine extends eventsExports.EventEmitter {
       };
       this.pcManager.onDataChannel = this.handleDataChannel;
       this.pcManager.onStateChange = (connectionState, publisherState, subscriberState) => __awaiter(this, void 0, void 0, function* () {
-        this.log.debug("primary PC state changed ".concat(connectionState), this.logContext);
+        this.log.debug("primary PC state changed ".concat(connectionState));
         if (['closed', 'disconnected', 'failed'].includes(publisherState)) {
           // reset publisher connection promise
           this.publisherConnectionPromise = undefined;
@@ -20893,11 +20941,11 @@ class RTCEngine extends eventsExports.EventEmitter {
       if (!this.pcManager) {
         return;
       }
-      this.log.debug('received server answer', Object.assign(Object.assign({}, this.logContext), {
+      this.log.debug('received server answer', {
         RTCSdpType: sd.type,
         sdp: sd.sdp,
         midToTrackId
-      }));
+      });
       this.midToTrackId = midToTrackId;
       yield this.pcManager.setPublisherAnswer(sd, offerId);
     });
@@ -20906,10 +20954,10 @@ class RTCEngine extends eventsExports.EventEmitter {
       if (!this.pcManager) {
         return;
       }
-      this.log.debug('got ICE candidate from peer', Object.assign(Object.assign({}, this.logContext), {
+      this.log.debug('got ICE candidate from peer', {
         candidate,
         target
-      }));
+      });
       this.pcManager.addIceCandidate(candidate, target);
     };
     // when server creates an offer for the client
@@ -20926,14 +20974,14 @@ class RTCEngine extends eventsExports.EventEmitter {
     });
     this.client.onLocalTrackPublished = res => {
       var _a;
-      this.log.debug('received trackPublishedResponse', Object.assign(Object.assign({}, this.logContext), {
+      this.log.debug('received trackPublishedResponse', {
         cid: res.cid,
         track: (_a = res.track) === null || _a === void 0 ? void 0 : _a.sid
-      }));
+      });
       if (!this.pendingTrackResolvers[res.cid]) {
-        this.log.error("missing track resolver for ".concat(res.cid), Object.assign(Object.assign({}, this.logContext), {
+        this.log.error("missing track resolver for ".concat(res.cid), {
           cid: res.cid
-        }));
+        });
         return;
       }
       const {
@@ -20983,11 +21031,11 @@ class RTCEngine extends eventsExports.EventEmitter {
       this.handleDisconnect('signal', ReconnectReason.RR_SIGNAL_DISCONNECTED);
     };
     this.client.onLeave = leave => {
-      this.log.debug('client leave request', Object.assign(Object.assign({}, this.logContext), {
+      this.log.info("client leave request received (action=".concat(leave === null || leave === void 0 ? void 0 : leave.action, ")"), {
         reason: leave === null || leave === void 0 ? void 0 : leave.reason
-      }));
+      });
       if (leave.regions) {
-        this.log.debug('updating regions', this.logContext);
+        this.log.debug('updating regions');
         this.emit(EngineEvent.ServerRegionsReported, leave.regions);
       }
       switch (leave.action) {
@@ -21010,7 +21058,7 @@ class RTCEngine extends eventsExports.EventEmitter {
     var _a;
     const rtcConfig = Object.assign({}, this.rtcConfig);
     if ((_a = this.signalOpts) === null || _a === void 0 ? void 0 : _a.e2eeEnabled) {
-      this.log.debug('E2EE - setting up transports with insertable streams', this.logContext);
+      this.log.debug('E2EE - setting up transports with insertable streams');
       //  this makes sure that no data is sent before the transforms are ready
       // @ts-ignore
       rtcConfig.encodedInsertableStreams = true;
@@ -21118,7 +21166,7 @@ class RTCEngine extends eventsExports.EventEmitter {
         return sender;
       }
       if (supportsAddTrack()) {
-        this.log.warn('using add-track fallback', this.logContext);
+        this.log.warn('using add-track fallback');
         const sender = yield this.createRTCRtpSender(track.mediaStreamTrack);
         return sender;
       }
@@ -21132,7 +21180,7 @@ class RTCEngine extends eventsExports.EventEmitter {
         return this.createSimulcastTransceiverSender(track, simulcastTrack, opts, encodings);
       }
       if (supportsAddTrack()) {
-        this.log.debug('using add-track fallback', this.logContext);
+        this.log.debug('using add-track fallback');
         return this.createRTCRtpSender(track.mediaStreamTrack);
       }
       throw new UnexpectedConnectionState('Cannot stream on this device');
@@ -21198,7 +21246,7 @@ class RTCEngine extends eventsExports.EventEmitter {
       }
       // guard for attempting reconnection multiple times while one attempt is still not finished
       if (this.attemptingReconnect) {
-        livekitLogger.warn('already attempting reconnect, returning early', this.logContext);
+        this.log.warn('already attempting reconnect, returning early');
         return;
       }
       if (((_a = this.clientConfiguration) === null || _a === void 0 ? void 0 : _a.resumeConnection) === ClientConfigSetting.DISABLED ||
@@ -21220,9 +21268,9 @@ class RTCEngine extends eventsExports.EventEmitter {
         this.reconnectAttempts += 1;
         let recoverable = true;
         if (e instanceof UnexpectedConnectionState) {
-          this.log.debug('received unrecoverable error', Object.assign(Object.assign({}, this.logContext), {
+          this.log.debug('received unrecoverable error', {
             error: e
-          }));
+          });
           // unrecoverable
           recoverable = false;
         } else if (!(e instanceof SignalReconnectError)) {
@@ -21232,7 +21280,7 @@ class RTCEngine extends eventsExports.EventEmitter {
         if (recoverable) {
           this.handleDisconnect('reconnect', ReconnectReason.RR_UNKNOWN);
         } else {
-          this.log.info("could not recover connection after ".concat(this.reconnectAttempts, " attempts, ").concat(Date.now() - this.reconnectStart, "ms. giving up"), this.logContext);
+          this.log.info("could not recover connection after ".concat(this.reconnectAttempts, " attempts, ").concat(Date.now() - this.reconnectStart, "ms. giving up"));
           this.emit(EngineEvent.Disconnected);
           yield this.close();
         }
@@ -21245,9 +21293,9 @@ class RTCEngine extends eventsExports.EventEmitter {
     try {
       return this.reconnectPolicy.nextRetryDelayInMs(context);
     } catch (e) {
-      this.log.warn('encountered error in reconnect policy', Object.assign(Object.assign({}, this.logContext), {
+      this.log.warn('encountered error in reconnect policy', {
         error: e
-      }));
+      });
     }
     // error in user code with provided reconnect policy, stop reconnecting
     return null;
@@ -21260,7 +21308,7 @@ class RTCEngine extends eventsExports.EventEmitter {
           // permanent failure, don't attempt reconnection
           throw new UnexpectedConnectionState('could not reconnect, url or token not saved');
         }
-        this.log.info("reconnecting, attempt: ".concat(this.reconnectAttempts), this.logContext);
+        this.log.info("reconnecting, attempt: ".concat(this.reconnectAttempts));
         this.emit(EngineEvent.Restarting);
         if (!this.client.isDisconnected) {
           yield this.client.sendLeave();
@@ -21270,7 +21318,7 @@ class RTCEngine extends eventsExports.EventEmitter {
         let joinResponse;
         try {
           if (!this.signalOpts) {
-            this.log.warn('attempted connection restart, without signal options present', this.logContext);
+            this.log.warn('attempted connection restart, without signal options present');
             throw new SignalReconnectError();
           }
           // in case a regionUrl is passed, the region URL takes precedence
@@ -21319,7 +21367,7 @@ class RTCEngine extends eventsExports.EventEmitter {
       if (!this.pcManager) {
         throw new UnexpectedConnectionState('publisher and subscriber connections unset');
       }
-      this.log.info("resuming signal connection, attempt ".concat(this.reconnectAttempts), this.logContext);
+      this.log.info("resuming signal connection, attempt ".concat(this.reconnectAttempts));
       this.emit(EngineEvent.Resuming);
       let res;
       try {
@@ -21329,9 +21377,9 @@ class RTCEngine extends eventsExports.EventEmitter {
         let message = '';
         if (error instanceof Error) {
           message = error.message;
-          this.log.error(error.message, Object.assign(Object.assign({}, this.logContext), {
+          this.log.error(error.message, {
             error
-          }));
+          });
         }
         if (error instanceof ConnectionError && error.reason === ConnectionErrorReason.NotAllowed) {
           throw new UnexpectedConnectionState('could not reconnect, token might be expired');
@@ -21349,7 +21397,7 @@ class RTCEngine extends eventsExports.EventEmitter {
           this.latestJoinResponse.serverInfo = res.serverInfo;
         }
       } else {
-        this.log.warn('Did not receive reconnect response', this.logContext);
+        this.log.warn('Did not receive reconnect response');
       }
       if (this.shouldFailNext) {
         this.shouldFailNext = false;
@@ -21385,7 +21433,7 @@ class RTCEngine extends eventsExports.EventEmitter {
   waitForPCReconnected() {
     return __awaiter(this, void 0, void 0, function* () {
       this.pcState = PCState.Reconnecting;
-      this.log.debug('waiting for peer connection to reconnect', this.logContext);
+      this.log.debug('waiting for peer connection to reconnect');
       try {
         yield sleep(minReconnectWait); // FIXME setTimeout again not ideal for a connection critical path
         if (!this.pcManager) {
@@ -21507,7 +21555,7 @@ class RTCEngine extends eventsExports.EventEmitter {
                 // Drop messages to reduce latency
                 _this3.lossyDataDropCount += 1;
                 if (_this3.lossyDataDropCount % 100 === 0) {
-                  _this3.log.warn("dropping lossy data channel messages, total dropped: ".concat(_this3.lossyDataDropCount), _this3.logContext);
+                  _this3.log.warn("dropping lossy data channel messages, total dropped: ".concat(_this3.lossyDataDropCount));
                 }
                 return;
             }
@@ -21585,7 +21633,7 @@ class RTCEngine extends eventsExports.EventEmitter {
         if (needNegotiation) {
           // start negotiation
           _this4.negotiate().catch(err => {
-            livekitLogger.error(err, _this4.logContext);
+            _this4.log.error(err);
           });
         }
         const targetChannel = _this4.dataChannelForKind(kind, subscriber);
@@ -21644,7 +21692,7 @@ class RTCEngine extends eventsExports.EventEmitter {
         const abortController = new AbortController();
         const handleClosed = () => {
           abortController.abort();
-          this.log.debug('engine disconnected while negotiation was ongoing', this.logContext);
+          this.log.debug('engine disconnected while negotiation was ongoing');
           resolve();
           return;
         };
@@ -21715,7 +21763,7 @@ class RTCEngine extends eventsExports.EventEmitter {
   sendSyncState(remoteTracks, localTracks, localDataTrackInfos) {
     var _a, _b, _c, _d;
     if (!this.pcManager) {
-      this.log.warn('sync state cannot be sent without peer connection setup', this.logContext);
+      this.log.warn('sync state cannot be sent without peer connection setup');
       return;
     }
     const previousPublisherOffer = this.pcManager.publisher.getLocalDescription();
@@ -23163,7 +23211,10 @@ const DataTrackSymbol = Symbol.for('lk.data-track');class RemoteDataTrack {
    */
   subscribe(options) {
     try {
-      const [stream] = this.manager.openSubscriptionStream(this.info.sid, options === null || options === void 0 ? void 0 : options.signal, options === null || options === void 0 ? void 0 : options.bufferSize);
+      const [stream, sfuSubscriptionComplete] = this.manager.openSubscriptionStream(this.info.sid, options === null || options === void 0 ? void 0 : options.signal, options === null || options === void 0 ? void 0 : options.bufferSize);
+      // Prevent uncaught promise rejections from bubbling up if rejections occur after the
+      // readable stream is discarded.
+      sfuSubscriptionComplete.catch(() => {});
       return stream;
     } catch (err) {
       // NOTE: Rethrow errors to break Throws<...> type boundary
@@ -23704,7 +23755,7 @@ class IncomingDataTrackManager extends eventsExports.EventEmitter {
      *
      * This is an index that allows track descriptors to be looked up
      * by subscriber handle in O(1) time, to make routing incoming packets
-     * a (hot code path) faster.
+     * (a hot code path) faster.
      */
     this.subscriptionHandles = new Map();
     this.e2eeManager = (_a = options === null || options === void 0 ? void 0 : options.e2eeManager) !== null && _a !== void 0 ? _a : null;
@@ -24188,8 +24239,9 @@ class IncomingDataTrackManager extends eventsExports.EventEmitter {
       }
     }
   }
-  /** Shutdown the manager, ending any subscriptions. */
-  shutdown() {
+  /** Resets the manager, ending any subscriptions, and getting it ready for the next room
+   * connection.  */
+  reset() {
     var _a, _b;
     for (const descriptor of this.descriptors.values()) {
       this.emit('trackUnpublished', {
@@ -24204,6 +24256,7 @@ class IncomingDataTrackManager extends eventsExports.EventEmitter {
       }
     }
     this.descriptors.clear();
+    this.subscriptionHandles.clear();
   }
 }class DataTrackPacketizerError extends LivekitReasonedError {
   constructor(message, reason, options) {
@@ -24402,9 +24455,31 @@ class DataTrackOutgoingPipelineError extends LivekitReasonedError {
     /** Represents the currently active {@link DataTrackHandle} for the publication. */
     this.handle = null;
     this.log = livekitLogger;
+    /** Resolves once the data track has sent all pending packets the rtc data channel buffer. */
+    this.flushedFuture = new Future();
+    this.isFlushed = true;
+    this.handleManagerReset = () => {
+      var _a, _b;
+      // When the associated manager resets, mark any in flight flushes as complete
+      // There's nothing actionable a user can do to get these to complete so no
+      // error is being thrown.
+      (_b = (_a = this.flushedFuture).resolve) === null || _b === void 0 ? void 0 : _b.call(_a);
+      this.manager.off('packetsFlushedChange', this.handleManagerPacketsFlushedChange);
+      this.manager.off('reset', this.handleManagerReset);
+    };
+    this.handleManagerPacketsFlushedChange = event => {
+      var _a, _b;
+      this.isFlushed = event.isFlushed;
+      if (event.isFlushed) {
+        (_b = (_a = this.flushedFuture).resolve) === null || _b === void 0 ? void 0 : _b.call(_a);
+        this.flushedFuture = new Future();
+      }
+    };
     this.options = options;
     this.manager = manager;
     this.log = getLogger(LoggerNames.DataTracks);
+    this.manager.on('packetsFlushedChange', this.handleManagerPacketsFlushedChange);
+    this.manager.on('reset', this.handleManagerReset);
   }
   /** @internal */
   static withExplicitHandle(options, manager, handle) {
@@ -24465,6 +24540,39 @@ class DataTrackOutgoingPipelineError extends LivekitReasonedError {
       throw err;
     }
   }
+  /**
+   * When called, waits for all in flight packets to be sent before resolving.
+   *
+   * Use this to:
+   *
+   * 1. Send frames exactly in order:
+   * ```ts
+   * await track.tryPush(/* ... *\/);
+   * await track.flush();
+   * await track.tryPush(/* ... *\/);
+   * await track.flush();
+   * // ... etc ...
+   * ```
+   *
+   * 2. Wait for frames to all be delivered before unpublishing a local data track:
+   *
+   * ```ts
+   * await track.tryPush(/* ... *\/);
+   * await track.tryPush(/* ... *\/);
+   * await track.tryPush(/* ... *\/);
+   * // ... etc ...
+   * await track.flush();
+   * await track.unpublish();
+   * ```
+   **/
+  flush() {
+    return __awaiter(this, void 0, void 0, function* () {
+      if (this.isFlushed) {
+        return;
+      }
+      return this.flushedFuture.promise;
+    });
+  }
   /**
    * Unpublish the track from the SFU. Once this is called, any further calls to {@link tryPush}
    * will fail.
@@ -24552,6 +24660,10 @@ class OutgoingDataTrackManager extends eventsExports.EventEmitter {
     super();
     this.handleAllocator = new DataTrackHandleAllocator();
     this.descriptors = new Map();
+    /** Number of packets for each data track which have been emitted via the `packetAvailable` event
+     * and which have not yet been sent via the rtc data channel yet. Once this goes to 0, then
+     * all in flight packets have been delivered, and the data tracks is "flushed". */
+    this.inFlightPacketCounter = new Map();
     this.e2eeManager = (_a = options === null || options === void 0 ? void 0 : options.e2eeManager) !== null && _a !== void 0 ? _a : null;
   }
   static withDescriptors(descriptors) {
@@ -24584,6 +24696,7 @@ class OutgoingDataTrackManager extends eventsExports.EventEmitter {
   tryProcessAndSend(handle, frame) {
     return __awaiter(this, void 0, void 0, function* () {
       var _a, e_1, _b, _c;
+      var _d;
       const descriptor = this.getDescriptor(handle);
       if ((descriptor === null || descriptor === void 0 ? void 0 : descriptor.type) !== 'active') {
         throw DataTrackPushFrameError.trackUnpublished();
@@ -24596,11 +24709,22 @@ class OutgoingDataTrackManager extends eventsExports.EventEmitter {
       }
       try {
         try {
-          for (var _d = true, _e = __asyncValues(descriptor.pipeline.processFrame(frame)), _f; _f = yield _e.next(), _a = _f.done, !_a; _d = true) {
-            _c = _f.value;
-            _d = false;
+          for (var _e = true, _f = __asyncValues(descriptor.pipeline.processFrame(frame)), _g; _g = yield _f.next(), _a = _g.done, !_a; _e = true) {
+            _c = _g.value;
+            _e = false;
             const packet = _c;
+            const prev = (_d = this.inFlightPacketCounter.get(handle)) !== null && _d !== void 0 ? _d : 0;
+            this.inFlightPacketCounter.set(handle, prev + 1);
+            if (prev === 0) {
+              // A new packet has been sent, so there are now packets in the rtc data channel buffer for
+              // this data track frame
+              this.emit('packetsFlushedChange', {
+                handle,
+                isFlushed: false
+              });
+            }
             this.emit('packetAvailable', {
+              handle,
               bytes: packet.toBinary()
             });
           }
@@ -24610,7 +24734,7 @@ class OutgoingDataTrackManager extends eventsExports.EventEmitter {
           };
         } finally {
           try {
-            if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
+            if (!_e && !_a && (_b = _f.return)) yield _b.call(_f);
           } finally {
             if (e_1) throw e_1.error;
           }
@@ -24622,6 +24746,26 @@ class OutgoingDataTrackManager extends eventsExports.EventEmitter {
       }
     });
   }
+  /** The client has sent a packet over the rtc data channel. This signal is used for determining
+   * once all packets are sent and a data track has been "flushed".
+   *
+   * @internal */
+  handlePacketSendComplete(handle) {
+    var _a;
+    const prev = (_a = this.inFlightPacketCounter.get(handle)) !== null && _a !== void 0 ? _a : 0;
+    let counter = prev - 1;
+    if (counter < 0) {
+      log.warn("OutgoingDataTrackManager.handlePacketSendComplete: inFlightPacketCounter was decremented below 0 (got ".concat(this.inFlightPacketCounter, " - resetting to 0. Were more packets send than were emitted?"));
+      counter = 0;
+    }
+    this.inFlightPacketCounter.set(handle, counter);
+    if (counter === 0) {
+      this.emit('packetsFlushedChange', {
+        handle,
+        isFlushed: true
+      });
+    }
+  }
   /**
    * Client requested to publish a track.
    *
@@ -24707,6 +24851,7 @@ class OutgoingDataTrackManager extends eventsExports.EventEmitter {
         handle
       });
       yield descriptor.unpublishingFuture.promise;
+      this.inFlightPacketCounter.delete(handle);
       this.emit('trackUnpublished', {
         sid: descriptor.info.sid
       });
@@ -24799,12 +24944,14 @@ class OutgoingDataTrackManager extends eventsExports.EventEmitter {
     }
   }
   /**
-   * Shuts down the manager and all associated tracks.
+   * Reset's the state of the manager and all associated tracks. Run on room disconnect to get
+   * the manager ready for the next room connection.
    * @internal
    **/
-  shutdown() {
+  reset() {
     return __awaiter(this, void 0, void 0, function* () {
       var _a, _b, _c, _d;
+      this.handleAllocator.reset();
       for (const descriptor of this.descriptors.values()) {
         switch (descriptor.type) {
           case 'pending':
@@ -24819,6 +24966,8 @@ class OutgoingDataTrackManager extends eventsExports.EventEmitter {
         }
       }
       this.descriptors.clear();
+      this.inFlightPacketCounter.clear();
+      this.emit('reset');
     });
   }
 }class RemoteTrack extends Track {
@@ -25933,8 +26082,8 @@ class Participant extends eventsExports.EventEmitter {
     this.isSpeaking = false;
     this._connectionQuality = ConnectionQuality.Unknown;
     this.log = livekitLogger;
-    this.log = getLogger((_a = loggerOptions === null || loggerOptions === void 0 ? void 0 : loggerOptions.loggerName) !== null && _a !== void 0 ? _a : LoggerNames.Participant);
     this.loggerOptions = loggerOptions;
+    this.log = getLogger((_a = loggerOptions === null || loggerOptions === void 0 ? void 0 : loggerOptions.loggerName) !== null && _a !== void 0 ? _a : LoggerNames.Participant, () => this.logContext);
     this.setMaxListeners(100);
     this.sid = sid;
     this.identity = identity;
@@ -26186,7 +26335,7 @@ class Participant extends eventsExports.EventEmitter {
       if (this.reconnectFuture) {
         // @throws-transformer ignore - introduced due to adding Throws into Future, investigate this
         // further
-        this.reconnectFuture.promise.catch(e => this.log.warn(e.message, this.logContext));
+        this.reconnectFuture.promise.catch(e => this.log.warn(e.message));
         (_b = (_a = this.reconnectFuture) === null || _a === void 0 ? void 0 : _a.reject) === null || _b === void 0 ? void 0 : _b.call(_a, new Error('Got disconnected during reconnection attempt'));
         this.reconnectFuture = undefined;
       }
@@ -26270,10 +26419,10 @@ class Participant extends eventsExports.EventEmitter {
       }
     };
     this.updateTrackSubscriptionPermissions = () => {
-      this.log.debug('updating track subscription permissions', Object.assign(Object.assign({}, this.logContext), {
+      this.log.debug('updating track subscription permissions', {
         allParticipantsAllowed: this.allParticipantsAllowedToSubscribe,
         participantTrackPermissions: this.participantTrackPermissions
-      }));
+      });
       this.engine.client.sendUpdateSubscriptionPermissions(this.allParticipantsAllowedToSubscribe, this.participantTrackPermissions.map(p => trackPermissionToProto(p)));
     };
     /** @internal */
@@ -26287,29 +26436,29 @@ class Participant extends eventsExports.EventEmitter {
         muted = true;
       }
       if (!track.sid) {
-        this.log.error('could not update mute status for unpublished track', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
+        this.log.error('could not update mute status for unpublished track', getLogContextFromTrack(track));
         return;
       }
       this.engine.updateMuteStatus(track.sid, muted);
     };
     this.onTrackUpstreamPaused = track => {
-      this.log.debug('upstream paused', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
+      this.log.debug('upstream paused', getLogContextFromTrack(track));
       this.onTrackMuted(track, true);
     };
     this.onTrackUpstreamResumed = track => {
-      this.log.debug('upstream resumed', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
+      this.log.debug('upstream resumed', getLogContextFromTrack(track));
       this.onTrackMuted(track, track.isMuted);
     };
     this.onTrackFeatureUpdate = track => {
       const pub = this.audioTrackPublications.get(track.sid);
       if (!pub) {
-        this.log.warn("Could not update local audio track settings, missing publication for track ".concat(track.sid), this.logContext);
+        this.log.warn("Could not update local audio track settings, missing publication for track ".concat(track.sid));
         return;
       }
       this.engine.client.sendUpdateLocalAudioTrack(pub.trackSid, pub.getTrackFeatures());
     };
     this.onTrackCpuConstrained = (track, publication) => {
-      this.log.debug('track cpu constrained', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(publication)));
+      this.log.debug('track cpu constrained', getLogContextFromTrack(publication));
       this.emit(ParticipantEvent.LocalTrackCpuConstrained, track, publication);
     };
     this.handleSubscribedQualityUpdate = update => __awaiter(this, void 0, void 0, function* () {
@@ -26320,9 +26469,9 @@ class Participant extends eventsExports.EventEmitter {
       }
       const pub = this.videoTrackPublications.get(update.trackSid);
       if (!pub) {
-        this.log.warn('received subscribed quality update for unknown track', Object.assign(Object.assign({}, this.logContext), {
+        this.log.warn('received subscribed quality update for unknown track', {
           trackSid: update.trackSid
-        }));
+        });
         return;
       }
       if (!pub.videoTrack) {
@@ -26335,7 +26484,7 @@ class Participant extends eventsExports.EventEmitter {
           _e = false;
           const codec = _c;
           if (isBackupCodec(codec)) {
-            this.log.debug("publish ".concat(codec, " for ").concat(pub.videoTrack.sid), Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(pub)));
+            this.log.debug("publish ".concat(codec, " for ").concat(pub.videoTrack.sid), getLogContextFromTrack(pub));
             yield this.publishAdditionalCodecForTrack(pub.videoTrack, codec, pub.options);
           }
         }
@@ -26354,16 +26503,16 @@ class Participant extends eventsExports.EventEmitter {
     this.handleLocalTrackUnpublished = unpublished => {
       const track = this.trackPublications.get(unpublished.trackSid);
       if (!track) {
-        this.log.warn('received unpublished event for unknown track', Object.assign(Object.assign({}, this.logContext), {
+        this.log.warn('received unpublished event for unknown track', {
           trackSid: unpublished.trackSid
-        }));
+        });
         return;
       }
       this.unpublishTrack(track.track);
     };
     this.handleTrackEnded = track => __awaiter(this, void 0, void 0, function* () {
       if (track.source === Track.Source.ScreenShare || track.source === Track.Source.ScreenShareAudio) {
-        this.log.debug('unpublishing local track due to TrackEnded', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
+        this.log.debug('unpublishing local track due to TrackEnded', getLogContextFromTrack(track));
         this.unpublishTrack(track);
       } else if (track.isUserProvided) {
         yield track.mute();
@@ -26377,7 +26526,7 @@ class Participant extends eventsExports.EventEmitter {
                 name: track.source === Track.Source.Camera ? 'camera' : 'microphone'
               });
               if (currentPermissions && currentPermissions.state === 'denied') {
-                this.log.warn("user has revoked access to ".concat(track.source), Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
+                this.log.warn("user has revoked access to ".concat(track.source), getLogContextFromTrack(track));
                 // detect granted change after permissions were denied to try and resume then
                 currentPermissions.onchange = () => {
                   if (currentPermissions.state !== 'denied') {
@@ -26394,7 +26543,7 @@ class Participant extends eventsExports.EventEmitter {
             }
           }
           if (!track.isMuted) {
-            this.log.debug('track ended, attempting to use a different device', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
+            this.log.debug('track ended, attempting to use a different device', getLogContextFromTrack(track));
             if (isLocalAudioTrack(track)) {
               // fall back to default device if available
               yield track.restartTrack({
@@ -26405,7 +26554,7 @@ class Participant extends eventsExports.EventEmitter {
             }
           }
         } catch (e) {
-          this.log.warn("could not restart track, muting instead", Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
+          this.log.warn("could not restart track, muting instead", getLogContextFromTrack(track));
           yield track.mute();
         }
       }
@@ -26598,10 +26747,10 @@ class Participant extends eventsExports.EventEmitter {
   setTrackEnabled(source, enabled, options, publishOptions) {
     return __awaiter(this, void 0, void 0, function* () {
       var _a, _b;
-      this.log.debug('setTrackEnabled', Object.assign(Object.assign({}, this.logContext), {
+      this.log.debug('setTrackEnabled', {
         source,
         enabled
-      }));
+      });
       if (this.republishPromise) {
         yield this.republishPromise;
       }
@@ -26614,9 +26763,9 @@ class Participant extends eventsExports.EventEmitter {
           if (this.pendingPublishing.has(source)) {
             const pendingTrack = yield this.waitForPendingPublicationOfSource(source);
             if (!pendingTrack) {
-              this.log.info('waiting for pending publication promise timed out', Object.assign(Object.assign({}, this.logContext), {
+              this.log.info('waiting for pending publication promise timed out', {
                 source
-              }));
+              });
             }
             yield pendingTrack === null || pendingTrack === void 0 ? void 0 : pendingTrack.unmute();
             return pendingTrack;
@@ -26653,14 +26802,14 @@ class Participant extends eventsExports.EventEmitter {
           for (const localTrack of localTracks) {
             const opts = Object.assign(Object.assign({}, this.roomOptions.publishDefaults), options);
             if (source === Track.Source.Microphone && isAudioTrack(localTrack) && opts.preConnectBuffer) {
-              this.log.info('starting preconnect buffer for microphone', Object.assign({}, this.logContext));
+              this.log.info('starting preconnect buffer for microphone');
               localTrack.startPreConnectBuffer();
             }
           }
           try {
             const publishPromises = [];
             for (const localTrack of localTracks) {
-              this.log.info('publishing track', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(localTrack)));
+              this.log.info('publishing track', getLogContextFromTrack(localTrack));
               publishPromises.push(this.publishTrack(localTrack, publishOptions));
             }
             const publishedTracks = yield Promise.all(publishPromises);
@@ -26681,9 +26830,9 @@ class Participant extends eventsExports.EventEmitter {
           // if there's no track available yet first wait for pending publishing promises of that source to see if it becomes available
           track = yield this.waitForPendingPublicationOfSource(source);
           if (!track) {
-            this.log.info('waiting for pending publication promise timed out', Object.assign(Object.assign({}, this.logContext), {
+            this.log.info('waiting for pending publication promise timed out', {
               source
-            }));
+            });
           }
         }
         if (track && track.track) {
@@ -26929,7 +27078,7 @@ class Participant extends eventsExports.EventEmitter {
           }
         });
         if (existingPublication) {
-          _this2.log.warn('track has already been published, skipping', Object.assign(Object.assign({}, _this2.logContext), getLogContextFromTrack(existingPublication)));
+          _this2.log.warn('track has already been published, skipping', getLogContextFromTrack(existingPublication));
           return existingPublication;
         }
         const opts = Object.assign(Object.assign({}, _this2.roomOptions.publishDefaults), options);
@@ -26940,16 +27089,16 @@ class Participant extends eventsExports.EventEmitter {
         // disable dtx for stereo track if not enabled explicitly
         if (isStereo) {
           if (opts.dtx === undefined) {
-            _this2.log.info("Opus DTX will be disabled for stereo tracks by default. Enable them explicitly to make it work.", Object.assign(Object.assign({}, _this2.logContext), getLogContextFromTrack(track)));
+            _this2.log.debug("Opus DTX will be disabled for stereo tracks by default. Enable them explicitly to make it work.", getLogContextFromTrack(track));
           }
           if (opts.red === undefined) {
-            _this2.log.info("Opus RED will be disabled for stereo tracks by default. Enable them explicitly to make it work.");
+            _this2.log.debug("Opus RED will be disabled for stereo tracks by default. Enable them explicitly to make it work.");
           }
           (_c = opts.dtx) !== null && _c !== void 0 ? _c : opts.dtx = false;
           (_d = opts.red) !== null && _d !== void 0 ? _d : opts.red = false;
         }
         if (!isE2EESimulcastSupported() && _this2.roomOptions.e2ee) {
-          _this2.log.info("End-to-end encryption is set up, simulcast publishing will be disabled on Safari versions and iOS browsers running iOS < v17.2", Object.assign({}, _this2.logContext));
+          _this2.log.info("End-to-end encryption is set up, simulcast publishing will be disabled on Safari versions and iOS browsers running iOS < v17.2");
           opts.simulcast = false;
         }
         if (opts.source) {
@@ -26958,9 +27107,9 @@ class Participant extends eventsExports.EventEmitter {
         const publishPromise = new Promise((resolve, reject) => __awaiter(_this2, void 0, void 0, function* () {
           try {
             if (this.engine.client.currentState !== SignalConnectionState.CONNECTED) {
-              this.log.debug('deferring track publication until signal is connected', Object.assign(Object.assign({}, this.logContext), {
+              this.log.debug('deferring track publication until signal is connected', {
                 track: getLogContextFromTrack(track)
-              }));
+              });
               let publicationTimedOut = false;
               const timeout = setTimeout(() => {
                 publicationTimedOut = true;
@@ -26992,9 +27141,9 @@ class Participant extends eventsExports.EventEmitter {
           return publication;
         } catch (e) {
           if (!hasRetriedAfterNegotiationError && e instanceof NegotiationError) {
-            _this2.log.warn('negotiation due to track publish failed, retrying after reconnect', Object.assign(Object.assign({}, _this2.logContext), {
+            _this2.log.warn('negotiation due to track publish failed, retrying after reconnect', {
               error: e
-            }));
+            });
             _this2.pendingPublishPromises.delete(track);
             yield _this2.waitForNextEngineRestart();
             return yield _this2.publishOrRepublishTrack(track, options, isRepublish, true);
@@ -27014,7 +27163,7 @@ class Participant extends eventsExports.EventEmitter {
   }
   hasPermissionsToPublish(track) {
     if (!this.permissions) {
-      this.log.warn('no permissions present for publishing track', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
+      this.log.warn('no permissions present for publishing track', getLogContextFromTrack(track));
       return false;
     }
     const {
@@ -27024,7 +27173,7 @@ class Participant extends eventsExports.EventEmitter {
     if (canPublish && (canPublishSources.length === 0 || canPublishSources.map(source => getTrackSourceFromProto(source)).includes(track.source))) {
       return true;
     }
-    this.log.warn('insufficient permissions to publish', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
+    this.log.warn('insufficient permissions to publish', getLogContextFromTrack(track));
     return false;
   }
   publish(track, opts, isStereo) {
@@ -27035,7 +27184,7 @@ class Participant extends eventsExports.EventEmitter {
       }
       const existingTrackOfSource = Array.from(this.trackPublications.values()).find(publishedTrack => isLocalTrack(track) && publishedTrack.source === track.source);
       if (existingTrackOfSource && track.source !== Track.Source.Unknown) {
-        this.log.info("publishing a second track with the same source: ".concat(track.source), Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
+        this.log.info("publishing a second track with the same source: ".concat(track.source), getLogContextFromTrack(track));
       }
       if (opts.stopMicTrackOnMute && isAudioTrack(track)) {
         track.stopOnMute = true;
@@ -27124,7 +27273,7 @@ class Participant extends eventsExports.EventEmitter {
             height: defaultRes.height
           };
           // log failure
-          this.log.error('could not determine track dimensions, using defaults', Object.assign(Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)), {
+          this.log.error('could not determine track dimensions, using defaults', Object.assign(Object.assign({}, getLogContextFromTrack(track)), {
             dims
           }));
         }
@@ -27145,7 +27294,7 @@ class Participant extends eventsExports.EventEmitter {
               // that we need
               if ('contentHint' in track.mediaStreamTrack) {
                 track.mediaStreamTrack.contentHint = 'motion';
-                this.log.info('forcing contentHint to motion for screenshare with SVC codecs', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
+                this.log.debug('forcing contentHint to motion for screenshare with SVC codecs', getLogContextFromTrack(track));
               }
             }
             // set scalabilityMode to 'L3T3_KEY' by default
@@ -27241,10 +27390,10 @@ class Participant extends eventsExports.EventEmitter {
             try {
               this.engine.pcManager.publisher.removeTrack(track.sender);
             } catch (e) {
-              this.log.error(e, this.logContext);
+              this.log.error(e);
             }
             yield this.engine.negotiate().catch(negotiateErr => {
-              this.log.error('failed to negotiate after removing track due to failed add track request', Object.assign(Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)), {
+              this.log.error('failed to negotiate after removing track due to failed add track request', Object.assign(Object.assign({}, getLogContextFromTrack(track)), {
                 error: negotiateErr
               }));
             });
@@ -27268,7 +27417,7 @@ class Participant extends eventsExports.EventEmitter {
         if (primaryCodecMime && track.kind === Track.Kind.Video) {
           const updatedCodec = mimeTypeToVideoCodecString(primaryCodecMime);
           if (updatedCodec !== videoCodec) {
-            this.log.debug('falling back to server selected codec', Object.assign(Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)), {
+            this.log.debug('falling back to server selected codec', Object.assign(Object.assign({}, getLogContextFromTrack(track)), {
               codec: updatedCodec
             }));
             opts.videoCodec = updatedCodec;
@@ -27299,10 +27448,10 @@ class Participant extends eventsExports.EventEmitter {
           };
         }
       }
-      this.log.debug("publishing ".concat(track.kind, " with encodings"), Object.assign(Object.assign({}, this.logContext), {
+      this.log.debug("publishing ".concat(track.kind, " with encodings"), {
         encodings,
         trackInfo: ti
-      }));
+      });
       if (isLocalVideoTrack(track)) {
         track.startMonitor(this.engine.client);
       } else if (isLocalAudioTrack(track)) {
@@ -27318,10 +27467,10 @@ class Participant extends eventsExports.EventEmitter {
         this.on(ParticipantEvent.LocalTrackSubscribed, pub => {
           if (pub.trackSid === ti.sid) {
             if (!track.hasPreConnectBuffer) {
-              this.log.warn('subscribe event came to late, buffer already closed', this.logContext);
+              this.log.warn('subscribe event came to late, buffer already closed');
               return;
             }
-            this.log.debug('finished recording preconnect buffer', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
+            this.log.debug('finished recording preconnect buffer', getLogContextFromTrack(track));
             track.stopPreConnectBuffer();
           }
         });
@@ -27330,13 +27479,13 @@ class Participant extends eventsExports.EventEmitter {
             var _a, e_2, _b, _c;
             var _d, _e;
             try {
-              this.log.debug('waiting for agent', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
+              this.log.debug('waiting for agent', getLogContextFromTrack(track));
               const agentActiveTimeout = setTimeout(() => {
                 reject(new Error('agent not active within 10 seconds'));
               }, 10000);
               const agent = yield this.waitUntilActiveAgentPresent();
               clearTimeout(agentActiveTimeout);
-              this.log.debug('sending preconnect buffer', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
+              this.log.debug('sending preconnect buffer', getLogContextFromTrack(track));
               const writer = yield this.streamBytes({
                 name: 'preconnect-buffer',
                 mimeType,
@@ -27373,9 +27522,9 @@ class Participant extends eventsExports.EventEmitter {
             }
           }));
           bufferStreamPromise.then(() => {
-            this.log.debug('preconnect buffer sent successfully', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
+            this.log.debug('preconnect buffer sent successfully', getLogContextFromTrack(track));
           }).catch(e => {
-            this.log.error('error sending preconnect buffer', Object.assign(Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)), {
+            this.log.error('error sending preconnect buffer', Object.assign(Object.assign({}, getLogContextFromTrack(track)), {
               error: e
             }));
           });
@@ -27416,7 +27565,7 @@ class Participant extends eventsExports.EventEmitter {
       const opts = Object.assign(Object.assign({}, (_a = this.roomOptions) === null || _a === void 0 ? void 0 : _a.publishDefaults), options);
       const encodings = computeTrackBackupEncodings(track, videoCodec, opts);
       if (!encodings) {
-        this.log.info("backup codec has been disabled, ignoring request to add additional codec for track", Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
+        this.log.info("backup codec has been disabled, ignoring request to add additional codec for track", getLogContextFromTrack(track));
         return;
       }
       const simulcastTrack = track.addSimulcastTrack(videoCodec, encodings);
@@ -27444,10 +27593,10 @@ class Participant extends eventsExports.EventEmitter {
       });
       const rets = yield Promise.all([this.engine.addTrack(req), negotiate()]);
       const ti = rets[0];
-      this.log.debug("published ".concat(videoCodec, " for track ").concat(track.sid), Object.assign(Object.assign({}, this.logContext), {
+      this.log.debug("published ".concat(videoCodec, " for track ").concat(track.sid), {
         encodings,
         trackInfo: ti
-      }));
+      });
     });
   }
   unpublishTrack(track, stopOnUnpublish) {
@@ -27456,16 +27605,16 @@ class Participant extends eventsExports.EventEmitter {
       if (isLocalTrack(track)) {
         const publishPromise = this.pendingPublishPromises.get(track);
         if (publishPromise) {
-          this.log.info('awaiting publish promise before attempting to unpublish', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
+          this.log.debug('awaiting publish promise before attempting to unpublish', getLogContextFromTrack(track));
           yield publishPromise;
         }
       }
       // look through all published tracks to find the right ones
       const publication = this.getPublicationForTrack(track);
       const pubLogContext = publication ? getLogContextFromTrack(publication) : undefined;
-      this.log.debug('unpublishing track', Object.assign(Object.assign({}, this.logContext), pubLogContext));
+      this.log.info('unpublishing track', pubLogContext);
       if (!publication || !publication.track) {
-        this.log.warn('track was not unpublished because no publication was found', Object.assign(Object.assign({}, this.logContext), pubLogContext));
+        this.log.warn('track was not unpublished because no publication was found', pubLogContext);
         return undefined;
       }
       track = publication.track;
@@ -27501,7 +27650,7 @@ class Participant extends eventsExports.EventEmitter {
           try {
             negotiationNeeded = this.engine.removeTrack(trackSender);
           } catch (e) {
-            this.log.warn(e, this.logContext);
+            this.log.warn(e);
             negotiationNeeded = true;
           }
           if (isLocalVideoTrack(track)) {
@@ -27510,7 +27659,7 @@ class Participant extends eventsExports.EventEmitter {
                 try {
                   negotiationNeeded = this.engine.removeTrack(trackInfo.sender);
                 } catch (e) {
-                  this.log.warn(e, this.logContext);
+                  this.log.warn(e);
                   negotiationNeeded = true;
                 }
                 trackInfo.sender = undefined;
@@ -27519,7 +27668,7 @@ class Participant extends eventsExports.EventEmitter {
             track.simulcastCodecs.clear();
           }
         } catch (e) {
-          this.log.warn('failed to unpublish track', Object.assign(Object.assign(Object.assign({}, this.logContext), pubLogContext), {
+          this.log.warn('failed to unpublish track', Object.assign(Object.assign({}, pubLogContext), {
             error: e
           }));
         }
@@ -27573,9 +27722,9 @@ class Participant extends eventsExports.EventEmitter {
               if (restartTracks && !track.isMuted && track.source !== Track.Source.ScreenShare && track.source !== Track.Source.ScreenShareAudio && (isLocalAudioTrack(track) || isLocalVideoTrack(track)) && !track.isUserProvided) {
                 // generally we need to restart the track before publishing, often a full reconnect
                 // is necessary because computer had gone to sleep.
-                this.log.debug('restarting existing track', Object.assign(Object.assign({}, this.logContext), {
+                this.log.debug('restarting existing track', {
                   track: pub.trackSid
-                }));
+                });
                 yield track.restartTrack();
               }
               yield this.publishOrRepublishTrack(track, pub.options, true);
@@ -27916,7 +28065,7 @@ class Participant extends eventsExports.EventEmitter {
       if (pub) {
         const mutedOnServer = pub.isMuted || ((_b = (_a = pub.track) === null || _a === void 0 ? void 0 : _a.isUpstreamPaused) !== null && _b !== void 0 ? _b : false);
         if (mutedOnServer !== ti.muted) {
-          this.log.debug('updating server mute state after reconcile', Object.assign(Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(pub)), {
+          this.log.debug('updating server mute state after reconcile', Object.assign(Object.assign({}, getLogContextFromTrack(pub)), {
             mutedOnServer
           }));
           this.engine.client.sendMuteTrack(ti.sid, mutedOnServer);
@@ -28700,7 +28849,7 @@ class Room extends eventsExports.EventEmitter {
       const unlockDisconnect = yield this.disconnectLock.lock();
       if (this.state === ConnectionState.Connected) {
         // when the state is reconnecting or connected, this function returns immediately
-        this.log.info("already connected to room ".concat(this.name), this.logContext);
+        this.log.info("already connected to room ".concat(this.name));
         unlockDisconnect();
         return Promise.resolve();
       }
@@ -28726,9 +28875,9 @@ class Room extends eventsExports.EventEmitter {
           var _a;
           (_a = this.regionUrlProvider) === null || _a === void 0 ? void 0 : _a.setServerReportedRegions(settings);
         }).catch(e => {
-          this.log.warn('could not fetch region settings', Object.assign(Object.assign({}, this.logContext), {
+          this.log.warn('could not fetch region settings', {
             error: e
-          }));
+          });
         });
       }
       const connectFn = (resolve, reject, regionUrl) => __awaiter(this, void 0, void 0, function* () {
@@ -28769,7 +28918,7 @@ class Room extends eventsExports.EventEmitter {
               BackOffStrategy.getInstance().addFailedConnectionAttempt(url);
             }
             if (nextUrl && !((_b = this.abortController) === null || _b === void 0 ? void 0 : _b.signal.aborted)) {
-              this.log.info("Initial connection failed with ConnectionError: ".concat(error.message, ". Retrying with another region: ").concat(nextUrl), this.logContext);
+              this.log.info("Initial connection failed with ConnectionError: ".concat(error.message, ". Retrying with another region: ").concat(nextUrl));
               this.recreateEngine(true);
               yield connectFn(resolve, reject, nextUrl);
             } else {
@@ -28811,7 +28960,7 @@ class Room extends eventsExports.EventEmitter {
         throw new UnsupportedServer('unknown server version');
       }
       if (serverInfo.version === '0.15.1' && this.options.dynacast) {
-        this.log.debug('disabling dynacast due to server version', this.logContext);
+        this.log.debug('disabling dynacast due to server version');
         // dynacast has a bug in 0.15.1, so we cannot use it then
         roomOptions.dynacast = false;
       }
@@ -28826,9 +28975,9 @@ class Room extends eventsExports.EventEmitter {
         try {
           this.e2eeManager.setSifTrailer(joinResponse.sifTrailer);
         } catch (e) {
-          this.log.error(e instanceof Error ? e.message : 'Could not set SifTrailer', Object.assign(Object.assign({}, this.logContext), {
+          this.log.error(e instanceof Error ? e.message : 'Could not set SifTrailer', {
             error: e
-          }));
+          });
         }
       }
       // populate remote participants, these should not trigger new events
@@ -28840,7 +28989,7 @@ class Room extends eventsExports.EventEmitter {
     this.attemptConnection = (url, token, opts, abortController) => __awaiter(this, void 0, void 0, function* () {
       var _a, _b;
       if (this.state === ConnectionState.Reconnecting || this.isResuming || ((_a = this.engine) === null || _a === void 0 ? void 0 : _a.pendingReconnect)) {
-        this.log.info('Reconnection attempt replaced by new connection attempt', this.logContext);
+        this.log.info('Reconnection attempt replaced by new connection attempt');
         // make sure we close and recreate the existing engine in order to get rid of any potentially ongoing reconnection attempts
         this.recreateEngine(true);
       } else {
@@ -28875,9 +29024,9 @@ class Room extends eventsExports.EventEmitter {
           resultingError.reason = err.reason;
           resultingError.status = err.status;
         }
-        this.log.debug("error trying to establish signal connection", Object.assign(Object.assign({}, this.logContext), {
+        this.log.debug("error trying to establish signal connection", {
           error: err
-        }));
+        });
         throw resultingError;
       }
       if (abortController.signal.aborted) {
@@ -28925,14 +29074,14 @@ class Room extends eventsExports.EventEmitter {
           const unlock = yield _this2.disconnectLock.lock();
           try {
             if (_this2.state === ConnectionState.Disconnected) {
-              _this2.log.debug('already disconnected', _this2.logContext);
+              _this2.log.debug('already disconnected');
               return;
             }
-            _this2.log.info('disconnect from room', Object.assign({}, _this2.logContext));
+            _this2.log.info('disconnect from room');
             if (_this2.state === ConnectionState.Connecting || _this2.state === ConnectionState.Reconnecting || _this2.isResuming) {
               // try aborting pending connection attempt
               const msg = 'Abort connection attempt due to user initiated disconnect';
-              _this2.log.warn(msg, _this2.logContext);
+              _this2.log.warn(msg);
               (_a = _this2.abortController) === null || _a === void 0 ? void 0 : _a.abort(msg);
               // in case the abort controller didn't manage to cancel the connection attempt, reject the connect promise explicitly
               (_c = (_b = _this2.connectFuture) === null || _b === void 0 ? void 0 : _b.reject) === null || _c === void 0 ? void 0 : _c.call(_b, ConnectionError.cancelled('Client initiated disconnect'));
@@ -28956,7 +29105,7 @@ class Room extends eventsExports.EventEmitter {
       });
     };
     this.onPageLeave = () => __awaiter(this, void 0, void 0, function* () {
-      this.log.info('Page leave detected, disconnecting', this.logContext);
+      this.log.info('Page leave detected, disconnecting');
       yield this.disconnect();
     });
     /**
@@ -28996,7 +29145,7 @@ class Room extends eventsExports.EventEmitter {
             // set the srcObject to null on page hide in order to prevent lock screen controls to show up for it
             dummyAudioEl.srcObject = document.hidden ? null : stream;
             if (!document.hidden) {
-              this.log.debug('page visible again, triggering startAudio to resume playback and update playback status', this.logContext);
+              this.log.debug('page visible again, triggering startAudio to resume playback and update playback status');
               this.startAudio();
             }
           });
@@ -29046,7 +29195,7 @@ class Room extends eventsExports.EventEmitter {
         if (e.name === 'NotAllowedError') {
           this.handleVideoPlaybackFailed();
         } else {
-          this.log.warn('Resuming video playback failed, make sure you call `startVideo` directly in a user gesture handler', this.logContext);
+          this.log.warn('Resuming video playback failed, make sure you call `startVideo` directly in a user gesture handler');
         }
       });
     });
@@ -29067,24 +29216,24 @@ class Room extends eventsExports.EventEmitter {
       this.incomingDataTrackManager.resendSubscriptionUpdates();
     };
     this.handleSignalRestarted = joinResponse => __awaiter(this, void 0, void 0, function* () {
-      this.log.debug("signal reconnected to server, region ".concat(joinResponse.serverRegion), Object.assign(Object.assign({}, this.logContext), {
+      this.log.debug("signal reconnected to server, region ".concat(joinResponse.serverRegion), {
         region: joinResponse.serverRegion
-      }));
+      });
       this.bufferedEvents = [];
       this.applyJoinResponse(joinResponse);
       try {
         // unpublish & republish tracks
         yield this.localParticipant.republishAllTracks(undefined, true);
       } catch (error) {
-        this.log.error('error trying to re-publish tracks after reconnection', Object.assign(Object.assign({}, this.logContext), {
+        this.log.error('error trying to re-publish tracks after reconnection', {
           error
-        }));
+        });
       }
       try {
         yield this.engine.waitForRestarted();
-        this.log.debug("fully reconnected to server", Object.assign(Object.assign({}, this.logContext), {
+        this.log.debug("fully reconnected to server", {
           region: joinResponse.serverRegion
-        }));
+        });
       } catch (_a) {
         // reconnection failed, handleDisconnect is being invoked already, just return here
         return;
@@ -29283,9 +29432,9 @@ class Room extends eventsExports.EventEmitter {
       this.emit(RoomEvent.AudioPlaybackStatusChanged, true);
     };
     this.handleAudioPlaybackFailed = e => {
-      this.log.warn('could not playback audio', Object.assign(Object.assign({}, this.logContext), {
+      this.log.warn('could not playback audio', {
         error: e
-      }));
+      });
       if (!this.canPlaybackAudio) {
         return;
       }
@@ -29382,7 +29531,7 @@ class Room extends eventsExports.EventEmitter {
       const deviceId = yield track.getDeviceId(false);
       const deviceKind = sourceToKind(track.source);
       if (deviceKind && deviceId && deviceId !== this.localParticipant.activeDeviceMap.get(deviceKind)) {
-        this.log.debug("local track restarted, setting ".concat(deviceKind, " ").concat(deviceId, " active"), this.logContext);
+        this.log.debug("local track restarted, setting ".concat(deviceKind, " ").concat(deviceId, " active"));
         this.localParticipant.activeDeviceMap.set(deviceKind, deviceId);
         this.emit(RoomEvent.ActiveDeviceChanged, deviceKind, deviceId);
       }
@@ -29403,7 +29552,7 @@ class Room extends eventsExports.EventEmitter {
     this.remoteParticipants = new Map();
     this.sidToIdentity = new Map();
     this.options = Object.assign(Object.assign({}, roomOptionDefaults), options);
-    this.log = getLogger((_a = this.options.loggerName) !== null && _a !== void 0 ? _a : LoggerNames.Room);
+    this.log = getLogger((_a = this.options.loggerName) !== null && _a !== void 0 ? _a : LoggerNames.Room, () => this.logContext);
     this.transcriptionReceivedTimes = new Map();
     this.options.audioCaptureDefaults = Object.assign(Object.assign({}, audioDefaults), options === null || options === void 0 ? void 0 : options.audioCaptureDefaults);
     this.options.videoCaptureDefaults = Object.assign(Object.assign({}, videoDefaults), options === null || options === void 0 ? void 0 : options.videoCaptureDefaults);
@@ -29446,9 +29595,10 @@ class Room extends eventsExports.EventEmitter {
       this.emit(RoomEvent.LocalDataTrackUnpublished, event.sid);
     }).on('packetAvailable', _ref => {
       let {
+        handle,
         bytes
       } = _ref;
-      this.engine.sendLossyBytes(bytes, DataChannelKind.DATA_TRACK_LOSSY, 'wait');
+      this.engine.sendLossyBytes(bytes, DataChannelKind.DATA_TRACK_LOSSY, 'wait').finally(() => this.outgoingDataTrackManager.handlePacketSendComplete(handle));
     });
     this.disconnectLock = new _();
     this.localParticipant = new LocalParticipant('', '', this.engine, this.options, this.rpcHandlers, this.outgoingDataStreamManager, this.outgoingDataTrackManager);
@@ -29465,7 +29615,7 @@ class Room extends eventsExports.EventEmitter {
       this.localParticipant.activeDeviceMap.set('audioinput', unwrapConstraint(this.options.audioCaptureDefaults.deviceId));
     }
     if ((_d = this.options.audioOutput) === null || _d === void 0 ? void 0 : _d.deviceId) {
-      this.switchActiveDevice('audiooutput', unwrapConstraint(this.options.audioOutput.deviceId)).catch(e => this.log.warn("Could not set audio output: ".concat(e.message), this.logContext));
+      this.switchActiveDevice('audiooutput', unwrapConstraint(this.options.audioOutput.deviceId)).catch(e => this.log.warn("Could not set audio output: ".concat(e.message)));
     }
     if (isWeb()) {
       const abortController = new AbortController();
@@ -29581,12 +29731,12 @@ class Room extends eventsExports.EventEmitter {
     }
   }
   get logContext() {
-    var _a;
+    var _a, _b, _c;
     return {
       room: this.name,
       roomID: (_a = this.roomInfo) === null || _a === void 0 ? void 0 : _a.sid,
-      participant: this.localParticipant.identity,
-      participantID: this.localParticipant.sid
+      participant: (_b = this.localParticipant) === null || _b === void 0 ? void 0 : _b.identity,
+      participantID: (_c = this.localParticipant) === null || _c === void 0 ? void 0 : _c.sid
     };
   }
   /**
@@ -29652,14 +29802,14 @@ class Room extends eventsExports.EventEmitter {
     }).on(EngineEvent.ActiveSpeakersUpdate, this.handleActiveSpeakersUpdate).on(EngineEvent.DataPacketReceived, this.handleDataPacket).on(EngineEvent.Resuming, () => {
       this.clearConnectionReconcile();
       this.isResuming = true;
-      this.log.info('Resuming signal connection', this.logContext);
+      this.log.debug('Resuming signal connection');
       if (this.setAndEmitConnectionState(ConnectionState.SignalReconnecting)) {
         this.emit(RoomEvent.SignalReconnecting);
       }
     }).on(EngineEvent.Resumed, () => {
       this.registerConnectionReconcile();
       this.isResuming = false;
-      this.log.info('Resumed signal connection', this.logContext);
+      this.log.debug('Resumed signal connection');
       this.updateSubscriptions();
       this.emitBufferedEvents();
       if (this.setAndEmitConnectionState(ConnectionState.Connected)) {
@@ -29694,7 +29844,7 @@ class Room extends eventsExports.EventEmitter {
       }
     }).on(EngineEvent.PublishDataTrackResponse, event => {
       if (!event.info) {
-        this.log.warn("received PublishDataTrackResponse, but event.info was ".concat(event.info, ", so skipping."), this.logContext);
+        this.log.warn("received PublishDataTrackResponse, but event.info was ".concat(event.info, ", so skipping."));
         return;
       }
       this.outgoingDataTrackManager.receivedSfuPublishResponse(event.info.pubHandle, {
@@ -29708,7 +29858,7 @@ class Room extends eventsExports.EventEmitter {
       });
     }).on(EngineEvent.UnPublishDataTrackResponse, event => {
       if (!event.info) {
-        this.log.warn("received UnPublishDataTrackResponse, but event.info was ".concat(event.info, ", so skipping."), this.logContext);
+        this.log.warn("received UnPublishDataTrackResponse, but event.info was ".concat(event.info, ", so skipping."));
         return;
       }
       this.outgoingDataTrackManager.receivedSfuUnpublishResponse(event.info.pubHandle);
@@ -29789,7 +29939,7 @@ class Room extends eventsExports.EventEmitter {
       if (this.state !== ConnectionState.Disconnected) {
         return;
       }
-      this.log.debug("prepareConnection to ".concat(url), this.logContext);
+      this.log.debug("prepareConnection to ".concat(url));
       try {
         if (isCloud(new URL(url)) && token) {
           this.regionUrlProvider = new RegionUrlProvider(url, token);
@@ -29801,7 +29951,7 @@ class Room extends eventsExports.EventEmitter {
             yield fetch(toHttpUrl(regionUrl), {
               method: 'HEAD'
             });
-            this.log.debug("prepared connection to ".concat(regionUrl), this.logContext);
+            this.log.debug("prepared connection to ".concat(regionUrl));
           }
         } else {
           yield fetch(toHttpUrl(url), {
@@ -29809,9 +29959,9 @@ class Room extends eventsExports.EventEmitter {
           });
         }
       } catch (e) {
-        this.log.warn('could not prepare connection', Object.assign(Object.assign({}, this.logContext), {
+        this.log.warn('could not prepare connection', {
           error: e
-        }));
+        });
       }
     });
   }
@@ -30110,11 +30260,11 @@ class Room extends eventsExports.EventEmitter {
       return;
     }
     if (this.state === ConnectionState.Disconnected) {
-      this.log.warn('skipping incoming track after Room disconnected', this.logContext);
+      this.log.warn('skipping incoming track after Room disconnected');
       return;
     }
     if (mediaTrack.readyState === 'ended') {
-      this.log.info('skipping incoming track as it already ended', this.logContext);
+      this.log.debug('skipping incoming track as it already ended');
       return;
     }
     const parts = unpackStreamId(stream.id);
@@ -30125,14 +30275,14 @@ class Room extends eventsExports.EventEmitter {
     // and generates its own track id instead of infer from sdp track id.
     if (streamId && streamId.startsWith('TR')) trackId = streamId;
     if (participantSid === this.localParticipant.sid) {
-      this.log.warn('tried to create RemoteParticipant for local participant', this.logContext);
+      this.log.warn('tried to create RemoteParticipant for local participant');
       return;
     }
     const participant = Array.from(this.remoteParticipants.values()).find(p => p.sid === participantSid);
     if (!participant) {
       // server could require extra media sections to accelerate subscription.
       if (participantSid.startsWith('PA')) {
-        this.log.error("Tried to add a track for a participant, that's not present. Sid: ".concat(participantSid), this.logContext);
+        this.log.error("Tried to add a track for a participant, that's not present. Sid: ".concat(participantSid));
       }
       return;
     }
@@ -30142,17 +30292,17 @@ class Room extends eventsExports.EventEmitter {
     if (!trackId.startsWith('TR')) {
       const id = this.engine.getTrackIdForReceiver(receiver);
       if (!id) {
-        this.log.error("Tried to add a track whose 'sid' could not be found for a participant, that's not present. Sid: ".concat(participantSid), this.logContext);
+        this.log.error("Tried to add a track whose 'sid' could not be found for a participant, that's not present. Sid: ".concat(participantSid));
         return;
       }
       trackId = id;
     }
     if (!trackId.startsWith('TR')) {
-      this.log.warn("Tried to add a track whose 'sid' could not be determined for a participant, that's not present. Sid: ".concat(participantSid, ", streamId: ").concat(streamId, ", trackId: ").concat(trackId), Object.assign(Object.assign({}, this.logContext), {
+      this.log.warn("Tried to add a track whose 'sid' could not be determined for a participant, that's not present. Sid: ".concat(participantSid, ", streamId: ").concat(streamId, ", trackId: ").concat(trackId), {
         remoteParticipantID: participantSid,
         streamId,
         trackId
-      }));
+      });
     }
     let adaptiveStreamSettings;
     if (this.options.adaptiveStream) {
@@ -30182,9 +30332,9 @@ class Room extends eventsExports.EventEmitter {
     // the track publication may not be registered yet if the server signals
     // the subscription before publishTrack has finished adding the publication.
     // defer with a timeout until LocalTrackPublished fires for the matching trackSid
-    this.log.debug('deferring LocalTrackSubscribed, publication not yet available', Object.assign(Object.assign({}, this.logContext), {
+    this.log.debug('deferring LocalTrackSubscribed, publication not yet available', {
       subscribedSid
-    }));
+    });
     const TIMEOUT_MS = 10000;
     let timer;
     const onPublished = pub => {
@@ -30207,9 +30357,9 @@ class Room extends eventsExports.EventEmitter {
       if (pub) {
         this.emitLocalTrackSubscribed(pub);
       } else {
-        this.log.warn('could not find local track publication for LocalTrackSubscribed event after timeout', Object.assign(Object.assign({}, this.logContext), {
+        this.log.warn('could not find local track publication for LocalTrackSubscribed event after timeout', {
           subscribedSid
-        }));
+        });
       }
     }, TIMEOUT_MS);
   }
@@ -30226,6 +30376,8 @@ class Room extends eventsExports.EventEmitter {
     this.bufferedEvents = [];
     this.transcriptionReceivedTimes.clear();
     this.incomingDataStreamManager.clearControllers();
+    this.incomingDataTrackManager.reset();
+    this.outgoingDataTrackManager.reset();
     if (this.state === ConnectionState.Disconnected) {
       return;
     }
@@ -30402,9 +30554,9 @@ class Room extends eventsExports.EventEmitter {
         try {
           yield Promise.race([this.audioContext.resume(), sleep(200)]);
         } catch (e) {
-          this.log.warn('Could not resume audio context', Object.assign(Object.assign({}, this.logContext), {
+          this.log.warn('Could not resume audio context', {
             error: e
-          }));
+          });
         }
       }
       const newContextIsRunning = ((_b = this.audioContext) === null || _b === void 0 ? void 0 : _b.state) === 'running';
@@ -30432,7 +30584,7 @@ class Room extends eventsExports.EventEmitter {
       participant.setAudioContext(this.audioContext);
     }
     if ((_a = this.options.audioOutput) === null || _a === void 0 ? void 0 : _a.deviceId) {
-      participant.setAudioOutput(this.options.audioOutput).catch(e => this.log.warn("Could not set audio output: ".concat(e.message), this.logContext));
+      participant.setAudioOutput(this.options.audioOutput).catch(e => this.log.warn("Could not set audio output: ".concat(e.message)));
     }
     return participant;
   }
@@ -30544,13 +30696,13 @@ class Room extends eventsExports.EventEmitter {
       // transports failed without notifying engine
       !this.engine.verifyTransport()) {
         consecutiveFailures++;
-        this.log.warn('detected connection state mismatch', Object.assign(Object.assign({}, this.logContext), {
+        this.log.warn('detected connection state mismatch', {
           numFailures: consecutiveFailures,
           engine: this.engine ? {
             closed: this.engine.isClosed,
             transportsConnectedOrConnecting: this.engine.verifyTransport()
           } : undefined
-        }));
+        });
         if (consecutiveFailures >= 3) {
           this.recreateEngine();
           this.handleDisconnect(this.options.stopLocalTrackOnUnpublish, DisconnectReason.STATE_MISMATCH);
@@ -30570,6 +30722,7 @@ class Room extends eventsExports.EventEmitter {
       // unchanged
       return false;
     }
+    this.log.info("connection state changed: ".concat(this.state, " -> ").concat(state));
     this.state = state;
     this.incomingDataStreamManager.setConnected(state === ConnectionState.Connected);
     this.emit(RoomEvent.ConnectionStateChanged, this.state);
@@ -30715,15 +30868,15 @@ class Room extends eventsExports.EventEmitter {
       // only extract logContext from arguments in order to avoid logging the whole object tree
       const minimizedArgs = mapArgs(args).filter(arg => arg !== undefined);
       if (event === RoomEvent.TrackSubscribed || event === RoomEvent.TrackUnsubscribed) {
-        this.log.trace("subscribe trace: ".concat(event), Object.assign(Object.assign({}, this.logContext), {
+        this.log.trace("subscribe trace: ".concat(event), {
           event,
           args: minimizedArgs
-        }));
+        });
       }
-      this.log.debug("room event ".concat(event), Object.assign(Object.assign({}, this.logContext), {
+      this.log.debug("room event ".concat(event), {
         event,
         args: minimizedArgs
-      }));
+      });
     }
     return super.emit(event, ...args);
   }