From f0b16f94f2950e651fd2311a1aebf1d4c1a54b50 Mon Sep 17 00:00:00 2001
From: Albin <albin.larsson@eyevinn.se>
Date: Sun, 27 Nov 2022 20:28:35 +0100
Subject: [PATCH] feat: use variant failover also for BAD_HTTP_STATUS and
 TIMEOUT

Fixes #4728 and #4764
---
 AUTHORS             |  1 +
 CONTRIBUTORS        |  1 +
 lib/player.js       |  8 ++++++--
 test/player_unit.js | 26 ++++++++++++++++++++++----
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index d2a77ceb39..3266b47a6c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,6 +15,7 @@
 
 Adrián Gómez Llorente <adgllorente@gmail.com>
 AdsWizz <*@adswizz.com>
+Albin Larsson <albin.larsson@eyevinn.se>
 Alex Jones <alexedwardjones@gmail.com>
 Alugha GmbH <*@alugha.com>
 Alvaro Velad Galvan <alvaro.velad@mirada.tv>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ad4022bc07..599146b1af 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -26,6 +26,7 @@ Aaron Vaage <vaage@google.com>
 Adrián Gómez Llorente <adgllorente@gmail.com>
 Agajan Jumakuliyev <agajan.tm@gmail.com>
 Aidan Ridley <aidan.ridley@charter.com>
+Albin Larsson <albin.larsson@eyevinn.se>
 Alex Jones <alexedwardjones@gmail.com>
 Alvaro Velad Galvan <alvaro.velad@mirada.tv>
 Amila Sampath <lucksy@gmail.com>
diff --git a/lib/player.js b/lib/player.js
index 1c463a8267..b996642eb2 100644
--- a/lib/player.js
+++ b/lib/player.js
@@ -6030,8 +6030,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @private
    */
   tryToRecoverFromError_(error) {
-    if ((error.code != shaka.util.Error.Code.HTTP_ERROR &&
-      error.code != shaka.util.Error.Code.SEGMENT_MISSING) ||
+    if (![
+      shaka.util.Error.Code.HTTP_ERROR,
+      shaka.util.Error.Code.SEGMENT_MISSING,
+      shaka.util.Error.Code.BAD_HTTP_STATUS,
+      shaka.util.Error.Code.TIMEOUT,
+    ].includes(error.code) ||
       error.category != shaka.util.Error.Category.NETWORK) {
       return false;
     }
diff --git a/test/player_unit.js b/test/player_unit.js
index 7308d9b7ea..7d8fc46acd 100644
--- a/test/player_unit.js
+++ b/test/player_unit.js
@@ -345,10 +345,18 @@ describe('Player', () => {
           shaka.util.Error.Severity.RECOVERABLE,
           shaka.util.Error.Category.NETWORK,
           shaka.util.Error.Code.HTTP_ERROR);
-      const nonHttpError = new shaka.util.Error(
+      const badHttpStatusError = new shaka.util.Error(
+          shaka.util.Error.Severity.RECOVERABLE,
+          shaka.util.Error.Category.NETWORK,
+          shaka.util.Error.Code.BAD_HTTP_STATUS);
+      const timeoutError = new shaka.util.Error(
           shaka.util.Error.Severity.RECOVERABLE,
           shaka.util.Error.Category.NETWORK,
           shaka.util.Error.Code.TIMEOUT);
+      const operationAbortedError = new shaka.util.Error(
+          shaka.util.Error.Severity.RECOVERABLE,
+          shaka.util.Error.Category.NETWORK,
+          shaka.util.Error.Code.OPERATION_ABORTED);
       /** @type {?jasmine.Spy} */
       let dispatchEventSpy;
 
@@ -371,9 +379,9 @@ describe('Player', () => {
         dispatchEventSpy.calls.reset();
       });
 
-      it('does not handle non NETWORK HTTP_ERROR', () => {
-        onErrorCallback(nonHttpError);
-        expect(nonHttpError.handled).toBeFalsy();
+      it('does not handle non recoverable network error', () => {
+        onErrorCallback(operationAbortedError);
+        expect(operationAbortedError.handled).toBeFalsy();
         expect(player.dispatchEvent).toHaveBeenCalled();
       });
 
@@ -440,6 +448,16 @@ describe('Player', () => {
             expect(httpError.handled).toBeTruthy();
           });
 
+          it('handles BAD_HTTP_STATUS', () => {
+            onErrorCallback(badHttpStatusError);
+            expect(badHttpStatusError.handled).toBeTruthy();
+          });
+
+          it('handles TIMEOUT', () => {
+            onErrorCallback(timeoutError);
+            expect(timeoutError.handled).toBeTruthy();
+          });
+
           it('does not dispatch any error', () => {
             onErrorCallback(httpError);
             expect(dispatchEventSpy).not.toHaveBeenCalled();