vani-meeting-client 2.2.2 → 2.2.3-beta1

package/lib/MeetingHandler.d.ts

@@ -15,6 +15,7 @@ export declare class MeetingHandler {
     meetingStartRequestObject(roomId: string, userId: string, appId: string, wssUrl: string, shouldIgnoreCaseForRoomId?: boolean): MeetingStartRequest;
     endAndDestory(): void;
     cleanupWebsocket: () => void;
+    isWebSocketInPreConnect: () => boolean;
     requestToCloseTheRoom: () => void;
     preconnect: (url: string) => Promise<void>;
     init(): Promise<boolean>;

package/lib/MeetingHandler.js

@@ -55,6 +55,13 @@ var MeetingHandler = /** @class */ (function () {
             catch (err) {
             }
         };
+        this.isWebSocketInPreConnect = function () {
+            var _a;
+            if (_this.websocketCallHandler) {
+                return (_a = _this.websocketCallHandler) === null || _a === void 0 ? void 0 : _a.isWebSocketInPreConnect();
+            }
+            return false;
+        };
         this.requestToCloseTheRoom = function () {
             var _a;
             (_a = _this.communicationHandler) === null || _a === void 0 ? void 0 : _a.requestToCloseTheRoom();
@@ -476,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,7 @@ export declare class Participant {
     isAudioEnable: boolean;
     isStartMeetingCalled: boolean;
     isRecordingUser: boolean;
-    peerConnections: Map<string, PeerConnection>;
+    private peerConnections;
+    getPeerConnections: () => Map<string, PeerConnection>;
     constructor(_userId: string, _roomId: string, _userData?: any, _isAdmin?: boolean);
 }

package/lib/model/Participant.js

@@ -2,6 +2,7 @@ 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 +14,12 @@ 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.userId = _userId;
         this.roomId = _roomId;
         this.userData = _userData;

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

@@ -69,16 +69,17 @@ var WebrtcHandler = /** @class */ (function (_super) {
         return _this;
     }
     WebrtcHandler.prototype.onParticipantUpdated = function () {
-        throw new Error("Method not implemented.");
+        console.log("onParticipantUpdated");
+        // throw new Error("Method not implemented.");
     };
     WebrtcHandler.prototype.resumeIncomingTrack = function (track) {
-        throw new Error("Method not implemented.");
+        // throw new Error("Method not implemented.");
     };
     WebrtcHandler.prototype.pauseIncomingTrack = function (track) {
-        throw new Error("Method not implemented.");
+        // throw new Error("Method not implemented.");
     };
     WebrtcHandler.prototype.onSocketMessage = function (websocketCallHandler) {
-        throw new Error("Method not implemented.");
+        // throw new Error("Method not implemented.");
     };
     WebrtcHandler.prototype.onAllParticipants = function (participants) {
         return __awaiter(this, void 0, void 0, function () {
@@ -98,13 +99,16 @@ var WebrtcHandler = /** @class */ (function (_super) {
                 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);
+                        debugger;
+                        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());
+                        if (!selfParticpant.getPeerConnections().has(participant.userId)) {
+                            selfParticpant.getPeerConnections().set(participant.userId, new PeerConnection());
                         }
-                        peerConnectionObject = selfParticpant.peerConnections.get(participant.userId);
+                        peerConnectionObject = selfParticpant.getPeerConnections().get(participant.userId);
                         peerConnection = this.dynamicLibHelper.getRTCPeerConnection(this.meetingStartRequest);
                         if (!peerConnection) return [3 /*break*/, 2];
                         peerConnection.addTransceiver("audio", { direction: "sendrecv" });

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

@@ -92,10 +92,12 @@ export declare class WebsocketHandler extends Base {
     private setUpTry;
     private pongData;
     private lastPingTimeStamp;
+    private isNormalConnectionCalledWhileInPreconnectProcess;
     protected onObjectCreated(): void;
     cleanup(): Promise<void>;
     startSocketConnection(isForPreConnect?: boolean, url?: string): Promise<void>;
     private connect;
+    isWebSocketInPreConnect(): boolean;
     isWebScoketConnectedWithoutSetup(): boolean;
     isWebScoketConnected(): boolean;
     sendSocketMessage(type: WebSocketEvents, data: any): void;

package/lib/websocket-handler/WebsocketHandler.js

@@ -147,6 +147,7 @@ var WebsocketHandler = /** @class */ (function (_super) {
         _this.setUpTry = 0;
         _this.pongData = undefined;
         _this.lastPingTimeStamp = 0;
+        _this.isNormalConnectionCalledWhileInPreconnectProcess = false;
         _this.onCloseTheRoomForcefully = function (data) { return __awaiter(_this, void 0, void 0, function () {
             var _a, _b;
             return __generator(this, function (_c) {
@@ -177,6 +178,7 @@ var WebsocketHandler = /** @class */ (function (_super) {
                 }
                 catch (err) {
                 }
+                this.isNormalConnectionCalledWhileInPreconnectProcess = false;
                 this.loadBalancerIpAddressForWebSocket = undefined;
                 this.isEnded = true;
                 if (this.wss) {
@@ -248,6 +250,9 @@ var WebsocketHandler = /** @class */ (function (_super) {
             var _this = this;
             return __generator(this, function (_d) {
                 if (this.isEnded === true || this.isWebSocketConnectionInProgress) {
+                    if (!isForPreConnect) {
+                        this.isNormalConnectionCalledWhileInPreconnectProcess = true;
+                    }
                     return [2 /*return*/];
                 }
                 if (!this.wss || (isForceFully && this.isWebScoketConnectedWithoutSetup() === false)) {
@@ -273,7 +278,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;
@@ -290,9 +294,13 @@ var WebsocketHandler = /** @class */ (function (_super) {
                             _this.isSetUpDone = false;
                             _this.websocketConnectionUrl = url_1;
                             _this.socketCheckTimeout = undefined;
-                            if (!isForPreConnect) {
+                            if (!isForPreConnect || _this.isNormalConnectionCalledWhileInPreconnectProcess) {
                                 _this.onSocketConnected();
                             }
+                            else {
+                                console.log("WebSocket connected in pre connect");
+                            }
+                            _this.isNormalConnectionCalledWhileInPreconnectProcess = false;
                         };
                         this.wss.onmessage = function (event) {
                             _this.isWebSocketConnectionInProgress = false;
@@ -313,7 +321,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.");
@@ -332,6 +339,12 @@ var WebsocketHandler = /** @class */ (function (_super) {
             });
         });
     };
+    WebsocketHandler.prototype.isWebSocketInPreConnect = function () {
+        if (this.wss && this.wss.readyState === 1 && !this.isSetUpDone) {
+            return true;
+        }
+        return false;
+    };
     WebsocketHandler.prototype.isWebScoketConnectedWithoutSetup = function () {
         var _a;
         if (this.wss && this.wss.readyState === 1) {

package/package.json

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