dasha 4.0.0-alpha.10 → 4.0.0-alpha.12

package/dist/dasha.cjs

@@ -25,6 +25,8 @@ let node_crypto = require("node:crypto");
 node_crypto = __toESM(node_crypto);
 let node_fs = require("node:fs");
 let barsic = require("barsic");
+let ky = require("ky");
+ky = __toESM(ky);
 let node_fs_promises = require("node:fs/promises");
 let node_url = require("node:url");
 let node_path = require("node:path");
@@ -505,7 +507,7 @@ var DefaultHlsKeyProcessor = class {
 	async fetchKeyWithRetry(url, parserConfig) {
 		let retryCount = parserConfig.keyRetryCount ?? 3;
 		while (retryCount >= 0) try {
-			const response = await fetch(url, { headers: parserConfig.headers });
+			const response = await (0, ky.default)(url, { headers: parserConfig.headers });
 			return new Uint8Array(await response.arrayBuffer());
 		} catch (error) {
 			if (error.message.includes("scheme is not supported")) throw error;
@@ -1155,7 +1157,7 @@ var DashExtractor = class DashExtractor {
 							const schemeIdUri = contentProtection.getAttribute("schemeIdUri");
 							const drmData = {
 								keyId: contentProtection.getAttribute("cenc:default_KID") || void 0,
-								pssh: contentProtection.getElementsByTagName("cenc:pssh")[0]?.textContent || void 0
+								pssh: (contentProtection.getElementsByTagName("cenc:pssh")[0]?.textContent || void 0)?.trim()
 							};
 							if (schemeIdUri?.includes(widevineSystemId)) encryptInfo.drm.widevine = drmData;
 							else if (schemeIdUri?.includes(playreadySystemId)) encryptInfo.drm.playready = drmData;
@@ -1163,7 +1165,7 @@ var DashExtractor = class DashExtractor {
 						}
 						if (streamInfo.playlist.mediaInit) streamInfo.playlist.mediaInit.encryptInfo = encryptInfo;
 						const segments = streamInfo.playlist.mediaParts[0].mediaSegments;
-						for (const segment of segments) if (!segment.encryptInfo) segment.encryptInfo = encryptInfo;
+						for (const segment of segments) if (!segment.encryptInfo || segment.encryptInfo.method === "unknown") segment.encryptInfo = encryptInfo;
 					}
 					const _index = streamInfos.findIndex((item) => item.type === streamInfo.type && item.periodId !== streamInfo.periodId && item.groupId === streamInfo.groupId && (item.type === "video" && streamInfo.type === "video" ? item.width === streamInfo.width && item.height === streamInfo.height : true));
 					if (_index > -1) if (isLive) {} else if (streamInfos[_index].playlist.mediaParts.at(-1).mediaSegments.at(-1).url !== streamInfo.playlist.mediaParts[0].mediaSegments.at(-1)?.url) {
@@ -1201,7 +1203,7 @@ var DashExtractor = class DashExtractor {
 	}
 	async refreshPlayList(streamInfos) {
 		if (!streamInfos.length) return;
-		const response = await fetch(this.#parserConfig.url, this.#parserConfig.headers).catch(() => fetch(this.#parserConfig.originalUrl, this.#parserConfig.headers));
+		const response = await (0, ky.default)(this.#parserConfig.url, this.#parserConfig.headers).catch(() => (0, ky.default)(this.#parserConfig.originalUrl, this.#parserConfig.headers));
 		const rawText = await response.text();
 		const url = response.url;
 		this.#parserConfig.url = url;
@@ -1491,12 +1493,12 @@ var HlsExtractor = class {
 			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 });
+			const response = await (0, ky.default)(url, { headers: this.parserConfig.headers });
 			url = response.url;
 			this.#m3u8Content = await response.text();
 		} catch (e) {
 			if (this.parserConfig.originalUrl.startsWith("http") && url !== this.parserConfig.originalUrl) {
-				const response = await fetch(this.parserConfig.originalUrl, { headers: this.parserConfig.headers });
+				const response = await (0, ky.default)(this.parserConfig.originalUrl, { headers: this.parserConfig.headers });
 				url = response.url;
 				this.#m3u8Content = await response.text();
 			}
@@ -1563,7 +1565,7 @@ var StreamExtractor = class {
 			this.#setUrl(url);
 		} else if (url.startsWith("http")) {
 			this.#parserConfig.originalUrl = url;
-			const response = await fetch(url, { headers: this.#parserConfig.headers });
+			const response = await (0, ky.default)(url, { headers: this.#parserConfig.headers });
 			this.#rawText = await response.text();
 			this.#parserConfig.url = response.url;
 		} else if ((0, node_fs.existsSync)(url)) {

package/dist/dasha.mjs

@@ -1,6 +1,7 @@
 import crypto from "node:crypto";
 import { existsSync, readFileSync } from "node:fs";
 import { b } from "barsic";
+import fetch from "ky";
 import { readFile } from "node:fs/promises";
 import { pathToFileURL } from "node:url";
 import path from "node:path";
@@ -1130,7 +1131,7 @@ var DashExtractor = class DashExtractor {
 							const schemeIdUri = contentProtection.getAttribute("schemeIdUri");
 							const drmData = {
 								keyId: contentProtection.getAttribute("cenc:default_KID") || void 0,
-								pssh: contentProtection.getElementsByTagName("cenc:pssh")[0]?.textContent || void 0
+								pssh: (contentProtection.getElementsByTagName("cenc:pssh")[0]?.textContent || void 0)?.trim()
 							};
 							if (schemeIdUri?.includes(widevineSystemId)) encryptInfo.drm.widevine = drmData;
 							else if (schemeIdUri?.includes(playreadySystemId)) encryptInfo.drm.playready = drmData;
@@ -1138,7 +1139,7 @@ var DashExtractor = class DashExtractor {
 						}
 						if (streamInfo.playlist.mediaInit) streamInfo.playlist.mediaInit.encryptInfo = encryptInfo;
 						const segments = streamInfo.playlist.mediaParts[0].mediaSegments;
-						for (const segment of segments) if (!segment.encryptInfo) segment.encryptInfo = encryptInfo;
+						for (const segment of segments) if (!segment.encryptInfo || segment.encryptInfo.method === "unknown") segment.encryptInfo = encryptInfo;
 					}
 					const _index = streamInfos.findIndex((item) => item.type === streamInfo.type && item.periodId !== streamInfo.periodId && item.groupId === streamInfo.groupId && (item.type === "video" && streamInfo.type === "video" ? item.width === streamInfo.width && item.height === streamInfo.height : true));
 					if (_index > -1) if (isLive) {} else if (streamInfos[_index].playlist.mediaParts.at(-1).mediaSegments.at(-1).url !== streamInfo.playlist.mediaParts[0].mediaSegments.at(-1)?.url) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dasha",
-  "version": "4.0.0-alpha.10",
+  "version": "4.0.0-alpha.12",
   "description": "Streaming manifest parser",
   "files": [
     "dist"
@@ -58,12 +58,13 @@
     }
   ],
   "engines": {
-    "node": ">=20"
+    "node": ">=22.16"
   },
   "dependencies": {
     "@xmldom/xmldom": "^0.9.8",
     "barsic": "^0.2.0",
-    "temporal-polyfill": "^0.3.0"
+    "ky": "^1.14.3",
+    "temporal-polyfill": "^0.3.2"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.1",
@@ -76,6 +77,6 @@
     "tsdown": "^0.16.1",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.46.3",
-    "vitest": "^4.0.8"
+    "vitest": "^4.1.0"
   }
 }