@antmedia/web_player 2.12.0 → 2.12.1

package/dist/es/web_player.js

@@ -520,6 +520,24 @@ class WebPlayer {
      * It can be streamID or backupStreamId
      */
     _defineProperty(this, "activeStreamId", void 0);
+    // we define insertSecurityParameters in this way because we want to get the this context such as this.subscriberId
+    _defineProperty(this, "insertSecurityParameters", options => {
+      var queryParams = [];
+      if (!options.uri.includes("subscriberId") && this.subscriberId != null) {
+        queryParams.push("subscriberId=".concat(this.subscriberId));
+      }
+      if (!options.uri.includes("subscriberCode") && this.subscriberCode != null) {
+        queryParams.push("subscriberCode=".concat(this.subscriberCode));
+      }
+      if (!options.uri.includes("token") && this.token != null) {
+        queryParams.push("token=".concat(this.token));
+      }
+      if (queryParams.length > 0) {
+        var queryString = queryParams.join("&");
+        options.uri += options.uri.includes("?") ? "&".concat(queryString) : "?".concat(queryString);
+      }
+      Logger_1.debug("hls request: " + options.uri);
+    });
     WebPlayer.DEFAULT_PLAY_ORDER = ["webrtc", "hls"];
     WebPlayer.DEFAULT_PLAY_TYPE = ["mp4", "webm"];
     WebPlayer.HLS_EXTENSION = "m3u8";
@@ -537,15 +555,19 @@ class WebPlayer {
     // Initialize default values
     this.setDefaults();
 
+    
     // Check if the first argument is a config object or a Window object
     if (!this.isWindow(configOrWindow)) {
       // New config object mode
       Logger_1.info("config object mode");
+          console.log("config object mode");
+
       Object.assign(this, configOrWindow);
       this.window = window;
     } else {
       // Backward compatibility mode
       Logger_1.info("getting from url mode");
+       console.log("getting from url mode");
       this.window = configOrWindow;
 
       // Use getUrlParameter for backward compatibility
@@ -722,12 +744,12 @@ class WebPlayer {
   }
   loadWebRTCComponents() {
     if (this.playOrder.includes("webrtc")) {
-      return import('./videojs-webrtc-plugin-7e293bd2.js').then(css => {
+      return import('./videojs-webrtc-plugin-5fadffd3.js').then(css => {
         Logger_1.info("videojs-webrtc-plugin.css is loaded");
         var styleElement = this.dom.createElement('style');
         styleElement.textContent = css.default.toString(); // Assuming css module exports a string
         this.dom.head.appendChild(styleElement);
-        return import('./videojs-webrtc-plugin.es-df625b38.js').then(videojsWebrtcPluginLocal => {
+        return import('./videojs-webrtc-plugin.es-f339fb8c.js').then(videojsWebrtcPluginLocal => {
           Logger_1.info("videojs-webrtc-plugin is loaded");
         });
       });
@@ -748,12 +770,12 @@ class WebPlayer {
           styleElement.textContent = css.default.toString(); // Assuming css module exports a string
           this.dom.head.appendChild(styleElement);
         }).then(() => {
-          return import('./video.es-be70c095.js');
+          return import('./video.es-0951ae41.js').then(function (n) { return n.a; });
         }).then(videojs => {
           window.videojs = videojs.default;
           this.videojsLoaded = true;
         }).then(() => {
-          return import('./plugin-50e1316e.js');
+          return import('./plugin-06260ef3.js');
         }).then(() => {
           return this.loadWebRTCComponents();
         });
@@ -819,10 +841,9 @@ class WebPlayer {
       }, 2000);
     } else if (infos["info"] == "streaming_started") {
       Logger_1.info("Requested stream has started");
-      this.playIfExists(this.currentPlayType, this.activeStreamId);
+      this.playIfExists(this.currentPlayType, infos["obj"].streamId);
     }
   }
-
   /**
    * Play the stream via videojs
    * @param {*} streamUrl
@@ -859,6 +880,9 @@ class WebPlayer {
     }
 
     //same videojs is being use for hls, vod and webrtc streams
+    var videoPlayererer =  this.dom.getElementById(this.videoPlayerId);
+    console.log("videoPlayererer", videoPlayererer);
+
     this.videojsPlayer = videojs(this.videoPlayerId, {
       poster: "previews/" + preview + ".png",
       liveui: extension == "m3u8" ? true : false,
@@ -890,7 +914,14 @@ class WebPlayer {
         && errors["message"]["information"] == "stream_not_exist_or_not_streaming") {
           // server puts the this client to the waiting list automatically and it will notify with
           //streaming_started event
-          Logger_1.info("Stream does not exists or not started yet. Waiting for the stream to start. It will be notified with streaming_started event by the server");
+
+          //check if backup stream id is set
+          if (this.backupStreamId != null) {
+            this.tryNextTech();
+          } else {
+            //if backup stream id is not set, let the server notify
+            Logger_1.info("Stream " + errors["message"]["streamId"] + " does not exists or not started yet. Waiting for the stream to start. It will be notified with streaming_started event by the server");
+          }
         } else if (errors["error"] == "no_stream_exist" || errors["error"] == "WebSocketNotConnected" || errors["error"] == "not_initialized_yet" || errors["error"] == "data_store_not_available" || errors["error"] == "highResourceUsage" || errors["error"] == "unauthorized_access" || errors["error"] == "user_blocked") {
           //handle high resource usage and not authroized errors && websocket disconnected
           //Even if webrtc adaptor has auto reconnect scenario, we dispose the videojs immediately in tryNextTech
@@ -918,23 +949,12 @@ class WebPlayer {
 
     //hls specific calls
     if (extension == "m3u8") {
-      videojs.Vhs.xhr.onRequest = options => {
-        var queryParams = [];
-        if (!options.uri.includes("subscriberId") && this.subscriberId != null) {
-          queryParams.push("subscriberId=".concat(this.subscriberId));
-        }
-        if (!options.uri.includes("subscriberCode") && this.subscriberCode != null) {
-          queryParams.push("subscriberCode=".concat(this.subscriberCode));
-        }
-        if (!options.uri.includes("token") && this.token != null) {
-          queryParams.push("token=".concat(this.token));
-        }
-        if (queryParams.length > 0) {
-          var queryString = queryParams.join("&");
-          options.uri += options.uri.includes("?") ? "&".concat(queryString) : "?".concat(queryString);
-        }
-        Logger_1.debug("hls request: " + options.uri);
-      };
+      this.videojsPlayer.on('xhr-hooks-ready', () => {
+        this.videojsPlayer.ready(() => {
+          // tech is ready after ready event
+          this.videojsPlayer.tech().vhs.xhr.onRequest(this.insertSecurityParameters);
+        });
+      });
       this.videojsPlayer.ready(() => {
         // If it's already added to player, no need to add again
         if (typeof this.videojsPlayer.qualitySelectorHls === "function") {
@@ -1370,6 +1390,8 @@ class WebPlayer {
       _this.destroyDashPlayer();
       _this.setPlayerVisible(false);
       _this.containerElement.innerHTML = _this.videoHTMLContent;
+      console.log("videoHTMLContent:", _this.videoHTMLContent);
+      console.log("containerElement:", _this.containerElement);
       Logger_1.warn("Try to play the stream " + streamIdToPlay + " with " + _this.currentPlayType);
       switch (_this.currentPlayType) {
         case "hls":
@@ -1445,13 +1467,17 @@ class WebPlayer {
   getSecurityQueryParams() {
     var queryString = "";
     if (this.token != null) {
-      queryString += "&token=" + this.token;
+      queryString += "token=" + this.token + "&";
     }
     if (this.subscriberId != null) {
-      queryString += "&subscriberId=" + this.subscriberId;
+      queryString += "subscriberId=" + this.subscriberId + "&";
     }
     if (this.subscriberCode != null) {
-      queryString += "&subscriberCode=" + this.subscriberCode;
+      queryString += "subscriberCode=" + this.subscriberCode + "&";
+    }
+    //remove the last character if it's "&"
+    if (queryString.endsWith("&")) {
+      queryString = queryString.substring(0, queryString.length - 1);
     }
     return queryString;
   }

package/dist/videojs-webrtc-plugin-c8051dbf.js

@@ -0,0 +1,5 @@
+'use strict';
+
+var videojsWebrtcPlugin = "/*! @name @antmedia/videojs-webrtc-plugin @version 1.3.3 @license MIT */\n.vjs-custom-spinner{position:absolute;top:50%;transform:translateY(-50%) translateX(-50%);left:50%;width:80px;height:80px}.vjs-custom-spinner:after{content:\" \";display:block;width:64px;height:64px;margin:8px;border-radius:50%;border:6px solid #fff;border-color:#fff transparent;animation:vjs-spinner-spin 1.1s cubic-bezier(.6,.2,0,.8) infinite,vjs-spinner-fade 1.1s linear infinite}";
+
+exports.default = videojsWebrtcPlugin;