rx-player 3.26.1 → 3.26.2

package/scripts/doc-generator/utils.js

@@ -0,0 +1,85 @@
+const { promisify } = require("util");
+const fs = require("fs");
+const path = require("path");
+
+/**
+ * Recursive mkdir (create parent directories if they do not exist).
+ * @param {string} dirPath
+ * @param {string} mode
+ * @returns {Promise}
+ */
+async function mkdirParent(dirPath, mode) {
+  try {
+    await promisify(fs.mkdir)(dirPath, mode);
+  } catch(error) {
+    if (error && error.errno === -2) {
+      return mkdirParent(path.dirname(dirPath), mode)
+        .then(() => mkdirParent(dirPath, mode));
+    }
+    throw error;
+  }
+};
+
+/**
+ * @param {string} val
+ * @returns {string}
+ */
+function encodeHtmlAttributeValue(val) {
+  return val
+    .replace(/&/g, "&")
+    .replace(/"/g, """);
+}
+
+/**
+ * @param {string} target
+ * @param {string} currentDir
+ * @returns {string}
+ */
+function toUriCompatibleRelativePath(target, currentDir) {
+  // TODO this is quite ugly but should work for most cases.
+  // See if there's a better and more compatible way of doing this.
+  let relativePath = path.relative(currentDir, target);
+  return pathToUrl(relativePath);
+}
+
+/**
+ * @param {string} _pathStr
+ * @returns {string}
+ */
+function pathToUrl(_pathStr) {
+  let pathStr = _pathStr;
+
+  // TODO this is quite ugly but should work for most cases.
+  // See if there's a better and more compatible way of doing this.
+  if (path.sep !== "/") {
+    pathStr = pathStr.split(path.sep).join("/");
+  }
+  pathStr = encodeURIComponent(pathStr).replace(/%2F/g, "/");
+  if (pathStr[0] !== ".") {
+    pathStr = "./" + pathStr;
+  }
+  return pathStr;
+}
+
+function getGithubSvg() {
+  return "<svg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'>" +
+    "<path d='M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 "+
+    "11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4." +
+    "042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-" +
+    ".729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 " +
+    "3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 " +
+    "0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 " +
+    "3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 " +
+    "3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 " +
+    "3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 " +
+    "2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 " +
+    "12.297c0-6.627-5.373-12-12-12'/></svg>";
+}
+
+module.exports = {
+  encodeHtmlAttributeValue,
+  getGithubSvg,
+  mkdirParent,
+  pathToUrl,
+  toUriCompatibleRelativePath,
+};

package/scripts/fast_demo_build.js

@@ -0,0 +1,143 @@
+/**
+ * # fast_demo_build.js
+ *
+ * This file allows to perform a "fast" build of the RxPlayer's demo, by using
+ * esbuild.
+ *
+ * You can either run it directly as a script (run `node fast_demo_build.js -h`
+ * to see the different options) or by requiring it as a node module.
+ * If doing the latter you will obtain a function you will have to run with the
+ * right options.
+ */
+
+const path = require("path");
+const esbuild = require("esbuild");
+const getHumanReadableHours = require("./utils/get_human_readable_hours");
+
+// If true, this script is called directly
+if (require.main === module) {
+  const { argv } = process;
+  if (argv.includes("-h") || argv.includes("--help")) {
+    displayHelp();
+    process.exit(0);
+  }
+  const shouldWatch = argv.includes("-w") || argv.includes("--watch");
+  const shouldMinify = argv.includes("-m") || argv.includes("--minify");
+  const production = argv.includes("-p") || argv.includes("--production-mode");
+  fastDemoBuild({
+    watch: shouldWatch,
+    minify: shouldMinify,
+    production,
+  });
+} else {
+  // This script is loaded as a module
+  module.exports = fastDemoBuild;
+}
+
+/**
+ * Build the demo with the given options.
+ * @param {Object} options
+ * @param {boolean} [options.minify] - If `true`, the output will be minified.
+ * @param {boolean} [options.production] - If `false`, the code will be compiled
+ * in "development" mode, which has supplementary assertions.
+ * @param {boolean} [options.watch] - If `true`, the RxPlayer's files involve
+ * will be watched and the code re-built each time one of them changes.
+ */
+function fastDemoBuild(options) {
+  const minify = !!options.minify;
+  const watch = !!options.watch;
+  const isDevMode = !options.production;
+  let beforeTime = process.hrtime.bigint();
+
+  esbuild.build({
+    entryPoints: [path.join(__dirname, "../demo/full/scripts/index.jsx")],
+    bundle: true,
+    minify,
+    outfile: path.join(__dirname, "../demo/full/bundle.js"),
+    watch: !watch ? undefined : {
+      onRebuild(error, result) {
+        if (error) {
+          console.error(`\x1b[31m[${getHumanReadableHours()}]\x1b[0m Demo re-build failed:`,
+                        err);
+        } else {
+          if (result.errors > 0 || result.warnings > 0) {
+            const { errors, warnings } = result;
+            console.log(`\x1b[33m[${getHumanReadableHours()}]\x1b[0m ` +
+                        `Demo re-built with ${errors.length} error(s) and ` +
+                        ` ${warnings.length} warning(s) ` +
+                        `(in ${stats.endTime - stats.startTime} ms).`);
+          }
+          console.log(`\x1b[32m[${getHumanReadableHours()}]\x1b[0m ` +
+                      "Demo re-built!");
+        }
+      },
+    },
+    define: {
+      "process.env.NODE_ENV": JSON.stringify(isDevMode ? "development" : "production"),
+      __FEATURES__: JSON.stringify({
+        IS_DISABLED: 0,
+        IS_ENABLED: 1,
+
+        BIF_PARSER: 1,
+        DASH: 1,
+        DIRECTFILE: 1,
+        EME: 1,
+        HTML_SAMI: 1,
+        HTML_SRT: 1,
+        HTML_TTML: 1,
+        HTML_VTT: 1,
+        LOCAL_MANIFEST: 1,
+        METAPLAYLIST: 1,
+        NATIVE_SAMI: 1,
+        NATIVE_SRT: 1,
+        NATIVE_TTML: 1,
+        NATIVE_VTT: 1,
+        SMOOTH: 1,
+      }),
+      __ENVIRONMENT__: JSON.stringify({
+        PRODUCTION: 0,
+        DEV: 1,
+        CURRENT_ENV: isDevMode ? 1 : 0,
+      }),
+      __LOGGER_LEVEL__: JSON.stringify({
+        CURRENT_LEVEL: "INFO",
+      }),
+    }
+  }).then(
+  (result) => {
+    if (result.errors > 0 || result.warnings > 0) {
+      const { errors, warnings } = result;
+      console.log(`\x1b[33m[${getHumanReadableHours()}]\x1b[0m ` +
+                  `Demo built with ${errors.length} error(s) and ` +
+                  ` ${warnings.length} warning(s) ` +
+                  `(in ${stats.endTime - stats.startTime} ms).`);
+    }
+    const fullTime = (process.hrtime.bigint() - beforeTime) / 1000000n;
+    console.log(`\x1b[32m[${getHumanReadableHours()}]\x1b[0m ` +
+                `Build done in ${fullTime}ms`);
+  },
+  (err) => {
+    console.error(`\x1b[31m[${getHumanReadableHours()}]\x1b[0m Demo build failed:`,
+                  err);
+    process.exit(1);
+  });
+}
+
+/**
+ * Display through `console.log` an helping message relative to how to run this
+ * script.
+ */
+function displayHelp() {
+  /* eslint-disable no-console */
+  console.log(
+  /* eslint-disable indent */
+`Usage: node generate_full_demo.js [options]
+Options:
+  -h, --help             Display this help
+  -m, --minify           Minify the built demo
+  -p, --production-mode  Build all files in production mode (less runtime checks, mostly).
+  -w, --watch            Re-build each time either the demo or library files change`,
+  /* eslint-enable indent */
+  );
+  /* eslint-enable no-console */
+}

package/scripts/generate_documentation_list.js

@@ -86,8 +86,12 @@ if (versions.length <= 0) {
   const sortedVersions = sortVersions(versions);
   for (let i = 0; i < sortedVersions.length; i++) {
     const version = sortedVersions[i];
-    // const versionAsNumber = +version.split(".").join();
-    const dirPath = path.join(INITIAL_PATH, version, "doc/pages/index.html");
+
+    // documentation homepage changed for the v3.26.1
+    const dirPath = semver.gte(version, "3.26.1") ?
+      path.join(INITIAL_PATH, version, "doc/api/Overview.html") :
+      path.join(INITIAL_PATH, version, "doc/pages/index.html");
+
     body += `<li><a href=${sanitizeHTML(dirPath)}>` +
       sanitizeHTML(version) +
       "</a></li>";

package/scripts/generate_full_demo.js

@@ -5,7 +5,7 @@
  * Build the full demo
  * ===================
  *
- * This script allows to build the full demo locally.
+ * This script allows to build the full demo locally, by using Webpack's bundler.
  *
  * You can either run it directly as a script (run `node
  * generate_full_demo.js -h` to see the different options) or by requiring it as
@@ -58,11 +58,6 @@ function generateFullDemo(options) {
     entry: path.join(__dirname, "../demo/full/scripts/index.jsx"),
     resolve: {
       extensions: [".ts", ".tsx", ".js", ".jsx", ".json"],
-      alias: {
-        ["rx-player$"]: path.resolve(__dirname, "../src/index.ts"),
-        ["rx-player/tools$"]: path.resolve(__dirname, "../src/tools/index.ts"),
-        ["rx-player/experimental/tools$"]: path.resolve(__dirname, "../src/experimental/tools/index.ts"),
-      },
     },
     output: {
       path: path.join(__dirname, "../demo/full"),
@@ -106,51 +101,33 @@ function generateFullDemo(options) {
     },
     plugins: [
       new Webpack.DefinePlugin({
-        __DEV__: isDevMode,
-        __LOGGER_LEVEL__: "\"INFO\"",
-        "process.env": {
-          NODE_ENV: JSON.stringify(isDevMode ? "development" : "production"),
-        },
         __FEATURES__: {
-          BIF_PARSER: true,
-          DASH: true,
-          DIRECTFILE: true,
-          EME: true,
-          HTML_SAMI: true,
-          HTML_SRT: true,
-          HTML_TTML: true,
-          HTML_VTT: true,
-          LOCAL_MANIFEST: true,
-          METAPLAYLIST: true,
-          NATIVE_SAMI: true,
-          NATIVE_SRT: true,
-          NATIVE_TTML: true,
-          NATIVE_VTT: true,
-          SMOOTH: true,
-        },
+          IS_DISABLED: 0,
+          IS_ENABLED: 1,
 
-        // Path relative to src/features where optional features are implemented
-        __RELATIVE_PATH__: {
-          BIF_PARSER: JSON.stringify("../parsers/images/bif.ts"),
-          DASH: JSON.stringify("../transports/dash/index.ts"),
-          DASH_JS_PARSER: JSON.stringify("../parsers/manifest/dash/js-parser/index.ts"),
-          DIRECTFILE: JSON.stringify("../core/init/initialize_directfile.ts"),
-          EME_MANAGER: JSON.stringify("../core/eme/index.ts"),
-          HTML_SAMI: JSON.stringify("../parsers/texttracks/sami/html.ts"),
-          HTML_SRT: JSON.stringify("../parsers/texttracks/srt/html.ts"),
-          HTML_TEXT_BUFFER: JSON.stringify("../core/segment_buffers/implementations/text/html/index.ts"),
-          HTML_TTML: JSON.stringify("../parsers/texttracks/ttml/html/index.ts"),
-          HTML_VTT: JSON.stringify("../parsers/texttracks/webvtt/html/index.ts"),
-          IMAGE_BUFFER: JSON.stringify("../core/segment_buffers/implementations/image/index.ts"),
-          LOCAL_MANIFEST: JSON.stringify("../transports/local/index.ts"),
-          MEDIA_ELEMENT_TRACK_CHOICE_MANAGER: JSON.stringify("../core/api/media_element_track_choice_manager.ts"),
-          METAPLAYLIST: JSON.stringify("../transports/metaplaylist/index.ts"),
-          NATIVE_SAMI: JSON.stringify("../parsers/texttracks/sami/native.ts"),
-          NATIVE_SRT: JSON.stringify("../parsers/texttracks/srt/native.ts"),
-          NATIVE_TEXT_BUFFER: JSON.stringify("../core/segment_buffers/implementations/text/native/index.ts"),
-          NATIVE_TTML: JSON.stringify("../parsers/texttracks/ttml/native/index.ts"),
-          NATIVE_VTT: JSON.stringify("../parsers/texttracks/webvtt/native/index.ts"),
-          SMOOTH: JSON.stringify("../transports/smooth/index.ts"),
+          BIF_PARSER: 1,
+          DASH: 1,
+          DIRECTFILE: 1,
+          EME: 1,
+          HTML_SAMI: 1,
+          HTML_SRT: 1,
+          HTML_TTML: 1,
+          HTML_VTT: 1,
+          LOCAL_MANIFEST: 1,
+          METAPLAYLIST: 1,
+          NATIVE_SAMI: 1,
+          NATIVE_SRT: 1,
+          NATIVE_TTML: 1,
+          NATIVE_VTT: 1,
+          SMOOTH: 1,
+        },
+        __ENVIRONMENT__: {
+          PRODUCTION: 0,
+          DEV: 1,
+          CURRENT_ENV: isDevMode ? 1 : 0,
+        },
+        __LOGGER_LEVEL__: {
+          CURRENT_LEVEL: "\"INFO\"",
         },
       }),
     ],

package/scripts/start_demo_web_server.js

@@ -15,12 +15,22 @@
  */
 
 const path = require("path");
-const generateFullDemo = require("./generate_full_demo");
+const fastBuild = require("./fast_demo_build");
+const slowBuild = require("./generate_full_demo");
 const launchStaticServer = require("./launch_static_server");
 
-generateFullDemo({ watch: true,
-                   minify: false,
-                   production: false });
+const shouldRunFastVersion = process.argv.includes("--fast") ||
+                             process.argv.includes("-f");
+
+if (shouldRunFastVersion) {
+  fastBuild({ watch: true,
+              minify: false,
+              production: false });
+} else {
+  slowBuild({ watch: true,
+              minify: false,
+              production: false });
+}
 
 launchStaticServer(path.join(__dirname, "../demo/full/"),
                    { certificatePath: path.join(__dirname, "../localhost.crt"),

package/scripts/update-version

@@ -32,7 +32,7 @@ npm install
 npm run build
 npm run build:min
 npm run build:wasm:release
-./scripts/generate_builds
+npm run build:modular
 
 echo "creating types for legacy code bases..."
 rm -f dist/rx-player.d.ts rx-player.min.d.ts

package/sonar-project.properties

@@ -1,6 +1,7 @@
 sonar.projectKey=rx-player
+sonar.organization=rx-player
 sonar.projectName=rx-player
-sonar.projectVersion=3.26.1
+sonar.projectVersion=3.26.2
 sonar.sources=./src,./demo,./tests
 sonar.exclusions=demo/full/bundle.js,demo/standalone/lib.js,demo/bundle.js
 sonar.host.url=https://sonarcloud.io

package/src/compat/__tests__/add_text_track.test.ts

@@ -20,6 +20,7 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 
 describe("compat - addTextTrack", () => {
   beforeEach(() => {

package/src/compat/__tests__/clear_element_src.test.ts

@@ -32,10 +32,6 @@ describe("Compat - clearElementSrc", () => {
       src: "foo",
       removeAttribute() { return null; },
     };
-    jest.mock("../browser_detection.ts", () => ({
-      __esModule: true as const,
-      isFirefox: false,
-    }));
     const clearElementSrc = require("../clear_element_src").default;
 
     const spyRemoveAttribute = jest.spyOn(fakeElement, "removeAttribute");
@@ -50,10 +46,6 @@ describe("Compat - clearElementSrc", () => {
       src: "foo",
       removeAttribute() { throw new Error("Oups, can't remove attribute."); },
     };
-    jest.mock("../browser_detection.ts", () => ({
-      __esModule: true as const,
-      isFirefox: false,
-    }));
     const clearElementSrc = require("../clear_element_src").default;
     const spyRemoveAttribute = jest.spyOn(fakeElement, "removeAttribute");
 
@@ -63,7 +55,7 @@ describe("Compat - clearElementSrc", () => {
     expect(spyRemoveAttribute).toHaveBeenCalledTimes(1);
   });
 
-  it("should disable text tracks and remove childs if on firefox", () => {
+  it("should disable text tracks and remove childs", () => {
     const fakeElement = {
       src: "foo",
       removeAttribute() { return null; },
@@ -84,10 +76,6 @@ describe("Compat - clearElementSrc", () => {
       },
     };
 
-    jest.mock("../browser_detection.ts", () => ({
-      __esModule: true as const,
-      isFirefox: true,
-    }));
     const clearElementSrc = require("../clear_element_src").default;
 
     const spyRemoveAttribute = jest.spyOn(fakeElement, "removeAttribute");
@@ -107,7 +95,7 @@ describe("Compat - clearElementSrc", () => {
     expect(spyRemoveChild).toHaveBeenCalledWith({ nodeName: "track" });
   });
 
-  it("should log when failed to remove text track child node if on firefox", () => {
+  it("should log when failed to remove text track child node", () => {
     const fakeElement = {
       src: "foo",
       removeAttribute() { return null; },
@@ -126,11 +114,6 @@ describe("Compat - clearElementSrc", () => {
       },
     };
 
-    jest.mock("../browser_detection", () => ({
-      __esModule: true as const,
-      isFirefox: true,
-    }));
-
     const mockLogWarn = jest.fn((message) => message);
     jest.mock("../../log", () => ({
       __esModule: true as const,
@@ -173,10 +156,6 @@ describe("Compat - clearElementSrc", () => {
       removeChild: () => null,
     };
 
-    jest.mock("../browser_detection.ts", () => ({
-      __esModule: true as const,
-      isFirefox: true,
-    }));
     const clearElementSrc = require("../clear_element_src").default;
 
     const spyRemoveAttribute = jest.spyOn(fakeElement, "removeAttribute");
@@ -193,7 +172,7 @@ describe("Compat - clearElementSrc", () => {
     expect(spyRemoveChild).not.toHaveBeenCalled();
   });
 
-  it("should not handle text tracks nodes is has no child nodes if on firefox", () => {
+  it("should not handle text tracks nodes is has no child nodes", () => {
     const fakeElement = {
       src: "foo",
       removeAttribute() { return null; },
@@ -203,10 +182,6 @@ describe("Compat - clearElementSrc", () => {
       removeChild: () => null,
     };
 
-    jest.mock("../browser_detection.ts", () => ({
-      __esModule: true as const,
-      isFirefox: true,
-    }));
     const clearElementSrc = require("../clear_element_src").default;
 
     const spyRemoveAttribute = jest.spyOn(fakeElement, "removeAttribute");
@@ -222,4 +197,56 @@ describe("Compat - clearElementSrc", () => {
     expect(spyHasChildNodes).toHaveBeenCalledTimes(1);
     expect(spyRemoveChild).not.toHaveBeenCalled();
   });
+
+  it("should not throw if the textTracks attribute is `null`", () => {
+    const fakeElement = {
+      src: "foo",
+      removeAttribute() { return null; },
+      textTracks: null,
+      childNodes: [],
+      hasChildNodes: () => false,
+      removeChild: () => null,
+    };
+
+    const clearElementSrc = require("../clear_element_src").default;
+
+    const spyRemoveAttribute = jest.spyOn(fakeElement, "removeAttribute");
+    const spyHasChildNodes = jest.spyOn(fakeElement, "hasChildNodes");
+    const spyRemoveChild = jest.spyOn(fakeElement, "removeChild");
+
+    clearElementSrc(fakeElement);
+
+    expect(fakeElement.src).toBe("");
+    expect(fakeElement.childNodes).toEqual([]);
+    expect(spyRemoveAttribute).toHaveBeenCalledTimes(1);
+    expect(spyRemoveAttribute).toHaveBeenCalledWith("src");
+    expect(spyHasChildNodes).toHaveBeenCalledTimes(0);
+    expect(spyRemoveChild).not.toHaveBeenCalled();
+  });
+
+  it("should not throw if the textTracks attribute is `undefined`", () => {
+    const fakeElement = {
+      src: "foo",
+      removeAttribute() { return null; },
+      textTracks: undefined,
+      childNodes: [],
+      hasChildNodes: () => false,
+      removeChild: () => null,
+    };
+
+    const clearElementSrc = require("../clear_element_src").default;
+
+    const spyRemoveAttribute = jest.spyOn(fakeElement, "removeAttribute");
+    const spyHasChildNodes = jest.spyOn(fakeElement, "hasChildNodes");
+    const spyRemoveChild = jest.spyOn(fakeElement, "removeChild");
+
+    clearElementSrc(fakeElement);
+
+    expect(fakeElement.src).toBe("");
+    expect(fakeElement.childNodes).toEqual([]);
+    expect(spyRemoveAttribute).toHaveBeenCalledTimes(1);
+    expect(spyRemoveAttribute).toHaveBeenCalledWith("src");
+    expect(spyHasChildNodes).toHaveBeenCalledTimes(0);
+    expect(spyRemoveChild).not.toHaveBeenCalled();
+  });
 });

package/src/compat/__tests__/set_element_src.test.ts

@@ -21,7 +21,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 
-import { map } from "rxjs/operators";
+import { map } from "rxjs";
 
 describe("compat - setElementSrc", () => {
   beforeEach(() => {
@@ -57,7 +57,7 @@ describe("compat - setElementSrc", () => {
       map(() => {
         expect(mockLogInfo).toHaveBeenCalledTimes(1);
         expect(mockLogInfo)
-          .toHaveBeenCalledWith("Setting URL to Element", fakeURL, fakeMediaElement);
+          .toHaveBeenCalledWith("Setting URL to HTMLMediaElement", fakeURL);
         expect(fakeMediaElement.src).toBe(fakeURL);
       })
     ).subscribe();

package/src/compat/__tests__/when_loaded_metadata.test.ts

@@ -20,16 +20,15 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 
-import {
-  interval as observableInterval,
-  timer as observableTimer,
-} from "rxjs";
 import {
   finalize,
+  interval as observableInterval,
   mapTo,
   tap,
-} from "rxjs/operators";
+  timer as observableTimer,
+} from "rxjs";
 
 describe("compat - whenLoadedMetadata$", () => {
   beforeEach(() => {

package/src/compat/__tests__/when_media_source_open.test.ts

@@ -20,16 +20,15 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 
-import {
-  interval as observableInterval,
-  timer as observableTimer,
-} from "rxjs";
 import {
   finalize,
+  interval as observableInterval,
   mapTo,
   tap,
-} from "rxjs/operators";
+  timer as observableTimer,
+} from "rxjs";
 
 describe("compat - whenMediaSourceOpen$", () => {
   beforeEach(() => {

package/src/compat/clear_element_src.ts

@@ -15,19 +15,21 @@
  */
 
 import log from "../log";
-import { isFirefox } from "./browser_detection";
+import isNullOrUndefined from "../utils/is_null_or_undefined";
 
 /**
  * Clear element's src attribute.
  * @param {HTMLMediaElement} element
  */
 export default function clearElementSrc(element : HTMLMediaElement) : void {
-  // On Firefox, we also have to make sure the textTracks elements are both
-  // disabled and removed from the DOM.
+  // On some browsers, we first have to make sure the textTracks elements are
+  // both disabled and removed from the DOM.
   // If we do not do that, we may be left with displayed text tracks on the
-  // screen
-  if (isFirefox) {
-    const { textTracks } = element;
+  // screen, even if the track elements are properly removed, due to browser
+  // issues.
+  // Bug seen on Firefox (I forgot which version) and Chrome 96.
+  const { textTracks } = element;
+  if (!isNullOrUndefined(textTracks)) {
     for (let i = 0; i < textTracks.length; i++) {
       textTracks[i].mode = "disabled";
     }

package/src/compat/eme/close_session.ts

@@ -15,16 +15,14 @@
  */
 
 import {
+  catchError,
+  map,
+  mergeMap,
   Observable,
   of as observableOf,
   race as observableRace,
   timer as observableTimer,
 } from "rxjs";
-import {
-  catchError,
-  map,
-  mergeMap,
-} from "rxjs/operators";
 import castToObservable from "../../utils/cast_to_observable";
 import { ICustomMediaKeySession } from "./custom_media_keys";
 

package/src/compat/eme/custom_media_keys/ie11_media_keys.ts

@@ -17,8 +17,8 @@
 import {
   merge as observableMerge,
   Subject,
+  takeUntil,
 } from "rxjs";
-import { takeUntil } from "rxjs/operators";
 import EventEmitter from "../../../utils/event_emitter";
 import PPromise from "../../../utils/promise";
 import { ICompatHTMLMediaElement } from "../../browser_compatibility_types";