dasha 3.1.5 → 3.1.7

package/README.md

@@ -9,7 +9,7 @@ Library for parsing MPEG-DASH (.mpd) and HLS (.m3u8) manifests. Made with the pu
 ## Install
 
 ```shell
-npm i dasha
+npm i dasha@3.1.5
 ```
 
 ## Quick start
@@ -18,8 +18,7 @@ npm i dasha
 import fs from 'node:fs/promises';
 import { parse } from 'dasha';
 
-const url =
-  'https://dash.akamaized.net/dash264/TestCases/1a/sony/SNE_DASH_SD_CASE1A_REVISED.mpd';
+const url = 'https://dash.akamaized.net/dash264/TestCases/1a/sony/SNE_DASH_SD_CASE1A_REVISED.mpd';
 const body = await fetch(url).then((res) => res.text());
 const manifest = await parse(body, url);
 

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/package.json

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