dasha 3.1.6 → 3.1.8

package/lib/hls.js

@@ -2,7 +2,6 @@
 
 const { dirname, basename } = require('node:path');
 const m3u8Parser = require('m3u8-parser');
-const { parseBitrate, getQualityLabel } = require('./util');
 const {
   createResolutionFilter,
   createVideoQualityFilter,
@@ -24,8 +23,7 @@ const parseM3u8 = (manifestString) => {
 
 const fetchPlaylist = async (url) => {
   const response = await fetch(url);
-  if (!response.ok)
-    throw new Error(`Failed to fetch playlist (${response.status}): ${url}`);
+  if (!response.ok) throw new Error(`Failed to fetch playlist (${response.status}): ${url}`);
   const text = await response.text();
   return parseM3u8(text);
 };
@@ -33,8 +31,7 @@ const fetchPlaylist = async (url) => {
 const parseUrl = (playlistUri, manifestUri) => {
   let value = playlistUri;
   if (!value.startsWith('https://'))
-    value =
-      new URL(value, manifestUri).toString() + new URL(manifestUri).search;
+    value = new URL(value, manifestUri).toString() + new URL(manifestUri).search;
   return value;
 };
 
@@ -77,23 +74,21 @@ const getSubtitlePlaylists = (m3u8, manifestUri) => {
 const getVideoPlaylists = (m3u8, manifestUri) => {
   if (!m3u8.playlists) return [];
   return m3u8.playlists.map((data) => {
-    const bandwidth = data.attributes?.BANDWIDTH;
-    const url = data.resolvedUri || parseUrl(data.uri, manifestUri);
-    const track = {
+    const track = createVideoTrack({
       id: data.uri.replace('/', ''),
-      bitrate: parseBitrate(bandwidth),
-      url,
-    };
-    track.type = 'video';
-    if (data.attributes.RESOLUTION) {
-      track.resolution = data.attributes.RESOLUTION;
-      track.quality = getQualityLabel(track.resolution);
-    }
-    if (data.attributes['VIDEO-RANGE'])
-      track.dynamicRange = data.attributes['VIDEO-RANGE'];
-    if (data.attributes.CODECS) track.codecs = data.attributes.CODECS;
-    if (data.attributes['FRAME-RATE'])
-      track.frameRate = data.attributes['FRAME-RATE'];
+      label: data.attributes['NAME'],
+      type: 'video',
+      codec: data.attributes.CODECS,
+      dynamicRange: data.attributes['VIDEO-RANGE'],
+      bitrate: data.attributes?.BANDWIDTH,
+      width: data.attributes.RESOLUTION?.width,
+      height: data.attributes.RESOLUTION?.height,
+      fps: data.attributes['FRAME-RATE'],
+      language: data.attributes['LANGUAGE'],
+    });
+
+    track.url = data.resolvedUri || parseUrl(data.uri, manifestUri);
+
     return track;
   });
 };
@@ -168,9 +163,7 @@ const parseManifest = async (manifestString, manifestUri) => {
     // TODO: Handle audio-only manifests
     const { pathname } = new URL(manifestUri);
     const isAudio =
-      pathname.includes('.m4a') ||
-      pathname.includes('.mp3') ||
-      pathname.includes('.opus');
+      pathname.includes('.m4a') || pathname.includes('.mp3') || pathname.includes('.opus');
     if (isAudio) {
       const track = createAudioTrack({
         id: 'audio' + basename(pathname),

package/lib/track.js

@@ -11,9 +11,7 @@ const parseMimes = (codecs) =>
 const createResolutionFilter = (videos) => {
   return ({ width, height }) => {
     return videos.filter(
-      (track) =>
-        (!width || track.width === width) &&
-        (!height || track.height === height),
+      (track) => (!width || track.width === width) && (!height || track.height === height),
     );
   };
 };
@@ -32,11 +30,9 @@ const createVideoCodecFilter = (videos) => createCodecFilter(videos);
 const createVideoQualityFilter = (videos) => {
   return (quality) => {
     if (!quality) return [getBestTrack(videos)];
-    const trackQuality = String(quality).includes('p')
-      ? quality
-      : `${quality}p`;
+    const trackQuality = String(quality).includes('p') ? quality : `${quality}p`;
     const results = videos.filter((track) => track.quality === trackQuality);
-    results.sort((a, b) => b.bitrate.bps - a.bitrate.bps);
+    results.filter((v) => !!v.bitrate).sort((a, b) => b.bitrate.bps - a.bitrate.bps);
     return results.length ? results : [getBestTrack(videos)];
   };
 };
@@ -53,15 +49,13 @@ const createAudioLanguageFilter = (audios) => {
           if (!alreadyAdded) languages.push(audio.language);
         }
       } else {
-        audios.sort((a, b) => b.bitrate.bps - a.bitrate.bps);
+        audios.filter((a) => !!a.bitrate).sort((a, b) => b.bitrate.bps - a.bitrate.bps);
         return audios.slice(0, maxTracksPerLanguage);
       }
     }
     const filtered = [];
     for (const language of languages) {
-      const tracks = audios.filter((track) =>
-        track.language?.startsWith(language),
-      );
+      const tracks = audios.filter((track) => track.language?.startsWith(language));
       filtered.push(...tracks);
     }
     const results = [];
@@ -81,8 +75,7 @@ const createAudioLanguageFilter = (audios) => {
 const createAudioChannelsFilter = (audios) => {
   return (channels) => {
     if (!channels) return audios;
-    const value =
-      typeof channels === 'string' ? parseFloat(channels) : channels;
+    const value = typeof channels === 'string' ? parseFloat(channels) : channels;
     return audios.filter((track) => track.channels === value);
   };
 };
@@ -92,23 +85,18 @@ const createSubtitleLanguageFilter = (subtitles) => {
     if (!languages.length) return subtitles;
     return subtitles.filter((track) =>
       languages.some(
-        (language) =>
-          track.language?.startsWith(language) ||
-          track.label?.startsWith(language),
+        (language) => track.language?.startsWith(language) || track.label?.startsWith(language),
       ),
     );
   };
 };
 
-const filterByResolution = (tracks, resolution) =>
-  createResolutionFilter(tracks)(resolution);
-const filterByQuality = (tracks, quality) =>
-  createVideoQualityFilter(tracks)(quality);
+const filterByResolution = (tracks, resolution) => createResolutionFilter(tracks)(resolution);
+const filterByQuality = (tracks, quality) => createVideoQualityFilter(tracks)(quality);
 const filterByCodecs = (tracks, codecs) => createCodecFilter(tracks)(codecs);
 const filterByLanguages = (tracks, languages, maxTracksPerLanguage) =>
   createAudioLanguageFilter(tracks)(languages, maxTracksPerLanguage);
-const filterByChannels = (tracks, channels) =>
-  createAudioChannelsFilter(tracks)(channels);
+const filterByChannels = (tracks, channels) => createAudioChannelsFilter(tracks)(channels);
 
 module.exports = {
   parseMimes,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dasha",
-  "version": "3.1.6",
+  "version": "3.1.8",
   "description": "Streaming manifest parser",
   "files": [
     "dasha.js",