vani-meeting-client 2.0.4 → 2.0.6

package/lib/model/MeetingStartRequest.d.ts

@@ -50,6 +50,7 @@ export declare class MeetingStartRequest {
     connectionProtocol: ConnectionProtocol;
     shouldKeepTryToReconnect: boolean;
     shouldIgnoreCaseForRoomId: boolean;
+    shouldUseExactDeviceForUserMedia: boolean;
     urlToCheckInternetPresent: string;
     constructor(_roomId: string, _userId: string, _appId: string, _wssUrl: string, _shouldIgnoreCaseForRoomId?: boolean);
 }

package/lib/model/MeetingStartRequest.js

@@ -48,6 +48,7 @@ var MeetingStartRequest = /** @class */ (function () {
         this.connectionProtocol = ConnectionProtocol.UDP;
         this.shouldKeepTryToReconnect = false;
         this.shouldIgnoreCaseForRoomId = false;
+        this.shouldUseExactDeviceForUserMedia = false;
         this.urlToCheckInternetPresent = "https://en.wikipedia.org/w/api.php?format=json&action=query&prop=extracts&exintro&explaintext&redirects=1&titles=Stack%20Overflow";
         this.shouldIgnoreCaseForRoomId = _shouldIgnoreCaseForRoomId;
         if (this.shouldIgnoreCaseForRoomId) {

package/lib/user-media-handler/UserMediaHandler.js

@@ -280,7 +280,12 @@ var UserMediaHandler = /** @class */ (function (_super) {
                 userMediaPayload.video = this.getVideoDictionay();
             }
             if ((_b = this.meetingStartRequest) === null || _b === void 0 ? void 0 : _b.cameraDevice) {
-                userMediaPayload.video.deviceId = this.meetingStartRequest.cameraDevice;
+                if (this.meetingStartRequest.shouldUseExactDeviceForUserMedia) {
+                    userMediaPayload.video.deviceId = { exact: this.meetingStartRequest.cameraDevice };
+                }
+                else {
+                    userMediaPayload.video.deviceId = this.meetingStartRequest.cameraDevice;
+                }
             }
             else {
                 if (!this.cameraFacingMode) {
@@ -298,7 +303,12 @@ var UserMediaHandler = /** @class */ (function (_super) {
                 userMediaPayload.audio = this.getAudioDictionay();
             }
             if ((_e = this.meetingStartRequest) === null || _e === void 0 ? void 0 : _e.audioInDevice) {
-                userMediaPayload.audio.deviceId = this.meetingStartRequest.audioInDevice;
+                if (this.meetingStartRequest.shouldUseExactDeviceForUserMedia) {
+                    userMediaPayload.audio.deviceId = { exact: this.meetingStartRequest.audioInDevice };
+                }
+                else {
+                    userMediaPayload.audio.deviceId = this.meetingStartRequest.audioInDevice;
+                }
             }
         }
         this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && log.info(userMediaPayload);
@@ -345,61 +355,65 @@ var UserMediaHandler = /** @class */ (function (_super) {
                 }
                 catch (err) {
                 }
-                if (!stream || (isForAudio === false && isForVideo === false)) {
-                    this.isVideoAudioFetchInProgress = false;
-                    return [2 /*return*/];
-                }
-                if (!this.communicationHandler.getSelfParticipant()) {
-                    return [2 /*return*/];
-                }
-                permissionApprovedFor = [];
-                if (isForAudio && stream.getAudioTracks().length > 0) {
-                    this.onTrack(stream.getAudioTracks()[0], TrackKind.Audio, shouldAddTrackImmediately);
-                    // removeAndStreamInLocalStream(stream.getAudioTracks()[0])
-                    // updateLocalTrackInAllTracks(stream.getAudioTracks()[0]);
-                    this.communicationHandler.getSelfParticipant().isAudioEnable = true;
-                    data = { userId: (_a = this.meetingStartRequest) === null || _a === void 0 ? void 0 : _a.userId, type: "audio", status: "resume" };
-                    audioPause = { message: data, type: WebSocketBasicEvents.AudioVideoPauseResume };
-                    this.communicationHandler.sendWebSocketMessage(WebSocketBasicEvents.AudioVideoPauseResume, audioPause);
-                    if (this.muteUmutePromiseResolver) {
-                        this.muteUmutePromiseResolver({ message: "Success", error: 'NoError', isSuccess: true });
-                        this.muteUmutePromiseResolver = undefined;
-                    }
-                    if (this.meetingStartRequest
-                        && stream.getAudioTracks()[0].getSettings() && stream.getAudioTracks()[0].getSettings().deviceId) {
-                        this.meetingStartRequest.audioInDevice = stream.getAudioTracks()[0].getSettings().deviceId;
-                    }
-                    else if (this.meetingStartRequest
-                        && stream.getAudioTracks()[0].getConstraints() && stream.getAudioTracks()[0].getConstraints().deviceId) {
-                        this.meetingStartRequest.audioInDevice = (_b = stream.getAudioTracks()[0].getConstraints().deviceId) === null || _b === void 0 ? void 0 : _b.toString();
+                try {
+                    if (!stream || (isForAudio === false && isForVideo === false)) {
+                        this.isVideoAudioFetchInProgress = false;
+                        return [2 /*return*/];
                     }
-                    permissionApprovedFor.push(TrackKind.Audio);
-                }
-                if (isForVideo && stream.getVideoTracks().length > 0) {
-                    this.onTrack(stream.getVideoTracks()[0], TrackKind.Video, shouldAddTrackImmediately);
-                    // removeAndStreamInLocalStream(stream.getVideoTracks()[0])
-                    // updateLocalTrackInAllTracks(stream.getVideoTracks()[0])
-                    this.communicationHandler.getSelfParticipant().isVideoEnable = true;
-                    data = { userId: (_c = this.meetingStartRequest) === null || _c === void 0 ? void 0 : _c.userId, type: "video", status: "resume" };
-                    audioPause = { message: data, type: WebSocketBasicEvents.AudioVideoPauseResume };
-                    this.communicationHandler.sendWebSocketMessage(WebSocketBasicEvents.AudioVideoPauseResume, audioPause);
-                    if (this.videoPauseResumePromiseResolver) {
-                        this.videoPauseResumePromiseResolver({ message: "Success", error: 'NoError', isSuccess: true });
-                        this.videoPauseResumePromiseResolver = undefined;
+                    if (!this.communicationHandler.getSelfParticipant()) {
+                        return [2 /*return*/];
                     }
-                    if (this.meetingStartRequest
-                        && stream.getVideoTracks()[0].getSettings() && stream.getVideoTracks()[0].getSettings().deviceId) {
-                        this.meetingStartRequest.cameraDevice = stream.getVideoTracks()[0].getSettings().deviceId;
+                    permissionApprovedFor = [];
+                    if (isForAudio && stream.getAudioTracks().length > 0) {
+                        this.onTrack(stream.getAudioTracks()[0], TrackKind.Audio, shouldAddTrackImmediately);
+                        // removeAndStreamInLocalStream(stream.getAudioTracks()[0])
+                        // updateLocalTrackInAllTracks(stream.getAudioTracks()[0]);
+                        this.communicationHandler.getSelfParticipant().isAudioEnable = true;
+                        data = { userId: (_a = this.meetingStartRequest) === null || _a === void 0 ? void 0 : _a.userId, type: "audio", status: "resume" };
+                        audioPause = { message: data, type: WebSocketBasicEvents.AudioVideoPauseResume };
+                        this.communicationHandler.sendWebSocketMessage(WebSocketBasicEvents.AudioVideoPauseResume, audioPause);
+                        if (this.muteUmutePromiseResolver) {
+                            this.muteUmutePromiseResolver({ message: "Success", error: 'NoError', isSuccess: true });
+                            this.muteUmutePromiseResolver = undefined;
+                        }
+                        if (this.meetingStartRequest
+                            && stream.getAudioTracks()[0].getSettings() && stream.getAudioTracks()[0].getSettings().deviceId) {
+                            this.meetingStartRequest.audioInDevice = stream.getAudioTracks()[0].getSettings().deviceId;
+                        }
+                        else if (this.meetingStartRequest
+                            && stream.getAudioTracks()[0].getConstraints() && stream.getAudioTracks()[0].getConstraints().deviceId) {
+                            this.meetingStartRequest.audioInDevice = (_b = stream.getAudioTracks()[0].getConstraints().deviceId) === null || _b === void 0 ? void 0 : _b.toString();
+                        }
+                        permissionApprovedFor.push(TrackKind.Audio);
                     }
-                    else if (this.meetingStartRequest
-                        && stream.getVideoTracks()[0].getConstraints() && stream.getVideoTracks()[0].getConstraints().deviceId) {
-                        this.meetingStartRequest.cameraDevice = (_d = stream.getVideoTracks()[0].getConstraints().deviceId) === null || _d === void 0 ? void 0 : _d.toString();
+                    if (isForVideo && stream.getVideoTracks().length > 0) {
+                        this.onTrack(stream.getVideoTracks()[0], TrackKind.Video, shouldAddTrackImmediately);
+                        // removeAndStreamInLocalStream(stream.getVideoTracks()[0])
+                        // updateLocalTrackInAllTracks(stream.getVideoTracks()[0])
+                        this.communicationHandler.getSelfParticipant().isVideoEnable = true;
+                        data = { userId: (_c = this.meetingStartRequest) === null || _c === void 0 ? void 0 : _c.userId, type: "video", status: "resume" };
+                        audioPause = { message: data, type: WebSocketBasicEvents.AudioVideoPauseResume };
+                        this.communicationHandler.sendWebSocketMessage(WebSocketBasicEvents.AudioVideoPauseResume, audioPause);
+                        if (this.videoPauseResumePromiseResolver) {
+                            this.videoPauseResumePromiseResolver({ message: "Success", error: 'NoError', isSuccess: true });
+                            this.videoPauseResumePromiseResolver = undefined;
+                        }
+                        if (this.meetingStartRequest
+                            && stream.getVideoTracks()[0].getSettings() && stream.getVideoTracks()[0].getSettings().deviceId) {
+                            this.meetingStartRequest.cameraDevice = stream.getVideoTracks()[0].getSettings().deviceId;
+                        }
+                        else if (this.meetingStartRequest
+                            && stream.getVideoTracks()[0].getConstraints() && stream.getVideoTracks()[0].getConstraints().deviceId) {
+                            this.meetingStartRequest.cameraDevice = (_d = stream.getVideoTracks()[0].getConstraints().deviceId) === null || _d === void 0 ? void 0 : _d.toString();
+                        }
+                        permissionApprovedFor.push(TrackKind.Video);
                     }
-                    permissionApprovedFor.push(TrackKind.Video);
+                    this.isVideoAudioFetchInProgress = false;
+                    (_e = this.communicationHandler) === null || _e === void 0 ? void 0 : _e.emitMessageToSource(VaniEvent.OnPermissionApproved, permissionApprovedFor);
+                    this.registerForDeviceChange();
+                }
+                catch (er) {
                 }
-                this.isVideoAudioFetchInProgress = false;
-                (_e = this.communicationHandler) === null || _e === void 0 ? void 0 : _e.emitMessageToSource(VaniEvent.OnPermissionApproved, permissionApprovedFor);
-                this.registerForDeviceChange();
                 return [2 /*return*/];
             });
         });
@@ -441,16 +455,19 @@ var UserMediaHandler = /** @class */ (function (_super) {
     };
     UserMediaHandler.prototype.onTrack = function (trackStream, trackKind, shouldAddTrackImmediately) {
         var _a, _b, _c;
-        var selfParticpant = (_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.getSelfParticipant();
-        if (selfParticpant) {
-            var track = new Track(selfParticpant, true, trackKind, trackStream);
-            if (!shouldAddTrackImmediately) {
-                (_b = this.communicationHandler) === null || _b === void 0 ? void 0 : _b.emitMessageToSource(VaniEvent.OnTrack, track);
-            }
-            else {
-                (_c = this.communicationHandler) === null || _c === void 0 ? void 0 : _c.addUpdateLocalTrack(track);
+        try {
+            var selfParticpant = (_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.getSelfParticipant();
+            if (selfParticpant) {
+                var track = new Track(selfParticpant, true, trackKind, trackStream);
+                if (!shouldAddTrackImmediately) {
+                    (_b = this.communicationHandler) === null || _b === void 0 ? void 0 : _b.emitMessageToSource(VaniEvent.OnTrack, track);
+                }
+                else {
+                    (_c = this.communicationHandler) === null || _c === void 0 ? void 0 : _c.addUpdateLocalTrack(track);
+                }
             }
         }
+        catch (err) { }
     };
     UserMediaHandler.prototype.getDevice = function (type) {
         return __awaiter(this, void 0, void 0, function () {
@@ -620,11 +637,12 @@ var UserMediaHandler = /** @class */ (function (_super) {
             var _this = this;
             return __generator(this, function (_a) {
                 return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                        var participant, videoInputDevices, data, videoUnblock, participant;
+                        var participant, videoInputDevices, data, videoUnblock, participant, err_1;
                         var _a, _b, _c;
                         return __generator(this, function (_d) {
                             switch (_d.label) {
                                 case 0:
+                                    _d.trys.push([0, 4, , 5]);
                                     if (!this.meetingStartRequest) {
                                         resolve({ message: "Start Meeting Object not found", error: 'InvalidMeetingRequest', isSuccess: false });
                                         return [2 /*return*/];
@@ -665,7 +683,11 @@ var UserMediaHandler = /** @class */ (function (_super) {
                                         resolve({ message: "Permission Not Allowed", error: 'PermissionDenied', isSuccess: false });
                                     }
                                     _d.label = 3;
-                                case 3: return [2 /*return*/];
+                                case 3: return [3 /*break*/, 5];
+                                case 4:
+                                    err_1 = _d.sent();
+                                    return [3 /*break*/, 5];
+                                case 5: return [2 /*return*/];
                             }
                         });
                     }); })];
@@ -677,11 +699,12 @@ var UserMediaHandler = /** @class */ (function (_super) {
             var _this = this;
             return __generator(this, function (_a) {
                 return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                        var participant, audioInputDevices, data, audioUnblock, participant;
+                        var participant, audioInputDevices, data, audioUnblock, participant, err_2;
                         var _a, _b, _c;
                         return __generator(this, function (_d) {
                             switch (_d.label) {
                                 case 0:
+                                    _d.trys.push([0, 4, , 5]);
                                     if (!this.meetingStartRequest) {
                                         resolve({ message: "Start Meeting Object not found", error: 'InvalidMeetingRequest', isSuccess: false });
                                         return [2 /*return*/];
@@ -722,7 +745,11 @@ var UserMediaHandler = /** @class */ (function (_super) {
                                         resolve({ message: "Permission Not Allowed", error: 'PermissionDenied', isSuccess: false });
                                     }
                                     _d.label = 3;
-                                case 3: return [2 /*return*/];
+                                case 3: return [3 /*break*/, 5];
+                                case 4:
+                                    err_2 = _d.sent();
+                                    return [3 /*break*/, 5];
+                                case 5: return [2 /*return*/];
                             }
                         });
                     }); })];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vani-meeting-client",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "Vani Meeting Clinet SDK",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",