@remotion/media-parser 4.0.293 → 4.0.295

package/dist/esm/index.mjs

@@ -2064,7 +2064,8 @@ var toMoofBox = (box) => {
   }
   return {
     offset: box.offset,
-    trafBoxes: box.children.filter((c) => c.type === "regular-box" && c.boxType === "traf")
+    trafBoxes: box.children.filter((c) => c.type === "regular-box" && c.boxType === "traf"),
+    size: box.boxSize
   };
 };
 var deduplicateMoofBoxesByOffset = (moofBoxes) => {
@@ -2238,13 +2239,16 @@ var getTrunBoxes = (segment) => {
   const trunBoxes = segment.children.filter((c) => c.type === "trun-box");
   return trunBoxes;
 };
+var getTfraBoxesFromMfraBoxChildren = (mfraBoxChildren) => {
+  const tfraBoxes = mfraBoxChildren.filter((b) => b.type === "tfra-box");
+  return tfraBoxes;
+};
 var getTfraBoxes = (structure) => {
-  const mfraBox = structure.boxes.find((b) => b.type === "regular-box" && b.boxType === "mfra");
+  const mfraBox = structure.find((b) => b.type === "regular-box" && b.boxType === "mfra");
   if (!mfraBox) {
     return [];
   }
-  const tfraBoxes = mfraBox.children.filter((b) => b.type === "tfra-box");
-  return tfraBoxes;
+  return getTfraBoxesFromMfraBoxChildren(mfraBox.children);
 };
 
 // src/containers/riff/traversal.ts
@@ -5088,13 +5092,13 @@ var processBox = async ({
   if (boxType === "ftyp") {
     return {
       type: "box",
-      box: await parseFtyp({ iterator, size: boxSize, offset: fileOffset })
+      box: parseFtyp({ iterator, size: boxSize, offset: fileOffset })
     };
   }
   if (boxType === "colr") {
     return {
       type: "box",
-      box: await parseColorParameterBox({
+      box: parseColorParameterBox({
         iterator,
         size: boxSize
       })
@@ -5103,25 +5107,25 @@ var processBox = async ({
   if (boxType === "mvhd") {
     return {
       type: "box",
-      box: await parseMvhd({ iterator, offset: fileOffset, size: boxSize })
+      box: parseMvhd({ iterator, offset: fileOffset, size: boxSize })
     };
   }
   if (boxType === "tkhd") {
     return {
       type: "box",
-      box: await parseTkhd({ iterator, offset: fileOffset, size: boxSize })
+      box: parseTkhd({ iterator, offset: fileOffset, size: boxSize })
     };
   }
   if (boxType === "trun") {
     return {
       type: "box",
-      box: await parseTrun({ iterator, offset: fileOffset, size: boxSize })
+      box: parseTrun({ iterator, offset: fileOffset, size: boxSize })
     };
   }
   if (boxType === "tfdt") {
     return {
       type: "box",
-      box: await parseTfdt({ iterator, size: boxSize, offset: fileOffset })
+      box: parseTfdt({ iterator, size: boxSize, offset: fileOffset })
     };
   }
   if (boxType === "stsd") {
@@ -5370,7 +5374,7 @@ var processBox = async ({
     };
   }
   if (boxType === "moof") {
-    onlyIfMoovAtomExpected?.isoState?.mfra.triggerLoad();
+    await onlyIfMoovAtomExpected?.isoState?.mfra.triggerLoad();
   }
   if (boxType === "mdia" || boxType === "minf" || boxType === "stbl" || boxType === "udta" || boxType === "moof" || boxType === "dims" || boxType === "meta" || boxType === "wave" || boxType === "traf" || boxType === "mfra" || boxType === "stsb") {
     const children = await getIsoBaseMediaChildren({
@@ -6776,6 +6780,17 @@ var getDurationFromFlac = (parserState) => {
   return streaminfo.totalSamples / streaminfo.sampleRate;
 };
 
+// src/containers/iso-base-media/are-samples-complete.ts
+var areSamplesComplete = ({
+  moofBoxes,
+  tfraBoxes
+}) => {
+  if (moofBoxes.length === 0) {
+    return true;
+  }
+  return tfraBoxes.length > 0 && tfraBoxes.every((t) => t.entries.length === moofBoxes.length);
+};
+
 // src/samples-from-moof.ts
 var getSamplesFromTraf = (trafSegment, moofOffset) => {
   if (trafSegment.type !== "regular-box" || trafSegment.boxType !== "traf") {
@@ -6849,10 +6864,9 @@ var getSamplesFromMoof = ({
 // src/containers/iso-base-media/collect-sample-positions-from-moof-boxes.ts
 var collectSamplePositionsFromMoofBoxes = ({
   moofBoxes,
-  tfraBoxes,
-  tkhdBox
+  tkhdBox,
+  isComplete
 }) => {
-  const isComplete = tfraBoxes.length > 0 && tfraBoxes.every((t) => t.entries.length === moofBoxes.length);
   const samplePositions = moofBoxes.map((m, index) => {
     const isLastFragment = index === moofBoxes.length - 1 && isComplete;
     return {
@@ -7032,21 +7046,21 @@ var collectSamplePositionsFromTrak = (trakBox) => {
 var getSamplePositionsFromTrack = ({
   trakBox,
   moofBoxes,
-  tfraBoxes
+  moofComplete
 }) => {
   const tkhdBox = getTkhdBox(trakBox);
   if (!tkhdBox) {
     throw new Error("Expected tkhd box in trak box");
   }
   if (moofBoxes.length > 0) {
-    const { isComplete, samplePositions } = collectSamplePositionsFromMoofBoxes({
+    const { samplePositions } = collectSamplePositionsFromMoofBoxes({
       moofBoxes,
-      tfraBoxes,
-      tkhdBox
+      tkhdBox,
+      isComplete: moofComplete
     });
     return {
       samplePositions: samplePositions.map((s) => s.samples).flat(1),
-      isComplete
+      isComplete: moofComplete
     };
   }
   return {
@@ -7249,6 +7263,20 @@ var getDurationFromWav = (state) => {
   return durationInSeconds;
 };
 
+// src/state/iso-base-media/precomputed-tfra.ts
+var precomputedTfraState = () => {
+  let tfraBoxes = [];
+  return {
+    getTfraBoxes: () => tfraBoxes,
+    setTfraBoxes: (boxes) => {
+      tfraBoxes = boxes;
+    }
+  };
+};
+var deduplicateTfraBoxesByOffset = (tfraBoxes) => {
+  return tfraBoxes.filter((m, i, arr) => i === arr.findIndex((t) => t.offset === m.offset));
+};
+
 // src/get-duration.ts
 var getDurationFromMatroska = (segments) => {
   const mainSegment = segments.find((s) => s.type === "Segment");
@@ -7286,7 +7314,14 @@ var getDurationFromIsoBaseMedia = (parserState) => {
     return null;
   }
   const moofBoxes = getMoofBoxes(structure.boxes);
-  const tfraBoxes = getTfraBoxes(structure);
+  const mfra = parserState.iso.mfra.getIfAlreadyLoaded();
+  const tfraBoxes = deduplicateTfraBoxesByOffset([
+    ...mfra ? getTfraBoxesFromMfraBoxChildren(mfra) : [],
+    ...getTfraBoxes(structure.boxes)
+  ]);
+  if (!areSamplesComplete({ moofBoxes, tfraBoxes })) {
+    return null;
+  }
   const mvhdBox = getMvhdBox(moovBox);
   if (!mvhdBox) {
     return null;
@@ -7308,7 +7343,7 @@ var getDurationFromIsoBaseMedia = (parserState) => {
     const { samplePositions, isComplete } = getSamplePositionsFromTrack({
       trakBox: t.trakBox,
       moofBoxes,
-      tfraBoxes
+      moofComplete: areSamplesComplete({ moofBoxes, tfraBoxes })
     });
     if (!isComplete) {
       return null;
@@ -7365,7 +7400,10 @@ var hasDuration = (parserState) => {
 };
 var hasSlowDuration = (parserState) => {
   try {
-    return hasDuration(parserState) && getDuration(parserState) !== null;
+    if (!hasDuration(parserState)) {
+      return false;
+    }
+    return getDuration(parserState) !== null;
   } catch {
     return false;
   }
@@ -7393,13 +7431,16 @@ var getKeyframesFromIsoBaseMedia = (state) => {
   });
   const structure = state.structure.getIsoStructure();
   const moofBoxes = getMoofBoxes(structure.boxes);
-  const tfraBoxes = getTfraBoxes(structure);
+  const tfraBoxes = getTfraBoxes(structure.boxes);
   const allSamples = videoTracks.map((t) => {
     const { timescale: ts } = t;
     const { samplePositions, isComplete } = getSamplePositionsFromTrack({
       trakBox: t.trakBox,
       moofBoxes,
-      tfraBoxes
+      moofComplete: areSamplesComplete({
+        moofBoxes,
+        tfraBoxes
+      })
     });
     if (!isComplete) {
       return [];
@@ -7852,7 +7893,10 @@ var findAnyTrackWithSamplePositions = (allTracks, struc) => {
       const { samplePositions } = getSamplePositionsFromTrack({
         trakBox: track.trakBox,
         moofBoxes: getMoofBoxes(struc.boxes),
-        tfraBoxes: getTfraBoxes(struc)
+        moofComplete: areSamplesComplete({
+          moofBoxes: getMoofBoxes(struc.boxes),
+          tfraBoxes: getTfraBoxes(struc.boxes)
+        })
       });
       if (samplePositions.length === 0) {
         continue;
@@ -7871,7 +7915,10 @@ var findTrackToSeek = (allTracks, structure) => {
   const { samplePositions } = getSamplePositionsFromTrack({
     trakBox: firstVideoTrack.trakBox,
     moofBoxes: getMoofBoxes(struc.boxes),
-    tfraBoxes: getTfraBoxes(struc)
+    moofComplete: areSamplesComplete({
+      moofBoxes: getMoofBoxes(struc.boxes),
+      tfraBoxes: getTfraBoxes(struc.boxes)
+    })
   });
   if (samplePositions.length === 0) {
     return findAnyTrackWithSamplePositions(allTracks, struc);
@@ -8011,10 +8058,14 @@ var getSeekingByteFromFragmentedMp4 = async ({
   if (!tkhdBox) {
     throw new Error("Expected tkhd box in trak box");
   }
+  const isComplete = areSamplesComplete({
+    moofBoxes: info.moofBoxes,
+    tfraBoxes: info.tfraBoxes
+  });
   const { samplePositions: samplePositionsArray } = collectSamplePositionsFromMoofBoxes({
     moofBoxes: info.moofBoxes,
-    tfraBoxes: info.tfraBoxes,
-    tkhdBox
+    tkhdBox,
+    isComplete
   });
   Log.trace(logLevel, "Fragmented MP4 - Checking if we have seeking info for this time range");
   for (const positions of samplePositionsArray) {
@@ -8938,20 +8989,6 @@ var setSeekingHintsForFlac = ({
   state.flac.audioSamples.setFromSeekingHints(hints.audioSampleMap);
 };
 
-// src/state/iso-base-media/precomputed-tfra.ts
-var precomputedTfraState = () => {
-  let tfraBoxes = [];
-  return {
-    getTfraBoxes: () => tfraBoxes,
-    setTfraBoxes: (boxes) => {
-      tfraBoxes = boxes;
-    }
-  };
-};
-var deduplicateTfraBoxesByOffset = (tfraBoxes) => {
-  return tfraBoxes.filter((m, i, arr) => i === arr.findIndex((t) => t.offset === m.offset));
-};
-
 // src/containers/iso-base-media/seeking-hints.ts
 var getSeekingHintsFromMp4 = ({
   structureState,
@@ -8972,7 +9009,7 @@ var getSeekingHintsFromMp4 = ({
   ]);
   const tfraBoxes = deduplicateTfraBoxesByOffset([
     ...isoState.tfra.getTfraBoxes(),
-    ...getTfraBoxes(structure)
+    ...getTfraBoxes(structure.boxes)
   ]);
   if (!moovAtom) {
     return null;
@@ -9231,6 +9268,7 @@ var seekBackwards = async ({
   }
   const time = Date.now();
   Log.verbose(logLevel, `Seeking in video from position ${iterator.counter.getOffset()} -> ${seekTo}. Re-reading because this portion is not available.`);
+  await currentReader.getCurrent().abort();
   const { reader: newReader } = await readerInterface.read({
     src,
     range: seekTo,
@@ -9325,6 +9363,7 @@ var seekForward = async ({
   }
   const time = Date.now();
   Log.verbose(logLevel, `Skipping over video data from position ${iterator.counter.getOffset()} -> ${seekTo}. Re-reading because this portion is not available`);
+  await currentReader.getCurrent().abort();
   const { reader: newReader } = await readerInterface.read({
     src,
     range: seekTo,
@@ -9705,7 +9744,7 @@ var emitAvailableInfo = async ({
     }
     if (key === "slowFps") {
       if (hasInfo.slowFps && !emittedFields.slowFps) {
-        const slowFps = state.samplesObserved.getFps();
+        const slowFps = getFps(state) ?? state.samplesObserved.getFps();
         await callbackFunctions.onSlowFps?.(slowFps);
         if (fieldsInReturnValue.slowFps) {
           returnValue.slowFps = slowFps;
@@ -10001,7 +10040,8 @@ var getAvailableInfo = ({
       return Boolean(structure && hasDuration(state));
     }
     if (key === "slowDurationInSeconds") {
-      return Boolean(structure && hasSlowDuration(state));
+      const res = Boolean(structure && hasSlowDuration(state));
+      return res;
     }
     if (key === "dimensions" || key === "rotation" || key === "unrotatedDimensions") {
       return Boolean(structure && hasDimensions(state));
@@ -10669,18 +10709,31 @@ var parseFlac = ({
 };
 
 // src/state/iso-base-media/cached-sample-positions.ts
-var calculateFlatSamples = (state) => {
+var calculateFlatSamples = ({
+  state,
+  mediaSectionStart
+}) => {
   const tracks2 = getTracks(state, true);
   const allTracks = [
     ...tracks2.videoTracks,
     ...tracks2.audioTracks,
     ...tracks2.otherTracks
   ];
+  const moofBoxes = getMoofBoxes(state.structure.getIsoStructure().boxes);
+  const tfraBoxes = deduplicateTfraBoxesByOffset([
+    ...state.iso.tfra.getTfraBoxes(),
+    ...getTfraBoxes(state.structure.getIsoStructure().boxes)
+  ]);
+  const moofComplete = areSamplesComplete({ moofBoxes, tfraBoxes });
+  const relevantMoofBox = moofBoxes.find((moofBox) => moofBox.offset + moofBox.size + 8 === mediaSectionStart);
+  if (moofBoxes.length > 0 && !relevantMoofBox) {
+    throw new Error("No relevant moof box found");
+  }
   const flatSamples = allTracks.map((track) => {
     const { samplePositions } = getSamplePositionsFromTrack({
       trakBox: track.trakBox,
-      moofBoxes: getMoofBoxes(state.structure.getIsoStructure().boxes),
-      tfraBoxes: getTfraBoxes(state.structure.getIsoStructure())
+      moofBoxes: relevantMoofBox ? [relevantMoofBox] : [],
+      moofComplete
     });
     return samplePositions.map((samplePosition) => {
       return {
@@ -10696,10 +10749,7 @@ var cachedSamplePositionsState = () => {
   const jumpMarksForMdatStart = {};
   return {
     getSamples: (mdatStart) => {
-      if (cachedForMdatStart[mdatStart]) {
-        return cachedForMdatStart[mdatStart];
-      }
-      return null;
+      return cachedForMdatStart[mdatStart] ?? null;
     },
     setSamples: (mdatStart, samples) => {
       cachedForMdatStart[mdatStart] = samples;
@@ -10713,6 +10763,24 @@ var cachedSamplePositionsState = () => {
   };
 };
 
+// src/state/iso-base-media/last-moof-box.ts
+var getLastMoofBox = (boxes) => {
+  if (boxes) {
+    const tfras = boxes.filter((b) => b.type === "tfra-box");
+    const lastMoofOffsets = tfras.map((f) => {
+      if (f.entries.length <= 1) {
+        return null;
+      }
+      return f.entries[f.entries.length - 1].moofOffset;
+    });
+    if (lastMoofOffsets.length > 0) {
+      const maxOffset = Math.max(...lastMoofOffsets.filter(truthy));
+      return maxOffset;
+    }
+    return null;
+  }
+};
+
 // src/state/can-skip-tracks.ts
 var needsTracksForField = ({
   field,
@@ -11109,6 +11177,14 @@ var parseMdatSection = async (state) => {
   }
   const endOfMdat = mediaSection.size + mediaSection.start;
   if (maySkipVideoData({ state })) {
+    const mfra = state.iso.mfra.getIfAlreadyLoaded();
+    if (mfra) {
+      const lastMoof = getLastMoofBox(mfra);
+      if (lastMoof && lastMoof > endOfMdat) {
+        Log.verbose(state.logLevel, "Skipping to last moof", lastMoof, "end of mdat", endOfMdat);
+        return makeSkip(lastMoof);
+      }
+    }
     return makeSkip(endOfMdat);
   }
   const alreadyHasMoov = getHasTracks(state, true);
@@ -11126,7 +11202,10 @@ var parseMdatSection = async (state) => {
     return parseMdatSection(state);
   }
   if (!state.iso.flatSamples.getSamples(mediaSection.start)) {
-    const flattedSamples = calculateFlatSamples(state);
+    const flattedSamples = calculateFlatSamples({
+      state,
+      mediaSectionStart: mediaSection.start
+    });
     const calcedJumpMarks = calculateJumpMarks(flattedSamples, endOfMdat);
     state.iso.flatSamples.setJumpMarks(mediaSection.start, calcedJumpMarks);
     state.iso.flatSamples.setSamples(mediaSection.start, flattedSamples.flat(1));
@@ -11143,9 +11222,11 @@ var parseMdatSection = async (state) => {
       iterator.discard(nextSample_.samplePosition.offset - iterator.counter.getOffset());
       return null;
     }
+    Log.verbose(state.logLevel, "Could not find sample at offset", iterator.counter.getOffset(), "skipping to end of mdat");
     return makeSkip(endOfMdat);
   }
   if (samplesWithIndex.samplePosition.offset + samplesWithIndex.samplePosition.size > state.contentLength) {
+    Log.verbose(state.logLevel, "Sample is beyond the end of the file. Don't process it.", samplesWithIndex.samplePosition.offset + samplesWithIndex.samplePosition.size, endOfMdat);
     return makeSkip(endOfMdat);
   }
   if (iterator.bytesRemaining() < samplesWithIndex.samplePosition.size) {
@@ -11199,6 +11280,7 @@ var parseMdatSection = async (state) => {
   }
   const jump = jumpMarks.find((j) => j.afterSampleWithOffset === offset);
   if (jump) {
+    Log.verbose(state.logLevel, "Found jump mark", jump.jumpToOffset, "skipping to jump mark");
     return makeSkip(jump.jumpToOffset);
   }
   return null;
@@ -11650,8 +11732,9 @@ var getLengthAndReader = async ({
       contentLength: encoded.byteLength,
       reader: {
         reader: stream.getReader(),
-        abort() {
+        abort: () => {
           ownController.abort();
+          return Promise.resolve();
         }
       },
       needsContentRange: false
@@ -11666,6 +11749,7 @@ var getLengthAndReader = async ({
       reader,
       abort: () => {
         ownController.abort();
+        return Promise.resolve();
       }
     },
     contentLength,
@@ -11886,42 +11970,29 @@ var webFileReadContent = ({ src, range: range2, controller }) => {
   if (typeof src === "string" || src instanceof URL) {
     throw new Error("`inputTypeFileReader` only supports `File` objects");
   }
-  const part = range2 === null ? src : typeof range2 === "number" ? src.slice(range2) : src.slice(range2[0], range2[1]);
-  const reader = new FileReader;
-  reader.readAsArrayBuffer(src);
-  const ownController = new AbortController;
-  if (ownController) {
-    ownController.signal.addEventListener("abort", () => {
-      reader.abort();
-    }, { once: true });
-  }
+  const part = range2 === null ? src : typeof range2 === "number" ? src.slice(range2) : src.slice(range2[0], range2[1] + 1);
+  const stream = part.stream();
+  const streamReader = stream.getReader();
   if (controller) {
     controller._internals.signal.addEventListener("abort", () => {
-      ownController.abort();
+      streamReader.cancel();
     }, { once: true });
   }
-  return new Promise((resolve, reject) => {
-    reader.onload = () => {
-      const stream = part.stream();
-      const streamReader = stream.getReader();
-      resolve({
-        reader: {
-          reader: streamReader,
-          abort() {
-            streamReader.cancel();
-            ownController.abort();
-          }
-        },
-        contentLength: src.size,
-        name: src instanceof File ? src.name : src.toString(),
-        supportsContentRange: true,
-        contentType: src.type,
-        needsContentRange: true
-      });
-    };
-    reader.onerror = () => {
-      reject(reader.error);
-    };
+  return Promise.resolve({
+    reader: {
+      reader: streamReader,
+      async abort() {
+        try {
+          await streamReader.cancel();
+        } catch {}
+        return Promise.resolve();
+      }
+    },
+    contentLength: src.size,
+    name: src instanceof File ? src.name : src.toString(),
+    supportsContentRange: true,
+    contentType: src.type,
+    needsContentRange: true
   });
 };
 var webFileReadWholeAsText = () => {
@@ -16572,6 +16643,7 @@ var makeParserState = ({
     fields: fieldsInReturnValue,
     callbacks
   });
+  const mediaSection = mediaSectionState();
   return {
     riff: riffSpecificState({
       controller,
@@ -16629,7 +16701,7 @@ var makeParserState = ({
     samplesObserved,
     contentLength,
     images,
-    mediaSection: mediaSectionState(),
+    mediaSection,
     logLevel,
     iterator,
     controller,
@@ -16905,7 +16977,7 @@ var downloadAndParseMedia = async (options) => {
   return returnValue;
 };
 // src/version.ts
-var VERSION = "4.0.293";
+var VERSION = "4.0.295";
 
 // src/index.ts
 var MediaParserInternals = {

package/dist/esm/node.mjs

@@ -8,8 +8,7 @@ var nodeReadContent = ({ src, range, controller }) => {
   const ownController = new AbortController;
   const stream = createReadStream(src, {
     start: range === null ? 0 : typeof range === "number" ? range : range[0],
-    end: range === null ? Infinity : typeof range === "number" ? Infinity : range[1],
-    signal: ownController.signal
+    end: range === null ? Infinity : typeof range === "number" ? Infinity : range[1]
   });
   controller._internals.signal.addEventListener("abort", () => {
     ownController.abort();
@@ -44,8 +43,12 @@ var nodeReadContent = ({ src, range, controller }) => {
   return Promise.resolve({
     reader: {
       reader,
-      abort: () => {
-        ownController.abort();
+      abort: async () => {
+        try {
+          stream.destroy();
+          ownController.abort();
+          await reader.cancel();
+        } catch {}
       }
     },
     contentLength: stats.size,

package/dist/esm/universal.mjs

@@ -75,8 +75,9 @@ var getLengthAndReader = async ({
       contentLength: encoded.byteLength,
       reader: {
         reader: stream.getReader(),
-        abort() {
+        abort: () => {
           ownController.abort();
+          return Promise.resolve();
         }
       },
       needsContentRange: false
@@ -91,6 +92,7 @@ var getLengthAndReader = async ({
       reader,
       abort: () => {
         ownController.abort();
+        return Promise.resolve();
       }
     },
     contentLength,
@@ -316,8 +318,7 @@ var nodeReadContent = ({ src, range, controller }) => {
   const ownController = new AbortController;
   const stream = createReadStream(src, {
     start: range === null ? 0 : typeof range === "number" ? range : range[0],
-    end: range === null ? Infinity : typeof range === "number" ? Infinity : range[1],
-    signal: ownController.signal
+    end: range === null ? Infinity : typeof range === "number" ? Infinity : range[1]
   });
   controller._internals.signal.addEventListener("abort", () => {
     ownController.abort();
@@ -352,8 +353,12 @@ var nodeReadContent = ({ src, range, controller }) => {
   return Promise.resolve({
     reader: {
       reader,
-      abort: () => {
-        ownController.abort();
+      abort: async () => {
+        try {
+          stream.destroy();
+          ownController.abort();
+          await reader.cancel();
+        } catch {}
       }
     },
     contentLength: stats.size,
@@ -386,42 +391,29 @@ var webFileReadContent = ({ src, range, controller }) => {
   if (typeof src === "string" || src instanceof URL) {
     throw new Error("`inputTypeFileReader` only supports `File` objects");
   }
-  const part = range === null ? src : typeof range === "number" ? src.slice(range) : src.slice(range[0], range[1]);
-  const reader = new FileReader;
-  reader.readAsArrayBuffer(src);
-  const ownController = new AbortController;
-  if (ownController) {
-    ownController.signal.addEventListener("abort", () => {
-      reader.abort();
-    }, { once: true });
-  }
+  const part = range === null ? src : typeof range === "number" ? src.slice(range) : src.slice(range[0], range[1] + 1);
+  const stream = part.stream();
+  const streamReader = stream.getReader();
   if (controller) {
     controller._internals.signal.addEventListener("abort", () => {
-      ownController.abort();
+      streamReader.cancel();
     }, { once: true });
   }
-  return new Promise((resolve, reject) => {
-    reader.onload = () => {
-      const stream = part.stream();
-      const streamReader = stream.getReader();
-      resolve({
-        reader: {
-          reader: streamReader,
-          abort() {
-            streamReader.cancel();
-            ownController.abort();
-          }
-        },
-        contentLength: src.size,
-        name: src instanceof File ? src.name : src.toString(),
-        supportsContentRange: true,
-        contentType: src.type,
-        needsContentRange: true
-      });
-    };
-    reader.onerror = () => {
-      reject(reader.error);
-    };
+  return Promise.resolve({
+    reader: {
+      reader: streamReader,
+      async abort() {
+        try {
+          await streamReader.cancel();
+        } catch {}
+        return Promise.resolve();
+      }
+    },
+    contentLength: src.size,
+    name: src instanceof File ? src.name : src.toString(),
+    supportsContentRange: true,
+    contentType: src.type,
+    needsContentRange: true
   });
 };
 var webFileReadWholeAsText = () => {