@stream-io/video-client 0.3.6 → 0.3.7

package/dist/index.cjs.js

@@ -9937,8 +9937,15 @@ class InputMediaDeviceManager {
             if (this.state.status === 'enabled') {
                 return;
             }
-            yield this.unmuteStream();
-            this.state.setStatus('enabled');
+            this.enablePromise = this.unmuteStream();
+            try {
+                yield this.enablePromise;
+                this.state.setStatus('enabled');
+            }
+            catch (error) {
+                this.enablePromise = undefined;
+                throw error;
+            }
         });
     }
     /**
@@ -9952,8 +9959,16 @@ class InputMediaDeviceManager {
             if (this.state.status === 'disabled') {
                 return;
             }
-            yield this.muteStream(this.state.disableMode === 'stop-tracks');
-            this.state.setStatus('disabled');
+            this.disablePromise = this.muteStream(this.state.disableMode === 'stop-tracks');
+            try {
+                yield this.disablePromise;
+                this.state.setStatus('disabled');
+                this.disablePromise = undefined;
+            }
+            catch (error) {
+                this.disablePromise = undefined;
+                throw error;
+            }
         });
     }
     /**
@@ -10049,6 +10064,10 @@ class InputMediaDeviceManager {
 class CameraManager extends InputMediaDeviceManager {
     constructor(call) {
         super(call, new CameraManagerState());
+        this.targetResolution = {
+            width: 1280,
+            height: 720,
+        };
     }
     /**
      * Select the camera direaction
@@ -10074,10 +10093,37 @@ class CameraManager extends InputMediaDeviceManager {
             this.selectDirection(newDirection);
         });
     }
+    /**
+     * @internal
+     */
+    selectTargetResolution(resolution) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            this.targetResolution.height = resolution.height;
+            this.targetResolution.width = resolution.width;
+            if (this.enablePromise) {
+                try {
+                    yield this.enablePromise;
+                }
+                catch (error) {
+                    // couldn't enable device, target resolution will be applied the next time user attempts to start the device
+                }
+            }
+            if (this.state.status === 'enabled') {
+                const { width, height } = (_a = this.state
+                    .mediaStream.getVideoTracks()[0]) === null || _a === void 0 ? void 0 : _a.getSettings();
+                if (width !== this.targetResolution.width ||
+                    height !== this.targetResolution.height)
+                    yield this.applySettingsToStream();
+            }
+        });
+    }
     getDevices() {
         return getVideoDevices();
     }
     getStream(constraints) {
+        constraints.width = this.targetResolution.width;
+        constraints.height = this.targetResolution.height;
         // We can't set both device id and facing mode
         // Device id has higher priority
         if (!constraints.deviceId && this.state.direction) {
@@ -11313,63 +11359,69 @@ class Call {
         return ((_a = this.state.createdBy) === null || _a === void 0 ? void 0 : _a.id) === this.currentUserId;
     }
     initCamera() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
+            // Wait for any in progress camera operation
+            if (this.camera.enablePromise) {
+                yield this.camera.enablePromise;
+            }
+            if (this.camera.disablePromise) {
+                yield this.camera.disablePromise;
+            }
             if (((_a = this.state.localParticipant) === null || _a === void 0 ? void 0 : _a.videoStream) ||
                 !this.permissionsContext.hasPermission('send-video')) {
                 return;
             }
             // Set camera direction if it's not yet set
-            // This will also start publishing if camera is enabled
             if (!this.camera.state.direction && !this.camera.state.selectedDevice) {
                 let defaultDirection = 'front';
                 const backendSetting = (_b = this.state.settings) === null || _b === void 0 ? void 0 : _b.video.camera_facing;
                 if (backendSetting) {
                     defaultDirection = backendSetting === 'front' ? 'front' : 'back';
                 }
-                this.camera.selectDirection(defaultDirection);
-            }
-            else if (this.camera.state.status === 'enabled') {
-                // Publish already started media streams (this is the case if there is a lobby screen before join)
-                // Wait for media stream
-                this.camera.state.mediaStream$
-                    .pipe(rxjs.takeWhile((s) => s === undefined, true))
-                    .subscribe((stream) => {
-                    var _a;
-                    if (!((_a = this.state.localParticipant) === null || _a === void 0 ? void 0 : _a.videoStream)) {
-                        this.publishVideoStream(stream);
-                    }
-                });
+                this.camera.state.setDirection(defaultDirection);
             }
-            // Apply backend config (this is the case if there is no lobby screen before join)
+            // Set target resolution
+            const targetResolution = (_c = this.state.settings) === null || _c === void 0 ? void 0 : _c.video.target_resolution;
+            if (targetResolution) {
+                yield this.camera.selectTargetResolution(targetResolution);
+            }
+            // Publish already that was set before we joined
+            if (this.camera.state.status === 'enabled' &&
+                this.camera.state.mediaStream &&
+                !((_d = this.publisher) === null || _d === void 0 ? void 0 : _d.isPublishing(TrackType.VIDEO))) {
+                yield this.publishVideoStream(this.camera.state.mediaStream);
+            }
+            // Start camera if backend config speicifies, and there is no local setting
             if (this.camera.state.status === undefined &&
-                ((_c = this.state.settings) === null || _c === void 0 ? void 0 : _c.video.camera_default_on)) {
+                ((_e = this.state.settings) === null || _e === void 0 ? void 0 : _e.video.camera_default_on)) {
                 yield this.camera.enable();
             }
         });
     }
     initMic() {
-        var _a, _b;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
+            // Wait for any in progress mic operation
+            if (this.microphone.enablePromise) {
+                yield this.microphone.enablePromise;
+            }
+            if (this.microphone.disablePromise) {
+                yield this.microphone.disablePromise;
+            }
             if (((_a = this.state.localParticipant) === null || _a === void 0 ? void 0 : _a.audioStream) ||
                 !this.permissionsContext.hasPermission('send-audio')) {
                 return;
             }
-            // Publish already started media streams (this is the case if there is a lobby screen before join)
-            if (this.microphone.state.status === 'enabled') {
-                // Wait for media stream
-                this.microphone.state.mediaStream$
-                    .pipe(rxjs.takeWhile((s) => s === undefined, true))
-                    .subscribe((stream) => {
-                    var _a;
-                    if (!((_a = this.state.localParticipant) === null || _a === void 0 ? void 0 : _a.audioStream)) {
-                        this.publishAudioStream(stream);
-                    }
-                });
+            // Publish media stream that was set before we joined
+            if (this.microphone.state.status === 'enabled' &&
+                this.microphone.state.mediaStream &&
+                !((_b = this.publisher) === null || _b === void 0 ? void 0 : _b.isPublishing(TrackType.AUDIO))) {
+                this.publishAudioStream(this.microphone.state.mediaStream);
             }
-            // Apply backend config (this is the case if there is no lobby screen before join)
+            // Start mic if backend config speicifies, and there is no local setting
             if (this.microphone.state.status === undefined &&
-                ((_b = this.state.settings) === null || _b === void 0 ? void 0 : _b.audio.mic_default_on)) {
+                ((_c = this.state.settings) === null || _c === void 0 ? void 0 : _c.audio.mic_default_on)) {
                 yield this.microphone.enable();
             }
         });
@@ -12485,7 +12537,7 @@ class WSConnectionFallback {
     }
 }
 
-const version = '0.3.6';
+const version = '0.3.7';
 
 const logger = getLogger(['location']);
 const HINT_URL = `https://hint.stream-io-video.com/`;