livekit-client 0.18.4 → 1.0.0

package/dist/livekit-client.esm.mjs

@@ -9260,10 +9260,15 @@ var RoomEvent;
   /**
    * Whenever the connection state of the room changes
    *
-   * args: ([[RoomState]])
+   * args: ([[ConnectionState]])
    */
 
-  RoomEvent["StateChanged"] = "stateChanged";
+  RoomEvent["ConnectionStateChanged"] = "connectionStateChanged";
+  /**
+   * @deprecated StateChanged has been renamed to ConnectionStateChanged
+   */
+
+  RoomEvent["StateChanged"] = "connectionStateChanged";
   /**
    * When input or output devices on the machine have changed.
    */
@@ -9370,12 +9375,6 @@ var RoomEvent;
    */
 
   RoomEvent["ActiveSpeakersChanged"] = "activeSpeakersChanged";
-  /**
-   * @deprecated Use ParticipantMetadataChanged instead
-   * @internal
-   */
-
-  RoomEvent["MetadataChanged"] = "metadataChanged";
   /**
    * Participant metadata is a simple way for app-specific state to be pushed to
    * all users.
@@ -9541,12 +9540,6 @@ var ParticipantEvent;
    */
 
   ParticipantEvent["LocalTrackUnpublished"] = "localTrackUnpublished";
-  /**
-   * @deprecated Use ParticipantMetadataChanged instead
-   * @internal
-   */
-
-  ParticipantEvent["MetadataChanged"] = "metadataChanged";
   /**
    * Participant metadata is a simple way for app-specific state to be pushed to
    * all users.
@@ -9737,8 +9730,11 @@ class DeviceManager {
           video: kind !== 'audioinput' && kind !== 'audiooutput',
           audio: kind !== 'videoinput'
         };
-        await navigator.mediaDevices.getUserMedia(permissionsToAcquire);
+        const stream = await navigator.mediaDevices.getUserMedia(permissionsToAcquire);
         devices = await navigator.mediaDevices.enumerateDevices();
+        stream.getTracks().forEach(track => {
+          track.stop();
+        });
       }
     }
 
@@ -9783,7 +9779,7 @@ class DeviceManager {
 }
 DeviceManager.mediaDeviceKinds = ['audioinput', 'audiooutput', 'videoinput'];
 
-const version = '0.18.4';
+const version = '1.0.0';
 const protocolVersion = 7;
 
 const separator = '|';
@@ -10351,7 +10347,7 @@ class Track extends events.exports.EventEmitter {
     };
 
     this.kind = kind;
-    this.mediaStreamTrack = mediaTrack;
+    this._mediaStreamTrack = mediaTrack;
     this.source = Track.Source.Unknown;
 
     if (isWeb()) {
@@ -10368,6 +10364,10 @@ class Track extends events.exports.EventEmitter {
     return this._currentBitrate;
   }
 
+  get mediaStreamTrack() {
+    return this._mediaStreamTrack;
+  }
+
   attach(element) {
     let elementType = 'audio';
 
@@ -10401,7 +10401,7 @@ class Track extends events.exports.EventEmitter {
     // we'll want to re-attach it in that case
 
 
-    attachToElement(this.mediaStreamTrack, element);
+    attachToElement(this._mediaStreamTrack, element);
 
     if (element instanceof HTMLAudioElement) {
       // manually play audio to detect audio playback status
@@ -10419,7 +10419,7 @@ class Track extends events.exports.EventEmitter {
   detach(element) {
     // detach from a single element
     if (element) {
-      detachTrack(this.mediaStreamTrack, element);
+      detachTrack(this._mediaStreamTrack, element);
       const idx = this.attachedElements.indexOf(element);
 
       if (idx >= 0) {
@@ -10433,7 +10433,7 @@ class Track extends events.exports.EventEmitter {
 
     const detached = [];
     this.attachedElements.forEach(elm => {
-      detachTrack(this.mediaStreamTrack, elm);
+      detachTrack(this._mediaStreamTrack, elm);
       detached.push(elm);
       this.recycleElement(elm);
       this.emit(TrackEvent.ElementDetached, elm);
@@ -10444,7 +10444,7 @@ class Track extends events.exports.EventEmitter {
   }
 
   stop() {
-    this.mediaStreamTrack.stop();
+    this._mediaStreamTrack.stop();
 
     if (isWeb()) {
       document.removeEventListener('visibilitychange', this.appVisibilityChangedListener);
@@ -10452,11 +10452,11 @@ class Track extends events.exports.EventEmitter {
   }
 
   enable() {
-    this.mediaStreamTrack.enabled = true;
+    this._mediaStreamTrack.enabled = true;
   }
 
   disable() {
-    this.mediaStreamTrack.enabled = false;
+    this._mediaStreamTrack.enabled = false;
   }
 
   recycleElement(element) {
@@ -10686,14 +10686,15 @@ class LocalTrack extends Track {
       this.emit(TrackEvent.Ended, this);
     };
 
-    this.mediaStreamTrack.addEventListener('ended', this.handleEnded);
+    this._mediaStreamTrack.addEventListener('ended', this.handleEnded);
+
     this.constraints = constraints !== null && constraints !== void 0 ? constraints : mediaTrack.getConstraints();
     this.reacquireTrack = false;
     this.wasMuted = false;
   }
 
   get id() {
-    return this.mediaStreamTrack.id;
+    return this._mediaStreamTrack.id;
   }
 
   get dimensions() {
@@ -10704,7 +10705,7 @@ class LocalTrack extends Track {
     const {
       width,
       height
-    } = this.mediaStreamTrack.getSettings();
+    } = this._mediaStreamTrack.getSettings();
 
     if (width && height) {
       return {
@@ -10733,7 +10734,8 @@ class LocalTrack extends Track {
     const {
       deviceId,
       groupId
-    } = this.mediaStreamTrack.getSettings();
+    } = this._mediaStreamTrack.getSettings();
+
     const kind = this.kind === Track.Kind.Audio ? 'audioinput' : 'videoinput';
     return DeviceManager.getInstance().normalizeDeviceId(kind, deviceId, groupId);
   }
@@ -10755,17 +10757,20 @@ class LocalTrack extends Track {
 
 
     this.attachedElements.forEach(el => {
-      detachTrack(this.mediaStreamTrack, el);
+      detachTrack(this._mediaStreamTrack, el);
     });
-    this.mediaStreamTrack.removeEventListener('ended', this.handleEnded); // on Safari, the old audio track must be stopped before attempting to acquire
+
+    this._mediaStreamTrack.removeEventListener('ended', this.handleEnded); // on Safari, the old audio track must be stopped before attempting to acquire
     // the new track, otherwise the new track will stop with
     // 'A MediaStreamTrack ended due to a capture failure`
 
-    this.mediaStreamTrack.stop();
+
+    this._mediaStreamTrack.stop();
+
     track.addEventListener('ended', this.handleEnded);
     livekitLogger.debug('replace MediaStreamTrack');
     await this.sender.replaceTrack(track);
-    this.mediaStreamTrack = track;
+    this._mediaStreamTrack = track;
     this.attachedElements.forEach(el => {
       attachToElement(track, el);
     });
@@ -10796,20 +10801,23 @@ class LocalTrack extends Track {
 
 
     this.attachedElements.forEach(el => {
-      detachTrack(this.mediaStreamTrack, el);
+      detachTrack(this._mediaStreamTrack, el);
     });
-    this.mediaStreamTrack.removeEventListener('ended', this.handleEnded); // on Safari, the old audio track must be stopped before attempting to acquire
+
+    this._mediaStreamTrack.removeEventListener('ended', this.handleEnded); // on Safari, the old audio track must be stopped before attempting to acquire
     // the new track, otherwise the new track will stop with
     // 'A MediaStreamTrack ended due to a capture failure`
 
-    this.mediaStreamTrack.stop(); // create new track and attach
+
+    this._mediaStreamTrack.stop(); // create new track and attach
+
 
     const mediaStream = await navigator.mediaDevices.getUserMedia(streamConstraints);
     const newTrack = mediaStream.getTracks()[0];
     newTrack.addEventListener('ended', this.handleEnded);
     livekitLogger.debug('re-acquired MediaStreamTrack');
     await this.sender.replaceTrack(newTrack);
-    this.mediaStreamTrack = newTrack;
+    this._mediaStreamTrack = newTrack;
     this.attachedElements.forEach(el => {
       attachToElement(newTrack, el);
     });
@@ -10824,12 +10832,12 @@ class LocalTrack extends Track {
     }
 
     this.isMuted = muted;
-    this.mediaStreamTrack.enabled = !muted;
+    this._mediaStreamTrack.enabled = !muted;
     this.emit(muted ? TrackEvent.Muted : TrackEvent.Unmuted, this);
   }
 
   get needsReAcquisition() {
-    return this.mediaStreamTrack.readyState !== 'live' || this.mediaStreamTrack.muted || !this.mediaStreamTrack.enabled || this.reacquireTrack;
+    return this._mediaStreamTrack.readyState !== 'live' || this._mediaStreamTrack.muted || !this._mediaStreamTrack.enabled || this.reacquireTrack;
   }
 
   async handleAppVisibilityChanged() {
@@ -10879,7 +10887,7 @@ class LocalTrack extends Track {
 
     this._isUpstreamPaused = false;
     this.emit(TrackEvent.UpstreamResumed, this);
-    await this.sender.replaceTrack(this.mediaStreamTrack);
+    await this.sender.replaceTrack(this._mediaStreamTrack);
   }
 
 }
@@ -11004,7 +11012,9 @@ class LocalAudioTrack extends LocalTrack {
       try {
         stats = await this.getSenderStats();
       } catch (e) {
-        livekitLogger.error('could not get audio sender stats', e);
+        livekitLogger.error('could not get audio sender stats', {
+          error: e
+        });
         return;
       }
 
@@ -11038,7 +11048,7 @@ class LocalAudioTrack extends LocalTrack {
     if (this.source === Track.Source.Microphone && this.stopOnMute) {
       livekitLogger.debug('stopping mic track'); // also stop the track, so that microphone indicator is turned off
 
-      this.mediaStreamTrack.stop();
+      this._mediaStreamTrack.stop();
     }
 
     await super.mute();
@@ -11192,7 +11202,9 @@ class LocalVideoTrack extends LocalTrack {
 
   stop() {
     this.sender = undefined;
-    this.mediaStreamTrack.getConstraints();
+
+    this._mediaStreamTrack.getConstraints();
+
     super.stop();
   }
 
@@ -11200,7 +11212,7 @@ class LocalVideoTrack extends LocalTrack {
     if (this.source === Track.Source.Camera) {
       livekitLogger.debug('stopping camera track'); // also stop the track, so that camera indicator is turned off
 
-      this.mediaStreamTrack.stop();
+      this._mediaStreamTrack.stop();
     }
 
     await super.mute();
@@ -11381,7 +11393,7 @@ class LocalVideoTrack extends LocalTrack {
     if (!isMobile()) return;
 
     if (this.isInBackground && this.source === Track.Source.Camera) {
-      this.mediaStreamTrack.enabled = false;
+      this._mediaStreamTrack.enabled = false;
     }
   }
 
@@ -11625,6 +11637,7 @@ class RemoteVideoTrack extends RemoteTrack {
   constructor(mediaTrack, sid, receiver, adaptiveStreamSettings) {
     super(mediaTrack, sid, Track.Kind.Video, receiver);
     this.elementInfos = [];
+    this.hasUsedAttach = false;
 
     this.monitorReceiver = async () => {
       if (!this.receiver) {
@@ -11672,6 +11685,14 @@ class RemoteVideoTrack extends RemoteTrack {
   get isAdaptiveStream() {
     return this.adaptiveStreamSettings !== undefined;
   }
+
+  get mediaStreamTrack() {
+    if (this.isAdaptiveStream && !this.hasUsedAttach) {
+      livekitLogger.warn('When using adaptiveStream, you need to use remoteVideoTrack.attach() to add the track to a HTMLVideoElement, otherwise your video tracks might never start');
+    }
+
+    return this._mediaStreamTrack;
+  }
   /** @internal */
 
 
@@ -11680,9 +11701,9 @@ class RemoteVideoTrack extends RemoteTrack {
     this.attachedElements.forEach(element => {
       // detach or attach
       if (muted) {
-        detachTrack(this.mediaStreamTrack, element);
+        detachTrack(this._mediaStreamTrack, element);
       } else {
-        attachToElement(this.mediaStreamTrack, element);
+        attachToElement(this._mediaStreamTrack, element);
       }
     });
   }
@@ -11712,6 +11733,7 @@ class RemoteVideoTrack extends RemoteTrack {
       this.debouncedHandleResize();
     }
 
+    this.hasUsedAttach = true;
     return element;
   }
 
@@ -12063,25 +12085,10 @@ const VideoPresets = {
   h216: new VideoPreset(384, 216, 180000, 15),
   h360: new VideoPreset(640, 360, 300000, 20),
   h540: new VideoPreset(960, 540, 600000, 25),
-  h720: new VideoPreset(1280, 720, 2000000, 30),
+  h720: new VideoPreset(1280, 720, 1700000, 30),
   h1080: new VideoPreset(1920, 1080, 3000000, 30),
   h1440: new VideoPreset(2560, 1440, 5000000, 30),
-  h2160: new VideoPreset(3840, 2160, 8000000, 30),
-
-  /** @deprecated */
-  qvga: new VideoPreset(320, 180, 120000, 10),
-
-  /** @deprecated */
-  vga: new VideoPreset(640, 360, 300000, 20),
-
-  /** @deprecated */
-  qhd: new VideoPreset(960, 540, 600000, 25),
-
-  /** @deprecated */
-  hd: new VideoPreset(1280, 720, 2000000, 30),
-
-  /** @deprecated */
-  fhd: new VideoPreset(1920, 1080, 3000000, 30)
+  h2160: new VideoPreset(3840, 2160, 8000000, 30)
 };
 /**
  * Four by three presets
@@ -12096,44 +12103,14 @@ const VideoPresets43 = {
   h540: new VideoPreset(720, 540, 450000, 25),
   h720: new VideoPreset(960, 720, 1500000, 30),
   h1080: new VideoPreset(1440, 1080, 2500000, 30),
-  h1440: new VideoPreset(1920, 1440, 3500000, 30),
-
-  /** @deprecated */
-  qvga: new VideoPreset(240, 180, 90000, 10),
-
-  /** @deprecated */
-  vga: new VideoPreset(480, 360, 225000, 20),
-
-  /** @deprecated */
-  qhd: new VideoPreset(720, 540, 450000, 25),
-
-  /** @deprecated */
-  hd: new VideoPreset(960, 720, 1500000, 30),
-
-  /** @deprecated */
-  fhd: new VideoPreset(1440, 1080, 2800000, 30)
+  h1440: new VideoPreset(1920, 1440, 3500000, 30)
 };
 const ScreenSharePresets = {
   h360fps3: new VideoPreset(640, 360, 200000, 3),
   h720fps5: new VideoPreset(1280, 720, 400000, 5),
   h720fps15: new VideoPreset(1280, 720, 1000000, 15),
   h1080fps15: new VideoPreset(1920, 1080, 1500000, 15),
-  h1080fps30: new VideoPreset(1920, 1080, 3000000, 30),
-
-  /** @deprecated */
-  vga: new VideoPreset(640, 360, 200000, 3),
-
-  /** @deprecated */
-  hd_8: new VideoPreset(1280, 720, 400000, 5),
-
-  /** @deprecated */
-  hd_15: new VideoPreset(1280, 720, 1000000, 15),
-
-  /** @deprecated */
-  fhd_15: new VideoPreset(1920, 1080, 1500000, 15),
-
-  /** @deprecated */
-  fhd_30: new VideoPreset(1920, 1080, 3000000, 30)
+  h1080fps30: new VideoPreset(1920, 1080, 3000000, 30)
 };
 
 var ConnectionQuality;
@@ -12291,7 +12268,6 @@ class Participant extends events.exports.EventEmitter {
     this.metadata = md;
 
     if (changed) {
-      this.emit(ParticipantEvent.MetadataChanged, prevMetadata);
       this.emit(ParticipantEvent.ParticipantMetadataChanged, prevMetadata);
     }
   }
@@ -12432,9 +12408,10 @@ function computeVideoEncodings(isScreenShare, width, height, options) {
   }
 
   const useSimulcast = options === null || options === void 0 ? void 0 : options.simulcast;
+  const scalabilityMode = options === null || options === void 0 ? void 0 : options.scalabilityMode;
 
-  if (!videoEncoding && !useSimulcast || !width || !height) {
-    // when we aren't simulcasting, will need to return a single encoding without
+  if (!videoEncoding && !useSimulcast && !scalabilityMode || !width || !height) {
+    // when we aren't simulcasting or svc, will need to return a single encoding without
     // capping bandwidth. we always require a encoding for dynacast
     return [{}];
   }
@@ -12445,11 +12422,41 @@ function computeVideoEncodings(isScreenShare, width, height, options) {
     livekitLogger.debug('using video encoding', videoEncoding);
   }
 
+  const original = new VideoPreset(width, height, videoEncoding.maxBitrate, videoEncoding.maxFramerate);
+  livekitLogger.debug("scalabilityMode ".concat(scalabilityMode));
+
+  if (scalabilityMode) {
+    const encodings = []; // svc use first encoding as the original, so we sort encoding from high to low
+
+    switch (scalabilityMode) {
+      case 'L3T3':
+        for (let i = 0; i < 3; i += 1) {
+          encodings.push({
+            rid: videoRids[2 - i],
+            scaleResolutionDownBy: 2 ** i,
+            maxBitrate: videoEncoding ? videoEncoding.maxBitrate / 2 ** i : 0,
+
+            /* @ts-ignore */
+            maxFramerate: original.encoding.maxFramerate,
+
+            /* @ts-ignore */
+            scalabilityMode: 'L3T3'
+          });
+        }
+
+        livekitLogger.debug('encodings', encodings);
+        return encodings;
+
+      default:
+        // TODO : support other scalability modes
+        throw new Error("unsupported scalabilityMode: ".concat(scalabilityMode));
+    }
+  }
+
   if (!useSimulcast) {
     return [videoEncoding];
   }
 
-  const original = new VideoPreset(width, height, videoEncoding.maxBitrate, videoEncoding.maxFramerate);
   let presets = [];
 
   if (isScreenShare) {
@@ -12852,29 +12859,32 @@ class RemoteParticipant extends Participant {
     }
   }
   /**
-   * sets the volume on the participant's microphone track if it exists.
+   * sets the volume on the participant's microphone track
+   * if no track exists the volume will be applied when the microphone track is added
    */
 
 
   setVolume(volume) {
+    this.volume = volume;
     const audioPublication = this.getTrack(Track.Source.Microphone);
 
-    if (audioPublication) {
+    if (audioPublication && audioPublication.track) {
       audioPublication.track.setVolume(volume);
     }
   }
   /**
    * gets the volume on the participant's microphone track
-   * returns undefined if no microphone track exists
    */
 
 
   getVolume() {
     const audioPublication = this.getTrack(Track.Source.Microphone);
 
-    if (audioPublication) {
+    if (audioPublication && audioPublication.track) {
       return audioPublication.track.getVolume();
     }
+
+    return this.volume;
   }
   /** @internal */
 
@@ -12930,7 +12940,12 @@ class RemoteParticipant extends Participant {
     track.isMuted = publication.isMuted;
     track.setMediaStream(mediaStream);
     track.start();
-    publication.setTrack(track);
+    publication.setTrack(track); // set participant volume on new microphone tracks
+
+    if (this.volume !== undefined && track instanceof RemoteAudioTrack && track.source === Track.Source.Microphone) {
+      track.setVolume(this.volume);
+    }
+
     this.emit(ParticipantEvent.TrackSubscribed, track, publication);
     return publication;
   }
@@ -13441,7 +13456,7 @@ class LocalParticipant extends Participant {
 
 
   async publishTrack(track, options) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
 
     const opts = _objectSpread2(_objectSpread2({}, (_a = this.roomOptions) === null || _a === void 0 ? void 0 : _a.publishDefaults), options); // convert raw media track into audio or video track
 
@@ -13514,7 +13529,19 @@ class LocalParticipant extends Participant {
       const height = (_e = settings.height) !== null && _e !== void 0 ? _e : (_f = track.dimensions) === null || _f === void 0 ? void 0 : _f.height; // width and height should be defined for video
 
       req.width = width !== null && width !== void 0 ? width : 0;
-      req.height = height !== null && height !== void 0 ? height : 0;
+      req.height = height !== null && height !== void 0 ? height : 0; // for svc codecs, disable simulcast and enable scalability L3T3
+      // by default
+
+      if (track instanceof LocalVideoTrack) {
+        if ((opts === null || opts === void 0 ? void 0 : opts.videoCodec) === 'vp9' || (opts === null || opts === void 0 ? void 0 : opts.videoCodec) === 'av1') {
+          opts.simulcast = false;
+          opts.scalabilityMode = (_g = opts.scalabilityMode) !== null && _g !== void 0 ? _g : 'L3T3';
+        } else {
+          // other codecs, unset scalability
+          opts.scalabilityMode = undefined;
+        }
+      }
+
       encodings = computeVideoEncodings(track.source === Track.Source.ScreenShare, width, height, opts);
       req.layers = videoLayersFromEncodings(req.width, req.height, encodings);
     } else if (track.kind === Track.Kind.Audio && opts.audioBitrate) {
@@ -13523,6 +13550,10 @@ class LocalParticipant extends Participant {
       }];
     }
 
+    if (!this.engine || this.engine.isClosed) {
+      throw new UnexpectedConnectionState('cannot publish track when not connected');
+    }
+
     const ti = await this.engine.addTrack(req);
     const publication = new LocalTrackPublication(track.kind, ti, track);
     track.sid = ti.sid;
@@ -13544,6 +13575,11 @@ class LocalParticipant extends Participant {
     }
 
     const transceiver = this.engine.publisher.pc.addTransceiver(track.mediaStreamTrack, transceiverInit);
+
+    if (opts.videoCodec) {
+      this.setPreferredCodec(transceiver, track.kind, opts.videoCodec);
+    }
+
     this.engine.negotiate(); // store RTPSender
 
     track.sender = transceiver.sender;
@@ -13554,10 +13590,6 @@ class LocalParticipant extends Participant {
       track.startMonitor();
     }
 
-    if (opts.videoCodec) {
-      this.setPreferredCodec(transceiver, track.kind, opts.videoCodec);
-    }
-
     this.addTrackPublication(publication); // send event for publication
 
     this.emit(ParticipantEvent.LocalTrackPublished, publication);
@@ -13739,21 +13771,38 @@ class LocalParticipant extends Participant {
 
     const cap = RTCRtpSender.getCapabilities(kind);
     if (!cap) return;
-    const selected = cap.codecs.find(c => {
+    let selected;
+    const codecs = [];
+    cap.codecs.forEach(c => {
       const codec = c.mimeType.toLowerCase();
-      const matchesVideoCodec = codec === "video/".concat(videoCodec); // for h264 codecs that have sdpFmtpLine available, use only if the
+      const matchesVideoCodec = codec === "video/".concat(videoCodec);
+
+      if (selected !== undefined) {
+        codecs.push(c);
+        return;
+      } // for h264 codecs that have sdpFmtpLine available, use only if the
       // profile-level-id is 42e01f for cross-browser compatibility
 
+
       if (videoCodec === 'h264' && c.sdpFmtpLine) {
-        return matchesVideoCodec && c.sdpFmtpLine.includes('profile-level-id=42e01f');
+        if (matchesVideoCodec && c.sdpFmtpLine.includes('profile-level-id=42e01f')) {
+          selected = c;
+          return;
+        }
       }
 
-      return matchesVideoCodec || codec === 'audio/opus';
+      if (matchesVideoCodec || codec === 'audio/opus') {
+        selected = c;
+        return;
+      }
+
+      codecs.push(c);
     });
 
     if (selected && 'setCodecPreferences' in transceiver) {
       // @ts-ignore
-      transceiver.setCodecPreferences([selected]);
+      codecs.unshift(selected);
+      transceiver.setCodecPreferences(codecs);
     }
   }
   /** @internal */
@@ -17354,7 +17403,7 @@ class SignalClient {
     this.requestQueue = new Queue();
   }
 
-  async join(url, token, opts) {
+  async join(url, token, opts, abortSignal) {
     // during a full reconnect, we'd want to start the sequence even if currently
     // connected
     this.isConnected = false;
@@ -17362,7 +17411,7 @@ class SignalClient {
       autoSubscribe: opts === null || opts === void 0 ? void 0 : opts.autoSubscribe,
       publishOnly: opts === null || opts === void 0 ? void 0 : opts.publishOnly,
       adaptiveStream: opts === null || opts === void 0 ? void 0 : opts.adaptiveStream
-    });
+    }, abortSignal);
     return res;
   }
 
@@ -17373,7 +17422,7 @@ class SignalClient {
     });
   }
 
-  connect(url, token, opts) {
+  connect(url, token, opts, abortSignal) {
     if (url.startsWith('http')) {
       url = url.replace('http', 'ws');
     } // strip trailing slash
@@ -17384,6 +17433,17 @@ class SignalClient {
     const clientInfo = getClientInfo();
     const params = createConnectionParams(token, clientInfo, opts);
     return new Promise((resolve, reject) => {
+      const abortHandler = () => {
+        ws.close();
+        this.close();
+        reject(new ConnectionError('room connection has been cancelled'));
+      };
+
+      if (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted) {
+        abortHandler();
+      }
+
+      abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.addEventListener('abort', abortHandler);
       livekitLogger.debug("connecting to ".concat(url + params));
       this.ws = undefined;
       const ws = new WebSocket(url + params);
@@ -17439,6 +17499,7 @@ class SignalClient {
           // handle join message only
           if (msg.join) {
             this.isConnected = true;
+            abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.removeEventListener('abort', abortHandler);
             resolve(msg.join);
           } else {
             reject(new ConnectionError('did not receive join response'));
@@ -17861,7 +17922,7 @@ class RTCEngine extends events.exports.EventEmitter {
     this.rtcConfig = {};
     this.subscriberPrimary = false;
     this.pcState = PCState.New;
-    this.isClosed = true;
+    this._isClosed = true;
     this.pendingTrackResolvers = {}; // true if publisher connection has already been established.
     // this is helpful to know if we need to restart ICE on the publisher connection
 
@@ -17932,7 +17993,7 @@ class RTCEngine extends events.exports.EventEmitter {
 
 
     this.handleDisconnect = connection => {
-      if (this.isClosed) {
+      if (this._isClosed) {
         return;
       }
 
@@ -17947,7 +18008,7 @@ class RTCEngine extends events.exports.EventEmitter {
       setTimeout(async () => {
         var _a;
 
-        if (this.isClosed) {
+        if (this._isClosed) {
           return;
         }
 
@@ -18000,12 +18061,16 @@ class RTCEngine extends events.exports.EventEmitter {
     this.client = new SignalClient();
   }
 
-  async join(url, token, opts) {
+  get isClosed() {
+    return this._isClosed;
+  }
+
+  async join(url, token, opts, abortSignal) {
     this.url = url;
     this.token = token;
     this.signalOpts = opts;
-    const joinResponse = await this.client.join(url, token, opts);
-    this.isClosed = false;
+    const joinResponse = await this.client.join(url, token, opts, abortSignal);
+    this._isClosed = false;
     this.subscriberPrimary = joinResponse.subscriberPrimary;
 
     if (!this.publisher) {
@@ -18022,7 +18087,7 @@ class RTCEngine extends events.exports.EventEmitter {
   }
 
   close() {
-    this.isClosed = true;
+    this._isClosed = true;
     this.removeAllListeners();
 
     if (this.publisher && this.publisher.pc.signalingState !== 'closed') {
@@ -18525,21 +18590,25 @@ const publishDefaults = {
 };
 const audioDefaults = {
   autoGainControl: true,
-  channelCount: 1,
   echoCancellation: true,
   noiseSuppression: true
 };
 const videoDefaults = {
-  resolution: VideoPresets.h540.resolution
+  resolution: VideoPresets.h720.resolution
 };
 
-var RoomState;
+var ConnectionState;
 
-(function (RoomState) {
-  RoomState["Disconnected"] = "disconnected";
-  RoomState["Connected"] = "connected";
-  RoomState["Reconnecting"] = "reconnecting";
-})(RoomState || (RoomState = {}));
+(function (ConnectionState) {
+  ConnectionState["Disconnected"] = "disconnected";
+  ConnectionState["Connecting"] = "connecting";
+  ConnectionState["Connected"] = "connected";
+  ConnectionState["Reconnecting"] = "reconnecting";
+})(ConnectionState || (ConnectionState = {}));
+/** @deprecated RoomState has been renamed to [[ConnectionState]] */
+
+
+const RoomState = ConnectionState;
 /**
  * In LiveKit, a room is the logical grouping for a list of participants.
  * Participants in a room can publish tracks, and subscribe to others' tracks.
@@ -18549,7 +18618,6 @@ var RoomState;
  * @noInheritDoc
  */
 
-
 class Room extends events.exports.EventEmitter {
   /**
    * Creates a new Room, the primary construct for a LiveKit session.
@@ -18562,7 +18630,7 @@ class Room extends events.exports.EventEmitter {
 
     super();
     _this = this;
-    this.state = RoomState.Disconnected;
+    this.state = ConnectionState.Disconnected;
     /**
      * list of participants that are actively speaking. when this changes
      * a [[RoomEvent.ActiveSpeakersChanged]] event is fired
@@ -18585,9 +18653,15 @@ class Room extends events.exports.EventEmitter {
       var _a, _b; // guard against calling connect
 
 
-      if (this.state !== RoomState.Disconnected) {
+      if (this.state !== ConnectionState.Disconnected) {
         livekitLogger.warn("already connected to room ".concat(this.name));
         return;
+      }
+
+      this.setAndEmitConnectionState(ConnectionState.Connecting);
+
+      if (!this.abortController || this.abortController.signal.aborted) {
+        this.abortController = new AbortController();
       } // recreate engine if previously disconnected
 
 
@@ -18605,7 +18679,7 @@ class Room extends events.exports.EventEmitter {
           autoSubscribe: opts === null || opts === void 0 ? void 0 : opts.autoSubscribe,
           publishOnly: opts === null || opts === void 0 ? void 0 : opts.publishOnly,
           adaptiveStream: typeof ((_a = this.options) === null || _a === void 0 ? void 0 : _a.adaptiveStream) === 'object' ? true : (_b = this.options) === null || _b === void 0 ? void 0 : _b.adaptiveStream
-        });
+        }, this.abortController.signal);
         livekitLogger.debug("connected to Livekit Server version: ".concat(joinResponse.serverVersion, ", region: ").concat(joinResponse.serverRegion));
 
         if (!joinResponse.serverVersion) {
@@ -18618,15 +18692,12 @@ class Room extends events.exports.EventEmitter {
           this.options.dynacast = false;
         }
 
-        this.state = RoomState.Connected;
         const pi = joinResponse.participant;
         this.localParticipant.sid = pi.sid;
         this.localParticipant.identity = pi.identity;
         this.localParticipant.updateInfo(pi); // forward metadata changed for the local participant
 
-        this.localParticipant.on(ParticipantEvent.MetadataChanged, metadata => {
-          this.emit(RoomEvent.MetadataChanged, metadata, this.localParticipant);
-        }).on(ParticipantEvent.ParticipantMetadataChanged, metadata => {
+        this.localParticipant.on(ParticipantEvent.ParticipantMetadataChanged, metadata => {
           this.emit(RoomEvent.ParticipantMetadataChanged, metadata, this.localParticipant);
         }).on(ParticipantEvent.TrackMuted, pub => {
           this.emit(RoomEvent.TrackMuted, pub, this.localParticipant);
@@ -18650,29 +18721,48 @@ class Room extends events.exports.EventEmitter {
         this.name = joinResponse.room.name;
         this.sid = joinResponse.room.sid;
         this.metadata = joinResponse.room.metadata;
-        this.emit(RoomEvent.StateChanged, this.state);
       } catch (err) {
         this.engine.close();
+        this.setAndEmitConnectionState(ConnectionState.Disconnected);
         throw err;
       } // don't return until ICE connected
 
 
       return new Promise((resolve, reject) => {
+        var _a, _b;
+
         const connectTimeout = setTimeout(() => {
           // timeout
           this.engine.close();
+          this.setAndEmitConnectionState(ConnectionState.Disconnected);
           reject(new ConnectionError('could not connect after timeout'));
         }, maxICEConnectTimeout);
+
+        const abortHandler = () => {
+          livekitLogger.warn('closing engine');
+          clearTimeout(connectTimeout);
+          this.engine.close();
+          this.setAndEmitConnectionState(ConnectionState.Disconnected);
+          reject(new ConnectionError('room connection has been cancelled'));
+        };
+
+        if ((_a = this.abortController) === null || _a === void 0 ? void 0 : _a.signal.aborted) {
+          abortHandler();
+        }
+
+        (_b = this.abortController) === null || _b === void 0 ? void 0 : _b.signal.addEventListener('abort', abortHandler);
         this.engine.once(EngineEvent.Connected, () => {
-          var _a;
+          var _a, _b;
 
-          clearTimeout(connectTimeout); // also hook unload event
+          clearTimeout(connectTimeout);
+          (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.signal.removeEventListener('abort', abortHandler); // also hook unload event
 
           if (isWeb()) {
             window.addEventListener('beforeunload', this.onBeforeUnload);
-            (_a = navigator.mediaDevices) === null || _a === void 0 ? void 0 : _a.addEventListener('devicechange', this.handleDeviceChange);
+            (_b = navigator.mediaDevices) === null || _b === void 0 ? void 0 : _b.addEventListener('devicechange', this.handleDeviceChange);
           }
 
+          this.setAndEmitConnectionState(ConnectionState.Connected);
           resolve(this);
         });
       });
@@ -18685,7 +18775,16 @@ class Room extends events.exports.EventEmitter {
     this.disconnect = function () {
       let stopTracks = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
 
-      // send leave
+      var _a;
+
+      if (_this.state === ConnectionState.Connecting) {
+        // try aborting pending connection attempt
+        livekitLogger.warn('abort connection attempt');
+        (_a = _this.abortController) === null || _a === void 0 ? void 0 : _a.abort();
+        return;
+      } // send leave
+
+
       if (_this.engine) {
         _this.engine.client.sendLeave();
 
@@ -18704,9 +18803,8 @@ class Room extends events.exports.EventEmitter {
     };
 
     this.handleRestarting = () => {
-      this.state = RoomState.Reconnecting;
-      this.emit(RoomEvent.Reconnecting);
-      this.emit(RoomEvent.StateChanged, this.state); // also unwind existing participants & existing subscriptions
+      this.setAndEmitConnectionState(ConnectionState.Reconnecting);
+      this.emit(RoomEvent.Reconnecting); // also unwind existing participants & existing subscriptions
 
       for (const p of this.participants.values()) {
         this.handleParticipantDisconnected(p.sid, p);
@@ -18715,9 +18813,8 @@ class Room extends events.exports.EventEmitter {
 
     this.handleRestarted = async joinResponse => {
       livekitLogger.debug("reconnected to server region ".concat(joinResponse.serverRegion));
-      this.state = RoomState.Connected;
-      this.emit(RoomEvent.Reconnected);
-      this.emit(RoomEvent.StateChanged, this.state); // rehydrate participants
+      this.setAndEmitConnectionState(ConnectionState.Connected);
+      this.emit(RoomEvent.Reconnected); // rehydrate participants
 
       if (joinResponse.participant) {
         // with a restart, the sid will have changed, we'll map our understanding to it
@@ -18959,16 +19056,14 @@ class Room extends events.exports.EventEmitter {
     }).on(EngineEvent.Disconnected, () => {
       this.handleDisconnect();
     }).on(EngineEvent.ActiveSpeakersUpdate, this.handleActiveSpeakersUpdate).on(EngineEvent.DataPacketReceived, this.handleDataPacket).on(EngineEvent.Resuming, () => {
-      this.state = RoomState.Reconnecting;
+      this.setAndEmitConnectionState(ConnectionState.Reconnecting);
       this.emit(RoomEvent.Reconnecting);
-      this.emit(RoomEvent.StateChanged, this.state);
     }).on(EngineEvent.Resumed, () => {
-      this.state = RoomState.Connected;
+      this.setAndEmitConnectionState(ConnectionState.Connected);
       this.emit(RoomEvent.Reconnected);
-      this.emit(RoomEvent.StateChanged, this.state);
       this.updateSubscriptions();
     }).on(EngineEvent.SignalResumed, () => {
-      if (this.state === RoomState.Reconnecting) {
+      if (this.state === ConnectionState.Reconnecting) {
         this.sendSyncState();
       }
     }).on(EngineEvent.Restarting, this.handleRestarting).on(EngineEvent.Restarted, this.handleRestarted);
@@ -19154,10 +19249,6 @@ class Room extends events.exports.EventEmitter {
 
     var _a;
 
-    if (this.state === RoomState.Disconnected) {
-      return;
-    }
-
     this.participants.forEach(p => {
       p.tracks.forEach(pub => {
         p.unpublishTrack(pub.trackSid);
@@ -19188,9 +19279,8 @@ class Room extends events.exports.EventEmitter {
       (_a = navigator.mediaDevices) === null || _a === void 0 ? void 0 : _a.removeEventListener('devicechange', this.handleDeviceChange);
     }
 
-    this.state = RoomState.Disconnected;
+    this.setAndEmitConnectionState(ConnectionState.Disconnected);
     this.emit(RoomEvent.Disconnected);
-    this.emit(RoomEvent.StateChanged, this.state);
   }
 
   handleParticipantDisconnected(sid, participant) {
@@ -19265,8 +19355,6 @@ class Room extends events.exports.EventEmitter {
       this.emit(RoomEvent.TrackMuted, pub, participant);
     }).on(ParticipantEvent.TrackUnmuted, pub => {
       this.emit(RoomEvent.TrackUnmuted, pub, participant);
-    }).on(ParticipantEvent.MetadataChanged, metadata => {
-      this.emit(RoomEvent.MetadataChanged, metadata, participant);
     }).on(ParticipantEvent.ParticipantMetadataChanged, metadata => {
       this.emit(RoomEvent.ParticipantMetadataChanged, metadata, participant);
     }).on(ParticipantEvent.ConnectionQualityChanged, quality => {
@@ -19328,6 +19416,15 @@ class Room extends events.exports.EventEmitter {
         }
       }
     }
+  }
+
+  setAndEmitConnectionState(state) {
+    if (state === this.state) {
+      return;
+    }
+
+    this.state = state;
+    this.emit(RoomEvent.ConnectionStateChanged, this.state);
   } // /** @internal */
 
 
@@ -19345,101 +19442,6 @@ class Room extends events.exports.EventEmitter {
 
 }
 
-/**
- * @deprecated Use room.connect() instead
- *
- * Connects to a LiveKit room, shorthand for `new Room()` and [[Room.connect]]
- *
- * ```typescript
- * connect('wss://myhost.livekit.io', token, {
- *   // publish audio and video tracks on joining
- *   audio: true,
- *   video: true,
- *   captureDefaults: {
- *    facingMode: 'user',
- *   },
- * })
- * ```
- * @param url URL to LiveKit server
- * @param token AccessToken, a JWT token that includes authentication and room details
- * @param options
- */
-
-async function connect(url, token, options) {
-  var _a, _b, _c, _d;
-
-  options !== null && options !== void 0 ? options : options = {};
-
-  if (options.adaptiveStream === undefined) {
-    options.adaptiveStream = options.autoManageVideo === true ? {} : undefined;
-  }
-
-  setLogLevel((_a = options.logLevel) !== null && _a !== void 0 ? _a : LogLevel.warn);
-  const config = (_b = options.rtcConfig) !== null && _b !== void 0 ? _b : {};
-
-  if (options.iceServers) {
-    config.iceServers = options.iceServers;
-  }
-
-  const room = new Room(options); // connect to room
-
-  await room.connect(url, token, options);
-  const publishAudio = (_c = options.audio) !== null && _c !== void 0 ? _c : false;
-  const publishVideo = (_d = options.video) !== null && _d !== void 0 ? _d : false;
-
-  if (publishAudio || publishVideo) {
-    setTimeout(async () => {
-      // if publishing both
-      let err;
-
-      if (publishAudio && publishVideo) {
-        try {
-          await room.localParticipant.enableCameraAndMicrophone();
-        } catch (e) {
-          const errKind = MediaDeviceFailure.getFailure(e);
-          livekitLogger.warn('received error while creating media', {
-            error: errKind
-          });
-
-          if (e instanceof Error) {
-            livekitLogger.warn(e.message);
-          } // when it's a device issue, try to publish the other kind
-
-
-          if (errKind === MediaDeviceFailure.NotFound || errKind === MediaDeviceFailure.DeviceInUse) {
-            try {
-              await room.localParticipant.setMicrophoneEnabled(true);
-            } catch (audioErr) {
-              err = audioErr;
-            }
-          } else {
-            err = e;
-          }
-        }
-      } else if (publishAudio) {
-        try {
-          await room.localParticipant.setMicrophoneEnabled(true);
-        } catch (e) {
-          err = e;
-        }
-      } else if (publishVideo) {
-        try {
-          await room.localParticipant.setCameraEnabled(true);
-        } catch (e) {
-          err = e;
-        }
-      }
-
-      if (err) {
-        room.emit(RoomEvent.MediaDevicesError, err);
-        livekitLogger.error('could not create media', err);
-      }
-    });
-  }
-
-  return room;
-}
-
 /**
  * Creates a local video and audio track at the same time. When acquiring both
  * audio and video tracks together, it'll display a single permission prompt to
@@ -19513,7 +19515,7 @@ async function createLocalScreenTracks(options) {
   }
 
   if (options.resolution === undefined) {
-    options.resolution = VideoPresets.fhd.resolution;
+    options.resolution = VideoPresets.h1080.resolution;
   }
 
   let videoConstraints = true;
@@ -19550,5 +19552,5 @@ async function createLocalScreenTracks(options) {
   return localTracks;
 }
 
-export { AudioPresets, ConnectionError, ConnectionQuality, DataPacket_Kind, EngineEvent, LivekitError, LocalAudioTrack, LocalParticipant, LocalTrack, LocalTrackPublication, LocalVideoTrack, LogLevel, MediaDeviceFailure, Participant, ParticipantEvent, PublishDataError, RemoteAudioTrack, RemoteParticipant, RemoteTrack, RemoteTrackPublication, RemoteVideoTrack, Room, RoomEvent, RoomState, ScreenSharePresets, Track, TrackEvent, TrackInvalidError, TrackPublication, UnexpectedConnectionState, UnsupportedServer, VideoPreset, VideoPresets, VideoPresets43, VideoQuality, attachToElement, connect, createLocalAudioTrack, createLocalScreenTracks, createLocalTracks, createLocalVideoTrack, detachTrack, protocolVersion, setLogExtension, setLogLevel, version };
+export { AudioPresets, ConnectionError, ConnectionQuality, ConnectionState, DataPacket_Kind, EngineEvent, LivekitError, LocalAudioTrack, LocalParticipant, LocalTrack, LocalTrackPublication, LocalVideoTrack, LogLevel, MediaDeviceFailure, Participant, ParticipantEvent, PublishDataError, RemoteAudioTrack, RemoteParticipant, RemoteTrack, RemoteTrackPublication, RemoteVideoTrack, Room, RoomEvent, RoomState, ScreenSharePresets, Track, TrackEvent, TrackInvalidError, TrackPublication, UnexpectedConnectionState, UnsupportedServer, VideoPreset, VideoPresets, VideoPresets43, VideoQuality, attachToElement, createLocalAudioTrack, createLocalScreenTracks, createLocalTracks, createLocalVideoTrack, detachTrack, protocolVersion, setLogExtension, setLogLevel, version };
 //# sourceMappingURL=livekit-client.esm.mjs.map