use polling fallback when socket server fails in SocketConnection com…

…ponent.
janeapp · Oct 1, 2021 · 21cf57a · 21cf57a
1 parent 67c641e
commit 21cf57a
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 14 deletions.
diff --git a/lang/main.json b/lang/main.json
@@ -599,7 +599,10 @@
         "youMayTest": "You may test your audio and video while you wait.",
         "callWillBegin": "Your call will automatically begin momentarily.",
         "authenticationExpired": "Your appointment booking has expired",
-        "minutes": "{{duration}} Minutes"
+        "minutes": "{{duration}} Minutes",
+        "errorTitleKey": "Waiting area error.",
+        "socketFailed": "Unable to connect to websocket.",
+        "socketFallback": "Fallback to polling."
     },
     "preCallMessage": {
         "sitBack": "Sit back, relax and take a moment for yourself.",

diff --git a/react/features/jane-waiting-area/actions.js b/react/features/jane-waiting-area/actions.js
@@ -19,6 +19,7 @@ import {
     SET_JANE_WAITING_AREA_AUTH_STATE
 } from './actionTypes';
 import {
+    updateParticipantReadyStatus,
     detectLegacyMobileApp,
     getAudioTrack,
     getVideoTrack, hasRemoteParticipantInBeginStatus
@@ -74,6 +75,7 @@ export function initJaneWaitingArea(tracks: Object[], errors: Object) {
 
 export function joinConference() {
     return function(dispatch: Function) {
+        updateParticipantReadyStatus('joined');
         dispatch(setJaneWaitingAreaPageVisibility(false));
         dispatch(startConference());
     };

diff --git a/react/features/jane-waiting-area/components/SocketConnection.web.js b/react/features/jane-waiting-area/components/SocketConnection.web.js
@@ -5,14 +5,20 @@ import { Component } from 'react';
 
 import { Socket } from '../../../../service/Websocket/socket';
 import {
+    createWaitingAreaModalEvent,
     createWaitingAreaParticipantStatusChangedEvent,
     createWaitingAreaSocketEvent,
     sendAnalytics
 } from '../../analytics';
+import {
+    redirectToStaticPage
+} from '../../app/actions';
 import { getLocalParticipantInfoFromJwt, getLocalParticipantType } from '../../base/participants/functions';
 import { connect } from '../../base/redux';
 import { playSound as playSoundAction } from '../../base/sounds';
 import { sleep } from '../../base/util/helpers';
+import { showErrorNotification as showErrorNotificationAction,
+    showNotification as showNotificationAction } from '../../notifications';
 import {
     setJaneWaitingAreaAuthState as setJaneWaitingAreaAuthStateAction,
     updateRemoteParticipantsStatuses as updateRemoteParticipantsStatusesAction,
@@ -40,16 +46,24 @@ type Props = {
     playSound: Function,
     joinConference: Function,
     setJaneWaitingAreaAuthState: Function,
-    remoteParticipantsStatuses: any
+    remoteParticipantsStatuses: any,
+    showErrorNotification: Function,
+    showNotification: Function
 };
 
 class SocketConnection extends Component<Props> {
 
     socket: Object;
 
+    interval: ?IntervalID;
+
+    pollingRetries: number;
+
     constructor(props) {
         super(props);
         this.socket = null;
+        this.interval = undefined;
+        this.pollingRetries = 0;
     }
 
     componentDidMount() {
@@ -89,6 +103,10 @@ class SocketConnection extends Component<Props> {
     }
 
     componentWillUnmount() {
+        if (this.interval) {
+            clearInterval(this.interval);
+            this.interval = undefined;
+        }
         this.socket && this.socket.disconnect();
     }
 
@@ -117,19 +135,59 @@ class SocketConnection extends Component<Props> {
     }
 
     _connectionStatusListener(status) {
-        const { isRNWebViewPage, joinConference } = this.props;
+        const { showNotification } = this.props;
 
-        if (isRNWebViewPage) {
-            sendMessageToIosApp({ message: status });
-        }
         if (status && status.error) {
-            joinConference();
+            sendAnalytics(createWaitingAreaSocketEvent('error', status.error));
+            sendAnalytics(createWaitingAreaModalEvent('start.polling'));
+
+            showNotification({
+                descriptionKey: 'janeWaitingArea.socketFallback',
+                titleKey: 'janeWaitingArea.socketFailed'
+            });
+            this._polling();
         }
     }
 
+    _polling() {
+        const { participantType, updateRemoteParticipantsStatuses, showErrorNotification, setJaneWaitingAreaAuthState, isRNWebViewPage } = this.props;
+
+        this.interval
+            = setInterval(
+            async () => {
+                try {
+                    const response = await checkRoomStatus();
+                    const remoteParticipantsStatuses = getRemoteParticipantsStatuses(response.participant_statuses, participantType);
+
+                    updateRemoteParticipantsStatuses(remoteParticipantsStatuses);
+                } catch (error) {
+                    if (this.pollingRetries === 3) {
+                        if (isRNWebViewPage) {
+                            sendMessageToIosApp({ message: error });
+                        } else if (error && error.error === 'Signature has expired') {
+                            setJaneWaitingAreaAuthState('failed');
+                        }
+                        showErrorNotification({
+                            description: error && error.error,
+                            titleKey: 'janeWaitingArea.errorTitleKey'
+                        });
+                        sendAnalytics(createWaitingAreaModalEvent('polling.stoped'));
+                        clearInterval(this.interval);
+                        throw Error(error);
+                    }
+                    this.pollingRetries++;
+                }
+            },
+            3000);
+    }
 
     async _connectSocket() {
-        const { participantType, isRNWebViewPage, updateRemoteParticipantsStatuses, joinConference, setJaneWaitingAreaAuthState } = this.props;
+        const { participantType,
+            isRNWebViewPage,
+            updateRemoteParticipantsStatuses,
+            setJaneWaitingAreaAuthState,
+            showErrorNotification,
+            redirectToWelcomePage } = this.props;
 
         try {
             const response = await checkRoomStatus();
@@ -149,9 +207,15 @@ class SocketConnection extends Component<Props> {
                 sendMessageToIosApp({ message: error });
             } else if (error && error.error === 'Signature has expired') {
                 setJaneWaitingAreaAuthState('failed');
-            } else {
-                joinConference();
             }
+            showErrorNotification({
+                description: error && error.error,
+                titleKey: 'janeWaitingArea.errorTitleKey'
+            });
+            console.error(error);
+
+            // redirect user to the welcome page
+            redirectToWelcomePage();
         }
     }
 
@@ -191,6 +255,15 @@ function mapDispatchToProps(dispatch) {
         },
         setJaneWaitingAreaAuthState(state) {
             dispatch(setJaneWaitingAreaAuthStateAction(state));
+        },
+        showErrorNotification(error) {
+            dispatch(showErrorNotificationAction(error));
+        },
+        showNotification(error) {
+            dispatch(showNotificationAction(error));
+        },
+        redirectToWelcomePage() {
+            dispatch(redirectToStaticPage('/'));
         }
     };
 }

diff --git a/react/features/jane-waiting-area/components/modal/Modal.js b/react/features/jane-waiting-area/components/modal/Modal.js
@@ -15,8 +15,7 @@ import {
     joinConference as joinConferenceAction
 } from '../../actions';
 import {
-    checkLocalParticipantCanJoin,
-    updateParticipantReadyStatus
+    checkLocalParticipantCanJoin
 } from '../../functions';
 import ActionButton from '../buttons/ActionButton';
 
@@ -114,7 +113,6 @@ class Modal extends Component<Props> {
     _joinConference() {
         const { joinConference } = this.props;
 
-        updateParticipantReadyStatus('joined');
         joinConference();
     }
 

diff --git a/react/features/jane-waiting-area/functions.js b/react/features/jane-waiting-area/functions.js
@@ -187,7 +187,7 @@ export function updateParticipantReadyStatus(status: string): void {
         sendAnalytics(createWaitingAreaParticipantStatusChangedEvent('failed'));
         window.APP.store.dispatch(showErrorNotification({
             descriptionKey: error,
-            titleKey: 'Waiting area error'
+            titleKey: 'janeWaitingArea.errorTitleKey'
         }));
         console.error(error);
     });