Fix bug.

Novage · Dec 20, 2023 · 3509712 · 3509712
1 parent d1d8a62
commit 3509712
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 28 deletions.
diff --git a/packages/p2p-media-loader-core/src/hybrid-loader.ts b/packages/p2p-media-loader-core/src/hybrid-loader.ts
@@ -187,7 +187,11 @@ export class HybridLoader {
       if (statuses.isHighDemand) {
         if (request?.type === "http" && request.status === "loading") continue;
 
+        const isP2PLoadingRequest =
+          request?.status === "loading" && request.type === "p2p";
+
         if (this.requests.executingHttpCount < simultaneousHttpDownloads) {
+          if (isP2PLoadingRequest) request.abortFromEngine();
           void this.loadThroughHttp(segment);
           continue;
         }
@@ -196,11 +200,12 @@ export class HybridLoader {
           this.abortLastHttpLoadingInQueueAfterItem(queue, segment) &&
           this.requests.executingHttpCount < simultaneousHttpDownloads
         ) {
+          if (isP2PLoadingRequest) request.abortFromEngine();
           void this.loadThroughHttp(segment);
           continue;
         }
 
-        if (request?.type === "p2p" && request.status === "loading") continue;
+        if (isP2PLoadingRequest) continue;
 
         if (this.requests.executingP2PCount < simultaneousP2PDownloads) {
           void this.loadThroughP2P(segment);

diff --git a/packages/p2p-media-loader-core/src/linked-map.ts b/packages/p2p-media-loader-core/src/linked-map.ts
@@ -68,15 +68,6 @@ export class LinkedMap<K, V extends object> {
     }
   }
 
-  *valuesBackwards(key?: K) {
-    let value = key ? this.map.get(key) : this._last;
-    if (value === undefined) return;
-    while (value?.item !== undefined) {
-      yield value.item[1];
-      value = value.prev;
-    }
-  }
-
   *keys(): Generator<K> {
     let value = this._first;
     if (value === undefined) return;

diff --git a/packages/p2p-media-loader-core/src/request.ts b/packages/p2p-media-loader-core/src/request.ts
@@ -192,6 +192,9 @@ export class Request {
   abortFromProcessQueue() {
     this.throwErrorIfNotLoadingStatus();
     this._status = "aborted";
+    this.logger(
+      `${this.currentAttempt?.type} ${this.segment.externalId} aborted`
+    );
     this._abortRequestCallback?.("abort");
     this._abortRequestCallback = undefined;
     this.currentAttempt = undefined;
@@ -205,6 +208,7 @@ export class Request {
     this._status = "failed";
     const error = new RequestError("bytes-receiving-timeout");
     this._abortRequestCallback?.(error.type);
+    this.logger(`${this.type} ${this.segment.externalId} failed ${error.type}`);
 
     this.currentAttempt.error = error;
     this._failedAttempts.push(this.currentAttempt);
@@ -217,6 +221,7 @@ export class Request {
     if (!this.currentAttempt) return;
 
     this._status = "failed";
+    this.logger(`${this.type} ${this.segment.externalId} failed ${error.type}`);
     this.currentAttempt.error = error;
     this._failedAttempts.push(this.currentAttempt);
     this.notReceivingBytesTimeout.clear();

diff --git a/packages/p2p-media-loader-core/src/utils/logger.ts b/packages/p2p-media-loader-core/src/utils/logger.ts
@@ -1,5 +1,4 @@
 import { Segment, Stream } from "../types";
-import { QueueItem } from "./queue";
 import { SegmentPlaybackStatuses } from "./stream";
 
 export function getStreamString(stream: Stream) {
@@ -21,9 +20,3 @@ export function getSegmentPlaybackStatusesString(
   if (isP2PDownloadable) return "p2p-window";
   return "-";
 }
-
-export function getQueueItemString(item: QueueItem) {
-  const { segment, statuses } = item;
-  const statusString = getSegmentPlaybackStatusesString(statuses);
-  return `${segment.externalId} ${statusString}`;
-}
diff --git a/packages/p2p-media-loader-shaka/src/engine.ts b/packages/p2p-media-loader-shaka/src/engine.ts
@@ -141,12 +141,7 @@ export class Engine {
       const { p2pml } = request;
       if (!p2pml) return shaka.net.HttpFetchPlugin.parse(...args);
 
-      const loader = new Loader(
-        p2pml.shaka,
-        p2pml.core,
-        p2pml.streamInfo,
-        p2pml.segmentManager
-      );
+      const loader = new Loader(p2pml.shaka, p2pml.core, p2pml.streamInfo);
       return loader.load(...args);
     };
     NetworkingEngine.registerScheme("http", handleLoading);

diff --git a/packages/p2p-media-loader-shaka/src/loading-handler.ts b/packages/p2p-media-loader-shaka/src/loading-handler.ts
@@ -1,5 +1,4 @@
 import * as Utils from "./stream-utils";
-import { SegmentManager } from "./segment-manager";
 import { StreamInfo } from "./types";
 import { Shaka, Stream } from "./types";
 import {
@@ -19,8 +18,7 @@ export class Loader {
   constructor(
     private readonly shaka: Shaka,
     private readonly core: Core<Stream>,
-    readonly streamInfo: StreamInfo,
-    private readonly segmentManager: SegmentManager
+    readonly streamInfo: StreamInfo
   ) {}
 
   private defaultLoad() {

diff --git a/packages/p2p-media-loader-shaka/src/manifest-parser-decorator.ts b/packages/p2p-media-loader-shaka/src/manifest-parser-decorator.ts
@@ -126,12 +126,12 @@ export class ManifestParserDecorator implements shaka.extern.ManifestParser {
           ) {
             return reference;
           }
+          prevFirstItemReference = firstItemReference;
+          prevLastItemReference = lastItemReference;
 
           // Segment index have been updated
           segmentManager.updateStreamSegments(stream, references);
           this.debug(`Stream ${stream.id} is updated`);
-          prevFirstItemReference = firstItemReference;
-          prevLastItemReference = lastItemReference;
         } catch (err) {
           // This catch is intentionally left blank.
           // [...segmentIndex] throws an error when segmentIndex inner array is empty