vani-meeting-client 0.6.1 → 0.6.4

package/lib/MeetingHandler.js

@@ -311,9 +311,10 @@ var MeetingHandler = /** @class */ (function () {
         return [];
     };
     MeetingHandler.prototype.isWebScoketConnected = function () {
-        var _a;
+        var _a, _b;
+        console.log("Room Id", (_a = this.meetingStartRequest) === null || _a === void 0 ? void 0 : _a.roomId);
         if (this.websocketCallHandler) {
-            return (_a = this.websocketCallHandler) === null || _a === void 0 ? void 0 : _a.isWebScoketConnected();
+            return (_b = this.websocketCallHandler) === null || _b === void 0 ? void 0 : _b.isWebScoketConnected();
         }
         return false;
     };

package/lib/model/Event.d.ts

@@ -6,6 +6,7 @@ export declare enum VaniEvent {
     OnSocketError = "onSocketError",
     OnSocketConnected = "onConnected",
     OnSocketReconnectTimeOut = "onReconnectTimeOut",
+    OnSocketDisconnected = "onSocketDisconnected",
     OnConnected = "onConnected",
     OnConnectionBack = "connectionBack",
     OnMeetingStartTime = "meetingStartTime",
@@ -58,6 +59,7 @@ interface VaniConnectionEvents {
     [VaniEvent.OnAudioUnblocked]: (participant: Participant) => any;
     [VaniEvent.OnVideoBlocked]: (participant: Participant) => any;
     [VaniEvent.OnAudioBlocked]: (participant: Participant) => any;
+    [VaniEvent.OnSocketDisconnected]: () => any;
 }
 export declare interface VaniEventListener {
     on<U extends keyof VaniConnectionEvents>(event: U, listener: VaniConnectionEvents[U]): this;

package/lib/model/Event.js

@@ -4,6 +4,7 @@ export var VaniEvent;
     VaniEvent["OnSocketError"] = "onSocketError";
     VaniEvent["OnSocketConnected"] = "onConnected";
     VaniEvent["OnSocketReconnectTimeOut"] = "onReconnectTimeOut";
+    VaniEvent["OnSocketDisconnected"] = "onSocketDisconnected";
     VaniEvent["OnConnected"] = "onConnected";
     VaniEvent["OnConnectionBack"] = "connectionBack";
     VaniEvent["OnMeetingStartTime"] = "meetingStartTime";

package/lib/websocket-handler/WebsocketHandler.js

@@ -289,15 +289,19 @@ var WebsocketHandler = /** @class */ (function (_super) {
     // }
     WebsocketHandler.prototype.onWebSocketClosed = function (event) {
         var _this = this;
+        var _a;
         log.info("onWebSocketClosed");
         if (event.wasClean === false) {
             this.socketCheckTimeout = window.setTimeout(function () {
                 _this.tryToReconectSocket();
             }, 1000);
         }
+        else {
+            (_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.emitMessageToSource(VaniEvent.OnSocketDisconnected, {});
+        }
     };
     WebsocketHandler.prototype.tryToReconectSocket = function () {
-        var _a;
+        var _a, _b;
         log.info("tryToReconectSocket");
         if (this.isWebScoketConnected() === false && this.isEnded === false) {
             this.wss = undefined;
@@ -307,6 +311,7 @@ var WebsocketHandler = /** @class */ (function (_super) {
         else {
             this.socketCheckTimeout = undefined;
             (_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.emitMessageToSource(VaniEvent.OnSocketReconnectTimeOut, {});
+            (_b = this.communicationHandler) === null || _b === void 0 ? void 0 : _b.emitMessageToSource(VaniEvent.OnSocketDisconnected, {});
         }
     };
     WebsocketHandler.prototype.onSocketConnected = function () {
@@ -349,7 +354,7 @@ var WebsocketHandler = /** @class */ (function (_super) {
         }, 200);
     };
     WebsocketHandler.prototype.onMessage = function (message) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         this.lastPingTimeStamp = new Date().getTime();
         var messagejson = JSON.parse(message);
         if (messagejson.type && messagejson.data) {
@@ -365,25 +370,29 @@ var WebsocketHandler = /** @class */ (function (_super) {
             else if (type === WebSocketBasicEvents.IsSetupDone) {
                 this.onSetupDone(data);
             }
-            else if (type === WebSocketBasicEvents.OnParticipantUpdated || type === WebSocketBasicEvents.OnNewJoinee) {
-                console.log(" data.message.participant OnParticipantUpdated", data);
+            else if (type === WebSocketBasicEvents.OnNewJoinee) {
                 if (data && data.message && data.message.participant) {
                     console.log("OnParticipantUpdated from server", data.message.participant);
                     (_b = this.communicationHandler) === null || _b === void 0 ? void 0 : _b.addParticipantIfNotExist(data.message.participant, true);
                 }
             }
+            else if (type === WebSocketBasicEvents.OnParticipantUpdated) {
+                if (data) {
+                    (_c = this.communicationHandler) === null || _c === void 0 ? void 0 : _c.addParticipantIfNotExist(data, true);
+                }
+            }
             else if (type === WebSocketBasicEvents.OnUserLeft) {
-                (_c = this.communicationHandler) === null || _c === void 0 ? void 0 : _c.onUserLeft(data);
+                (_d = this.communicationHandler) === null || _d === void 0 ? void 0 : _d.onUserLeft(data);
             }
             else if (type === WebSocketBasicEvents.OnServerParticipants) {
-                (_d = this.communicationHandler) === null || _d === void 0 ? void 0 : _d.onServerParticipants(data);
+                (_e = this.communicationHandler) === null || _e === void 0 ? void 0 : _e.onServerParticipants(data);
             }
             else if (type === WebSocketBasicEvents.OnOldMessages) {
-                (_e = this.communicationHandler) === null || _e === void 0 ? void 0 : _e.onOldMessages(data);
+                (_f = this.communicationHandler) === null || _f === void 0 ? void 0 : _f.onOldMessages(data);
             }
             else if (type === WebSocketBasicEvents.OnChat) {
                 if (data.message) {
-                    (_f = this.communicationHandler) === null || _f === void 0 ? void 0 : _f.onMessage(data.message);
+                    (_g = this.communicationHandler) === null || _g === void 0 ? void 0 : _g.onMessage(data.message);
                 }
             }
             else if (type === WebSocketBasicEvents.OnMeetingStartTime) {
@@ -392,23 +401,23 @@ var WebsocketHandler = /** @class */ (function (_super) {
                     if (time > new Date().getTime()) {
                         time = new Date().getTime();
                     }
-                    (_g = this.communicationHandler) === null || _g === void 0 ? void 0 : _g.emitMessageToSource(VaniEvent.OnMeetingStartTime, (time + ""));
+                    (_h = this.communicationHandler) === null || _h === void 0 ? void 0 : _h.emitMessageToSource(VaniEvent.OnMeetingStartTime, (time + ""));
                 }
             }
             else if (type === WebSocketBasicEvents.OnAudioVideoStatusUpdated) {
-                (_h = this.communicationHandler) === null || _h === void 0 ? void 0 : _h.onAudioVideoStatusUpdated(data);
+                (_j = this.communicationHandler) === null || _j === void 0 ? void 0 : _j.onAudioVideoStatusUpdated(data);
             }
             else if (type === WebSocketBasicEvents.OnAudioBlockRequest) {
-                (_j = this.communicationHandler) === null || _j === void 0 ? void 0 : _j.onAudioBlocked(data);
+                (_k = this.communicationHandler) === null || _k === void 0 ? void 0 : _k.onAudioBlocked(data);
             }
             else if (type === WebSocketBasicEvents.OnAudioUnblockRequest) {
-                (_k = this.communicationHandler) === null || _k === void 0 ? void 0 : _k.onAudioUnblocked(data);
+                (_l = this.communicationHandler) === null || _l === void 0 ? void 0 : _l.onAudioUnblocked(data);
             }
             else if (type === WebSocketBasicEvents.OnVideoBlockRequest) {
-                (_l = this.communicationHandler) === null || _l === void 0 ? void 0 : _l.onVideoBlocked(data);
+                (_m = this.communicationHandler) === null || _m === void 0 ? void 0 : _m.onVideoBlocked(data);
             }
             else if (type === WebSocketBasicEvents.OnVideoUnblockRequest) {
-                (_m = this.communicationHandler) === null || _m === void 0 ? void 0 : _m.onVideoUnblocked(data);
+                (_o = this.communicationHandler) === null || _o === void 0 ? void 0 : _o.onVideoUnblocked(data);
             }
         }
     };

package/package.json

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

package/lib/model/AudioVideoPauseResumeResponse.d.ts

@@ -1,5 +0,0 @@
-export interface AudioVideoPauseResumeResponse {
-    message: string;
-    isSuccess: boolean;
-    error?: 'NoError' | 'Busy' | 'NoDevice' | 'InvalidMeetingRequest' | 'BlockedByAdmin' | 'PermissionDenied';
-}

package/lib/model/AudioVideoPauseResumeResponse.js

@@ -1 +0,0 @@
-export {};

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

@@ -1,22 +0,0 @@
-import { WebSocketEvents } from '..';
-import { Base } from '../base/Base';
-export declare class WebsockerHandler extends Base {
-    private loadBalancerIpAddressForWebSocket?;
-    private isEnded;
-    private isWebSocketConnectionInProgress;
-    private wss?;
-    private connection;
-    private isSetUpDone;
-    private socketCheckTimeout?;
-    private setUpTry;
-    cleanup(): void;
-    startSocketConnection(): Promise<void>;
-    private connect;
-    isWebScoketConnected(): boolean;
-    sendSocketMessage(type: WebSocketEvents, data: any): void;
-    private tryToReconectSocket;
-    private onSocketConnected;
-    private socketSubscribeToTopic;
-    private askIfSetupDone;
-    private onMessage;
-}

package/lib/websocket-handler/WebsockerHandler.js

@@ -1,272 +0,0 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebsockerHandler = void 0;
-var axios_1 = require("axios");
-var __1 = require("..");
-var Base_1 = require("../base/Base");
-var log = require("loglevel");
-var ConnectionType;
-(function (ConnectionType) {
-    ConnectionType["new"] = "new";
-    ConnectionType["reconnect"] = "reconnect";
-})(ConnectionType || (ConnectionType = {}));
-var WebsockerHandler = /** @class */ (function (_super) {
-    __extends(WebsockerHandler, _super);
-    function WebsockerHandler() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.isEnded = false;
-        _this.isWebSocketConnectionInProgress = false;
-        _this.connection = ConnectionType.new;
-        _this.isSetUpDone = false;
-        _this.setUpTry = 0;
-        return _this;
-    }
-    WebsockerHandler.prototype.cleanup = function () {
-        this.loadBalancerIpAddressForWebSocket = undefined;
-        this.isEnded = true;
-        if (this.wss) {
-            this.wss.close();
-            this.wss = undefined;
-        }
-        if (this.socketCheckTimeout) {
-            clearTimeout(this.socketCheckTimeout);
-            this.socketCheckTimeout = undefined;
-        }
-    };
-    WebsockerHandler.prototype.startSocketConnection = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var request, urlToGetIpAddress, config;
-            var _this = this;
-            return __generator(this, function (_a) {
-                if (!this.meetingStartRequest) {
-                    log.warn("meetingStartRequest not found on startSocketConnection");
-                    return [2 /*return*/];
-                }
-                if (this.meetingStartRequest.dynamicWebSocketFetchBaseUrl) {
-                    if (this.meetingStartRequest.dynamicWebSocketFetchBaseUrl.endsWith("/") === false) {
-                        this.meetingStartRequest.dynamicWebSocketFetchBaseUrl = this.meetingStartRequest.dynamicWebSocketFetchBaseUrl + "/";
-                    }
-                    request = { meeting_id: this.meetingStartRequest.roomId, estimated_users: this.meetingStartRequest.numberOfUsers };
-                    urlToGetIpAddress = this.meetingStartRequest.dynamicWebSocketFetchBaseUrl + "api/getIpAddressForMeeting";
-                    log.info(JSON.stringify(request));
-                    config = {
-                        headers: {
-                            'Content-Type': 'application/json'
-                        }
-                    };
-                    axios_1.default
-                        .post(urlToGetIpAddress, request, config)
-                        .then(function (response) {
-                        log.info("response ", response.data);
-                        if (response && response.data && response.data.status === true && response.data.ipAddress && response.data.ipAddress !== null) {
-                            _this.loadBalancerIpAddressForWebSocket = response.data.ipAddress;
-                        }
-                        _this.connect(false);
-                    })
-                        .catch(function (error) {
-                        _this.connect(false);
-                        log.warn(error);
-                        _this.connect(false);
-                    });
-                }
-                else {
-                    this.connect(false);
-                }
-                return [2 /*return*/];
-            });
-        });
-    };
-    WebsockerHandler.prototype.connect = function (isForceFully) {
-        var _a, _b, _c;
-        if (isForceFully === void 0) { isForceFully = false; }
-        return __awaiter(this, void 0, void 0, function () {
-            var url;
-            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=";
-                    }
-                    else if (((_a = this.meetingStartRequest) === null || _a === void 0 ? void 0 : _a.wssUrl) && this.meetingStartRequest.wssUrl !== null) {
-                        url = this.meetingStartRequest.wssUrl;
-                    }
-                    if (url) {
-                        log.info("Connecting to ", url);
-                        this.isWebSocketConnectionInProgress = true;
-                        if ((_b = this.meetingStartRequest) === null || _b === void 0 ? void 0 : _b.isMobileApp) {
-                            this.wss = new WebSocket(url + this.connection);
-                        }
-                        else {
-                            this.wss = new WebSocket(url + this.connection);
-                        }
-                        this.wss.addEventListener('open', function (event) {
-                            log.info("connected ----");
-                            _this.isWebSocketConnectionInProgress = false;
-                            _this.isSetUpDone = false;
-                            _this.socketCheckTimeout = undefined;
-                            _this.onSocketConnected();
-                        });
-                        this.wss.onmessage = function (event) {
-                            _this.isWebSocketConnectionInProgress = false;
-                            _this.onMessage(event.data);
-                        };
-                        this.wss.onerror = function (event) {
-                            var _a;
-                            _this.isWebSocketConnectionInProgress = false;
-                            (_a = _this.communicationHandler) === null || _a === void 0 ? void 0 : _a.emitMessageToSource(__1.Event.OnSocketError, event);
-                            if (_this.wss) {
-                                _this.wss.close();
-                            }
-                        };
-                        this.wss.onclose = function (event) {
-                            _this.isWebSocketConnectionInProgress = false;
-                            log.info("WebSocket is closed now.");
-                            log.warn(event);
-                            if (event.wasClean === false) {
-                                _this.socketCheckTimeout = setTimeout(_this.tryToReconectSocket, 1000);
-                            }
-                        };
-                    }
-                }
-                else if (isForceFully === false && this.isWebScoketConnected()) {
-                    (_c = this.communicationHandler) === null || _c === void 0 ? void 0 : _c.emitMessageToSource(__1.Event.OnSocketConnected, {});
-                }
-                return [2 /*return*/];
-            });
-        });
-    };
-    WebsockerHandler.prototype.isWebScoketConnected = function () {
-        if (this.wss && this.wss.readyState === 1) {
-            return true;
-        }
-        return false;
-    };
-    WebsockerHandler.prototype.sendSocketMessage = function (type, data) {
-        var _a;
-        if (this.isWebScoketConnected()) {
-            var paylod = { type: type, data: data };
-            (_a = this.wss) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify(paylod));
-        }
-    };
-    WebsockerHandler.prototype.tryToReconectSocket = function () {
-        var _a;
-        if (this.isWebScoketConnected() === false && this.isEnded === false) {
-            this.wss = undefined;
-            this.connection = ConnectionType.reconnect;
-            this.connect(true);
-        }
-        else {
-            this.socketCheckTimeout = undefined;
-            (_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.emitMessageToSource(__1.Event.OnSocketReconnectTimeOut, {});
-        }
-    };
-    WebsockerHandler.prototype.onSocketConnected = function () {
-        this.socketSubscribeToTopic();
-    };
-    WebsockerHandler.prototype.socketSubscribeToTopic = function () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        if (this.isWebScoketConnected() === false) {
-            return;
-        }
-        var config = {
-            participant: (_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.getSelfParticipant(), apiData: (_b = this.meetingStartRequest) === null || _b === void 0 ? void 0 : _b.apiData,
-            appId: (_c = this.meetingStartRequest) === null || _c === void 0 ? void 0 : _c.appId, sfuRequired: (((_d = this.meetingStartRequest) === null || _d === void 0 ? void 0 : _d.meetingType) === __1.MeetingType.SFU), numberOfUsers: (_e = this.meetingStartRequest) === null || _e === void 0 ? void 0 : _e.numberOfUsers, meetId: (_f = this.meetingStartRequest) === null || _f === void 0 ? void 0 : _f.roomId
-        };
-        this.sendSocketMessage(__1.WebSocketEvents.Config, config);
-        var hostNotificationRoom = { roomId: (_g = this.meetingStartRequest) === null || _g === void 0 ? void 0 : _g.userId, id: (_h = this.meetingStartRequest) === null || _h === void 0 ? void 0 : _h.userId };
-        this.sendSocketMessage(__1.WebSocketEvents.JoinRoom, hostNotificationRoom);
-        var roomForAllClient = { roomId: (_j = this.meetingStartRequest) === null || _j === void 0 ? void 0 : _j.roomId, id: (_k = this.meetingStartRequest) === null || _k === void 0 ? void 0 : _k.userId };
-        this.sendSocketMessage(__1.WebSocketEvents.JoinRoom, roomForAllClient);
-        this.setUpTry = 0;
-        this.askIfSetupDone();
-    };
-    WebsockerHandler.prototype.askIfSetupDone = function () {
-        var _this = this;
-        if (this.isSetUpDone || this.setUpTry > 10) {
-            return;
-        }
-        if (!this.meetingStartRequest) {
-            return;
-        }
-        var checkIfSetupDone = { to: this.meetingStartRequest.userId };
-        this.sendSocketMessage(__1.WebSocketEvents.IsSetupDone, checkIfSetupDone);
-        log.info("Vani setupDone asked");
-        setTimeout(function () {
-            if (_this.isSetUpDone || _this.setUpTry > 10) {
-                return;
-            }
-            _this.askIfSetupDone();
-            _this.setUpTry = _this.setUpTry + 1;
-        }, 200);
-    };
-    WebsockerHandler.prototype.onMessage = function (message) {
-        var messagejson = JSON.parse(message);
-        if (messagejson.type && messagejson.data) {
-            var type = messagejson.type;
-            var data = messagejson.data;
-            // if (type === WebSocketEvents.IsSetupDone) {
-            // }
-            // else 
-            if (type === __1.WebSocketEvents.Ping) {
-                this.sendSocketMessage(__1.WebSocketEvents.Pong, data);
-            }
-        }
-    };
-    return WebsockerHandler;
-}(Base_1.Base));
-exports.WebsockerHandler = WebsockerHandler;