From 12f215ddd9571c5ae9394386f4ed9032526ebcf5 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Tue, 29 Sep 2020 11:59:30 +0200
Subject: [PATCH] openvidu-browser: fix unexpected undefined exception on
 reconnected callback

---
 openvidu-browser/src/OpenVidu/OpenVidu.ts | 40 +++++++++++++----------
 openvidu-browser/src/OpenVidu/Session.ts  |  2 +-
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/openvidu-browser/src/OpenVidu/OpenVidu.ts b/openvidu-browser/src/OpenVidu/OpenVidu.ts
index 8820a72c..bfb971e6 100644
--- a/openvidu-browser/src/OpenVidu/OpenVidu.ts
+++ b/openvidu-browser/src/OpenVidu/OpenVidu.ts
@@ -337,10 +337,10 @@ export class OpenVidu {
     const family = platform.os!!.family;
     const userAgent = !!platform.ua ? platform.ua : navigator.userAgent;
 
-    if(this.isIPhoneOrIPad(userAgent)) {
-        if(this.isIOSWithSafari(userAgent) || platform['isIonicIos']){
-          return 1;
-        }
+    if (this.isIPhoneOrIPad(userAgent)) {
+      if (this.isIOSWithSafari(userAgent) || platform['isIonicIos']) {
+        return 1;
+      }
       return 0;
     }
 
@@ -377,7 +377,7 @@ export class OpenVidu {
     }
 
     if ((browser !== 'Chrome') && (browser !== 'Firefox') && (browser !== 'Opera') && (browser !== 'Electron') &&
-       (browser === 'Safari' && version < 13)) {
+      (browser === 'Safari' && version < 13)) {
       return 0;
     } else {
       return 1;
@@ -1025,17 +1025,21 @@ export class OpenVidu {
   private reconnectedCallback(): void {
     logger.warn('Websocket reconnected');
     if (this.isRoomAvailable()) {
-      this.sendRequest('connect', { sessionId: this.session.connection.rpcSessionId }, (error, response) => {
-        if (!!error) {
-          logger.error(error);
-          logger.warn('Websocket was able to reconnect to OpenVidu Server, but your Connection was already destroyed due to timeout. You are no longer a participant of the Session and your media streams have been destroyed');
-          this.session.onLostConnection("networkDisconnect");
-          this.jsonRpcClient.close(4101, "Reconnection fault");
-        } else {
-          this.jsonRpcClient.resetPing();
-          this.session.onRecoveredConnection();
-        }
-      });
+      if (!!this.session.connection) {
+        this.sendRequest('connect', { sessionId: this.session.connection.rpcSessionId }, (error, response) => {
+          if (!!error) {
+            logger.error(error);
+            logger.warn('Websocket was able to reconnect to OpenVidu Server, but your Connection was already destroyed due to timeout. You are no longer a participant of the Session and your media streams have been destroyed');
+            this.session.onLostConnection("networkDisconnect");
+            this.jsonRpcClient.close(4101, "Reconnection fault");
+          } else {
+            this.jsonRpcClient.resetPing();
+            this.session.onRecoveredConnection();
+          }
+        });
+      } else {
+        logger.warn('There was no previous connection when running reconnection callback');
+      }
     } else {
       alert('Connection error. Please reload page.');
     }
@@ -1064,9 +1068,9 @@ export class OpenVidu {
     return isIPad || isIPhone;
   }
 
-  private isIOSWithSafari(userAgent): boolean{
+  private isIOSWithSafari(userAgent): boolean {
     return /\b(\w*Apple\w*)\b/.test(navigator.vendor) && /\b(\w*Safari\w*)\b/.test(userAgent)
-          && !/\b(\w*CriOS\w*)\b/.test(userAgent) && !/\b(\w*FxiOS\w*)\b/.test(userAgent);
+      && !/\b(\w*CriOS\w*)\b/.test(userAgent) && !/\b(\w*FxiOS\w*)\b/.test(userAgent);
   }
 
 
diff --git a/openvidu-browser/src/OpenVidu/Session.ts b/openvidu-browser/src/OpenVidu/Session.ts
index f6650a68..09f5a38a 100644
--- a/openvidu-browser/src/OpenVidu/Session.ts
+++ b/openvidu-browser/src/OpenVidu/Session.ts
@@ -987,7 +987,7 @@ export class Session extends EventDispatcher {
      */
     onLostConnection(reason: string): void {
         logger.warn('Lost connection in Session ' + this.sessionId);
-        if (!!this.sessionId && !this.connection.disposed) {
+        if (!!this.sessionId && !!this.connection && !this.connection.disposed) {
             this.leave(true, reason);
         }
     }