dasha 2.1.0 → 2.2.2

package/lib/manifest.js

@@ -5,6 +5,14 @@ const { processManifest } = require('./processor');
 const { getQualityLabel } = require('./utils');
 const { CONTENT_TYPE, KEY_SYSTEMS } = require('./constants');
 
+const isUrl = (value) => {
+  try {
+    return !!new URL(value);
+  } catch (e) {
+    return false;
+  }
+};
+
 class Manifest {
   constructor(manifest) {
     for (const key of Object.keys(manifest)) this[key] = manifest[key];
@@ -21,10 +29,13 @@ class Manifest {
       .flat(1)
       .filter(isVideoAdaptationSet);
     const representations = adaptationSets.map((a) => a.representations).flat(2);
-    const matches = representations.filter((r) => r.height === height);
+    const matchesInHeight = representations.filter((r) => r.height === height);
+    const matchesInId = representations.filter((r) => r.id.includes(height));
+    const matches = matchesInHeight?.length ? matchesInHeight : matchesInId;
     const representation = this.findBestRepresentation(matches.length ? matches : representations);
     const adaptationSet = adaptationSets.find((a) => a.representations.includes(representation));
     return {
+      id: 0,
       type: CONTENT_TYPE.video,
       pssh: this.getWidevinePssh(adaptationSet),
       licenseUrl: this.getWidevineLicenseUrl(adaptationSet),
@@ -33,16 +44,15 @@ class Manifest {
       size: Math.ceil((representation.bandwidth / 8e6) * this.mediaPresentationDuration), // MB
       width: representation.width,
       height: representation.height,
-      quality: getQualityLabel(representation.height),
+      quality: getQualityLabel(representation.width),
     };
   }
 
   getAudioTracks(languages) {
     const isAudioAdaptationSet = (adaptationSet) =>
-      adaptationSet.contentType === CONTENT_TYPE.audio ||
-      adaptationSet.mimeType === 'audio/mp4' ||
-      !adaptationSet.maxWidth ||
-      !adaptationSet.maxHeight;
+      (adaptationSet.contentType === CONTENT_TYPE.audio ||
+        adaptationSet.mimeType === 'audio/mp4') &&
+      !adaptationSet.maxWidth;
     const adaptationSets = this.periods
       .map((p) => p.adaptationSets)
       .flat(1)
@@ -50,16 +60,16 @@ class Manifest {
 
     const representations = adaptationSets.map((a) => a.representations).flat(2);
     const matches = representations.filter((r) => languages?.some((lang) => r.lang.includes(lang)));
-    // TODO: Select all audio tracks if they with different langs but same bandwidth
-    const selectedRepresentations = matches?.length
-      ? matches
-      : [this.findBestRepresentation(representations)];
+    const selectedRepresentations = matches?.length ? matches : representations;
 
     const tracks = [];
     for (const representation of selectedRepresentations) {
       const adaptationSet = adaptationSets.find((a) => a.representations.includes(representation));
       const track = {
+        id: tracks.length,
         type: CONTENT_TYPE.audio,
+        label: adaptationSet.label,
+        language: adaptationSet.lang,
         pssh: this.getWidevinePssh(adaptationSet),
         licenseUrl: this.getWidevineLicenseUrl(adaptationSet),
         segments: this.getSegments(adaptationSet, representation),
@@ -74,19 +84,53 @@ class Manifest {
   }
 
   getSubtitleTracks(languages) {
-    // TODO: Return subtitle tracks
+    const isSubtitleAdaptationSet = (adaptationSet) =>
+      (adaptationSet.contentType === CONTENT_TYPE.text ||
+        adaptationSet.mimeType.includes('text')) &&
+      !adaptationSet.maxWidth;
+    const adaptationSets = this.periods
+      .map((p) => p.adaptationSets)
+      .flat(1)
+      .filter(isSubtitleAdaptationSet);
+
+    const representations = adaptationSets.map((a) => a.representations).flat(2);
+    const matches = representations.filter((r) => languages?.some((lang) => r.lang.includes(lang)));
+    const selectedRepresentations = matches?.length ? matches : representations;
+
+    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 url = isUrl(representationBaseUrl)
+        ? representationBaseUrl
+        : `${baseUrl || ''}${representationBaseUrl || ''}`;
+      const track = {
+        id: tracks.length,
+        type: CONTENT_TYPE.text,
+        label: adaptationSet.label,
+        language: adaptationSet.lang,
+        format: representation.mimeType?.split('/')[1] || adaptationSet.mimeType?.split('/')[1],
+        segments: [{ url }],
+        bitrate: Math.round(representation.bandwidth / 1000), // Kbps
+        size: Math.ceil((representation.bandwidth / 8e6) * this.mediaPresentationDuration), // MB
+      };
+      tracks.push(track);
+    }
+
+    return tracks;
   }
 
   getWidevinePssh(adaptationSet) {
     const isWidevineProtection = (protection) =>
       protection.schemeIdUri === KEY_SYSTEMS['com.widevine.alpha'];
-    return adaptationSet.contentProtections.find(isWidevineProtection)?.cencPssh || null;
+    return adaptationSet?.contentProtections?.find(isWidevineProtection)?.cencPssh || null;
   }
 
   getWidevineLicenseUrl(adaptationSet) {
     const isWidevineProtection = (protection) =>
       protection.schemeIdUri === KEY_SYSTEMS['com.widevine.alpha'];
-    return adaptationSet.contentProtections.find(isWidevineProtection)?.licenseUrl || null;
+    return adaptationSet?.contentProtections?.find(isWidevineProtection)?.licenseUrl || null;
   }
 
   findBestRepresentation(representations) {

package/lib/processor.js

@@ -58,6 +58,8 @@ const processAdaptationSet = (adaptationSet) => {
     maxFrameRate: adaptationSet['maxFrameRate'],
     contentType: adaptationSet['contentType'],
     segmentTemplate: adaptationSet['SegmentTemplate'],
+    mimeType: adaptationSet['mimeType'],
+    label: adaptationSet['label'],
     contentProtections,
     representations,
   };

package/lib/utils.js

@@ -34,14 +34,15 @@ const parseDuration = (durationString) => {
   return isFinite(d) ? d : null;
 };
 
-const getQualityLabel = (videoHeight) => {
-  const height = typeof videoHeight === 'number' ? videoHeight : parseInt(videoHeight);
-  if (isNaN(height)) return;
+const getQualityLabel = (videoWidth) => {
+  const width = typeof videoWidth === 'number' ? videoWidth : parseInt(videoWidth);
+  if (isNaN(width)) return;
   let label = 'SD';
-  if (height >= 720) label = 'HD';
-  if (height >= 1080) label = 'Full HD';
-  if (height >= 2160) label = '4K';
-  if (height >= 4320) label = '8K';
+  if (width >= 1280) label = 'HD';
+  if (width >= 1920) label = 'Full HD';
+  if (width >= 3840) label = 'UHD';
+  if (width >= 4096) label = '4K';
+  if (width >= 7680) label = '8K';
   return label;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dasha",
-  "version": "2.1.0",
+  "version": "2.2.2",
   "author": "Vitaliy Gashkov <vitnore@gmail.com>",
   "description": "Simple MPEG-DASH MPD parser",
   "license": "Apache-2.0",
@@ -34,13 +34,13 @@
     "format:check": "prettier --loglevel warn --check \"**/*.{ts,js,json,yaml}\""
   },
   "devDependencies": {
-    "@types/node": "^17.0.17",
-    "eslint": "^8.9.0",
-    "eslint-config-prettier": "^8.3.0",
+    "@types/node": "^17.0.23",
+    "eslint": "^8.12.0",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-prettier": "^4.0.0",
     "jest": "^27.5.1",
-    "prettier": "^2.5.1",
-    "typescript": "^4.5.5"
+    "prettier": "^2.6.1",
+    "typescript": "^4.6.3"
   }
 }