vani-meeting-client 0.7.3 → 0.7.7

package/lib/MeetingHandler.js

@@ -61,7 +61,7 @@ var MeetingHandler = /** @class */ (function () {
     MeetingHandler.prototype.init = function () {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {
-            var _d, _e, err_1;
+            var _d, _e;
             return __generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
@@ -79,26 +79,15 @@ var MeetingHandler = /** @class */ (function () {
                         this.reactNativeWebrtcPlugin.registerGlobals();
                         _f.label = 2;
                     case 2:
-                        _f.trys.push([2, 5, , 6]);
                         if (!!this.videoCallHandler) return [3 /*break*/, 4];
                         _e = this;
                         return [4 /*yield*/, new DynamicLibHelper().getVideoCallClassHandler((_c = this.meetingStartRequest) === null || _c === void 0 ? void 0 : _c.meetingType, this.meetingStartRequest, this.communicationHandler)];
                     case 3:
                         _e.videoCallHandler = _f.sent();
                         _f.label = 4;
-                    case 4: return [3 /*break*/, 6];
-                    case 5:
-                        err_1 = _f.sent();
-                        console.log("his.videoCallHandler error", err_1);
-                        return [3 /*break*/, 6];
-                    case 6:
-                        try {
-                            if (!this.websocketCallHandler) {
-                                this.websocketCallHandler = new WebsocketHandler(this.meetingStartRequest, this.communicationHandler);
-                            }
-                        }
-                        catch (err) {
-                            console.log("his.websocketCallHandler error", err);
+                    case 4:
+                        if (!this.websocketCallHandler) {
+                            this.websocketCallHandler = new WebsocketHandler(this.meetingStartRequest, this.communicationHandler);
                         }
                         // this.handleGA();
                         this.emitMessageToSource(VaniEvent.OnInitDone, {});

package/lib/model/Event.d.ts

@@ -1,6 +1,6 @@
 import { MessagePayload } from "..";
 import { Participant } from "./Participant";
-import { Track } from "./Track";
+import { Track, TrackKind } from "./Track";
 export declare enum VaniEvent {
     OnInitDone = "onInitDone",
     OnSocketError = "onSocketError",
@@ -39,7 +39,7 @@ interface VaniConnectionEvents {
     [VaniEvent.OnConnected]: () => any;
     [VaniEvent.OnConnectionBack]: () => any;
     [VaniEvent.OnPermissionError]: (error: DOMException) => any;
-    [VaniEvent.OnPermissionApproved]: () => any;
+    [VaniEvent.OnPermissionApproved]: (forTrackKinds: TrackKind[]) => any;
     [VaniEvent.OnDevicesChanged]: () => any;
     [VaniEvent.OnUserJoined]: (participant: Participant) => any;
     [VaniEvent.OnAudioVideoStatusUpdated]: (participant: Participant) => any;

package/lib/model/MeetingStartRequest.d.ts

@@ -34,6 +34,7 @@ export declare class MeetingStartRequest {
     defaultAudioBlocked: boolean;
     defaultVideoBlocked: boolean;
     defaultScreenShareBlocked: boolean;
+    mediasoupDeviceHandlerName?: String;
     defaultCameraFacingMode: CameraFacingMode;
     simulcastEncodings: RTCRtpEncodingParameters[];
     isDataChannelRequired: boolean;

package/lib/model/MeetingStartRequest.js

@@ -29,6 +29,7 @@ var MeetingStartRequest = /** @class */ (function () {
         this.defaultAudioBlocked = false;
         this.defaultVideoBlocked = false;
         this.defaultScreenShareBlocked = false;
+        this.mediasoupDeviceHandlerName = undefined;
         this.defaultCameraFacingMode = CameraFacingMode.Front;
         this.simulcastEncodings = [{ maxBitrate: 40000, scaleResolutionDownBy: 2.0 }, { maxBitrate: 620000, scaleResolutionDownBy: 1.0 },];
         this.isDataChannelRequired = false;

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

@@ -253,12 +253,13 @@ var UserMediaHandler = /** @class */ (function (_super) {
     UserMediaHandler.prototype.onStreamGot = function (stream, isForAudio, isForVideo, shouldAddTrackImmediately) {
         var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function () {
-            var data, audioPause, data, audioPause;
+            var permissionApprovedFor, data, audioPause, data, audioPause;
             return __generator(this, function (_f) {
                 if (!stream || (isForAudio === false && isForVideo === false)) {
                     this.isVideoAudioFetchInProgress = false;
                     return [2 /*return*/];
                 }
+                permissionApprovedFor = [];
                 if (isForAudio && stream.getAudioTracks().length > 0) {
                     this.onTrack(stream.getAudioTracks()[0], TrackKind.Audio, shouldAddTrackImmediately);
                     // removeAndStreamInLocalStream(stream.getAudioTracks()[0])
@@ -279,6 +280,7 @@ var UserMediaHandler = /** @class */ (function (_super) {
                         && 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);
                 }
                 if (isForVideo && stream.getVideoTracks().length > 0) {
                     this.onTrack(stream.getVideoTracks()[0], TrackKind.Video, shouldAddTrackImmediately);
@@ -300,24 +302,31 @@ var UserMediaHandler = /** @class */ (function (_super) {
                         && 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);
                 }
                 this.isVideoAudioFetchInProgress = false;
-                (_e = this.communicationHandler) === null || _e === void 0 ? void 0 : _e.emitMessageToSource(VaniEvent.OnPermissionApproved, {});
+                (_e = this.communicationHandler) === null || _e === void 0 ? void 0 : _e.emitMessageToSource(VaniEvent.OnPermissionApproved, permissionApprovedFor);
                 this.registerForDeviceChange();
                 return [2 /*return*/];
             });
         });
     };
     UserMediaHandler.prototype.onScreenShareStreamGot = function (stream, shouldAddTrackImmediately) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
+            var permissionApprovedFor;
+            return __generator(this, function (_b) {
+                permissionApprovedFor = [];
                 if (stream.getVideoTracks().length > 0) {
                     this.onTrack(stream.getVideoTracks()[0], TrackKind.ScreenshareVideo, shouldAddTrackImmediately);
+                    permissionApprovedFor.push(TrackKind.ScreenshareVideo);
                 }
                 if (stream.getAudioTracks().length > 0) {
                     this.onTrack(stream.getAudioTracks()[0], TrackKind.ScreenshareAudio, shouldAddTrackImmediately);
+                    permissionApprovedFor.push(TrackKind.ScreenshareAudio);
                 }
                 this.isScreenShareFetchInProgress = false;
+                (_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.emitMessageToSource(VaniEvent.OnPermissionApproved, permissionApprovedFor);
                 return [2 /*return*/];
             });
         });

package/lib/utility/DynamicLibHelper.d.ts

@@ -1,9 +1,8 @@
 import { MeetingStartRequest, MeetingType } from '..';
 import { CommunicationHandler } from '../inter-communication-handler/CommunicationHandler';
-import { SFUHandler } from '../video-call-handler/SFUHandler';
 export declare class DynamicLibHelper {
     getReactNativeWebrtcPlugin(meetingStartRequest: MeetingStartRequest): Promise<any>;
-    getVideoCallClassHandler(meetingType: MeetingType, meetingStartRequest: MeetingStartRequest, _communicationHandler: CommunicationHandler): Promise<SFUHandler | import("../video-call-handler/WebrtcHandler").WebrtcHandler | undefined>;
+    getVideoCallClassHandler(meetingType: MeetingType, meetingStartRequest: MeetingStartRequest, _communicationHandler: CommunicationHandler): Promise<import("../video-call-handler/SFUHandler").SFUHandler | import("../video-call-handler/WebrtcHandler").WebrtcHandler | undefined>;
     getMediaDevicesVariable(meetingStartRequest: MeetingStartRequest): any;
     getMediaStreamVariable(meetingStartRequest: MeetingStartRequest): any;
 }

package/lib/utility/DynamicLibHelper.js

@@ -36,7 +36,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { MeetingType } from '..';
 import * as log from 'loglevel';
-import { SFUHandler } from '../video-call-handler/SFUHandler';
 var DynamicLibHelper = /** @class */ (function () {
     function DynamicLibHelper() {
     }
@@ -62,18 +61,21 @@ var DynamicLibHelper = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (meetingType === MeetingType.SFU) {
-                            baseVideoCallHandler = SFUHandler;
-                            if (baseVideoCallHandler) {
-                                return [2 /*return*/, new baseVideoCallHandler(meetingStartRequest, _communicationHandler)];
-                            }
+                        if (!(meetingType === MeetingType.SFU)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, import("../video-call-handler/SFUHandler")];
+                    case 1:
+                        baseVideoCallHandler = _a.sent();
+                        if (baseVideoCallHandler) {
+                            return [2 /*return*/, new baseVideoCallHandler.SFUHandler(meetingStartRequest, _communicationHandler)];
                         }
-                        if (!(meetingType === MeetingType.WEBRTC)) return [3 /*break*/, 2];
+                        _a.label = 2;
+                    case 2:
+                        if (!(meetingType === MeetingType.WEBRTC)) return [3 /*break*/, 4];
                         baseVideoCallHandler = import("../video-call-handler/WebrtcHandler");
-                        if (!baseVideoCallHandler) return [3 /*break*/, 2];
+                        if (!baseVideoCallHandler) return [3 /*break*/, 4];
                         return [4 /*yield*/, baseVideoCallHandler];
-                    case 1: return [2 /*return*/, new (_a.sent()).WebrtcHandler(meetingStartRequest, _communicationHandler)];
-                    case 2: return [2 /*return*/, undefined];
+                    case 3: return [2 /*return*/, new (_a.sent()).WebrtcHandler(meetingStartRequest, _communicationHandler)];
+                    case 4: return [2 /*return*/, undefined];
                 }
             });
         });

package/lib/video-call-handler/SFUHandler.js

@@ -79,16 +79,15 @@ var SFUHandler = /** @class */ (function (_super) {
         _this.dataConsumer = [];
         var handlerName = detectDevice();
         if (handlerName) {
+            _this.device = new Device();
             console.log("detected handler: %s", handlerName);
         }
         else {
+            if (_this.meetingStartRequest && _this.meetingStartRequest.mediasoupDeviceHandlerName) {
+                _this.device = new Device({ handlerName: _this.meetingStartRequest.mediasoupDeviceHandlerName });
+            }
             console.warn("no suitable handler found for current browser/device");
         }
-        try {
-            _this.device = new Device();
-        }
-        catch (err) {
-        }
         return _this;
     }
     SFUHandler.prototype.onReconnect = function () {

package/package.json

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