@antmedia/web_player 2.12.0 → 2.12.1

package/dist/browser/web_player.js

@@ -232,6 +232,24 @@
        * 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);
+        }
+        loglevel_min.Logger.debug("hls request: " + options.uri);
+      });
       WebPlayer.DEFAULT_PLAY_ORDER = ["webrtc", "hls"];
       WebPlayer.DEFAULT_PLAY_TYPE = ["mp4", "webm"];
       WebPlayer.HLS_EXTENSION = "m3u8";
@@ -531,10 +549,9 @@
         }, 2000);
       } else if (infos["info"] == "streaming_started") {
         loglevel_min.Logger.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
@@ -602,7 +619,14 @@
           && 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
-            loglevel_min.Logger.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
+              loglevel_min.Logger.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
@@ -630,23 +654,12 @@
 
       //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);
-          }
-          loglevel_min.Logger.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") {
@@ -1157,13 +1170,17 @@
     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/es/index.d.ts

@@ -199,6 +199,7 @@ export declare class WebPlayer {
      */
     setPlayerVisible(visible: boolean): void;
     handleWebRTCInfoMessages(infos: any): void;
+    insertSecurityParameters: (options: any) => void;
     /**
      * Play the stream via videojs
      * @param {*} streamUrl

package/dist/es/videojs-webrtc-plugin-5fadffd3.js

@@ -0,0 +1,3 @@
+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}";
+
+export { videojsWebrtcPlugin as default };