dasha 4.0.0-alpha.1 → 4.0.0-alpha.2

package/README.md

@@ -6,10 +6,14 @@
 
 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).
+
+
 ## Install
 
 ```shell
-npm i dasha
+npm i dasha@4.0.0-alpha.1
 ```
 
 ## Usage
@@ -19,13 +23,16 @@ 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 body = await fetch(url).then((res) => res.text());
-const manifest = await parse(body, url);
-
-for (const track of manifest.tracks.all) {
-  for (const segment of track.segments) {
-    const content = await fetch(url).then((res) => res.arrayBuffer());
-    await fs.appendFile(`${track.id}.mp4`, content);
+const streamExtractor = new StreamExtractor();
+await streamExtractor.loadSourceFromUrl(url);
+const streams = await streamExtractor.extractStreams();
+
+for (const stream of streams) {
+  const segments = stream.playlist?.mediaParts[0].mediaSegments || [];
+  const filename = `${stream.name}_${stream.groupId}`;
+  for (const segment of segments) {
+    const content = await fetch(segment.url).then((res) => res.arrayBuffer());
+    await fs.appendFile(`${filename}.${stream.extension}`, content);
   }
 }
 ```

package/dist/dasha.cjs

@@ -76,22 +76,42 @@ const ROLE_TYPE = {
 };
 
 //#endregion
-//#region lib/parser-config.ts
-var ParserConfig = class {
-	url = "";
-	originalUrl = "";
-	baseUrl;
-	customParserArgs = {};
-	headers = {};
-	contentProcessors = [];
-	urlProcessors = [];
-	keyProcessors = [];
-	customMethod;
-	customKey;
-	customIv;
-	urlProcessorArgs;
-	appendUrlParams = false;
-	keyRetryCount = 3;
+//#region lib/processor.ts
+var ContentProcessor = class {};
+var KeyProcessor = class {};
+var UrlProcessor = class {};
+var DefaultUrlProcessor = class extends UrlProcessor {
+	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 oldUrl = new URL(url);
+		const newQuery = oldUrl.searchParams;
+		for (const [key, value] of urlFromConfigQuery) if (newQuery.has(key)) newQuery.set(key, value);
+		else newQuery.append(key, value);
+		if (!newQuery.toString()) return url;
+		console.debug(`Before: ${url}`);
+		url = `${oldUrl.pathname}?${newQuery.toString()}`;
+		console.debug(`After: ${url}`);
+		return url;
+	}
+};
+
+//#endregion
+//#region lib/dash/dash-content-processor.ts
+var DefaultDashContentProcessor = class extends ContentProcessor {
+	canProcess(extractorType, mpdContent) {
+		if (extractorType !== EXTRACTOR_TYPES.MPEG_DASH) return false;
+		return mpdContent.includes("<mas:") && !mpdContent.includes("xmlns:mas");
+	}
+	process(mpdContent) {
+		console.debug("Fix xigua mpd...");
+		mpdContent = mpdContent.replace("<MPD ", "<MPD xmlns:mas=\"urn:marlin:mas:1-0:services:schemas:mpd\" ");
+		return mpdContent;
+	}
 };
 
 //#endregion
@@ -125,6 +145,137 @@ const HLS_TAGS = {
 	extXStart: "#EXT-X-START"
 };
 
+//#endregion
+//#region lib/hls/hls-content-processor.ts
+var DefaultHlsContentProcessor = class DefaultHlsContentProcessor extends ContentProcessor {
+	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/;
+	static OrderFixRegex = /(#EXTINF.*)(\s+)(#EXT-X-KEY.*)/g;
+	static ATVRegex = /#EXT-X-MAP.*\.apple\.com\//;
+	static ATVRegex2 = /(#EXT-X-KEY:[\s\S]*?)(#EXT-X-DISCONTINUITY|#EXT-X-ENDLIST)/;
+	canProcess(extractorType) {
+		return extractorType === EXTRACTOR_TYPES.HLS;
+	}
+	process(m3u8Content, parserConfig) {
+		if (m3u8Content.includes("\r") && !m3u8Content.includes("\n")) m3u8Content = m3u8Content.replace(/\r/g, "\n");
+		const m3u8Url = parserConfig.url;
+		if (m3u8Url.includes("tlivecloud-playback-cdn.ysp.cctv.cn") && m3u8Url.includes("endtime=")) m3u8Content += "\n" + HLS_TAGS.extXEndlist;
+		if (m3u8Content.includes("#EXT-X-DISCONTINUITY") && m3u8Content.includes("#EXT-X-MAP") && m3u8Content.includes("ott.cibntv.net") && m3u8Content.includes("ccode=")) m3u8Content = m3u8Content.replace(DefaultHlsContentProcessor.YkDVRegex, (_match, uri, byterange) => `#EXTINF:0.000000,\n#EXT-X-BYTERANGE:${byterange}\n${uri}`);
+		if (m3u8Content.includes("#EXT-X-DISCONTINUITY") && m3u8Content.includes("#EXT-X-MAP") && m3u8Url.includes("media.dssott.com/")) this.applyRegexReplacement(m3u8Content, DefaultHlsContentProcessor.DNSPRegex);
+		if (m3u8Content.includes("#EXT-X-DISCONTINUITY") && m3u8Content.includes("seg_00000.vtt") && m3u8Url.includes("media.dssott.com/")) this.applyRegexReplacement(m3u8Content, DefaultHlsContentProcessor.DNSPSubRegex);
+		if (m3u8Content.includes("#EXT-X-DISCONTINUITY") && m3u8Content.includes("#EXT-X-MAP") && (m3u8Url.includes(".apple.com/") || DefaultHlsContentProcessor.ATVRegex.test(m3u8Content))) {
+			const match = DefaultHlsContentProcessor.ATVRegex2.exec(m3u8Content);
+			if (match) m3u8Content = `#EXTM3U\n${match[1]}\n#EXT-X-ENDLIST`;
+		}
+		if (DefaultHlsContentProcessor.OrderFixRegex.test(m3u8Content)) m3u8Content = m3u8Content.replace(DefaultHlsContentProcessor.OrderFixRegex, "$3$2$1");
+		return m3u8Content;
+	}
+	applyRegexReplacement(content, regex) {
+		if (regex.test(content)) {
+			const match = regex.exec(content);
+			if (match) return content.split(match[0]).join("#XXX");
+		}
+		return content;
+	}
+};
+
+//#endregion
+//#region lib/shared/encrypt-info.ts
+var EncryptInfo = class {
+	method = ENCRYPT_METHODS.NONE;
+	key;
+	iv;
+	constructor(method) {
+		this.method = this.parseMethod(method);
+	}
+	parseMethod(method) {
+		if (method) return ENCRYPT_METHODS[method.replace("-", "_")];
+		else return ENCRYPT_METHODS.UNKNOWN;
+	}
+};
+
+//#endregion
+//#region lib/hls/hls-key-processor.ts
+var DefaultHlsKeyProcessor = class extends KeyProcessor {
+	canProcess(extractorType) {
+		return extractorType === EXTRACTOR_TYPES.HLS;
+	}
+	async process(keyLine, m3u8Url, _m3u8Content, parserConfig) {
+		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 (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");
+				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);
+					encryptInfo.key = await this.fetchKeyWithRetry(processedUrl, parserConfig);
+				}
+			}
+		} catch (error) {
+			console.error(`Failed to load key: ${error.message}`);
+			encryptInfo.method = ENCRYPT_METHODS.UNKNOWN;
+		}
+		if (parserConfig.customMethod) {
+			console.warn(`METHOD changed from ${encryptInfo.method} to ${parserConfig.customMethod}`);
+			encryptInfo.method = parserConfig.customMethod;
+		}
+		return encryptInfo;
+	}
+	getAttribute(line, attrName) {
+		const regex = new RegExp(`${attrName}="([^"]+)"`, "i");
+		const match = line.match(regex);
+		return match?.[1] ?? 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());
+		} catch (error) {
+			if (error.message.includes("scheme is not supported")) throw error;
+			console.warn(`Error fetching key: ${error.message}. Retries left: ${retryCount}`);
+			await new Promise((resolve) => setTimeout(resolve, 1e3));
+			retryCount--;
+		}
+		throw new Error("Maximum retry attempts reached");
+	}
+	preProcessUrl(url, parserConfig) {
+		let processedUrl = url;
+		for (const processor of parserConfig.urlProcessors ?? []) if (processor.canProcess(EXTRACTOR_TYPES.HLS, processedUrl, parserConfig)) processedUrl = processor.process(processedUrl, parserConfig);
+		return processedUrl;
+	}
+};
+
+//#endregion
+//#region lib/parser-config.ts
+var ParserConfig = class {
+	url = "";
+	originalUrl = "";
+	baseUrl;
+	customParserArgs = {};
+	headers = {};
+	contentProcessors = [new DefaultDashContentProcessor(), new DefaultHlsContentProcessor()];
+	urlProcessors = [new DefaultUrlProcessor()];
+	keyProcessors = [new DefaultHlsKeyProcessor()];
+	customMethod;
+	customKey;
+	customIv;
+	urlProcessorArgs;
+	appendUrlParams = false;
+	keyRetryCount = 3;
+};
+
 //#endregion
 //#region lib/shared/stream-spec.ts
 var StreamSpec = class {
@@ -285,21 +436,6 @@ var MediaPart = class {
 	}
 };
 
-//#endregion
-//#region lib/shared/encrypt-info.ts
-var EncryptInfo = class {
-	method = ENCRYPT_METHODS.NONE;
-	key;
-	iv;
-	constructor(method) {
-		this.method = this.parseMethod(method);
-	}
-	parseMethod(method) {
-		if (method !== void 0) return ENCRYPT_METHODS[method.replace("-", "_")];
-		else return ENCRYPT_METHODS.UNKNOWN;
-	}
-};
-
 //#endregion
 //#region lib/shared/media-segment.ts
 var MediaSegment = class MediaSegment {
@@ -835,7 +971,7 @@ var HlsExtractor = class {
 				const uri = getAttribute(line, "URI");
 				const uriLast = getAttribute(lastKeyLine, "URI");
 				if (uri !== uriLast) {
-					const parsedInfo = this.#parseKey(line);
+					const parsedInfo = await this.#parseKey(line);
 					currentEncryptInfo.method = parsedInfo.method;
 					currentEncryptInfo.key = parsedInfo.key;
 					currentEncryptInfo.iv = parsedInfo.iv;
@@ -905,7 +1041,7 @@ var HlsExtractor = class {
 		if (playlist.isLive) playlist.refreshIntervalMs = (playlist.targetDuration || 5) * 2 * 1e3;
 		return playlist;
 	}
-	#parseKey(keyLine) {
+	async #parseKey(keyLine) {
 		for (const p of this.parserConfig.keyProcessors) if (p.canProcess(this.extractorType, keyLine, this.#m3u8Url, this.#m3u8Content, this.parserConfig)) return p.process(keyLine, this.#m3u8Url, this.#m3u8Content, this.parserConfig);
 		throw new Error("No key processor found");
 	}
@@ -1040,9 +1176,13 @@ 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.StreamExtractor = StreamExtractor
+exports.UrlProcessor = UrlProcessor

package/dist/dasha.d.cts

@@ -47,6 +47,35 @@ declare const ROLE_TYPE: {
 };
 type RoleType = (typeof ROLE_TYPE)[keyof typeof ROLE_TYPE];
 
+//#endregion
+//#region lib/shared/encrypt-info.d.ts
+declare class EncryptInfo {
+  method: EncryptMethod;
+  key?: Buffer;
+  iv?: Buffer;
+  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;
+}
+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>;
+}
+declare abstract class UrlProcessor {
+  abstract canProcess(extractorType: ExtractorType, originalUrl: string, parserConfig: ParserConfig): boolean;
+  abstract process(originalUrl: string, parserConfig: ParserConfig): string;
+}
+declare class DefaultUrlProcessor extends 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 {
@@ -55,9 +84,9 @@ declare class ParserConfig {
   baseUrl?: string;
   customParserArgs: Record<string, string>;
   headers: Record<string, string>;
-  contentProcessors: any[];
-  urlProcessors: any[];
-  keyProcessors: any[];
+  contentProcessors: ContentProcessor[];
+  urlProcessors: UrlProcessor[];
+  keyProcessors: KeyProcessor[];
   customMethod?: EncryptMethod;
   customKey?: Buffer;
   customIv?: Buffer;
@@ -66,16 +95,6 @@ declare class ParserConfig {
   keyRetryCount: number;
 }
 
-//#endregion
-//#region lib/shared/encrypt-info.d.ts
-declare class EncryptInfo {
-  method: EncryptMethod;
-  key?: Buffer;
-  iv?: Buffer;
-  constructor(method?: string);
-  parseMethod(method?: string): EncryptMethod;
-}
-
 //#endregion
 //#region lib/shared/media-segment.d.ts
 declare class MediaSegment {
@@ -157,4 +176,4 @@ declare class StreamExtractor {
 }
 
 //#endregion
-export { ENCRYPT_METHODS, EXTRACTOR_TYPES, EncryptMethod, ExtractorType, MEDIA_TYPES, MediaType, ParserConfig, ROLE_TYPE, RoleType, StreamExtractor };
+export { ContentProcessor, DefaultUrlProcessor, ENCRYPT_METHODS, EXTRACTOR_TYPES, EncryptMethod, ExtractorType, KeyProcessor, MEDIA_TYPES, MediaType, ParserConfig, ROLE_TYPE, RoleType, StreamExtractor, UrlProcessor };

package/dist/dasha.d.ts

@@ -47,6 +47,35 @@ declare const ROLE_TYPE: {
 };
 type RoleType = (typeof ROLE_TYPE)[keyof typeof ROLE_TYPE];
 
+//#endregion
+//#region lib/shared/encrypt-info.d.ts
+declare class EncryptInfo {
+  method: EncryptMethod;
+  key?: Buffer;
+  iv?: Buffer;
+  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;
+}
+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>;
+}
+declare abstract class UrlProcessor {
+  abstract canProcess(extractorType: ExtractorType, originalUrl: string, parserConfig: ParserConfig): boolean;
+  abstract process(originalUrl: string, parserConfig: ParserConfig): string;
+}
+declare class DefaultUrlProcessor extends 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 {
@@ -55,9 +84,9 @@ declare class ParserConfig {
   baseUrl?: string;
   customParserArgs: Record<string, string>;
   headers: Record<string, string>;
-  contentProcessors: any[];
-  urlProcessors: any[];
-  keyProcessors: any[];
+  contentProcessors: ContentProcessor[];
+  urlProcessors: UrlProcessor[];
+  keyProcessors: KeyProcessor[];
   customMethod?: EncryptMethod;
   customKey?: Buffer;
   customIv?: Buffer;
@@ -66,16 +95,6 @@ declare class ParserConfig {
   keyRetryCount: number;
 }
 
-//#endregion
-//#region lib/shared/encrypt-info.d.ts
-declare class EncryptInfo {
-  method: EncryptMethod;
-  key?: Buffer;
-  iv?: Buffer;
-  constructor(method?: string);
-  parseMethod(method?: string): EncryptMethod;
-}
-
 //#endregion
 //#region lib/shared/media-segment.d.ts
 declare class MediaSegment {
@@ -157,4 +176,4 @@ declare class StreamExtractor {
 }
 
 //#endregion
-export { ENCRYPT_METHODS, EXTRACTOR_TYPES, EncryptMethod, ExtractorType, MEDIA_TYPES, MediaType, ParserConfig, ROLE_TYPE, RoleType, StreamExtractor };
+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,4 @@
-import { existsSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { pathToFileURL } from "node:url";
 import path from "node:path";
@@ -52,22 +52,42 @@ const ROLE_TYPE = {
 };
 
 //#endregion
-//#region lib/parser-config.ts
-var ParserConfig = class {
-	url = "";
-	originalUrl = "";
-	baseUrl;
-	customParserArgs = {};
-	headers = {};
-	contentProcessors = [];
-	urlProcessors = [];
-	keyProcessors = [];
-	customMethod;
-	customKey;
-	customIv;
-	urlProcessorArgs;
-	appendUrlParams = false;
-	keyRetryCount = 3;
+//#region lib/processor.ts
+var ContentProcessor = class {};
+var KeyProcessor = class {};
+var UrlProcessor = class {};
+var DefaultUrlProcessor = class extends UrlProcessor {
+	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 oldUrl = new URL(url);
+		const newQuery = oldUrl.searchParams;
+		for (const [key, value] of urlFromConfigQuery) if (newQuery.has(key)) newQuery.set(key, value);
+		else newQuery.append(key, value);
+		if (!newQuery.toString()) return url;
+		console.debug(`Before: ${url}`);
+		url = `${oldUrl.pathname}?${newQuery.toString()}`;
+		console.debug(`After: ${url}`);
+		return url;
+	}
+};
+
+//#endregion
+//#region lib/dash/dash-content-processor.ts
+var DefaultDashContentProcessor = class extends ContentProcessor {
+	canProcess(extractorType, mpdContent) {
+		if (extractorType !== EXTRACTOR_TYPES.MPEG_DASH) return false;
+		return mpdContent.includes("<mas:") && !mpdContent.includes("xmlns:mas");
+	}
+	process(mpdContent) {
+		console.debug("Fix xigua mpd...");
+		mpdContent = mpdContent.replace("<MPD ", "<MPD xmlns:mas=\"urn:marlin:mas:1-0:services:schemas:mpd\" ");
+		return mpdContent;
+	}
 };
 
 //#endregion
@@ -101,6 +121,137 @@ const HLS_TAGS = {
 	extXStart: "#EXT-X-START"
 };
 
+//#endregion
+//#region lib/hls/hls-content-processor.ts
+var DefaultHlsContentProcessor = class DefaultHlsContentProcessor extends ContentProcessor {
+	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/;
+	static OrderFixRegex = /(#EXTINF.*)(\s+)(#EXT-X-KEY.*)/g;
+	static ATVRegex = /#EXT-X-MAP.*\.apple\.com\//;
+	static ATVRegex2 = /(#EXT-X-KEY:[\s\S]*?)(#EXT-X-DISCONTINUITY|#EXT-X-ENDLIST)/;
+	canProcess(extractorType) {
+		return extractorType === EXTRACTOR_TYPES.HLS;
+	}
+	process(m3u8Content, parserConfig) {
+		if (m3u8Content.includes("\r") && !m3u8Content.includes("\n")) m3u8Content = m3u8Content.replace(/\r/g, "\n");
+		const m3u8Url = parserConfig.url;
+		if (m3u8Url.includes("tlivecloud-playback-cdn.ysp.cctv.cn") && m3u8Url.includes("endtime=")) m3u8Content += "\n" + HLS_TAGS.extXEndlist;
+		if (m3u8Content.includes("#EXT-X-DISCONTINUITY") && m3u8Content.includes("#EXT-X-MAP") && m3u8Content.includes("ott.cibntv.net") && m3u8Content.includes("ccode=")) m3u8Content = m3u8Content.replace(DefaultHlsContentProcessor.YkDVRegex, (_match, uri, byterange) => `#EXTINF:0.000000,\n#EXT-X-BYTERANGE:${byterange}\n${uri}`);
+		if (m3u8Content.includes("#EXT-X-DISCONTINUITY") && m3u8Content.includes("#EXT-X-MAP") && m3u8Url.includes("media.dssott.com/")) this.applyRegexReplacement(m3u8Content, DefaultHlsContentProcessor.DNSPRegex);
+		if (m3u8Content.includes("#EXT-X-DISCONTINUITY") && m3u8Content.includes("seg_00000.vtt") && m3u8Url.includes("media.dssott.com/")) this.applyRegexReplacement(m3u8Content, DefaultHlsContentProcessor.DNSPSubRegex);
+		if (m3u8Content.includes("#EXT-X-DISCONTINUITY") && m3u8Content.includes("#EXT-X-MAP") && (m3u8Url.includes(".apple.com/") || DefaultHlsContentProcessor.ATVRegex.test(m3u8Content))) {
+			const match = DefaultHlsContentProcessor.ATVRegex2.exec(m3u8Content);
+			if (match) m3u8Content = `#EXTM3U\n${match[1]}\n#EXT-X-ENDLIST`;
+		}
+		if (DefaultHlsContentProcessor.OrderFixRegex.test(m3u8Content)) m3u8Content = m3u8Content.replace(DefaultHlsContentProcessor.OrderFixRegex, "$3$2$1");
+		return m3u8Content;
+	}
+	applyRegexReplacement(content, regex) {
+		if (regex.test(content)) {
+			const match = regex.exec(content);
+			if (match) return content.split(match[0]).join("#XXX");
+		}
+		return content;
+	}
+};
+
+//#endregion
+//#region lib/shared/encrypt-info.ts
+var EncryptInfo = class {
+	method = ENCRYPT_METHODS.NONE;
+	key;
+	iv;
+	constructor(method) {
+		this.method = this.parseMethod(method);
+	}
+	parseMethod(method) {
+		if (method) return ENCRYPT_METHODS[method.replace("-", "_")];
+		else return ENCRYPT_METHODS.UNKNOWN;
+	}
+};
+
+//#endregion
+//#region lib/hls/hls-key-processor.ts
+var DefaultHlsKeyProcessor = class extends KeyProcessor {
+	canProcess(extractorType) {
+		return extractorType === EXTRACTOR_TYPES.HLS;
+	}
+	async process(keyLine, m3u8Url, _m3u8Content, parserConfig) {
+		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 (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");
+				else if (existsSync(uri)) encryptInfo.key = readFileSync(uri);
+				else {
+					const processedUrl = this.preProcessUrl(new URL(uri, m3u8Url).toString(), parserConfig);
+					encryptInfo.key = await this.fetchKeyWithRetry(processedUrl, parserConfig);
+				}
+			}
+		} catch (error) {
+			console.error(`Failed to load key: ${error.message}`);
+			encryptInfo.method = ENCRYPT_METHODS.UNKNOWN;
+		}
+		if (parserConfig.customMethod) {
+			console.warn(`METHOD changed from ${encryptInfo.method} to ${parserConfig.customMethod}`);
+			encryptInfo.method = parserConfig.customMethod;
+		}
+		return encryptInfo;
+	}
+	getAttribute(line, attrName) {
+		const regex = new RegExp(`${attrName}="([^"]+)"`, "i");
+		const match = line.match(regex);
+		return match?.[1] ?? 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());
+		} catch (error) {
+			if (error.message.includes("scheme is not supported")) throw error;
+			console.warn(`Error fetching key: ${error.message}. Retries left: ${retryCount}`);
+			await new Promise((resolve) => setTimeout(resolve, 1e3));
+			retryCount--;
+		}
+		throw new Error("Maximum retry attempts reached");
+	}
+	preProcessUrl(url, parserConfig) {
+		let processedUrl = url;
+		for (const processor of parserConfig.urlProcessors ?? []) if (processor.canProcess(EXTRACTOR_TYPES.HLS, processedUrl, parserConfig)) processedUrl = processor.process(processedUrl, parserConfig);
+		return processedUrl;
+	}
+};
+
+//#endregion
+//#region lib/parser-config.ts
+var ParserConfig = class {
+	url = "";
+	originalUrl = "";
+	baseUrl;
+	customParserArgs = {};
+	headers = {};
+	contentProcessors = [new DefaultDashContentProcessor(), new DefaultHlsContentProcessor()];
+	urlProcessors = [new DefaultUrlProcessor()];
+	keyProcessors = [new DefaultHlsKeyProcessor()];
+	customMethod;
+	customKey;
+	customIv;
+	urlProcessorArgs;
+	appendUrlParams = false;
+	keyRetryCount = 3;
+};
+
 //#endregion
 //#region lib/shared/stream-spec.ts
 var StreamSpec = class {
@@ -261,21 +412,6 @@ var MediaPart = class {
 	}
 };
 
-//#endregion
-//#region lib/shared/encrypt-info.ts
-var EncryptInfo = class {
-	method = ENCRYPT_METHODS.NONE;
-	key;
-	iv;
-	constructor(method) {
-		this.method = this.parseMethod(method);
-	}
-	parseMethod(method) {
-		if (method !== void 0) return ENCRYPT_METHODS[method.replace("-", "_")];
-		else return ENCRYPT_METHODS.UNKNOWN;
-	}
-};
-
 //#endregion
 //#region lib/shared/media-segment.ts
 var MediaSegment = class MediaSegment {
@@ -811,7 +947,7 @@ var HlsExtractor = class {
 				const uri = getAttribute(line, "URI");
 				const uriLast = getAttribute(lastKeyLine, "URI");
 				if (uri !== uriLast) {
-					const parsedInfo = this.#parseKey(line);
+					const parsedInfo = await this.#parseKey(line);
 					currentEncryptInfo.method = parsedInfo.method;
 					currentEncryptInfo.key = parsedInfo.key;
 					currentEncryptInfo.iv = parsedInfo.iv;
@@ -881,7 +1017,7 @@ var HlsExtractor = class {
 		if (playlist.isLive) playlist.refreshIntervalMs = (playlist.targetDuration || 5) * 2 * 1e3;
 		return playlist;
 	}
-	#parseKey(keyLine) {
+	async #parseKey(keyLine) {
 		for (const p of this.parserConfig.keyProcessors) if (p.canProcess(this.extractorType, keyLine, this.#m3u8Url, this.#m3u8Content, this.parserConfig)) return p.process(keyLine, this.#m3u8Url, this.#m3u8Content, this.parserConfig);
 		throw new Error("No key processor found");
 	}
@@ -1016,4 +1152,4 @@ var StreamExtractor = class {
 };
 
 //#endregion
-export { ENCRYPT_METHODS, EXTRACTOR_TYPES, MEDIA_TYPES, ParserConfig, ROLE_TYPE, StreamExtractor };
+export { ContentProcessor, DefaultUrlProcessor, ENCRYPT_METHODS, EXTRACTOR_TYPES, KeyProcessor, MEDIA_TYPES, ParserConfig, ROLE_TYPE, StreamExtractor, UrlProcessor };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dasha",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-alpha.2",
   "description": "Streaming manifest parser",
   "files": [
     "dist"