dasha 4.0.0-alpha.8 → 4.0.0-alpha.9

package/dist/dasha.cjs

@@ -217,6 +217,20 @@ const ALL_STREAM_TYPES = [
 	"audio",
 	"subtitle"
 ];
+const bitrateToString = (bitrate) => {
+	return bitrate ? `${Math.round(bitrate / 1e3)} Kbps` : "";
+};
+const roleToString = (role) => {
+	for (const [key, value] of Object.entries(ROLE_TYPE)) if (value === role) return key;
+	return "";
+};
+const durationToString = (seconds) => {
+	if (!Number.isFinite(seconds) || seconds < 0) return "";
+	const mins = Math.floor(seconds / 60);
+	const secs = Math.round(seconds % 60);
+	if (mins > 0) return `~${mins}m${secs.toString().padStart(2, "0")}s`;
+	return `~${secs}s`;
+};
 var StreamInfo = class {
 	codec;
 	languageCode;
@@ -272,17 +286,17 @@ var VideoStreamInfo = class extends StreamInfo {
 		this.codec = info?.codec;
 	}
 	toShortString() {
-		const prefix = `Vid `;
-		const bitrate = this.bitrate ? `${this.bitrate / 1e3} Kbps` : "";
-		return `${prefix} | ${[
-			this.width ? `${this.width}x${this.height}` : "",
-			bitrate,
-			this.groupId,
-			this.frameRate,
-			this.codec ?? this.codecs,
-			this.videoRange,
-			this.role
-		].filter(Boolean).join(" | ")}`.trim();
+		const parts = ["Vid"];
+		if (this.width) parts.push(`${this.width}x${this.height}`);
+		if (this.bitrate) parts.push(bitrateToString(this.bitrate));
+		if (this.groupId) parts.push(this.groupId);
+		if (this.frameRate) parts.push(this.frameRate.toString());
+		if (this.codec) parts.push(this.codec);
+		if (this.videoRange) parts.push(this.videoRange);
+		if (this.segmentsCount) parts.push(`${this.segmentsCount} segments`);
+		if (this.role) parts.push(roleToString(this.role));
+		if (this.playlist) parts.push(durationToString(this.playlist.totalDuration));
+		return parts.filter(Boolean).join(" | ").trim();
 	}
 };
 var AudioStreamInfo = class extends StreamInfo {
@@ -300,18 +314,15 @@ var AudioStreamInfo = class extends StreamInfo {
 		this.codec = info?.codec;
 	}
 	toShortString() {
-		const prefix = `Aud `;
-		const bitrate = this.bitrate ? `${this.bitrate / 1e3} Kbps` : "";
-		const channels = this.numberOfChannels || this.channels ? `${this.numberOfChannels ?? this.channels}CH` : "";
-		return `${prefix} | ${[
-			this.groupId,
-			bitrate,
-			this.name,
-			this.codec ?? this.codecs,
-			this.languageCode,
-			channels,
-			this.role
-		].filter(Boolean).join(" | ")}`.trim();
+		const parts = ["Aud"];
+		if (this.groupId) parts.push(this.groupId);
+		if (this.bitrate) parts.push(bitrateToString(this.bitrate));
+		if (this.name) parts.push(this.name);
+		if (this.codec) parts.push(this.codec);
+		if (this.languageCode) parts.push(this.languageCode);
+		if (this.numberOfChannels) parts.push(`${this.numberOfChannels}CH`);
+		if (this.role) parts.push(roleToString(this.role));
+		return parts.filter(Boolean).join(" | ").trim();
 	}
 };
 var SubtitleStreamInfo = class extends StreamInfo {
@@ -327,13 +338,14 @@ var SubtitleStreamInfo = class extends StreamInfo {
 		this.codec = info?.codec;
 	}
 	toShortString() {
-		return `Sub  | ${[
-			this.groupId,
-			this.languageCode,
-			this.name,
-			this.codecs,
-			this.role
-		].filter(Boolean).join(" | ")}`.trim();
+		const parts = ["Sub"];
+		const text = parts.filter(Boolean).join(" | ");
+		if (this.groupId) parts.push(this.groupId);
+		if (this.languageCode) parts.push(this.languageCode);
+		if (this.name) parts.push(this.name);
+		if (this.codec) parts.push(this.codec);
+		if (this.role) parts.push(roleToString(this.role));
+		return text.trim();
 	}
 };
 
@@ -360,15 +372,26 @@ var DefaultUrlProcessor = class {
 
 //#endregion
 //#region lib/dash/dash-content-processor.ts
+const namespaceMap = new Map([
+	["cenc", "urn:mpeg:cenc:2013"],
+	["mspr", "urn:microsoft:playready"],
+	["mas", "urn:marlin:mas:1-0:services:schemas:mpd"]
+]);
+const isMissingNs = (rawText, tag) => !rawText.includes(`xmlns:${tag}`) && rawText.includes(`<${tag}:`);
+function replaceFirst(source, oldValue, newValue) {
+	const index = source.indexOf(oldValue);
+	return index < 0 ? source : source.slice(0, index) + newValue + source.slice(index + oldValue.length);
+}
 var DefaultDashContentProcessor = class {
 	canProcess(extractorType, mpdContent) {
 		if (extractorType !== EXTRACTOR_TYPES.MPEG_DASH) return false;
-		return mpdContent.includes("<mas:") && !mpdContent.includes("xmlns:mas");
+		return namespaceMap.keys().some((key) => isMissingNs(mpdContent, key));
 	}
 	process(mpdContent) {
-		console.debug("Fix xigua mpd...");
-		mpdContent = mpdContent.replace("<MPD ", "<MPD xmlns:mas=\"urn:marlin:mas:1-0:services:schemas:mpd\" ");
-		return mpdContent;
+		console.debug("Namespace missing, trying to fix...");
+		const missingNamespaceKeys = Array.from(namespaceMap.keys().filter((key) => isMissingNs(mpdContent, key)));
+		if (!missingNamespaceKeys.length) return mpdContent;
+		return replaceFirst(mpdContent, "<MPD ", `<MPD ${missingNamespaceKeys.map((key) => `xmlns:${key}="${namespaceMap.get(key)}"`).join(" ")} `);
 	}
 };
 
@@ -930,6 +953,7 @@ var DashExtractor = class DashExtractor {
 							streamInfo.channels = channelsString;
 						}
 					} else if (streamInfo.type === "subtitle") {
+						streamInfo.bitrate = bitrate;
 						if (roles) streamInfo.cc = checkIsClosedCaption(roles);
 						if (accessibilities) streamInfo.sdh = checkIsSdh(accessibilities);
 					}
@@ -1465,7 +1489,7 @@ var HlsExtractor = class {
 			url = response.url;
 			this.#m3u8Content = await response.text();
 		} catch (e) {
-			if (url !== this.parserConfig.originalUrl) {
+			if (this.parserConfig.originalUrl.startsWith("http") && url !== this.parserConfig.originalUrl) {
 				const response = await fetch(this.parserConfig.originalUrl, { headers: this.parserConfig.headers });
 				url = response.url;
 				this.#m3u8Content = await response.text();

package/dist/dasha.mjs

@@ -192,6 +192,20 @@ const ALL_STREAM_TYPES = [
 	"audio",
 	"subtitle"
 ];
+const bitrateToString = (bitrate) => {
+	return bitrate ? `${Math.round(bitrate / 1e3)} Kbps` : "";
+};
+const roleToString = (role) => {
+	for (const [key, value] of Object.entries(ROLE_TYPE)) if (value === role) return key;
+	return "";
+};
+const durationToString = (seconds) => {
+	if (!Number.isFinite(seconds) || seconds < 0) return "";
+	const mins = Math.floor(seconds / 60);
+	const secs = Math.round(seconds % 60);
+	if (mins > 0) return `~${mins}m${secs.toString().padStart(2, "0")}s`;
+	return `~${secs}s`;
+};
 var StreamInfo = class {
 	codec;
 	languageCode;
@@ -247,17 +261,17 @@ var VideoStreamInfo = class extends StreamInfo {
 		this.codec = info?.codec;
 	}
 	toShortString() {
-		const prefix = `Vid `;
-		const bitrate = this.bitrate ? `${this.bitrate / 1e3} Kbps` : "";
-		return `${prefix} | ${[
-			this.width ? `${this.width}x${this.height}` : "",
-			bitrate,
-			this.groupId,
-			this.frameRate,
-			this.codec ?? this.codecs,
-			this.videoRange,
-			this.role
-		].filter(Boolean).join(" | ")}`.trim();
+		const parts = ["Vid"];
+		if (this.width) parts.push(`${this.width}x${this.height}`);
+		if (this.bitrate) parts.push(bitrateToString(this.bitrate));
+		if (this.groupId) parts.push(this.groupId);
+		if (this.frameRate) parts.push(this.frameRate.toString());
+		if (this.codec) parts.push(this.codec);
+		if (this.videoRange) parts.push(this.videoRange);
+		if (this.segmentsCount) parts.push(`${this.segmentsCount} segments`);
+		if (this.role) parts.push(roleToString(this.role));
+		if (this.playlist) parts.push(durationToString(this.playlist.totalDuration));
+		return parts.filter(Boolean).join(" | ").trim();
 	}
 };
 var AudioStreamInfo = class extends StreamInfo {
@@ -275,18 +289,15 @@ var AudioStreamInfo = class extends StreamInfo {
 		this.codec = info?.codec;
 	}
 	toShortString() {
-		const prefix = `Aud `;
-		const bitrate = this.bitrate ? `${this.bitrate / 1e3} Kbps` : "";
-		const channels = this.numberOfChannels || this.channels ? `${this.numberOfChannels ?? this.channels}CH` : "";
-		return `${prefix} | ${[
-			this.groupId,
-			bitrate,
-			this.name,
-			this.codec ?? this.codecs,
-			this.languageCode,
-			channels,
-			this.role
-		].filter(Boolean).join(" | ")}`.trim();
+		const parts = ["Aud"];
+		if (this.groupId) parts.push(this.groupId);
+		if (this.bitrate) parts.push(bitrateToString(this.bitrate));
+		if (this.name) parts.push(this.name);
+		if (this.codec) parts.push(this.codec);
+		if (this.languageCode) parts.push(this.languageCode);
+		if (this.numberOfChannels) parts.push(`${this.numberOfChannels}CH`);
+		if (this.role) parts.push(roleToString(this.role));
+		return parts.filter(Boolean).join(" | ").trim();
 	}
 };
 var SubtitleStreamInfo = class extends StreamInfo {
@@ -302,13 +313,14 @@ var SubtitleStreamInfo = class extends StreamInfo {
 		this.codec = info?.codec;
 	}
 	toShortString() {
-		return `Sub  | ${[
-			this.groupId,
-			this.languageCode,
-			this.name,
-			this.codecs,
-			this.role
-		].filter(Boolean).join(" | ")}`.trim();
+		const parts = ["Sub"];
+		const text = parts.filter(Boolean).join(" | ");
+		if (this.groupId) parts.push(this.groupId);
+		if (this.languageCode) parts.push(this.languageCode);
+		if (this.name) parts.push(this.name);
+		if (this.codec) parts.push(this.codec);
+		if (this.role) parts.push(roleToString(this.role));
+		return text.trim();
 	}
 };
 
@@ -335,15 +347,26 @@ var DefaultUrlProcessor = class {
 
 //#endregion
 //#region lib/dash/dash-content-processor.ts
+const namespaceMap = new Map([
+	["cenc", "urn:mpeg:cenc:2013"],
+	["mspr", "urn:microsoft:playready"],
+	["mas", "urn:marlin:mas:1-0:services:schemas:mpd"]
+]);
+const isMissingNs = (rawText, tag) => !rawText.includes(`xmlns:${tag}`) && rawText.includes(`<${tag}:`);
+function replaceFirst(source, oldValue, newValue) {
+	const index = source.indexOf(oldValue);
+	return index < 0 ? source : source.slice(0, index) + newValue + source.slice(index + oldValue.length);
+}
 var DefaultDashContentProcessor = class {
 	canProcess(extractorType, mpdContent) {
 		if (extractorType !== EXTRACTOR_TYPES.MPEG_DASH) return false;
-		return mpdContent.includes("<mas:") && !mpdContent.includes("xmlns:mas");
+		return namespaceMap.keys().some((key) => isMissingNs(mpdContent, key));
 	}
 	process(mpdContent) {
-		console.debug("Fix xigua mpd...");
-		mpdContent = mpdContent.replace("<MPD ", "<MPD xmlns:mas=\"urn:marlin:mas:1-0:services:schemas:mpd\" ");
-		return mpdContent;
+		console.debug("Namespace missing, trying to fix...");
+		const missingNamespaceKeys = Array.from(namespaceMap.keys().filter((key) => isMissingNs(mpdContent, key)));
+		if (!missingNamespaceKeys.length) return mpdContent;
+		return replaceFirst(mpdContent, "<MPD ", `<MPD ${missingNamespaceKeys.map((key) => `xmlns:${key}="${namespaceMap.get(key)}"`).join(" ")} `);
 	}
 };
 
@@ -905,6 +928,7 @@ var DashExtractor = class DashExtractor {
 							streamInfo.channels = channelsString;
 						}
 					} else if (streamInfo.type === "subtitle") {
+						streamInfo.bitrate = bitrate;
 						if (roles) streamInfo.cc = checkIsClosedCaption(roles);
 						if (accessibilities) streamInfo.sdh = checkIsSdh(accessibilities);
 					}
@@ -1440,7 +1464,7 @@ var HlsExtractor = class {
 			url = response.url;
 			this.#m3u8Content = await response.text();
 		} catch (e) {
-			if (url !== this.parserConfig.originalUrl) {
+			if (this.parserConfig.originalUrl.startsWith("http") && url !== this.parserConfig.originalUrl) {
 				const response = await fetch(this.parserConfig.originalUrl, { headers: this.parserConfig.headers });
 				url = response.url;
 				this.#m3u8Content = await response.text();

package/package.json

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