dasha 3.1.2 → 3.1.3

package/dist/dasha.js

@@ -467,6 +467,13 @@ var require_video = __commonJS({
         `No MIME types matched any supported Video Codecs in ${codecs}`
       );
     };
+    var tryParseVideoCodec = (codecs) => {
+      try {
+        return parseVideoCodec(codecs);
+      } catch (e) {
+        return null;
+      }
+    };
     var parseDynamicRange = (codecs, supplementalProps = [], essentialProps = []) => {
       const dv = ["dva1", "dvav", "dvhe", "dvh1"];
       if (dv.some((value) => codecs.startsWith(value))) return DYNAMIC_RANGE.dv;
@@ -491,6 +498,7 @@ var require_video = __commonJS({
     };
     module2.exports = {
       parseVideoCodec,
+      tryParseVideoCodec,
       parseDynamicRange,
       createVideoTrack,
       VIDEO_CODECS
@@ -660,6 +668,13 @@ var require_audio = __commonJS({
         `No MIME types matched any supported Audio Codecs in ${codecs}`
       );
     };
+    var tryParseAudioCodec = (codecs) => {
+      try {
+        return parseAudioCodec(codecs);
+      } catch (e) {
+        return null;
+      }
+    };
     var getDolbyDigitalPlusComplexityIndex = (supplementalProps = []) => {
       const targetScheme = "tag:dolby.com,2018:dash:EC3_ExtensionComplexityIndex:2018";
       for (const prop of supplementalProps)
@@ -693,6 +708,7 @@ var require_audio = __commonJS({
       type,
       codec,
       channels,
+      contentProtection,
       bitrate,
       duration,
       jointObjectCoding = 0,
@@ -710,6 +726,7 @@ var require_audio = __commonJS({
         codec,
         bitrate: parsedBitrate,
         size,
+        protection: contentProtection,
         language,
         segments,
         channels: parsedChannels,
@@ -729,6 +746,7 @@ var require_audio = __commonJS({
     module2.exports = {
       AUDIO_CODECS,
       parseAudioCodec,
+      tryParseAudioCodec,
       createAudioTrack,
       getDolbyDigitalPlusComplexityIndex,
       checkIsDescriptive
@@ -794,6 +812,13 @@ var require_subtitle = __commonJS({
         `No MIME types matched any supported Subtitle Codecs in ${codecs}`
       );
     };
+    var tryParseSubtitleCodec = (codecs) => {
+      try {
+        return parseSubtitleCodec(codecs);
+      } catch (e) {
+        return null;
+      }
+    };
     var checkIsClosedCaption = (roles = []) => {
       for (const role of roles) {
         const isClosedCaption = role.attributes.schemeIdUri === "urn:mpeg:dash:role:2011" && role.attributes.value === "caption";
@@ -850,6 +875,7 @@ var require_subtitle = __commonJS({
     };
     module2.exports = {
       parseSubtitleCodec,
+      tryParseSubtitleCodec,
       checkIsClosedCaption,
       checkIsSdh,
       checkIsForced,
@@ -866,17 +892,20 @@ var require_dash = __commonJS({
     var { parseDuration, isLanguageTagValid } = require_util();
     var {
       parseVideoCodec,
+      tryParseVideoCodec,
       parseDynamicRange,
       createVideoTrack
     } = require_video();
     var {
       parseAudioCodec,
+      tryParseAudioCodec,
       createAudioTrack,
       getDolbyDigitalPlusComplexityIndex,
       checkIsDescriptive
     } = require_audio();
     var {
       parseSubtitleCodec,
+      tryParseSubtitleCodec,
       checkIsClosedCaption,
       checkIsSdh,
       checkIsForced,
@@ -930,14 +959,22 @@ var require_dash = __commonJS({
       const baseUrl = new URL(representation.getBaseUrl() || "", base).toString();
       return baseUrl;
     };
+    var getTrackTypeByCodecs = (codecs) => {
+      if (tryParseVideoCodec(codecs)) return "video";
+      else if (tryParseAudioCodec(codecs)) return "audio";
+      else if (tryParseSubtitleCodec(codecs)) return "text";
+      return null;
+    };
     var parseContentTypes = (representation) => {
+      const codecs = representation.get("codecs");
       const mimeType = representation.get("mimeType");
+      const contentTypeByCodecs = getTrackTypeByCodecs(codecs);
       const contentType = representation.get("contentType") || mimeType?.split("/")[0];
       if (!contentType && !mimeType)
         throw new Error(
           "Unable to determine the format of a Representation, cannot continue..."
         );
-      return { contentType, mimeType };
+      return { contentType: contentTypeByCodecs || contentType, mimeType };
     };
     var parseCodecs = (representation, contentType, mimeType) => {
       const shouldUseCodecsFromMime = contentType === "text" && !mimeType.includes("mp4");
@@ -1030,6 +1067,7 @@ var require_dash = __commonJS({
       const segmentsCount = duration ? Math.ceil(duration / (segmentDuration / segmentTimescale)) : DEFAULT_SEGMENTS_COUNT;
       const bandwidth = representation.get("bandwidth");
       const id = representation.get("id");
+      const sanitizeTemplate = (template) => template?.replace(/\$.*?(RepresentationID|Number|Time).*?\$/g, "$$$1$$");
       const segments = [];
       if (segmentTimeline) {
         segments.push(
@@ -1041,8 +1079,9 @@ var require_dash = __commonJS({
           )
         );
       } else {
+        const template = sanitizeTemplate(segmentTemplate.get("media"));
         for (let i = startNumber; i < startNumber + segmentsCount; i++) {
-          const url = buildSegmentUrl(segmentTemplate.get("media"), {
+          const url = buildSegmentUrl(template, {
             Bandwidth: bandwidth,
             RepresentationID: id,
             Number: i,
@@ -1051,7 +1090,9 @@ var require_dash = __commonJS({
           segments.push({ url });
         }
       }
-      const initialization = segmentTemplate.get("initialization");
+      const initialization = sanitizeTemplate(
+        segmentTemplate.get("initialization")
+      );
       if (initialization) {
         const url = buildSegmentUrl(initialization, {
           Bandwidth: bandwidth,
@@ -1216,6 +1257,7 @@ var require_dash = __commonJS({
                 channels: get("AudioChannelConfiguration")?.get("value"),
                 jointObjectCoding: getDolbyDigitalPlusComplexityIndex(supplementalProps),
                 isDescriptive: checkIsDescriptive(accessibilities),
+                contentProtection: parseContentProtection(contentProtections),
                 bitrate,
                 duration,
                 language,

package/dist/dasha.mjs

@@ -472,6 +472,13 @@ var require_video = __commonJS({
         `No MIME types matched any supported Video Codecs in ${codecs}`
       );
     };
+    var tryParseVideoCodec = (codecs) => {
+      try {
+        return parseVideoCodec(codecs);
+      } catch (e) {
+        return null;
+      }
+    };
     var parseDynamicRange = (codecs, supplementalProps = [], essentialProps = []) => {
       const dv = ["dva1", "dvav", "dvhe", "dvh1"];
       if (dv.some((value) => codecs.startsWith(value))) return DYNAMIC_RANGE.dv;
@@ -496,6 +503,7 @@ var require_video = __commonJS({
     };
     module.exports = {
       parseVideoCodec,
+      tryParseVideoCodec,
       parseDynamicRange,
       createVideoTrack,
       VIDEO_CODECS
@@ -665,6 +673,13 @@ var require_audio = __commonJS({
         `No MIME types matched any supported Audio Codecs in ${codecs}`
       );
     };
+    var tryParseAudioCodec = (codecs) => {
+      try {
+        return parseAudioCodec(codecs);
+      } catch (e) {
+        return null;
+      }
+    };
     var getDolbyDigitalPlusComplexityIndex = (supplementalProps = []) => {
       const targetScheme = "tag:dolby.com,2018:dash:EC3_ExtensionComplexityIndex:2018";
       for (const prop of supplementalProps)
@@ -698,6 +713,7 @@ var require_audio = __commonJS({
       type,
       codec,
       channels,
+      contentProtection,
       bitrate,
       duration,
       jointObjectCoding = 0,
@@ -715,6 +731,7 @@ var require_audio = __commonJS({
         codec,
         bitrate: parsedBitrate,
         size,
+        protection: contentProtection,
         language,
         segments,
         channels: parsedChannels,
@@ -734,6 +751,7 @@ var require_audio = __commonJS({
     module.exports = {
       AUDIO_CODECS,
       parseAudioCodec,
+      tryParseAudioCodec,
       createAudioTrack,
       getDolbyDigitalPlusComplexityIndex,
       checkIsDescriptive
@@ -799,6 +817,13 @@ var require_subtitle = __commonJS({
         `No MIME types matched any supported Subtitle Codecs in ${codecs}`
       );
     };
+    var tryParseSubtitleCodec = (codecs) => {
+      try {
+        return parseSubtitleCodec(codecs);
+      } catch (e) {
+        return null;
+      }
+    };
     var checkIsClosedCaption = (roles = []) => {
       for (const role of roles) {
         const isClosedCaption = role.attributes.schemeIdUri === "urn:mpeg:dash:role:2011" && role.attributes.value === "caption";
@@ -855,6 +880,7 @@ var require_subtitle = __commonJS({
     };
     module.exports = {
       parseSubtitleCodec,
+      tryParseSubtitleCodec,
       checkIsClosedCaption,
       checkIsSdh,
       checkIsForced,
@@ -871,17 +897,20 @@ var require_dash = __commonJS({
     var { parseDuration, isLanguageTagValid } = require_util();
     var {
       parseVideoCodec,
+      tryParseVideoCodec,
       parseDynamicRange,
       createVideoTrack
     } = require_video();
     var {
       parseAudioCodec,
+      tryParseAudioCodec,
       createAudioTrack,
       getDolbyDigitalPlusComplexityIndex,
       checkIsDescriptive
     } = require_audio();
     var {
       parseSubtitleCodec,
+      tryParseSubtitleCodec,
       checkIsClosedCaption,
       checkIsSdh,
       checkIsForced,
@@ -935,14 +964,22 @@ var require_dash = __commonJS({
       const baseUrl = new URL(representation.getBaseUrl() || "", base).toString();
       return baseUrl;
     };
+    var getTrackTypeByCodecs = (codecs) => {
+      if (tryParseVideoCodec(codecs)) return "video";
+      else if (tryParseAudioCodec(codecs)) return "audio";
+      else if (tryParseSubtitleCodec(codecs)) return "text";
+      return null;
+    };
     var parseContentTypes = (representation) => {
+      const codecs = representation.get("codecs");
       const mimeType = representation.get("mimeType");
+      const contentTypeByCodecs = getTrackTypeByCodecs(codecs);
       const contentType = representation.get("contentType") || mimeType?.split("/")[0];
       if (!contentType && !mimeType)
         throw new Error(
           "Unable to determine the format of a Representation, cannot continue..."
         );
-      return { contentType, mimeType };
+      return { contentType: contentTypeByCodecs || contentType, mimeType };
     };
     var parseCodecs = (representation, contentType, mimeType) => {
       const shouldUseCodecsFromMime = contentType === "text" && !mimeType.includes("mp4");
@@ -1035,6 +1072,7 @@ var require_dash = __commonJS({
       const segmentsCount = duration ? Math.ceil(duration / (segmentDuration / segmentTimescale)) : DEFAULT_SEGMENTS_COUNT;
       const bandwidth = representation.get("bandwidth");
       const id = representation.get("id");
+      const sanitizeTemplate = (template) => template?.replace(/\$.*?(RepresentationID|Number|Time).*?\$/g, "$$$1$$");
       const segments = [];
       if (segmentTimeline) {
         segments.push(
@@ -1046,8 +1084,9 @@ var require_dash = __commonJS({
           )
         );
       } else {
+        const template = sanitizeTemplate(segmentTemplate.get("media"));
         for (let i = startNumber; i < startNumber + segmentsCount; i++) {
-          const url = buildSegmentUrl(segmentTemplate.get("media"), {
+          const url = buildSegmentUrl(template, {
             Bandwidth: bandwidth,
             RepresentationID: id,
             Number: i,
@@ -1056,7 +1095,9 @@ var require_dash = __commonJS({
           segments.push({ url });
         }
       }
-      const initialization = segmentTemplate.get("initialization");
+      const initialization = sanitizeTemplate(
+        segmentTemplate.get("initialization")
+      );
       if (initialization) {
         const url = buildSegmentUrl(initialization, {
           Bandwidth: bandwidth,
@@ -1221,6 +1262,7 @@ var require_dash = __commonJS({
                 channels: get("AudioChannelConfiguration")?.get("value"),
                 jointObjectCoding: getDolbyDigitalPlusComplexityIndex(supplementalProps),
                 isDescriptive: checkIsDescriptive(accessibilities),
+                contentProtection: parseContentProtection(contentProtections),
                 bitrate,
                 duration,
                 language,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dasha",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "Streaming manifest parser",
   "files": [
     "dist",
@@ -55,14 +55,14 @@
     "m3u8-parser": "^7.2.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.13.0",
-    "@types/node": "^22.7.9",
-    "eslint": "^9.13.0",
+    "@eslint/js": "^9.15.0",
+    "@types/node": "^22.10.0",
+    "eslint": "^9.15.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "globals": "^15.11.0",
-    "prettier": "^3.3.3",
-    "tsup": "^8.3.0",
-    "typescript": "^5.6.3"
+    "globals": "^15.12.0",
+    "prettier": "^3.4.1",
+    "tsup": "^8.3.5",
+    "typescript": "^5.7.2"
   }
 }