vani-meeting-client-native 0.4.6 → 0.4.7-beta2

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

@@ -573,6 +573,8 @@ var CommunicationHandler = /** @class */ (function () {
     CommunicationHandler.prototype.sendWebSocketMessage = function (type, data) {
         var _a;
         (_a = this.websocketCallHandler) === null || _a === void 0 ? void 0 : _a.sendSocketMessage(type, data);
+        // this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && 
+        // console.log("sendSocketMessage",type,data)
     };
     // public sendWebSocketMessageForWebrtc(type: WebrtcMessageType, data: any, to : string) {
     //     this.websocketCallHandler?.sendSocketMessage(type, data)

package/lib/model/Participant.d.ts

@@ -16,6 +16,8 @@ export declare class Participant {
     isRecordingUser: boolean;
     private peerConnections;
     getPeerConnections: () => Map<string, PeerConnection>;
+    isPeerConnectionsViaUserIdPresent: (userId: string) => PeerConnection;
+    removePeerConnectionsViaUserId: (userId: string) => boolean;
     getPeerConnectionsViaUserId: (userId: string, meetingStartRequest: MeetingStartRequest) => PeerConnection;
     constructor(_userId: string, _roomId: string, _userData?: any, _isAdmin?: boolean);
 }

package/lib/model/Participant.js

@@ -22,6 +22,12 @@ var Participant = /** @class */ (function () {
             }
             return _this.peerConnections;
         };
+        this.isPeerConnectionsViaUserIdPresent = function (userId) {
+            return _this.getPeerConnections().get(userId);
+        };
+        this.removePeerConnectionsViaUserId = function (userId) {
+            return _this.getPeerConnections().delete(userId);
+        };
         this.getPeerConnectionsViaUserId = function (userId, meetingStartRequest) {
             if (!_this.getPeerConnections().has(userId)) {
                 var peerConnection = new PeerConnection();

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

@@ -272,11 +272,11 @@ var SFUHandler = /** @class */ (function (_super) {
         });
     };
     SFUHandler.prototype.onRestartIceCandidateResponse = function (data) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
             var transportId, iceParameters;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         transportId = data.message.transportId;
                         iceParameters = data.message.iceParameters;
@@ -285,17 +285,17 @@ var SFUHandler = /** @class */ (function (_super) {
                         this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && console.log("Restat Ice consumer");
                         return [4 /*yield*/, this.consumerTransport.restartIce({ iceParameters: iceParameters })];
                     case 1:
-                        _b.sent();
+                        _c.sent();
                         return [3 /*break*/, 4];
                     case 2:
                         if (!(this.sendTransport && this.sendTransport.id === transportId)) return [3 /*break*/, 4];
                         this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && console.log("Restat Ice sender");
                         return [4 /*yield*/, this.sendTransport.restartIce({ iceParameters: iceParameters })];
                     case 3:
-                        _b.sent();
-                        _b.label = 4;
+                        _c.sent();
+                        _c.label = 4;
                     case 4:
-                        this.communicationHandler.onReconnect(false);
+                        (_b = this.communicationHandler) === null || _b === void 0 ? void 0 : _b.onReconnect(false);
                         return [2 /*return*/];
                 }
             });
@@ -670,8 +670,9 @@ var SFUHandler = /** @class */ (function (_super) {
         });
     };
     SFUHandler.prototype.onRouterRtpCapabilities = function (data) {
+        var _a;
         try {
-            if (this.getDevice() && this.getDevice().loaded) {
+            if (this.getDevice() && ((_a = this.getDevice()) === null || _a === void 0 ? void 0 : _a.loaded)) {
                 return;
             }
             if (data && data.message && data.message.rtpCapabilities) {

package/lib/video-call-handler/WebrtcHandler.d.ts

@@ -42,6 +42,7 @@ export declare class WebrtcHandler extends BaseVideoCallHandler {
     subToConnectionState: (remoteParticipant: Participant) => Promise<void>;
     onNegotiationNeeded: (remoteParticipant: Participant, shouldRestartIce?: boolean, count?: number, shouldForceFullyCreateOffer?: boolean) => Promise<void>;
     onAllParticipants(participants: Participant[]): Promise<void>;
+    onUserLeft(participant: Participant): Promise<void>;
     onUserJoined(participant: Participant): Promise<void>;
     startSendTrackToPartiipant: (participant: Participant) => Promise<void>;
     sendTrackToParticipant: (track: Track, participant: Participant) => Promise<void>;

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

@@ -162,11 +162,6 @@ var WebrtcHandler = /** @class */ (function (_super) {
                                 else if (realTrack.track.kind === 'video') {
                                     newTransceiver = peerConnection.rtcPeerConnection.addTransceiver(realTrack.track, {
                                         direction: 'sendonly',
-                                        sendEncodings: [{
-                                                maxBitrate: 500000,
-                                                priority: 'low',
-                                                networkPriority: 'low',
-                                            }]
                                     });
                                 }
                                 //  newTransceiver = await peerConnection.rtcPeerConnection.addTransceiver(realTrack.track, { direction: "sendrecv" })
@@ -257,6 +252,7 @@ var WebrtcHandler = /** @class */ (function (_super) {
                             // send offer to peer
                             peerConnectionObject.remoteAnswer = undefined;
                             this.loopSendOffer(peerConnectionObject, participant, mungedOffer);
+                            this.printLogIfRequired("CheckIfCanSendOffer", peerConnectionObject, selfParticpant);
                             _c.label = 5;
                         case 5: return [2 /*return*/];
                     }
@@ -266,10 +262,19 @@ var WebrtcHandler = /** @class */ (function (_super) {
         _this.loopSendOffer = function (peerConnectionObject, participant, mungedOffer, count) {
             if (count === void 0) { count = 0; }
             return __awaiter(_this, void 0, void 0, function () {
-                var messageJson;
+                var selfParticpant, messageJson;
                 var _this = this;
-                return __generator(this, function (_a) {
-                    this.printLogIfRequired("Send Offer", mungedOffer);
+                var _a;
+                return __generator(this, function (_b) {
+                    selfParticpant = (_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.getSelfParticipant();
+                    if (!selfParticpant) {
+                        return [2 /*return*/];
+                    }
+                    if (!selfParticpant.isPeerConnectionsViaUserIdPresent(participant.userId)) {
+                        this.printLogIfRequired("loopSendOffer", "Not found", selfParticpant, participant);
+                        return [2 /*return*/];
+                    }
+                    this.printLogIfRequired("Send Offer loop", mungedOffer, participant);
                     messageJson = { to: participant.userId, type: WebrtcMessageType.SendOffer, data: mungedOffer };
                     this.sendWebrtcMessage(messageJson);
                     if (peerConnectionObject.remoteAnswer || count > 20) {
@@ -561,10 +566,13 @@ var WebrtcHandler = /** @class */ (function (_super) {
                     }
                 });
                 rtcConnection.addEventListener('signalingstatechange', function (event) {
+                    var _a;
                     _this.printLogIfRequired("signalingstatechange", event, rtcConnection.signalingState);
-                    if (rtcConnection.signalingState === 'stable') {
-                        peerConnectionObject.isCreatingOffer = false;
-                        if (peerConnectionObject.isNegotiationNeeded) {
+                    var selfParticpant = (_a = _this.communicationHandler) === null || _a === void 0 ? void 0 : _a.getSelfParticipant();
+                    var innerPeerConnectionObject = selfParticpant === null || selfParticpant === void 0 ? void 0 : selfParticpant.isPeerConnectionsViaUserIdPresent(remoteParticipant.userId);
+                    if (innerPeerConnectionObject && rtcConnection.signalingState === 'stable') {
+                        innerPeerConnectionObject.isCreatingOffer = false;
+                        if (innerPeerConnectionObject.isNegotiationNeeded) {
                             _this.onNegotiationNeeded(remoteParticipant, false, 0, true);
                         }
                     }
@@ -579,13 +587,16 @@ var WebrtcHandler = /** @class */ (function (_super) {
                 //     }
                 // })
                 rtcConnection.addEventListener('negotiationneeded', function (event) {
-                    _this.printLogIfRequired("negotiationneeded", rtcConnection.signalingState, remoteParticipant);
-                    if (!peerConnectionObject.offer && !peerConnectionObject.answer) {
-                        _this.printLogIfRequired("negotiationneeded ignored", rtcConnection.signalingState, remoteParticipant);
+                    var _a;
+                    _this.printLogIfRequired("negotiationneeded", rtcConnection.signalingState, remoteParticipant, peerConnectionObject);
+                    var selfParticpant = (_a = _this.communicationHandler) === null || _a === void 0 ? void 0 : _a.getSelfParticipant();
+                    var innerPeerConnectionObject = selfParticpant === null || selfParticpant === void 0 ? void 0 : selfParticpant.isPeerConnectionsViaUserIdPresent(remoteParticipant.userId);
+                    if (!innerPeerConnectionObject || (!innerPeerConnectionObject.offer && !innerPeerConnectionObject.answer)) {
+                        _this.printLogIfRequired("negotiationneeded ignored", rtcConnection.signalingState, remoteParticipant, innerPeerConnectionObject, selfParticpant);
                         return;
                     }
-                    peerConnectionObject.isNegotiationNeeded = true;
-                    peerConnectionObject.negotiationId = new Date().getTime() + "_" + (Math.floor(Math.random() * 100) + 1);
+                    innerPeerConnectionObject.isNegotiationNeeded = true;
+                    innerPeerConnectionObject.negotiationId = new Date().getTime() + "_" + (Math.floor(Math.random() * 100) + 1);
                     if (rtcConnection.signalingState === 'stable') {
                         _this.onNegotiationNeeded(remoteParticipant, false, 0, true);
                     }
@@ -710,11 +721,12 @@ var WebrtcHandler = /** @class */ (function (_super) {
         }); };
         _this.sendTrackToParticipant = function (track, participant) { return __awaiter(_this, void 0, void 0, function () {
             var selfParticpant, peerConnection;
-            return __generator(this, function (_a) {
+            var _a;
+            return __generator(this, function (_b) {
                 if (!track.track) {
                     return [2 /*return*/];
                 }
-                selfParticpant = this.communicationHandler.getSelfParticipant();
+                selfParticpant = (_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.getSelfParticipant();
                 if (selfParticpant) {
                     peerConnection = selfParticpant.getPeerConnectionsViaUserId(participant.userId, this.meetingStartRequest);
                     if (peerConnection && peerConnection.rtcPeerConnection && peerConnection.rtcPeerConnection.signalingState === 'stable') {
@@ -832,13 +844,10 @@ var WebrtcHandler = /** @class */ (function (_super) {
             transceiver.sender.setParameters(params).catch(console.error);
         };
         _this.onNewTrack = function (track, receiver, transceiver, remoteParticipant) { return __awaiter(_this, void 0, void 0, function () {
-            var kind, t;
-            var _a;
-            return __generator(this, function (_b) {
-                this.printLogIfRequired('ontrack fired', track.kind, track.id);
+            var kind;
+            return __generator(this, function (_a) {
                 kind = track.kind.toLowerCase() === 'audio' ? TrackKind.Audio : TrackKind.Video;
-                t = new Track(remoteParticipant, false, kind, track);
-                (_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.addUpdateRemoteTrack(t, remoteParticipant, true);
+                this.registerTrack(track, remoteParticipant, kind);
                 return [2 /*return*/];
             });
         }); };
@@ -983,12 +992,13 @@ var WebrtcHandler = /** @class */ (function (_super) {
         // throw new Error("Method not implemented.");
     };
     WebrtcHandler.prototype.onAllParticipants = function (participants) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var selfParticpant;
             var _this = this;
-            return __generator(this, function (_a) {
-                selfParticpant = this.communicationHandler.getSelfParticipant();
-                if (selfParticpant.isStartMeetingCalled) {
+            return __generator(this, function (_b) {
+                selfParticpant = (_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.getSelfParticipant();
+                if (selfParticpant && selfParticpant.isStartMeetingCalled) {
                     participants.forEach(function (eachParticiapant) {
                         _this.onUserJoined(eachParticiapant);
                     });
@@ -997,6 +1007,28 @@ var WebrtcHandler = /** @class */ (function (_super) {
             });
         });
     };
+    WebrtcHandler.prototype.onUserLeft = function (participant) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function () {
+            var selfParticpant, peerConnection;
+            return __generator(this, function (_b) {
+                try {
+                    selfParticpant = (_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.getSelfParticipant();
+                    if (selfParticpant) {
+                        peerConnection = selfParticpant.isPeerConnectionsViaUserIdPresent(participant.userId);
+                        if (peerConnection) {
+                            peerConnection.rtcPeerConnection.close();
+                            selfParticpant.removePeerConnectionsViaUserId(participant.userId);
+                            this.printLogIfRequired("onUserLeft after", selfParticpant.getPeerConnections());
+                        }
+                    }
+                }
+                catch (err) {
+                }
+                return [2 /*return*/];
+            });
+        });
+    };
     WebrtcHandler.prototype.onUserJoined = function (participant) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {

package/lib/websocket-handler/WebsocketHandler.js

@@ -373,6 +373,8 @@ 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));
+            this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug &&
+                console.log("sendSocketMessage", type, JSON.stringify(paylod));
             // console.log("sendSocketMessage",type,data)
         }
     };

package/package.json

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