Fix part timeout handling

Cleanup frag stats handoff
video-dev · Feb 22, 2023 · 05b7fe7 · 05b7fe7
1 parent aae2d6c
commit 05b7fe7
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/src/controller/base-stream-controller.ts b/src/controller/base-stream-controller.ts
@@ -826,8 +826,7 @@ export default class BaseStreamController
       return null;
     }
     if (fragCurrent && fragCurrent !== frag) {
-      logger.warn(`Expected current context to match fragCurrent`);
-      return { frag: fragCurrent, part, level };
+      frag.stats = fragCurrent.stats;
     }
     return { frag, part, level };
   }

diff --git a/src/loader/fragment-loader.ts b/src/loader/fragment-loader.ts
@@ -5,6 +5,7 @@ import {
   LoaderConfiguration,
   FragmentLoaderContext,
 } from '../types/loader';
+import { getLoaderConfigWithoutReties } from '../utils/error-helper';
 import type { HlsConfig } from '../config';
 import type { BaseSegment, Part } from './fragment';
 import type {
@@ -74,10 +75,9 @@ export default class FragmentLoader {
             ? new FragmentILoader(config)
             : (new DefaultILoader(config) as Loader<FragmentLoaderContext>));
       const loaderContext = createLoaderContext(frag);
-      const loadPolicy = Object.assign({}, config.fragLoadPolicy.default, {
-        timeoutRetry: null,
-        errorRetry: null,
-      });
+      const loadPolicy = getLoaderConfigWithoutReties(
+        config.fragLoadPolicy.default
+      );
       const loaderConfig: LoaderConfiguration = {
         loadPolicy,
         timeout: loadPolicy.maxLoadTimeMs,
@@ -183,7 +183,9 @@ export default class FragmentLoader {
             : (new DefaultILoader(config) as Loader<FragmentLoaderContext>));
       const loaderContext = createLoaderContext(frag, part);
       // Should we define another load policy for parts?
-      const loadPolicy = config.fragLoadPolicy.default;
+      const loadPolicy = getLoaderConfigWithoutReties(
+        config.fragLoadPolicy.default
+      );
       const loaderConfig: LoaderConfiguration = {
         loadPolicy,
         timeout: loadPolicy.maxLoadTimeMs,

diff --git a/src/utils/error-helper.ts b/src/utils/error-helper.ts
@@ -1,4 +1,4 @@
-import { LoadPolicy, RetryConfig } from '../config';
+import { LoadPolicy, LoaderConfig, RetryConfig } from '../config';
 import { ErrorDetails } from '../errors';
 import { ErrorData } from '../types/events';
 
@@ -34,10 +34,22 @@ export function getRetryDelay(
   );
 }
 
+export function getLoaderConfigWithoutReties(
+  loderConfig: LoaderConfig
+): LoaderConfig {
+  return {
+    ...loderConfig,
+    ...{
+      errorRetry: null,
+      timeoutRetry: null,
+    },
+  };
+}
+
 export function shouldRetry(
-  retryConfig: RetryConfig | null,
+  retryConfig: RetryConfig | null | undefined,
   retryCount: number,
-  httpStatus: number | undefined
+  httpStatus?: number | undefined
 ): retryConfig is RetryConfig & boolean {
   return (
     !!retryConfig &&

diff --git a/src/utils/xhr-loader.ts b/src/utils/xhr-loader.ts
@@ -226,7 +226,7 @@ class XhrLoader implements Loader<LoaderContext> {
   loadtimeout(): void {
     const retryConfig = this.config?.loadPolicy.timeoutRetry;
     const retryCount = this.stats.retry;
-    if (retryConfig && retryCount < retryConfig.maxNumRetry) {
+    if (shouldRetry(retryConfig, retryCount)) {
       this.retry(retryConfig);
     } else {
       logger.warn(`timeout while loading ${this.context.url}`);