livekit-client 1.15.6 → 1.15.7

package/dist/livekit-client.esm.mjs

@@ -295,13 +295,40 @@ var LogLevel;
   LogLevel[LogLevel["error"] = 4] = "error";
   LogLevel[LogLevel["silent"] = 5] = "silent";
 })(LogLevel || (LogLevel = {}));
-const livekitLogger = loglevelExports.getLogger('livekit');
+var LoggerNames;
+(function (LoggerNames) {
+  LoggerNames["Default"] = "livekit";
+  LoggerNames["Room"] = "livekit-room";
+  LoggerNames["Participant"] = "livekit-participant";
+  LoggerNames["Track"] = "livekit-track";
+  LoggerNames["Publication"] = "livekit-track-publication";
+  LoggerNames["Engine"] = "livekit-engine";
+  LoggerNames["Signal"] = "livekit-signal";
+  LoggerNames["PCManager"] = "livekit-pc-manager";
+  LoggerNames["PCTransport"] = "livekit-pc-transport";
+  LoggerNames["E2EE"] = "lk-e2ee";
+})(LoggerNames || (LoggerNames = {}));
+let livekitLogger = loglevelExports.getLogger('livekit');
 livekitLogger.setDefaultLevel(LogLevel.info);
+/**
+ * @internal
+ */
+function getLogger(name) {
+  const logger = loglevelExports.getLogger(name);
+  logger.setDefaultLevel(livekitLogger.getLevel());
+  return logger;
+}
 function setLogLevel(level, loggerName) {
   if (loggerName) {
     loglevelExports.getLogger(loggerName).setLevel(level);
   }
-  for (const logger of Object.values(loglevelExports.getLoggers())) {
+  for (const logger of Object.entries(loglevelExports.getLoggers()).filter(_ref => {
+    let [logrName] = _ref;
+    return logrName.startsWith('livekit');
+  }).map(_ref2 => {
+    let [, logr] = _ref2;
+    return logr;
+  })) {
     logger.setLevel(level);
   }
 }
@@ -310,8 +337,9 @@ function setLogLevel(level, loggerName) {
  * if set, the browser logs will lose their stacktrace information (see https://github.com/pimterry/loglevel#writing-plugins)
  */
 function setLogExtension(extension) {
-  const originalFactory = livekitLogger.methodFactory;
-  livekitLogger.methodFactory = (methodName, configLevel, loggerName) => {
+  let logger = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : livekitLogger;
+  const originalFactory = logger.methodFactory;
+  logger.methodFactory = (methodName, configLevel, loggerName) => {
     const rawMethod = originalFactory(methodName, configLevel, loggerName);
     const logLevel = LogLevel[methodName];
     const needLog = logLevel >= configLevel && logLevel < LogLevel.silent;
@@ -322,7 +350,7 @@ function setLogExtension(extension) {
       }
     };
   };
-  livekitLogger.setLevel(livekitLogger.getLevel()); // Be sure to call setLevel method in order to apply plugin
+  logger.setLevel(logger.getLevel()); // Be sure to call setLevel method in order to apply plugin
 }
 loglevelExports.getLogger('lk-e2ee');
 
@@ -10586,7 +10614,7 @@ function getMatch(exp, ua) {
   return match && match.length >= id && match[id] || '';
 }
 
-var version$1 = "1.15.6";
+var version$1 = "1.15.7";
 
 const version = version$1;
 const protocolVersion = 11;
@@ -10687,11 +10715,14 @@ const VideoPresets43 = {
 };
 const ScreenSharePresets = {
   h360fps3: new VideoPreset(640, 360, 200000, 3, 'medium'),
-  h720fps5: new VideoPreset(1280, 720, 400000, 5, 'medium'),
+  h360fps15: new VideoPreset(640, 360, 400000, 15, 'medium'),
+  h720fps5: new VideoPreset(1280, 720, 800000, 5, 'medium'),
   h720fps15: new VideoPreset(1280, 720, 1500000, 15, 'medium'),
   h720fps30: new VideoPreset(1280, 720, 2000000, 30, 'medium'),
   h1080fps15: new VideoPreset(1920, 1080, 2500000, 15, 'medium'),
-  h1080fps30: new VideoPreset(1920, 1080, 4000000, 30, 'medium')
+  h1080fps30: new VideoPreset(1920, 1080, 5000000, 30, 'medium'),
+  // original resolution, without resizing
+  original: new VideoPreset(0, 0, 7000000, 30, 'medium')
 };
 
 // Copyright 2023 LiveKit, Inc.
@@ -12956,6 +12987,8 @@ const BACKGROUND_REACTION_DELAY = 5000;
 const recycledElements = [];
 class Track extends eventsExports.EventEmitter {
   constructor(mediaTrack, kind) {
+    let loggerOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    var _a;
     super();
     this.attachedElements = [];
     this.isMuted = false;
@@ -12966,6 +12999,7 @@ class Track extends eventsExports.EventEmitter {
     this.streamState = Track.StreamState.Active;
     this.isInBackground = false;
     this._currentBitrate = 0;
+    this.log = livekitLogger;
     this.appVisibilityChangedListener = () => {
       if (this.backgroundTimeout) {
         clearTimeout(this.backgroundTimeout);
@@ -12978,12 +13012,18 @@ class Track extends eventsExports.EventEmitter {
         this.handleAppVisibilityChanged();
       }
     };
+    this.log = getLogger((_a = loggerOptions.loggerName) !== null && _a !== void 0 ? _a : LoggerNames.Track);
+    this.loggerContextCb = loggerOptions.loggerContextCb;
     this.setMaxListeners(100);
     this.kind = kind;
     this._mediaStreamTrack = mediaTrack;
     this._mediaStreamID = mediaTrack.id;
     this.source = Track.Source.Unknown;
   }
+  get logContext() {
+    var _a;
+    return Object.assign(Object.assign({}, (_a = this.loggerContextCb) === null || _a === void 0 ? void 0 : _a.call(this)), getLogContextFromTrack(this));
+  }
   /** current receive bits per second */
   get currentBitrate() {
     return this._currentBitrate;
@@ -13101,6 +13141,15 @@ class Track extends eventsExports.EventEmitter {
       clearInterval(this.monitorInterval);
     }
   }
+  /** @internal */
+  updateLoggerOptions(loggerOptions) {
+    if (loggerOptions.loggerName) {
+      this.log = getLogger(loggerOptions.loggerName);
+    }
+    if (loggerOptions.loggerContextCb) {
+      this.loggerContextCb = loggerOptions.loggerContextCb;
+    }
+  }
   recycleElement(element) {
     if (element instanceof HTMLAudioElement) {
       // we only need to re-use a single element
@@ -13403,7 +13452,8 @@ function sourceToKind(source) {
 function screenCaptureToDisplayMediaStreamOptions(options) {
   var _a, _b;
   let videoConstraints = (_a = options.video) !== null && _a !== void 0 ? _a : true;
-  if (options.resolution) {
+  // treat 0 as uncapped
+  if (options.resolution && options.resolution.width > 0 && options.resolution.height > 0) {
     videoConstraints = typeof videoConstraints === 'boolean' ? {} : videoConstraints;
     if (isSafari()) {
       videoConstraints = Object.assign(Object.assign({}, videoConstraints), {
@@ -13456,6 +13506,26 @@ function getTrackPublicationInfo(tracks) {
   });
   return infos;
 }
+function getLogContextFromTrack(track) {
+  if (track instanceof Track) {
+    return {
+      trackSid: track.sid,
+      trackSource: track.source,
+      trackMuted: track.isMuted,
+      trackEnabled: track.mediaStreamTrack.enabled,
+      trackKind: track.kind
+    };
+  } else {
+    return {
+      trackSid: track.trackSid,
+      trackName: track.trackName,
+      track: track.track ? getLogContextFromTrack(track.track) : undefined,
+      trackEnabled: track.isEnabled,
+      trackEncrypted: track.isEncrypted,
+      trackMimeType: track.mimeType
+    };
+  }
+}
 
 const separator = '|';
 const ddExtensionURI = 'https://aomediacodec.github.io/av1-rtp-spec/#dependency-descriptor-rtp-header-extension';
@@ -13583,6 +13653,10 @@ function isSafari() {
   var _a;
   return ((_a = getBrowser()) === null || _a === void 0 ? void 0 : _a.name) === 'Safari';
 }
+function isSafari17() {
+  const b = getBrowser();
+  return (b === null || b === void 0 ? void 0 : b.name) === 'Safari' && b.version.startsWith('17.');
+}
 function isMobile() {
   if (!isWeb()) return false;
   return /Tablet|iPad|Mobile|Android|BlackBerry/.test(navigator.userAgent);
@@ -13943,9 +14017,10 @@ class LocalTrack extends Track {
    */
   constructor(mediaTrack, kind, constraints) {
     let userProvidedTrack = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-    super(mediaTrack, kind);
+    let loggerOptions = arguments.length > 4 ? arguments[4] : undefined;
+    super(mediaTrack, kind, loggerOptions);
     this._isUpstreamPaused = false;
-    this.handleTrackMuteEvent = () => this.debouncedTrackMuteHandler().catch(() => livekitLogger.debug('track mute bounce got cancelled by an unmute event'));
+    this.handleTrackMuteEvent = () => this.debouncedTrackMuteHandler().catch(() => this.log.debug('track mute bounce got cancelled by an unmute event', this.logContext));
     this.debouncedTrackMuteHandler = r(() => __awaiter(this, void 0, void 0, function* () {
       yield this.pauseUpstream();
     }), 5000);
@@ -14016,9 +14091,6 @@ class LocalTrack extends Track {
         this._mediaStreamTrack.removeEventListener('ended', this.handleEnded);
         this._mediaStreamTrack.removeEventListener('mute', this.handleTrackMuteEvent);
         this._mediaStreamTrack.removeEventListener('unmute', this.handleTrackUnmuteEvent);
-        if (!this.providedByUser && this._mediaStreamTrack !== newTrack) {
-          this._mediaStreamTrack.stop();
-        }
       }
       this.mediaStream = new MediaStream([newTrack]);
       if (newTrack) {
@@ -14034,7 +14106,7 @@ class LocalTrack extends Track {
       }
       let processedTrack;
       if (this.processor && newTrack && this.processorElement) {
-        livekitLogger.debug('restarting processor');
+        this.log.debug('restarting processor', this.logContext);
         if (this.kind === 'unknown') {
           throw TypeError('cannot set processor on track of unknown kind');
         }
@@ -14051,6 +14123,11 @@ class LocalTrack extends Track {
       if (this.sender) {
         yield this.sender.replaceTrack(processedTrack !== null && processedTrack !== void 0 ? processedTrack : newTrack);
       }
+      // if `newTrack` is different from the existing track, stop the
+      // older track just before replacing it
+      if (!this.providedByUser && this._mediaStreamTrack !== newTrack) {
+        this._mediaStreamTrack.stop();
+      }
       this._mediaStreamTrack = newTrack;
       if (newTrack) {
         // sync muted state with the enabled state of the newly provided track
@@ -14121,7 +14198,7 @@ class LocalTrack extends Track {
       if (!this.sender) {
         throw new TrackInvalidError('unable to replace an unpublished track');
       }
-      livekitLogger.debug('replace MediaStreamTrack');
+      this.log.debug('replace MediaStreamTrack', this.logContext);
       yield this.setMediaStreamTrack(track);
       // this must be synced *after* setting mediaStreamTrack above, since it relies
       // on the previous state in order to cleanup
@@ -14137,7 +14214,9 @@ class LocalTrack extends Track {
       if (!constraints) {
         constraints = this._constraints;
       }
-      livekitLogger.debug('restarting track with constraints', constraints);
+      this.log.debug('restarting track with constraints', Object.assign(Object.assign({}, this.logContext), {
+        constraints
+      }));
       const streamConstraints = {
         audio: false,
         video: false
@@ -14161,7 +14240,7 @@ class LocalTrack extends Track {
       const mediaStream = yield navigator.mediaDevices.getUserMedia(streamConstraints);
       const newTrack = mediaStream.getTracks()[0];
       newTrack.addEventListener('ended', this.handleEnded);
-      livekitLogger.debug('re-acquired MediaStreamTrack');
+      this.log.debug('re-acquired MediaStreamTrack', this.logContext);
       yield this.setMediaStreamTrack(newTrack);
       this._constraints = constraints;
       this.emit(TrackEvent.Restarted, this);
@@ -14169,7 +14248,7 @@ class LocalTrack extends Track {
     });
   }
   setTrackMuted(muted) {
-    livekitLogger.debug("setting ".concat(this.kind, " track ").concat(muted ? 'muted' : 'unmuted'));
+    this.log.debug("setting ".concat(this.kind, " track ").concat(muted ? 'muted' : 'unmuted'), this.logContext);
     if (this.isMuted === muted && this._mediaStreamTrack.enabled !== muted) {
       return;
     }
@@ -14189,9 +14268,9 @@ class LocalTrack extends Track {
     return __awaiter(this, void 0, void 0, function* () {
       yield _super.handleAppVisibilityChanged.call(this);
       if (!isMobile()) return;
-      livekitLogger.debug("visibility changed, is in Background: ".concat(this.isInBackground));
+      this.log.debug("visibility changed, is in Background: ".concat(this.isInBackground), this.logContext);
       if (!this.isInBackground && this.needsReAcquisition && !this.isUserProvided && !this.isMuted) {
-        livekitLogger.debug("track needs to be reacquired, restarting ".concat(this.source));
+        this.log.debug("track needs to be reacquired, restarting ".concat(this.source), this.logContext);
         yield this.restart();
         this.reacquireTrack = false;
       }
@@ -14220,7 +14299,7 @@ class LocalTrack extends Track {
           return;
         }
         if (!this.sender) {
-          livekitLogger.warn('unable to pause upstream for an unpublished track');
+          this.log.warn('unable to pause upstream for an unpublished track', this.logContext);
           return;
         }
         this._isUpstreamPaused = true;
@@ -14244,7 +14323,7 @@ class LocalTrack extends Track {
           return;
         }
         if (!this.sender) {
-          livekitLogger.warn('unable to resume upstream for an unpublished track');
+          this.log.warn('unable to resume upstream for an unpublished track', this.logContext);
           return;
         }
         this._isUpstreamPaused = false;
@@ -14288,7 +14367,7 @@ class LocalTrack extends Track {
     return __awaiter(this, void 0, void 0, function* () {
       const unlock = yield this.processorLock.lock();
       try {
-        livekitLogger.debug('setting up processor');
+        this.log.debug('setting up processor', this.logContext);
         if (this.processor) {
           yield this.stopProcessor();
         }
@@ -14298,9 +14377,9 @@ class LocalTrack extends Track {
         this.processorElement = (_a = this.processorElement) !== null && _a !== void 0 ? _a : document.createElement(this.kind);
         attachToElement(this._mediaStreamTrack, this.processorElement);
         this.processorElement.muted = true;
-        this.processorElement.play().catch(error => livekitLogger.error('failed to play processor element', {
+        this.processorElement.play().catch(error => this.log.error('failed to play processor element', Object.assign(Object.assign({}, this.logContext), {
           error
-        }));
+        })));
         const processorOptions = {
           kind: this.kind,
           track: this._mediaStreamTrack,
@@ -14336,7 +14415,7 @@ class LocalTrack extends Track {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
       if (!this.processor) return;
-      livekitLogger.debug('stopping processor');
+      this.log.debug('stopping processor', this.logContext);
       (_a = this.processor.processedTrack) === null || _a === void 0 ? void 0 : _a.stop();
       yield this.processor.destroy();
       this.processor = undefined;
@@ -14758,9 +14837,12 @@ class SignalClient {
   }
   constructor() {
     let useJSON = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+    let loggerOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var _a;
     /** signal rtt in milliseconds */
     this.rtt = 0;
     this.state = SignalConnectionState.DISCONNECTED;
+    this.log = livekitLogger;
     /** @internal */
     this.resetCallbacks = () => {
       this.onAnswer = undefined;
@@ -14775,6 +14857,8 @@ class SignalClient {
       this.onTrickle = undefined;
       this.onClose = undefined;
     };
+    this.log = getLogger((_a = loggerOptions.loggerName) !== null && _a !== void 0 ? _a : LoggerNames.Signal);
+    this.loggerContextCb = loggerOptions.loggerContextCb;
     this.useJSON = useJSON;
     this.requestQueue = new AsyncQueue();
     this.queuedRequests = [];
@@ -14782,6 +14866,10 @@ class SignalClient {
     this.connectionLock = new Mutex();
     this.state = SignalConnectionState.DISCONNECTED;
   }
+  get logContext() {
+    var _a, _b;
+    return (_b = (_a = this.loggerContextCb) === null || _a === void 0 ? void 0 : _a.call(this)) !== null && _b !== void 0 ? _b : {};
+  }
   join(url, token, opts, abortSignal) {
     return __awaiter(this, void 0, void 0, function* () {
       // during a full reconnect, we'd want to start the sequence even if currently
@@ -14795,7 +14883,7 @@ class SignalClient {
   reconnect(url, token, sid, reason) {
     return __awaiter(this, void 0, void 0, function* () {
       if (!this.options) {
-        livekitLogger.warn('attempted to reconnect without signal options being set, ignoring');
+        this.log.warn('attempted to reconnect without signal options being set, ignoring', this.logContext);
         return;
       }
       this.state = SignalConnectionState.RECONNECTING;
@@ -14833,7 +14921,7 @@ class SignalClient {
           abortHandler();
         }
         abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.addEventListener('abort', abortHandler);
-        livekitLogger.debug("connecting to ".concat(url + params));
+        this.log.debug("connecting to ".concat(url + params), this.logContext);
         if (this.ws) {
           yield this.close();
         }
@@ -14871,7 +14959,7 @@ class SignalClient {
           } else if (ev.data instanceof ArrayBuffer) {
             resp = SignalResponse.fromBinary(new Uint8Array(ev.data));
           } else {
-            livekitLogger.error("could not decode websocket message: ".concat(typeof ev.data));
+            this.log.error("could not decode websocket message: ".concat(typeof ev.data), this.logContext);
             return;
           }
           if (this.state !== SignalConnectionState.CONNECTED) {
@@ -14883,10 +14971,10 @@ class SignalClient {
               this.pingTimeoutDuration = resp.message.value.pingTimeout;
               this.pingIntervalDuration = resp.message.value.pingInterval;
               if (this.pingTimeoutDuration && this.pingTimeoutDuration > 0) {
-                livekitLogger.debug('ping config', {
+                this.log.debug('ping config', Object.assign(Object.assign({}, this.logContext), {
                   timeout: this.pingTimeoutDuration,
                   interval: this.pingIntervalDuration
-                });
+                }));
                 this.startPingInterval();
               }
               resolve(resp.message.value);
@@ -14915,9 +15003,9 @@ class SignalClient {
           this.handleSignalResponse(resp);
         });
         this.ws.onclose = ev => {
-          livekitLogger.warn("websocket closed", {
-            ev
-          });
+          this.log.warn("websocket closed", Object.assign(Object.assign({}, this.logContext), {
+            reason: ev.reason
+          }));
           this.handleOnClose(ev.reason);
         };
       } finally {
@@ -14960,7 +15048,9 @@ class SignalClient {
   }
   // initial offer after joining
   sendOffer(offer) {
-    livekitLogger.debug('sending offer', offer);
+    this.log.debug('sending offer', Object.assign(Object.assign({}, this.logContext), {
+      offerSdp: offer.sdp
+    }));
     this.sendRequest({
       case: 'offer',
       value: toProtoSessionDescription(offer)
@@ -14968,14 +15058,18 @@ class SignalClient {
   }
   // answer a server-initiated offer
   sendAnswer(answer) {
-    livekitLogger.debug('sending answer');
+    this.log.debug('sending answer', Object.assign(Object.assign({}, this.logContext), {
+      answerSdp: answer.sdp
+    }));
     return this.sendRequest({
       case: 'answer',
       value: toProtoSessionDescription(answer)
     });
   }
   sendIceCandidate(candidate, target) {
-    livekitLogger.trace('sending ice candidate', candidate);
+    this.log.trace('sending ice candidate', Object.assign(Object.assign({}, this.logContext), {
+      candidate
+    }));
     return this.sendRequest({
       case: 'trickle',
       value: new TrickleRequest({
@@ -15092,7 +15186,7 @@ class SignalClient {
         yield sleep(this.signalLatency);
       }
       if (!this.ws || this.ws.readyState !== this.ws.OPEN) {
-        livekitLogger.error("cannot send signal request before connected, type: ".concat(message === null || message === void 0 ? void 0 : message.case));
+        this.log.error("cannot send signal request before connected, type: ".concat(message === null || message === void 0 ? void 0 : message.case), this.logContext);
         return;
       }
       const req = new SignalRequest({
@@ -15105,9 +15199,9 @@ class SignalClient {
           this.ws.send(req.toBinary());
         }
       } catch (e) {
-        livekitLogger.error('error sending signal message', {
+        this.log.error('error sending signal message', Object.assign(Object.assign({}, this.logContext), {
           error: e
-        });
+        }));
       }
     });
   }
@@ -15115,7 +15209,7 @@ class SignalClient {
     var _a, _b;
     const msg = res.message;
     if (msg == undefined) {
-      livekitLogger.debug('received unsupported message');
+      this.log.debug('received unsupported message', this.logContext);
       return;
     }
     let pingHandled = false;
@@ -15191,7 +15285,9 @@ class SignalClient {
       this.resetPingTimeout();
       pingHandled = true;
     } else {
-      livekitLogger.debug('unsupported message', msg);
+      this.log.debug('unsupported message', Object.assign(Object.assign({}, this.logContext), {
+        msgCase: msg.case
+      }));
     }
     if (!pingHandled) {
       this.resetPingTimeout();
@@ -15210,14 +15306,18 @@ class SignalClient {
       if (this.state === SignalConnectionState.DISCONNECTED) return;
       const onCloseCallback = this.onClose;
       yield this.close();
-      livekitLogger.debug("websocket connection closed: ".concat(reason));
+      this.log.debug("websocket connection closed: ".concat(reason), Object.assign(Object.assign({}, this.logContext), {
+        reason
+      }));
       if (onCloseCallback) {
         onCloseCallback(reason);
       }
     });
   }
   handleWSError(ev) {
-    livekitLogger.error('websocket error', ev);
+    this.log.error('websocket error', Object.assign(Object.assign({}, this.logContext), {
+      error: ev
+    }));
   }
   /**
    * Resets the ping timeout and starts a new timeout.
@@ -15226,11 +15326,11 @@ class SignalClient {
   resetPingTimeout() {
     this.clearPingTimeout();
     if (!this.pingTimeoutDuration) {
-      livekitLogger.warn('ping timeout duration not set');
+      this.log.warn('ping timeout duration not set', this.logContext);
       return;
     }
     this.pingTimeout = CriticalTimers.setTimeout(() => {
-      livekitLogger.warn("ping timeout triggered. last pong received at: ".concat(new Date(Date.now() - this.pingTimeoutDuration * 1000).toUTCString()));
+      this.log.warn("ping timeout triggered. last pong received at: ".concat(new Date(Date.now() - this.pingTimeoutDuration * 1000).toUTCString()), this.logContext);
       this.handleOnClose('ping timeout');
     }, this.pingTimeoutDuration * 1000);
   }
@@ -15246,16 +15346,16 @@ class SignalClient {
     this.clearPingInterval();
     this.resetPingTimeout();
     if (!this.pingIntervalDuration) {
-      livekitLogger.warn('ping interval duration not set');
+      this.log.warn('ping interval duration not set', this.logContext);
       return;
     }
-    livekitLogger.debug('start ping interval');
+    this.log.debug('start ping interval', this.logContext);
     this.pingInterval = CriticalTimers.setInterval(() => {
       this.sendPing();
     }, this.pingIntervalDuration * 1000);
   }
   clearPingInterval() {
-    livekitLogger.debug('clearing ping interval');
+    this.log.debug('clearing ping interval', this.logContext);
     this.clearPingTimeout();
     if (this.pingInterval) {
       CriticalTimers.clearInterval(this.pingInterval);
@@ -16020,7 +16120,10 @@ class PCTransport extends eventsExports.EventEmitter {
   }
   constructor(config) {
     let mediaConstraints = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    let loggerOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    var _a;
     super();
+    this.log = livekitLogger;
     this.pendingCandidates = [];
     this.restartingIce = false;
     this.renegotiate = false;
@@ -16058,6 +16161,8 @@ class PCTransport extends eventsExports.EventEmitter {
       this._pc.oniceconnectionstatechange = null;
       this._pc = null;
     };
+    this.log = getLogger((_a = loggerOptions.loggerName) !== null && _a !== void 0 ? _a : LoggerNames.PCTransport);
+    this.loggerOptions = loggerOptions;
     this.config = config;
     this.mediaConstraints = mediaConstraints;
     this._pc = this.createPC();
@@ -16097,6 +16202,10 @@ class PCTransport extends eventsExports.EventEmitter {
     };
     return pc;
   }
+  get logContext() {
+    var _a, _b;
+    return Object.assign({}, (_b = (_a = this.loggerOptions).loggerContextCb) === null || _b === void 0 ? void 0 : _b.call(_a));
+  }
   get isICEConnected() {
     return this._pc !== null && (this.pc.iceConnectionState === 'connected' || this.pc.iceConnectionState === 'completed');
   }
@@ -16193,7 +16302,7 @@ class PCTransport extends eventsExports.EventEmitter {
         return;
       }
       if (options === null || options === void 0 ? void 0 : options.iceRestart) {
-        livekitLogger.debug('restarting ICE');
+        this.log.debug('restarting ICE', this.logContext);
         this.restartingIce = true;
       }
       if (this._pc && this._pc.signalingState === 'have-local-offer') {
@@ -16209,11 +16318,11 @@ class PCTransport extends eventsExports.EventEmitter {
           return;
         }
       } else if (!this._pc || this._pc.signalingState === 'closed') {
-        livekitLogger.warn('could not createOffer with closed peer connection');
+        this.log.warn('could not createOffer with closed peer connection', this.logContext);
         return;
       }
       // actually negotiate
-      livekitLogger.debug('starting to negotiate');
+      this.log.debug('starting to negotiate', this.logContext);
       const offer = yield this.pc.createOffer(options);
       const sdpParsed = parse((_a = offer.sdp) !== null && _a !== void 0 ? _a : '');
       sdpParsed.media.forEach(media => {
@@ -16382,7 +16491,7 @@ class PCTransport extends eventsExports.EventEmitter {
         const originalSdp = sd.sdp;
         sd.sdp = munged;
         try {
-          livekitLogger.debug("setting munged ".concat(remote ? 'remote' : 'local', " description"));
+          this.log.debug("setting munged ".concat(remote ? 'remote' : 'local', " description"), this.logContext);
           if (remote) {
             yield this.pc.setRemoteDescription(sd);
           } else {
@@ -16390,10 +16499,10 @@ class PCTransport extends eventsExports.EventEmitter {
           }
           return;
         } catch (e) {
-          livekitLogger.warn("not able to set ".concat(sd.type, ", falling back to unmodified sdp"), {
+          this.log.warn("not able to set ".concat(sd.type, ", falling back to unmodified sdp"), Object.assign(Object.assign({}, this.logContext), {
             error: e,
             sdp: munged
-          });
+          }));
           sd.sdp = originalSdp;
         }
       }
@@ -16419,7 +16528,9 @@ class PCTransport extends eventsExports.EventEmitter {
         if (!remote && this.pc.remoteDescription) {
           fields.remoteSdp = this.pc.remoteDescription;
         }
-        livekitLogger.error("unable to set ".concat(sd.type), fields);
+        this.log.error("unable to set ".concat(sd.type), Object.assign(Object.assign({}, this.logContext), {
+          fields
+        }));
         throw new NegotiationError(msg);
       }
     });
@@ -16576,8 +16687,10 @@ class PCTransportManager {
   get currentState() {
     return this.state;
   }
-  constructor(rtcConfig, subscriberPrimary) {
+  constructor(rtcConfig, subscriberPrimary, loggerOptions) {
+    var _a;
     this.peerConnectionTimeout = roomConnectOptionDefaults.peerConnectionTimeout;
+    this.log = livekitLogger;
     this.updateState = () => {
       var _a;
       const previousState = this.state;
@@ -16596,10 +16709,12 @@ class PCTransportManager {
         this.state = PCTransportState.NEW;
       }
       if (previousState !== this.state) {
-        livekitLogger.debug("pc state change: from ".concat(PCTransportState[previousState], " to ").concat(PCTransportState[this.state]));
+        this.log.debug("pc state change: from ".concat(PCTransportState[previousState], " to ").concat(PCTransportState[this.state]), this.logContext);
         (_a = this.onStateChange) === null || _a === void 0 ? void 0 : _a.call(this, this.state, this.publisher.getConnectionState(), this.subscriber.getConnectionState());
       }
     };
+    this.log = getLogger((_a = loggerOptions.loggerName) !== null && _a !== void 0 ? _a : LoggerNames.PCManager);
+    this.loggerOptions = loggerOptions;
     this.isPublisherConnectionRequired = !subscriberPrimary;
     this.isSubscriberConnectionRequired = subscriberPrimary;
     const googConstraints = {
@@ -16607,8 +16722,8 @@ class PCTransportManager {
         googDscp: true
       }]
     };
-    this.publisher = new PCTransport(rtcConfig, googConstraints);
-    this.subscriber = new PCTransport(rtcConfig);
+    this.publisher = new PCTransport(rtcConfig, googConstraints, loggerOptions);
+    this.subscriber = new PCTransport(rtcConfig, loggerOptions);
     this.publisher.onConnectionStateChange = this.updateState;
     this.subscriber.onConnectionStateChange = this.updateState;
     this.publisher.onIceConnectionStateChange = this.updateState;
@@ -16639,6 +16754,10 @@ class PCTransportManager {
     this.state = PCTransportState.NEW;
     this.connectionLock = new Mutex();
   }
+  get logContext() {
+    var _a, _b;
+    return Object.assign({}, (_b = (_a = this.loggerOptions).loggerContextCb) === null || _b === void 0 ? void 0 : _b.call(_a));
+  }
   requirePublisher() {
     let require = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
     this.isPublisherConnectionRequired = require;
@@ -16669,9 +16788,9 @@ class PCTransportManager {
               publisher.removeTrack(sender);
             }
           } catch (e) {
-            livekitLogger.warn('could not removeTrack', {
+            this.log.warn('could not removeTrack', Object.assign(Object.assign({}, this.logContext), {
               error: e
-            });
+            }));
           }
         }
       }
@@ -16701,10 +16820,10 @@ class PCTransportManager {
   }
   createSubscriberAnswerFromOffer(sd) {
     return __awaiter(this, void 0, void 0, function* () {
-      livekitLogger.debug('received server offer', {
+      this.log.debug('received server offer', Object.assign(Object.assign({}, this.logContext), {
         RTCSdpType: sd.type,
         signalingState: this.subscriber.getSignallingState().toString()
-      });
+      }));
       yield this.subscriber.setRemoteDescription(sd);
       // answer the offer
       const answer = yield this.subscriber.createAndSetAnswer();
@@ -16724,7 +16843,7 @@ class PCTransportManager {
       const unlock = yield this.connectionLock.lock();
       try {
         if (this.isPublisherConnectionRequired && this.publisher.getConnectionState() !== 'connected' && this.publisher.getConnectionState() !== 'connecting') {
-          livekitLogger.debug('negotiation required, start negotiating');
+          this.log.debug('negotiation required, start negotiating', this.logContext);
           this.publisher.negotiate();
         }
         yield Promise.all((_a = this.requiredTransports) === null || _a === void 0 ? void 0 : _a.map(transport => this.ensureTransportConnected(transport, abortController, timeout)));
@@ -16799,7 +16918,7 @@ class PCTransportManager {
       }
       return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
         const abortHandler = () => {
-          livekitLogger.warn('abort transport connection');
+          this.log.warn('abort transport connection', this.logContext);
           CriticalTimers.clearTimeout(connectTimeout);
           reject(new ConnectionError('room connection has been cancelled', 3 /* ConnectionErrorReason.Cancelled */));
         };
@@ -16844,6 +16963,7 @@ class RTCEngine extends eventsExports.EventEmitter {
     return this._isClosed;
   }
   constructor(options) {
+    var _a;
     super();
     this.options = options;
     this.rtcConfig = {};
@@ -16861,6 +16981,7 @@ class RTCEngine extends eventsExports.EventEmitter {
     /** specifies how often an initial join connection is allowed to retry */
     this.maxJoinAttempts = 1;
     this.shouldFailNext = false;
+    this.log = livekitLogger;
     this.handleDataChannel = _ref => {
       let {
         channel
@@ -16876,12 +16997,12 @@ class RTCEngine extends eventsExports.EventEmitter {
         } else {
           return;
         }
-        livekitLogger.debug("on data channel ".concat(channel.id, ", ").concat(channel.label));
+        this.log.debug("on data channel ".concat(channel.id, ", ").concat(channel.label), this.logContext);
         channel.onmessage = this.handleDataMessage;
       });
     };
     this.handleDataMessage = message => __awaiter(this, void 0, void 0, function* () {
-      var _a, _b;
+      var _b, _c;
       // make sure to respect incoming data message order by processing message events one after the other
       const unlock = yield this.dataProcessLock.lock();
       try {
@@ -16892,14 +17013,16 @@ class RTCEngine extends eventsExports.EventEmitter {
         } else if (message.data instanceof Blob) {
           buffer = yield message.data.arrayBuffer();
         } else {
-          livekitLogger.error('unsupported data type', message.data);
+          this.log.error('unsupported data type', Object.assign(Object.assign({}, this.logContext), {
+            data: message.data
+          }));
           return;
         }
         const dp = DataPacket.fromBinary(new Uint8Array(buffer));
-        if (((_a = dp.value) === null || _a === void 0 ? void 0 : _a.case) === 'speaker') {
+        if (((_b = dp.value) === null || _b === void 0 ? void 0 : _b.case) === 'speaker') {
           // dispatch speaker updates
           this.emit(EngineEvent.ActiveSpeakersUpdate, dp.value.value.speakers);
-        } else if (((_b = dp.value) === null || _b === void 0 ? void 0 : _b.case) === 'user') {
+        } else if (((_c = dp.value) === null || _c === void 0 ? void 0 : _c.case) === 'user') {
           this.emit(EngineEvent.DataPacketReceived, dp.value.value, dp.kind);
         }
       } finally {
@@ -16913,9 +17036,13 @@ class RTCEngine extends eventsExports.EventEmitter {
         const {
           error
         } = event.error;
-        livekitLogger.error("DataChannel error on ".concat(channelKind, ": ").concat(event.message), error);
+        this.log.error("DataChannel error on ".concat(channelKind, ": ").concat(event.message), Object.assign(Object.assign({}, this.logContext), {
+          error
+        }));
       } else {
-        livekitLogger.error("Unknown DataChannel error on ".concat(channelKind), event);
+        this.log.error("Unknown DataChannel error on ".concat(channelKind), Object.assign(Object.assign({}, this.logContext), {
+          event
+        }));
       }
     };
     this.handleBufferedAmountLow = event => {
@@ -16930,13 +17057,13 @@ class RTCEngine extends eventsExports.EventEmitter {
       if (this._isClosed) {
         return;
       }
-      livekitLogger.warn("".concat(connection, " disconnected"));
+      this.log.warn("".concat(connection, " disconnected"), this.logContext);
       if (this.reconnectAttempts === 0) {
         // only reset start time on the first try
         this.reconnectStart = Date.now();
       }
       const disconnect = duration => {
-        livekitLogger.warn("could not recover connection after ".concat(this.reconnectAttempts, " attempts, ").concat(duration, "ms. giving up"));
+        this.log.warn("could not recover connection after ".concat(this.reconnectAttempts, " attempts, ").concat(duration, "ms. giving up"), this.logContext);
         this.emit(EngineEvent.Disconnected);
         this.close();
       };
@@ -16952,7 +17079,7 @@ class RTCEngine extends eventsExports.EventEmitter {
       if (connection === leaveReconnect) {
         delay = 0;
       }
-      livekitLogger.debug("reconnecting in ".concat(delay, "ms"));
+      this.log.debug("reconnecting in ".concat(delay, "ms"), this.logContext);
       this.clearReconnectTimeout();
       if (this.token && this.regionUrlProvider) {
         // token may have been refreshed, we do not want to recreate the regionUrlProvider
@@ -16998,7 +17125,12 @@ class RTCEngine extends eventsExports.EventEmitter {
         this.attemptReconnect(ReconnectReason.RR_SIGNAL_DISCONNECTED);
       }
     };
-    this.client = new SignalClient();
+    this.log = getLogger((_a = options.loggerName) !== null && _a !== void 0 ? _a : LoggerNames.Engine);
+    this.loggerOptions = {
+      loggerName: options.loggerName,
+      loggerContextCb: () => this.logContext
+    };
+    this.client = new SignalClient(undefined, this.loggerOptions);
     this.client.signalLatency = this.options.expSignalLatency;
     this.reconnectPolicy = this.options.reconnectPolicy;
     this.registerOnLineListener();
@@ -17013,6 +17145,15 @@ class RTCEngine extends eventsExports.EventEmitter {
     this.client.onSpeakersChanged = update => this.emit(EngineEvent.SpeakersChanged, update);
     this.client.onStreamStateUpdate = update => this.emit(EngineEvent.StreamStateChanged, update);
   }
+  /** @internal */
+  get logContext() {
+    var _a, _b, _c, _d, _e, _f;
+    return {
+      room: (_b = (_a = this.latestJoinResponse) === null || _a === void 0 ? void 0 : _a.room) === null || _b === void 0 ? void 0 : _b.name,
+      roomSid: (_d = (_c = this.latestJoinResponse) === null || _c === void 0 ? void 0 : _c.room) === null || _d === void 0 ? void 0 : _d.sid,
+      identity: (_f = (_e = this.latestJoinResponse) === null || _e === void 0 ? void 0 : _e.participant) === null || _f === void 0 ? void 0 : _f.identity
+    };
+  }
   join(url, token, opts, abortSignal) {
     return __awaiter(this, void 0, void 0, function* () {
       this.url = url;
@@ -17038,7 +17179,7 @@ class RTCEngine extends eventsExports.EventEmitter {
       } catch (e) {
         if (e instanceof ConnectionError) {
           if (e.reason === 1 /* ConnectionErrorReason.ServerUnreachable */) {
-            livekitLogger.warn("Couldn't connect to server, attempt ".concat(this.joinAttempts, " of ").concat(this.maxJoinAttempts));
+            this.log.warn("Couldn't connect to server, attempt ".concat(this.joinAttempts, " of ").concat(this.maxJoinAttempts), this.logContext);
             if (this.joinAttempts < this.maxJoinAttempts) {
               return this.join(url, token, opts, abortSignal);
             }
@@ -17141,10 +17282,9 @@ class RTCEngine extends eventsExports.EventEmitter {
       this.pcManager.removeTrack(sender);
       return true;
     } catch (e) {
-      livekitLogger.warn('failed to remove track', {
-        error: e,
-        method: 'removeTrack'
-      });
+      this.log.warn('failed to remove track', Object.assign(Object.assign({}, this.logContext), {
+        error: e
+      }));
     }
     return false;
   }
@@ -17174,7 +17314,7 @@ class RTCEngine extends eventsExports.EventEmitter {
       }
       this.participantSid = (_a = joinResponse.participant) === null || _a === void 0 ? void 0 : _a.sid;
       const rtcConfig = this.makeRTCConfiguration(joinResponse);
-      this.pcManager = new PCTransportManager(rtcConfig, joinResponse.subscriberPrimary);
+      this.pcManager = new PCTransportManager(rtcConfig, joinResponse.subscriberPrimary, this.loggerOptions);
       this.emit(EngineEvent.TransportsCreated, this.pcManager.publisher, this.pcManager.subscriber);
       this.pcManager.onIceCandidate = (candidate, target) => {
         this.client.sendIceCandidate(candidate, target);
@@ -17184,7 +17324,7 @@ class RTCEngine extends eventsExports.EventEmitter {
       };
       this.pcManager.onDataChannel = this.handleDataChannel;
       this.pcManager.onStateChange = (connectionState, publisherState, subscriberState) => __awaiter(this, void 0, void 0, function* () {
-        livekitLogger.debug("primary PC state changed ".concat(connectionState));
+        this.log.debug("primary PC state changed ".concat(connectionState), this.logContext);
         if (connectionState === PCTransportState.CONNECTED) {
           const shouldEmit = this.pcState === PCState.New;
           this.pcState = PCState.Connected;
@@ -17211,9 +17351,9 @@ class RTCEngine extends eventsExports.EventEmitter {
       if (!this.pcManager) {
         return;
       }
-      livekitLogger.debug('received server answer', {
+      this.log.debug('received server answer', Object.assign(Object.assign({}, this.logContext), {
         RTCSdpType: sd.type
-      });
+      }));
       yield this.pcManager.setPublisherAnswer(sd);
     });
     // add candidate on trickle
@@ -17221,10 +17361,10 @@ class RTCEngine extends eventsExports.EventEmitter {
       if (!this.pcManager) {
         return;
       }
-      livekitLogger.trace('got ICE candidate from peer', {
+      this.log.trace('got ICE candidate from peer', Object.assign(Object.assign({}, this.logContext), {
         candidate,
         target
-      });
+      }));
       this.pcManager.addIceCandidate(candidate, target);
     };
     // when server creates an offer for the client
@@ -17236,9 +17376,15 @@ class RTCEngine extends eventsExports.EventEmitter {
       this.client.sendAnswer(answer);
     });
     this.client.onLocalTrackPublished = res => {
-      livekitLogger.debug('received trackPublishedResponse', res);
+      var _a;
+      this.log.debug('received trackPublishedResponse', Object.assign(Object.assign({}, this.logContext), {
+        cid: res.cid,
+        track: (_a = res.track) === null || _a === void 0 ? void 0 : _a.sid
+      }));
       if (!this.pendingTrackResolvers[res.cid]) {
-        livekitLogger.error("missing track resolver for ".concat(res.cid));
+        this.log.error("missing track resolver for ".concat(res.cid), Object.assign(Object.assign({}, this.logContext), {
+          cid: res.cid
+        }));
         return;
       }
       const {
@@ -17268,16 +17414,16 @@ class RTCEngine extends eventsExports.EventEmitter {
         this.emit(EngineEvent.Disconnected, leave === null || leave === void 0 ? void 0 : leave.reason);
         this.close();
       }
-      livekitLogger.trace('leave request', {
-        leave
-      });
+      this.log.debug('client leave request', Object.assign(Object.assign({}, this.logContext), {
+        reason: leave === null || leave === void 0 ? void 0 : leave.reason
+      }));
     };
   }
   makeRTCConfiguration(serverResponse) {
     var _a;
     const rtcConfig = Object.assign({}, this.rtcConfig);
     if ((_a = this.signalOpts) === null || _a === void 0 ? void 0 : _a.e2eeEnabled) {
-      livekitLogger.debug('E2EE - setting up transports with insertable streams');
+      this.log.debug('E2EE - setting up transports with insertable streams', this.logContext);
       //  this makes sure that no data is sent before the transforms are ready
       // @ts-ignore
       rtcConfig.encodedInsertableStreams = true;
@@ -17347,7 +17493,9 @@ class RTCEngine extends eventsExports.EventEmitter {
     }
     const cap = RTCRtpSender.getCapabilities(kind);
     if (!cap) return;
-    livekitLogger.debug('get capabilities', cap);
+    this.log.debug('get sender capabilities', Object.assign(Object.assign({}, this.logContext), {
+      cap
+    }));
     const matched = [];
     const partialMatched = [];
     const unmatched = [];
@@ -17385,7 +17533,7 @@ class RTCEngine extends eventsExports.EventEmitter {
         return sender;
       }
       if (supportsAddTrack()) {
-        livekitLogger.warn('using add-track fallback');
+        this.log.warn('using add-track fallback', this.logContext);
         const sender = yield this.createRTCRtpSender(track.mediaStreamTrack);
         return sender;
       }
@@ -17399,7 +17547,7 @@ class RTCEngine extends eventsExports.EventEmitter {
         return this.createSimulcastTransceiverSender(track, simulcastTrack, opts, encodings);
       }
       if (supportsAddTrack()) {
-        livekitLogger.debug('using add-track fallback');
+        this.log.debug('using add-track fallback', this.logContext);
         return this.createRTCRtpSender(track.mediaStreamTrack);
       }
       throw new UnexpectedConnectionState('Cannot stream on this device');
@@ -17488,9 +17636,9 @@ class RTCEngine extends eventsExports.EventEmitter {
         this.reconnectAttempts += 1;
         let recoverable = true;
         if (e instanceof UnexpectedConnectionState) {
-          livekitLogger.debug('received unrecoverable error', {
+          this.log.debug('received unrecoverable error', Object.assign(Object.assign({}, this.logContext), {
             error: e
-          });
+          }));
           // unrecoverable
           recoverable = false;
         } else if (!(e instanceof SignalReconnectError)) {
@@ -17500,7 +17648,7 @@ class RTCEngine extends eventsExports.EventEmitter {
         if (recoverable) {
           this.handleDisconnect('reconnect', ReconnectReason.RR_UNKNOWN);
         } else {
-          livekitLogger.info("could not recover connection after ".concat(this.reconnectAttempts, " attempts, ").concat(Date.now() - this.reconnectStart, "ms. giving up"));
+          this.log.info("could not recover connection after ".concat(this.reconnectAttempts, " attempts, ").concat(Date.now() - this.reconnectStart, "ms. giving up"), this.logContext);
           this.emit(EngineEvent.Disconnected);
           yield this.close();
         }
@@ -17513,9 +17661,9 @@ class RTCEngine extends eventsExports.EventEmitter {
     try {
       return this.reconnectPolicy.nextRetryDelayInMs(context);
     } catch (e) {
-      livekitLogger.warn('encountered error in reconnect policy', {
+      this.log.warn('encountered error in reconnect policy', Object.assign(Object.assign({}, this.logContext), {
         error: e
-      });
+      }));
     }
     // error in user code with provided reconnect policy, stop reconnecting
     return null;
@@ -17528,7 +17676,7 @@ class RTCEngine extends eventsExports.EventEmitter {
           // permanent failure, don't attempt reconnection
           throw new UnexpectedConnectionState('could not reconnect, url or token not saved');
         }
-        livekitLogger.info("reconnecting, attempt: ".concat(this.reconnectAttempts));
+        this.log.info("reconnecting, attempt: ".concat(this.reconnectAttempts), this.logContext);
         this.emit(EngineEvent.Restarting);
         if (!this.client.isDisconnected) {
           yield this.client.sendLeave();
@@ -17538,7 +17686,7 @@ class RTCEngine extends eventsExports.EventEmitter {
         let joinResponse;
         try {
           if (!this.signalOpts) {
-            livekitLogger.warn('attempted connection restart, without signal options present');
+            this.log.warn('attempted connection restart, without signal options present', this.logContext);
             throw new SignalReconnectError();
           }
           // in case a regionUrl is passed, the region URL takes precedence
@@ -17583,7 +17731,7 @@ class RTCEngine extends eventsExports.EventEmitter {
       if (!this.pcManager) {
         throw new UnexpectedConnectionState('publisher and subscriber connections unset');
       }
-      livekitLogger.info("resuming signal connection, attempt ".concat(this.reconnectAttempts));
+      this.log.info("resuming signal connection, attempt ".concat(this.reconnectAttempts), this.logContext);
       this.emit(EngineEvent.Resuming);
       try {
         this.setupSignalClientCallbacks();
@@ -17596,7 +17744,7 @@ class RTCEngine extends eventsExports.EventEmitter {
         let message = '';
         if (e instanceof Error) {
           message = e.message;
-          livekitLogger.error(e.message);
+          this.log.error(e.message, this.logContext);
         }
         if (e instanceof ConnectionError && e.reason === 0 /* ConnectionErrorReason.NotAllowed */) {
           throw new UnexpectedConnectionState('could not reconnect, token might be expired');
@@ -17631,7 +17779,7 @@ class RTCEngine extends eventsExports.EventEmitter {
   waitForPCReconnected() {
     return __awaiter(this, void 0, void 0, function* () {
       this.pcState = PCState.Reconnecting;
-      livekitLogger.debug('waiting for peer connection to reconnect');
+      this.log.debug('waiting for peer connection to reconnect', this.logContext);
       try {
         yield sleep(minReconnectWait); // FIXME setTimeout again not ideal for a connection critical path
         if (!this.pcManager) {
@@ -17726,7 +17874,7 @@ class RTCEngine extends eventsExports.EventEmitter {
         const abortController = new AbortController();
         const handleClosed = () => {
           abortController.abort();
-          livekitLogger.debug('engine disconnected while negotiation was ongoing');
+          this.log.debug('engine disconnected while negotiation was ongoing', this.logContext);
           resolve();
           return;
         };
@@ -17780,7 +17928,7 @@ class RTCEngine extends eventsExports.EventEmitter {
   sendSyncState(remoteTracks, localTracks) {
     var _a, _b;
     if (!this.pcManager) {
-      livekitLogger.warn('sync state cannot be sent without peer connection setup');
+      this.log.warn('sync state cannot be sent without peer connection setup', this.logContext);
       return;
     }
     const previousAnswer = this.pcManager.subscriber.getLocalDescription();
@@ -17951,7 +18099,8 @@ class LocalAudioTrack extends LocalTrack {
   constructor(mediaTrack, constraints) {
     let userProvidedTrack = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
     let audioContext = arguments.length > 3 ? arguments[3] : undefined;
-    super(mediaTrack, Track.Kind.Audio, constraints, userProvidedTrack);
+    let loggerOptions = arguments.length > 4 ? arguments[4] : undefined;
+    super(mediaTrack, Track.Kind.Audio, constraints, userProvidedTrack, loggerOptions);
     /** @internal */
     this.stopOnMute = false;
     this.monitorSender = () => __awaiter(this, void 0, void 0, function* () {
@@ -17963,9 +18112,9 @@ class LocalAudioTrack extends LocalTrack {
       try {
         stats = yield this.getSenderStats();
       } catch (e) {
-        livekitLogger.error('could not get audio sender stats', {
+        this.log.error('could not get audio sender stats', Object.assign(Object.assign({}, this.logContext), {
           error: e
-        });
+        }));
         return;
       }
       if (stats && this.prevStats) {
@@ -17999,7 +18148,7 @@ class LocalAudioTrack extends LocalTrack {
       try {
         // disabled special handling as it will cause BT headsets to switch communication modes
         if (this.source === Track.Source.Microphone && this.stopOnMute && !this.isUserProvided) {
-          livekitLogger.debug('stopping mic track');
+          this.log.debug('stopping mic track', this.logContext);
           // also stop the track, so that microphone indicator is turned off
           this._mediaStreamTrack.stop();
         }
@@ -18021,7 +18170,7 @@ class LocalAudioTrack extends LocalTrack {
       try {
         const deviceHasChanged = this._constraints.deviceId && this._mediaStreamTrack.getSettings().deviceId !== unwrapConstraint(this._constraints.deviceId);
         if (this.source === Track.Source.Microphone && (this.stopOnMute || this._mediaStreamTrack.readyState === 'ended' || deviceHasChanged) && !this.isUserProvided) {
-          livekitLogger.debug('reacquiring mic track');
+          this.log.debug('reacquiring mic track', this.logContext);
           yield this.restartTrack();
         }
         yield _super.unmute.call(this);
@@ -18088,7 +18237,7 @@ class LocalAudioTrack extends LocalTrack {
           track: this._mediaStreamTrack,
           audioContext: this.audioContext
         };
-        livekitLogger.debug("setting up audio processor ".concat(processor.name));
+        this.log.debug("setting up audio processor ".concat(processor.name), this.logContext);
         yield processor.init(processorOptions);
         this.processor = processor;
         if (this.processor.processedTrack) {
@@ -18136,7 +18285,7 @@ class LocalAudioTrack extends LocalTrack {
       const trackIsSilent = yield detectSilence(this);
       if (trackIsSilent) {
         if (!this.isMuted) {
-          livekitLogger.warn('silence detected on local audio track');
+          this.log.warn('silence detected on local audio track', this.logContext);
         }
         this.emit(TrackEvent.AudioSilenceDetected);
       }
@@ -18146,12 +18295,12 @@ class LocalAudioTrack extends LocalTrack {
 }
 
 /** @internal */
-function mediaTrackToLocalTrack(mediaStreamTrack, constraints) {
+function mediaTrackToLocalTrack(mediaStreamTrack, constraints, loggerOptions) {
   switch (mediaStreamTrack.kind) {
     case 'audio':
-      return new LocalAudioTrack(mediaStreamTrack, constraints, false);
+      return new LocalAudioTrack(mediaStreamTrack, constraints, false, undefined, loggerOptions);
     case 'video':
-      return new LocalVideoTrack(mediaStreamTrack, constraints, false);
+      return new LocalVideoTrack(mediaStreamTrack, constraints, false, loggerOptions);
     default:
       throw new TrackInvalidError("unsupported track type: ".concat(mediaStreamTrack.kind));
   }
@@ -18170,11 +18319,11 @@ const defaultSimulcastPresets43 = [VideoPresets43.h180, VideoPresets43.h360];
 const computeDefaultScreenShareSimulcastPresets = fromPreset => {
   const layers = [{
     scaleResolutionDownBy: 2,
-    fps: 3
+    fps: fromPreset.encoding.maxFramerate
   }];
   return layers.map(t => {
-    var _a;
-    return new VideoPreset(Math.floor(fromPreset.width / t.scaleResolutionDownBy), Math.floor(fromPreset.height / t.scaleResolutionDownBy), Math.max(150000, Math.floor(fromPreset.encoding.maxBitrate / (Math.pow(t.scaleResolutionDownBy, 2) * (((_a = fromPreset.encoding.maxFramerate) !== null && _a !== void 0 ? _a : 30) / t.fps)))), t.fps, fromPreset.encoding.priority);
+    var _a, _b;
+    return new VideoPreset(Math.floor(fromPreset.width / t.scaleResolutionDownBy), Math.floor(fromPreset.height / t.scaleResolutionDownBy), Math.max(150000, Math.floor(fromPreset.encoding.maxBitrate / (Math.pow(t.scaleResolutionDownBy, 2) * (((_a = fromPreset.encoding.maxFramerate) !== null && _a !== void 0 ? _a : 30) / ((_b = t.fps) !== null && _b !== void 0 ? _b : 30))))), t.fps, fromPreset.encoding.priority);
   });
 };
 // /**
@@ -18456,7 +18605,8 @@ class LocalVideoTrack extends LocalTrack {
    */
   constructor(mediaTrack, constraints) {
     let userProvidedTrack = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-    super(mediaTrack, Track.Kind.Video, constraints, userProvidedTrack);
+    let loggerOptions = arguments.length > 3 ? arguments[3] : undefined;
+    super(mediaTrack, Track.Kind.Video, constraints, userProvidedTrack, loggerOptions);
     /* @internal */
     this.simulcastCodecs = new Map();
     this.monitorSender = () => __awaiter(this, void 0, void 0, function* () {
@@ -18468,9 +18618,9 @@ class LocalVideoTrack extends LocalTrack {
       try {
         stats = yield this.getSenderStats();
       } catch (e) {
-        livekitLogger.error('could not get audio sender stats', {
+        this.log.error('could not get audio sender stats', Object.assign(Object.assign({}, this.logContext), {
           error: e
-        });
+        }));
         return;
       }
       const statsMap = new Map(stats.map(s => [s.rid, s]));
@@ -18590,7 +18740,7 @@ class LocalVideoTrack extends LocalTrack {
       const unlock = yield this.muteLock.lock();
       try {
         if (this.source === Track.Source.Camera && !this.isUserProvided) {
-          livekitLogger.debug('stopping camera track');
+          this.log.debug('stopping camera track', this.logContext);
           // also stop the track, so that camera indicator is turned off
           this._mediaStreamTrack.stop();
         }
@@ -18611,7 +18761,7 @@ class LocalVideoTrack extends LocalTrack {
       const unlock = yield this.muteLock.lock();
       try {
         if (this.source === Track.Source.Camera && !this.isUserProvided) {
-          livekitLogger.debug('reacquiring camera track');
+          this.log.debug('reacquiring camera track', this.logContext);
           yield this.restartTrack();
         }
         yield _super.unmute.call(this);
@@ -18676,7 +18826,7 @@ class LocalVideoTrack extends LocalTrack {
         enabled: q <= maxQuality
       }));
     }
-    livekitLogger.debug("setting publishing quality. max quality ".concat(maxQuality));
+    this.log.debug("setting publishing quality. max quality ".concat(maxQuality), this.logContext);
     this.setPublishingLayers(qualities);
   }
   setDeviceId(deviceId) {
@@ -18798,10 +18948,10 @@ class LocalVideoTrack extends LocalTrack {
     var _a, codecs_1, codecs_1_1;
     var _b, e_5, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
-      livekitLogger.debug('setting publishing codecs', {
+      this.log.debug('setting publishing codecs', Object.assign(Object.assign({}, this.logContext), {
         codecs,
         currentCodec: this.codec
-      });
+      }));
       // only enable simulcast codec for preference codec setted
       if (!this.codec && codecs.length > 0) {
         yield this.setPublishingLayers(codecs[0].qualities);
@@ -18818,7 +18968,9 @@ class LocalVideoTrack extends LocalTrack {
             yield this.setPublishingLayers(codec.qualities);
           } else {
             const simulcastCodecInfo = this.simulcastCodecs.get(codec.codec);
-            livekitLogger.debug("try setPublishingCodec for ".concat(codec.codec), simulcastCodecInfo);
+            this.log.debug("try setPublishingCodec for ".concat(codec.codec), Object.assign(Object.assign({}, this.logContext), {
+              simulcastCodecInfo
+            }));
             if (!simulcastCodecInfo || !simulcastCodecInfo.sender) {
               for (const q of codec.qualities) {
                 if (q.enabled) {
@@ -18827,8 +18979,8 @@ class LocalVideoTrack extends LocalTrack {
                 }
               }
             } else if (simulcastCodecInfo.encodings) {
-              livekitLogger.debug("try setPublishingLayersForSender ".concat(codec.codec));
-              yield setPublishingLayersForSender(simulcastCodecInfo.sender, simulcastCodecInfo.encodings, codec.qualities, this.senderLock);
+              this.log.debug("try setPublishingLayersForSender ".concat(codec.codec), this.logContext);
+              yield setPublishingLayersForSender(simulcastCodecInfo.sender, simulcastCodecInfo.encodings, codec.qualities, this.senderLock, this.log, this.logContext);
             }
           }
         }
@@ -18852,11 +19004,13 @@ class LocalVideoTrack extends LocalTrack {
    */
   setPublishingLayers(qualities) {
     return __awaiter(this, void 0, void 0, function* () {
-      livekitLogger.debug('setting publishing layers', qualities);
+      this.log.debug('setting publishing layers', Object.assign(Object.assign({}, this.logContext), {
+        qualities
+      }));
       if (!this.sender || !this.encodings) {
         return;
       }
-      yield setPublishingLayersForSender(this.sender, this.encodings, qualities, this.senderLock);
+      yield setPublishingLayersForSender(this.sender, this.encodings, qualities, this.senderLock, this.log, this.logContext);
     });
   }
   handleAppVisibilityChanged() {
@@ -18874,14 +19028,14 @@ class LocalVideoTrack extends LocalTrack {
     });
   }
 }
-function setPublishingLayersForSender(sender, senderEncodings, qualities, senderLock) {
+function setPublishingLayersForSender(sender, senderEncodings, qualities, senderLock, log, logContext) {
   return __awaiter(this, void 0, void 0, function* () {
     const unlock = yield senderLock.lock();
-    livekitLogger.debug('setPublishingLayersForSender', {
+    log.debug('setPublishingLayersForSender', Object.assign(Object.assign({}, logContext), {
       sender,
       qualities,
       senderEncodings
-    });
+    }));
     try {
       const params = sender.getParameters();
       const {
@@ -18891,7 +19045,7 @@ function setPublishingLayersForSender(sender, senderEncodings, qualities, sender
         return;
       }
       if (encodings.length !== senderEncodings.length) {
-        livekitLogger.warn('cannot set publishing layers, encodings mismatch');
+        log.warn('cannot set publishing layers, encodings mismatch');
         return;
       }
       let hasChanged = false;
@@ -18917,7 +19071,7 @@ function setPublishingLayersForSender(sender, senderEncodings, qualities, sender
           if (encoding.active !== subscribedQuality.enabled) {
             hasChanged = true;
             encoding.active = subscribedQuality.enabled;
-            livekitLogger.debug("setting layer ".concat(subscribedQuality.quality, " to ").concat(encoding.active ? 'enabled' : 'disabled'));
+            log.debug("setting layer ".concat(subscribedQuality.quality, " to ").concat(encoding.active ? 'enabled' : 'disabled'), logContext);
             // FireFox does not support setting encoding.active to false, so we
             // have a workaround of lowering its bitrate and resolution to the min.
             if (isFireFox()) {
@@ -18938,7 +19092,9 @@ function setPublishingLayersForSender(sender, senderEncodings, qualities, sender
       }
       if (hasChanged) {
         params.encodings = encodings;
-        livekitLogger.debug("setting encodings", params.encodings);
+        log.debug("setting encodings", Object.assign(Object.assign({}, logContext), {
+          encodings: params.encodings
+        }));
         yield sender.setParameters(params);
       }
     } finally {
@@ -19001,8 +19157,8 @@ function videoLayersFromEncodings(width, height, encodings, svc) {
 }
 
 class RemoteTrack extends Track {
-  constructor(mediaTrack, sid, kind, receiver) {
-    super(mediaTrack, kind);
+  constructor(mediaTrack, sid, kind, receiver, loggerOptions) {
+    super(mediaTrack, kind, loggerOptions);
     this.sid = sid;
     this.receiver = receiver;
   }
@@ -19063,8 +19219,8 @@ class RemoteTrack extends Track {
 }
 
 class RemoteAudioTrack extends RemoteTrack {
-  constructor(mediaTrack, sid, receiver, audioContext, audioOutput) {
-    super(mediaTrack, sid, Track.Kind.Audio, receiver);
+  constructor(mediaTrack, sid, receiver, audioContext, audioOutput, loggerOptions) {
+    super(mediaTrack, sid, Track.Kind.Audio, receiver, loggerOptions);
     this.monitorReceiver = () => __awaiter(this, void 0, void 0, function* () {
       if (!this.receiver) {
         this._currentBitrate = 0;
@@ -19147,7 +19303,7 @@ class RemoteAudioTrack extends RemoteTrack {
       element.setSinkId(this.sinkId);
     }
     if (this.audioContext && needsNewWebAudioConnection) {
-      livekitLogger.debug('using audio context mapping');
+      this.log.debug('using audio context mapping', this.logContext);
       this.connectWebAudio(this.audioContext, element);
       element.volume = 0;
       element.muted = true;
@@ -19263,8 +19419,8 @@ class RemoteAudioTrack extends RemoteTrack {
 
 const REACTION_DELAY = 100;
 class RemoteVideoTrack extends RemoteTrack {
-  constructor(mediaTrack, sid, receiver, adaptiveStreamSettings) {
-    super(mediaTrack, sid, Track.Kind.Video, receiver);
+  constructor(mediaTrack, sid, receiver, adaptiveStreamSettings, loggerOptions) {
+    super(mediaTrack, sid, Track.Kind.Video, receiver, loggerOptions);
     this.elementInfos = [];
     this.monitorReceiver = () => __awaiter(this, void 0, void 0, function* () {
       if (!this.receiver) {
@@ -19338,7 +19494,7 @@ class RemoteVideoTrack extends RemoteTrack {
       this.debouncedHandleResize();
       this.updateVisibility();
     } else {
-      livekitLogger.warn('visibility resize observer not triggered');
+      this.log.warn('visibility resize observer not triggered', this.logContext);
     }
   }
   /**
@@ -19348,7 +19504,7 @@ class RemoteVideoTrack extends RemoteTrack {
    */
   stopObservingElementInfo(elementInfo) {
     if (!this.isAdaptiveStream) {
-      livekitLogger.warn('stopObservingElementInfo ignored');
+      this.log.warn('stopObservingElementInfo ignored', this.logContext);
       return;
     }
     const stopElementInfos = this.elementInfos.filter(info => info === elementInfo);
@@ -19579,16 +19735,20 @@ function isElementInViewport(el) {
 }
 
 class TrackPublication extends eventsExports.EventEmitter {
-  constructor(kind, id, name) {
+  constructor(kind, id, name, loggerOptions) {
+    var _a;
     super();
     this.metadataMuted = false;
     this.encryption = Encryption_Type.NONE;
+    this.log = livekitLogger;
     this.handleMuted = () => {
       this.emit(TrackEvent.Muted);
     };
     this.handleUnmuted = () => {
       this.emit(TrackEvent.Unmuted);
     };
+    this.log = getLogger((_a = loggerOptions === null || loggerOptions === void 0 ? void 0 : loggerOptions.loggerName) !== null && _a !== void 0 ? _a : LoggerNames.Publication);
+    this.loggerContextCb = this.loggerContextCb;
     this.setMaxListeners(100);
     this.kind = kind;
     this.trackSid = id;
@@ -19608,6 +19768,10 @@ class TrackPublication extends eventsExports.EventEmitter {
       track.on(TrackEvent.Unmuted, this.handleUnmuted);
     }
   }
+  get logContext() {
+    var _a;
+    return Object.assign(Object.assign({}, (_a = this.loggerContextCb) === null || _a === void 0 ? void 0 : _a.call(this)), getLogContextFromTrack(this));
+  }
   get isMuted() {
     return this.metadataMuted;
   }
@@ -19651,9 +19815,9 @@ class TrackPublication extends eventsExports.EventEmitter {
     }
     this.encryption = info.encryption;
     this.trackInfo = info;
-    livekitLogger.debug('update publication info', {
+    this.log.debug('update publication info', Object.assign(Object.assign({}, this.logContext), {
       info
-    });
+    }));
   }
 }
 (function (TrackPublication) {
@@ -19673,8 +19837,8 @@ class LocalTrackPublication extends TrackPublication {
     var _a;
     return (_a = this.track) === null || _a === void 0 ? void 0 : _a.isUpstreamPaused;
   }
-  constructor(kind, ti, track) {
-    super(kind, ti.sid, ti.name);
+  constructor(kind, ti, track, loggerOptions) {
+    super(kind, ti.sid, ti.name, loggerOptions);
     this.track = undefined;
     this.handleTrackEnded = () => {
       this.emit(TrackEvent.Ended);
@@ -19771,6 +19935,13 @@ function qualityFromProto(q) {
   }
 }
 class Participant extends eventsExports.EventEmitter {
+  get logContext() {
+    var _a, _b;
+    return Object.assign(Object.assign({}, (_b = (_a = this.loggerOptions) === null || _a === void 0 ? void 0 : _a.loggerContextCb) === null || _b === void 0 ? void 0 : _b.call(_a)), {
+      participantSid: this.sid,
+      participantId: this.identity
+    });
+  }
   get isEncrypted() {
     return this.tracks.size > 0 && Array.from(this.tracks.values()).every(tr => tr.isEncrypted);
   }
@@ -19779,13 +19950,17 @@ class Participant extends eventsExports.EventEmitter {
     return (_b = (_a = this.permissions) === null || _a === void 0 ? void 0 : _a.agent) !== null && _b !== void 0 ? _b : false;
   }
   /** @internal */
-  constructor(sid, identity, name, metadata) {
+  constructor(sid, identity, name, metadata, loggerOptions) {
+    var _a;
     super();
     /** audio level between 0-1.0, 1 being loudest, 0 being softest */
     this.audioLevel = 0;
     /** if participant is currently speaking */
     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.setMaxListeners(100);
     this.sid = sid;
     this.identity = identity;
@@ -19870,9 +20045,9 @@ class Participant extends eventsExports.EventEmitter {
     }
     // set this last so setMetadata can detect changes
     this.participantInfo = info;
-    livekitLogger.trace('update participant info', {
+    this.log.trace('update participant info', Object.assign(Object.assign({}, this.logContext), {
       info
-    });
+    }));
     return true;
   }
   /**
@@ -19971,8 +20146,8 @@ function trackPermissionToProto(perms) {
 }
 
 class RemoteTrackPublication extends TrackPublication {
-  constructor(kind, ti, autoSubscribe) {
-    super(kind, ti.sid, ti.name);
+  constructor(kind, ti, autoSubscribe, loggerOptions) {
+    super(kind, ti.sid, ti.name, loggerOptions);
     this.track = undefined;
     /** @internal */
     this.allowed = true;
@@ -19983,16 +20158,12 @@ class RemoteTrackPublication extends TrackPublication {
       this.emit(TrackEvent.Ended, track);
     };
     this.handleVisibilityChange = visible => {
-      livekitLogger.debug("adaptivestream video visibility ".concat(this.trackSid, ", visible=").concat(visible), {
-        trackSid: this.trackSid
-      });
+      this.log.debug("adaptivestream video visibility ".concat(this.trackSid, ", visible=").concat(visible), this.logContext);
       this.disabled = !visible;
       this.emitTrackUpdate();
     };
     this.handleVideoDimensionsChange = dimensions => {
-      livekitLogger.debug("adaptivestream video dimensions ".concat(dimensions.width, "x").concat(dimensions.height), {
-        trackSid: this.trackSid
-      });
+      this.log.debug("adaptivestream video dimensions ".concat(dimensions.width, "x").concat(dimensions.height), this.logContext);
       this.videoDimensions = dimensions;
       this.emitTrackUpdate();
     };
@@ -20178,15 +20349,11 @@ class RemoteTrackPublication extends TrackPublication {
   }
   isManualOperationAllowed() {
     if (this.kind === Track.Kind.Video && this.isAdaptiveStream) {
-      livekitLogger.warn('adaptive stream is enabled, cannot change video track settings', {
-        trackSid: this.trackSid
-      });
+      this.log.warn('adaptive stream is enabled, cannot change video track settings', this.logContext);
       return false;
     }
     if (!this.isDesired) {
-      livekitLogger.warn('cannot update track settings when not subscribed', {
-        trackSid: this.trackSid
-      });
+      this.log.warn('cannot update track settings when not subscribed', this.logContext);
       return false;
     }
     return true;
@@ -20220,8 +20387,8 @@ class RemoteParticipant extends Participant {
     return new RemoteParticipant(signalClient, pi.sid, pi.identity, pi.name, pi.metadata);
   }
   /** @internal */
-  constructor(signalClient, sid, identity, name, metadata) {
-    super(sid, identity || '', name, metadata);
+  constructor(signalClient, sid, identity, name, metadata, loggerOptions) {
+    super(sid, identity || '', name, metadata, loggerOptions);
     this.signalClient = signalClient;
     this.tracks = new Map();
     this.audioTracks = new Map();
@@ -20232,7 +20399,7 @@ class RemoteParticipant extends Participant {
     super.addTrackPublication(publication);
     // register action events
     publication.on(TrackEvent.UpdateSettings, settings => {
-      livekitLogger.debug('send update settings', settings);
+      this.log.debug('send update settings', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(publication)));
       this.signalClient.sendUpdateTrackSettings(settings);
     });
     publication.on(TrackEvent.UpdateSubscription, sub => {
@@ -20315,10 +20482,9 @@ class RemoteParticipant extends Participant {
     // yet arrived. Wait a bit longer for it to arrive, or fire an error
     if (!publication) {
       if (triesLeft === 0) {
-        livekitLogger.error('could not find published track', {
-          participant: this.sid,
+        this.log.error('could not find published track', Object.assign(Object.assign({}, this.logContext), {
           trackSid: sid
-        });
+        }));
         this.emit(ParticipantEvent.TrackSubscriptionFailed, sid);
         return;
       }
@@ -20329,10 +20495,7 @@ class RemoteParticipant extends Participant {
       return;
     }
     if (mediaTrack.readyState === 'ended') {
-      livekitLogger.error('unable to subscribe because MediaStreamTrack is ended. Do not call MediaStreamTrack.stop()', {
-        participant: this.sid,
-        trackSid: sid
-      });
+      this.log.error('unable to subscribe because MediaStreamTrack is ended. Do not call MediaStreamTrack.stop()', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(publication)));
       this.emit(ParticipantEvent.TrackSubscriptionFailed, sid);
       return;
     }
@@ -20375,7 +20538,7 @@ class RemoteParticipant extends Participant {
     const validTracks = new Map();
     const newTracks = new Map();
     info.tracks.forEach(ti => {
-      var _a;
+      var _a, _b;
       let publication = this.getTrackPublication(ti.sid);
       if (!publication) {
         // new publication
@@ -20383,17 +20546,18 @@ class RemoteParticipant extends Participant {
         if (!kind) {
           return;
         }
-        publication = new RemoteTrackPublication(kind, ti, (_a = this.signalClient.connectOptions) === null || _a === void 0 ? void 0 : _a.autoSubscribe);
+        publication = new RemoteTrackPublication(kind, ti, (_a = this.signalClient.connectOptions) === null || _a === void 0 ? void 0 : _a.autoSubscribe, {
+          loggerContextCb: () => this.logContext,
+          loggerName: (_b = this.loggerOptions) === null || _b === void 0 ? void 0 : _b.loggerName
+        });
         publication.updateInfo(ti);
         newTracks.set(ti.sid, publication);
         const existingTrackOfSource = Array.from(this.tracks.values()).find(publishedTrack => publishedTrack.source === (publication === null || publication === void 0 ? void 0 : publication.source));
         if (existingTrackOfSource && publication.source !== Track.Source.Unknown) {
-          livekitLogger.debug("received a second track publication for ".concat(this.identity, " with the same source: ").concat(publication.source), {
-            oldTrack: existingTrackOfSource,
-            newTrack: publication,
-            participant: this,
-            participantInfo: info
-          });
+          this.log.debug("received a second track publication for ".concat(this.identity, " with the same source: ").concat(publication.source), Object.assign(Object.assign({}, this.logContext), {
+            oldTrack: getLogContextFromTrack(existingTrackOfSource),
+            newTrack: getLogContextFromTrack(publication)
+          }));
         }
         this.addTrackPublication(publication);
       } else {
@@ -20404,10 +20568,7 @@ class RemoteParticipant extends Participant {
     // detect removed tracks
     this.tracks.forEach(publication => {
       if (!validTracks.has(publication.trackSid)) {
-        livekitLogger.trace('detected removed track on remote participant, unpublishing', {
-          publication,
-          participantSid: this.sid
-        });
+        this.log.trace('detected removed track on remote participant, unpublishing', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(publication)));
         this.unpublishTrack(publication.trackSid, true);
       }
     });
@@ -20467,11 +20628,10 @@ class RemoteParticipant extends Participant {
     for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
       args[_key - 1] = arguments[_key];
     }
-    livekitLogger.trace('participant event', {
-      participant: this.sid,
+    this.log.trace('participant event', Object.assign(Object.assign({}, this.logContext), {
       event,
       args
-    });
+    }));
     return super.emit(event, ...args);
   }
 }
@@ -20479,7 +20639,10 @@ class RemoteParticipant extends Participant {
 class LocalParticipant extends Participant {
   /** @internal */
   constructor(sid, identity, engine, options) {
-    super(sid, identity);
+    super(sid, identity, undefined, undefined, {
+      loggerName: options.loggerName,
+      loggerContextCb: () => this.engine.logContext
+    });
     this.pendingPublishing = new Set();
     this.pendingPublishPromises = new Map();
     this.participantTrackPermissions = [];
@@ -20499,16 +20662,16 @@ class LocalParticipant extends Participant {
     this.handleDisconnected = () => {
       var _a, _b;
       if (this.reconnectFuture) {
-        this.reconnectFuture.promise.catch(e => livekitLogger.warn(e));
+        this.reconnectFuture.promise.catch(e => this.log.warn(e.message, this.logContext));
         (_b = (_a = this.reconnectFuture) === null || _a === void 0 ? void 0 : _a.reject) === null || _b === void 0 ? void 0 : _b.call(_a, 'Got disconnected during reconnection attempt');
         this.reconnectFuture = undefined;
       }
     };
     this.updateTrackSubscriptionPermissions = () => {
-      livekitLogger.debug('updating track subscription permissions', {
+      this.log.debug('updating track subscription permissions', Object.assign(Object.assign({}, this.logContext), {
         allParticipantsAllowed: this.allParticipantsAllowedToSubscribe,
         participantTrackPermissions: this.participantTrackPermissions
-      });
+      }));
       this.engine.client.sendUpdateSubscriptionPermissions(this.allParticipantsAllowedToSubscribe, this.participantTrackPermissions.map(p => trackPermissionToProto(p)));
     };
     /** @internal */
@@ -20522,17 +20685,17 @@ class LocalParticipant extends Participant {
         muted = true;
       }
       if (!track.sid) {
-        livekitLogger.error('could not update mute status for unpublished track', track);
+        this.log.error('could not update mute status for unpublished track', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
         return;
       }
       this.engine.updateMuteStatus(track.sid, muted);
     };
     this.onTrackUpstreamPaused = track => {
-      livekitLogger.debug('upstream paused');
+      this.log.debug('upstream paused', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
       this.onTrackMuted(track, true);
     };
     this.onTrackUpstreamResumed = track => {
-      livekitLogger.debug('upstream resumed');
+      this.log.debug('upstream resumed', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
       this.onTrackMuted(track, track.isMuted);
     };
     this.handleSubscribedQualityUpdate = update => __awaiter(this, void 0, void 0, function* () {
@@ -20543,10 +20706,9 @@ class LocalParticipant extends Participant {
       }
       const pub = this.videoTracks.get(update.trackSid);
       if (!pub) {
-        livekitLogger.warn('received subscribed quality update for unknown track', {
-          method: 'handleSubscribedQualityUpdate',
-          sid: update.trackSid
-        });
+        this.log.warn('received subscribed quality update for unknown track', Object.assign(Object.assign({}, this.logContext), {
+          trackSid: update.trackSid
+        }));
         return;
       }
       if (update.subscribedCodecs.length > 0) {
@@ -20560,7 +20722,7 @@ class LocalParticipant extends Participant {
             _f = false;
             const codec = _c;
             if (isBackupCodec(codec)) {
-              livekitLogger.debug("publish ".concat(codec, " for ").concat(pub.videoTrack.sid));
+              this.log.debug("publish ".concat(codec, " for ").concat(pub.videoTrack.sid), Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(pub)));
               yield this.publishAdditionalCodecForTrack(pub.videoTrack, codec, pub.options);
             }
           }
@@ -20582,19 +20744,16 @@ class LocalParticipant extends Participant {
     this.handleLocalTrackUnpublished = unpublished => {
       const track = this.tracks.get(unpublished.trackSid);
       if (!track) {
-        livekitLogger.warn('received unpublished event for unknown track', {
-          method: 'handleLocalTrackUnpublished',
+        this.log.warn('received unpublished event for unknown track', Object.assign(Object.assign({}, this.logContext), {
           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) {
-        livekitLogger.debug('unpublishing local track due to TrackEnded', {
-          track: track.sid
-        });
+        this.log.debug('unpublishing local track due to TrackEnded', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
         this.unpublishTrack(track);
       } else if (track.isUserProvided) {
         yield track.mute();
@@ -20608,7 +20767,7 @@ class LocalParticipant extends Participant {
                 name: track.source === Track.Source.Camera ? 'camera' : 'microphone'
               });
               if (currentPermissions && currentPermissions.state === 'denied') {
-                livekitLogger.warn("user has revoked access to ".concat(track.source));
+                this.log.warn("user has revoked access to ".concat(track.source), Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
                 // detect granted change after permissions were denied to try and resume then
                 currentPermissions.onchange = () => {
                   if (currentPermissions.state !== 'denied') {
@@ -20625,11 +20784,11 @@ class LocalParticipant extends Participant {
             }
           }
           if (!track.isMuted) {
-            livekitLogger.debug('track ended, attempting to use a different device');
+            this.log.debug('track ended, attempting to use a different device', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
             yield track.restartTrack();
           }
         } catch (e) {
-          livekitLogger.warn("could not restart track, muting instead");
+          this.log.warn("could not restart track, muting instead", Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
           yield track.mute();
         }
       }
@@ -20747,10 +20906,10 @@ class LocalParticipant extends Participant {
   setTrackEnabled(source, enabled, options, publishOptions) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
-      livekitLogger.debug('setTrackEnabled', {
+      this.log.debug('setTrackEnabled', Object.assign(Object.assign({}, this.logContext), {
         source,
         enabled
-      });
+      }));
       let track = this.getTrack(source);
       if (enabled) {
         if (track) {
@@ -20758,9 +20917,9 @@ class LocalParticipant extends Participant {
         } else {
           let localTracks;
           if (this.pendingPublishing.has(source)) {
-            livekitLogger.info('skipping duplicate published source', {
+            this.log.info('skipping duplicate published source', Object.assign(Object.assign({}, this.logContext), {
               source
-            });
+            }));
             // no-op it's already been requested
             return;
           }
@@ -20785,9 +20944,7 @@ class LocalParticipant extends Participant {
             }
             const publishPromises = [];
             for (const localTrack of localTracks) {
-              livekitLogger.info('publishing track', {
-                localTrack
-              });
+              this.log.info('publishing track', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(localTrack)));
               publishPromises.push(this.publishTrack(localTrack, publishOptions));
             }
             const publishedTracks = yield Promise.all(publishPromises);
@@ -20884,7 +21041,10 @@ class LocalParticipant extends Participant {
         if (typeof conOrBool !== 'boolean') {
           trackConstraints = conOrBool;
         }
-        const track = mediaTrackToLocalTrack(mediaStreamTrack, trackConstraints);
+        const track = mediaTrackToLocalTrack(mediaStreamTrack, trackConstraints, {
+          loggerName: this.roomOptions.loggerName,
+          loggerContextCb: () => this.logContext
+        });
         if (track.kind === Track.Kind.Video) {
           track.source = Track.Source.Camera;
         } else if (track.kind === Track.Kind.Audio) {
@@ -20908,18 +21068,33 @@ class LocalParticipant extends Participant {
       if (navigator.mediaDevices.getDisplayMedia === undefined) {
         throw new DeviceUnsupportedError('getDisplayMedia not supported');
       }
+      if (options.resolution === undefined && !isSafari17()) {
+        // we need to constrain the dimensions, otherwise it could lead to low bitrate
+        // due to encoding a huge video. Encoding such large surfaces is really expensive
+        // unfortunately Safari 17 has a but and cannot be constrained by default
+        options.resolution = ScreenSharePresets.h1080fps30.resolution;
+      }
       const constraints = screenCaptureToDisplayMediaStreamOptions(options);
       const stream = yield navigator.mediaDevices.getDisplayMedia(constraints);
       const tracks = stream.getVideoTracks();
       if (tracks.length === 0) {
         throw new TrackInvalidError('no video track found');
       }
-      const screenVideo = new LocalVideoTrack(tracks[0], undefined, false);
+      const screenVideo = new LocalVideoTrack(tracks[0], undefined, false, {
+        loggerName: this.roomOptions.loggerName,
+        loggerContextCb: () => this.logContext
+      });
       screenVideo.source = Track.Source.ScreenShare;
+      if (options.contentHint) {
+        screenVideo.mediaStreamTrack.contentHint = options.contentHint;
+      }
       const localTracks = [screenVideo];
       if (stream.getAudioTracks().length > 0) {
         this.emit(ParticipantEvent.AudioStreamAcquired);
-        const screenAudio = new LocalAudioTrack(stream.getAudioTracks()[0], undefined, false, this.audioContext);
+        const screenAudio = new LocalAudioTrack(stream.getAudioTracks()[0], undefined, false, this.audioContext, {
+          loggerName: this.roomOptions.loggerName,
+          loggerContextCb: () => this.logContext
+        });
         screenAudio.source = Track.Source.ScreenShareAudio;
         localTracks.push(screenAudio);
       }
@@ -20963,14 +21138,25 @@ class LocalParticipant extends Participant {
       if (track instanceof MediaStreamTrack) {
         switch (track.kind) {
           case 'audio':
-            track = new LocalAudioTrack(track, defaultConstraints, true, this.audioContext);
+            track = new LocalAudioTrack(track, defaultConstraints, true, this.audioContext, {
+              loggerName: this.roomOptions.loggerName,
+              loggerContextCb: () => this.logContext
+            });
             break;
           case 'video':
-            track = new LocalVideoTrack(track, defaultConstraints, true);
+            track = new LocalVideoTrack(track, defaultConstraints, true, {
+              loggerName: this.roomOptions.loggerName,
+              loggerContextCb: () => this.logContext
+            });
             break;
           default:
             throw new TrackInvalidError("unsupported MediaStreamTrack kind ".concat(track.kind));
         }
+      } else {
+        track.updateLoggerOptions({
+          loggerName: this.roomOptions.loggerName,
+          loggerContextCb: () => this.logContext
+        });
       }
       if (track instanceof LocalAudioTrack) {
         track.setAudioContext(this.audioContext);
@@ -20986,7 +21172,7 @@ class LocalParticipant extends Participant {
         }
       });
       if (existingPublication) {
-        livekitLogger.warn('track has already been published, skipping');
+        this.log.warn('track has already been published, skipping', Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(existingPublication)));
         return existingPublication;
       }
       const isStereoInput = 'channelCount' in track.mediaStreamTrack.getSettings() &&
@@ -20999,10 +21185,10 @@ class LocalParticipant extends Participant {
           options = {};
         }
         if (options.dtx === undefined) {
-          livekitLogger.info("Opus DTX will be disabled for stereo tracks by default. Enable them explicitly to make it work.");
+          this.log.info("Opus DTX will be disabled for stereo tracks by default. Enable them explicitly to make it work.", Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
         }
         if (options.red === undefined) {
-          livekitLogger.info("Opus RED will be disabled for stereo tracks by default. Enable them explicitly to make it work.");
+          this.log.info("Opus RED will be disabled for stereo tracks by default. Enable them explicitly to make it work.");
         }
         (_c = options.dtx) !== null && _c !== void 0 ? _c : options.dtx = false;
         (_d = options.red) !== null && _d !== void 0 ? _d : options.red = false;
@@ -21010,7 +21196,7 @@ class LocalParticipant extends Participant {
       const opts = Object.assign(Object.assign({}, this.roomOptions.publishDefaults), options);
       // disable simulcast if e2ee is set on safari
       if (isSafari() && this.roomOptions.e2ee) {
-        livekitLogger.info("End-to-end encryption is set up, simulcast publishing will be disabled on Safari");
+        this.log.info("End-to-end encryption is set up, simulcast publishing will be disabled on Safari", Object.assign({}, this.logContext));
         opts.simulcast = false;
       }
       if (opts.source) {
@@ -21033,7 +21219,7 @@ class LocalParticipant extends Participant {
     return __awaiter(this, void 0, void 0, function* () {
       const existingTrackOfSource = Array.from(this.tracks.values()).find(publishedTrack => track instanceof LocalTrack && publishedTrack.source === track.source);
       if (existingTrackOfSource && track.source !== Track.Source.Unknown) {
-        livekitLogger.info("publishing a second track with the same source: ".concat(track.source));
+        this.log.info("publishing a second track with the same source: ".concat(track.source), Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
       }
       if (opts.stopMicTrackOnMute && track instanceof LocalAudioTrack) {
         track.stopOnMute = true;
@@ -21092,7 +21278,9 @@ class LocalParticipant extends Participant {
             height: defaultRes.height
           };
           // log failure
-          livekitLogger.error('could not determine track dimensions, using defaults', dims);
+          this.log.error('could not determine track dimensions, using defaults', Object.assign(Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)), {
+            dims
+          }));
         }
         // width and height should be defined for video
         req.width = dims.width;
@@ -21154,26 +21342,29 @@ class LocalParticipant extends Participant {
       if (primaryCodecMime && track.kind === Track.Kind.Video) {
         const updatedCodec = mimeTypeToVideoCodecString(primaryCodecMime);
         if (updatedCodec !== videoCodec) {
-          livekitLogger.debug('falling back to server selected codec', {
+          this.log.debug('falling back to server selected codec', Object.assign(Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)), {
             codec: updatedCodec
-          });
+          }));
           /* @ts-ignore */
           opts.videoCodec = updatedCodec;
           // recompute encodings since bitrates/etc could have changed
           encodings = computeVideoEncodings(track.source === Track.Source.ScreenShare, req.width, req.height, opts);
         }
       }
-      const publication = new LocalTrackPublication(track.kind, ti, track);
+      const publication = new LocalTrackPublication(track.kind, ti, track, {
+        loggerName: this.roomOptions.loggerName,
+        loggerContextCb: () => this.logContext
+      });
       // save options for when it needs to be republished again
       publication.options = opts;
       track.sid = ti.sid;
       if (!this.engine.pcManager) {
         throw new UnexpectedConnectionState('pcManager is not ready');
       }
-      livekitLogger.debug("publishing ".concat(track.kind, " with encodings"), {
+      this.log.debug("publishing ".concat(track.kind, " with encodings"), Object.assign(Object.assign({}, this.logContext), {
         encodings,
         trackInfo: ti
-      });
+      }));
       track.sender = yield this.engine.createSender(track, opts, encodings);
       if (encodings) {
         if (isFireFox() && track.kind === Track.Kind.Audio) {
@@ -21250,7 +21441,7 @@ class LocalParticipant extends Participant {
       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) {
-        livekitLogger.info("backup codec has been disabled, ignoring request to add additional codec for track");
+        this.log.info("backup codec has been disabled, ignoring request to add additional codec for track", Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(track)));
         return;
       }
       const simulcastTrack = track.addSimulcastTrack(videoCodec, encodings);
@@ -21272,10 +21463,10 @@ class LocalParticipant extends Participant {
       const ti = yield this.engine.addTrack(req);
       yield this.engine.createSimulcastSender(track, simulcastTrack, opts, encodings);
       yield this.engine.negotiate();
-      livekitLogger.debug("published ".concat(videoCodec, " for track ").concat(track.sid), {
+      this.log.debug("published ".concat(videoCodec, " for track ").concat(track.sid), Object.assign(Object.assign({}, this.logContext), {
         encodings,
         trackInfo: ti
-      });
+      }));
     });
   }
   unpublishTrack(track, stopOnUnpublish) {
@@ -21283,15 +21474,10 @@ class LocalParticipant extends Participant {
     return __awaiter(this, void 0, void 0, function* () {
       // look through all published tracks to find the right ones
       const publication = this.getPublicationForTrack(track);
-      livekitLogger.debug('unpublishing track', {
-        track,
-        method: 'unpublishTrack'
-      });
+      const pubLogContext = publication ? getLogContextFromTrack(publication) : undefined;
+      this.log.debug('unpublishing track', Object.assign(Object.assign({}, this.logContext), pubLogContext));
       if (!publication || !publication.track) {
-        livekitLogger.warn('track was not unpublished because no publication was found', {
-          track,
-          method: 'unpublishTrack'
-        });
+        this.log.warn('track was not unpublished because no publication was found', Object.assign(Object.assign({}, this.logContext), pubLogContext));
         return undefined;
       }
       track = publication.track;
@@ -21336,10 +21522,9 @@ class LocalParticipant extends Participant {
             track.simulcastCodecs.clear();
           }
         } catch (e) {
-          livekitLogger.warn('failed to unpublish track', {
-            error: e,
-            method: 'unpublishTrack'
-          });
+          this.log.warn('failed to unpublish track', Object.assign(Object.assign(Object.assign({}, this.logContext), pubLogContext), {
+            error: e
+          }));
         }
       }
       // remove from our maps
@@ -21384,9 +21569,9 @@ class LocalParticipant extends Participant {
         if (restartTracks && !track.isMuted && (track instanceof LocalAudioTrack || track instanceof LocalVideoTrack) && !track.isUserProvided) {
           // generally we need to restart the track before publishing, often a full reconnect
           // is necessary because computer had gone to sleep.
-          livekitLogger.debug('restarting existing track', {
+          this.log.debug('restarting existing track', Object.assign(Object.assign({}, this.logContext), {
             track: pub.trackSid
-          });
+          }));
           yield track.restartTrack();
         }
         yield this.publishTrack(track, pub.options);
@@ -21467,10 +21652,9 @@ class LocalParticipant extends Participant {
       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) {
-          livekitLogger.debug('updating server mute state after reconcile', {
-            sid: ti.sid,
-            muted: mutedOnServer
-          });
+          this.log.debug('updating server mute state after reconcile', Object.assign(Object.assign(Object.assign({}, this.logContext), getLogContextFromTrack(pub)), {
+            mutedOnServer
+          }));
           this.engine.client.sendMuteTrack(ti.sid, mutedOnServer);
         }
       }
@@ -21524,7 +21708,7 @@ class Room extends eventsExports.EventEmitter {
    */
   constructor(options) {
     var _this;
-    var _a;
+    var _a, _b;
     super();
     _this = this;
     this.state = ConnectionState.Disconnected;
@@ -21537,13 +21721,14 @@ class Room extends eventsExports.EventEmitter {
     this.isE2EEEnabled = false;
     this.audioEnabled = true;
     this.isVideoPlaybackBlocked = false;
+    this.log = livekitLogger;
     this.connect = (url, token, opts) => __awaiter(this, void 0, void 0, function* () {
-      var _b;
+      var _c;
       // In case a disconnect called happened right before the connect call, make sure the disconnect is completed first by awaiting its lock
       const unlockDisconnect = yield this.disconnectLock.lock();
       if (this.state === ConnectionState.Connected) {
         // when the state is reconnecting or connected, this function returns immediately
-        livekitLogger.info("already connected to room ".concat(this.name));
+        this.log.info("already connected to room ".concat(this.name), this.logContext);
         unlockDisconnect();
         return Promise.resolve();
       }
@@ -21552,7 +21737,7 @@ class Room extends eventsExports.EventEmitter {
         return this.connectFuture.promise;
       }
       this.setAndEmitConnectionState(ConnectionState.Connecting);
-      if (((_b = this.regionUrlProvider) === null || _b === void 0 ? void 0 : _b.getServerUrl().toString()) !== url) {
+      if (((_c = this.regionUrlProvider) === null || _c === void 0 ? void 0 : _c.getServerUrl().toString()) !== url) {
         this.regionUrl = undefined;
         this.regionUrlProvider = undefined;
       }
@@ -21566,13 +21751,13 @@ class Room extends eventsExports.EventEmitter {
         // if initial connection fails, this will speed up picking regional url
         // on subsequent runs
         this.regionUrlProvider.fetchRegionSettings().catch(e => {
-          livekitLogger.warn('could not fetch region settings', {
+          this.log.warn('could not fetch region settings', Object.assign(Object.assign({}, this.logContext), {
             error: e
-          });
+          }));
         });
       }
       const connectFn = (resolve, reject, regionUrl) => __awaiter(this, void 0, void 0, function* () {
-        var _c;
+        var _d;
         if (this.abortController) {
           this.abortController.abort();
         }
@@ -21589,7 +21774,7 @@ class Room extends eventsExports.EventEmitter {
           if (this.regionUrlProvider && e instanceof ConnectionError && e.reason !== 3 /* ConnectionErrorReason.Cancelled */ && e.reason !== 0 /* ConnectionErrorReason.NotAllowed */) {
             let nextUrl = null;
             try {
-              nextUrl = yield this.regionUrlProvider.getNextBestRegionUrl((_c = this.abortController) === null || _c === void 0 ? void 0 : _c.signal);
+              nextUrl = yield this.regionUrlProvider.getNextBestRegionUrl((_d = this.abortController) === null || _d === void 0 ? void 0 : _d.signal);
             } catch (error) {
               if (error instanceof ConnectionError && (error.status === 401 || error.reason === 3 /* ConnectionErrorReason.Cancelled */)) {
                 this.handleDisconnect(this.options.stopLocalTrackOnUnpublish);
@@ -21598,7 +21783,7 @@ class Room extends eventsExports.EventEmitter {
               }
             }
             if (nextUrl) {
-              livekitLogger.info("Initial connection failed with ConnectionError: ".concat(e.message, ". Retrying with another region: ").concat(nextUrl));
+              this.log.info("Initial connection failed with ConnectionError: ".concat(e.message, ". Retrying with another region: ").concat(nextUrl), this.logContext);
               yield connectFn(resolve, reject, nextUrl);
             } else {
               this.handleDisconnect(this.options.stopLocalTrackOnUnpublish);
@@ -21620,6 +21805,7 @@ class Room extends eventsExports.EventEmitter {
       return this.connectFuture.promise;
     });
     this.connectSignal = (url, token, engine, connectOptions, roomOptions, abortController) => __awaiter(this, void 0, void 0, function* () {
+      var _e, _f, _g;
       const joinResponse = yield engine.join(url, token, {
         autoSubscribe: connectOptions.autoSubscribe,
         publishOnly: connectOptions.publishOnly,
@@ -21635,15 +21821,19 @@ class Room extends eventsExports.EventEmitter {
           region: joinResponse.serverRegion
         };
       }
-      livekitLogger.debug("connected to Livekit Server ".concat(Object.entries(serverInfo).map(_ref => {
+      this.log.debug("connected to Livekit Server ".concat(Object.entries(serverInfo).map(_ref => {
         let [key, value] = _ref;
         return "".concat(key, ": ").concat(value);
-      }).join(', ')));
+      }).join(', ')), {
+        room: (_e = joinResponse.room) === null || _e === void 0 ? void 0 : _e.name,
+        roomSid: (_f = joinResponse.room) === null || _f === void 0 ? void 0 : _f.sid,
+        identity: (_g = joinResponse.participant) === null || _g === void 0 ? void 0 : _g.identity
+      });
       if (!joinResponse.serverVersion) {
         throw new UnsupportedServer('unknown server version');
       }
       if (joinResponse.serverVersion === '0.15.1' && this.options.dynacast) {
-        livekitLogger.debug('disabling dynacast due to server version');
+        this.log.debug('disabling dynacast due to server version', this.logContext);
         // dynacast has a bug in 0.15.1, so we cannot use it then
         roomOptions.dynacast = false;
       }
@@ -21663,16 +21853,16 @@ class Room extends eventsExports.EventEmitter {
       }
     };
     this.attemptConnection = (url, token, opts, abortController) => __awaiter(this, void 0, void 0, function* () {
-      var _d, _e;
+      var _h, _j;
       if (this.state === ConnectionState.Reconnecting) {
-        livekitLogger.info('Reconnection attempt replaced by new connection attempt');
+        this.log.info('Reconnection attempt replaced by new connection attempt', this.logContext);
         // make sure we close and recreate the existing engine in order to get rid of any potentially ongoing reconnection attempts
         this.recreateEngine();
       } else {
         // create engine if previously disconnected
         this.maybeCreateEngine();
       }
-      if ((_d = this.regionUrlProvider) === null || _d === void 0 ? void 0 : _d.isCloud()) {
+      if ((_h = this.regionUrlProvider) === null || _h === void 0 ? void 0 : _h.isCloud()) {
         this.engine.setRegionUrlProvider(this.regionUrlProvider);
       }
       this.acquireAudioContext();
@@ -21700,9 +21890,9 @@ class Room extends eventsExports.EventEmitter {
           resultingError.reason = err.reason;
           resultingError.status = err.status;
         }
-        livekitLogger.debug("error trying to establish signal connection", {
+        this.log.debug("error trying to establish signal connection", Object.assign(Object.assign({}, this.logContext), {
           error: err
-        });
+        }));
         throw resultingError;
       }
       if (abortController.signal.aborted) {
@@ -21725,7 +21915,7 @@ class Room extends eventsExports.EventEmitter {
       }
       if (isWeb()) {
         document.addEventListener('freeze', this.onPageLeave);
-        (_e = navigator.mediaDevices) === null || _e === void 0 ? void 0 : _e.addEventListener('devicechange', this.handleDeviceChange);
+        (_j = navigator.mediaDevices) === null || _j === void 0 ? void 0 : _j.addEventListener('devicechange', this.handleDeviceChange);
       }
       this.setAndEmitConnectionState(ConnectionState.Connected);
       this.emit(RoomEvent.Connected);
@@ -21737,26 +21927,24 @@ class Room extends eventsExports.EventEmitter {
     this.disconnect = function () {
       let stopTracks = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
       return __awaiter(_this, void 0, void 0, function* () {
-        var _f, _g, _h, _j;
+        var _k, _l, _m, _o;
         const unlock = yield this.disconnectLock.lock();
         try {
           if (this.state === ConnectionState.Disconnected) {
-            livekitLogger.debug('already disconnected');
+            this.log.debug('already disconnected', this.logContext);
             return;
           }
-          livekitLogger.info('disconnect from room', {
-            identity: this.localParticipant.identity
-          });
+          this.log.info('disconnect from room', Object.assign({}, this.logContext));
           if (this.state === ConnectionState.Connecting || this.state === ConnectionState.Reconnecting) {
             // try aborting pending connection attempt
-            livekitLogger.warn('abort connection attempt');
-            (_f = this.abortController) === null || _f === void 0 ? void 0 : _f.abort();
+            this.log.warn('abort connection attempt', this.logContext);
+            (_k = this.abortController) === null || _k === void 0 ? void 0 : _k.abort();
             // in case the abort controller didn't manage to cancel the connection attempt, reject the connect promise explicitly
-            (_h = (_g = this.connectFuture) === null || _g === void 0 ? void 0 : _g.reject) === null || _h === void 0 ? void 0 : _h.call(_g, new ConnectionError('Client initiated disconnect'));
+            (_m = (_l = this.connectFuture) === null || _l === void 0 ? void 0 : _l.reject) === null || _m === void 0 ? void 0 : _m.call(_l, new ConnectionError('Client initiated disconnect'));
             this.connectFuture = undefined;
           }
           // send leave
-          if (!((_j = this.engine) === null || _j === void 0 ? void 0 : _j.client.isDisconnected)) {
+          if (!((_o = this.engine) === null || _o === void 0 ? void 0 : _o.client.isDisconnected)) {
             yield this.engine.client.sendLeave();
           }
           // close engine (also closes client)
@@ -21856,7 +22044,7 @@ class Room extends eventsExports.EventEmitter {
         if (e.name === 'NotAllowedError') {
           this.handleVideoPlaybackFailed();
         } else {
-          livekitLogger.warn('Resuming video playback failed, make sure you call `startVideo` directly in a user gesture handler');
+          this.log.warn('Resuming video playback failed, make sure you call `startVideo` directly in a user gesture handler', this.logContext);
         }
       });
     });
@@ -21871,9 +22059,9 @@ class Room extends eventsExports.EventEmitter {
       }
     };
     this.handleSignalRestarted = joinResponse => __awaiter(this, void 0, void 0, function* () {
-      livekitLogger.debug("signal reconnected to server", {
+      this.log.debug("signal reconnected to server, region ".concat(joinResponse.serverRegion), Object.assign(Object.assign({}, this.logContext), {
         region: joinResponse.serverRegion
-      });
+      }));
       this.cachedParticipantSids = [];
       this.applyJoinResponse(joinResponse);
       try {
@@ -21891,28 +22079,28 @@ class Room extends eventsExports.EventEmitter {
             if ((track instanceof LocalAudioTrack || track instanceof LocalVideoTrack) && track.source !== Track.Source.ScreenShare && track.source !== Track.Source.ScreenShareAudio && !track.isUserProvided) {
               // we need to restart the track before publishing, often a full reconnect
               // is necessary because computer had gone to sleep.
-              livekitLogger.debug('restarting existing track', {
+              this.log.debug('restarting existing track', Object.assign(Object.assign({}, this.logContext), {
                 track: pub.trackSid
-              });
+              }));
               yield track.restartTrack();
             }
-            livekitLogger.debug('publishing new track', {
+            this.log.debug('publishing new track', Object.assign(Object.assign({}, this.logContext), {
               track: pub.trackSid
-            });
+            }));
             yield this.localParticipant.publishTrack(track, pub.options);
           }
         })));
       } catch (error) {
-        livekitLogger.error('error trying to re-publish tracks after reconnection', {
+        this.log.error('error trying to re-publish tracks after reconnection', Object.assign(Object.assign({}, this.logContext), {
           error
-        });
+        }));
       }
       try {
         yield this.engine.waitForRestarted();
-        livekitLogger.debug("fully reconnected to server", {
+        this.log.debug("fully reconnected to server", Object.assign(Object.assign({}, this.logContext), {
           region: joinResponse.serverRegion
-        });
-      } catch (_k) {
+        }));
+      } catch (_p) {
         // reconnection failed, handleDisconnect is being invoked already, just return here
         return;
       }
@@ -22063,7 +22251,9 @@ class Room extends eventsExports.EventEmitter {
       this.emit(RoomEvent.AudioPlaybackStatusChanged, true);
     };
     this.handleAudioPlaybackFailed = e => {
-      livekitLogger.warn('could not playback audio', e);
+      this.log.warn('could not playback audio', Object.assign(Object.assign({}, this.logContext), {
+        error: e
+      }));
       if (!this.canPlaybackAudio) {
         return;
       }
@@ -22120,7 +22310,7 @@ class Room extends eventsExports.EventEmitter {
       this.emit(RoomEvent.TrackUnmuted, pub, this.localParticipant);
     };
     this.onLocalTrackPublished = pub => __awaiter(this, void 0, void 0, function* () {
-      var _l;
+      var _q;
       this.emit(RoomEvent.LocalTrackPublished, pub, this.localParticipant);
       if (pub.track instanceof LocalAudioTrack) {
         const trackIsSilent = yield pub.track.checkForSilence();
@@ -22128,7 +22318,7 @@ class Room extends eventsExports.EventEmitter {
           this.emit(RoomEvent.LocalAudioSilenceDetected, pub);
         }
       }
-      const deviceId = yield (_l = pub.track) === null || _l === void 0 ? void 0 : _l.getDeviceId();
+      const deviceId = yield (_q = pub.track) === null || _q === void 0 ? void 0 : _q.getDeviceId();
       const deviceKind = sourceToKind(pub.source);
       if (deviceKind && deviceId && deviceId !== this.localParticipant.activeDeviceMap.get(deviceKind)) {
         this.localParticipant.activeDeviceMap.set(deviceKind, deviceId);
@@ -22152,6 +22342,7 @@ class Room extends eventsExports.EventEmitter {
     this.cachedParticipantSids = [];
     this.identityToSid = 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.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);
     this.options.publishDefaults = Object.assign(Object.assign({}, publishDefaults), options === null || options === void 0 ? void 0 : options.publishDefaults);
@@ -22164,8 +22355,8 @@ class Room extends eventsExports.EventEmitter {
     if (this.options.audioCaptureDefaults.deviceId) {
       this.localParticipant.activeDeviceMap.set('audioinput', unwrapConstraint(this.options.audioCaptureDefaults.deviceId));
     }
-    if ((_a = this.options.audioOutput) === null || _a === void 0 ? void 0 : _a.deviceId) {
-      this.switchActiveDevice('audiooutput', unwrapConstraint(this.options.audioOutput.deviceId)).catch(e => livekitLogger.warn("Could not set audio output: ".concat(e.message)));
+    if ((_b = this.options.audioOutput) === null || _b === void 0 ? void 0 : _b.deviceId) {
+      this.switchActiveDevice('audiooutput', unwrapConstraint(this.options.audioOutput.deviceId)).catch(e => this.log.warn("Could not set audio output: ".concat(e.message), this.logContext));
     }
     if (this.options.e2ee) {
       this.setupE2EE();
@@ -22200,6 +22391,13 @@ class Room extends eventsExports.EventEmitter {
       (_a = this.e2eeManager) === null || _a === void 0 ? void 0 : _a.setup(this);
     }
   }
+  get logContext() {
+    return {
+      room: this.name,
+      roomSid: this.sid,
+      identity: this.localParticipant.identity
+    };
+  }
   /**
    * if the current room has a participant with `recorder: true` in its JWT grant
    **/
@@ -22294,7 +22492,7 @@ class Room extends eventsExports.EventEmitter {
       if (this.state !== ConnectionState.Disconnected) {
         return;
       }
-      livekitLogger.debug("prepareConnection to ".concat(url));
+      this.log.debug("prepareConnection to ".concat(url), this.logContext);
       try {
         if (isCloud(new URL(url)) && token) {
           this.regionUrlProvider = new RegionUrlProvider(url, token);
@@ -22306,7 +22504,7 @@ class Room extends eventsExports.EventEmitter {
             yield fetch(toHttpUrl(regionUrl), {
               method: 'HEAD'
             });
-            livekitLogger.debug("prepared connection to ".concat(regionUrl));
+            this.log.debug("prepared connection to ".concat(regionUrl), this.logContext);
           }
         } else {
           yield fetch(toHttpUrl(url), {
@@ -22314,9 +22512,9 @@ class Room extends eventsExports.EventEmitter {
           });
         }
       } catch (e) {
-        livekitLogger.warn('could not prepare connection', {
+        this.log.warn('could not prepare connection', Object.assign(Object.assign({}, this.logContext), {
           error: e
-        });
+        }));
       }
     });
   }
@@ -22563,7 +22761,7 @@ class Room extends eventsExports.EventEmitter {
       return;
     }
     if (this.state === ConnectionState.Disconnected) {
-      livekitLogger.warn('skipping incoming track after Room disconnected');
+      this.log.warn('skipping incoming track after Room disconnected', this.logContext);
       return;
     }
     const parts = unpackStreamId(stream.id);
@@ -22574,12 +22772,12 @@ 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 (participantId === this.localParticipant.sid) {
-      livekitLogger.warn('tried to create RemoteParticipant for local participant');
+      this.log.warn('tried to create RemoteParticipant for local participant', this.logContext);
       return;
     }
     const participant = this.participants.get(participantId);
     if (!participant) {
-      livekitLogger.error("Tried to add a track for a participant, that's not present. Sid: ".concat(participantId));
+      this.log.error("Tried to add a track for a participant, that's not present. Sid: ".concat(participantId), this.logContext);
       return;
     }
     let adaptiveStreamSettings;
@@ -22667,7 +22865,9 @@ class Room extends eventsExports.EventEmitter {
         try {
           yield this.audioContext.resume();
         } catch (e) {
-          livekitLogger.warn(e);
+          this.log.warn('Could not resume audio context', Object.assign(Object.assign({}, this.logContext), {
+            error: e
+          }));
         }
       }
       if (this.options.expWebAudioMix) {
@@ -22687,13 +22887,16 @@ class Room extends eventsExports.EventEmitter {
     if (info) {
       participant = RemoteParticipant.fromParticipantInfo(this.engine.client, info);
     } else {
-      participant = new RemoteParticipant(this.engine.client, id, '', undefined, undefined);
+      participant = new RemoteParticipant(this.engine.client, id, '', undefined, undefined, {
+        loggerContextCb: () => this.logContext,
+        loggerName: this.options.loggerName
+      });
     }
     if (this.options.expWebAudioMix) {
       participant.setAudioContext(this.audioContext);
     }
     if ((_a = this.options.audioOutput) === null || _a === void 0 ? void 0 : _a.deviceId) {
-      participant.setAudioOutput(this.options.audioOutput).catch(e => livekitLogger.warn("Could not set audio output: ".concat(e.message)));
+      participant.setAudioOutput(this.options.audioOutput).catch(e => this.log.warn("Could not set audio output: ".concat(e.message), this.logContext));
     }
     return participant;
   }
@@ -22786,9 +22989,9 @@ class Room extends eventsExports.EventEmitter {
       // transports failed without notifying engine
       !this.engine.verifyTransport()) {
         consecutiveFailures++;
-        livekitLogger.warn('detected connection state mismatch', {
+        this.log.warn('detected connection state mismatch', Object.assign(Object.assign({}, this.logContext), {
           numFailures: consecutiveFailures
-        });
+        }));
         if (consecutiveFailures >= 3) {
           this.recreateEngine();
           this.handleDisconnect(this.options.stopLocalTrackOnUnpublish, DisconnectReason.STATE_MISMATCH);
@@ -22870,7 +23073,13 @@ class Room extends eventsExports.EventEmitter {
           name: 'video-dummy'
         }), new LocalVideoTrack(publishOptions.useRealTracks ? (yield window.navigator.mediaDevices.getUserMedia({
           video: true
-        })).getVideoTracks()[0] : createDummyVideoStreamTrack((_a = 160 * participantOptions.aspectRatios[0]) !== null && _a !== void 0 ? _a : 1, 160, true, true)));
+        })).getVideoTracks()[0] : createDummyVideoStreamTrack((_a = 160 * participantOptions.aspectRatios[0]) !== null && _a !== void 0 ? _a : 1, 160, true, true), undefined, false, {
+          loggerName: this.options.loggerName,
+          loggerContextCb: () => this.logContext
+        }), {
+          loggerName: this.options.loggerName,
+          loggerContextCb: () => this.logContext
+        });
         // @ts-ignore
         this.localParticipant.addTrackPublication(camPub);
         this.localParticipant.emit(ParticipantEvent.LocalTrackPublished, camPub);
@@ -22882,7 +23091,13 @@ class Room extends eventsExports.EventEmitter {
           type: TrackType.AUDIO
         }), new LocalAudioTrack(publishOptions.useRealTracks ? (yield navigator.mediaDevices.getUserMedia({
           audio: true
-        })).getAudioTracks()[0] : getEmptyAudioStreamTrack()));
+        })).getAudioTracks()[0] : getEmptyAudioStreamTrack(), undefined, false, this.audioContext, {
+          loggerName: this.options.loggerName,
+          loggerContextCb: () => this.logContext
+        }), {
+          loggerName: this.options.loggerName,
+          loggerContextCb: () => this.logContext
+        });
         // @ts-ignore
         this.localParticipant.addTrackPublication(audioPub);
         this.localParticipant.emit(ParticipantEvent.LocalTrackPublished, audioPub);
@@ -22927,14 +23142,30 @@ class Room extends eventsExports.EventEmitter {
     }
     // active speaker updates are too spammy
     if (event !== RoomEvent.ActiveSpeakersChanged) {
-      livekitLogger.debug("room event ".concat(event), {
+      // only extract logContext from arguments in order to avoid logging the whole object tree
+      const minimizedArgs = mapArgs(args).filter(arg => arg !== undefined);
+      this.log.debug("room event ".concat(event), Object.assign(Object.assign({}, this.logContext), {
         event,
-        args
-      });
+        args: minimizedArgs
+      }));
     }
     return super.emit(event, ...args);
   }
 }
+function mapArgs(args) {
+  return args.map(arg => {
+    if (!arg) {
+      return;
+    }
+    if (Array.isArray(arg)) {
+      return mapArgs(arg);
+    }
+    if (typeof arg === 'object') {
+      return 'logContext' in arg && arg.logContext;
+    }
+    return arg;
+  });
+}
 
 var CheckStatus;
 (function (CheckStatus) {
@@ -23140,8 +23371,8 @@ function createLocalScreenTracks(options) {
     if (options === undefined) {
       options = {};
     }
-    if (options.resolution === undefined) {
-      options.resolution = ScreenSharePresets.h1080fps15.resolution;
+    if (options.resolution === undefined && !isSafari17()) {
+      options.resolution = ScreenSharePresets.h1080fps30.resolution;
     }
     if (navigator.mediaDevices.getDisplayMedia === undefined) {
       throw new DeviceUnsupportedError('getDisplayMedia not supported');
@@ -23568,5 +23799,5 @@ function isFacingModeValue(item) {
   return item === undefined || allowedValues.includes(item);
 }
 
-export { AudioPresets, BaseKeyProvider, ConnectionCheck, ConnectionError, ConnectionQuality, ConnectionState, CriticalTimers, CryptorEvent, DataPacket_Kind, DefaultReconnectPolicy, DeviceUnsupportedError, DisconnectReason, EncryptionEvent, EngineEvent, ExternalE2EEKeyProvider, KeyHandlerEvent, KeyProviderEvent, LivekitError, LocalAudioTrack, LocalParticipant, LocalTrack, LocalTrackPublication, LocalVideoTrack, LogLevel, MediaDeviceFailure, NegotiationError, Participant, ParticipantEvent, PublishDataError, RemoteAudioTrack, RemoteParticipant, RemoteTrack, RemoteTrackPublication, RemoteVideoTrack, Room, RoomEvent, RoomState, ScreenSharePresets, Track, TrackEvent, TrackInvalidError, TrackPublication, UnexpectedConnectionState, UnsupportedServer, VideoPreset, VideoPresets, VideoPresets43, VideoQuality, attachToElement, createAudioAnalyser, createE2EEKey, createKeyMaterialFromBuffer, createKeyMaterialFromString, createLocalAudioTrack, createLocalScreenTracks, createLocalTracks, createLocalVideoTrack, deriveKeys, detachTrack, facingModeFromDeviceLabel, facingModeFromLocalTrack, getEmptyAudioStreamTrack, getEmptyVideoStreamTrack, importKey, isBackupCodec, isBrowserSupported, isE2EESupported, isInsertableStreamSupported, isScriptTransformSupported, isVideoFrame, needsRbspUnescaping, parseRbsp, protocolVersion, ratchet, setLogExtension, setLogLevel, supportsAV1, supportsAdaptiveStream, supportsDynacast, supportsVP9, version, videoCodecs, writeRbsp };
+export { AudioPresets, BaseKeyProvider, ConnectionCheck, ConnectionError, ConnectionQuality, ConnectionState, CriticalTimers, CryptorEvent, DataPacket_Kind, DefaultReconnectPolicy, DeviceUnsupportedError, DisconnectReason, EncryptionEvent, EngineEvent, ExternalE2EEKeyProvider, KeyHandlerEvent, KeyProviderEvent, LivekitError, LocalAudioTrack, LocalParticipant, LocalTrack, LocalTrackPublication, LocalVideoTrack, LogLevel, MediaDeviceFailure, NegotiationError, Participant, ParticipantEvent, PublishDataError, RemoteAudioTrack, RemoteParticipant, RemoteTrack, RemoteTrackPublication, RemoteVideoTrack, Room, RoomEvent, RoomState, ScreenSharePresets, Track, TrackEvent, TrackInvalidError, TrackPublication, UnexpectedConnectionState, UnsupportedServer, VideoPreset, VideoPresets, VideoPresets43, VideoQuality, attachToElement, createAudioAnalyser, createE2EEKey, createKeyMaterialFromBuffer, createKeyMaterialFromString, createLocalAudioTrack, createLocalScreenTracks, createLocalTracks, createLocalVideoTrack, deriveKeys, detachTrack, facingModeFromDeviceLabel, facingModeFromLocalTrack, getEmptyAudioStreamTrack, getEmptyVideoStreamTrack, getLogger, importKey, isBackupCodec, isBrowserSupported, isE2EESupported, isInsertableStreamSupported, isScriptTransformSupported, isVideoFrame, needsRbspUnescaping, parseRbsp, protocolVersion, ratchet, setLogExtension, setLogLevel, supportsAV1, supportsAdaptiveStream, supportsDynacast, supportsVP9, version, videoCodecs, writeRbsp };
 //# sourceMappingURL=livekit-client.esm.mjs.map