refactor: segments-storage-interface

Novage · Aug 23, 2024 · d8b9a2e · d8b9a2e
1 parent 66452fd
commit d8b9a2e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 19 deletions.
diff --git a/packages/p2p-media-loader-core/src/core.ts b/packages/p2p-media-loader-core/src/core.ts
@@ -30,7 +30,6 @@ import { ISegmentsStorage } from "./segments-storage/segments-storage.interface.
 export class Core<TStream extends Stream = Stream> {
   /** Default configuration for common core settings. */
   static readonly DEFAULT_COMMON_CORE_CONFIG: CommonCoreConfig = {
-    cachedSegmentExpiration: undefined,
     cachedSegmentsCount: 0,
     customSegmentStorage: undefined,
   };

diff --git a/packages/p2p-media-loader-core/src/hybrid-loader.ts b/packages/p2p-media-loader-core/src/hybrid-loader.ts
@@ -62,7 +62,7 @@ export class HybridLoader {
     if (!this.segmentStorage.isInitialized()) {
       throw new Error("Segment storage is not initialized.");
     }
-    this.segmentStorage.setEngineRequestSegmentDurationCallback(() => {
+    this.segmentStorage.setLastRequestedSegmentDurationCallback(() => {
       return {
         startTime: this.lastRequestedSegment.startTime,
         endTime: this.lastRequestedSegment.endTime,

diff --git a/packages/p2p-media-loader-core/src/segments-storage.ts b/packages/p2p-media-loader-core/src/segments-storage.ts
@@ -33,7 +33,10 @@ export class SegmentsMemoryStorage implements ISegmentsStorage {
   private mainStreamConfig?: StreamConfig;
   private secondaryStreamConfig?: StreamConfig;
   private getCurrentPlaybackTime?: () => number;
-  private getSegmentDuration?: () => { startTime: number; endTime: number };
+  private getLastRequestedSegmentDuration?: () => {
+    startTime: number;
+    endTime: number;
+  };
 
   constructor() {
     this.logger = debug("p2pml-core:segment-memory-storage");
@@ -62,13 +65,13 @@ export class SegmentsMemoryStorage implements ISegmentsStorage {
     this.getCurrentPlaybackTime = getCurrentPlaybackTime;
   }
 
-  setEngineRequestSegmentDurationCallback(
+  setLastRequestedSegmentDurationCallback(
     getSegmentDurationFromEngineRequest: () => {
       startTime: number;
       endTime: number;
     },
   ) {
-    this.getSegmentDuration = getSegmentDurationFromEngineRequest;
+    this.getLastRequestedSegmentDuration = getSegmentDurationFromEngineRequest;
   }
 
   // eslint-disable-next-line @typescript-eslint/require-await
@@ -200,7 +203,7 @@ export class SegmentsMemoryStorage implements ISegmentsStorage {
   private getStorageMaxCacheCount() {
     if (
       !this.storageConfig ||
-      !this.getSegmentDuration ||
+      !this.getLastRequestedSegmentDuration ||
       !this.mainStreamConfig ||
       !this.secondaryStreamConfig
     ) {
@@ -216,7 +219,7 @@ export class SegmentsMemoryStorage implements ISegmentsStorage {
         ? this.mainStreamConfig.httpDownloadTimeWindow
         : this.secondaryStreamConfig.httpDownloadTimeWindow;
 
-    const { startTime, endTime } = this.getSegmentDuration();
+    const { startTime, endTime } = this.getLastRequestedSegmentDuration();
     const segmentDuration = endTime - startTime;
     const segmentsInTimeWindow = Math.ceil(maxHttpTimeWindow / segmentDuration);
 

diff --git a/packages/p2p-media-loader-core/src/segments-storage/segments-storage.interface.ts b/packages/p2p-media-loader-core/src/segments-storage/segments-storage.interface.ts
@@ -11,8 +11,8 @@ export interface ISegmentsStorage {
 
   setSegmentPlaybackCallback(getCurrentPlaybackTime: () => number): void;
 
-  setEngineRequestSegmentDurationCallback(
-    getSegmentDurationFromEngineRequest: () => {
+  setLastRequestedSegmentDurationCallback(
+    getLastRequestedSegmentDuration: () => {
       startTime: number;
       endTime: number;
     },

diff --git a/packages/p2p-media-loader-core/src/types.ts b/packages/p2p-media-loader-core/src/types.ts
@@ -114,16 +114,6 @@ export type DynamicCoreConfig = Partial<
 
 /** Represents the configuration for the Core functionality that is common to all streams. */
 export type CommonCoreConfig = {
-  /**
-   * Time after which a cached segment expires, in seconds.
-   * If set to undefined, the cacheSegmentExpiration is disabled for VOD streams, and a default value (20 minutes) is used for live streams.
-   *
-   * @default
-   * ```typescript
-   * cachedSegmentExpiration: undefined
-   * ```
-   */
-  cachedSegmentExpiration?: number;
   /**
    * Maximum number of segments to store in the cache.
    * Has to be less then httpDownloadTimeWindow and p2pDownloadTimeWindow.