rx-player 4.2.0-dev.2024090600 → 4.2.0-dev.2024091000

package/dist/rx-player.js

@@ -3374,6 +3374,213 @@
     });
   }
 
+  // src/utils/starts_with.ts
+  function startsWith(completeString, searchString, position) {
+    if (typeof String.prototype.startsWith === "function") {
+      return completeString.startsWith(searchString, position);
+    }
+    const initialPosition = typeof position === "number" ? Math.max(position, 0) : 0;
+    return completeString.substring(initialPosition, initialPosition + searchString.length) === searchString;
+  }
+
+  // src/utils/url-utils.ts
+  var schemeRe = /^(?:[a-z]+:)?\/\//i;
+  var urlComponentRegex = /^(?:([^:\/?#]+):)?(?:\/\/([^\/?#]*))?([^?#]*)(?:\?([^#]*))?(?:#(.*))?$/;
+  function getFilenameIndexInUrl(url) {
+    const indexOfLastSlash = url.lastIndexOf("/");
+    if (indexOfLastSlash < 0) {
+      return url.length;
+    }
+    if (schemeRe.test(url)) {
+      const firstSlashIndex = url.indexOf("/");
+      if (firstSlashIndex >= 0 && indexOfLastSlash === firstSlashIndex + 1) {
+        return url.length;
+      }
+    }
+    const indexOfQuestionMark = url.indexOf("?");
+    if (indexOfQuestionMark >= 0 && indexOfQuestionMark < indexOfLastSlash) {
+      return getFilenameIndexInUrl(url.substring(0, indexOfQuestionMark));
+    }
+    return indexOfLastSlash + 1;
+  }
+  function getRelativeUrl(baseUrl, newUrl) {
+    const baseParts = parseURL(baseUrl);
+    const newParts = parseURL(newUrl);
+    if (baseParts.scheme !== newParts.scheme || baseParts.authority !== newParts.authority) {
+      return null;
+    }
+    if (
+      // if base and new path are mixed between absolute and relative path, return null
+      baseParts.path[0] !== void 0 && baseParts.path[0] !== "/" && newParts.path[0] === "/" || newParts.path[0] !== void 0 && newParts.path[0] !== "/" && baseParts.path[0] === "/"
+    ) {
+      return null;
+    }
+    const baseNormalizedPath = removeDotSegment(baseParts.path);
+    const newNormalizedPath = removeDotSegment(newParts.path);
+    let relativePath;
+    if (baseNormalizedPath === newNormalizedPath) {
+      relativePath = "";
+    } else {
+      const basePathSplitted = baseNormalizedPath.split("/");
+      basePathSplitted.pop();
+      const newPathSplitted = newNormalizedPath.split("/");
+      while (basePathSplitted.length > 0 && newPathSplitted.length > 0 && basePathSplitted[0] === newPathSplitted[0]) {
+        basePathSplitted.shift();
+        newPathSplitted.shift();
+      }
+      while (basePathSplitted.length > 0) {
+        basePathSplitted.shift();
+        newPathSplitted.unshift("..");
+      }
+      let pathJoined = newPathSplitted.join("/");
+      if (pathJoined.endsWith("../") || pathJoined.endsWith("./")) {
+        pathJoined = pathJoined.slice(0, pathJoined.length - 1);
+      }
+      relativePath = pathJoined === "" ? "." : pathJoined;
+    }
+    let result = relativePath;
+    if (relativePath === "" && newParts.query === baseParts.query) {
+    } else if (newParts.query) {
+      result += "?";
+      result += newParts.query;
+    }
+    if (newParts.fragment) {
+      result += "#";
+      result += newParts.fragment;
+    }
+    return result;
+  }
+  function _resolveURL(base, relative) {
+    const baseParts = parseURL(base);
+    const relativeParts = parseURL(relative);
+    if (relativeParts.scheme) {
+      return formatURL(relativeParts);
+    }
+    const target = {
+      scheme: baseParts.scheme,
+      authority: baseParts.authority,
+      path: "",
+      query: relativeParts.query,
+      fragment: relativeParts.fragment
+    };
+    if (relativeParts.authority) {
+      target.authority = relativeParts.authority;
+      target.path = removeDotSegment(relativeParts.path);
+      return formatURL(target);
+    }
+    if (relativeParts.path === "") {
+      target.path = baseParts.path;
+      if (!relativeParts.query) {
+        target.query = baseParts.query;
+      }
+    } else {
+      if (startsWith(relativeParts.path, "/")) {
+        target.path = removeDotSegment(relativeParts.path);
+      } else {
+        target.path = removeDotSegment(mergePaths(baseParts, relativeParts.path));
+      }
+    }
+    return formatURL(target);
+  }
+  var parsedUrlCache = /* @__PURE__ */ new Map();
+  var MAX_URL_CACHE_ENTRIES = 200;
+  function parseURL(url) {
+    var _a, _b, _c, _d, _e;
+    if (parsedUrlCache.has(url)) {
+      return parsedUrlCache.get(url);
+    }
+    const matches = url.match(urlComponentRegex);
+    let parsed;
+    if (matches === null) {
+      parsed = {
+        scheme: "",
+        authority: "",
+        path: "",
+        query: "",
+        fragment: ""
+      };
+    } else {
+      parsed = {
+        scheme: (_a = matches[1]) != null ? _a : "",
+        authority: (_b = matches[2]) != null ? _b : "",
+        path: (_c = matches[3]) != null ? _c : "",
+        query: (_d = matches[4]) != null ? _d : "",
+        fragment: (_e = matches[5]) != null ? _e : ""
+      };
+    }
+    if (parsedUrlCache.size >= MAX_URL_CACHE_ENTRIES) {
+      parsedUrlCache.clear();
+    }
+    parsedUrlCache.set(url, parsed);
+    return parsed;
+  }
+  function formatURL(parts) {
+    let url = "";
+    if (parts.scheme) {
+      url += parts.scheme + ":";
+    }
+    if (parts.authority) {
+      url += "//" + parts.authority;
+    }
+    url += parts.path;
+    if (parts.query) {
+      url += "?" + parts.query;
+    }
+    if (parts.fragment) {
+      url += "#" + parts.fragment;
+    }
+    return url;
+  }
+  function removeDotSegment(path) {
+    const segments = path.split(/(?=\/)/);
+    const output = [];
+    for (let i = 0; i < segments.length; i++) {
+      const segment = segments[i];
+      if (segment === ".." || segment === "." || segment === "") {
+        continue;
+      }
+      if (segment === "/..") {
+        output.pop();
+        if (i === segments.length - 1) {
+          output.push("/");
+        }
+        continue;
+      }
+      if (segment === "/.") {
+        if (i === segments.length - 1) {
+          output.push("/");
+        }
+        continue;
+      }
+      output.push(segment);
+    }
+    return output.join("");
+  }
+  function mergePaths(baseParts, relativePath) {
+    if (baseParts.authority && baseParts.path === "") {
+      return "/" + relativePath;
+    }
+    const basePath = baseParts.path;
+    return basePath.substring(0, basePath.lastIndexOf("/") + 1) + relativePath;
+  }
+  function resolveURL(...args) {
+    var _a, _b, _c;
+    const filteredArgs = args.filter((val) => val !== "");
+    const len = filteredArgs.length;
+    if (len === 0) {
+      return "";
+    }
+    if (len === 1) {
+      return (_a = filteredArgs[0]) != null ? _a : "";
+    } else {
+      const basePart = (_b = filteredArgs[0]) != null ? _b : "";
+      const relativeParts = (_c = filteredArgs[1]) != null ? _c : "";
+      const resolvedURL = _resolveURL(basePart, relativeParts);
+      const remainingArgs = filteredArgs.slice(2);
+      return resolveURL(resolvedURL, ...remainingArgs);
+    }
+  }
+
   // src/core/cmcd/cmcd_data_builder.ts
   var RTP_FACTOR = 4;
   var CmcdDataBuilder = class {
@@ -3508,6 +3715,24 @@
       if (content.segment.isInit) {
         props.ot = "i";
       }
+      if (!isNullOrUndefined(content.nextSegment) && content.segment.url !== null && content.nextSegment.url !== null) {
+        if (!content.nextSegment.isInit || content.nextSegment.indexRange === void 0) {
+          const currSegmentUrl = content.segment.url;
+          const nextSegmentUrl = content.nextSegment.url;
+          const relativeUrl = getRelativeUrl(currSegmentUrl, nextSegmentUrl);
+          if (relativeUrl !== null) {
+            if (relativeUrl !== ".") {
+              props.nor = encodeURIComponent(relativeUrl);
+            }
+            if (content.nextSegment.range !== void 0) {
+              props.nrr = String(content.nextSegment.range[0]) + "-";
+              if (isFinite(content.nextSegment.range[1])) {
+                props.nrr += String(content.nextSegment.range[1]);
+              }
+            }
+          }
+        }
+      }
       let precizeBufferLengthMs;
       if (lastObservation !== void 0 && (props.ot === "v" || props.ot === "a" || props.ot === "av")) {
         const bufferedForType = lastObservation.buffered[content.adaptation.type];
@@ -3613,6 +3838,8 @@
       addNumberProperty("d", "object");
       addNumberProperty("dl", "request");
       addNumberProperty("mtp", "request");
+      addStringProperty("nor", "request");
+      addStringProperty("nrr", "request");
       addTokenProperty("ot", "object");
       addNumberProperty("pr", "session");
       addNumberProperty("rtp", "status");
@@ -6556,15 +6783,6 @@
     };
   }
 
-  // src/utils/starts_with.ts
-  function startsWith(completeString, searchString, position) {
-    if (typeof String.prototype.startsWith === "function") {
-      return completeString.startsWith(searchString, position);
-    }
-    const initialPosition = typeof position === "number" ? Math.max(position, 0) : 0;
-    return completeString.substring(initialPosition, initialPosition + searchString.length) === searchString;
-  }
-
   // src/utils/byte_parsing.ts
   function concat(...args) {
     const l = args.length;
@@ -13289,9 +13507,10 @@
         contentInfo.mediaSegmentRequest.canceller.cancel();
       }
       const { downloadQueue, content, initSegmentInfoRef, currentCanceller } = contentInfo;
-      const { segmentQueue } = downloadQueue.getValue();
-      const currentNeededSegment = segmentQueue[0];
-      const recursivelyRequestSegments = (startingSegment) => {
+      const recursivelyRequestSegments = () => {
+        var _a;
+        const { segmentQueue } = downloadQueue.getValue();
+        const startingSegment = segmentQueue[0];
         if (currentCanceller !== null && currentCanceller.isUsed()) {
           contentInfo.mediaSegmentRequest = null;
           return;
@@ -13304,7 +13523,10 @@
         const canceller = new TaskCanceller();
         const unlinkCanceller = currentCanceller === null ? noop_default : canceller.linkToSignal(currentCanceller.signal);
         const { segment, priority } = startingSegment;
-        const context = object_assign_default({ segment }, content);
+        const context = object_assign_default(
+          { segment, nextSegment: (_a = segmentQueue[1]) == null ? void 0 : _a.segment },
+          content
+        );
         let isComplete = false;
         let isWaitingOnInitSegment = false;
         canceller.signal.register(() => {
@@ -13332,7 +13554,7 @@
             lastQueue.shift();
           }
           isComplete = true;
-          recursivelyRequestSegments(lastQueue[0]);
+          recursivelyRequestSegments();
         };
         const request2 = this._segmentFetcher.createRequest(
           context,
@@ -13418,7 +13640,7 @@
         });
         contentInfo.mediaSegmentRequest = { segment, priority, request: request2, canceller };
       };
-      recursivelyRequestSegments(currentNeededSegment);
+      recursivelyRequestSegments();
     }
     /**
      * Internal logic performing initialization segment requests.
@@ -13436,7 +13658,7 @@
       const canceller = new TaskCanceller();
       const unlinkCanceller = contentInfo.currentCanceller === null ? noop_default : canceller.linkToSignal(contentInfo.currentCanceller.signal);
       const { segment, priority } = queuedInitSegment;
-      const context = object_assign_default({ segment }, content);
+      const context = object_assign_default({ segment, nextSegment: void 0 }, content);
       let isComplete = false;
       const request2 = this._segmentFetcher.createRequest(
         context,
@@ -23407,158 +23629,6 @@
   // src/parsers/manifest/dash/common/indexes/timeline/index.ts
   var timeline_default = TimelineRepresentationIndex;
 
-  // src/utils/resolve_url.ts
-  var schemeRe = /^(?:[a-z]+:)?\/\//i;
-  var urlComponentRegex = /^(?:([^:\/?#]+):)?(?:\/\/([^\/?#]*))?([^?#]*)(?:\?([^#]*))?(?:#(.*))?$/;
-  function getFilenameIndexInUrl(url) {
-    const indexOfLastSlash = url.lastIndexOf("/");
-    if (indexOfLastSlash < 0) {
-      return url.length;
-    }
-    if (schemeRe.test(url)) {
-      const firstSlashIndex = url.indexOf("/");
-      if (firstSlashIndex >= 0 && indexOfLastSlash === firstSlashIndex + 1) {
-        return url.length;
-      }
-    }
-    const indexOfQuestionMark = url.indexOf("?");
-    if (indexOfQuestionMark >= 0 && indexOfQuestionMark < indexOfLastSlash) {
-      return getFilenameIndexInUrl(url.substring(0, indexOfQuestionMark));
-    }
-    return indexOfLastSlash + 1;
-  }
-  function _resolveURL(base, relative) {
-    const baseParts = parseURL(base);
-    const relativeParts = parseURL(relative);
-    if (relativeParts.scheme) {
-      return formatURL(relativeParts);
-    }
-    const target = {
-      scheme: baseParts.scheme,
-      authority: baseParts.authority,
-      path: "",
-      query: relativeParts.query,
-      fragment: relativeParts.fragment
-    };
-    if (relativeParts.authority) {
-      target.authority = relativeParts.authority;
-      target.path = removeDotSegment(relativeParts.path);
-      return formatURL(target);
-    }
-    if (relativeParts.path === "") {
-      target.path = baseParts.path;
-      if (!relativeParts.query) {
-        target.query = baseParts.query;
-      }
-    } else {
-      if (startsWith(relativeParts.path, "/")) {
-        target.path = removeDotSegment(relativeParts.path);
-      } else {
-        target.path = removeDotSegment(mergePaths(baseParts, relativeParts.path));
-      }
-    }
-    return formatURL(target);
-  }
-  var parsedUrlCache = /* @__PURE__ */ new Map();
-  var MAX_URL_CACHE_ENTRIES = 200;
-  function parseURL(url) {
-    var _a, _b, _c, _d, _e;
-    if (parsedUrlCache.has(url)) {
-      return parsedUrlCache.get(url);
-    }
-    const matches = url.match(urlComponentRegex);
-    let parsed;
-    if (matches === null) {
-      parsed = {
-        scheme: "",
-        authority: "",
-        path: "",
-        query: "",
-        fragment: ""
-      };
-    } else {
-      parsed = {
-        scheme: (_a = matches[1]) != null ? _a : "",
-        authority: (_b = matches[2]) != null ? _b : "",
-        path: (_c = matches[3]) != null ? _c : "",
-        query: (_d = matches[4]) != null ? _d : "",
-        fragment: (_e = matches[5]) != null ? _e : ""
-      };
-    }
-    if (parsedUrlCache.size >= MAX_URL_CACHE_ENTRIES) {
-      parsedUrlCache.clear();
-    }
-    parsedUrlCache.set(url, parsed);
-    return parsed;
-  }
-  function formatURL(parts) {
-    let url = "";
-    if (parts.scheme) {
-      url += parts.scheme + ":";
-    }
-    if (parts.authority) {
-      url += "//" + parts.authority;
-    }
-    url += parts.path;
-    if (parts.query) {
-      url += "?" + parts.query;
-    }
-    if (parts.fragment) {
-      url += "#" + parts.fragment;
-    }
-    return url;
-  }
-  function removeDotSegment(path) {
-    const segments = path.split(/(?=\/)/);
-    const output = [];
-    for (let i = 0; i < segments.length; i++) {
-      const segment = segments[i];
-      if (segment === ".." || segment === "." || segment === "") {
-        continue;
-      }
-      if (segment === "/..") {
-        output.pop();
-        if (i === segments.length - 1) {
-          output.push("/");
-        }
-        continue;
-      }
-      if (segment === "/.") {
-        if (i === segments.length - 1) {
-          output.push("/");
-        }
-        continue;
-      }
-      output.push(segment);
-    }
-    return output.join("");
-  }
-  function mergePaths(baseParts, relativePath) {
-    if (baseParts.authority && baseParts.path === "") {
-      return "/" + relativePath;
-    }
-    const basePath = baseParts.path;
-    return basePath.substring(0, basePath.lastIndexOf("/") + 1) + relativePath;
-  }
-  function resolveURL(...args) {
-    var _a, _b, _c;
-    const filteredArgs = args.filter((val) => val !== "");
-    const len = filteredArgs.length;
-    if (len === 0) {
-      return "";
-    }
-    if (len === 1) {
-      return (_a = filteredArgs[0]) != null ? _a : "";
-    } else {
-      const basePart = (_b = filteredArgs[0]) != null ? _b : "";
-      const relativeParts = (_c = filteredArgs[1]) != null ? _c : "";
-      const resolvedURL = _resolveURL(basePart, relativeParts);
-      const remainingArgs = filteredArgs.slice(2);
-      return resolveURL(resolvedURL, ...remainingArgs);
-    }
-  }
-  var resolve_url_default = resolveURL;
-
   // src/parsers/manifest/dash/common/content_protection_parser.ts
   var ContentProtectionParser = class {
     constructor() {
@@ -24317,7 +24387,7 @@
       const curBaseUrl = currentBaseURLs[i];
       for (let j = 0; j < newBaseUrls.length; j++) {
         const newBaseUrl = newBaseUrls[j];
-        const newUrl = resolve_url_default(curBaseUrl.url, newBaseUrl.url);
+        const newUrl = resolveURL(curBaseUrl.url, newBaseUrl.url);
         result.push({
           url: newUrl,
           serviceLocation: (_a = newBaseUrl.serviceLocation) != null ? _a : curBaseUrl.serviceLocation
@@ -27101,7 +27171,7 @@
     if (segment.url === null) {
       return wantedCdn.baseUrl;
     }
-    return resolve_url_default(wantedCdn.baseUrl, segment.url);
+    return resolveURL(wantedCdn.baseUrl, segment.url);
   }
 
   // src/transports/dash/init_segment_loader.ts
@@ -34174,7 +34244,7 @@
     if (segment.url === null) {
       return wantedCdn.baseUrl;
     }
-    return resolve_url_default(wantedCdn.baseUrl, segment.url);
+    return resolveURL(wantedCdn.baseUrl, segment.url);
   }
 
   // src/transports/smooth/pipelines.ts
@@ -36778,7 +36848,7 @@ ${event}`
       } = parseConstructorOptions(options);
       videoElement.preload = "auto";
       this.version = /* PLAYER_VERSION */
-      "4.2.0-dev.2024090600";
+      "4.2.0-dev.2024091000";
       this.log = log_default;
       this.state = "STOPPED";
       this.videoElement = videoElement;
@@ -39304,7 +39374,7 @@ ${event}`
   _Player._priv_currentlyUsedVideoElements = /* @__PURE__ */ new WeakSet();
   var Player = _Player;
   Player.version = /* PLAYER_VERSION */
-  "4.2.0-dev.2024090600";
+  "4.2.0-dev.2024091000";
   var public_api_default = Player;
 
   // src/main_thread/api/index.ts