@stream-io/video-client 0.0.2-alpha.9 → 0.0.4

package/dist/index.cjs.js

@@ -5243,8 +5243,8 @@ const removeCodec = (sdp, mediaType, codecToRemove) => {
     const fmtp = section === null || section === void 0 ? void 0 : section.fmtp.find((f) => f.payload === codecId);
     return sdp
         .replace(mediaSection.original, `${mediaSection.mediaWithPorts} ${newCodecOrder}`)
-        .replace(new RegExp(`${rtpMap.original}[\r\n|\r|\n]`), '') // remove the corresponding rtpmap line
-        .replace((fmtp === null || fmtp === void 0 ? void 0 : fmtp.original) ? new RegExp(`${fmtp === null || fmtp === void 0 ? void 0 : fmtp.original}[\r\n|\r|\n]`) : '', ''); // remove the corresponding fmtp line
+        .replace(new RegExp(`${rtpMap.original}[\r\n]+`), '') // remove the corresponding rtpmap line
+        .replace((fmtp === null || fmtp === void 0 ? void 0 : fmtp.original) ? new RegExp(`${fmtp === null || fmtp === void 0 ? void 0 : fmtp.original}[\r\n]+`) : '', ''); // remove the corresponding fmtp line
 };
 /**
  * Gets the fmtp line corresponding to opus
@@ -5254,8 +5254,7 @@ const getOpusFmtp = (sdp) => {
     const rtpMap = section === null || section === void 0 ? void 0 : section.rtpMap.find((r) => r.codec.toLowerCase() === 'opus');
     const codecId = rtpMap === null || rtpMap === void 0 ? void 0 : rtpMap.payload;
     if (codecId) {
-        const fmtp = section === null || section === void 0 ? void 0 : section.fmtp.find((f) => f.payload === codecId);
-        return fmtp;
+        return section === null || section === void 0 ? void 0 : section.fmtp.find((f) => f.payload === codecId);
     }
 };
 /**
@@ -5469,7 +5468,7 @@ const defaultTargetResolution = {
 const findOptimalVideoLayers = (videoTrack, targetResolution = defaultTargetResolution) => {
     const optimalVideoLayers = [];
     const settings = videoTrack.getSettings();
-    const { width: w = 0, height: h = 0 } = settings;
+    const { width: w = targetResolution.width, height: h = targetResolution.height, } = settings;
     const maxBitrate = getComputedMaxBitrate(targetResolution, w, h);
     let downscaleFactor = 1;
     ['f', 'h', 'q'].forEach((rid) => {
@@ -5737,14 +5736,13 @@ class Publisher {
         };
         this.updateVideoPublishQuality = (enabledRids) => __awaiter(this, void 0, void 0, function* () {
             var _a;
-            console.log('Updating publish quality, qualities requested by SFU:', enabledRids);
+            console.log('Update publish quality, requested rids by SFU:', enabledRids);
             const videoSender = (_a = this.transceiverRegistry[TrackType.VIDEO]) === null || _a === void 0 ? void 0 : _a.sender;
             if (!videoSender)
                 return;
             const params = videoSender.getParameters();
             let changed = false;
             params.encodings.forEach((enc) => {
-                console.log(enc.rid, enc.active);
                 // flip 'active' flag only when necessary
                 const shouldEnable = enabledRids.includes(enc.rid);
                 if (shouldEnable !== enc.active) {
@@ -5757,6 +5755,10 @@ class Publisher {
                     console.warn('No suitable video encoding quality found');
                 }
                 yield videoSender.setParameters(params);
+                console.log(`Update publish quality, enabled rids: ${params.encodings
+                    .filter((e) => e.active)
+                    .map((e) => e.rid)
+                    .join(', ')}`);
             }
         });
         this.getCodecPreferences = (trackType, preferredCodec) => {
@@ -5785,7 +5787,7 @@ class Publisher {
             const offer = yield this.publisher.createOffer();
             let sdp = offer.sdp;
             if (sdp) {
-                toggleDtx(sdp, this.isDtxEnabled);
+                sdp = toggleDtx(sdp, this.isDtxEnabled);
                 if (isReactNative()) {
                     if (this.preferredVideoCodec) {
                         sdp = setPreferredCodec(sdp, 'video', this.preferredVideoCodec);
@@ -6132,8 +6134,9 @@ class StreamSfuClient {
      * @param url the URL of the SFU.
      * @param wsEndpoint the WebSocket endpoint of the SFU.
      * @param token the JWT token to use for authentication.
+     * @param sessionId the `sessionId` of the currently connected participant.
      */
-    constructor(dispatcher, url, wsEndpoint, token) {
+    constructor({ dispatcher, url, wsEndpoint, token, sessionId, }) {
         /**
          * A buffer for ICE Candidates that are received before
          * the PeerConnections are ready to handle them.
@@ -6218,7 +6221,7 @@ class StreamSfuClient {
                 }
             }, this.unhealthyTimeoutInMs);
         };
-        this.sessionId = generateUUIDv4();
+        this.sessionId = sessionId || generateUUIDv4();
         this.token = token;
         this.rpc = createSignalClient({
             baseUrl: url,
@@ -6619,6 +6622,12 @@ class CallState {
          * @internal
          */
         this.membersSubject = new rxjs.BehaviorSubject([]);
+        /**
+         * The list of capabilities of the current user.
+         *
+         * @private
+         */
+        this.ownCapabilitiesSubject = new rxjs.BehaviorSubject([]);
         /**
          * The calling state.
          *
@@ -6801,6 +6810,15 @@ class CallState {
         this.setMembers = (members) => {
             this.setCurrentValue(this.membersSubject, members);
         };
+        /**
+         * Sets the own capabilities.
+         *
+         * @internal
+         * @param capabilities the capabilities to set.
+         */
+        this.setOwnCapabilities = (capabilities) => {
+            return this.setCurrentValue(this.ownCapabilitiesSubject, capabilities);
+        };
         /**
          * Will try to find the participant with the given sessionId in the current call.
          *
@@ -6890,6 +6908,7 @@ class CallState {
         this.callRecordingList$ = this.callRecordingListSubject.asObservable();
         this.metadata$ = this.metadataSubject.asObservable();
         this.members$ = this.membersSubject.asObservable();
+        this.ownCapabilities$ = this.ownCapabilitiesSubject.asObservable();
         this.callingState$ = this.callingStateSubject.asObservable();
     }
     /**
@@ -6985,6 +7004,12 @@ class CallState {
     get members() {
         return this.getCurrentValue(this.members$);
     }
+    /**
+     * The capabilities of the current user for the current call.
+     */
+    get ownCapabilities() {
+        return this.getCurrentValue(this.ownCapabilities$);
+    }
 }
 
 class StreamVideoWriteableStateStore {
@@ -7249,7 +7274,10 @@ const watchCallPermissionRequest = (state) => {
     return function onCallPermissionRequest(event) {
         if (event.type !== 'call.permission_request')
             return;
-        state.setCallPermissionRequest(event);
+        const { localParticipant } = state;
+        if (event.user.id !== (localParticipant === null || localParticipant === void 0 ? void 0 : localParticipant.userId)) {
+            state.setCallPermissionRequest(event);
+        }
     };
 };
 /**
@@ -7261,7 +7289,7 @@ const watchCallPermissionsUpdated = (state) => {
             return;
         const { localParticipant } = state;
         if (event.user.id === (localParticipant === null || localParticipant === void 0 ? void 0 : localParticipant.userId)) {
-            state.setMetadata((metadata) => (Object.assign(Object.assign({}, metadata), { own_capabilities: event.own_capabilities })));
+            state.setOwnCapabilities(event.own_capabilities);
         }
     };
 };
@@ -7272,7 +7300,6 @@ const watchCallPermissionsUpdated = (state) => {
  */
 const watchCallGrantsUpdated = (state) => {
     return function onCallGrantsUpdated(event) {
-        var _a;
         if (event.eventPayload.oneofKind !== 'callGrantsUpdated')
             return;
         const { currentGrants } = event.eventPayload.callGrantsUpdated;
@@ -7283,15 +7310,13 @@ const watchCallGrantsUpdated = (state) => {
                 [OwnCapability.SEND_VIDEO]: canPublishVideo,
                 [OwnCapability.SCREENSHARE]: canScreenshare,
             };
-            const nextCapabilities = (((_a = state.metadata) === null || _a === void 0 ? void 0 : _a.own_capabilities) || []).filter((capability) => update[capability] !== false);
+            const nextCapabilities = state.ownCapabilities.filter((capability) => update[capability] !== false);
             Object.entries(update).forEach(([capability, value]) => {
                 if (value && !nextCapabilities.includes(capability)) {
                     nextCapabilities.push(capability);
                 }
             });
-            state.setMetadata((metadata) => {
-                return Object.assign(Object.assign({}, metadata), { own_capabilities: nextCapabilities });
-            });
+            state.setOwnCapabilities(nextCapabilities);
         }
     };
 };
@@ -7584,10 +7609,7 @@ const watchCallSessionStarted = (state) => {
     return function onCallSessionStarted(event) {
         if (event.type !== 'call.session_started')
             return;
-        const { call } = event;
-        state.setMetadata((metadata) => (Object.assign(Object.assign({}, call), { 
-            // FIXME OL: temporary, until the backend sends the own_capabilities
-            own_capabilities: (metadata === null || metadata === void 0 ? void 0 : metadata.own_capabilities) || [] })));
+        state.setMetadata(event.call);
     };
 };
 /**
@@ -7599,10 +7621,7 @@ const watchCallSessionEnded = (state) => {
     return function onCallSessionEnded(event) {
         if (event.type !== 'call.session_ended')
             return;
-        const { call } = event;
-        state.setMetadata((metadata) => (Object.assign(Object.assign({}, call), { 
-            // FIXME OL: temporary, until the backend sends the own_capabilities
-            own_capabilities: (metadata === null || metadata === void 0 ? void 0 : metadata.own_capabilities) || [] })));
+        state.setMetadata(event.call);
     };
 };
 /**
@@ -7764,13 +7783,14 @@ const registerRingingCallEventHandlers = (call) => {
 const join = (httpClient, type, id, data) => __awaiter(void 0, void 0, void 0, function* () {
     yield httpClient.connectionIdPromise;
     const joinCallResponse = yield doJoin(httpClient, type, id, data);
-    const { call, credentials, members } = joinCallResponse;
+    const { call, credentials, members, own_capabilities } = joinCallResponse;
     return {
         connectionConfig: toRtcConfiguration(credentials.ice_servers),
         sfuServer: credentials.server,
         token: credentials.token,
         metadata: call,
         members,
+        ownCapabilities: own_capabilities,
     };
 });
 const doJoin = (httpClient, type, id, data) => __awaiter(void 0, void 0, void 0, function* () {
@@ -7787,9 +7807,12 @@ const doJoin = (httpClient, type, id, data) => __awaiter(void 0, void 0, void 0,
 });
 const getLocationHint = () => __awaiter(void 0, void 0, void 0, function* () {
     const hintURL = `https://hint.stream-io-video.com/`;
+    const abortController = new AbortController();
+    const timeoutId = setTimeout(() => abortController.abort(), 1000);
     try {
         const response = yield fetch(hintURL, {
             method: 'HEAD',
+            signal: abortController.signal,
         });
         const awsPop = response.headers.get('x-amz-cf-pop') || 'ERR';
         return awsPop.substring(0, 3); // AMS1-P2 -> AMS
@@ -7798,6 +7821,9 @@ const getLocationHint = () => __awaiter(void 0, void 0, void 0, function* () {
         console.error(`Failed to get location hint from ${hintURL}`, e);
         return 'ERR';
     }
+    finally {
+        clearTimeout(timeoutId);
+    }
 });
 const toRtcConfiguration = (config) => {
     if (!config || config.length === 0)
@@ -8300,7 +8326,7 @@ class Call {
      * Use the [`StreamVideoClient.call`](./StreamVideoClient.md/#call)
      * method to construct a `Call` instance.
      */
-    constructor({ type, id, streamClient, metadata, members, sortParticipantsBy, clientStore, ringing = false, watching = false, }) {
+    constructor({ type, id, streamClient, metadata, members, ownCapabilities, sortParticipantsBy, clientStore, ringing = false, watching = false, }) {
         /**
          * ViewportTracker instance
          */
@@ -8392,6 +8418,7 @@ class Call {
             }
             this.state.setMetadata(response.call);
             this.state.setMembers(response.members);
+            this.state.setOwnCapabilities(response.own_capabilities);
             if (this.streamClient._hasConnectionID()) {
                 this.watching = true;
                 this.clientStore.registerCall(this);
@@ -8410,6 +8437,7 @@ class Call {
             }
             this.state.setMetadata(response.call);
             this.state.setMembers(response.members);
+            this.state.setOwnCapabilities(response.own_capabilities);
             if (this.streamClient._hasConnectionID()) {
                 this.watching = true;
                 this.clientStore.registerCall(this);
@@ -8456,7 +8484,7 @@ class Call {
          * @returns a promise which resolves once the call join-flow has finished.
          */
         this.join = (data) => __awaiter(this, void 0, void 0, function* () {
-            var _e;
+            var _e, _f;
             if ([exports.CallingState.JOINED, exports.CallingState.JOINING].includes(this.state.callingState)) {
                 throw new Error(`Illegal State: Already joined.`);
             }
@@ -8476,6 +8504,7 @@ class Call {
                 const call = yield join(this.streamClient, this.type, this.id, data);
                 this.state.setMetadata(call.metadata);
                 this.state.setMembers(call.members);
+                this.state.setOwnCapabilities(call.ownCapabilities);
                 connectionConfig = call.connectionConfig;
                 sfuServer = call.sfuServer;
                 sfuToken = call.token;
@@ -8501,21 +8530,28 @@ class Call {
                 const sfuWsUrlParam = params.get('sfuWsUrl');
                 sfuWsUrl = sfuWsUrlParam || sfuServer.ws_endpoint;
             }
-            const sfuClient = (this.sfuClient = new StreamSfuClient(this.dispatcher, sfuUrl, sfuWsUrl, sfuToken));
+            const previousSessionId = (_e = this.sfuClient) === null || _e === void 0 ? void 0 : _e.sessionId;
+            const sfuClient = (this.sfuClient = new StreamSfuClient({
+                dispatcher: this.dispatcher,
+                url: sfuUrl,
+                wsEndpoint: sfuWsUrl,
+                token: sfuToken,
+                sessionId: previousSessionId,
+            }));
             /**
              * A closure which hides away the re-connection logic.
              */
             const rejoin = () => __awaiter(this, void 0, void 0, function* () {
-                var _f, _g, _h;
+                var _g, _h, _j;
                 console.log(`Rejoining call ${this.cid} (${this.reconnectAttempts})...`);
                 this.reconnectAttempts++;
                 this.state.setCallingState(exports.CallingState.RECONNECTING);
                 // take a snapshot of the current "local participant" state
                 // we'll need it for restoring the previous publishing state later
                 const localParticipant = this.state.localParticipant;
-                (_f = this.subscriber) === null || _f === void 0 ? void 0 : _f.close();
-                (_g = this.publisher) === null || _g === void 0 ? void 0 : _g.stopPublishing({ stopTracks: false });
-                (_h = this.statsReporter) === null || _h === void 0 ? void 0 : _h.stop();
+                (_g = this.subscriber) === null || _g === void 0 ? void 0 : _g.close();
+                (_h = this.publisher) === null || _h === void 0 ? void 0 : _h.stopPublishing({ stopTracks: false });
+                (_j = this.statsReporter) === null || _j === void 0 ? void 0 : _j.stop();
                 sfuClient.close(); // clean up previous connection
                 yield sleep(retryInterval(this.reconnectAttempts));
                 yield this.join(data);
@@ -8585,7 +8621,7 @@ class Call {
                 connectionConfig,
                 onTrack: this.handleOnTrack,
             });
-            const audioSettings = (_e = this.data) === null || _e === void 0 ? void 0 : _e.settings.audio;
+            const audioSettings = (_f = this.data) === null || _f === void 0 ? void 0 : _f.settings.audio;
             const isDtxEnabled = !!(audioSettings === null || audioSettings === void 0 ? void 0 : audioSettings.opus_dtx_enabled);
             const isRedEnabled = !!(audioSettings === null || audioSettings === void 0 ? void 0 : audioSettings.redundant_coding_enabled);
             this.publisher = new Publisher({
@@ -8743,9 +8779,9 @@ class Call {
          * @param trackType the track type to stop publishing.
          */
         this.stopPublish = (trackType) => __awaiter(this, void 0, void 0, function* () {
-            var _j;
+            var _k;
             console.log(`stopPublish`, TrackType[trackType]);
-            yield ((_j = this.publisher) === null || _j === void 0 ? void 0 : _j.unpublishStream(trackType));
+            yield ((_k = this.publisher) === null || _k === void 0 ? void 0 : _k.unpublishStream(trackType));
         });
         /**
          * Update track subscription configuration for one or more participants.
@@ -8886,8 +8922,8 @@ class Call {
          * @returns
          */
         this.updatePublishQuality = (enabledRids) => __awaiter(this, void 0, void 0, function* () {
-            var _k;
-            return (_k = this.publisher) === null || _k === void 0 ? void 0 : _k.updateVideoPublishQuality(enabledRids);
+            var _l;
+            return (_l = this.publisher) === null || _l === void 0 ? void 0 : _l.updateVideoPublishQuality(enabledRids);
         });
         this.handleOnTrack = (e) => {
             const [primaryStream] = e.streams;
@@ -9117,7 +9153,12 @@ class Call {
          * @param updates the updates to apply to the call.
          */
         this.update = (updates) => __awaiter(this, void 0, void 0, function* () {
-            return this.streamClient.patch(`${this.streamClientBasePath}`, updates);
+            const response = yield this.streamClient.patch(`${this.streamClientBasePath}`, updates);
+            const { call, members, own_capabilities } = response;
+            this.state.setMetadata(call);
+            this.state.setMembers(members);
+            this.state.setOwnCapabilities(own_capabilities);
+            return response;
         });
         /**
          * Ends the call. Once the call is ended, it cannot be re-joined.
@@ -9198,15 +9239,6 @@ class Call {
             this.state.setCallRecordingsList(response.recordings);
             return response;
         });
-        /**
-         * Returns a list of Edge Serves for current call.
-         *
-         * @deprecated merged with `call.join`.
-         * @param data the data.
-         */
-        this.getEdgeServer = (data) => {
-            return this.streamClient.post(`${this.streamClientBasePath}/get_edge_server`, data);
-        };
         /**
          * Sends an event to all call participants.
          *
@@ -9230,6 +9262,7 @@ class Call {
         }
         this.state.setMetadata(metadata);
         this.state.setMembers(members || []);
+        this.state.setOwnCapabilities(ownCapabilities || []);
         this.state.setCallingState(ringing ? exports.CallingState.RINGING : exports.CallingState.IDLE);
         this.leaveCallHooks.push(registerEventHandlers(this, this.state, this.dispatcher));
         this.registerEffects();
@@ -9241,23 +9274,13 @@ class Call {
         createSubscription(this.state.metadata$, (metadata) => {
             if (!metadata)
                 return;
-            this.permissionsContext.setPermissions(metadata.own_capabilities);
             this.permissionsContext.setCallSettings(metadata.settings);
         }), 
-        // handles the case when the user is blocked by the call owner.
-        createSubscription(this.state.metadata$, (metadata) => __awaiter(this, void 0, void 0, function* () {
-            if (!metadata)
-                return;
-            const currentUserId = this.currentUserId;
-            if (currentUserId &&
-                metadata.blocked_user_ids.includes(currentUserId)) {
-                yield this.leave();
-            }
-        })), 
-        // handle the case when the user permissions are revoked.
-        createSubscription(this.state.metadata$, (metadata) => {
-            if (!metadata)
-                return;
+        // handle the case when the user permissions are modified.
+        createSubscription(this.state.ownCapabilities$, (ownCapabilities) => {
+            // update the permission context.
+            this.permissionsContext.setPermissions(ownCapabilities);
+            // check if the user still has publishing permissions and stop publishing if not.
             const permissionToTrackType = {
                 [OwnCapability.SEND_AUDIO]: TrackType.AUDIO,
                 [OwnCapability.SEND_VIDEO]: TrackType.VIDEO,
@@ -9272,6 +9295,16 @@ class Call {
                 }
             });
         }), 
+        // handles the case when the user is blocked by the call owner.
+        createSubscription(this.state.metadata$, (metadata) => __awaiter(this, void 0, void 0, function* () {
+            if (!metadata)
+                return;
+            const currentUserId = this.currentUserId;
+            if (currentUserId &&
+                metadata.blocked_user_ids.includes(currentUserId)) {
+                yield this.leave();
+            }
+        })), 
         // watch for auto drop cancellation
         createSubscription(this.state.callingState$, (callingState) => {
             if (!this.ringing)
@@ -10962,7 +10995,7 @@ class StreamClient {
     }
     getUserAgent() {
         return (this.userAgent ||
-            `stream-video-javascript-client-${this.node ? 'node' : 'browser'}-${"0.0.2-alpha.8"}`);
+            `stream-video-javascript-client-${this.node ? 'node' : 'browser'}-${"0.0.3"}`);
     }
     setUserAgent(userAgent) {
         this.userAgent = userAgent;
@@ -11170,6 +11203,7 @@ class StreamVideoClient {
                     type: c.call.type,
                     metadata: c.call,
                     members: c.members,
+                    ownCapabilities: c.own_capabilities,
                     watching: data.watch,
                     clientStore: this.writeableStateStore,
                 });
@@ -11519,7 +11553,7 @@ const createSoundDetector = (audioStream, onSoundDetectedStateChanged, options =
         const percentage = averagedDataValue > audioLevelThreshold
             ? 100
             : Math.round((averagedDataValue / audioLevelThreshold) * 100);
-        onSoundDetectedStateChanged(isSoundDetected, percentage);
+        onSoundDetectedStateChanged({ isSoundDetected, audioLevel: percentage });
     }, detectionFrequencyInMs);
     return function stop() {
         return __awaiter(this, void 0, void 0, function* () {