vani-meeting-client 2.2.3-beta → 2.2.3-beta10

package/lib/MeetingHandler.js

@@ -483,7 +483,6 @@ var MeetingHandler = /** @class */ (function () {
     MeetingHandler.prototype.checkSocket = function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                debugger;
                 if (!this.meetingStartRequest) {
                     log.error("meetingStartRequestObject not found");
                     return [2 /*return*/, false];

package/lib/model/Participant.d.ts

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

package/lib/model/Participant.js

@@ -1,7 +1,9 @@
+import { PeerConnection } from "./PeerConnection";
 var Participant = /** @class */ (function () {
     function Participant(_userId, _roomId, _userData, _isAdmin) {
         if (_userData === void 0) { _userData = {}; }
         if (_isAdmin === void 0) { _isAdmin = false; }
+        var _this = this;
         this.isAdmin = false;
         this.isAudioBlockedByAdmin = false;
         this.isVideoBlockedByAdmin = false;
@@ -13,6 +15,18 @@ var Participant = /** @class */ (function () {
         this.isStartMeetingCalled = false;
         this.isRecordingUser = false;
         this.peerConnections = new Map();
+        this.getPeerConnections = function () {
+            if (!_this.peerConnections) {
+                _this.peerConnections = new Map();
+            }
+            return _this.peerConnections;
+        };
+        this.getPeerConnectionsViaUserId = function (userId) {
+            if (!_this.getPeerConnections().has(userId)) {
+                _this.getPeerConnections().set(userId, new PeerConnection());
+            }
+            return _this.getPeerConnections().get(userId);
+        };
         this.userId = _userId;
         this.roomId = _roomId;
         this.userData = _userData;

package/lib/model/PeerConnection.d.ts

@@ -1,6 +1,8 @@
 export declare class PeerConnection {
     rtcPeerConnection: any;
     offer: any;
+    remoteOffer: any;
     answer: any;
+    remoteAnswer: any;
     userId: string;
 }

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

@@ -8,8 +8,19 @@ export declare class WebrtcHandler extends BaseVideoCallHandler {
     resumeIncomingTrack(track: Track): void;
     pauseIncomingTrack(track: Track): void;
     onSocketMessage(websocketCallHandler: WebSocketMessageBody): void;
+    onNewOffer: (data: {
+        sdp: string;
+        type: string;
+        sender: Participant;
+    }) => Promise<void>;
+    onNewAnswer: (data: {
+        sdp: string;
+        type: string;
+        sender: Participant;
+    }) => Promise<void>;
     onAllParticipants(participants: Participant[]): Promise<void>;
     onUserJoined(participant: Participant): Promise<void>;
+    private sendWebrtcMessage;
     init(): Promise<void>;
     onReconnect(): Promise<void>;
     stopTrack(track: Track): void;

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

@@ -49,16 +49,65 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+import { WebrtcMessageType } from "../websocket-handler/WebsocketHandler";
 import { BaseVideoCallHandler } from "./BaseVideoCallHandler";
 import log from 'loglevel';
 import { LogLevel } from "../model/MeetingStartRequest";
 import { DynamicLibHelper } from "../utility/DynamicLibHelper";
-import { PeerConnection } from "../model/PeerConnection";
 var WebrtcHandler = /** @class */ (function (_super) {
     __extends(WebrtcHandler, _super);
     function WebrtcHandler() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.dynamicLibHelper = (new DynamicLibHelper());
+        _this.onNewOffer = function (data) { return __awaiter(_this, void 0, void 0, function () {
+            var selfParticpant, participant, peerConnectionObject, peerConnection, answer, messageJson;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        selfParticpant = this.communicationHandler.getSelfParticipant();
+                        participant = data.sender;
+                        peerConnectionObject = selfParticpant.getPeerConnectionsViaUserId(participant.userId);
+                        if (peerConnectionObject) {
+                            peerConnectionObject.remoteOffer = data.sdp;
+                        }
+                        peerConnection = peerConnectionObject.rtcPeerConnection ? peerConnectionObject.rtcPeerConnection : this.dynamicLibHelper.getRTCPeerConnection(this.meetingStartRequest);
+                        if (!peerConnection) return [3 /*break*/, 2];
+                        peerConnection.setRemoteDescription(peerConnectionObject.remoteOffer);
+                        peerConnection.addTransceiver("audio", { direction: "sendrecv" });
+                        peerConnection.addTransceiver("video", { direction: "sendrecv" });
+                        return [4 /*yield*/, peerConnection.createAnswer()];
+                    case 1:
+                        answer = _a.sent();
+                        peerConnection.setLocalDescription(answer);
+                        peerConnectionObject.answer = answer;
+                        peerConnectionObject.rtcPeerConnection = peerConnection;
+                        console.log("answer", answer);
+                        messageJson = { to: participant.userId, type: WebrtcMessageType.SendAnswer, data: answer };
+                        this.sendWebrtcMessage(messageJson);
+                        _a.label = 2;
+                    case 2: return [2 /*return*/];
+                }
+            });
+        }); };
+        _this.onNewAnswer = function (data) { return __awaiter(_this, void 0, void 0, function () {
+            var selfParticpant, participant, peerConnectionObject, peerConnection;
+            return __generator(this, function (_a) {
+                selfParticpant = this.communicationHandler.getSelfParticipant();
+                participant = data.sender;
+                peerConnectionObject = selfParticpant.getPeerConnectionsViaUserId(participant.userId);
+                if (peerConnectionObject) {
+                    peerConnectionObject.remoteAnswer = data.sdp;
+                }
+                peerConnection = peerConnectionObject.rtcPeerConnection ? peerConnectionObject.rtcPeerConnection : this.dynamicLibHelper.getRTCPeerConnection(this.meetingStartRequest);
+                if (peerConnection) {
+                    peerConnection.setRemoteDescription(peerConnectionObject.remoteAnswer);
+                }
+                return [2 /*return*/];
+            });
+        }); };
+        _this.sendWebrtcMessage = function (data) {
+            _this.communicationHandler.sendWebSocketMessage(WebrtcMessageType.WebrtcMessage, data);
+        };
         _this.isOfferInitParticipant = function (participant) {
             var selfParticpant = _this.communicationHandler.getSelfParticipant();
             if (participant.userId > selfParticpant.userId) {
@@ -79,6 +128,27 @@ var WebrtcHandler = /** @class */ (function (_super) {
         // throw new Error("Method not implemented.");
     };
     WebrtcHandler.prototype.onSocketMessage = function (websocketCallHandler) {
+        var _a;
+        console.log("websocketCallHandler", websocketCallHandler);
+        var data = websocketCallHandler.data;
+        if (websocketCallHandler.data.message) {
+            data = websocketCallHandler.data.message;
+        }
+        if (data.sender && data.sender._id) {
+            var participant = this.communicationHandler.participantByUserId(data.sender._id);
+            if (!participant) {
+                data.sender = (_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.addParticipantIfNotExist(data.sender, false);
+            }
+            else {
+                data.sender = participant;
+            }
+        }
+        if (websocketCallHandler.type === WebrtcMessageType.SendOffer) {
+            this.onNewOffer(data);
+        }
+        else if (websocketCallHandler.type === WebrtcMessageType.SendAnswer) {
+            this.onNewAnswer(data);
+        }
         // throw new Error("Method not implemented.");
     };
     WebrtcHandler.prototype.onAllParticipants = function (participants) {
@@ -94,20 +164,18 @@ var WebrtcHandler = /** @class */ (function (_super) {
     };
     WebrtcHandler.prototype.onUserJoined = function (participant) {
         return __awaiter(this, void 0, void 0, function () {
-            var selfParticpant, isOfferInitParticipant, peerConnectionObject, peerConnection, offer;
+            var selfParticpant, isOfferInitParticipant, peerConnectionObject, peerConnection, offer, messageJson;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         selfParticpant = this.communicationHandler.getSelfParticipant();
-                        if (!(selfParticpant.userId !== participant.userId && !selfParticpant.peerConnections.has(participant.userId))) return [3 /*break*/, 2];
+                        console.log(selfParticpant);
+                        if (!(selfParticpant.userId !== participant.userId && !selfParticpant.getPeerConnections().has(participant.userId))) return [3 /*break*/, 2];
                         console.log("onUserJoined ", participant);
                         isOfferInitParticipant = this.isOfferInitParticipant(participant);
                         if (!!isOfferInitParticipant) return [3 /*break*/, 2];
-                        if (!selfParticpant.peerConnections.has(participant.userId)) {
-                            selfParticpant.peerConnections.set(participant.userId, new PeerConnection());
-                        }
-                        peerConnectionObject = selfParticpant.peerConnections.get(participant.userId);
-                        peerConnection = this.dynamicLibHelper.getRTCPeerConnection(this.meetingStartRequest);
+                        peerConnectionObject = selfParticpant.getPeerConnectionsViaUserId(participant.userId);
+                        peerConnection = peerConnectionObject.rtcPeerConnection ? peerConnectionObject.rtcPeerConnection : this.dynamicLibHelper.getRTCPeerConnection(this.meetingStartRequest);
                         if (!peerConnection) return [3 /*break*/, 2];
                         peerConnection.addTransceiver("audio", { direction: "sendrecv" });
                         peerConnection.addTransceiver("video", { direction: "sendrecv" });
@@ -116,8 +184,11 @@ var WebrtcHandler = /** @class */ (function (_super) {
                         offer = _a.sent();
                         peerConnection.setLocalDescription(offer);
                         peerConnectionObject.offer = offer;
+                        peerConnectionObject.rtcPeerConnection = peerConnection;
                         // send offer to peer
                         console.log("offer", offer);
+                        messageJson = { to: participant.userId, type: WebrtcMessageType.SendOffer, data: offer };
+                        this.sendWebrtcMessage(messageJson);
                         _a.label = 2;
                     case 2: return [2 /*return*/];
                 }
@@ -136,16 +207,16 @@ var WebrtcHandler = /** @class */ (function (_super) {
         throw new Error("Method not implemented.");
     };
     WebrtcHandler.prototype.stopTrack = function (track) {
-        throw new Error("Method not implemented.");
+        // throw new Error("Method not implemented.");
     };
     WebrtcHandler.prototype.pauseTrack = function (track) {
-        throw new Error("Method not implemented.");
+        // throw new Error("Method not implemented.");
     };
     WebrtcHandler.prototype.resumeTrack = function (track) {
-        throw new Error("Method not implemented.");
+        // throw new Error("Method not implemented.");
     };
     WebrtcHandler.prototype.sendTrack = function (track) {
-        throw new Error("Method not implemented.");
+        // throw new Error("Method not implemented.");
     };
     WebrtcHandler.prototype.createDataChannel = function () {
         return __awaiter(this, void 0, void 0, function () {
@@ -155,7 +226,7 @@ var WebrtcHandler = /** @class */ (function (_super) {
         });
     };
     WebrtcHandler.prototype.sendMessageViaDataChannel = function (messagePayload) {
-        throw new Error('Method not implemented.');
+        // throw new Error('Method not implemented.');
     };
     return WebrtcHandler;
 }(BaseVideoCallHandler));

package/lib/websocket-handler/WebsocketHandler.d.ts

@@ -32,6 +32,7 @@ export declare enum WebSocketBasicEvents {
 }
 export declare enum WebrtcMessageType {
     SendOffer = "SendOffer",
+    WebrtcMessage = "WebrtcMessage",
     SendAnswer = "SendAnswer"
 }
 export declare enum SFUMessageType {

package/lib/websocket-handler/WebsocketHandler.js

@@ -88,6 +88,7 @@ export var WebSocketBasicEvents;
 export var WebrtcMessageType;
 (function (WebrtcMessageType) {
     WebrtcMessageType["SendOffer"] = "SendOffer";
+    WebrtcMessageType["WebrtcMessage"] = "WebrtcMessage";
     WebrtcMessageType["SendAnswer"] = "SendAnswer";
 })(WebrtcMessageType || (WebrtcMessageType = {}));
 export var SFUMessageType;
@@ -278,7 +279,6 @@ var WebsocketHandler = /** @class */ (function (_super) {
                     if (!url_1.includes("connection=")) {
                         url_1 = url_1 + "/?connection=";
                     }
-                    debugger;
                     if (url_1) {
                         this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && log.info("Connecting to ", url_1);
                         this.isWebSocketConnectionInProgress = true;
@@ -322,7 +322,6 @@ var WebsocketHandler = /** @class */ (function (_super) {
                             }
                         };
                         this.wss.onclose = function (event) {
-                            debugger;
                             _this.isSetUpDone = false;
                             _this.isWebSocketConnectionInProgress = false;
                             _this.meetingStartRequest && _this.meetingStartRequest.logLevel === LogLevel.Debug && ("WebSocket is closed now.");
@@ -489,6 +488,7 @@ var WebsocketHandler = /** @class */ (function (_super) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         this.lastPingTimeStamp = new Date().getTime();
         // this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && console.log("lastPingTimeStamp time ", this.lastPingTimeStamp)
+        console.log("message", message);
         var messagejson = JSON.parse(message);
         if (messagejson.type && messagejson.data) {
             var type = messagejson.type;
@@ -612,9 +612,13 @@ var WebsocketHandler = /** @class */ (function (_super) {
         }
     };
     WebsocketHandler.prototype.isVideoCallControllerMessageType = function (type) {
+        console.log("isVideoCallControllerMessageType", type);
         if (Object.values(SFUMessageType).includes(type)) {
             return true;
         }
+        else if (Object.values(WebrtcMessageType).includes(type)) {
+            return true;
+        }
         return false;
     };
     return WebsocketHandler;

package/package.json

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