vani-meeting-client 2.3.0 → 2.3.1

package/lib/MeetingHandler.js

@@ -429,6 +429,7 @@ var MeetingHandler = /** @class */ (function () {
     };
     MeetingHandler.prototype.getUpdatedParticipantsListFromServer = function () {
         var _a;
+        this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && console.log("getUpdatedParticipantsListFromServer", this.communicationHandler);
         (_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.downloadParticipantsData();
     };
     MeetingHandler.prototype.getAllParticipants = function () {

package/lib/inter-communication-handler/CommunicationHandler.d.ts

@@ -17,6 +17,7 @@ export declare class CommunicationHandler {
     private meetingHandler?;
     private internetReachbilityTimeout?;
     private isReachable;
+    private isServerVerifiedIfStartMeetingCalled;
     constructor(meetingHandler: MeetingHandler);
     setMeetingStartRequest(_meetingStartRequest: MeetingStartRequest): void;
     setWebsocketCallHandler(_websocketCallHandler: WebsocketHandler): void;
@@ -57,7 +58,8 @@ export declare class CommunicationHandler {
     sendWebSocketMessage(type: WebSocketEvents, data: any): void;
     onVideoCallWebSocketMessage(websocketMessage: WebSocketMessageBody): Promise<void>;
     onReconnect(shouldInfromVideoCallHandler?: boolean): Promise<void>;
-    onStartMeeingCalled(): boolean;
+    onStartMeeingCalled(isForceFully?: boolean): boolean;
+    checkIfStartMeetingUpdatedOnServer: () => Promise<void>;
     onAudioBlocked(data: any): void;
     onAudioUnblocked(data: any): void;
     onVideoBlocked(data: any): void;

package/lib/inter-communication-handler/CommunicationHandler.js

@@ -67,6 +67,7 @@ var CommunicationHandler = /** @class */ (function () {
         this.allTracks = [];
         this.allSelfTracksForRestartSFU = undefined;
         this.isReachable = true;
+        this.isServerVerifiedIfStartMeetingCalled = false;
         this.refetchTrackForParticipant = function (participant) { return __awaiter(_this, void 0, void 0, function () {
             var _a;
             return __generator(this, function (_b) {
@@ -107,6 +108,29 @@ var CommunicationHandler = /** @class */ (function () {
                 return [2 /*return*/];
             });
         }); };
+        this.checkIfStartMeetingUpdatedOnServer = function () { return __awaiter(_this, void 0, void 0, function () {
+            var _this = this;
+            var _a;
+            return __generator(this, function (_b) {
+                if (this.isServerVerifiedIfStartMeetingCalled) {
+                    (_a = this.videoCallHandler) === null || _a === void 0 ? void 0 : _a.init();
+                    return [2 /*return*/];
+                }
+                this.downloadParticipantsData();
+                setTimeout(function () {
+                    var _a;
+                    if (_this.isServerVerifiedIfStartMeetingCalled) {
+                        (_a = _this.videoCallHandler) === null || _a === void 0 ? void 0 : _a.init();
+                        return;
+                    }
+                    _this.onStartMeeingCalled(true);
+                    _this.meetingStartRequest &&
+                        _this.meetingStartRequest.logLevel === LogLevel.Debug &&
+                        console.log("checkIfStartMeetingUpdatedOnServer", _this.isServerVerifiedIfStartMeetingCalled);
+                }, 1000);
+                return [2 /*return*/];
+            });
+        }); };
         //Connection Recheck
         this.destoryRoomForcefully = function () {
             var _a;
@@ -276,19 +300,25 @@ var CommunicationHandler = /** @class */ (function () {
     };
     CommunicationHandler.prototype.downloadParticipantsData = function () {
         var _a;
+        this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && console.log("downloadParticipantsData");
         var obj = { type: WebSocketBasicEvents.GetAllParticipant, message: "" };
         (_a = this.websocketCallHandler) === null || _a === void 0 ? void 0 : _a.sendSocketMessage(WebSocketBasicEvents.GetAllParticipant, obj);
     };
     CommunicationHandler.prototype.onServerParticipants = function (data) {
         var _this = this;
         var _a;
-        this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && console.log(data);
+        this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && console.log("onServerParticipants", data);
         if (data && data.message) {
-            var userIds = "";
+            // var userIds = "";
             Object.entries(data.message).forEach(function (_a) {
-                var _b = __read(_a, 2), userId = _b[0], participant = _b[1];
-                userIds = userIds + " " + userId;
+                var _b;
+                var _c = __read(_a, 2), userId = _c[0], participant = _c[1];
+                // userIds = userIds + " " + userId
                 _this.meetingStartRequest && _this.meetingStartRequest.logLevel === LogLevel.Debug && console.log("addParticipantIfNotExist from onServerParticipants", data);
+                var localParticipant = participant;
+                if (localParticipant && localParticipant.userId === ((_b = _this.meetingStartRequest) === null || _b === void 0 ? void 0 : _b.userId) && localParticipant.isStartMeetingCalled) {
+                    _this.isServerVerifiedIfStartMeetingCalled = true;
+                }
                 _this.addParticipantIfNotExist(participant, false);
             });
             // const allParticiapntsToBeRemove = this.allParticipants.filter(participant => (userIds.includes(participant.userId) === false))
@@ -327,8 +357,9 @@ var CommunicationHandler = /** @class */ (function () {
                 this.emitMessageToSource(VaniEvent.OnParticipantDataUpdated, oldParticipant);
             }
             this.updateParticipantAudioVideoDataAccordingToTrack(oldParticipant);
+            (_a = this.videoCallHandler) === null || _a === void 0 ? void 0 : _a.onParticipantUpdated();
             try {
-                if (oldParticipant.userId === ((_a = this.meetingStartRequest) === null || _a === void 0 ? void 0 : _a.userId)) {
+                if (oldParticipant.userId === ((_b = this.meetingStartRequest) === null || _b === void 0 ? void 0 : _b.userId)) {
                     this.meetingStartRequest.userData = oldParticipant.userData;
                 }
             }
@@ -340,18 +371,17 @@ var CommunicationHandler = /** @class */ (function () {
             participant = Object.assign(new Participant(participant.userId, participant.roomId, participant.userData, participant.isAdmin), participant);
             this.updateParticipantAudioVideoDataAccordingToTrack(participant);
             try {
-                if (participant.userId === ((_b = this.meetingStartRequest) === null || _b === void 0 ? void 0 : _b.userId)) {
+                if (participant.userId === ((_c = this.meetingStartRequest) === null || _c === void 0 ? void 0 : _c.userId)) {
                     this.meetingStartRequest.userData = participant.userData;
                 }
             }
             catch (err) {
             }
             this.allParticipants.push(participant);
-            (_c = this.videoCallHandler) === null || _c === void 0 ? void 0 : _c.onUserJoined(participant);
+            (_d = this.videoCallHandler) === null || _d === void 0 ? void 0 : _d.onUserJoined(participant);
             if (shouldInfrom) {
                 this.emitMessageToSource(VaniEvent.OnUserJoined, participant);
             }
-            (_d = this.videoCallHandler) === null || _d === void 0 ? void 0 : _d.onParticipantUpdated();
             return participant;
         }
     };
@@ -574,21 +604,24 @@ var CommunicationHandler = /** @class */ (function () {
             });
         });
     };
-    CommunicationHandler.prototype.onStartMeeingCalled = function () {
+    CommunicationHandler.prototype.onStartMeeingCalled = function (isForceFully) {
         var _a, _b, _c, _d;
-        if (this.isStartAndSetupWithServerCalled) {
+        if (isForceFully === void 0) { isForceFully = false; }
+        if (this.isStartAndSetupWithServerCalled && !isForceFully) {
             return;
         }
         if (!this.meetingStartRequest) {
-            log.warn("meetingStartRequestObject not found onStartMeeingCalled");
+            log.warn("meetingStartRequestObject not found onStartMeeingCalled", isForceFully);
             return false;
         }
         if (!this.websocketCallHandler) {
-            log.warn("Init method not called onStartMeeingCalled");
+            this.checkIfStartMeetingUpdatedOnServer();
+            log.warn("Init method not called onStartMeeingCalled", isForceFully);
             return false;
         }
         if (!this.websocketCallHandler.isWebScoketConnected()) {
-            log.warn("WEB SOCKET NOT CONNECTED");
+            this.checkIfStartMeetingUpdatedOnServer();
+            log.warn("WEB SOCKET NOT CONNECTED", isForceFully);
             return false;
         }
         this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && console.log("webrtc onStartAndSetupWithServerCalled client");
@@ -601,6 +634,7 @@ var CommunicationHandler = /** @class */ (function () {
             selfParticpant.isStartMeetingCalled = true;
         }
         (_d = this.videoCallHandler) === null || _d === void 0 ? void 0 : _d.init();
+        this.checkIfStartMeetingUpdatedOnServer();
     };
     CommunicationHandler.prototype.onAudioBlocked = function (data) {
         var _a, _b, _c;

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

@@ -393,13 +393,13 @@ var UserMediaHandler = /** @class */ (function (_super) {
                     }
                     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);
+                        this.onTrack(stream.getAudioTracks()[0], TrackKind.Audio, shouldAddTrackImmediately);
                         if (this.muteUmutePromiseResolver) {
                             this.muteUmutePromiseResolver({ message: "Success", error: 'NoError', isSuccess: true });
                             this.muteUmutePromiseResolver = undefined;
@@ -415,13 +415,13 @@ var UserMediaHandler = /** @class */ (function (_super) {
                         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);
+                        this.onTrack(stream.getVideoTracks()[0], TrackKind.Video, shouldAddTrackImmediately);
                         if (this.videoPauseResumePromiseResolver) {
                             this.videoPauseResumePromiseResolver({ message: "Success", error: 'NoError', isSuccess: true });
                             this.videoPauseResumePromiseResolver = undefined;
@@ -807,11 +807,17 @@ var UserMediaHandler = /** @class */ (function (_super) {
         if (track && track.track) {
             track.track.enabled = false;
             if (streamKind === TrackKind.Audio) {
+                if (this.communicationHandler) {
+                    this.communicationHandler.getSelfParticipant().isAudioEnable = false;
+                }
                 var data = { userId: (_b = this.meetingStartRequest) === null || _b === void 0 ? void 0 : _b.userId, type: "audio", status: "pause" };
                 var audioPause = { message: data, type: WebSocketBasicEvents.AudioVideoPauseResume };
                 this.communicationHandler.sendWebSocketMessage(WebSocketBasicEvents.AudioVideoPauseResume, audioPause);
             }
             else {
+                if (this.communicationHandler) {
+                    this.communicationHandler.getSelfParticipant().isVideoEnable = false;
+                }
                 var data = { userId: (_c = this.meetingStartRequest) === null || _c === void 0 ? void 0 : _c.userId, type: "video", status: "pause" };
                 var audioPause = { message: data, type: WebSocketBasicEvents.AudioVideoPauseResume };
                 this.communicationHandler.sendWebSocketMessage(WebSocketBasicEvents.AudioVideoPauseResume, audioPause);
@@ -828,11 +834,17 @@ var UserMediaHandler = /** @class */ (function (_super) {
         if (track && track.track) {
             track.track.enabled = true;
             if (streamKind === TrackKind.Audio) {
+                if (this.communicationHandler) {
+                    this.communicationHandler.getSelfParticipant().isAudioEnable = true;
+                }
                 var data = { userId: (_b = this.meetingStartRequest) === null || _b === void 0 ? void 0 : _b.userId, type: "audio", status: "resume" };
                 var audioPause = { message: data, type: WebSocketBasicEvents.AudioVideoPauseResume };
                 this.communicationHandler.sendWebSocketMessage(WebSocketBasicEvents.AudioVideoPauseResume, audioPause);
             }
             else {
+                if (this.communicationHandler) {
+                    this.communicationHandler.getSelfParticipant().isVideoEnable = true;
+                }
                 var data = { userId: (_c = this.meetingStartRequest) === null || _c === void 0 ? void 0 : _c.userId, type: "video", status: "resume" };
                 var audioPause = { message: data, type: WebSocketBasicEvents.AudioVideoPauseResume };
                 this.communicationHandler.sendWebSocketMessage(WebSocketBasicEvents.AudioVideoPauseResume, audioPause);

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

@@ -730,7 +730,7 @@ var WebrtcHandler = /** @class */ (function (_super) {
         };
         _this.isOfferInitParticipant = function (participant) {
             var selfParticpant = _this.communicationHandler.getSelfParticipant();
-            if (participant.userId > selfParticpant.userId) {
+            if (participant.userId < selfParticpant.userId) {
                 return true;
             }
             return false;
@@ -996,16 +996,22 @@ var WebrtcHandler = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_b) {
-                this.adaptationManager = new MediaAdaptationManager(function () { return _this.rtcPeerConnections.filter(Boolean); }, function () {
-                    var _a, _b;
-                    return (_b = (_a = _this.communicationHandler
-                        .getAllSelfTracks()
-                        .find(function (t) { var _a; return ((_a = t.track) === null || _a === void 0 ? void 0 : _a.kind) === 'video'; })) === null || _a === void 0 ? void 0 : _a.track) !== null && _b !== void 0 ? _b : null;
-                }, function (profile) {
-                    _this.printLogIfRequired('Network profile', profile);
-                    // Show UI banner: 'poor connection' / 'video paused' etc.
-                }, (_a = this.meetingStartRequest) === null || _a === void 0 ? void 0 : _a.deviceTier);
-                this.adaptationManager.start();
+                try {
+                    if (!this.adaptationManager) {
+                        this.adaptationManager = new MediaAdaptationManager(function () { return _this.rtcPeerConnections.filter(Boolean); }, function () {
+                            var _a, _b;
+                            return (_b = (_a = _this.communicationHandler
+                                .getAllSelfTracks()
+                                .find(function (t) { var _a; return ((_a = t.track) === null || _a === void 0 ? void 0 : _a.kind) === 'video'; })) === null || _a === void 0 ? void 0 : _a.track) !== null && _b !== void 0 ? _b : null;
+                        }, function (profile) {
+                            _this.printLogIfRequired('Network profile', profile);
+                            // Show UI banner: 'poor connection' / 'video paused' etc.
+                        }, (_a = this.meetingStartRequest) === null || _a === void 0 ? void 0 : _a.deviceTier);
+                        this.adaptationManager.start();
+                    }
+                }
+                catch (err) {
+                }
                 this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && this.printLogIfRequired(" Init", this.communicationHandler.getAllParticipants());
                 this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && this.printLogIfRequired("Webrtc Init");
                 this.communicationHandler.getAllParticipants().forEach(function (eachParticiapant) {

package/lib/websocket-handler/WebsocketHandler.js

@@ -373,6 +373,7 @@ var WebsocketHandler = /** @class */ (function (_super) {
         if (this.isWebScoketConnectedWithoutSetup()) {
             var paylod = { type: type, data: data };
             (_a = this.wss) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify(paylod));
+            console.log("sendSocketMessage", type, data);
         }
     };
     WebsocketHandler.prototype.reconnectOnInternetFailur = function () {
@@ -590,7 +591,7 @@ var WebsocketHandler = /** @class */ (function (_super) {
                 return;
             }
             else {
-                (_c = this.communicationHandler) === null || _c === void 0 ? void 0 : _c.emitMessageToSource(VaniEvent.OnConnected, {});
+                (_c = this.communicationHandler) === null || _c === void 0 ? void 0 : _c.emitMessageToSource(VaniEvent.OnSocketConnected, {});
             }
         }
         if (this.pingCheckTimeout) {

package/package.json

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