fix: force HLS for all iOS browsers

digris · May 22, 2023 · 6362abd · 6362abd
1 parent 2e009eb
commit 6362abd
Show file tree

Hide file tree

Showing 7 changed files with 1,463 additions and 1,455 deletions.
diff --git a/core/catalog/sync/release.py b/core/catalog/sync/release.py
@@ -23,7 +23,7 @@ def sync_release(release, skip_images=False, **kwargs):
         "name": data.get("name").strip(),
         "updated": timezone.make_aware(datetime.fromisoformat(data.get("updated"))),
         "release_date": data.get("releasedate"),
-        "release_type": data.get("type", ""),
+        "release_type": data.get("type") or "",
     }
 
     type(release).objects.filter(id=release.id).update(**update)

diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "qrcode.vue": "^3.3.3",
     "qs": "^6.10.3",
     "sass": "^1.49.9",
-    "shaka-player": "4.3.0",
+    "shaka-player": "4.3.6",
     "shifty": "^2.17.1",
     "showdown": "^2.1.0",
     "vanilla-cookieconsent": "^2.8.9",

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -56,6 +56,7 @@ python-dateutil = "^2.8.2"
 django-tree-queries = "^0.14.0"
 google-cloud-bigquery = "^3.9.0"
 ua-parser = "^0.16.1"
+grpcio = "1.51.3"
 
 [tool.poetry.group.dev.dependencies]
 django-debug-toolbar = "*"
@@ -189,4 +190,4 @@ target-version = "py311"
 
 [tool.ruff.mccabe]
 # Unlike Flake8, default to a complexity level of 10.
-max-complexity = 8
+max-complexity = 8
diff --git a/src/player/audioPlayer.ts b/src/player/audioPlayer.ts
@@ -289,20 +289,24 @@ class AudioPlayer {
   // un-block safari playback.
   // this has to be invoked by a user-interaction (click / tap)
   async unblockPlay() {
-    const { isSafari } = useDevice();
-    if (!isSafari) {
-      log.debug("AudioPlayer - no unblock needed for non-safari browser");
-      return;
-    }
+    const { isMobile, isSafari } = useDevice();
     if (this.isUnblocked) {
       log.debug("AudioPlayer - already unblocked - nothing to do");
       return;
     }
+    if (!isMobile.value) {
+      if (!isSafari) {
+        log.debug("AudioPlayer - no unblock needed for non-mobile and/or non safari browser");
+        return;
+      }
+    }
     log.debug("AudioPlayer - load & play silence");
     // set source to base64 encode 0.001s audio
     this.audio.src =
       "data:audio/wav;base64,UklGRsgAAABXQVZFZm10ICgAAAD+/wIAgD4AAAD0AQAIACAAFgAgAAMAAAABAAAAAAAQAIAAAKoAOJtxZmFjdAQAAAAQAAAAZGF0YYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==";
     await this.audio.play();
+    this.audio.pause();
+    this.audio.currentTime = 0;
     this.isUnblocked = true;
     log.debug("AudioPlayer - un-blocked");
   }

diff --git a/src/utils/browser.ts b/src/utils/browser.ts
@@ -1,7 +1,7 @@
 import Bowser from "bowser";
 
 const parser = Bowser.getParser(window.navigator.userAgent);
-// const osName = parser.getOSName(true);
+const osName = parser.getOSName(true);
 const browserName = parser.getBrowserName(true);
 
 const getMediaFormat = () => {
@@ -10,6 +10,9 @@ const getMediaFormat = () => {
   if (browserName === "safari") {
     return "hls";
   }
+  if (osName === "ios") {
+    return "hls";
+  }
   return "dash";
 };
 

diff --git a/yarn.lock b/yarn.lock
@@ -3986,10 +3986,10 @@ semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
   dependencies:
     lru-cache "^6.0.0"
 
-[email protected].0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/shaka-player/-/shaka-player-4.3.0.tgz#1508e1949232b2a47718ce69524b63c777e69f1e"
-  integrity sha512-3obEhekQc6UZJFKWWlPkF6AHO4uA7vQpYDm23LXwuau3+UVlulkYyoZLbAvs1/WJ89h/PA0wk5W97FYPTzgNAw==
+[email protected].6:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/shaka-player/-/shaka-player-4.3.6.tgz#9cc99f7918bb8da4b4eadb9215e781de89220f3a"
+  integrity sha512-IX0rJY9NZyENcFH3MDf50cpOLOBsWWdaX8D3Fy0kSl7j1D1I+sXrzOQ2LxFgwmlqbIX3XrHzY9bxiWapV3ZjEg==
   dependencies:
     eme-encryption-scheme-polyfill "^2.1.1"