dasha 4.0.0-alpha.11 → 4.0.0-alpha.13

package/README.md

@@ -13,14 +13,14 @@ Library for parsing MPEG-DASH (.mpd) and HLS (.m3u8) manifests. Made with the pu
 ## Install
 
 ```shell
-npm i dasha@alpha
+npm install dasha@alpha
 ```
 
 ## Usage
 
 ```js
 import fs from 'node:fs/promises';
-import { parse } from 'dasha';
+import { StreamExtractor } from 'dasha';
 
 const url = 'https://dash.akamaized.net/dash264/TestCases/1a/sony/SNE_DASH_SD_CASE1A_REVISED.mpd';
 const streamExtractor = new StreamExtractor();
@@ -37,10 +37,47 @@ for (const stream of streams) {
 }
 ```
 
-## Credits
+### New API (HLS-only for now)
+
+```ts
+import fs from 'node:fs/promises';
+import { getSegments, desc, HLS_FORMATS, Input, UrlSource } from 'dasha';
+
+async function saveVideo() {
+  const input = new Input({
+    source: new UrlSource(
+      'https://storage.googleapis.com/shaka-demo-assets/angel-one-widevine-hls/hls.m3u8',
+      { requestInit: { headers: { Referer: 'https://bitmovin.com/' } } },
+    ),
+    formats: HLS_FORMATS,
+  });
+
+  const videoTracks = await input.getVideoTracks({
+    sortBy: async (track) => [
+      desc(await track.getDisplayHeight()),
+      // Tracks with matching resolution are sorted by bitrate
+      desc(await track.getBitrate()),
+    ],
+    // Filter out #EXT-X-I-FRAME-STREAM-INF tracks
+    filter: async (track) => !(await track.hasOnlyKeyPackets()),
+  });
 
-This project is heavily influenced by the robust implementation found in [N_m3u8DL-RE](https://github.com/nilaoda/N_m3u8DL-RE). Special thanks to the open-source community and contributors who make projects like this possible.
+  const bestVideoTrack = videoTracks[0];
 
-## Licenses
+  const segments = await getSegments(bestVideoTrack);
+
+  const outputPath = 'output.mp4';
+  const urls = segments.map((segment) => segment.location.path);
+  const initSegment = segments[0]?.initSegment;
+  if (initSegment) urls.unshift(initSegment.location.path);
+  for (const url of urls) {
+    const content = await fetch(url).then((res) => res.arrayBuffer());
+    await fs.appendFile(outputPath, new Uint8Array(content));
+  }
+};
+```
+
+## Credits
 
-This project is licensed under the [MIT License](LICENSE).
+[mediabunny](https://github.com/Vanilagy/mediabunny)
+[N_m3u8DL-RE](https://github.com/nilaoda/N_m3u8DL-RE)

package/dist/dasha.d.mts

@@ -1,3 +1,5 @@
+import { HLS_FORMATS, Input, InputTrack as InputTrack$1, UrlSource, asc, desc } from "mediabunny";
+
 //#region lib/shared/codec.d.ts
 /**
  * List of known video codecs, ordered by encoding preference.
@@ -389,4 +391,51 @@ declare const HLS_TAGS: {
  */
 declare function getRange(input: string): [number, number | null];
 //#endregion
-export { ALL_STREAM_TYPES, AUDIO_CODECS, AudioCodec, AudioStreamInfo, ContentProcessor, DASH_TAGS, DashExtractor, DefaultDashContentProcessor, DefaultHlsContentProcessor, DefaultHlsKeyProcessor, DefaultUrlProcessor, ENCRYPT_METHODS, EXTRACTOR_TYPES, EncryptInfo, EncryptMethod, Extractor, ExtractorType, HLS_TAGS, HlsExtractor, KeyProcessor, MediaCodec, MediaPart, MediaSegment, MediaStreamInfo, ParserConfig, Playlist, ROLE_TYPE, RoleType, SUBTITLE_CODECS, StreamExtractor, StreamInfo, StreamType, SubtitleCodec, SubtitleStreamInfo, UrlProcessor, VIDEO_CODECS, VIDEO_DYNAMIC_RANGES, VideoCodec, VideoDynamicRange, VideoStreamInfo, getRange, parseRange };
+//#region lib/mediabunny.d.ts
+type Segment = {
+  timestamp: number;
+  duration: number;
+  relativeToUnixEpoch: boolean;
+  firstSegment: Segment | null;
+};
+type HlsSegmentLocation = {
+  path: string;
+  offset: number;
+  length: number | null;
+};
+type HlsEncryptionInfo = {
+  method: 'AES-128';
+  keyUri: string;
+  iv: Uint8Array | null;
+  keyFormat: string;
+} | {
+  method: 'SAMPLE-AES' | 'SAMPLE-AES-CTR';
+};
+type HlsSegment = Segment & {
+  sequenceNumber: number | null;
+  location: HlsSegmentLocation;
+  encryption: HlsEncryptionInfo | null;
+  firstSegment: HlsSegment | null;
+  initSegment: HlsSegment | null;
+  lastProgramDateTimeSeconds: number | null;
+};
+type HlsSegmentedInput = {
+  segments: HlsSegment[];
+  runUpdateSegments(): Promise<void>;
+};
+type InputTrackWithBacking = InputTrack & {
+  _backing: {
+    internalTrack: {
+      fullPath: string;
+      demuxer: {
+        getSegmentedInputForPath(path: string): HlsSegmentedInput;
+      };
+    };
+  };
+};
+//#endregion
+//#region lib/input.d.ts
+declare const getSegmentedInput: (track: InputTrack$1) => HlsSegmentedInput;
+declare const getSegments: (track: InputTrack$1) => Promise<HlsSegment[]>;
+//#endregion
+export { ALL_STREAM_TYPES, AUDIO_CODECS, AudioCodec, AudioStreamInfo, ContentProcessor, DASH_TAGS, DashExtractor, DefaultDashContentProcessor, DefaultHlsContentProcessor, DefaultHlsKeyProcessor, DefaultUrlProcessor, ENCRYPT_METHODS, EXTRACTOR_TYPES, EncryptInfo, EncryptMethod, Extractor, ExtractorType, HLS_FORMATS, HLS_TAGS, HlsExtractor, type HlsSegment, type HlsSegmentedInput, Input, InputTrack$1 as InputTrack, type InputTrackWithBacking, KeyProcessor, MediaCodec, MediaPart, MediaSegment, MediaStreamInfo, ParserConfig, Playlist, ROLE_TYPE, RoleType, SUBTITLE_CODECS, StreamExtractor, StreamInfo, StreamType, SubtitleCodec, SubtitleStreamInfo, UrlProcessor, UrlSource, VIDEO_CODECS, VIDEO_DYNAMIC_RANGES, VideoCodec, VideoDynamicRange, VideoStreamInfo, asc, desc, getRange, getSegmentedInput, getSegments, parseRange };

package/dist/dasha.mjs

@@ -7,7 +7,7 @@ import { pathToFileURL } from "node:url";
 import path from "node:path";
 import { Temporal } from "temporal-polyfill";
 import { DOMParser } from "@xmldom/xmldom";
-
+import { HLS_FORMATS, Input, InputTrack, UrlSource, asc, desc } from "mediabunny";
 //#region lib/shared/codec.ts
 /**
 * List of known video codecs, ordered by encoding preference.
@@ -65,7 +65,6 @@ const SUBTITLE_CODECS = [
 	"stpp",
 	"wvtt"
 ];
-
 //#endregion
 //#region lib/shared/encrypt-method.ts
 const ENCRYPT_METHODS = {
@@ -78,7 +77,6 @@ const ENCRYPT_METHODS = {
 	CHACHA20: "chacha20",
 	UNKNOWN: "unknown"
 };
-
 //#endregion
 //#region lib/shared/encrypt-info.ts
 var EncryptInfo = class {
@@ -95,7 +93,6 @@ var EncryptInfo = class {
 		else return ENCRYPT_METHODS.UNKNOWN;
 	}
 };
-
 //#endregion
 //#region lib/shared/extractor-type.ts
 const EXTRACTOR_TYPES = {
@@ -104,7 +101,6 @@ const EXTRACTOR_TYPES = {
 	HTTP_LIVE: "HTTP_LIVE",
 	MSS: "MSS"
 };
-
 //#endregion
 //#region lib/shared/media-part.ts
 var MediaPart = class {
@@ -113,7 +109,6 @@ var MediaPart = class {
 		this.mediaSegments = segments || [];
 	}
 };
-
 //#endregion
 //#region lib/shared/media-segment.ts
 var MediaSegment = class MediaSegment {
@@ -149,7 +144,6 @@ var MediaSegment = class MediaSegment {
 		return crypto.createHash("md5").update(payload).digest("hex");
 	}
 };
-
 //#endregion
 //#region lib/shared/playlist.ts
 var Playlist = class {
@@ -165,7 +159,6 @@ var Playlist = class {
 	mediaInit;
 	mediaParts = [];
 };
-
 //#endregion
 //#region lib/shared/role-type.ts
 const ROLE_TYPE = {
@@ -180,7 +173,6 @@ const ROLE_TYPE = {
 	Metadata: 8,
 	ForcedSubtitle: 9
 };
-
 //#endregion
 //#region lib/shared/stream-info.ts
 /**
@@ -324,7 +316,6 @@ var SubtitleStreamInfo = class extends StreamInfo {
 		return text.trim();
 	}
 };
-
 //#endregion
 //#region lib/processor.ts
 var DefaultUrlProcessor = class {
@@ -345,7 +336,6 @@ var DefaultUrlProcessor = class {
 		return url;
 	}
 };
-
 //#endregion
 //#region lib/dash/dash-content-processor.ts
 const namespaceMap = new Map([
@@ -370,7 +360,6 @@ var DefaultDashContentProcessor = class {
 		return replaceFirst(mpdContent, "<MPD ", `<MPD ${missingNamespaceKeys.map((key) => `xmlns:${key}="${namespaceMap.get(key)}"`).join(" ")} `);
 	}
 };
-
 //#endregion
 //#region lib/hls/hls-tags.ts
 const HLS_TAGS = {
@@ -401,7 +390,6 @@ const HLS_TAGS = {
 	extXMap: "#EXT-X-MAP",
 	extXStart: "#EXT-X-START"
 };
-
 //#endregion
 //#region lib/hls/hls-content-processor.ts
 var DefaultHlsContentProcessor = class DefaultHlsContentProcessor {
@@ -436,7 +424,6 @@ var DefaultHlsContentProcessor = class DefaultHlsContentProcessor {
 		return content;
 	}
 };
-
 //#endregion
 //#region lib/hls/hls-key-processor.ts
 var DefaultHlsKeyProcessor = class {
@@ -497,7 +484,6 @@ var DefaultHlsKeyProcessor = class {
 		return processedUrl;
 	}
 };
-
 //#endregion
 //#region lib/parser-config.ts
 var ParserConfig = class {
@@ -516,7 +502,6 @@ var ParserConfig = class {
 	appendUrlParams = false;
 	keyRetryCount = 3;
 };
-
 //#endregion
 //#region lib/dash/dash-tags.ts
 const DASH_TAGS = {
@@ -525,7 +510,6 @@ const DASH_TAGS = {
 	TemplateNumber: "$Number$",
 	TemplateTime: "$Time$"
 };
-
 //#endregion
 //#region lib/shared/util.ts
 const combineUrl = (baseUrl, relativeUrl) => {
@@ -579,7 +563,6 @@ const distinctBy = (array, callbackfn) => {
 	});
 };
 const parseMimes = (codecs) => codecs.toLowerCase().split(",").map((codec) => codec.trim().split(".")[0]);
-
 //#endregion
 //#region lib/dash/dash-utils.ts
 /**
@@ -591,7 +574,6 @@ const parseRange = (range) => {
 	const [startRange, end] = range.split("-").map(Number);
 	return [startRange, end - startRange + 1];
 };
-
 //#endregion
 //#region lib/shared/video.ts
 const PRIMARIES = {
@@ -692,7 +674,6 @@ const parseDynamicRange = (codecs, supplementalProps = [], essentialProps = [])
 	const getValues = (schemeIdUri) => allProps.filter((prop) => prop.schemeIdUri === schemeIdUri).map((prop) => parseInt(prop.value));
 	return parseDynamicRangeFromCicp(getValues(primariesScheme).reduce((acc, current) => acc + current, 0), getValues(transferScheme).reduce((acc, current) => acc + current, 0), getValues(matrixScheme).reduce((acc, current) => acc + current, 0));
 };
-
 //#endregion
 //#region lib/shared/subtitle.ts
 const parseSubtitleCodecFromMime = (mime) => {
@@ -735,7 +716,6 @@ const checkIsSdh = (accessibilities = []) => {
 	}
 	return false;
 };
-
 //#endregion
 //#region lib/shared/audio.ts
 const parseAudioCodecFromMime = (mime) => {
@@ -787,11 +767,9 @@ const parseChannels = (channels) => {
 	}
 	return parseFloat(channels);
 };
-
 //#endregion
 //#region lib/shared/pipe.ts
 const pipe = (...fns) => (value) => fns.reduce((acc, fn) => fn(acc), value);
-
 //#endregion
 //#region lib/dash/dash-extractor.ts
 const createMediaStreamInfo = (params) => {
@@ -1131,7 +1109,7 @@ var DashExtractor = class DashExtractor {
 							const schemeIdUri = contentProtection.getAttribute("schemeIdUri");
 							const drmData = {
 								keyId: contentProtection.getAttribute("cenc:default_KID") || void 0,
-								pssh: contentProtection.getElementsByTagName("cenc:pssh")[0]?.textContent || void 0
+								pssh: (contentProtection.getElementsByTagName("cenc:pssh")[0]?.textContent || void 0)?.trim()
 							};
 							if (schemeIdUri?.includes(widevineSystemId)) encryptInfo.drm.widevine = drmData;
 							else if (schemeIdUri?.includes(playreadySystemId)) encryptInfo.drm.playready = drmData;
@@ -1139,7 +1117,7 @@ var DashExtractor = class DashExtractor {
 						}
 						if (streamInfo.playlist.mediaInit) streamInfo.playlist.mediaInit.encryptInfo = encryptInfo;
 						const segments = streamInfo.playlist.mediaParts[0].mediaSegments;
-						for (const segment of segments) if (!segment.encryptInfo) segment.encryptInfo = encryptInfo;
+						for (const segment of segments) if (!segment.encryptInfo || segment.encryptInfo.method === "unknown") segment.encryptInfo = encryptInfo;
 					}
 					const _index = streamInfos.findIndex((item) => item.type === streamInfo.type && item.periodId !== streamInfo.periodId && item.groupId === streamInfo.groupId && (item.type === "video" && streamInfo.type === "video" ? item.width === streamInfo.width && item.height === streamInfo.height : true));
 					if (_index > -1) if (isLive) {} else if (streamInfos[_index].playlist.mediaParts.at(-1).mediaSegments.at(-1).url !== streamInfo.playlist.mediaParts[0].mediaSegments.at(-1)?.url) {
@@ -1164,8 +1142,8 @@ var DashExtractor = class DashExtractor {
 		const subtitleList = streamInfos.filter((stream) => stream.type === "subtitle");
 		const videoList = streamInfos.filter((stream) => stream.type === "video");
 		for (const video of videoList) {
-			const audioGroupId = audioList.toSorted((a, b$1) => (b$1.bitrate || 0) - (a.bitrate || 0)).at(0)?.groupId;
-			const subtitleGroupId = subtitleList.toSorted((a, b$1) => (b$1.bitrate || 0) - (a.bitrate || 0)).at(0)?.groupId;
+			const audioGroupId = audioList.toSorted((a, b) => (b.bitrate || 0) - (a.bitrate || 0)).at(0)?.groupId;
+			const subtitleGroupId = subtitleList.toSorted((a, b) => (b.bitrate || 0) - (a.bitrate || 0)).at(0)?.groupId;
 			if (audioGroupId) video.audioId = audioGroupId;
 			if (subtitleGroupId) video.subtitleId = subtitleGroupId;
 		}
@@ -1209,7 +1187,6 @@ var DashExtractor = class DashExtractor {
 		for (const processor of this.#parserConfig.contentProcessors) if (processor.canProcess(this.extractorType, this.#mpdContent, this.#parserConfig)) this.#mpdContent = processor.process(this.#mpdContent, this.#parserConfig);
 	}
 };
-
 //#endregion
 //#region lib/hls/hls-utils.ts
 /**
@@ -1226,7 +1203,6 @@ function getRange(input) {
 		default: return [0, null];
 	}
 }
-
 //#endregion
 //#region lib/hls/hls-extractor.ts
 var HlsExtractor = class {
@@ -1483,7 +1459,7 @@ var HlsExtractor = class {
 	}
 	async #refreshUrlFromMaster(lists) {
 		await this.#loadM3u8FromUrl(this.parserConfig.url);
-		const newStreams = await this.#parseMasterList().then((lists$1) => distinctBy(lists$1, (list) => list.url));
+		const newStreams = await this.#parseMasterList().then((lists) => distinctBy(lists, (list) => list.url));
 		for (const list of lists) {
 			const match = newStreams.filter((stream) => stream.toShortString() === list.toShortString());
 			if (!match.length) continue;
@@ -1504,9 +1480,9 @@ var HlsExtractor = class {
 			else list.playlist = newPlaylist;
 			if (list.type === "subtitle") {
 				const a = list.playlist.mediaParts.some((part) => part.mediaSegments.some((segment) => segment.url.includes(".ttml")));
-				const b$1 = list.playlist.mediaParts.some((part) => part.mediaSegments.some((segment) => segment.url.includes(".vtt") || segment.url.includes(".webvtt")));
+				const b = list.playlist.mediaParts.some((part) => part.mediaSegments.some((segment) => segment.url.includes(".vtt") || segment.url.includes(".webvtt")));
 				if (a) list.extension = "ttml";
-				if (b$1) list.extension = "vtt";
+				if (b) list.extension = "vtt";
 			} else list.extension = list.playlist.mediaInit ? "m4s" : "ts";
 		}
 	}
@@ -1514,7 +1490,6 @@ var HlsExtractor = class {
 		await this.fetchPlayList(streamInfos);
 	}
 };
-
 //#endregion
 //#region lib/stream-extractor.ts
 var StreamExtractor = class {
@@ -1578,6 +1553,16 @@ var StreamExtractor = class {
 		return this.#extractor.refreshPlayList(streamInfos);
 	}
 };
-
 //#endregion
-export { ALL_STREAM_TYPES, AUDIO_CODECS, AudioStreamInfo, DASH_TAGS, DashExtractor, DefaultDashContentProcessor, DefaultHlsContentProcessor, DefaultHlsKeyProcessor, DefaultUrlProcessor, ENCRYPT_METHODS, EXTRACTOR_TYPES, EncryptInfo, HLS_TAGS, HlsExtractor, MediaPart, MediaSegment, ParserConfig, Playlist, ROLE_TYPE, SUBTITLE_CODECS, StreamExtractor, StreamInfo, SubtitleStreamInfo, VIDEO_CODECS, VIDEO_DYNAMIC_RANGES, VideoStreamInfo, getRange, parseRange };
+//#region lib/input.ts
+const getSegmentedInput = (track) => {
+	const internalTrack = track._backing.internalTrack;
+	return internalTrack.demuxer.getSegmentedInputForPath(internalTrack.fullPath);
+};
+const getSegments = async (track) => {
+	const segmentedInput = getSegmentedInput(track);
+	await segmentedInput.runUpdateSegments();
+	return segmentedInput.segments;
+};
+//#endregion
+export { ALL_STREAM_TYPES, AUDIO_CODECS, AudioStreamInfo, DASH_TAGS, DashExtractor, DefaultDashContentProcessor, DefaultHlsContentProcessor, DefaultHlsKeyProcessor, DefaultUrlProcessor, ENCRYPT_METHODS, EXTRACTOR_TYPES, EncryptInfo, HLS_FORMATS, HLS_TAGS, HlsExtractor, Input, InputTrack, MediaPart, MediaSegment, ParserConfig, Playlist, ROLE_TYPE, SUBTITLE_CODECS, StreamExtractor, StreamInfo, SubtitleStreamInfo, UrlSource, VIDEO_CODECS, VIDEO_DYNAMIC_RANGES, VideoStreamInfo, asc, desc, getRange, getSegmentedInput, getSegments, parseRange };

package/package.json

@@ -1,31 +1,18 @@
 {
   "name": "dasha",
-  "version": "4.0.0-alpha.11",
+  "version": "4.0.0-alpha.13",
   "description": "Streaming manifest parser",
   "files": [
     "dist"
   ],
-  "scripts": {
-    "test": "vitest",
-    "lint": "eslint . && prettier --check .",
-    "fix": "eslint . --fix && prettier --write .",
-    "typecheck": "tsc --noEmit -p tsconfig.json",
-    "build": "tsdown dasha.ts --format esm --format cjs",
-    "prepublishOnly": "npm run build"
-  },
   "type": "module",
   "main": "./dist/dasha.mjs",
   "types": "./dist/dasha.d.mts",
   "exports": {
     ".": {
-      "require": {
-        "types": "./dist/dasha.d.cts",
-        "default": "./dist/dasha.cjs"
-      },
-      "import": {
-        "types": "./dist/dasha.d.mts",
-        "default": "./dist/dasha.mjs"
-      }
+      "types": "./dist/dasha.d.mts",
+      "module-sync": "./dist/dasha.mjs",
+      "default": "./dist/dasha.mjs"
     }
   },
   "repository": {
@@ -58,25 +45,28 @@
     }
   ],
   "engines": {
-    "node": ">=20"
+    "node": ">=22.16"
   },
   "dependencies": {
-    "@xmldom/xmldom": "^0.9.8",
+    "@xmldom/xmldom": "^0.9.10",
     "barsic": "^0.2.0",
-    "ky": "^1.14.2",
-    "temporal-polyfill": "^0.3.0"
+    "ky": "^2.0.2",
+    "mediabunny": "1.42.0-beta.6",
+    "temporal-polyfill": "^0.3.2"
   },
   "devDependencies": {
-    "@eslint/js": "^9.39.1",
-    "@types/node": "^24.10.0",
-    "eslint": "^9.39.1",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.5.4",
-    "globals": "^16.5.0",
-    "prettier": "^3.6.2",
-    "tsdown": "^0.16.1",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.46.3",
-    "vitest": "^4.0.8"
+    "@types/node": "^25.6.0",
+    "oxfmt": "^0.46.0",
+    "oxlint": "^1.61.0",
+    "tsdown": "^0.21.10",
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.5"
+  },
+  "scripts": {
+    "test": "vitest",
+    "lint": "oxlint . && oxfmt --check .",
+    "fix": "oxlint . --fix && oxfmt --write .",
+    "typecheck": "tsc --noEmit -p tsconfig.json",
+    "build": "tsdown dasha.ts --format esm"
   }
-}
+}