Enable Prettier (#195)

Novage · Apr 2, 2021 · 65bfee0 · 65bfee0
1 parent e9c73ad
commit 65bfee0
Show file tree

Hide file tree

Showing 51 changed files with 3,049 additions and 2,805 deletions.
diff --git a/p2p-media-loader-core/.editorconfig b/p2p-media-loader-core/.editorconfig
@@ -7,6 +7,7 @@ end_of_line              = lf
 charset                  = utf-8
 trim_trailing_whitespace = true
 insert_final_newline     = true
+max_line_length          = 120
 [*.md]
 trim_trailing_whitespace = false
 [*.json]

diff --git a/p2p-media-loader-core/.eslintrc b/p2p-media-loader-core/.eslintrc
@@ -11,7 +11,8 @@
         "eslint:recommended",
         "plugin:@typescript-eslint/eslint-recommended",
         "plugin:@typescript-eslint/recommended",
-        "plugin:@typescript-eslint/recommended-requiring-type-checking"
+        "plugin:@typescript-eslint/recommended-requiring-type-checking",
+        "prettier"
     ],
     "env": {
         "browser": true

diff --git a/p2p-media-loader-core/lib/bandwidth-approximator.ts b/p2p-media-loader-core/lib/bandwidth-approximator.ts
@@ -37,7 +37,7 @@ export class BandwidthApproximator {
 
         const interval = Math.min(SMOOTH_INTERVAL, timeStamp);
         this.lastBandwidth.push(new NumberWithTime(this.currentBytesSum / interval, timeStamp));
-    }
+    };
 
     // in bytes per millisecond
     public getBandwidth = (timeStamp: number): number => {
@@ -53,13 +53,13 @@ export class BandwidthApproximator {
         }
 
         return maxBandwidth;
-    }
+    };
 
     public getSmoothInterval = (): number => {
         return SMOOTH_INTERVAL;
-    }
+    };
 
     public getMeasureInterval = (): number => {
         return MEASURE_INTERVAL;
-    }
+    };
 }
diff --git a/p2p-media-loader-core/lib/http-media-manager.ts b/p2p-media-loader-core/lib/http-media-manager.ts
@@ -20,21 +20,20 @@ import { STEEmitter } from "./stringly-typed-event-emitter";
 import { Segment } from "./loader-interface";
 import { SegmentValidatorCallback, XhrSetupCallback, SegmentUrlBuilder } from "./hybrid-loader";
 
-export class HttpMediaManager extends STEEmitter<
-    "segment-loaded" | "segment-error" | "bytes-downloaded"
-> {
-
-    private xhrRequests = new Map<string, {xhr: XMLHttpRequest, segment: Segment}>();
+export class HttpMediaManager extends STEEmitter<"segment-loaded" | "segment-error" | "bytes-downloaded"> {
+    private xhrRequests = new Map<string, { xhr: XMLHttpRequest; segment: Segment }>();
     private failedSegments = new Map<string, number>();
     private debug = Debug("p2pml:http-media-manager");
 
-    public constructor(readonly settings: {
-        httpFailedSegmentTimeout: number,
-        httpUseRanges: boolean,
-        segmentValidator?: SegmentValidatorCallback,
-        xhrSetup?: XhrSetupCallback
-        segmentUrlBuilder?: SegmentUrlBuilder
-    }) {
+    public constructor(
+        readonly settings: {
+            httpFailedSegmentTimeout: number;
+            httpUseRanges: boolean;
+            segmentValidator?: SegmentValidatorCallback;
+            xhrSetup?: XhrSetupCallback;
+            segmentUrlBuilder?: SegmentUrlBuilder;
+        }
+    ) {
         super();
     }
 
@@ -45,9 +44,7 @@ export class HttpMediaManager extends STEEmitter<
 
         this.cleanTimedOutFailedSegments();
 
-        const segmentUrl = this.settings.segmentUrlBuilder
-            ? this.settings.segmentUrlBuilder(segment)
-            : segment.url;
+        const segmentUrl = this.settings.segmentUrlBuilder ? this.settings.segmentUrlBuilder(segment) : segment.url;
 
         this.debug("http segment download", segmentUrl);
 
@@ -60,7 +57,7 @@ export class HttpMediaManager extends STEEmitter<
         if (segment.range) {
             xhr.setRequestHeader("Range", segment.range);
             downloadedPieces = undefined; // TODO: process downloadedPieces for segments with range headers too
-        } else if ((downloadedPieces !== undefined) && this.settings.httpUseRanges) {
+        } else if (downloadedPieces !== undefined && this.settings.httpUseRanges) {
             let bytesDownloaded = 0;
             for (const piece of downloadedPieces) {
                 bytesDownloaded += piece.byteLength;
@@ -79,9 +76,9 @@ export class HttpMediaManager extends STEEmitter<
             this.settings.xhrSetup(xhr, segmentUrl);
         }
 
-        this.xhrRequests.set(segment.id, {xhr, segment});
+        this.xhrRequests.set(segment.id, { xhr, segment });
         xhr.send();
-    }
+    };
 
     public abort = (segment: Segment): void => {
         const request = this.xhrRequests.get(segment.id);
@@ -91,29 +88,29 @@ export class HttpMediaManager extends STEEmitter<
             this.xhrRequests.delete(segment.id);
             this.debug("http segment abort", segment.id);
         }
-    }
+    };
 
     public isDownloading = (segment: Segment): boolean => {
         return this.xhrRequests.has(segment.id);
-    }
+    };
 
     public isFailed = (segment: Segment): boolean => {
         const time = this.failedSegments.get(segment.id);
         return time !== undefined && time > this.now();
-    }
+    };
 
-    public getActiveDownloads = (): ReadonlyMap<string, {segment: Segment}> => {
+    public getActiveDownloads = (): ReadonlyMap<string, { segment: Segment }> => {
         return this.xhrRequests;
-    }
+    };
 
     public getActiveDownloadsCount = (): number => {
         return this.xhrRequests.size;
-    }
+    };
 
     public destroy = (): void => {
-        this.xhrRequests.forEach(request => request.xhr.abort());
+        this.xhrRequests.forEach((request) => request.xhr.abort());
         this.xhrRequests.clear();
-    }
+    };
 
     private setupXhrEvents = (xhr: XMLHttpRequest, segment: Segment, downloadedPieces?: ArrayBuffer[]) => {
         let prevBytesLoaded = 0;
@@ -125,14 +122,14 @@ export class HttpMediaManager extends STEEmitter<
         });
 
         xhr.addEventListener("load", async (event) => {
-            if ((xhr.status < 200) || (xhr.status >= 300)) {
+            if (xhr.status < 200 || xhr.status >= 300) {
                 this.segmentFailure(segment, event, xhr);
                 return;
             }
 
             let data = xhr.response as ArrayBuffer;
 
-            if ((downloadedPieces !== undefined) && (xhr.status === 206)) {
+            if (downloadedPieces !== undefined && xhr.status === 206) {
                 let bytesDownloaded = 0;
                 for (const piece of downloadedPieces) {
                     bytesDownloaded += piece.byteLength;
@@ -160,7 +157,7 @@ export class HttpMediaManager extends STEEmitter<
         xhr.addEventListener("timeout", (event: unknown) => {
             this.segmentFailure(segment, event, xhr);
         });
-    }
+    };
 
     private segmentDownloadFinished = async (segment: Segment, data: ArrayBuffer, xhr: XMLHttpRequest) => {
         segment.responseUrl = xhr.responseURL === null ? undefined : xhr.responseURL;
@@ -177,15 +174,15 @@ export class HttpMediaManager extends STEEmitter<
 
         this.xhrRequests.delete(segment.id);
         this.emit("segment-loaded", segment, data);
-    }
+    };
 
     private segmentFailure = (segment: Segment, error: unknown, xhr: XMLHttpRequest) => {
         segment.responseUrl = xhr.responseURL === null ? undefined : xhr.responseURL;
 
         this.xhrRequests.delete(segment.id);
         this.failedSegments.set(segment.id, this.now() + this.settings.httpFailedSegmentTimeout);
         this.emit("segment-error", segment, error);
-    }
+    };
 
     private cleanTimedOutFailedSegments = () => {
         const now = this.now();
@@ -197,9 +194,8 @@ export class HttpMediaManager extends STEEmitter<
             }
         });
 
-        candidates.forEach(id => this.failedSegments.delete(id));
-    }
+        candidates.forEach((id) => this.failedSegments.delete(id));
+    };
 
     private now = () => performance.now();
-
 }