dasha 3.0.1 → 3.0.3

package/lib/dash.js

@@ -56,16 +56,12 @@ const combineGetters = (representation, adaptationSet) => {
 };
 
 const parseBaseUrl = (manifestUrl, mpd, period, representation) => {
-  let manifestBaseUrl = mpd.getBaseUrl();
-  if (!manifestBaseUrl) manifestBaseUrl = manifestUrl;
-  else if (!manifestBaseUrl.startsWith('https://'))
-    manifestBaseUrl = new URL(manifestBaseUrl, manifestUrl).toString();
-  const periodBaseUrl = new URL(period.getBaseUrl() || '', manifestBaseUrl).toString();
-  const representationBaseUrl = new URL(
-    representation.getBaseUrl() || '',
-    periodBaseUrl
-  ).toString();
-  return representationBaseUrl;
+  let base = mpd.getBaseUrl();
+  if (!base) base = manifestUrl;
+  else if (!base.startsWith('https://')) base = new URL(base, manifestUrl).toString();
+  if (!!period.getBaseUrl() || !!base) base = new URL(period.getBaseUrl() || '', base).toString();
+  const baseUrl = new URL(representation.getBaseUrl() || '', base).toString();
+  return baseUrl;
 };
 
 const parseContentTypes = (representation) => {
@@ -236,35 +232,36 @@ const parseSegmentFromBase = async (segmentBase, baseUrl) => {
   return { url: baseUrl, range: mediaRange };
 };
 
+const transformSegmentUrls = (segments) => {
+  for (const segment of segments) {
+    const hasHtmlEscapeCode = segment.url.includes('&');
+    if (hasHtmlEscapeCode) {
+      const url = new URL(segment.url);
+      const entries = new URLSearchParams(url.searchParams.toString()).entries();
+      for (const [key, value] of entries) {
+        url.searchParams.delete(key);
+        url.searchParams.append(key.replaceAll('amp;', ''), value);
+      }
+      segment.url = url.toString();
+    }
+  }
+};
+
+const protectionSchemas = {
+  'urn:mpeg:dash:mp4protection:2011': 'common',
+  'urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95': 'playready',
+  'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed': 'widevine',
+};
+
 const parseContentProtection = (contentProtections) => {
   const protection = {};
-  const commonId = 'urn:mpeg:dash:mp4protection:2011';
-  const playreadyId = 'urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95';
-  const widevineId = 'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed';
   for (const contentProtection of contentProtections) {
     const id = contentProtection.get('schemeIdUri')?.toLowerCase();
-    switch (id) {
-      case commonId:
-        protection.common = {
-          id,
-          value: contentProtection.get('value'),
-          keyId: contentProtection.get('cenc:default_KID'),
-        };
-        continue;
-      case playreadyId:
-        protection.playready = {
-          id,
-          value: contentProtection.get('value'),
-          pssh: contentProtection.get('cenc:pssh')?.get(),
-        };
-        continue;
-      case widevineId:
-        protection.widevine = {
-          id,
-          pssh: contentProtection.get('cenc:pssh')?.get(),
-        };
-        continue;
-    }
+    const value = contentProtection.get('value');
+    const pssh = contentProtection.get('cenc:pssh')?.get();
+    const defaultKeyId = contentProtection.get('cenc:default_KID');
+    const data = { id, value, pssh, defaultKeyId };
+    protection[protectionSchemas[id]] = data;
   }
   return protection;
 };
@@ -312,6 +309,7 @@ const parseManifest = async (text, url, fallbackLanguage) => {
       } else {
         throw new Error('Could not find a way to get segments from this MPD manifest.');
       }
+      transformSegmentUrls(segments);
 
       const label = get('label');
       const fps = get('frameRate') ?? segmentBase?.attributes.timescale;

package/lib/track.js

@@ -33,14 +33,18 @@ const createAudioLanguageFilter = (audios) => {
         if (!alreadyAdded) languages.push(audio.language);
       }
     }
-    const results = [];
+    const filtered = [];
     for (const language of languages) {
       const tracks = audios.filter((track) => track.language?.startsWith(language));
-      if (tracks.length > maxTracksPerLanguage) {
-        results.push(...tracks.slice(0, maxTracksPerLanguage));
-      } else {
-        results.push(...tracks);
-      }
+      filtered.push(...tracks);
+    }
+    const results = [];
+    const filteredLanguages = [...new Set(filtered.map((track) => track.language))];
+    for (const language of filteredLanguages) {
+      const tracks = filtered
+        .filter((track) => track.language === language)
+        .slice(0, maxTracksPerLanguage);
+      results.push(...tracks);
     }
     return results;
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dasha",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "author": "Vitaly Gashkov <vitalygashkov@vk.com>",
   "description": "Parser for MPEG-DASH & HLS manifests",
   "license": "AGPL-3.0",

package/types/dasha.d.ts

@@ -1,4 +1,4 @@
-export function parse(text: string, url: string, fallbackLanguage?: string): Promise<Manifest>;
+export function parse(text: string, url?: string, fallbackLanguage?: string): Promise<Manifest>;
 
 export interface Manifest {
   duration?: number;
@@ -50,9 +50,9 @@ export interface Segment {
 }
 
 export interface TrackProtection {
-  common?: { id: string; value: 'cenc' | 'cbcs'; keyId?: string };
+  common?: { id: string; value: 'cenc' | 'cbcs'; defaultKeyId?: string };
   playready?: { id: string; pssh?: string; value?: string };
-  widevine?: { id: string; pssh: string };
+  widevine?: { id: string; pssh: string; defaultKeyId?: string };
   fairplay?: { keyFormat: string; uri: string; method: string };
 }