senza-sdk 4.2.9 → 4.2.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "senza-sdk",
-    "version": "4.2.9",
+    "version": "4.2.10",
     "main": "./src/api.js",
     "description": "API for Senza application",
     "license": "MIT",

package/src/senzaShakaPlayer.js

@@ -23,46 +23,83 @@ export class SenzaShakaPlayer extends shaka.Player {
     /**
      * Creates an instance of SenzaShakaPlayer, which is a subclass of shaka.Player.
      *
-     * @param {HTMLVideoElement} videoElement - The video element to be used for local playback.
+     * @param {HTMLVideoElement} videoElement - The video element to be used for local playback. This parameter is optional. If not provided, the video element can be attached later using the attach method.
+     * @param {HTMLElement=} videoContainer - The videoContainer to construct UITextDisplayer
+     * @param {function(shaka.Player)=} dependencyInjector Optional callback
+   *   which is called to inject mocks into the Player.  Used for testing.
      */
     constructor(videoElement, videoContainer, dependencyInjector) {
         super(videoElement, videoContainer, dependencyInjector);
-        this.videoElement = videoElement;
         this.remotePlayer = remotePlayer;
+        this.addEventListeners();
+        // if video element is provided, add the listeres here. In this case ,there is no need to call attach.
+        if (videoElement) {
+            this.videoElement = videoElement;
+            this.addVideoElementEventListeners();
+            sdkLogger.warn("SenzaShakaPlayer constructor Adding videoElement in the constructor is going to be deprecated in the future. Please use attach method instead.");
+        }
+    }
+
+    /**
+     * Overrides the attach method of shaka.Player to attach the video element.
+     *
+     * @param {HTMLVideoElement} videoElement - The video element to be used for local playback.
+     * @param {boolean} [initializeMediaSource=true] - Whether to initialize the media source.
+     */
+    async attach(videoElement, initializeMediaSource = true) {
+        await super.attach(videoElement, initializeMediaSource);
+
+        if (this.videoElement) {
+            sdkLogger.error("SenzaShakaPlayer attach Player is already attached to a video element.");
+            this.removeVideoElementEventListeners();
+            this.remotePlayer.attach(null);
+        }
 
+        this.videoElement = videoElement;
         this.remotePlayer.attach(this.videoElement);
+        this.addVideoElementEventListeners();
 
-        this.addEventListeners();
+
+    }
+
+    /**
+   * Detach the player from the current media element. Leaves the player in a
+   * state where it cannot play media, until it has been attached to something
+   * else.
+   *
+   * @param {boolean=} keepAdManager
+   *
+   * @return {!Promise}
+   * @export
+   */
+    async detach(keepAdManager = false) {
+        await super.detach(keepAdManager);
+        // remote player does not suppot detach yet, this should be implemented.
+        this.remotePlayer.attach(null);
+        this.videoElement = null;
+        sdkLogger.warn("SenzaShakaPlayer detach  detach is not fully supported yet");
     }
 
     addEventListeners() {
         this.remotePlayer.addEventListener("ended", () => {
             sdkLogger.log("remotePlayer ended");
             lifecycle.moveToForeground();
-            this.videoElement.dispatchEvent(new Event("ended"));
+            if (this.videoElement) {
+                this.videoElement.dispatchEvent(new Event("ended"));
+            }
         });
 
         this.remotePlayer.addEventListener("error", (event) => {
             sdkLogger.log("remotePlayer error:", event.detail.errorCode, event.detail.message);
-            this.videoElement.dispatchEvent(new CustomEvent("error", event));
+            if (this.videoElement) {
+                this.videoElement.dispatchEvent(new CustomEvent("error", event));
+            }
         });
 
         this.addEventListener("error", (event) => {
             sdkLogger.log("localPlayer error:", event.detail.errorCode, event.detail.message);
         });
 
-        this.videoElement.addEventListener("play", () => {
-            this.remotePlayer.play();
-        });
-
-        this.videoElement.addEventListener("pause", () => {
-            this.remotePlayer.pause();
-        });
-
-        this.videoElement.addEventListener("seeked", () => {
-            this.remotePlayer.currentTime = this.videoElement.currentTime;
-        });
-
 
         this.remotePlayer.addEventListener("license-request", async (event) => {
             sdkLogger.log("remotePlayer", "license-request", "Got license-request event from remote player");
@@ -93,6 +130,21 @@ export class SenzaShakaPlayer extends shaka.Player {
         });
     }
 
+    addVideoElementEventListeners() {
+        this.videoElement.addEventListener("play", () => {
+            this.remotePlayer.play();
+        });
+
+        this.videoElement.addEventListener("pause", () => {
+            this.remotePlayer.pause();
+        });
+
+        this.videoElement.addEventListener("seeked", () => {
+            this.remotePlayer.currentTime = this.videoElement.currentTime;
+        });
+    }
+
+
     /**
      * Helper function that makes it easier to check if lifecycle.state is
      * either background or inTransitionToBackground.