refactor: Swap func params in correct order

Novage · Sep 6, 2024 · a2d14e8 · a2d14e8
1 parent 4c3b74f
commit a2d14e8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/packages/p2p-media-loader-core/src/hybrid-loader.ts b/packages/p2p-media-loader-core/src/hybrid-loader.ts
@@ -101,20 +101,21 @@ export class HybridLoader {
       this.p2pLoaders.changeCurrentLoader(stream);
     }
     this.lastRequestedSegment = segment;
+
+    const swarmId = this.config.swarmId ?? this.streamManifestUrl;
+    const streamSwarmId = StreamUtils.getStreamSwarmId(swarmId, stream);
+
     this.segmentStorage.onSegmentRequested(
-      stream.runtimeId,
+      streamSwarmId,
       segment.externalId,
       segment.startTime,
       segment.endTime,
-      this.config.swarmId ?? this.streamManifestUrl,
+      swarmId,
       stream.type,
       this.streamDetails.isLive,
     );
     const engineRequest = new EngineRequest(segment, callbacks);
 
-    const swarmId = this.config.swarmId ?? this.streamManifestUrl;
-    const streamSwarmId = StreamUtils.getStreamSwarmId(swarmId, stream);
-
     try {
       if (
         this.segmentStorage.hasSegment(

diff --git a/packages/p2p-media-loader-core/src/p2p/loader.ts b/packages/p2p-media-loader-core/src/p2p/loader.ts
@@ -90,14 +90,11 @@ export class P2PLoader {
 
   private getSegmentsAnnouncement() {
     const swarmId = this.config.swarmId ?? this.streamManifestUrl;
-    const streamSwarmId = StreamUtils.getStreamSwarmId(
-      this.config.swarmId ?? this.streamManifestUrl,
-      this.stream,
-    );
+    const streamSwarmId = StreamUtils.getStreamSwarmId(swarmId, this.stream);
 
     const loaded: number[] = this.segmentStorage.getStoredSegmentIds(
-      swarmId,
       streamSwarmId,
+      swarmId,
     );
     const httpLoading: number[] = [];
 

diff --git a/packages/p2p-media-loader-core/src/p2p/loaders-container.ts b/packages/p2p-media-loader-core/src/p2p/loaders-container.ts
@@ -71,8 +71,8 @@ export class P2PLoadersContainer {
         this._currentLoaderItem.stream,
       );
       const ids = this.segmentStorage.getStoredSegmentIds(
-        swarmId,
         streamSwarmId,
+        swarmId,
       );
       if (!ids.length) this.destroyAndRemoveLoader(this._currentLoaderItem);
       else this.setLoaderDestroyTimeout(this._currentLoaderItem);

diff --git a/packages/p2p-media-loader-core/src/segments-storage/segments-memory-storage.ts b/packages/p2p-media-loader-core/src/segments-storage/segments-memory-storage.ts
@@ -108,11 +108,7 @@ export class SegmentsMemoryStorage implements SegmentsStorage {
   }
 
   // eslint-disable-next-line @typescript-eslint/require-await
-  async getSegmentData(
-    streamId: string,
-    segmentId: number,
-    _swarmId: string,
-  ): Promise<ArrayBuffer | undefined> {
+  async getSegmentData(streamId: string, segmentId: number, _swarmId: string) {
     const segmentStorageId = getStorageItemId(streamId, segmentId);
     const dataItem = this.cache.get(segmentStorageId);
 
@@ -121,26 +117,26 @@ export class SegmentsMemoryStorage implements SegmentsStorage {
     return dataItem.data;
   }
 
-  hasSegment(streamId: string, externalId: number, _swarmId: string): boolean {
+  hasSegment(streamId: string, externalId: number, _swarmId: string) {
     const segmentStorageId = getStorageItemId(streamId, externalId);
     const segment = this.cache.get(segmentStorageId);
 
     return segment !== undefined;
   }
 
-  getStoredSegmentIds(streamSwarm: string) {
+  getStoredSegmentIds(streamId: string, _swarmId: string) {
     const externalIds: number[] = [];
 
-    for (const { segmentId, streamId } of this.cache.values()) {
-      if (streamId !== streamSwarm) continue;
+    for (const { segmentId, streamId: streamCacheId } of this.cache.values()) {
+      if (streamCacheId !== streamId) continue;
       externalIds.push(segmentId);
     }
 
     return externalIds;
   }
 
   // eslint-disable-next-line @typescript-eslint/require-await
-  private async clear(isLiveStream: boolean): Promise<boolean> {
+  private async clear(isLiveStream: boolean) {
     if (
       !this.currentPlayback ||
       !this.mainStreamConfig ||