dasha 4.4.4 → 4.4.6

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { AudioCodec as AudioCodec$1, DurationMetadataRequestOptions, EncodedPacket, FilePathSource, HLS, HLS_FORMATS, Input as Input$1, InputAudioTrack as InputAudioTrack$1, InputFormat, InputOptions, InputTrack as InputTrack$2, InputTrackQuery, InputTrackQuery as InputTrackQuery$1, InputVideoTrack as InputVideoTrack$1, MP3, MP4, MaybePromise, MediaCodec as MediaCodec$1, MetadataTags, PacketRetrievalOptions, PathedSource, Source, SourceRef, SubtitleCodec as SubtitleCodec$1, TrackDisposition, UrlSource, VideoCodec as VideoCodec$1, asc, desc, prefer } from "mediabunny";
+import { AudioCodec as AudioCodec$1, DurationMetadataRequestOptions, EncodedPacket, FilePathSource, HLS, HLS_FORMATS, Input as Input$1, InputAudioTrack as InputAudioTrack$1, InputFormat, InputOptions, InputTrack as InputTrack$2, InputTrackQuery, InputTrackQuery as InputTrackQuery$1, InputVideoTrack as InputVideoTrack$1, MP3, MP4, MaybePromise, MaybePromise as MaybePromise$1, MediaCodec as MediaCodec$1, MetadataTags, PacketRetrievalOptions, PathedSource, Source, SourceRef, SubtitleCodec as SubtitleCodec$1, TrackDisposition, UrlSource, VideoCodec as VideoCodec$1, asc, desc, prefer } from "mediabunny";
 
 //#region src/mediabunny.d.ts
 type Segment$1 = {
@@ -439,12 +439,18 @@ declare const DASH: DashInputFormat;
 declare const DASH_FORMATS: InputFormat[];
 //#endregion
 //#region src/hls/hls-subtitles.d.ts
-type SourceWithRootPath = {
+type ReadResult = {
+  bytes: Uint8Array;
+  view: DataView; /** The offset of the bytes in the file. */
+  offset: number;
+};
+type SourceWithRootPath = Source & {
   rootPath: string;
   _options?: {
     requestInit?: RequestInit;
   };
   _url?: string | URL | Request;
+  _read(start: number, end: number, minReadPosition: number, maxReadPosition: number): MaybePromise$1<ReadResult | null>;
 };
 type HlsSubtitleMediaTag = {
   autoselect: boolean;

package/dist/index.mjs

@@ -662,6 +662,17 @@ const loadPlaylistText = async (source, path) => {
 		path,
 		text: await readFile(new URL(path), "utf8")
 	};
+	if (path === source.rootPath && typeof source.getSize === "function" && typeof source._read === "function") {
+		const size = await source.getSize();
+		const result = await source._read(0, size, 0, Infinity);
+		if (result) {
+			const data = result.bytes.subarray(result.offset, result.offset + size);
+			return {
+				path,
+				text: new TextDecoder().decode(data)
+			};
+		}
+	}
 	return {
 		path,
 		text: await readFile(path, "utf8")
@@ -1416,6 +1427,7 @@ const BACKING_TYPE_AUDIO = "audio";
 const BACKING_TYPE_VIDEO = "video";
 const BASE_INPUT_PATCHED = Symbol.for("dasha.base-mediabunny-input-patched");
 const PRESERVE_SUBTITLE_BACKINGS = Symbol.for("dasha.preserve-subtitle-backings");
+const resolvedHlsSegmentLocations = /* @__PURE__ */ new WeakSet();
 const getDefaultAudioTrackFormats = (source) => {
 	return isLikelyDashPath(source instanceof SourceRef ? source.source : source) ? [DASH, ...ALL_FORMATS$1] : [...ALL_FORMATS$1, DASH];
 };
@@ -1579,6 +1591,22 @@ const getSegmentedInputForTrack = (track) => {
 	const internalTrack = backing.internalTrack;
 	return internalTrack.demuxer.getSegmentedInputForPath(internalTrack.fullPath);
 };
+const isHlsSegment = (segment) => !("sourcePath" in segment.location);
+const resolveHlsSegmentLocation = async (source, location) => {
+	if (resolvedHlsSegmentLocations.has(location)) return;
+	location.path = await resolvePathedSourcePath(source, {
+		path: location.path,
+		isRoot: false
+	});
+	resolvedHlsSegmentLocations.add(location);
+};
+const resolveHlsSegments = async (source, segments) => {
+	for (const segment of segments) {
+		if (!isHlsSegment(segment)) continue;
+		if (segment.initSegment) await resolveHlsSegmentLocation(source, segment.initSegment.location);
+		await resolveHlsSegmentLocation(source, segment.location);
+	}
+};
 const getTrackBacking = (track) => track._backing;
 const getTrackSource = (track) => {
 	return getTrackBacking(track).getSource?.() ?? track.input.source;
@@ -1602,11 +1630,13 @@ const addSegmentAccess = (track) => new Proxy(track, { get(target, prop) {
 	if (prop === "getSegments") return async () => {
 		const segmentedInput = getSegmentedInputForTrack(target);
 		if (segmentedInput.segments.length === 0) await segmentedInput.runUpdateSegments();
+		await resolveHlsSegments(getTrackSource(target), segmentedInput.segments);
 		return segmentedInput.segments;
 	};
 	if (prop === "refreshSegments") return async () => {
 		const segmentedInput = getSegmentedInputForTrack(target);
 		await segmentedInput.runUpdateSegments();
+		await resolveHlsSegments(getTrackSource(target), segmentedInput.segments);
 		return segmentedInput.segments;
 	};
 	const value = Reflect.get(target, prop, target);

package/package.json

@@ -1,10 +1,19 @@
 {
   "name": "dasha",
-  "version": "4.4.4",
+  "version": "4.4.6",
   "description": "Streaming manifest parser",
+  "packageManager": "pnpm@11.5.0",
   "files": [
     "dist"
   ],
+  "scripts": {
+    "test": "vitest",
+    "lint": "oxlint . && oxfmt --check .",
+    "fix": "oxlint . --fix && oxfmt --write .",
+    "typecheck": "tsc --noEmit -p tsconfig.json",
+    "build": "tsdown src/index.ts --format esm",
+    "prepublishOnly": "pnpm build"
+  },
   "type": "module",
   "main": "./dist/index.mjs",
   "types": "./dist/index.d.mts",
@@ -61,12 +70,5 @@
     "tsdown": "^0.22.1",
     "typescript": "^6.0.3",
     "vitest": "^4.1.7"
-  },
-  "scripts": {
-    "test": "vitest",
-    "lint": "oxlint . && oxfmt --check .",
-    "fix": "oxlint . --fix && oxfmt --write .",
-    "typecheck": "tsc --noEmit -p tsconfig.json",
-    "build": "tsdown src/index.ts --format esm"
   }
-}
+}