dasha 2.3.2 → 2.3.4

package/lib/manifest.js

@@ -2,7 +2,7 @@
 
 const { parseXml } = require('./xml');
 const { processManifest } = require('./processor');
-const { getQualityLabel, getHeightByWidth, getClosest } = require('./utils');
+const { getQualityLabel, getHeightByWidth, getClosest, sanitizeBaseUrl } = require('./utils');
 const { CONTENT_TYPE, KEY_SYSTEMS } = require('./constants');
 
 const isUrl = (value) => {
@@ -19,8 +19,9 @@ class Manifest {
   }
 
   addBaseUrl(value) {
-    if (Array.isArray(this.baseUrls)) this.baseUrls.push({ value });
-    else this.baseUrls = [{ value }];
+    const sanitizedValue = sanitizeBaseUrl(value);
+    if (Array.isArray(this.baseUrls)) this.baseUrls.push(sanitizedValue);
+    else this.baseUrls = [sanitizedValue];
   }
 
   getVideoTrack(height) {
@@ -133,8 +134,8 @@ class Manifest {
     const tracks = [];
     for (const representation of selectedRepresentations) {
       const adaptationSet = adaptationSets.find((a) => a.representations.includes(representation));
-      const baseUrl = this.baseUrls?.[0]?.value;
-      const representationBaseUrl = representation.baseUrls?.[0]?.value;
+      const baseUrl = this.baseUrls?.[0];
+      const representationBaseUrl = representation.baseUrls?.[0];
       const url = isUrl(representationBaseUrl)
         ? representationBaseUrl
         : `${baseUrl || ''}${representationBaseUrl || ''}`;
@@ -177,7 +178,7 @@ class Manifest {
     const segmentTemplate = representation.segmentTemplate || adaptationSet.segmentTemplate;
     const baseUrls = representation.baseUrls || this.baseUrls;
     const isBaseUrlRequired = !segmentTemplate.media.includes(`https://`);
-    const baseUrl = baseUrls?.map((url) => url.value)?.[0];
+    const baseUrl = baseUrls?.[0];
     const initTemplate = segmentTemplate.initialization;
     const initUrl = initTemplate
       ?.replace(/\$Bandwidth\$/i, representation.bandwidth)
@@ -187,12 +188,14 @@ class Manifest {
 
     const mediaTemplate = segmentTemplate.media.replace(/\$Bandwidth\$/i, representation.bandwidth);
     let time = 0;
-    let index = parseInt(segmentTemplate.startNumber) || 0;
+    let index = parseInt(segmentTemplate.startNumber || segmentTemplate.start) || 0;
 
-    if (!Array.isArray(segmentTemplate['SegmentTimeline']['S']))
-      segmentTemplate['SegmentTimeline']['S'] = [segmentTemplate['SegmentTimeline']['S']];
+    let s = segmentTemplate['SegmentTimeline']?.['S'];
+    if (!!s && !Array.isArray(segmentTemplate['SegmentTimeline']?.['S']))
+      s = [segmentTemplate['SegmentTimeline']?.['S']];
 
-    for (const segment of segmentTemplate['SegmentTimeline']['S']) {
+    for (let i = 0; i < (s?.length || segmentTemplate.duration); i++) {
+      const segment = s?.[i] || {};
       const repeats = parseInt(segment.r || '0') + 1;
       if (segment.t) time = parseInt(segment.t);
       const duration = parseInt(segment.d || segmentTemplate.timescale || '0');
@@ -215,6 +218,14 @@ class Manifest {
     let pssh = null;
     for (const period of this.periods)
       for (const adaptationSet of period.adaptationSets) {
+        for (const representation of adaptationSet.representations) {
+          if (!representation.contentProtections) continue;
+          for (const contentProtection of representation.contentProtections)
+            if (contentProtection.cencPssh && contentProtection.schemeIdUri === schemeIdUri) {
+              pssh = contentProtection.cencPssh;
+              break;
+            }
+        }
         if (!adaptationSet.contentProtections) continue;
         for (const contentProtection of adaptationSet.contentProtections)
           if (contentProtection.cencPssh && contentProtection.schemeIdUri === schemeIdUri) {

package/lib/processor.js

@@ -1,4 +1,4 @@
-const { parseDuration } = require('./utils');
+const { parseDuration, sanitizeBaseUrl } = require('./utils');
 
 const processElement = (element, type) => {
   if (!element) return;
@@ -15,9 +15,13 @@ const processElement = (element, type) => {
 };
 
 const processRepresentation = (representation) => {
+  const contentProtectionsList = processElement(representation?.['ContentProtection'], 'array');
+  const contentProtections = contentProtectionsList?.map((c) => processContentProtection(c));
   return {
     id: representation['id'],
-    baseUrls: processElement(representation['BaseURL'], 'array'),
+    baseUrls: processElement(representation['BaseURL'], 'array')?.map((url) =>
+      sanitizeBaseUrl(url.value)
+    ),
     codecs: representation['codecs'],
     bandwidth: processElement(representation['bandwidth'], 'number'),
     frameRate: representation['frameRate'],
@@ -28,6 +32,7 @@ const processRepresentation = (representation) => {
     sar: representation['sar'],
     startWithSAP: representation['startWithSAP'],
     segmentTemplate: representation['SegmentTemplate'],
+    contentProtections,
   };
 };
 
@@ -50,7 +55,9 @@ const processAdaptationSet = (adaptationSet) => {
   return {
     id: adaptationSet['id'],
     group: processElement(adaptationSet['group'], 'number'),
-    baseUrls: processElement(adaptationSet['BaseURL'], 'array'),
+    baseUrls: processElement(adaptationSet['BaseURL'], 'array')?.map((url) =>
+      sanitizeBaseUrl(url.value)
+    ),
     segmentAlignment: adaptationSet['segmentAlignment'],
     lang: adaptationSet['lang'],
     maxWidth: processElement(adaptationSet['maxWidth'], 'number'),
@@ -82,7 +89,7 @@ const processManifest = (parsedXml) => {
   if (!periodsList.length) return null;
   return {
     periods: periodsList.map((p) => processPeriod(p)),
-    baseUrls: processElement(mpd['BaseURL'], 'array'),
+    baseUrls: processElement(mpd['BaseURL'], 'array')?.map((url) => sanitizeBaseUrl(url.value)),
     locations: processElement(mpd['Location'], 'array'),
     profiles: mpd['profiles'],
     mediaPresentationDuration: processElement(mpd['mediaPresentationDuration'], 'duration'),

package/lib/utils.js

@@ -54,4 +54,10 @@ const getClosest = (value, array) =>
 
 const getQualityLabel = (videoWidth) => getHeightByWidth(videoWidth) + 'p';
 
-module.exports = { parseDuration, getHeightByWidth, getQualityLabel, getClosest };
+const sanitizeBaseUrl = (value) => {
+  if (!value.includes('.mpd')) return value;
+  const manifestFilename = value.split('.mpd')[0].split('/').at(-1) + '.mpd';
+  return value.replace(manifestFilename, '');
+};
+
+module.exports = { parseDuration, getHeightByWidth, getQualityLabel, getClosest, sanitizeBaseUrl };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dasha",
-  "version": "2.3.2",
-  "author": "Vitaly Gashkov <vitalygashkov@bk.ru>",
+  "version": "2.3.4",
+  "author": "Vitaly Gashkov <vitalygashkov@vk.com>",
   "description": "MPD-manifest parser for MPEG DASH",
   "license": "Apache-2.0",
   "keywords": [

package/types/manifest.d.ts

@@ -34,9 +34,13 @@ interface VideoTrack extends MediaTrack {
 interface AudioTrack extends MediaTrack {
   type: 'audio';
   audioSampleRate: number;
+  language: string;
 }
 
-interface SubtitleTrack {}
+interface SubtitleTrack extends MediaTrack {
+  type: 'text';
+  language: string;
+}
 
 interface Segment {
   url: string;
@@ -45,4 +49,4 @@ interface Segment {
 
 declare const parseManifest: (text: string) => Manifest | null;
 
-export { parseManifest, Manifest, VideoTrack, AudioTrack };
+export { parseManifest, Manifest, VideoTrack, AudioTrack, SubtitleTrack };