Remove LinkedMap class

packages/p2p-media-loader-core/src/core.ts

@@ -10,7 +10,6 @@ import {
   StreamDetails,
 } from "./types";
 import * as StreamUtils from "./utils/stream";
-import { LinkedMap } from "./linked-map";
 import { BandwidthCalculator } from "./bandwidth-calculator";
 import { EngineCallbacks } from "./requests/engine-request";
 import { SegmentsMemoryStorage } from "./segments-storage";
@@ -67,7 +66,7 @@ export class Core<TStream extends Stream = Stream> {
     if (this.streams.has(stream.localId)) return;
     this.streams.set(stream.localId, {
       ...stream,
-      segments: new LinkedMap<string, Segment>(),
+      segments: new Map<string, Segment>(),
     });
   }
 
@@ -81,7 +80,7 @@ export class Core<TStream extends Stream = Stream> {
 
     addSegments?.forEach((s) => {
       const segment = { ...s, stream };
-      stream.segments.addToEnd(segment.localId, segment);
+      stream.segments.set(segment.localId, segment);
     });
     removeSegmentIds?.forEach((id) => stream.segments.delete(id));
     this.mainStreamLoader?.updateStream(stream);

packages/p2p-media-loader-core/src/types.d.ts

@@ -1,4 +1,3 @@
-import { LinkedMap } from "./linked-map";
 import { RequestAttempt } from "./requests/request";
 import { BandwidthCalculator } from "./bandwidth-calculator";
 
@@ -25,23 +24,15 @@ export type Stream = {
   readonly index: number;
 };
 
-export type ReadonlyLinkedMap<K, V extends object> = Pick<
-  LinkedMap<K, V>,
-  "has" | "keys" | "values" | "valuesBackwards" | "size"
->;
-
 export type StreamWithSegments<
   TStream extends Stream = Stream,
-  TMap extends ReadonlyLinkedMap<string, SegmentBase> = LinkedMap<
-    string,
-    Segment
-  >,
+  TMap extends ReadonlyMap<string, SegmentBase> = Map<string, Segment>,
 > = TStream & {
   readonly segments: TMap;
 };
 
 export type StreamWithReadonlySegments<TStream extends Stream = Stream> =
-  StreamWithSegments<TStream, ReadonlyLinkedMap<string, SegmentBase>>;
+  StreamWithSegments<TStream, ReadonlyMap<string, SegmentBase>>;
 
 export type SegmentResponse = {
   data: ArrayBuffer;

packages/p2p-media-loader-core/src/utils/queue.ts

@@ -13,10 +13,19 @@ export function* generateQueue(
   settings: PlaybackTimeWindowsSettings
 ): Generator<QueueItem, void> {
   const { localId: requestedSegmentId, stream } = lastRequestedSegment;
-  const queueSegments = stream.segments.values(requestedSegmentId);
 
-  const first = queueSegments.next().value;
-  if (!first) return;
+  const requestedSegment = stream.segments.get(requestedSegmentId);
+  if (!requestedSegment) return;
+
+  const queueSegments = stream.segments.values();
+
+  let first: Segment | undefined;
+
+  while (first !== requestedSegment) {
+    first = queueSegments.next().value;
+  }
+
+  if (!first) return; // should never happen
 
   const firstStatuses = getSegmentPlaybackStatuses(first, playback, settings);
   if (isNotActualStatuses(firstStatuses)) {

packages/p2p-media-loader-shaka/src/segment-manager.ts

@@ -5,7 +5,6 @@ import {
   StreamWithReadonlySegments,
   SegmentBase,
   StreamType,
-  ReadonlyLinkedMap,
 } from "p2p-media-loader-core";
 
 // The minimum time interval (in seconds) between segments to assign unique IDs.
@@ -143,7 +142,7 @@ function* itemsBackwards<T>(items: T[]) {
 }
 
 function* nSegmentsBackwards(
-  segments: ReadonlyLinkedMap<string, SegmentBase>,
+  segments: ReadonlyMap<string, SegmentBase>,
   amount: number
 ) {
   let i = 0;