livekit-client 1.0.4 → 1.1.2

package/dist/livekit-client.esm.mjs

@@ -7049,7 +7049,8 @@ function createBaseAddTrackRequest() {
     disableDtx: false,
     source: 0,
     layers: [],
-    simulcastCodecs: []
+    simulcastCodecs: [],
+    sid: ''
   };
 }
 
@@ -7097,6 +7098,10 @@ const AddTrackRequest = {
       SimulcastCodec.encode(v, writer.uint32(82).fork()).ldelim();
     }
 
+    if (message.sid !== '') {
+      writer.uint32(90).string(message.sid);
+    }
+
     return writer;
   },
 
@@ -7149,6 +7154,10 @@ const AddTrackRequest = {
           message.simulcastCodecs.push(SimulcastCodec.decode(reader, reader.uint32()));
           break;
 
+        case 11:
+          message.sid = reader.string();
+          break;
+
         default:
           reader.skipType(tag & 7);
           break;
@@ -7169,7 +7178,8 @@ const AddTrackRequest = {
       disableDtx: isSet(object.disableDtx) ? Boolean(object.disableDtx) : false,
       source: isSet(object.source) ? trackSourceFromJSON(object.source) : 0,
       layers: Array.isArray(object === null || object === void 0 ? void 0 : object.layers) ? object.layers.map(e => VideoLayer.fromJSON(e)) : [],
-      simulcastCodecs: Array.isArray(object === null || object === void 0 ? void 0 : object.simulcastCodecs) ? object.simulcastCodecs.map(e => SimulcastCodec.fromJSON(e)) : []
+      simulcastCodecs: Array.isArray(object === null || object === void 0 ? void 0 : object.simulcastCodecs) ? object.simulcastCodecs.map(e => SimulcastCodec.fromJSON(e)) : [],
+      sid: isSet(object.sid) ? String(object.sid) : ''
     };
   },
 
@@ -7196,11 +7206,12 @@ const AddTrackRequest = {
       obj.simulcastCodecs = [];
     }
 
+    message.sid !== undefined && (obj.sid = message.sid);
     return obj;
   },
 
   fromPartial(object) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
 
     const message = createBaseAddTrackRequest();
     message.cid = (_a = object.cid) !== null && _a !== void 0 ? _a : '';
@@ -7213,6 +7224,7 @@ const AddTrackRequest = {
     message.source = (_h = object.source) !== null && _h !== void 0 ? _h : 0;
     message.layers = ((_j = object.layers) === null || _j === void 0 ? void 0 : _j.map(e => VideoLayer.fromPartial(e))) || [];
     message.simulcastCodecs = ((_k = object.simulcastCodecs) === null || _k === void 0 ? void 0 : _k.map(e => SimulcastCodec.fromPartial(e))) || [];
+    message.sid = (_l = object.sid) !== null && _l !== void 0 ? _l : '';
     return message;
   }
 
@@ -10058,7 +10070,7 @@ function computeBitrate(currentStats, prevStats) {
   return (bytesNow - bytesPrev) * 8 * 1000 / (currentStats.timestamp - prevStats.timestamp);
 }
 
-var version$1 = "1.0.4";
+var version$1 = "1.1.2";
 
 const version = version$1;
 const protocolVersion = 8;
@@ -10130,9 +10142,10 @@ function getEmptyVideoStreamTrack() {
   var _a;
 
   if (!emptyVideoStreamTrack) {
-    const canvas = document.createElement('canvas');
-    canvas.width = 2;
-    canvas.height = 2;
+    const canvas = document.createElement('canvas'); // the canvas size is set to 16, because electron apps seem to fail with smaller values
+
+    canvas.width = 16;
+    canvas.height = 16;
     (_a = canvas.getContext('2d')) === null || _a === void 0 ? void 0 : _a.fillRect(0, 0, canvas.width, canvas.height); // @ts-ignore
 
     const emptyStream = canvas.captureStream();
@@ -11514,6 +11527,7 @@ class LocalAudioTrack extends LocalTrack {
 
 }
 
+const refreshSubscribedCodecAfterNewCodec = 5000;
 class LocalVideoTrack extends LocalTrack {
   constructor(mediaTrack, constraints) {
     super(mediaTrack, Track.Kind.Video, constraints);
@@ -11730,7 +11744,14 @@ class LocalVideoTrack extends LocalTrack {
       return;
     }
 
-    simulcastCodecInfo.sender = sender;
+    simulcastCodecInfo.sender = sender; // browser will reenable disabled codec/layers after new codec has been published,
+    // so refresh subscribedCodecs after publish a new codec
+
+    setTimeout(() => {
+      if (this.subscribedCodecs) {
+        this.setPublishingCodecs(this.subscribedCodecs);
+      }
+    }, refreshSubscribedCodecAfterNewCodec);
   }
   /**
    * @internal
@@ -11739,25 +11760,41 @@ class LocalVideoTrack extends LocalTrack {
 
 
   async setPublishingCodecs(codecs) {
-    livekitLogger.debug('setting publishing codecs', codecs);
+    livekitLogger.debug('setting publishing codecs', {
+      codecs,
+      currentCodec: this.codec
+    }); // only enable simulcast codec for preference codec setted
+
+    if (!this.codec && codecs.length > 0) {
+      await this.setPublishingLayers(codecs[0].qualities);
+      return [];
+    }
+
+    this.subscribedCodecs = codecs;
+    const newCodecs = [];
 
     for await (const codec of codecs) {
-      if (this.codec === codec.codec) {
+      if (!this.codec || this.codec === codec.codec) {
         await this.setPublishingLayers(codec.qualities);
       } else {
         const simulcastCodecInfo = this.simulcastCodecs.get(codec.codec);
         livekitLogger.debug("try setPublishingCodec for ".concat(codec.codec), simulcastCodecInfo);
 
         if (!simulcastCodecInfo || !simulcastCodecInfo.sender) {
-          return;
-        }
-
-        if (simulcastCodecInfo.encodings) {
+          for (const q of codec.qualities) {
+            if (q.enabled) {
+              newCodecs.push(codec.codec);
+              break;
+            }
+          }
+        } else if (simulcastCodecInfo.encodings) {
           livekitLogger.debug("try setPublishingLayersForSender ".concat(codec.codec));
           await setPublishingLayersForSender(simulcastCodecInfo.sender, simulcastCodecInfo.encodings, codec.qualities);
         }
       }
     }
+
+    return newCodecs;
   }
   /**
    * @internal
@@ -12364,7 +12401,7 @@ class HTMLElementInfo {
   }
 
   height() {
-    return this.element.clientWidth;
+    return this.element.clientHeight;
   }
 
   observe() {
@@ -13605,7 +13642,7 @@ class RemoteParticipant extends Participant {
 
 }
 
-const compatibleCodecForSVC = 'vp8';
+const compatibleCodec = 'vp8';
 class LocalParticipant extends Participant {
   /** @internal */
   constructor(sid, identity, engine, options) {
@@ -13654,8 +13691,8 @@ class LocalParticipant extends Participant {
       this.onTrackMuted(track, track.isMuted);
     };
 
-    this.handleSubscribedQualityUpdate = update => {
-      var _a, _b, _c;
+    this.handleSubscribedQualityUpdate = async update => {
+      var _a, _b;
 
       if (!((_a = this.roomOptions) === null || _a === void 0 ? void 0 : _a.dynacast)) {
         return;
@@ -13672,9 +13709,18 @@ class LocalParticipant extends Participant {
       }
 
       if (update.subscribedCodecs.length > 0) {
-        (_b = pub.videoTrack) === null || _b === void 0 ? void 0 : _b.setPublishingCodecs(update.subscribedCodecs);
+        if (!pub.videoTrack) {
+          return;
+        }
+
+        const newCodecs = await pub.videoTrack.setPublishingCodecs(update.subscribedCodecs);
+
+        for await (const codec of newCodecs) {
+          livekitLogger.debug("publish ".concat(codec, " for ").concat(pub.videoTrack.sid));
+          await this.publishAdditionalCodecForTrack(pub.videoTrack, codec, pub.options);
+        }
       } else if (update.subscribedQualities.length > 0) {
-        (_c = pub.videoTrack) === null || _c === void 0 ? void 0 : _c.setPublishingLayers(update.subscribedQualities);
+        (_b = pub.videoTrack) === null || _b === void 0 ? void 0 : _b.setPublishingLayers(update.subscribedQualities);
       }
     };
 
@@ -13755,8 +13801,8 @@ class LocalParticipant extends Participant {
    */
 
 
-  setCameraEnabled(enabled) {
-    return this.setTrackEnabled(Track.Source.Camera, enabled);
+  setCameraEnabled(enabled, options) {
+    return this.setTrackEnabled(Track.Source.Camera, enabled, options);
   }
   /**
    * Enable or disable a participant's microphone track.
@@ -13766,8 +13812,8 @@ class LocalParticipant extends Participant {
    */
 
 
-  setMicrophoneEnabled(enabled) {
-    return this.setTrackEnabled(Track.Source.Microphone, enabled);
+  setMicrophoneEnabled(enabled, options) {
+    return this.setTrackEnabled(Track.Source.Microphone, enabled, options);
   }
   /**
    * Start or stop sharing a participant's screen
@@ -13775,8 +13821,8 @@ class LocalParticipant extends Participant {
    */
 
 
-  setScreenShareEnabled(enabled) {
-    return this.setTrackEnabled(Track.Source.ScreenShare, enabled);
+  setScreenShareEnabled(enabled, options) {
+    return this.setTrackEnabled(Track.Source.ScreenShare, enabled, options);
   }
   /** @internal */
 
@@ -13791,14 +13837,10 @@ class LocalParticipant extends Participant {
 
     return changed;
   }
-  /**
-   * Enable or disable publishing for a track by source. This serves as a simple
-   * way to manage the common tracks (camera, mic, or screen share).
-   * Resolves with LocalTrackPublication if successful and void otherwise
-   */
 
+  async setTrackEnabled(source, enabled, options) {
+    var _a, _b;
 
-  async setTrackEnabled(source, enabled) {
     livekitLogger.debug('setTrackEnabled', {
       source,
       enabled
@@ -13809,7 +13851,7 @@ class LocalParticipant extends Participant {
       if (track) {
         await track.unmute();
       } else {
-        let localTrack;
+        let localTracks;
 
         if (this.pendingPublishing.has(source)) {
           livekitLogger.info('skipping duplicate published source', {
@@ -13824,28 +13866,35 @@ class LocalParticipant extends Participant {
         try {
           switch (source) {
             case Track.Source.Camera:
-              [localTrack] = await this.createTracks({
-                video: true
+              localTracks = await this.createTracks({
+                video: (_a = options) !== null && _a !== void 0 ? _a : true
               });
               break;
 
             case Track.Source.Microphone:
-              [localTrack] = await this.createTracks({
-                audio: true
+              localTracks = await this.createTracks({
+                audio: (_b = options) !== null && _b !== void 0 ? _b : true
               });
               break;
 
             case Track.Source.ScreenShare:
-              [localTrack] = await this.createScreenTracks({
-                audio: false
-              });
+              localTracks = await this.createScreenTracks(_objectSpread2({}, options));
               break;
 
             default:
               throw new TrackInvalidError(source);
           }
 
-          track = await this.publishTrack(localTrack);
+          const publishPromises = [];
+
+          for (const localTrack of localTracks) {
+            publishPromises.push(this.publishTrack(localTrack));
+          }
+
+          const publishedTracks = await Promise.all(publishPromises); // for screen share publications including audio, this will only return the screen share publication, not the screen share audio one
+          // revisit if we want to return an array of tracks instead for v2
+
+          [track] = publishedTracks;
         } catch (e) {
           if (e instanceof Error && !(e instanceof TrackInvalidError)) {
             this.emit(ParticipantEvent.MediaDevicesError, e);
@@ -13860,6 +13909,11 @@ class LocalParticipant extends Participant {
       // screenshare cannot be muted, unpublish instead
       if (source === Track.Source.ScreenShare) {
         track = this.unpublishTrack(track.track);
+        const screenAudioTrack = this.getTrack(Track.Source.ScreenShareAudio);
+
+        if (screenAudioTrack && screenAudioTrack.track) {
+          this.unpublishTrack(screenAudioTrack.track);
+        }
       } else {
         await track.mute();
       }
@@ -14080,7 +14134,6 @@ class LocalParticipant extends Participant {
 
     let encodings;
     let simEncodings;
-    let simulcastTracks;
 
     if (track.kind === Track.Kind.Video) {
       // TODO: support react native, which doesn't expose getSettings
@@ -14091,26 +14144,30 @@ class LocalParticipant extends Participant {
       req.width = width !== null && width !== void 0 ? width : 0;
       req.height = height !== null && height !== void 0 ? height : 0; // for svc codecs, disable simulcast and use vp8 for backup codec
 
-      if (track instanceof LocalVideoTrack && ((opts === null || opts === void 0 ? void 0 : opts.videoCodec) === 'vp9' || (opts === null || opts === void 0 ? void 0 : opts.videoCodec) === 'av1')) {
-        // set scalabilityMode to 'L3T3' by default
-        opts.scalabilityMode = (_g = opts.scalabilityMode) !== null && _g !== void 0 ? _g : 'L3T3'; // add backup codec track
-
-        const simOpts = _objectSpread2({}, opts);
-
-        simOpts.simulcast = true;
-        simOpts.scalabilityMode = undefined;
-        simEncodings = computeVideoEncodings(track.source === Track.Source.ScreenShare, width, height, simOpts);
-        const simulcastTrack = track.addSimulcastTrack(compatibleCodecForSVC, simEncodings);
-        simulcastTracks = [simulcastTrack];
-        req.simulcastCodecs = [{
-          codec: opts.videoCodec,
-          cid: track.mediaStreamTrack.id,
-          enableSimulcastLayers: true
-        }, {
-          codec: simulcastTrack.codec,
-          cid: simulcastTrack.mediaStreamTrack.id,
-          enableSimulcastLayers: true
-        }];
+      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') {
+          // set scalabilityMode to 'L3T3' by default
+          opts.scalabilityMode = (_g = opts.scalabilityMode) !== null && _g !== void 0 ? _g : 'L3T3'; // add backup codec track
+
+          const simOpts = _objectSpread2({}, opts);
+
+          simOpts.simulcast = true;
+          simOpts.scalabilityMode = undefined;
+          simEncodings = computeVideoEncodings(track.source === Track.Source.ScreenShare, width, height, simOpts);
+        } // set vp8 codec as backup for any other codecs
+
+
+        if (opts.videoCodec && opts.videoCodec !== 'vp8') {
+          req.simulcastCodecs = [{
+            codec: opts.videoCodec,
+            cid: track.mediaStreamTrack.id,
+            enableSimulcastLayers: true
+          }, {
+            codec: compatibleCodec,
+            cid: '',
+            enableSimulcastLayers: true
+          }];
+        }
       }
 
       encodings = computeVideoEncodings(track.source === Track.Source.ScreenShare, width, height, opts);
@@ -14155,24 +14212,6 @@ class LocalParticipant extends Participant {
       track.codec = opts.videoCodec;
     }
 
-    const localTrack = track;
-
-    if (simulcastTracks) {
-      for await (const simulcastTrack of simulcastTracks) {
-        const simTransceiverInit = {
-          direction: 'sendonly'
-        };
-
-        if (simulcastTrack.encodings) {
-          simTransceiverInit.sendEncodings = simulcastTrack.encodings;
-        }
-
-        const simTransceiver = await this.engine.publisher.pc.addTransceiver(simulcastTrack.mediaStreamTrack, simTransceiverInit);
-        this.setPreferredCodec(simTransceiver, localTrack.kind, simulcastTrack.codec);
-        localTrack.setSimulcastTrackSender(simulcastTrack.codec, simTransceiver.sender);
-      }
-    }
-
     this.engine.negotiate(); // store RTPSender
 
     track.sender = transceiver.sender;
@@ -14188,6 +14227,86 @@ class LocalParticipant extends Participant {
     this.emit(ParticipantEvent.LocalTrackPublished, publication);
     return publication;
   }
+  /** @internal
+   * publish additional codec to existing track
+   */
+
+
+  async publishAdditionalCodecForTrack(track, videoCodec, options) {
+    var _a, _b, _c, _d, _e;
+
+    const opts = _objectSpread2(_objectSpread2({}, (_a = this.roomOptions) === null || _a === void 0 ? void 0 : _a.publishDefaults), options); // clear scalabilityMode setting for backup codec
+
+
+    opts.scalabilityMode = undefined;
+    opts.videoCodec = videoCodec; // is it not published? if so skip
+
+    let existingPublication;
+    this.tracks.forEach(publication => {
+      if (!publication.track) {
+        return;
+      }
+
+      if (publication.track === track) {
+        existingPublication = publication;
+      }
+    });
+
+    if (!existingPublication) {
+      throw new TrackInvalidError('track is not published');
+    }
+
+    if (!(track instanceof LocalVideoTrack)) {
+      throw new TrackInvalidError('track is not a video track');
+    }
+
+    const settings = track.mediaStreamTrack.getSettings();
+    const width = (_b = settings.width) !== null && _b !== void 0 ? _b : (_c = track.dimensions) === null || _c === void 0 ? void 0 : _c.width;
+    const height = (_d = settings.height) !== null && _d !== void 0 ? _d : (_e = track.dimensions) === null || _e === void 0 ? void 0 : _e.height;
+    const encodings = computeVideoEncodings(track.source === Track.Source.ScreenShare, width, height, opts);
+    const simulcastTrack = track.addSimulcastTrack(opts.videoCodec, encodings);
+    const req = AddTrackRequest.fromPartial({
+      cid: simulcastTrack.mediaStreamTrack.id,
+      type: Track.kindToProto(track.kind),
+      muted: track.isMuted,
+      source: Track.sourceToProto(track.source),
+      sid: track.sid,
+      simulcastCodecs: [{
+        codec: opts.videoCodec,
+        cid: simulcastTrack.mediaStreamTrack.id,
+        enableSimulcastLayers: opts.simulcast
+      }]
+    });
+    req.layers = videoLayersFromEncodings(req.width, req.height, encodings);
+
+    if (!this.engine || this.engine.isClosed) {
+      throw new UnexpectedConnectionState('cannot publish track when not connected');
+    }
+
+    const ti = await this.engine.addTrack(req);
+
+    if (!this.engine.publisher) {
+      throw new UnexpectedConnectionState('publisher is closed');
+    }
+
+    const transceiverInit = {
+      direction: 'sendonly'
+    };
+
+    if (encodings) {
+      transceiverInit.sendEncodings = encodings;
+    } // addTransceiver for react-native is async. web is synchronous, but await won't effect it.
+
+
+    const transceiver = await this.engine.publisher.pc.addTransceiver(simulcastTrack.mediaStreamTrack, transceiverInit);
+    this.setPreferredCodec(transceiver, track.kind, opts.videoCodec);
+    track.setSimulcastTrackSender(opts.videoCodec, transceiver.sender);
+    this.engine.negotiate();
+    livekitLogger.debug("published ".concat(opts.videoCodec, " for track ").concat(track.sid), {
+      encodings,
+      trackInfo: ti
+    });
+  }
 
   unpublishTrack(track, stopOnUnpublish) {
     var _a, _b; // look through all published tracks to find the right ones
@@ -14371,38 +14490,41 @@ class LocalParticipant extends Participant {
     const cap = RTCRtpSender.getCapabilities(kind);
     if (!cap) return;
     livekitLogger.debug('get capabilities', cap);
-    let selected;
-    const codecs = [];
+    const matched = [];
+    const partialMatched = [];
+    const unmatched = [];
     cap.codecs.forEach(c => {
       const codec = c.mimeType.toLowerCase();
+
+      if (codec === 'audio/opus') {
+        matched.push(c);
+        return;
+      }
+
       const matchesVideoCodec = codec === "video/".concat(videoCodec);
 
-      if (selected !== undefined) {
-        codecs.push(c);
+      if (!matchesVideoCodec) {
+        unmatched.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) {
-        if (matchesVideoCodec && c.sdpFmtpLine.includes('profile-level-id=42e01f')) {
-          selected = c;
-          return;
+      if (videoCodec === 'h264') {
+        if (c.sdpFmtpLine && c.sdpFmtpLine.includes('profile-level-id=42e01f')) {
+          matched.push(c);
+        } else {
+          partialMatched.push(c);
         }
-      }
 
-      if (matchesVideoCodec || codec === 'audio/opus') {
-        selected = c;
         return;
       }
 
-      codecs.push(c);
+      matched.push(c);
     });
 
-    if (selected && 'setCodecPreferences' in transceiver) {
-      // @ts-ignore
-      codecs.unshift(selected);
-      transceiver.setCodecPreferences(codecs);
+    if ('setCodecPreferences' in transceiver) {
+      transceiver.setCodecPreferences(matched.concat(partialMatched, unmatched));
     }
   }
   /** @internal */
@@ -19255,8 +19377,6 @@ class Room extends events.exports.EventEmitter {
   constructor(options) {
     var _this;
 
-    var _a, _b;
-
     super();
     _this = this;
     this.state = ConnectionState.Disconnected;
@@ -19681,14 +19801,6 @@ class Room extends events.exports.EventEmitter {
     this.participants = new Map();
     this.identityToSid = new Map();
     this.options = options || {};
-
-    switch ((_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.publishDefaults) === null || _b === void 0 ? void 0 : _b.videoCodec) {
-      case 'av1':
-      case 'vp9':
-        this.options.publishDefaults.simulcast = undefined;
-        break;
-    }
-
     this.options.audioCaptureDefaults = _objectSpread2(_objectSpread2({}, audioDefaults), options === null || options === void 0 ? void 0 : options.audioCaptureDefaults);
     this.options.videoCaptureDefaults = _objectSpread2(_objectSpread2({}, videoDefaults), options === null || options === void 0 ? void 0 : options.videoCaptureDefaults);
     this.options.publishDefaults = _objectSpread2(_objectSpread2({}, publishDefaults), options === null || options === void 0 ? void 0 : options.publishDefaults);