vani-meeting-client 2.1.1 → 2.1.3

package/lib/MeetingHandler.js

@@ -520,16 +520,37 @@ var MeetingHandler = /** @class */ (function () {
     };
     MeetingHandler.prototype.cleanup = function () {
         var _a, _b, _c, _d;
-        this.meetingStartRequest = undefined;
-        this.reactNativeWebrtcPlugin = undefined;
-        (_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.cleanup();
-        this.communicationHandler = undefined;
-        (_b = this.videoCallHandler) === null || _b === void 0 ? void 0 : _b.cleanup();
-        this.videoCallHandler = undefined;
-        (_c = this.websocketCallHandler) === null || _c === void 0 ? void 0 : _c.cleanup();
-        this.websocketCallHandler = undefined;
-        (_d = this.userMediaHandler) === null || _d === void 0 ? void 0 : _d.cleanup();
-        this.userMediaHandler = undefined;
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_e) {
+                this.meetingStartRequest = undefined;
+                this.reactNativeWebrtcPlugin = undefined;
+                try {
+                    (_a = this.communicationHandler) === null || _a === void 0 ? void 0 : _a.cleanup();
+                    this.communicationHandler = undefined;
+                }
+                catch (err) {
+                }
+                try {
+                    (_b = this.videoCallHandler) === null || _b === void 0 ? void 0 : _b.cleanup();
+                    this.videoCallHandler = undefined;
+                }
+                catch (err) {
+                }
+                try {
+                    (_c = this.websocketCallHandler) === null || _c === void 0 ? void 0 : _c.cleanup();
+                    this.websocketCallHandler = undefined;
+                }
+                catch (err) {
+                }
+                try {
+                    (_d = this.userMediaHandler) === null || _d === void 0 ? void 0 : _d.cleanup();
+                    this.userMediaHandler = undefined;
+                }
+                catch (err) {
+                }
+                return [2 /*return*/];
+            });
+        });
     };
     MeetingHandler.prototype.handleGA = function () {
         return __awaiter(this, void 0, void 0, function () {

package/lib/inter-communication-handler/CommunicationHandler.d.ts

@@ -65,5 +65,5 @@ export declare class CommunicationHandler {
     restartSFU: () => Promise<void>;
     onSFUInitDone: () => Promise<void>;
     private reloadSFUCleanUpDone;
-    cleanup(): void;
+    cleanup(): Promise<void>;
 }

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

@@ -77,9 +77,13 @@ var CommunicationHandler = /** @class */ (function () {
                 (_a = _this.meetingHandler) === null || _a === void 0 ? void 0 : _a.endAndDestory();
                 return;
             }
-            if (count === 2) {
+            if (count === 10) {
                 _this.emitMessageToSource(VaniEvent.OnNotReachable, {});
+                if (_this.meetingStartRequest.isMobileApp) {
+                    _this.emitMessageToSource(VaniEvent.OnSocketError, {});
+                }
             }
+            _this.emitMessageToSource(VaniEvent.CheckingInternetConnection, {});
             _this.isReachable = false;
             _this.meetingStartRequest && _this.meetingStartRequest.logLevel === LogLevel.Debug && console.log("checkIfInternetReachable");
             fetch(_this.meetingStartRequest.urlToCheckInternetPresent, {
@@ -560,20 +564,30 @@ var CommunicationHandler = /** @class */ (function () {
             // if (count < 2 && this.websocketCallHandler?.isWebScoketConnected()) {
             //     this.videoCallHandler?.reconnectedWithoutPing()
             // }
-            (_a = this.videoCallHandler) === null || _a === void 0 ? void 0 : _a.reconnectedWithoutPing();
+            if (this.meetingStartRequest && this.meetingStartRequest.isMobileApp) {
+                this.websocketCallHandler.reconnectOnInternetFailur();
+            }
+            else {
+                (_a = this.videoCallHandler) === null || _a === void 0 ? void 0 : _a.reconnectedWithoutPing();
+            }
         }
     };
     CommunicationHandler.prototype.cleanup = function () {
-        var _this = this;
-        this.selfTracks.forEach(function (eachTrack) {
-            _this.removeTrack(eachTrack, false);
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                this.selfTracks.forEach(function (eachTrack) {
+                    _this.removeTrack(eachTrack, false);
+                });
+                this.allSelfTracksForRestartSFU = undefined;
+                this.eventEmitter.removeAllListeners();
+                this.videoCallHandler = undefined;
+                this.meetingStartRequest = undefined;
+                this.websocketCallHandler = undefined;
+                this.meetingHandler = undefined;
+                return [2 /*return*/];
+            });
         });
-        this.allSelfTracksForRestartSFU = undefined;
-        this.eventEmitter.removeAllListeners();
-        this.videoCallHandler = undefined;
-        this.meetingStartRequest = undefined;
-        this.websocketCallHandler = undefined;
-        this.meetingHandler = undefined;
     };
     return CommunicationHandler;
 }());

package/lib/model/Event.d.ts

@@ -29,6 +29,7 @@ export declare enum VaniEvent {
     OnOldMessages = "onOldMessages",
     OnSpeakerChanged = "onSpeakerChanged",
     OnAudioVolumeChanged = "OnAudioVolumeChanged",
+    CheckingInternetConnection = "CheckingInternetConnection",
     OnNotReachable = "notReachable",
     OnReconectionTimeout = "reconectionTimeout",
     OnReconecting = "reconecting",
@@ -45,6 +46,7 @@ interface VaniConnectionEvents {
     [VaniEvent.OnSocketError]: (error: any) => any;
     [VaniEvent.OnSocketConnected]: () => any;
     [VaniEvent.OnSocketReconnectTimeOut]: () => any;
+    [VaniEvent.CheckingInternetConnection]: () => any;
     [VaniEvent.OnConnected]: () => any;
     [VaniEvent.OnConnectionBack]: () => any;
     [VaniEvent.OnPermissionError]: (error: DOMException) => any;

package/lib/model/Event.js

@@ -27,6 +27,7 @@ export var VaniEvent;
     VaniEvent["OnOldMessages"] = "onOldMessages";
     VaniEvent["OnSpeakerChanged"] = "onSpeakerChanged";
     VaniEvent["OnAudioVolumeChanged"] = "OnAudioVolumeChanged";
+    VaniEvent["CheckingInternetConnection"] = "CheckingInternetConnection";
     VaniEvent["OnNotReachable"] = "notReachable";
     VaniEvent["OnReconectionTimeout"] = "reconectionTimeout";
     VaniEvent["OnReconecting"] = "reconecting";

package/lib/user-media-handler/UserMediaHandler.d.ts

@@ -34,5 +34,5 @@ export declare class UserMediaHandler extends Base {
     unmute(userId?: string): Promise<TaskResponse>;
     pauseStreamWithoutStopping(streamKind: TrackKind): TaskResponse;
     resumeStreamWithoutAdding(streamKind: TrackKind): TaskResponse;
-    cleanup(): void;
+    cleanup(): Promise<void>;
 }

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

@@ -799,14 +799,19 @@ var UserMediaHandler = /** @class */ (function (_super) {
         }
     };
     UserMediaHandler.prototype.cleanup = function () {
-        this.tracks.forEach(function (eachTrack) {
-            try {
-                eachTrack.stop();
-            }
-            catch (err) {
-            }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                this.tracks.forEach(function (eachTrack) {
+                    try {
+                        eachTrack.stop();
+                    }
+                    catch (err) {
+                    }
+                });
+                _super.prototype.cleanup.call(this);
+                return [2 /*return*/];
+            });
         });
-        _super.prototype.cleanup.call(this);
     };
     return UserMediaHandler;
 }(Base));

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

@@ -21,7 +21,7 @@ export declare abstract class BaseVideoCallHandler extends Base {
     pauseProducerOrConsumerForTrack(track: Track): Promise<void>;
     reconnectedWithoutPing(): void;
     updateSpatialForTrack(track: Track, spatialLayerIndex: number): Promise<void>;
-    cleanup(shouldStopTracks?: boolean): void;
+    cleanup(shouldStopTracks?: boolean): Promise<void>;
     restartTransport(): void;
     getClientStats: () => Promise<TrackStats[]>;
 }

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

@@ -95,8 +95,13 @@ var BaseVideoCallHandler = /** @class */ (function (_super) {
     };
     BaseVideoCallHandler.prototype.cleanup = function (shouldStopTracks) {
         if (shouldStopTracks === void 0) { shouldStopTracks = true; }
-        this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && log.info("cleanup ");
-        _super.prototype.cleanup.call(this);
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && log.info("cleanup ");
+                _super.prototype.cleanup.call(this);
+                return [2 /*return*/];
+            });
+        });
     };
     BaseVideoCallHandler.prototype.restartTransport = function () {
     };

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

@@ -59,5 +59,5 @@ export declare class SFUHandler extends BaseVideoCallHandler {
     private onSpeakerChanged;
     getClientStats: () => Promise<TrackStats[]>;
     private eachTrackStats;
-    cleanup(shouldStopTracks?: boolean): void;
+    cleanup(shouldStopTracks?: boolean): Promise<void>;
 }

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

@@ -885,77 +885,82 @@ var SFUHandler = /** @class */ (function (_super) {
     };
     SFUHandler.prototype.cleanup = function (shouldStopTracks) {
         if (shouldStopTracks === void 0) { shouldStopTracks = true; }
-        if (this.sendTransport) {
-            try {
-                this.sendTransport.close();
-            }
-            catch (err) {
-            }
-            this.sendTransport = undefined;
-        }
-        if (this.consumerTransport) {
-            try {
-                this.consumerTransport.close();
-            }
-            catch (err) {
-            }
-            this.consumerTransport = undefined;
-        }
-        if (this.producers) {
-            this.producers.forEach(function (producer) {
-                var _a;
-                try {
-                    if (shouldStopTracks) {
-                        try {
-                            (_a = producer.track) === null || _a === void 0 ? void 0 : _a.stop();
-                        }
-                        catch (err) {
-                        }
-                    }
-                }
-                catch (err) {
-                }
-                if (producer.closed === false) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                if (this.sendTransport) {
                     try {
-                        producer.close();
+                        this.sendTransport.close();
                     }
                     catch (err) {
                     }
+                    this.sendTransport = undefined;
                 }
-            });
-        }
-        this.dataProducers.forEach(function (producer) {
-            if (producer.closed === false) {
-                if (shouldStopTracks) {
+                if (this.consumerTransport) {
                     try {
-                        producer.close();
+                        this.consumerTransport.close();
                     }
                     catch (err) {
                     }
+                    this.consumerTransport = undefined;
                 }
-            }
-        });
-        this.dataConsumer.forEach(function (consumer) {
-            if (consumer.closed === false) {
-                try {
-                    consumer.close();
-                }
-                catch (err) {
+                if (this.producers) {
+                    this.producers.forEach(function (producer) {
+                        var _a;
+                        try {
+                            if (shouldStopTracks) {
+                                try {
+                                    (_a = producer.track) === null || _a === void 0 ? void 0 : _a.stop();
+                                }
+                                catch (err) {
+                                }
+                            }
+                        }
+                        catch (err) {
+                        }
+                        if (producer.closed === false) {
+                            try {
+                                producer.close();
+                            }
+                            catch (err) {
+                            }
+                        }
+                    });
                 }
-            }
-        });
-        this.consumers.forEach(function (consumer) {
-            var _a;
-            try {
-                (_a = consumer.track) === null || _a === void 0 ? void 0 : _a.stop();
-            }
-            catch (err) {
-            }
-            if (consumer.closed === false) {
-                consumer.close();
-            }
+                this.dataProducers.forEach(function (producer) {
+                    if (producer.closed === false) {
+                        if (shouldStopTracks) {
+                            try {
+                                producer.close();
+                            }
+                            catch (err) {
+                            }
+                        }
+                    }
+                });
+                this.dataConsumer.forEach(function (consumer) {
+                    if (consumer.closed === false) {
+                        try {
+                            consumer.close();
+                        }
+                        catch (err) {
+                        }
+                    }
+                });
+                this.consumers.forEach(function (consumer) {
+                    var _a;
+                    try {
+                        (_a = consumer.track) === null || _a === void 0 ? void 0 : _a.stop();
+                    }
+                    catch (err) {
+                    }
+                    if (consumer.closed === false) {
+                        consumer.close();
+                    }
+                });
+                _super.prototype.cleanup.call(this);
+                return [2 /*return*/];
+            });
         });
-        _super.prototype.cleanup.call(this);
     };
     return SFUHandler;
 }(BaseVideoCallHandler));

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

@@ -88,7 +88,7 @@ export declare class WebsocketHandler extends Base {
     private pongData;
     private lastPingTimeStamp;
     protected onObjectCreated(): void;
-    cleanup(): void;
+    cleanup(): Promise<void>;
     startSocketConnection(): Promise<void>;
     private connect;
     isWebScoketConnected(): boolean;

package/lib/websocket-handler/WebsocketHandler.js

@@ -163,28 +163,34 @@ var WebsocketHandler = /** @class */ (function (_super) {
     };
     WebsocketHandler.prototype.cleanup = function () {
         var _a;
-        try {
-            var data = { userId: (_a = this.meetingStartRequest) === null || _a === void 0 ? void 0 : _a.userId };
-            this.sendSocketMessage(WebSocketBasicEvents.SelfLeft, data);
-        }
-        catch (err) {
-        }
-        this.loadBalancerIpAddressForWebSocket = undefined;
-        this.isEnded = true;
-        if (this.wss) {
-            this.wss.close();
-            this.wss = undefined;
-            this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && console.log("this.wss undefined cleanup ");
-        }
-        if (this.socketCheckTimeout) {
-            window.clearTimeout(this.socketCheckTimeout);
-            this.socketCheckTimeout = undefined;
-        }
-        if (this.pingCheckTimeout) {
-            window.clearTimeout(this.pingCheckTimeout);
-            this.pingCheckTimeout = undefined;
-        }
-        _super.prototype.cleanup.call(this);
+        return __awaiter(this, void 0, void 0, function () {
+            var data;
+            return __generator(this, function (_b) {
+                try {
+                    data = { userId: (_a = this.meetingStartRequest) === null || _a === void 0 ? void 0 : _a.userId };
+                    this.sendSocketMessage(WebSocketBasicEvents.SelfLeft, data);
+                }
+                catch (err) {
+                }
+                this.loadBalancerIpAddressForWebSocket = undefined;
+                this.isEnded = true;
+                if (this.wss) {
+                    this.wss.close();
+                    this.wss = undefined;
+                    this.meetingStartRequest && this.meetingStartRequest.logLevel === LogLevel.Debug && console.log("this.wss undefined cleanup ");
+                }
+                if (this.socketCheckTimeout) {
+                    window.clearTimeout(this.socketCheckTimeout);
+                    this.socketCheckTimeout = undefined;
+                }
+                if (this.pingCheckTimeout) {
+                    window.clearTimeout(this.pingCheckTimeout);
+                    this.pingCheckTimeout = undefined;
+                }
+                _super.prototype.cleanup.call(this);
+                return [2 /*return*/];
+            });
+        });
     };
     WebsocketHandler.prototype.startSocketConnection = function () {
         return __awaiter(this, void 0, void 0, function () {
@@ -271,10 +277,15 @@ var WebsocketHandler = /** @class */ (function (_super) {
                         this.wss.onerror = function (event) {
                             var _a;
                             _this.meetingStartRequest && _this.meetingStartRequest.logLevel === LogLevel.Debug && console.log("wss error", event);
-                            _this.isWebSocketConnectionInProgress = false;
-                            (_a = _this.communicationHandler) === null || _a === void 0 ? void 0 : _a.emitMessageToSource(VaniEvent.OnSocketError, event);
-                            if (_this.wss) {
-                                _this.wss.close();
+                            if (_this.meetingStartRequest.isMobileApp) {
+                                _this.communicationHandler.onIceCandidateDisconnected();
+                            }
+                            else {
+                                _this.isWebSocketConnectionInProgress = false;
+                                (_a = _this.communicationHandler) === null || _a === void 0 ? void 0 : _a.emitMessageToSource(VaniEvent.OnSocketError, event);
+                                if (_this.wss) {
+                                    _this.wss.close();
+                                }
                             }
                         };
                         this.wss.onclose = function (event) {

package/package.json

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