Fix QuotaExceededError regression caused by change in Chrome 138 (#7368)

robwalch · web-flow · commit 0e842b13ed53 · 2025-07-02T13:33:33.000-07:00
* Improve quota exceeded error handling (In response to #7362 (comment)) * Identify QuotaExceededError(s) with `quota` property (Fixes #7367 whatwg/webidl#1465) * Allow content-steering to penalize pathways on buffer append error without interfering with append retries when there is no alternate
diff --git a/src/controller/audio-stream-controller.ts b/src/controller/audio-stream-controller.ts
@@ -810,7 +810,9 @@ class AudioStreamController
         if (data.parent !== 'audio') {
           return;
         }
-        this.resetLoadingState();
+        if (!this.reduceLengthAndFlushBuffer(data)) {
+          this.resetLoadingState();
+        }
         break;
       case ErrorDetails.BUFFER_FULL_ERROR:
         if (data.parent !== 'audio') {
diff --git a/src/controller/buffer-controller.ts b/src/controller/buffer-controller.ts
@@ -785,7 +785,7 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
     }
 
     // Block audio append until overlapping video append
-    const videoTrack = this.tracks.video;
+    const videoTrack = tracks.video;
     const videoSb = videoTrack?.buffer;
     if (videoSb && sn !== 'initSegment') {
       const partOrFrag = part || (frag as MediaFragment);
@@ -828,15 +828,12 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
       execute: () => {
         chunkStats.executeStart = self.performance.now();
 
-        const track = this.tracks[type];
-        if (track) {
-          const sb = track.buffer;
-          if (sb) {
-            if (checkTimestampOffset) {
-              this.updateTimestampOffset(sb, fragStart, 0.1, type, sn, cc);
-            } else if (offset !== undefined && Number.isFinite(offset)) {
-              this.updateTimestampOffset(sb, offset, 0.000001, type, sn, cc);
-            }
+        const sb = this.tracks[type]?.buffer;
+        if (sb) {
+          if (checkTimestampOffset) {
+            this.updateTimestampOffset(sb, fragStart, 0.1, type, sn, cc);
+          } else if (offset !== undefined && Number.isFinite(offset)) {
+            this.updateTimestampOffset(sb, offset, 0.000001, type, sn, cc);
           }
         }
         this.appendExecutor(data, type);
@@ -892,7 +889,11 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
           fatal: false,
         };
         const mediaError = this.media?.error;
-        if ((error as DOMException).code === DOMException.QUOTA_EXCEEDED_ERR) {
+        if (
+          (error as DOMException).code === DOMException.QUOTA_EXCEEDED_ERR ||
+          error.name == 'QuotaExceededError' ||
+          `quota` in error
+        ) {
           // QuotaExceededError: https://www.w3.org/TR/html5/infrastructure.html#quotaexceedederror
           // let's stop appending any segments, and report BUFFER_FULL_ERROR error
           event.details = ErrorDetails.BUFFER_FULL_ERROR;
diff --git a/src/controller/content-steering-controller.ts b/src/controller/content-steering-controller.ts
@@ -1,4 +1,5 @@
 import { ErrorActionFlags, NetworkErrorAction } from './error-controller';
+import { ErrorDetails } from '../errors';
 import { Events } from '../events';
 import { Level } from '../types/level';
 import {
@@ -216,7 +217,11 @@ export default class ContentSteeringController
         this.updatePathwayPriority(pathwayPriority);
         errorAction.resolved = this.pathwayId !== errorPathway;
       }
-      if (!errorAction.resolved) {
+      if (data.details === ErrorDetails.BUFFER_APPEND_ERROR && !data.fatal) {
+        // Error will become fatal in buffer-controller when reaching `appendErrorMaxRetry`
+        // Stream-controllers are expected to reduce buffer length even if this is not deemed a QuotaExceededError
+        errorAction.resolved = true;
+      } else if (!errorAction.resolved) {
         this.warn(
           `Could not resolve ${data.details} ("${
             data.error.message
diff --git a/src/controller/stream-controller.ts b/src/controller/stream-controller.ts
@@ -1053,7 +1053,9 @@ export default class StreamController
         if (data.parent !== 'main') {
           return;
         }
-        this.resetLoadingState();
+        if (this.reduceLengthAndFlushBuffer(data)) {
+          this.resetLoadingState();
+        }
         break;
       case ErrorDetails.BUFFER_FULL_ERROR:
         if (data.parent !== 'main') {
