fix(IceFailedHandling) force client reload when ICE fails locally.

JitsiConference.js

@@ -2788,7 +2788,6 @@ JitsiConference.prototype.isConnectionInterrupted = function() {
  */
 JitsiConference.prototype._onConferenceRestarted = function(session) {
     if (!session.isP2P && this.options.config.enableForcedReload) {
-        this.restartInProgress = true;
         this.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_FAILED, JitsiConferenceErrors.CONFERENCE_RESTARTED);
     }
 };

modules/connectivity/IceFailedHandling.js

@@ -37,19 +37,19 @@ export default class IceFailedHandling {
         const explicitlyDisabled = typeof enableIceRestart !== 'undefined' && !enableIceRestart;
         const supportsRestartByTerminate = this._conference.room.supportsRestartByTerminate();
         const useTerminateForRestart = supportsRestartByTerminate && !enableIceRestart;
-        const reloadClient = this._conference.restartInProgress && enableForcedReload;
 
         logger.info('ICE failed,'
             + ` enableForcedReload: ${enableForcedReload},`
             + ` enableIceRestart: ${enableIceRestart},`
-            + ` restartInProgress: ${this._conference.restartInProgress},`
             + ` supports restart by terminate: ${supportsRestartByTerminate}`);
 
-        if (explicitlyDisabled || (!enableIceRestart && !supportsRestartByTerminate) || reloadClient) {
+        if (explicitlyDisabled || (!enableIceRestart && !supportsRestartByTerminate) || enableForcedReload) {
             logger.info('ICE failed, but ICE restarts are disabled');
-            this._conference.eventEmitter.emit(
-                JitsiConferenceEvents.CONFERENCE_FAILED,
-                JitsiConferenceErrors.ICE_FAILED);
+            const reason = enableForcedReload
+                ? JitsiConferenceErrors.CONFERENCE_RESTARTED
+                : JitsiConferenceErrors.ICE_FAILED;
+
+            this._conference.eventEmitter.emit(JitsiConferenceEvents.CONFERENCE_FAILED, reason);
 
             return;
         }

modules/connectivity/IceFailedHandling.spec.js

@@ -147,4 +147,24 @@ describe('IceFailedHandling', () => {
                 });
         });
     });
+    describe('when forced reloads are enabled', () => {
+        beforeEach(() => {
+            mockConference.options.config.enableIceRestart = undefined;
+            mockConference.options.config.enableForcedReload = true;
+
+            mockConference.room = {
+                supportsRestartByTerminate: () => true
+            };
+        });
+
+        it('emits conference restarted when force reloads are enabled', () => {
+            iceFailedHandling.start();
+
+            return nextTick() // tick for ping
+                .then(() => nextTick(2500)) // tick for ice timeout
+                .then(() => {
+                    expect(emitEventSpy).toHaveBeenCalled();
+                });
+        });
+    });
 });