refactor: hasSegment function

Novage · Aug 19, 2024 · 7772e57 · 7772e57
1 parent bf96747
commit 7772e57
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/packages/p2p-media-loader-core/src/hybrid-loader.ts b/packages/p2p-media-loader-core/src/hybrid-loader.ts
@@ -137,7 +137,7 @@ export class HybridLoader {
       streamSwarmId,
       segment.externalId,
     );
-    if (this.segmentStorage.hasSegment(segmentStorageId)) {
+    if (this.segmentStorage.hasSegment(streamSwarmId, segment.externalId)) {
       // TODO: error handling
       const data = await this.segmentStorage.getSegmentData(segmentStorageId);
       if (data) {
@@ -218,13 +218,18 @@ export class HybridLoader {
             stream,
           );
           const streamId = StreamUtils.getStreamId(stream);
+          const segmentStorageId = getStorageItemId(
+            streamSwarmId,
+            segment.externalId,
+          );
           const segmentInfoItem = createSegmentInfoItem(
             streamSwarmId,
             streamId,
             segment.externalId,
+            segmentStorageId,
           );
           const segmentDataItem = createSegmentDataItem(
-            getStorageItemId(streamSwarmId, segment.externalId),
+            segmentStorageId,
             request.data,
             now,
             streamId,
@@ -418,15 +423,11 @@ export class HybridLoader {
         this.config.swarmId ?? this.streamManifestUrl,
         segment.stream,
       );
-      const segmentStorageId = getStorageItemId(
-        streamSwarmId,
-        segment.externalId,
-      );
 
       if (
         !statuses.isHttpDownloadable ||
         statuses.isP2PDownloadable ||
-        this.segmentStorage.hasSegment(segmentStorageId)
+        this.segmentStorage.hasSegment(streamSwarmId, segment.externalId)
       ) {
         continue;
       }
@@ -524,13 +525,9 @@ export class HybridLoader {
         this.config.swarmId ?? this.streamManifestUrl,
         segment.stream,
       );
-      const segmentStorageId = getStorageItemId(
-        streamSwarmId,
-        segment.externalId,
-      );
 
       if (
-        this.segmentStorage.hasSegment(segmentStorageId) ||
+        this.segmentStorage.hasSegment(streamSwarmId, segment.externalId) ||
         this.requests.get(segment)?.status === "succeed"
       ) {
         alreadyLoadedCount++;

diff --git a/packages/p2p-media-loader-core/src/segments-storage.ts b/packages/p2p-media-loader-core/src/segments-storage.ts
@@ -86,8 +86,10 @@ export class SegmentsMemoryStorage implements ISegmentsStorage {
     return dataItem.data;
   }
 
-  hasSegment(segmentStorageId: string): boolean {
-    return this.cache.has(segmentStorageId);
+  hasSegment(streamSwarmId: string, externalId: number): boolean {
+    const streamCache = this.cacheMap.get(streamSwarmId);
+
+    return streamCache === undefined ? false : streamCache.has(externalId);
   }
 
   getStoredSegmentExternalIdsOfStream(streamSwarmId: string) {

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
@@ -17,7 +17,7 @@ export interface ISegmentsStorage {
 
   getSegmentData(segmentStorageId: string): Promise<ArrayBuffer | undefined>;
 
-  hasSegment(segmentStorageId: string): boolean;
+  hasSegment(streamSwarmId: string, externalId: number): boolean;
 
   getStoredSegmentExternalIdsOfStream(streamSwarmId: string): number[];
 

diff --git a/packages/p2p-media-loader-core/src/segments-storage/segments-types.ts b/packages/p2p-media-loader-core/src/segments-storage/segments-types.ts
@@ -2,6 +2,7 @@ export type SegmentInfoItem = {
   streamSwarmId: string;
   streamId: string;
   externalId: number;
+  storageId: string;
 };
 
 export type SegmentDataItem = {

diff --git a/packages/p2p-media-loader-core/src/segments-storage/utils.ts b/packages/p2p-media-loader-core/src/segments-storage/utils.ts
@@ -8,8 +8,9 @@ export function createSegmentInfoItem(
   streamSwarmId: string,
   streamId: string,
   externalId: number,
+  storageId: string,
 ): SegmentInfoItem {
-  return { streamSwarmId, streamId, externalId };
+  return { streamSwarmId, streamId, externalId, storageId };
 }
 
 export function createSegmentDataItem(