dasha 4.0.0-alpha.2 → 4.0.0-alpha.3

package/README.md

@@ -7,13 +7,13 @@
 Library for parsing MPEG-DASH (.mpd) and HLS (.m3u8) manifests. Made with the purpose of obtaining a simplified representation convenient for further downloading of segments.
 
 > [!WARNING]  
-> This README is for the alpha version. Info about latest stable version is available on [NPM](https://www.npmjs.com/package/dasha/v/3.1.5) or [another GitHub branch](https://github.com/streamyx-labs/dasha/tree/v3).
+> This README is for the alpha version. Info about latest stable version is available on [NPM](https://www.npmjs.com/package/dasha/v/3.1.5) or [another GitHub branch](https://github.com/azot-labs/dasha/tree/v3).
 
 
 ## Install
 
 ```shell
-npm i dasha@4.0.0-alpha.1
+npm i dasha@alpha
 ```
 
 ## Usage

package/dist/dasha.cjs

@@ -1,4 +1,3 @@
-"use strict";
 //#region rolldown:runtime
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -22,13 +21,22 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
-const node_fs = __toESM(require("node:fs"));
-const node_fs_promises = __toESM(require("node:fs/promises"));
-const node_url = __toESM(require("node:url"));
-const node_path = __toESM(require("node:path"));
-const temporal_polyfill = __toESM(require("temporal-polyfill"));
-const __xmldom_xmldom = __toESM(require("@xmldom/xmldom"));
-const node_crypto = __toESM(require("node:crypto"));
+let node_fs = require("node:fs");
+node_fs = __toESM(node_fs);
+let barsic = require("barsic");
+barsic = __toESM(barsic);
+let node_fs_promises = require("node:fs/promises");
+node_fs_promises = __toESM(node_fs_promises);
+let node_url = require("node:url");
+node_url = __toESM(node_url);
+let node_path = require("node:path");
+node_path = __toESM(node_path);
+let temporal_polyfill = require("temporal-polyfill");
+temporal_polyfill = __toESM(temporal_polyfill);
+let __xmldom_xmldom = require("@xmldom/xmldom");
+__xmldom_xmldom = __toESM(__xmldom_xmldom);
+let node_crypto = require("node:crypto");
+node_crypto = __toESM(node_crypto);
 
 //#region lib/shared/media-type.ts
 const MEDIA_TYPES = {
@@ -41,14 +49,14 @@ const MEDIA_TYPES = {
 //#endregion
 //#region lib/shared/encrypt-method.ts
 const ENCRYPT_METHODS = {
-	NONE: 0,
-	AES_128: 1,
-	AES_128_ECB: 2,
-	SAMPLE_AES: 3,
-	SAMPLE_AES_CTR: 4,
-	CENC: 5,
-	CHACHA20: 6,
-	UNKNOWN: 7
+	NONE: "none",
+	AES_128: "aes-128",
+	AES_128_ECB: "aes-128-ecb",
+	SAMPLE_AES: "sample-aes",
+	SAMPLE_AES_CTR: "sample-aes-ctr",
+	CENC: "cenc",
+	CHACHA20: "chacha20",
+	UNKNOWN: "unknown"
 };
 
 //#endregion
@@ -77,17 +85,13 @@ const ROLE_TYPE = {
 
 //#endregion
 //#region lib/processor.ts
-var ContentProcessor = class {};
-var KeyProcessor = class {};
-var UrlProcessor = class {};
-var DefaultUrlProcessor = class extends UrlProcessor {
+var DefaultUrlProcessor = class {
 	canProcess(_extractorType, _originalUrl, parserConfig) {
 		return parserConfig.appendUrlParams;
 	}
 	process(url, parserConfig) {
 		if (!url.startsWith("http")) return url;
-		const urlFromConfig = new URL(parserConfig.url);
-		const urlFromConfigQuery = urlFromConfig.searchParams;
+		const urlFromConfigQuery = new URL(parserConfig.url).searchParams;
 		const oldUrl = new URL(url);
 		const newQuery = oldUrl.searchParams;
 		for (const [key, value] of urlFromConfigQuery) if (newQuery.has(key)) newQuery.set(key, value);
@@ -102,7 +106,7 @@ var DefaultUrlProcessor = class extends UrlProcessor {
 
 //#endregion
 //#region lib/dash/dash-content-processor.ts
-var DefaultDashContentProcessor = class extends ContentProcessor {
+var DefaultDashContentProcessor = class {
 	canProcess(extractorType, mpdContent) {
 		if (extractorType !== EXTRACTOR_TYPES.MPEG_DASH) return false;
 		return mpdContent.includes("<mas:") && !mpdContent.includes("xmlns:mas");
@@ -147,7 +151,7 @@ const HLS_TAGS = {
 
 //#endregion
 //#region lib/hls/hls-content-processor.ts
-var DefaultHlsContentProcessor = class DefaultHlsContentProcessor extends ContentProcessor {
+var DefaultHlsContentProcessor = class DefaultHlsContentProcessor {
 	static YkDVRegex = /#EXT-X-DISCONTINUITY\s+#EXT-X-MAP:URI="(.*?)",BYTERANGE="(.*?)"/g;
 	static DNSPRegex = /#EXT-X-MAP:URI=".*?BUMPER\/[\s\S]+?#EXT-X-DISCONTINUITY/;
 	static DNSPSubRegex = /#EXTINF:.*?,\s+.*BUMPER.*\s+#EXT-X-DISCONTINUITY/;
@@ -186,8 +190,10 @@ var EncryptInfo = class {
 	method = ENCRYPT_METHODS.NONE;
 	key;
 	iv;
+	drm;
 	constructor(method) {
 		this.method = this.parseMethod(method);
+		this.drm = {};
 	}
 	parseMethod(method) {
 		if (method) return ENCRYPT_METHODS[method.replace("-", "_")];
@@ -197,7 +203,7 @@ var EncryptInfo = class {
 
 //#endregion
 //#region lib/hls/hls-key-processor.ts
-var DefaultHlsKeyProcessor = class extends KeyProcessor {
+var DefaultHlsKeyProcessor = class {
 	canProcess(extractorType) {
 		return extractorType === EXTRACTOR_TYPES.HLS;
 	}
@@ -205,17 +211,16 @@ var DefaultHlsKeyProcessor = class extends KeyProcessor {
 		const iv = this.getAttribute(keyLine, "IV");
 		const method = this.getAttribute(keyLine, "METHOD");
 		const uri = this.getAttribute(keyLine, "URI");
-		console.debug(`METHOD:${method}, URI:${uri}, IV:${iv}`);
 		const encryptInfo = new EncryptInfo(method);
-		if (iv) encryptInfo.iv = Buffer.from(iv, "hex");
+		if (iv) encryptInfo.iv = barsic.b.hex().encode(iv);
 		if (parserConfig.customIv && parserConfig.customIv.length > 0) encryptInfo.iv = parserConfig.customIv;
 		try {
 			if (parserConfig.customKey && parserConfig.customKey.length > 0) encryptInfo.key = parserConfig.customKey;
 			else if (uri) {
 				const lowerUri = uri.toLowerCase();
-				if (lowerUri.startsWith("base64:")) encryptInfo.key = Buffer.from(uri.slice(7), "base64");
-				else if (lowerUri.startsWith("data:;base64,")) encryptInfo.key = Buffer.from(uri.slice(13), "base64");
-				else if (lowerUri.startsWith("data:text/plain;base64,")) encryptInfo.key = Buffer.from(uri.slice(23), "base64");
+				if (lowerUri.startsWith("base64:")) encryptInfo.key = barsic.b.base64().encode(uri.slice(7));
+				else if (lowerUri.startsWith("data:;base64,")) encryptInfo.key = barsic.b.base64().encode(uri.slice(13));
+				else if (lowerUri.startsWith("data:text/plain;base64,")) encryptInfo.key = barsic.b.base64().encode(uri.slice(23));
 				else if ((0, node_fs.existsSync)(uri)) encryptInfo.key = (0, node_fs.readFileSync)(uri);
 				else {
 					const processedUrl = this.preProcessUrl(new URL(uri, m3u8Url).toString(), parserConfig);
@@ -233,15 +238,15 @@ var DefaultHlsKeyProcessor = class extends KeyProcessor {
 		return encryptInfo;
 	}
 	getAttribute(line, attrName) {
-		const regex = new RegExp(`${attrName}="([^"]+)"`, "i");
+		const regex = new RegExp(`${attrName}=(?:"([^"]+)"|([^,]+))`, "i");
 		const match = line.match(regex);
-		return match?.[1] ?? null;
+		return match?.[1] ?? match?.[2] ?? null;
 	}
 	async fetchKeyWithRetry(url, parserConfig) {
 		let retryCount = parserConfig.keyRetryCount ?? 3;
 		while (retryCount >= 0) try {
 			const response = await fetch(url, { headers: parserConfig.headers });
-			return Buffer.from(await response.arrayBuffer());
+			return new Uint8Array(await response.arrayBuffer());
 		} catch (error) {
 			if (error.message.includes("scheme is not supported")) throw error;
 			console.warn(`Error fetching key: ${error.message}. Retries left: ${retryCount}`);
@@ -362,8 +367,7 @@ const DASH_TAGS = {
 const combineUrl = (baseUrl, relativeUrl) => {
 	if (!baseUrl.trim()) return relativeUrl;
 	const url1 = new URL(baseUrl);
-	const url2 = new URL(relativeUrl, url1);
-	return url2.toString();
+	return new URL(relativeUrl, url1).toString();
 };
 const replaceVars = (text, dict) => {
 	let result = text;
@@ -402,7 +406,7 @@ const getAttribute = (line, key = "") => {
 	return result;
 };
 const distinctBy = (array, callbackfn) => {
-	const seen = new Set();
+	const seen = /* @__PURE__ */ new Set();
 	return array.filter((item) => {
 		const value = callbackfn(item);
 		if (seen.has(value)) return false;
@@ -481,8 +485,7 @@ var MediaSegment = class MediaSegment {
 */
 const parseRange = (range) => {
 	const [startRange, end] = range.split("-").map(Number);
-	const expectLength = end - startRange + 1;
-	return [startRange, expectLength];
+	return [startRange, end - startRange + 1];
 };
 
 //#endregion
@@ -518,11 +521,9 @@ var DashExtractor = class DashExtractor {
 	async extractStreams(rawText) {
 		const streamList = [];
 		this.#mpdContent = rawText;
-		const document = new __xmldom_xmldom.DOMParser().parseFromString(this.#mpdContent, "text/xml");
-		const mpdElement = document.getElementsByTagName("MPD")[0];
-		const type = mpdElement.getAttribute("type");
-		const isLive = type === "dynamic";
-		const maxSegmentDuration = mpdElement.getAttribute("maxSegmentDuration");
+		const mpdElement = new __xmldom_xmldom.DOMParser().parseFromString(this.#mpdContent, "text/xml").getElementsByTagName("MPD")[0];
+		const isLive = mpdElement.getAttribute("type") === "dynamic";
+		mpdElement.getAttribute("maxSegmentDuration");
 		const availabilityStartTime = mpdElement.getAttribute("availabilityStartTime");
 		const timeShiftBufferDepth = mpdElement.getAttribute("timeShiftBufferDepth") || "PT1M";
 		const publishTime = mpdElement.getAttribute("publishTime");
@@ -581,8 +582,7 @@ var DashExtractor = class DashExtractor {
 					if (role) {
 						const roleValue = role.getAttribute("value");
 						const capitalize = (word) => word.charAt(0).toUpperCase() + word.slice(1);
-						const roleTypeKey = roleValue.split("-").map(capitalize).join("");
-						const roleType = ROLE_TYPE[roleTypeKey];
+						const roleType = ROLE_TYPE[roleValue.split("-").map(capitalize).join("")];
 						streamSpec.role = roleType;
 						if (roleType === ROLE_TYPE.Subtitle) {
 							streamSpec.mediaType = MEDIA_TYPES.SUBTITLES;
@@ -713,8 +713,7 @@ var DashExtractor = class DashExtractor {
 									varDic[DASH_TAGS.TemplateNumber] = segNumber++;
 									const _hashTime = mediaTemplate?.includes(DASH_TAGS.TemplateTime);
 									const _media = replaceVars(mediaTemplate, varDic);
-									const _mediaUrl = combineUrl(segBaseUrl, _media);
-									_mediaSegment.url = _mediaUrl;
+									_mediaSegment.url = combineUrl(segBaseUrl, _media);
 									_mediaSegment.index = segIndex++;
 									_mediaSegment.duration = _duration / timescale;
 									if (_hashTime) _mediaSegment.nameFromVar = currentTime.toString();
@@ -758,27 +757,37 @@ var DashExtractor = class DashExtractor {
 						mediaSegment.duration = periodDurationSeconds;
 						streamSpec.playlist.mediaParts[0].mediaSegments.push(mediaSegment);
 					}
-					const contentProtection = adaptationSet.getElementsByTagName("ContentProtection")[0] || representation.getElementsByTagName("ContentProtection")[0];
-					if (contentProtection) {
+					const adaptationSetProtections = adaptationSet.getElementsByTagName("ContentProtection");
+					const representationProtections = representation.getElementsByTagName("ContentProtection");
+					const contentProtections = representationProtections[0] ? representationProtections : adaptationSetProtections;
+					if (contentProtections.length) {
 						const encryptInfo = new EncryptInfo();
 						encryptInfo.method = DashExtractor.#DEFAULT_METHOD;
+						const widevineSystemId = "edef8ba9-79d6-4ace-a3c8-27dcd51d21ed";
+						const playreadySystemId = "9a04f079-9840-4286-ab92-e65be0885f95";
+						for (const contentProtection of contentProtections) {
+							const schemeIdUri = contentProtection.getAttribute("schemeIdUri");
+							const drmData = {
+								keyId: contentProtection.getAttribute("cenc:default_KID") || void 0,
+								pssh: contentProtection.getElementsByTagName("cenc:pssh")[0]?.textContent || void 0
+							};
+							if (schemeIdUri?.includes(widevineSystemId)) encryptInfo.drm.widevine = drmData;
+							else if (schemeIdUri?.includes(playreadySystemId)) encryptInfo.drm.playready = drmData;
+							else continue;
+						}
 						if (streamSpec.playlist.mediaInit) streamSpec.playlist.mediaInit.encryptInfo = encryptInfo;
 						const segments = streamSpec.playlist.mediaParts[0].mediaSegments;
 						for (const segment of segments) if (!segment.encryptInfo) segment.encryptInfo = encryptInfo;
 					}
 					const _index = streamList.findIndex((item) => item.periodId !== streamSpec.periodId && item.groupId === streamSpec.groupId && item.resolution === streamSpec.resolution && item.mediaType === streamSpec.mediaType);
-					if (_index > -1) if (isLive) {} else {
-						const url1 = streamList[_index].playlist.mediaParts.at(-1).mediaSegments.at(-1).url;
-						const url2 = streamSpec.playlist.mediaParts[0].mediaSegments.at(-1)?.url;
-						if (url1 !== url2) {
-							const startIndex = streamList[_index].playlist.mediaParts.at(-1).mediaSegments.at(-1).index + 1;
-							const segments = streamSpec.playlist.mediaParts[0].mediaSegments;
-							for (const segment of segments) segment.index += startIndex;
-							const mediaPart = new MediaPart();
-							mediaPart.mediaSegments = streamList[_index].playlist.mediaParts[0].mediaSegments;
-							streamList[_index].playlist.mediaParts.push(mediaPart);
-						} else streamList[_index].playlist.mediaParts.at(-1).mediaSegments.at(-1).duration += streamSpec.playlist.mediaParts[0].mediaSegments.reduce((sum, segment) => sum + segment.duration, 0);
-					}
+					if (_index > -1) if (isLive) {} else if (streamList[_index].playlist.mediaParts.at(-1).mediaSegments.at(-1).url !== streamSpec.playlist.mediaParts[0].mediaSegments.at(-1)?.url) {
+						const startIndex = streamList[_index].playlist.mediaParts.at(-1).mediaSegments.at(-1).index + 1;
+						const segments = streamSpec.playlist.mediaParts[0].mediaSegments;
+						for (const segment of segments) segment.index += startIndex;
+						const mediaPart = new MediaPart();
+						mediaPart.mediaSegments = streamList[_index].playlist.mediaParts[0].mediaSegments;
+						streamList[_index].playlist.mediaParts.push(mediaPart);
+					} else streamList[_index].playlist.mediaParts.at(-1).mediaSegments.at(-1).duration += streamSpec.playlist.mediaParts[0].mediaSegments.reduce((sum, segment) => sum + segment.duration, 0);
 					else {
 						if (streamSpec.mediaType === MEDIA_TYPES.SUBTITLES && streamSpec.extension === "mp4") streamSpec.extension = "m4s";
 						if (streamSpec.mediaType !== MEDIA_TYPES.SUBTITLES && (streamSpec.extension == null || streamSpec.playlist.mediaParts.reduce((sum, part) => sum + part.mediaSegments.length, 0) > 1)) streamSpec.extension = "m4s";
@@ -793,8 +802,8 @@ var DashExtractor = class DashExtractor {
 		const subtitleList = streamList.filter((stream) => stream.mediaType === MEDIA_TYPES.SUBTITLES);
 		const videoList = streamList.filter((stream) => stream.mediaType === MEDIA_TYPES.VIDEO);
 		for (const video of videoList) {
-			const audioGroupId = audioList.toSorted((a, b) => (b.bandwidth || 0) - (a.bandwidth || 0)).at(0)?.groupId;
-			const subtitleGroupId = subtitleList.toSorted((a, b) => (b.bandwidth || 0) - (a.bandwidth || 0)).at(0)?.groupId;
+			const audioGroupId = audioList.toSorted((a, b$1) => (b$1.bandwidth || 0) - (a.bandwidth || 0)).at(0)?.groupId;
+			const subtitleGroupId = subtitleList.toSorted((a, b$1) => (b$1.bandwidth || 0) - (a.bandwidth || 0)).at(0)?.groupId;
 			if (audioGroupId) video.audioId = audioGroupId;
 			if (subtitleGroupId) video.subtitleId = subtitleGroupId;
 		}
@@ -804,17 +813,38 @@ var DashExtractor = class DashExtractor {
 		if (!v) return;
 		return v;
 	}
-	fetchPlayList(streamSpecs) {
-		throw new Error("Method not implemented.");
+	async refreshPlayList(streamSpecs) {
+		if (!streamSpecs.length) return;
+		const response = await fetch(this.#parserConfig.url, this.#parserConfig.headers).catch(() => fetch(this.#parserConfig.originalUrl, this.#parserConfig.headers));
+		const rawText = await response.text();
+		const url = response.url;
+		this.#parserConfig.url = url;
+		this.#setInitUrl();
+		const newStreams = await this.extractStreams(rawText);
+		for (const streamSpec of streamSpecs) {
+			let results = newStreams.filter((n) => n.toShortString() === streamSpec.toShortString());
+			if (!results.length) results = newStreams.filter((n) => n.playlist?.mediaInit?.url === streamSpec.playlist?.mediaInit?.url);
+			if (results.length) streamSpec.playlist.mediaParts = results.at(0).playlist.mediaParts;
+		}
+		await this.#processUrl(streamSpecs);
+	}
+	async #processUrl(streamSpecs) {
+		for (const spec of streamSpecs) {
+			const playlist = spec.playlist;
+			if (!playlist) continue;
+			if (playlist.mediaInit) playlist.mediaInit.url = this.preProcessUrl(playlist.mediaInit.url);
+			for (const part of playlist.mediaParts) for (const segment of part.mediaSegments) segment.url = this.preProcessUrl(segment.url);
+		}
 	}
-	refreshPlayList(streamSpecs) {
-		throw new Error("Method not implemented.");
+	async fetchPlayList(streamSpecs) {
+		this.#processUrl(streamSpecs);
 	}
 	preProcessUrl(url) {
-		throw new Error("Method not implemented.");
+		for (const processor of this.#parserConfig.urlProcessors) if (processor.canProcess(this.extractorType, url, this.#parserConfig)) url = processor.process(url, this.#parserConfig);
+		return url;
 	}
 	preProcessContent() {
-		throw new Error("Method not implemented.");
+		for (const processor of this.#parserConfig.contentProcessors) if (processor.canProcess(this.extractorType, this.#mpdContent, this.#parserConfig)) this.#mpdContent = processor.process(this.#mpdContent, this.#parserConfig);
 	}
 };
 
@@ -893,8 +923,7 @@ var HlsExtractor = class {
 				expectPlaylist = true;
 			} else if (line.startsWith(HLS_TAGS.extXMedia)) {
 				streamSpec = new StreamSpec();
-				const type = getAttribute(line, "TYPE").replace("-", "_");
-				const mediaType = MEDIA_TYPES[type];
+				const mediaType = MEDIA_TYPES[getAttribute(line, "TYPE").replace("-", "_")];
 				if (mediaType) streamSpec.mediaType = mediaType;
 				if (mediaType === MEDIA_TYPES.CLOSED_CAPTIONS) continue;
 				let url = getAttribute(line, "URI");
@@ -945,8 +974,7 @@ var HlsExtractor = class {
 		for (const line of lines) {
 			if (!line.trim()) continue;
 			if (line.startsWith(HLS_TAGS.extXByterange)) {
-				const p = getAttribute(line);
-				const [n, o] = getRange(p);
+				const [n, o] = getRange(getAttribute(line));
 				segment.expectLength = n;
 				segment.startRange = o || (segments.at(-1)?.startRange || 0) + (segments.at(-1)?.expectLength || 0);
 				expectSegment = true;
@@ -968,9 +996,7 @@ var HlsExtractor = class {
 				mediaParts.push(new MediaPart(segments));
 				segments = [];
 			} else if (line.startsWith(HLS_TAGS.extXKey)) {
-				const uri = getAttribute(line, "URI");
-				const uriLast = getAttribute(lastKeyLine, "URI");
-				if (uri !== uriLast) {
+				if (getAttribute(line, "URI") !== getAttribute(lastKeyLine, "URI")) {
 					const parsedInfo = await this.#parseKey(line);
 					currentEncryptInfo.method = parsedInfo.method;
 					currentEncryptInfo.key = parsedInfo.key;
@@ -998,8 +1024,7 @@ var HlsExtractor = class {
 				mediaSegment.index = -1;
 				playlist.mediaInit = mediaSegment;
 				if (line.includes("BYTERANGE")) {
-					const p = getAttribute(line, "BYTERANGE");
-					const [n, o] = getRange(p);
+					const [n, o] = getRange(getAttribute(line, "BYTERANGE"));
 					mediaSegment.expectLength = n;
 					mediaSegment.startRange = o || 0;
 				}
@@ -1048,10 +1073,7 @@ var HlsExtractor = class {
 	async extractStreams(rawText) {
 		this.#m3u8Content = rawText;
 		this.preProcessContent();
-		if (this.#m3u8Content.includes(HLS_TAGS.extXStreamInf)) {
-			console.log("Master m3u8 found");
-			return this.#parseMasterList().then((lists) => distinctBy(lists, (list) => list.url));
-		}
+		if (this.#m3u8Content.includes(HLS_TAGS.extXStreamInf)) return this.#parseMasterList().then((lists) => distinctBy(lists, (list) => list.url));
 		const playlist = await this.#parseList();
 		const streamSpec = new StreamSpec();
 		streamSpec.url = this.parserConfig.url;
@@ -1061,8 +1083,7 @@ var HlsExtractor = class {
 	}
 	async #loadM3u8FromUrl(url) {
 		if (url.startsWith("file:")) {
-			const uri = new URL(url);
-			const filePath = uri.pathname;
+			const filePath = new URL(url).pathname;
 			this.#m3u8Content = await (0, node_fs_promises.readFile)(filePath, "utf8");
 		} else if (url.startsWith("http")) try {
 			const response = await fetch(url, { headers: this.parserConfig.headers });
@@ -1102,9 +1123,9 @@ var HlsExtractor = class {
 			else list.playlist = newPlaylist;
 			if (list.mediaType === MEDIA_TYPES.SUBTITLES) {
 				const a = list.playlist.mediaParts.some((part) => part.mediaSegments.some((segment) => segment.url.includes(".ttml")));
-				const b = list.playlist.mediaParts.some((part) => part.mediaSegments.some((segment) => segment.url.includes(".vtt") || segment.url.includes(".webvtt")));
+				const b$1 = list.playlist.mediaParts.some((part) => part.mediaSegments.some((segment) => segment.url.includes(".vtt") || segment.url.includes(".webvtt")));
 				if (a) list.extension = "ttml";
-				if (b) list.extension = "vtt";
+				if (b$1) list.extension = "vtt";
 			} else list.extension = list.playlist.mediaInit ? "m4s" : "ts";
 		}
 	}
@@ -1132,8 +1153,7 @@ var StreamExtractor = class {
 	}
 	async loadSourceFromUrl(url) {
 		if (url.startsWith("file:")) {
-			const uri = new URL(url);
-			const filePath = uri.pathname;
+			const filePath = new URL(url).pathname;
 			this.#rawText = await (0, node_fs_promises.readFile)(filePath, "utf8");
 			this.#setUrl(url);
 		} else if (url.startsWith("http")) {
@@ -1160,8 +1180,11 @@ var StreamExtractor = class {
 		} else if (this.#rawText.includes("</MPD>") && this.#rawText.includes("<MPD")) {
 			this.#extractor = new DashExtractor(this.#parserConfig);
 			rawType = "mpd";
-		} else if (this.#rawText.includes("</SmoothStreamingMedia>") && this.#rawText.includes("<SmoothStreamingMedia")) rawType = "ism";
-		else if (rawText === "<RE_LIVE_TS>") {} else throw new Error("Unsupported stream type");
+		} else if (this.#rawText.includes("</SmoothStreamingMedia>") && this.#rawText.includes("<SmoothStreamingMedia")) {
+			rawType = "ism";
+			throw new Error("Smooth Streaming is not supported yet");
+		} else if (rawText === "<RE_LIVE_TS>") throw new Error("Live TS is not supported yet");
+		else throw new Error("Unsupported stream type");
 		this.#rawFiles[`raw.${rawType}`] = rawText;
 	}
 	async extractStreams() {
@@ -1176,13 +1199,10 @@ var StreamExtractor = class {
 };
 
 //#endregion
-exports.ContentProcessor = ContentProcessor
-exports.DefaultUrlProcessor = DefaultUrlProcessor
-exports.ENCRYPT_METHODS = ENCRYPT_METHODS
-exports.EXTRACTOR_TYPES = EXTRACTOR_TYPES
-exports.KeyProcessor = KeyProcessor
-exports.MEDIA_TYPES = MEDIA_TYPES
-exports.ParserConfig = ParserConfig
-exports.ROLE_TYPE = ROLE_TYPE
-exports.StreamExtractor = StreamExtractor
-exports.UrlProcessor = UrlProcessor
+exports.DefaultUrlProcessor = DefaultUrlProcessor;
+exports.ENCRYPT_METHODS = ENCRYPT_METHODS;
+exports.EXTRACTOR_TYPES = EXTRACTOR_TYPES;
+exports.MEDIA_TYPES = MEDIA_TYPES;
+exports.ParserConfig = ParserConfig;
+exports.ROLE_TYPE = ROLE_TYPE;
+exports.StreamExtractor = StreamExtractor;

package/dist/dasha.d.cts

@@ -6,21 +6,19 @@ declare const MEDIA_TYPES: {
   readonly CLOSED_CAPTIONS: "closed-captions";
 };
 type MediaType = (typeof MEDIA_TYPES)[keyof typeof MEDIA_TYPES];
-
 //#endregion
 //#region lib/shared/encrypt-method.d.ts
 declare const ENCRYPT_METHODS: {
-  NONE: number;
-  AES_128: number;
-  AES_128_ECB: number;
-  SAMPLE_AES: number;
-  SAMPLE_AES_CTR: number;
-  CENC: number;
-  CHACHA20: number;
-  UNKNOWN: number;
+  readonly NONE: "none";
+  readonly AES_128: "aes-128";
+  readonly AES_128_ECB: "aes-128-ecb";
+  readonly SAMPLE_AES: "sample-aes";
+  readonly SAMPLE_AES_CTR: "sample-aes-ctr";
+  readonly CENC: "cenc";
+  readonly CHACHA20: "chacha20";
+  readonly UNKNOWN: "unknown";
 };
 type EncryptMethod = (typeof ENCRYPT_METHODS)[keyof typeof ENCRYPT_METHODS];
-
 //#endregion
 //#region lib/shared/extractor-type.d.ts
 declare const EXTRACTOR_TYPES: {
@@ -30,7 +28,6 @@ declare const EXTRACTOR_TYPES: {
   readonly MSS: "MSS";
 };
 type ExtractorType = (typeof EXTRACTOR_TYPES)[keyof typeof EXTRACTOR_TYPES];
-
 //#endregion
 //#region lib/shared/role-type.d.ts
 declare const ROLE_TYPE: {
@@ -46,36 +43,38 @@ declare const ROLE_TYPE: {
   ForcedSubtitle: number;
 };
 type RoleType = (typeof ROLE_TYPE)[keyof typeof ROLE_TYPE];
-
 //#endregion
 //#region lib/shared/encrypt-info.d.ts
+type DrmType = 'widevine' | 'playready' | 'fairplay';
 declare class EncryptInfo {
   method: EncryptMethod;
-  key?: Buffer;
-  iv?: Buffer;
+  key?: Uint8Array;
+  iv?: Uint8Array;
+  drm: { [key in DrmType]?: {
+    keyId?: string;
+    pssh?: string;
+  } };
   constructor(method?: string | null);
   parseMethod(method?: string | null): EncryptMethod;
 }
-
 //#endregion
 //#region lib/processor.d.ts
-declare abstract class ContentProcessor {
-  abstract canProcess(extractorType: ExtractorType, rawText: string, parserConfig: ParserConfig): boolean;
-  abstract process(rawText: string, parserConfig: ParserConfig): string;
+interface ContentProcessor {
+  canProcess(extractorType: ExtractorType, rawText: string, parserConfig: ParserConfig): boolean;
+  process(rawText: string, parserConfig: ParserConfig): string;
 }
-declare abstract class KeyProcessor {
-  abstract canProcess(extractorType: ExtractorType, keyLine: string, m3u8Url: string, m3u8Content: string, parserConfig: ParserConfig): boolean;
-  abstract process(keyLine: string, m3u8Url: string, m3u8Content: string, parserConfig: ParserConfig): Promise<EncryptInfo>;
+interface KeyProcessor {
+  canProcess(extractorType: ExtractorType, keyLine: string, m3u8Url: string, m3u8Content: string, parserConfig: ParserConfig): boolean;
+  process(keyLine: string, m3u8Url: string, m3u8Content: string, parserConfig: ParserConfig): Promise<EncryptInfo>;
 }
-declare abstract class UrlProcessor {
-  abstract canProcess(extractorType: ExtractorType, originalUrl: string, parserConfig: ParserConfig): boolean;
-  abstract process(originalUrl: string, parserConfig: ParserConfig): string;
+interface UrlProcessor {
+  canProcess(extractorType: ExtractorType, originalUrl: string, parserConfig: ParserConfig): boolean;
+  process(originalUrl: string, parserConfig: ParserConfig): string;
 }
-declare class DefaultUrlProcessor extends UrlProcessor {
+declare class DefaultUrlProcessor implements UrlProcessor {
   canProcess(_extractorType: ExtractorType, _originalUrl: string, parserConfig: ParserConfig): boolean;
   process(url: string, parserConfig: ParserConfig): string;
 }
-
 //#endregion
 //#region lib/parser-config.d.ts
 declare class ParserConfig {
@@ -88,13 +87,12 @@ declare class ParserConfig {
   urlProcessors: UrlProcessor[];
   keyProcessors: KeyProcessor[];
   customMethod?: EncryptMethod;
-  customKey?: Buffer;
-  customIv?: Buffer;
+  customKey?: Uint8Array;
+  customIv?: Uint8Array;
   urlProcessorArgs?: string;
   appendUrlParams: boolean;
   keyRetryCount: number;
 }
-
 //#endregion
 //#region lib/shared/media-segment.d.ts
 declare class MediaSegment {
@@ -112,14 +110,12 @@ declare class MediaSegment {
   equals(segment: unknown): boolean;
   getHashCode(): string;
 }
-
 //#endregion
 //#region lib/shared/media-part.d.ts
 declare class MediaPart {
   mediaSegments: MediaSegment[];
   constructor(segments?: MediaSegment[]);
 }
-
 //#endregion
 //#region lib/shared/playlist.d.ts
 declare class Playlist {
@@ -131,7 +127,6 @@ declare class Playlist {
   mediaInit?: MediaSegment;
   mediaParts: MediaPart[];
 }
-
 //#endregion
 //#region lib/shared/stream-spec.d.ts
 declare class StreamSpec {
@@ -161,7 +156,6 @@ declare class StreamSpec {
   get segmentsCount(): number;
   toShortString(): string;
 }
-
 //#endregion
 //#region lib/stream-extractor.d.ts
 declare class StreamExtractor {
@@ -174,6 +168,5 @@ declare class StreamExtractor {
   fetchPlayList(streamSpecs: StreamSpec[]): Promise<void>;
   refreshPlayList(streamSpecs: StreamSpec[]): Promise<void>;
 }
-
 //#endregion
 export { ContentProcessor, DefaultUrlProcessor, ENCRYPT_METHODS, EXTRACTOR_TYPES, EncryptMethod, ExtractorType, KeyProcessor, MEDIA_TYPES, MediaType, ParserConfig, ROLE_TYPE, RoleType, StreamExtractor, UrlProcessor };

package/dist/dasha.d.ts

@@ -6,21 +6,19 @@ declare const MEDIA_TYPES: {
   readonly CLOSED_CAPTIONS: "closed-captions";
 };
 type MediaType = (typeof MEDIA_TYPES)[keyof typeof MEDIA_TYPES];
-
 //#endregion
 //#region lib/shared/encrypt-method.d.ts
 declare const ENCRYPT_METHODS: {
-  NONE: number;
-  AES_128: number;
-  AES_128_ECB: number;
-  SAMPLE_AES: number;
-  SAMPLE_AES_CTR: number;
-  CENC: number;
-  CHACHA20: number;
-  UNKNOWN: number;
+  readonly NONE: "none";
+  readonly AES_128: "aes-128";
+  readonly AES_128_ECB: "aes-128-ecb";
+  readonly SAMPLE_AES: "sample-aes";
+  readonly SAMPLE_AES_CTR: "sample-aes-ctr";
+  readonly CENC: "cenc";
+  readonly CHACHA20: "chacha20";
+  readonly UNKNOWN: "unknown";
 };
 type EncryptMethod = (typeof ENCRYPT_METHODS)[keyof typeof ENCRYPT_METHODS];
-
 //#endregion
 //#region lib/shared/extractor-type.d.ts
 declare const EXTRACTOR_TYPES: {
@@ -30,7 +28,6 @@ declare const EXTRACTOR_TYPES: {
   readonly MSS: "MSS";
 };
 type ExtractorType = (typeof EXTRACTOR_TYPES)[keyof typeof EXTRACTOR_TYPES];
-
 //#endregion
 //#region lib/shared/role-type.d.ts
 declare const ROLE_TYPE: {
@@ -46,36 +43,38 @@ declare const ROLE_TYPE: {
   ForcedSubtitle: number;
 };
 type RoleType = (typeof ROLE_TYPE)[keyof typeof ROLE_TYPE];
-
 //#endregion
 //#region lib/shared/encrypt-info.d.ts
+type DrmType = 'widevine' | 'playready' | 'fairplay';
 declare class EncryptInfo {
   method: EncryptMethod;
-  key?: Buffer;
-  iv?: Buffer;
+  key?: Uint8Array;
+  iv?: Uint8Array;
+  drm: { [key in DrmType]?: {
+    keyId?: string;
+    pssh?: string;
+  } };
   constructor(method?: string | null);
   parseMethod(method?: string | null): EncryptMethod;
 }
-
 //#endregion
 //#region lib/processor.d.ts
-declare abstract class ContentProcessor {
-  abstract canProcess(extractorType: ExtractorType, rawText: string, parserConfig: ParserConfig): boolean;
-  abstract process(rawText: string, parserConfig: ParserConfig): string;
+interface ContentProcessor {
+  canProcess(extractorType: ExtractorType, rawText: string, parserConfig: ParserConfig): boolean;
+  process(rawText: string, parserConfig: ParserConfig): string;
 }
-declare abstract class KeyProcessor {
-  abstract canProcess(extractorType: ExtractorType, keyLine: string, m3u8Url: string, m3u8Content: string, parserConfig: ParserConfig): boolean;
-  abstract process(keyLine: string, m3u8Url: string, m3u8Content: string, parserConfig: ParserConfig): Promise<EncryptInfo>;
+interface KeyProcessor {
+  canProcess(extractorType: ExtractorType, keyLine: string, m3u8Url: string, m3u8Content: string, parserConfig: ParserConfig): boolean;
+  process(keyLine: string, m3u8Url: string, m3u8Content: string, parserConfig: ParserConfig): Promise<EncryptInfo>;
 }
-declare abstract class UrlProcessor {
-  abstract canProcess(extractorType: ExtractorType, originalUrl: string, parserConfig: ParserConfig): boolean;
-  abstract process(originalUrl: string, parserConfig: ParserConfig): string;
+interface UrlProcessor {
+  canProcess(extractorType: ExtractorType, originalUrl: string, parserConfig: ParserConfig): boolean;
+  process(originalUrl: string, parserConfig: ParserConfig): string;
 }
-declare class DefaultUrlProcessor extends UrlProcessor {
+declare class DefaultUrlProcessor implements UrlProcessor {
   canProcess(_extractorType: ExtractorType, _originalUrl: string, parserConfig: ParserConfig): boolean;
   process(url: string, parserConfig: ParserConfig): string;
 }
-
 //#endregion
 //#region lib/parser-config.d.ts
 declare class ParserConfig {
@@ -88,13 +87,12 @@ declare class ParserConfig {
   urlProcessors: UrlProcessor[];
   keyProcessors: KeyProcessor[];
   customMethod?: EncryptMethod;
-  customKey?: Buffer;
-  customIv?: Buffer;
+  customKey?: Uint8Array;
+  customIv?: Uint8Array;
   urlProcessorArgs?: string;
   appendUrlParams: boolean;
   keyRetryCount: number;
 }
-
 //#endregion
 //#region lib/shared/media-segment.d.ts
 declare class MediaSegment {
@@ -112,14 +110,12 @@ declare class MediaSegment {
   equals(segment: unknown): boolean;
   getHashCode(): string;
 }
-
 //#endregion
 //#region lib/shared/media-part.d.ts
 declare class MediaPart {
   mediaSegments: MediaSegment[];
   constructor(segments?: MediaSegment[]);
 }
-
 //#endregion
 //#region lib/shared/playlist.d.ts
 declare class Playlist {
@@ -131,7 +127,6 @@ declare class Playlist {
   mediaInit?: MediaSegment;
   mediaParts: MediaPart[];
 }
-
 //#endregion
 //#region lib/shared/stream-spec.d.ts
 declare class StreamSpec {
@@ -161,7 +156,6 @@ declare class StreamSpec {
   get segmentsCount(): number;
   toShortString(): string;
 }
-
 //#endregion
 //#region lib/stream-extractor.d.ts
 declare class StreamExtractor {
@@ -174,6 +168,5 @@ declare class StreamExtractor {
   fetchPlayList(streamSpecs: StreamSpec[]): Promise<void>;
   refreshPlayList(streamSpecs: StreamSpec[]): Promise<void>;
 }
-
 //#endregion
 export { ContentProcessor, DefaultUrlProcessor, ENCRYPT_METHODS, EXTRACTOR_TYPES, EncryptMethod, ExtractorType, KeyProcessor, MEDIA_TYPES, MediaType, ParserConfig, ROLE_TYPE, RoleType, StreamExtractor, UrlProcessor };

package/dist/dasha.js

@@ -1,4 +1,5 @@
 import { existsSync, readFileSync } from "node:fs";
+import { b } from "barsic";
 import { readFile } from "node:fs/promises";
 import { pathToFileURL } from "node:url";
 import path from "node:path";
@@ -17,14 +18,14 @@ const MEDIA_TYPES = {
 //#endregion
 //#region lib/shared/encrypt-method.ts
 const ENCRYPT_METHODS = {
-	NONE: 0,
-	AES_128: 1,
-	AES_128_ECB: 2,
-	SAMPLE_AES: 3,
-	SAMPLE_AES_CTR: 4,
-	CENC: 5,
-	CHACHA20: 6,
-	UNKNOWN: 7
+	NONE: "none",
+	AES_128: "aes-128",
+	AES_128_ECB: "aes-128-ecb",
+	SAMPLE_AES: "sample-aes",
+	SAMPLE_AES_CTR: "sample-aes-ctr",
+	CENC: "cenc",
+	CHACHA20: "chacha20",
+	UNKNOWN: "unknown"
 };
 
 //#endregion
@@ -53,17 +54,13 @@ const ROLE_TYPE = {
 
 //#endregion
 //#region lib/processor.ts
-var ContentProcessor = class {};
-var KeyProcessor = class {};
-var UrlProcessor = class {};
-var DefaultUrlProcessor = class extends UrlProcessor {
+var DefaultUrlProcessor = class {
 	canProcess(_extractorType, _originalUrl, parserConfig) {
 		return parserConfig.appendUrlParams;
 	}
 	process(url, parserConfig) {
 		if (!url.startsWith("http")) return url;
-		const urlFromConfig = new URL(parserConfig.url);
-		const urlFromConfigQuery = urlFromConfig.searchParams;
+		const urlFromConfigQuery = new URL(parserConfig.url).searchParams;
 		const oldUrl = new URL(url);
 		const newQuery = oldUrl.searchParams;
 		for (const [key, value] of urlFromConfigQuery) if (newQuery.has(key)) newQuery.set(key, value);
@@ -78,7 +75,7 @@ var DefaultUrlProcessor = class extends UrlProcessor {
 
 //#endregion
 //#region lib/dash/dash-content-processor.ts
-var DefaultDashContentProcessor = class extends ContentProcessor {
+var DefaultDashContentProcessor = class {
 	canProcess(extractorType, mpdContent) {
 		if (extractorType !== EXTRACTOR_TYPES.MPEG_DASH) return false;
 		return mpdContent.includes("<mas:") && !mpdContent.includes("xmlns:mas");
@@ -123,7 +120,7 @@ const HLS_TAGS = {
 
 //#endregion
 //#region lib/hls/hls-content-processor.ts
-var DefaultHlsContentProcessor = class DefaultHlsContentProcessor extends ContentProcessor {
+var DefaultHlsContentProcessor = class DefaultHlsContentProcessor {
 	static YkDVRegex = /#EXT-X-DISCONTINUITY\s+#EXT-X-MAP:URI="(.*?)",BYTERANGE="(.*?)"/g;
 	static DNSPRegex = /#EXT-X-MAP:URI=".*?BUMPER\/[\s\S]+?#EXT-X-DISCONTINUITY/;
 	static DNSPSubRegex = /#EXTINF:.*?,\s+.*BUMPER.*\s+#EXT-X-DISCONTINUITY/;
@@ -162,8 +159,10 @@ var EncryptInfo = class {
 	method = ENCRYPT_METHODS.NONE;
 	key;
 	iv;
+	drm;
 	constructor(method) {
 		this.method = this.parseMethod(method);
+		this.drm = {};
 	}
 	parseMethod(method) {
 		if (method) return ENCRYPT_METHODS[method.replace("-", "_")];
@@ -173,7 +172,7 @@ var EncryptInfo = class {
 
 //#endregion
 //#region lib/hls/hls-key-processor.ts
-var DefaultHlsKeyProcessor = class extends KeyProcessor {
+var DefaultHlsKeyProcessor = class {
 	canProcess(extractorType) {
 		return extractorType === EXTRACTOR_TYPES.HLS;
 	}
@@ -181,17 +180,16 @@ var DefaultHlsKeyProcessor = class extends KeyProcessor {
 		const iv = this.getAttribute(keyLine, "IV");
 		const method = this.getAttribute(keyLine, "METHOD");
 		const uri = this.getAttribute(keyLine, "URI");
-		console.debug(`METHOD:${method}, URI:${uri}, IV:${iv}`);
 		const encryptInfo = new EncryptInfo(method);
-		if (iv) encryptInfo.iv = Buffer.from(iv, "hex");
+		if (iv) encryptInfo.iv = b.hex().encode(iv);
 		if (parserConfig.customIv && parserConfig.customIv.length > 0) encryptInfo.iv = parserConfig.customIv;
 		try {
 			if (parserConfig.customKey && parserConfig.customKey.length > 0) encryptInfo.key = parserConfig.customKey;
 			else if (uri) {
 				const lowerUri = uri.toLowerCase();
-				if (lowerUri.startsWith("base64:")) encryptInfo.key = Buffer.from(uri.slice(7), "base64");
-				else if (lowerUri.startsWith("data:;base64,")) encryptInfo.key = Buffer.from(uri.slice(13), "base64");
-				else if (lowerUri.startsWith("data:text/plain;base64,")) encryptInfo.key = Buffer.from(uri.slice(23), "base64");
+				if (lowerUri.startsWith("base64:")) encryptInfo.key = b.base64().encode(uri.slice(7));
+				else if (lowerUri.startsWith("data:;base64,")) encryptInfo.key = b.base64().encode(uri.slice(13));
+				else if (lowerUri.startsWith("data:text/plain;base64,")) encryptInfo.key = b.base64().encode(uri.slice(23));
 				else if (existsSync(uri)) encryptInfo.key = readFileSync(uri);
 				else {
 					const processedUrl = this.preProcessUrl(new URL(uri, m3u8Url).toString(), parserConfig);
@@ -209,15 +207,15 @@ var DefaultHlsKeyProcessor = class extends KeyProcessor {
 		return encryptInfo;
 	}
 	getAttribute(line, attrName) {
-		const regex = new RegExp(`${attrName}="([^"]+)"`, "i");
+		const regex = new RegExp(`${attrName}=(?:"([^"]+)"|([^,]+))`, "i");
 		const match = line.match(regex);
-		return match?.[1] ?? null;
+		return match?.[1] ?? match?.[2] ?? null;
 	}
 	async fetchKeyWithRetry(url, parserConfig) {
 		let retryCount = parserConfig.keyRetryCount ?? 3;
 		while (retryCount >= 0) try {
 			const response = await fetch(url, { headers: parserConfig.headers });
-			return Buffer.from(await response.arrayBuffer());
+			return new Uint8Array(await response.arrayBuffer());
 		} catch (error) {
 			if (error.message.includes("scheme is not supported")) throw error;
 			console.warn(`Error fetching key: ${error.message}. Retries left: ${retryCount}`);
@@ -338,8 +336,7 @@ const DASH_TAGS = {
 const combineUrl = (baseUrl, relativeUrl) => {
 	if (!baseUrl.trim()) return relativeUrl;
 	const url1 = new URL(baseUrl);
-	const url2 = new URL(relativeUrl, url1);
-	return url2.toString();
+	return new URL(relativeUrl, url1).toString();
 };
 const replaceVars = (text, dict) => {
 	let result = text;
@@ -378,7 +375,7 @@ const getAttribute = (line, key = "") => {
 	return result;
 };
 const distinctBy = (array, callbackfn) => {
-	const seen = new Set();
+	const seen = /* @__PURE__ */ new Set();
 	return array.filter((item) => {
 		const value = callbackfn(item);
 		if (seen.has(value)) return false;
@@ -457,8 +454,7 @@ var MediaSegment = class MediaSegment {
 */
 const parseRange = (range) => {
 	const [startRange, end] = range.split("-").map(Number);
-	const expectLength = end - startRange + 1;
-	return [startRange, expectLength];
+	return [startRange, end - startRange + 1];
 };
 
 //#endregion
@@ -494,11 +490,9 @@ var DashExtractor = class DashExtractor {
 	async extractStreams(rawText) {
 		const streamList = [];
 		this.#mpdContent = rawText;
-		const document = new DOMParser().parseFromString(this.#mpdContent, "text/xml");
-		const mpdElement = document.getElementsByTagName("MPD")[0];
-		const type = mpdElement.getAttribute("type");
-		const isLive = type === "dynamic";
-		const maxSegmentDuration = mpdElement.getAttribute("maxSegmentDuration");
+		const mpdElement = new DOMParser().parseFromString(this.#mpdContent, "text/xml").getElementsByTagName("MPD")[0];
+		const isLive = mpdElement.getAttribute("type") === "dynamic";
+		mpdElement.getAttribute("maxSegmentDuration");
 		const availabilityStartTime = mpdElement.getAttribute("availabilityStartTime");
 		const timeShiftBufferDepth = mpdElement.getAttribute("timeShiftBufferDepth") || "PT1M";
 		const publishTime = mpdElement.getAttribute("publishTime");
@@ -557,8 +551,7 @@ var DashExtractor = class DashExtractor {
 					if (role) {
 						const roleValue = role.getAttribute("value");
 						const capitalize = (word) => word.charAt(0).toUpperCase() + word.slice(1);
-						const roleTypeKey = roleValue.split("-").map(capitalize).join("");
-						const roleType = ROLE_TYPE[roleTypeKey];
+						const roleType = ROLE_TYPE[roleValue.split("-").map(capitalize).join("")];
 						streamSpec.role = roleType;
 						if (roleType === ROLE_TYPE.Subtitle) {
 							streamSpec.mediaType = MEDIA_TYPES.SUBTITLES;
@@ -689,8 +682,7 @@ var DashExtractor = class DashExtractor {
 									varDic[DASH_TAGS.TemplateNumber] = segNumber++;
 									const _hashTime = mediaTemplate?.includes(DASH_TAGS.TemplateTime);
 									const _media = replaceVars(mediaTemplate, varDic);
-									const _mediaUrl = combineUrl(segBaseUrl, _media);
-									_mediaSegment.url = _mediaUrl;
+									_mediaSegment.url = combineUrl(segBaseUrl, _media);
 									_mediaSegment.index = segIndex++;
 									_mediaSegment.duration = _duration / timescale;
 									if (_hashTime) _mediaSegment.nameFromVar = currentTime.toString();
@@ -734,27 +726,37 @@ var DashExtractor = class DashExtractor {
 						mediaSegment.duration = periodDurationSeconds;
 						streamSpec.playlist.mediaParts[0].mediaSegments.push(mediaSegment);
 					}
-					const contentProtection = adaptationSet.getElementsByTagName("ContentProtection")[0] || representation.getElementsByTagName("ContentProtection")[0];
-					if (contentProtection) {
+					const adaptationSetProtections = adaptationSet.getElementsByTagName("ContentProtection");
+					const representationProtections = representation.getElementsByTagName("ContentProtection");
+					const contentProtections = representationProtections[0] ? representationProtections : adaptationSetProtections;
+					if (contentProtections.length) {
 						const encryptInfo = new EncryptInfo();
 						encryptInfo.method = DashExtractor.#DEFAULT_METHOD;
+						const widevineSystemId = "edef8ba9-79d6-4ace-a3c8-27dcd51d21ed";
+						const playreadySystemId = "9a04f079-9840-4286-ab92-e65be0885f95";
+						for (const contentProtection of contentProtections) {
+							const schemeIdUri = contentProtection.getAttribute("schemeIdUri");
+							const drmData = {
+								keyId: contentProtection.getAttribute("cenc:default_KID") || void 0,
+								pssh: contentProtection.getElementsByTagName("cenc:pssh")[0]?.textContent || void 0
+							};
+							if (schemeIdUri?.includes(widevineSystemId)) encryptInfo.drm.widevine = drmData;
+							else if (schemeIdUri?.includes(playreadySystemId)) encryptInfo.drm.playready = drmData;
+							else continue;
+						}
 						if (streamSpec.playlist.mediaInit) streamSpec.playlist.mediaInit.encryptInfo = encryptInfo;
 						const segments = streamSpec.playlist.mediaParts[0].mediaSegments;
 						for (const segment of segments) if (!segment.encryptInfo) segment.encryptInfo = encryptInfo;
 					}
 					const _index = streamList.findIndex((item) => item.periodId !== streamSpec.periodId && item.groupId === streamSpec.groupId && item.resolution === streamSpec.resolution && item.mediaType === streamSpec.mediaType);
-					if (_index > -1) if (isLive) {} else {
-						const url1 = streamList[_index].playlist.mediaParts.at(-1).mediaSegments.at(-1).url;
-						const url2 = streamSpec.playlist.mediaParts[0].mediaSegments.at(-1)?.url;
-						if (url1 !== url2) {
-							const startIndex = streamList[_index].playlist.mediaParts.at(-1).mediaSegments.at(-1).index + 1;
-							const segments = streamSpec.playlist.mediaParts[0].mediaSegments;
-							for (const segment of segments) segment.index += startIndex;
-							const mediaPart = new MediaPart();
-							mediaPart.mediaSegments = streamList[_index].playlist.mediaParts[0].mediaSegments;
-							streamList[_index].playlist.mediaParts.push(mediaPart);
-						} else streamList[_index].playlist.mediaParts.at(-1).mediaSegments.at(-1).duration += streamSpec.playlist.mediaParts[0].mediaSegments.reduce((sum, segment) => sum + segment.duration, 0);
-					}
+					if (_index > -1) if (isLive) {} else if (streamList[_index].playlist.mediaParts.at(-1).mediaSegments.at(-1).url !== streamSpec.playlist.mediaParts[0].mediaSegments.at(-1)?.url) {
+						const startIndex = streamList[_index].playlist.mediaParts.at(-1).mediaSegments.at(-1).index + 1;
+						const segments = streamSpec.playlist.mediaParts[0].mediaSegments;
+						for (const segment of segments) segment.index += startIndex;
+						const mediaPart = new MediaPart();
+						mediaPart.mediaSegments = streamList[_index].playlist.mediaParts[0].mediaSegments;
+						streamList[_index].playlist.mediaParts.push(mediaPart);
+					} else streamList[_index].playlist.mediaParts.at(-1).mediaSegments.at(-1).duration += streamSpec.playlist.mediaParts[0].mediaSegments.reduce((sum, segment) => sum + segment.duration, 0);
 					else {
 						if (streamSpec.mediaType === MEDIA_TYPES.SUBTITLES && streamSpec.extension === "mp4") streamSpec.extension = "m4s";
 						if (streamSpec.mediaType !== MEDIA_TYPES.SUBTITLES && (streamSpec.extension == null || streamSpec.playlist.mediaParts.reduce((sum, part) => sum + part.mediaSegments.length, 0) > 1)) streamSpec.extension = "m4s";
@@ -769,8 +771,8 @@ var DashExtractor = class DashExtractor {
 		const subtitleList = streamList.filter((stream) => stream.mediaType === MEDIA_TYPES.SUBTITLES);
 		const videoList = streamList.filter((stream) => stream.mediaType === MEDIA_TYPES.VIDEO);
 		for (const video of videoList) {
-			const audioGroupId = audioList.toSorted((a, b) => (b.bandwidth || 0) - (a.bandwidth || 0)).at(0)?.groupId;
-			const subtitleGroupId = subtitleList.toSorted((a, b) => (b.bandwidth || 0) - (a.bandwidth || 0)).at(0)?.groupId;
+			const audioGroupId = audioList.toSorted((a, b$1) => (b$1.bandwidth || 0) - (a.bandwidth || 0)).at(0)?.groupId;
+			const subtitleGroupId = subtitleList.toSorted((a, b$1) => (b$1.bandwidth || 0) - (a.bandwidth || 0)).at(0)?.groupId;
 			if (audioGroupId) video.audioId = audioGroupId;
 			if (subtitleGroupId) video.subtitleId = subtitleGroupId;
 		}
@@ -780,17 +782,38 @@ var DashExtractor = class DashExtractor {
 		if (!v) return;
 		return v;
 	}
-	fetchPlayList(streamSpecs) {
-		throw new Error("Method not implemented.");
+	async refreshPlayList(streamSpecs) {
+		if (!streamSpecs.length) return;
+		const response = await fetch(this.#parserConfig.url, this.#parserConfig.headers).catch(() => fetch(this.#parserConfig.originalUrl, this.#parserConfig.headers));
+		const rawText = await response.text();
+		const url = response.url;
+		this.#parserConfig.url = url;
+		this.#setInitUrl();
+		const newStreams = await this.extractStreams(rawText);
+		for (const streamSpec of streamSpecs) {
+			let results = newStreams.filter((n) => n.toShortString() === streamSpec.toShortString());
+			if (!results.length) results = newStreams.filter((n) => n.playlist?.mediaInit?.url === streamSpec.playlist?.mediaInit?.url);
+			if (results.length) streamSpec.playlist.mediaParts = results.at(0).playlist.mediaParts;
+		}
+		await this.#processUrl(streamSpecs);
+	}
+	async #processUrl(streamSpecs) {
+		for (const spec of streamSpecs) {
+			const playlist = spec.playlist;
+			if (!playlist) continue;
+			if (playlist.mediaInit) playlist.mediaInit.url = this.preProcessUrl(playlist.mediaInit.url);
+			for (const part of playlist.mediaParts) for (const segment of part.mediaSegments) segment.url = this.preProcessUrl(segment.url);
+		}
 	}
-	refreshPlayList(streamSpecs) {
-		throw new Error("Method not implemented.");
+	async fetchPlayList(streamSpecs) {
+		this.#processUrl(streamSpecs);
 	}
 	preProcessUrl(url) {
-		throw new Error("Method not implemented.");
+		for (const processor of this.#parserConfig.urlProcessors) if (processor.canProcess(this.extractorType, url, this.#parserConfig)) url = processor.process(url, this.#parserConfig);
+		return url;
 	}
 	preProcessContent() {
-		throw new Error("Method not implemented.");
+		for (const processor of this.#parserConfig.contentProcessors) if (processor.canProcess(this.extractorType, this.#mpdContent, this.#parserConfig)) this.#mpdContent = processor.process(this.#mpdContent, this.#parserConfig);
 	}
 };
 
@@ -869,8 +892,7 @@ var HlsExtractor = class {
 				expectPlaylist = true;
 			} else if (line.startsWith(HLS_TAGS.extXMedia)) {
 				streamSpec = new StreamSpec();
-				const type = getAttribute(line, "TYPE").replace("-", "_");
-				const mediaType = MEDIA_TYPES[type];
+				const mediaType = MEDIA_TYPES[getAttribute(line, "TYPE").replace("-", "_")];
 				if (mediaType) streamSpec.mediaType = mediaType;
 				if (mediaType === MEDIA_TYPES.CLOSED_CAPTIONS) continue;
 				let url = getAttribute(line, "URI");
@@ -921,8 +943,7 @@ var HlsExtractor = class {
 		for (const line of lines) {
 			if (!line.trim()) continue;
 			if (line.startsWith(HLS_TAGS.extXByterange)) {
-				const p = getAttribute(line);
-				const [n, o] = getRange(p);
+				const [n, o] = getRange(getAttribute(line));
 				segment.expectLength = n;
 				segment.startRange = o || (segments.at(-1)?.startRange || 0) + (segments.at(-1)?.expectLength || 0);
 				expectSegment = true;
@@ -944,9 +965,7 @@ var HlsExtractor = class {
 				mediaParts.push(new MediaPart(segments));
 				segments = [];
 			} else if (line.startsWith(HLS_TAGS.extXKey)) {
-				const uri = getAttribute(line, "URI");
-				const uriLast = getAttribute(lastKeyLine, "URI");
-				if (uri !== uriLast) {
+				if (getAttribute(line, "URI") !== getAttribute(lastKeyLine, "URI")) {
 					const parsedInfo = await this.#parseKey(line);
 					currentEncryptInfo.method = parsedInfo.method;
 					currentEncryptInfo.key = parsedInfo.key;
@@ -974,8 +993,7 @@ var HlsExtractor = class {
 				mediaSegment.index = -1;
 				playlist.mediaInit = mediaSegment;
 				if (line.includes("BYTERANGE")) {
-					const p = getAttribute(line, "BYTERANGE");
-					const [n, o] = getRange(p);
+					const [n, o] = getRange(getAttribute(line, "BYTERANGE"));
 					mediaSegment.expectLength = n;
 					mediaSegment.startRange = o || 0;
 				}
@@ -1024,10 +1042,7 @@ var HlsExtractor = class {
 	async extractStreams(rawText) {
 		this.#m3u8Content = rawText;
 		this.preProcessContent();
-		if (this.#m3u8Content.includes(HLS_TAGS.extXStreamInf)) {
-			console.log("Master m3u8 found");
-			return this.#parseMasterList().then((lists) => distinctBy(lists, (list) => list.url));
-		}
+		if (this.#m3u8Content.includes(HLS_TAGS.extXStreamInf)) return this.#parseMasterList().then((lists) => distinctBy(lists, (list) => list.url));
 		const playlist = await this.#parseList();
 		const streamSpec = new StreamSpec();
 		streamSpec.url = this.parserConfig.url;
@@ -1037,8 +1052,7 @@ var HlsExtractor = class {
 	}
 	async #loadM3u8FromUrl(url) {
 		if (url.startsWith("file:")) {
-			const uri = new URL(url);
-			const filePath = uri.pathname;
+			const filePath = new URL(url).pathname;
 			this.#m3u8Content = await readFile(filePath, "utf8");
 		} else if (url.startsWith("http")) try {
 			const response = await fetch(url, { headers: this.parserConfig.headers });
@@ -1078,9 +1092,9 @@ var HlsExtractor = class {
 			else list.playlist = newPlaylist;
 			if (list.mediaType === MEDIA_TYPES.SUBTITLES) {
 				const a = list.playlist.mediaParts.some((part) => part.mediaSegments.some((segment) => segment.url.includes(".ttml")));
-				const b = list.playlist.mediaParts.some((part) => part.mediaSegments.some((segment) => segment.url.includes(".vtt") || segment.url.includes(".webvtt")));
+				const b$1 = list.playlist.mediaParts.some((part) => part.mediaSegments.some((segment) => segment.url.includes(".vtt") || segment.url.includes(".webvtt")));
 				if (a) list.extension = "ttml";
-				if (b) list.extension = "vtt";
+				if (b$1) list.extension = "vtt";
 			} else list.extension = list.playlist.mediaInit ? "m4s" : "ts";
 		}
 	}
@@ -1108,8 +1122,7 @@ var StreamExtractor = class {
 	}
 	async loadSourceFromUrl(url) {
 		if (url.startsWith("file:")) {
-			const uri = new URL(url);
-			const filePath = uri.pathname;
+			const filePath = new URL(url).pathname;
 			this.#rawText = await readFile(filePath, "utf8");
 			this.#setUrl(url);
 		} else if (url.startsWith("http")) {
@@ -1136,8 +1149,11 @@ var StreamExtractor = class {
 		} else if (this.#rawText.includes("</MPD>") && this.#rawText.includes("<MPD")) {
 			this.#extractor = new DashExtractor(this.#parserConfig);
 			rawType = "mpd";
-		} else if (this.#rawText.includes("</SmoothStreamingMedia>") && this.#rawText.includes("<SmoothStreamingMedia")) rawType = "ism";
-		else if (rawText === "<RE_LIVE_TS>") {} else throw new Error("Unsupported stream type");
+		} else if (this.#rawText.includes("</SmoothStreamingMedia>") && this.#rawText.includes("<SmoothStreamingMedia")) {
+			rawType = "ism";
+			throw new Error("Smooth Streaming is not supported yet");
+		} else if (rawText === "<RE_LIVE_TS>") throw new Error("Live TS is not supported yet");
+		else throw new Error("Unsupported stream type");
 		this.#rawFiles[`raw.${rawType}`] = rawText;
 	}
 	async extractStreams() {
@@ -1152,4 +1168,4 @@ var StreamExtractor = class {
 };
 
 //#endregion
-export { ContentProcessor, DefaultUrlProcessor, ENCRYPT_METHODS, EXTRACTOR_TYPES, KeyProcessor, MEDIA_TYPES, ParserConfig, ROLE_TYPE, StreamExtractor, UrlProcessor };
+export { DefaultUrlProcessor, ENCRYPT_METHODS, EXTRACTOR_TYPES, MEDIA_TYPES, ParserConfig, ROLE_TYPE, StreamExtractor };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dasha",
-  "version": "4.0.0-alpha.2",
+  "version": "4.0.0-alpha.3",
   "description": "Streaming manifest parser",
   "files": [
     "dist"
@@ -30,7 +30,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/streamyx-labs/dasha"
+    "url": "https://github.com/azot-labs/dasha"
   },
   "keywords": [
     "mpeg",
@@ -48,37 +48,34 @@
   "license": "MIT",
   "readmeFilename": "README.md",
   "bugs": {
-    "url": "https://github.com/streamyx-labs/dasha/issues",
+    "url": "https://github.com/azot-labs/dasha/issues",
     "email": "vitalygashkov@vk.com"
   },
   "funding": [
     {
       "type": "individual",
-      "url": "https://boosty.to/vitalygashkov"
-    },
-    {
-      "type": "patreon",
-      "url": "https://www.patreon.com/vitalygashkov"
+      "url": "https://t.me/tribute/app?startapp=dqW2"
     }
   ],
   "engines": {
-    "node": "20 || 21 || 22"
+    "node": ">=20"
   },
   "dependencies": {
     "@xmldom/xmldom": "^0.9.8",
+    "barsic": "^0.2.0",
     "temporal-polyfill": "^0.3.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.25.1",
-    "@types/node": "^22.15.3",
-    "eslint": "^9.25.1",
-    "eslint-config-prettier": "^10.1.2",
-    "eslint-plugin-prettier": "^5.2.6",
-    "globals": "^16.0.0",
-    "prettier": "^3.5.3",
-    "tsdown": "^0.10.2",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.31.1",
-    "vitest": "^3.1.2"
+    "@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.15.12",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.46.3",
+    "vitest": "^4.0.6"
   }
 }