vani-meeting-client-native 0.2.0 → 0.2.2

package/lib/MeetingHandler.d.ts

@@ -14,7 +14,9 @@ export declare class MeetingHandler {
     private userMediaHandler?;
     meetingStartRequestObject(roomId: string, userId: string, appId: string, wssUrl: string, shouldIgnoreCaseForRoomId?: boolean): MeetingStartRequest;
     endAndDestory(): void;
+    cleanupWebsocket: () => void;
     requestToCloseTheRoom: () => void;
+    preconnect: (url: string) => Promise<void>;
     init(): Promise<boolean>;
     recreateVideoCallHandler: () => Promise<BaseVideoCallHandler>;
     switchCamera(): void;

package/lib/MeetingHandler.js

@@ -46,10 +46,28 @@ var MeetingHandler = /** @class */ (function () {
     function MeetingHandler() {
         var _this = this;
         this.communicationHandler = new CommunicationHandler(this);
+        this.cleanupWebsocket = function () {
+            var _a;
+            try {
+                (_a = _this.websocketCallHandler) === null || _a === void 0 ? void 0 : _a.cleanup();
+                _this.websocketCallHandler = undefined;
+            }
+            catch (err) {
+            }
+        };
         this.requestToCloseTheRoom = function () {
             var _a;
             (_a = _this.communicationHandler) === null || _a === void 0 ? void 0 : _a.requestToCloseTheRoom();
         };
+        this.preconnect = function (url) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                if (!this.websocketCallHandler) {
+                    this.websocketCallHandler = new WebsocketHandler(this.meetingStartRequest, this.communicationHandler);
+                }
+                this.websocketCallHandler.startSocketConnection(true, url);
+                return [2 /*return*/];
+            });
+        }); };
         this.recreateVideoCallHandler = function () { return __awaiter(_this, void 0, void 0, function () {
             var _a;
             var _b;
@@ -140,11 +158,19 @@ var MeetingHandler = /** @class */ (function () {
                         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;
+                        return [3 /*break*/, 5];
                     case 4:
+                        if (this.meetingStartRequest) {
+                            this.videoCallHandler.setMeetingRequest(this.meetingStartRequest);
+                        }
+                        _f.label = 5;
+                    case 5:
                         if (!this.websocketCallHandler) {
                             this.websocketCallHandler = new WebsocketHandler(this.meetingStartRequest, this.communicationHandler);
                         }
+                        else if (this.meetingStartRequest) {
+                            this.websocketCallHandler.setMeetingRequest(this.meetingStartRequest);
+                        }
                         // this.handleGA();
                         this.emitMessageToSource(VaniEvent.OnInitDone, {});
                         return [2 /*return*/, true];
@@ -450,6 +476,7 @@ 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/base/Base.d.ts

@@ -4,6 +4,7 @@ export declare abstract class Base {
     protected meetingStartRequest?: MeetingStartRequest;
     protected communicationHandler?: CommunicationHandler;
     constructor(_meetingStartRequest: MeetingStartRequest, _communicationHandler: CommunicationHandler);
+    setMeetingRequest: (_meetingStartRequest: MeetingStartRequest) => void;
     protected onObjectCreated(): void;
     cleanup(): void;
 }

package/lib/base/Base.js

@@ -1,5 +1,9 @@
 var Base = /** @class */ (function () {
     function Base(_meetingStartRequest, _communicationHandler) {
+        var _this = this;
+        this.setMeetingRequest = function (_meetingStartRequest) {
+            _this.meetingStartRequest = _meetingStartRequest;
+        };
         this.meetingStartRequest = _meetingStartRequest;
         this.communicationHandler = _communicationHandler;
         this.onObjectCreated();

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

@@ -201,7 +201,9 @@ var CommunicationHandler = /** @class */ (function () {
             userId = participant.userId.split("-").at(0);
         }
         catch (err) { }
-        participant.userId = userId + "_" + new Date().getTime();
+        if (this.meetingStartRequest && this.meetingStartRequest && this.meetingStartRequest.renewUserIdOnEveryReconnection) {
+            participant.userId = userId + "_" + new Date().getTime();
+        }
     };
     CommunicationHandler.prototype.getSelfParticipant = function () {
         var _a;
@@ -228,6 +230,7 @@ var CommunicationHandler = /** @class */ (function () {
     };
     CommunicationHandler.prototype.onServerParticipants = function (data) {
         var _this = this;
+        var _a;
         this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && log.info(data);
         if (data && data.message) {
             var userIds = "";
@@ -241,6 +244,7 @@ var CommunicationHandler = /** @class */ (function () {
             // allParticiapntsToBeRemove.forEach(participant => {
             //     this.removeParticipant(participant, true);
             // })
+            (_a = this.videoCallHandler) === null || _a === void 0 ? void 0 : _a.onAllParticipants(this.allParticipants);
             this.emitMessageToSource(VaniEvent.OnAllParticipants, this.allParticipants);
         }
     };
@@ -251,7 +255,7 @@ var CommunicationHandler = /** @class */ (function () {
         return this.allParticipants.find(function (participant) { return participant.userId === userId; });
     };
     CommunicationHandler.prototype.addParticipantIfNotExist = function (participant, shouldInfrom) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if (shouldInfrom === void 0) { shouldInfrom = false; }
         this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && console.log("addParticipantIfNotExist", this.allParticipants);
         this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && console.log("addParticipantIfNotExist new user", participant);
@@ -285,16 +289,17 @@ var CommunicationHandler = /** @class */ (function () {
             catch (err) {
             }
             this.allParticipants.push(participant);
+            (_c = this.videoCallHandler) === null || _c === void 0 ? void 0 : _c.onUserJoined(participant);
             if (shouldInfrom) {
                 this.emitMessageToSource(VaniEvent.OnUserJoined, participant);
             }
-            (_c = this.videoCallHandler) === null || _c === void 0 ? void 0 : _c.onParticipantUpdated();
+            (_d = this.videoCallHandler) === null || _d === void 0 ? void 0 : _d.onParticipantUpdated();
             return participant;
         }
     };
     CommunicationHandler.prototype.removeParticipant = function (participant, shouldInfrom) {
         var _this = this;
-        var _a;
+        var _a, _b;
         if (shouldInfrom === void 0) { shouldInfrom = false; }
         var tracks = this.getAllTracksForParticipant(participant);
         if (tracks) {
@@ -304,6 +309,7 @@ var CommunicationHandler = /** @class */ (function () {
         }
         Utility.deleteArrayObject(participant, this.allParticipants);
         (_a = this.videoCallHandler) === null || _a === void 0 ? void 0 : _a.onParticipantUpdated();
+        (_b = this.videoCallHandler) === null || _b === void 0 ? void 0 : _b.onUserLeft(participant);
         if (shouldInfrom) {
             this.emitMessageToSource(VaniEvent.OnUserLeft, participant);
         }
@@ -469,6 +475,9 @@ var CommunicationHandler = /** @class */ (function () {
         var _a;
         (_a = this.websocketCallHandler) === null || _a === void 0 ? void 0 : _a.sendSocketMessage(type, data);
     };
+    // public sendWebSocketMessageForWebrtc(type: WebrtcMessageType, data: any, to : string) {
+    //     this.websocketCallHandler?.sendSocketMessage(type, data)
+    // }
     CommunicationHandler.prototype.onVideoCallWebSocketMessage = function (websocketMessage) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {

package/lib/model/Participant.d.ts

@@ -1,3 +1,4 @@
+import { PeerConnection } from "./PeerConnection";
 export declare class Participant {
     userId: string;
     userData: any;
@@ -12,5 +13,6 @@ export declare class Participant {
     isAudioEnable: boolean;
     isStartMeetingCalled: boolean;
     isRecordingUser: boolean;
+    peerConnections: Map<string, PeerConnection>;
     constructor(_userId: string, _roomId: string, _userData?: any, _isAdmin?: boolean);
 }

package/lib/model/Participant.js

@@ -12,6 +12,7 @@ var Participant = /** @class */ (function () {
         this.isAudioEnable = false;
         this.isStartMeetingCalled = false;
         this.isRecordingUser = false;
+        this.peerConnections = new Map();
         this.userId = _userId;
         this.roomId = _roomId;
         this.userData = _userData;

package/lib/model/PeerConnection.d.ts

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

package/lib/model/PeerConnection.js

@@ -0,0 +1,6 @@
+var PeerConnection = /** @class */ (function () {
+    function PeerConnection() {
+    }
+    return PeerConnection;
+}());
+export { PeerConnection };

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

@@ -258,10 +258,7 @@ var UserMediaHandler = /** @class */ (function (_super) {
     };
     UserMediaHandler.prototype.getAudioDictionay = function () {
         var permissionDict = {
-            echoCancellation: true, noiseSuppression: true, autoGainControl: true, latency: 0.001, googAutoGainControl: false,
-            googNoiseSuppression: true,
-            googEchoCancellation: true,
-            googHighpassFilter: true
+            echoCancellation: true, noiseSuppression: true, autoGainControl: true
         };
         return permissionDict;
     };

package/lib/utility/DynamicLibHelper.d.ts

@@ -5,4 +5,5 @@ export declare class DynamicLibHelper {
     getVideoCallClassHandler(meetingType: MeetingType, meetingStartRequest: MeetingStartRequest, _communicationHandler: CommunicationHandler): Promise<import("../video-call-handler/SFUHandler").SFUHandler | import("../video-call-handler/WebrtcHandler").WebrtcHandler>;
     getMediaDevicesVariable(meetingStartRequest: MeetingStartRequest): any;
     getMediaStreamVariable(meetingStartRequest: MeetingStartRequest): any;
+    getRTCPeerConnection(meetingStartRequest: MeetingStartRequest): any;
 }

package/lib/utility/DynamicLibHelper.js

@@ -102,6 +102,17 @@ var DynamicLibHelper = /** @class */ (function () {
         }
         return MediaStream;
     };
+    DynamicLibHelper.prototype.getRTCPeerConnection = function (meetingStartRequest) {
+        try {
+            if (meetingStartRequest === null || meetingStartRequest === void 0 ? void 0 : meetingStartRequest.isMobileApp) {
+                return new (require("react-native-webrtc").RTCPeerConnection)();
+            }
+        }
+        catch (err) {
+            log.error("react-native-webrtc not found. Please do npm install ");
+        }
+        return new RTCPeerConnection();
+    };
     return DynamicLibHelper;
 }());
 export { DynamicLibHelper };

package/lib/utility/DynamicLibHelper.native.d.ts

@@ -5,4 +5,5 @@ export declare class DynamicLibHelper {
     getVideoCallClassHandler(meetingType: MeetingType, meetingStartRequest: MeetingStartRequest, _communicationHandler: CommunicationHandler): Promise<import("../video-call-handler/SFUHandler").SFUHandler | import("../video-call-handler/WebrtcHandler").WebrtcHandler>;
     getMediaDevicesVariable(meetingStartRequest: MeetingStartRequest): any;
     getMediaStreamVariable(meetingStartRequest: MeetingStartRequest): any;
+    getRTCPeerConnection(meetingStartRequest: MeetingStartRequest): any;
 }

package/lib/utility/DynamicLibHelper.native.js

@@ -102,6 +102,17 @@ var DynamicLibHelper = /** @class */ (function () {
         }
         return MediaStream;
     };
+    DynamicLibHelper.prototype.getRTCPeerConnection = function (meetingStartRequest) {
+        try {
+            if (meetingStartRequest === null || meetingStartRequest === void 0 ? void 0 : meetingStartRequest.isMobileApp) {
+                return new (require("react-native-webrtc").RTCPeerConnection)();
+            }
+        }
+        catch (err) {
+            log.error("react-native-webrtc not found. Please do npm install ");
+        }
+        return new RTCPeerConnection();
+    };
     return DynamicLibHelper;
 }());
 export { DynamicLibHelper };

package/lib/utility/DynamicLibHelper.node.d.ts

@@ -5,4 +5,5 @@ export declare class DynamicLibHelper {
     getVideoCallClassHandler(meetingType: MeetingType, meetingStartRequest: MeetingStartRequest, _communicationHandler: CommunicationHandler): Promise<import("../video-call-handler/SFUHandler").SFUHandler | import("../video-call-handler/WebrtcHandler").WebrtcHandler>;
     getMediaDevicesVariable(meetingStartRequest: MeetingStartRequest): any;
     getMediaStreamVariable(meetingStartRequest: MeetingStartRequest): any;
+    getRTCPeerConnection(meetingStartRequest: MeetingStartRequest): any;
 }

package/lib/utility/DynamicLibHelper.node.js

@@ -103,6 +103,9 @@ var DynamicLibHelper = /** @class */ (function () {
         }
         return MediaStream;
     };
+    DynamicLibHelper.prototype.getRTCPeerConnection = function (meetingStartRequest) {
+        return new RTCPeerConnection();
+    };
     return DynamicLibHelper;
 }());
 export { DynamicLibHelper };

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

@@ -1,5 +1,6 @@
 import { Track } from "../model/Track";
 import { WebSocketMessageBody } from "../websocket-handler/WebsocketHandler";
+import { Participant } from "../model/Participant";
 import { Base } from "../base/Base";
 import { TrackStats } from "../model/TrackStats";
 export declare abstract class BaseVideoCallHandler extends Base {
@@ -16,6 +17,9 @@ export declare abstract class BaseVideoCallHandler extends Base {
     abstract onParticipantUpdated(): void;
     abstract createDataChannel(): any;
     abstract sendMessageViaDataChannel(messagePayload: any): any;
+    onAllParticipants(participants: Participant[]): Promise<void>;
+    onUserJoined(participants: Participant): Promise<void>;
+    onUserLeft(participants: Participant): Promise<void>;
     getConsumerForTrack(track: Track): void;
     resumeProducerOrConsumerForTrack(track: Track): Promise<void>;
     pauseProducerOrConsumerForTrack(track: Track): Promise<void>;

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

@@ -68,6 +68,27 @@ var BaseVideoCallHandler = /** @class */ (function (_super) {
         _super.prototype.onObjectCreated.call(this);
         (_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.setVideoCallHandler(this);
     };
+    BaseVideoCallHandler.prototype.onAllParticipants = function (participants) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/];
+            });
+        });
+    };
+    BaseVideoCallHandler.prototype.onUserJoined = function (participants) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/];
+            });
+        });
+    };
+    BaseVideoCallHandler.prototype.onUserLeft = function (participants) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/];
+            });
+        });
+    };
     BaseVideoCallHandler.prototype.getConsumerForTrack = function (track) {
     };
     BaseVideoCallHandler.prototype.resumeProducerOrConsumerForTrack = function (track) {

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

@@ -430,7 +430,7 @@ var SFUHandler = /** @class */ (function (_super) {
                             producerData.encodings = this.meetingStartRequest.simulcastEncodings;
                         }
                         if (track.track.kind === "audio") {
-                            producerData.codecOptions = { opusStereo: true, opusFec: true };
+                            producerData.codecOptions = { opusStereo: true, opusFec: true, opusDtx: true };
                             if (this.meetingStartRequest.maxAudioBitrateConfig > 0) {
                                 producerData.codecOptions.opusMaxAverageBitrate = (_d = this.meetingStartRequest) === null || _d === void 0 ? void 0 : _d.maxAudioBitrateConfig;
                             }

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

@@ -1,11 +1,15 @@
+import { Participant } from "../model/Participant";
 import { Track } from "../model/Track";
 import { WebSocketMessageBody } from "../websocket-handler/WebsocketHandler";
 import { BaseVideoCallHandler } from "./BaseVideoCallHandler";
 export declare class WebrtcHandler extends BaseVideoCallHandler {
+    private dynamicLibHelper;
     onParticipantUpdated(): void;
     resumeIncomingTrack(track: Track): void;
     pauseIncomingTrack(track: Track): void;
     onSocketMessage(websocketCallHandler: WebSocketMessageBody): void;
+    onAllParticipants(participants: Participant[]): Promise<void>;
+    onUserJoined(participant: Participant): Promise<void>;
     init(): Promise<void>;
     onReconnect(): Promise<void>;
     stopTrack(track: Track): void;
@@ -14,4 +18,5 @@ export declare class WebrtcHandler extends BaseVideoCallHandler {
     sendTrack(track: Track): void;
     createDataChannel(): Promise<void>;
     sendMessageViaDataChannel(messagePayload: any): void;
+    private isOfferInitParticipant;
 }

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

@@ -52,10 +52,21 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 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() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.dynamicLibHelper = (new DynamicLibHelper());
+        _this.isOfferInitParticipant = function (participant) {
+            var selfParticpant = _this.communicationHandler.getSelfParticipant();
+            if (participant.userId > selfParticpant.userId) {
+                return true;
+            }
+            return false;
+        };
+        return _this;
     }
     WebrtcHandler.prototype.onParticipantUpdated = function () {
         throw new Error("Method not implemented.");
@@ -69,6 +80,48 @@ var WebrtcHandler = /** @class */ (function (_super) {
     WebrtcHandler.prototype.onSocketMessage = function (websocketCallHandler) {
         throw new Error("Method not implemented.");
     };
+    WebrtcHandler.prototype.onAllParticipants = function (participants) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                participants.forEach(function (eachParticiapant) {
+                    _this.onUserJoined(eachParticiapant);
+                });
+                return [2 /*return*/];
+            });
+        });
+    };
+    WebrtcHandler.prototype.onUserJoined = function (participant) {
+        return __awaiter(this, void 0, void 0, function () {
+            var selfParticpant, isOfferInitParticipant, peerConnectionObject, peerConnection, offer;
+            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];
+                        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);
+                        if (!peerConnection) return [3 /*break*/, 2];
+                        peerConnection.addTransceiver("audio", { direction: "sendrecv" });
+                        peerConnection.addTransceiver("video", { direction: "sendrecv" });
+                        return [4 /*yield*/, peerConnection.createOffer()];
+                    case 1:
+                        offer = _a.sent();
+                        peerConnection.setLocalDescription(offer);
+                        peerConnectionObject.offer = offer;
+                        // send offer to peer
+                        console.log("offer", offer);
+                        _a.label = 2;
+                    case 2: return [2 /*return*/];
+                }
+            });
+        });
+    };
     WebrtcHandler.prototype.init = function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {

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

@@ -30,6 +30,10 @@ export declare enum WebSocketBasicEvents {
     OnChat = "chat",
     SelfLeft = "selfLeft"
 }
+export declare enum WebrtcMessageType {
+    SendOffer = "SendOffer",
+    SendAnswer = "SendAnswer"
+}
 export declare enum SFUMessageType {
     SFUMessage = "sfuMessage",
     GetRouterRtpCapabilities = "routerRtpCapabilities",
@@ -70,12 +74,13 @@ export declare enum SFUMessageType {
     OnProducerScoreChange = "OnProducerScoreChange",
     OnConsumerLayerChange = "OnConsumerLayerChange"
 }
-export type WebSocketEvents = SFUMessageType | WebSocketBasicEvents;
+export type WebSocketEvents = SFUMessageType | WebSocketBasicEvents | WebrtcMessageType;
 export interface WebSocketMessageBody {
     type?: WebSocketEvents;
     data?: any;
 }
 export declare class WebsocketHandler extends Base {
+    private websocketConnectionUrl?;
     private loadBalancerIpAddressForWebSocket?;
     private isEnded;
     private isWebSocketConnectionInProgress;
@@ -89,8 +94,9 @@ export declare class WebsocketHandler extends Base {
     private lastPingTimeStamp;
     protected onObjectCreated(): void;
     cleanup(): Promise<void>;
-    startSocketConnection(): Promise<void>;
+    startSocketConnection(isForPreConnect?: boolean, url?: string): Promise<void>;
     private connect;
+    isWebScoketConnectedWithoutSetup(): boolean;
     isWebScoketConnected(): boolean;
     sendSocketMessage(type: WebSocketEvents, data: any): void;
     reconnectOnInternetFailur(): void;

package/lib/websocket-handler/WebsocketHandler.js

@@ -85,6 +85,11 @@ export var WebSocketBasicEvents;
     WebSocketBasicEvents["OnChat"] = "chat";
     WebSocketBasicEvents["SelfLeft"] = "selfLeft";
 })(WebSocketBasicEvents || (WebSocketBasicEvents = {}));
+export var WebrtcMessageType;
+(function (WebrtcMessageType) {
+    WebrtcMessageType["SendOffer"] = "SendOffer";
+    WebrtcMessageType["SendAnswer"] = "SendAnswer";
+})(WebrtcMessageType || (WebrtcMessageType = {}));
 export var SFUMessageType;
 (function (SFUMessageType) {
     SFUMessageType["SFUMessage"] = "sfuMessage";
@@ -192,16 +197,16 @@ var WebsocketHandler = /** @class */ (function (_super) {
             });
         });
     };
-    WebsocketHandler.prototype.startSocketConnection = function () {
+    WebsocketHandler.prototype.startSocketConnection = function (isForPreConnect, url) {
         return __awaiter(this, void 0, void 0, function () {
             var request, urlToGetIpAddress, config;
             var _this = this;
             return __generator(this, function (_a) {
-                if (!this.meetingStartRequest) {
+                if (!this.meetingStartRequest && !isForPreConnect) {
                     log.log("meetingStartRequest not found on startSocketConnection");
                     return [2 /*return*/];
                 }
-                if (this.meetingStartRequest.dynamicWebSocketFetchBaseUrl) {
+                if (!isForPreConnect && this.meetingStartRequest.dynamicWebSocketFetchBaseUrl) {
                     if (this.meetingStartRequest.dynamicWebSocketFetchBaseUrl.endsWith("/") === false) {
                         this.meetingStartRequest.dynamicWebSocketFetchBaseUrl = this.meetingStartRequest.dynamicWebSocketFetchBaseUrl + "/";
                     }
@@ -229,46 +234,65 @@ var WebsocketHandler = /** @class */ (function (_super) {
                     });
                 }
                 else {
-                    this.connect(false);
+                    this.connect(false, isForPreConnect, url);
                 }
                 return [2 /*return*/];
             });
         });
     };
-    WebsocketHandler.prototype.connect = function (isForceFully) {
+    WebsocketHandler.prototype.connect = function (isForceFully, isForPreConnect, _url) {
         var _a, _b, _c;
         if (isForceFully === void 0) { isForceFully = false; }
         return __awaiter(this, void 0, void 0, function () {
-            var url;
+            var url_1;
             var _this = this;
             return __generator(this, function (_d) {
                 if (this.isEnded === true || this.isWebSocketConnectionInProgress) {
                     return [2 /*return*/];
                 }
-                if (!this.wss || (isForceFully && this.isWebScoketConnected() === false)) {
-                    url = void 0;
-                    if (this.loadBalancerIpAddressForWebSocket) {
-                        url = "ws://" + this.loadBalancerIpAddressForWebSocket + ":4003/?connection=";
+                if (!this.wss || (isForceFully && this.isWebScoketConnectedWithoutSetup() === false)) {
+                    url_1 = _url;
+                    // if (this.loadBalancerIpAddressForWebSocket) {
+                    //     url = "ws://" + this.loadBalancerIpAddressForWebSocket + ":4003/?connection=";
+                    // }
+                    // else 
+                    if (!url_1 && ((_a = this.meetingStartRequest) === null || _a === void 0 ? void 0 : _a.wssUrl) && this.meetingStartRequest.wssUrl !== null) {
+                        url_1 = this.meetingStartRequest.wssUrl;
                     }
-                    else if (((_a = this.meetingStartRequest) === null || _a === void 0 ? void 0 : _a.wssUrl) && this.meetingStartRequest.wssUrl !== null) {
-                        url = this.meetingStartRequest.wssUrl;
+                    if (!url_1 && this.websocketConnectionUrl) {
+                        url_1 = this.websocketConnectionUrl;
                     }
-                    if (url) {
-                        this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && log.info("Connecting to ", url);
+                    if (!url_1) {
+                        return [2 /*return*/];
+                    }
+                    if (url_1 !== this.websocketConnectionUrl) {
+                        if (this.wss) {
+                            this.wss.close();
+                        }
+                    }
+                    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;
                         if (this.meetingStartRequest && ((_b = this.meetingStartRequest) === null || _b === void 0 ? void 0 : _b.isMobileApp)) {
-                            this.wss = new WebSocket(url + this.connection);
+                            this.wss = new WebSocket(url_1 + this.connection);
                         }
                         else {
-                            this.wss = new WebSocket(url + this.connection);
+                            this.wss = new WebSocket(url_1 + this.connection);
                         }
                         this.wss.onopen = function (event) {
                             // this.checkIfSocketConnected();
                             _this.meetingStartRequest && _this.meetingStartRequest.logLevel === LogLevel.Debug && log.info("connected ----");
                             _this.isWebSocketConnectionInProgress = false;
                             _this.isSetUpDone = false;
+                            _this.websocketConnectionUrl = url_1;
                             _this.socketCheckTimeout = undefined;
-                            _this.onSocketConnected();
+                            if (!isForPreConnect) {
+                                _this.onSocketConnected();
+                            }
                         };
                         this.wss.onmessage = function (event) {
                             _this.isWebSocketConnectionInProgress = false;
@@ -289,6 +313,8 @@ 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.");
                             // log.warn(event)
@@ -296,14 +322,17 @@ var WebsocketHandler = /** @class */ (function (_super) {
                         };
                     }
                 }
-                else if (isForceFully === false && this.isWebScoketConnected()) {
+                else if (isForceFully === false && !isForPreConnect && this.isWebScoketConnected()) {
                     (_c = this.communicationHandler) === null || _c === void 0 ? void 0 : _c.emitMessageToSource(VaniEvent.OnSocketConnected, {});
                 }
+                else if (!isForPreConnect && this.isWebScoketConnectedWithoutSetup() && !this.isSetUpDone) {
+                    this.onSocketConnected();
+                }
                 return [2 /*return*/];
             });
         });
     };
-    WebsocketHandler.prototype.isWebScoketConnected = function () {
+    WebsocketHandler.prototype.isWebScoketConnectedWithoutSetup = function () {
         var _a;
         if (this.wss && this.wss.readyState === 1) {
             return true;
@@ -311,9 +340,17 @@ var WebsocketHandler = /** @class */ (function (_super) {
         this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && console.log("this.wss.readyState", this.wss, (_a = this.wss) === null || _a === void 0 ? void 0 : _a.readyState);
         return false;
     };
+    WebsocketHandler.prototype.isWebScoketConnected = function () {
+        var _a;
+        if (this.wss && this.wss.readyState === 1 && this.isSetUpDone) {
+            return true;
+        }
+        this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && console.log("this.wss.readyState", this.wss, (_a = this.wss) === null || _a === void 0 ? void 0 : _a.readyState);
+        return false;
+    };
     WebsocketHandler.prototype.sendSocketMessage = function (type, data) {
         var _a;
-        if (this.isWebScoketConnected()) {
+        if (this.isWebScoketConnectedWithoutSetup()) {
             var paylod = { type: type, data: data };
             (_a = this.wss) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify(paylod));
         }
@@ -386,7 +423,7 @@ var WebsocketHandler = /** @class */ (function (_super) {
     };
     WebsocketHandler.prototype.socketSubscribeToTopic = function () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-        if (this.isWebScoketConnected() === false) {
+        if (this.isWebScoketConnectedWithoutSetup() === false) {
             return;
         }
         this.communicationHandler.updateSelfParticipantUserId();

package/package.json

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