vani-meeting-client 2.1.9 → 2.2.1-beta0

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;

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

@@ -80,6 +80,7 @@ export interface WebSocketMessageBody {
     data?: any;
 }
 export declare class WebsocketHandler extends Base {
+    private websocketConnectionUrl?;
     private loadBalancerIpAddressForWebSocket?;
     private isEnded;
     private isWebSocketConnectionInProgress;
@@ -93,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

@@ -197,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 + "/";
                     }
@@ -234,46 +234,60 @@ 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) {
+                        if (this.wss) {
+                            this.wss.close();
+                        }
+                    }
+                    if (!url_1.includes("connection=")) {
+                        url_1 = url_1 + "/?connection=";
                     }
-                    if (url) {
-                        this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && log.info("Connecting to ", url);
+                    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) {
+                            debugger;
                             // 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;
@@ -294,6 +308,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)
@@ -301,14 +317,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;
@@ -316,6 +335,14 @@ 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()) {

package/package.json

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