Improve Prettier and ESLint configuration

Novage · Jan 13, 2024 · 7937c81 · 7937c81
1 parent a600e2e
commit 7937c81
Show file tree

Hide file tree

Showing 36 changed files with 235 additions and 290 deletions.
diff --git a/.eslintrc.common.cjs b/.eslintrc.common.cjs
@@ -1,21 +1,19 @@
 module.exports = {
   root: true,
   env: {
-    es2021: true
+    es2021: true,
   },
   extends: [
-    "eslint:recommended",
     "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended"
+    "plugin:@typescript-eslint/recommended",
   ],
-  plugins: ["@typescript-eslint", "prettier"],
+  plugins: ["@typescript-eslint"],
   ignorePatterns: ["/.eslintrc.cjs", "/lib", "/dist", "/vite.config.ts"],
   rules: {
-    "prettier/prettier": "error",
     "no-console": "warn",
     "@typescript-eslint/prefer-nullish-coalescing": "error",
-    "curly": ["warn", "multi-line", "consistent"],
-    "spaced-comment": ["warn", "always", {"markers": ["/"]}],
-    "no-debugger": "warn"
-  }
+    curly: ["warn", "multi-line", "consistent"],
+    "spaced-comment": ["warn", "always", { markers: ["/"] }],
+    "no-debugger": "warn",
+  },
 };
diff --git a/.prettierrc.common.cjs b/.prettierrc.common.cjs
@@ -1,5 +1,3 @@
 module.exports = {
   editorconfig: true,
-  singleQuote: false,
-  trailingComma: "es5"
 };
diff --git a/package.json b/package.json
@@ -18,7 +18,6 @@
     "@typescript-eslint/eslint-plugin": "^6.18.1",
     "@typescript-eslint/parser": "^6.18.1",
     "eslint": "^8.56.0",
-    "eslint-plugin-prettier": "^5.1.3",
     "prettier": "^3.1.1",
     "rimraf": "^5.0.5",
     "typescript": "^5.3.3",

diff --git a/packages/p2p-media-loader-core/src/bandwidth-calculator.ts b/packages/p2p-media-loader-core/src/bandwidth-calculator.ts
@@ -32,7 +32,7 @@ export class BandwidthCalculator {
 
   getBandwidthLoadingOnly(
     seconds: number,
-    ignoreThresholdTimestamp = Number.NEGATIVE_INFINITY
+    ignoreThresholdTimestamp = Number.NEGATIVE_INFINITY,
   ) {
     if (!this.loadingOnlyTimestamps.length) return 0;
     const milliseconds = seconds * 1000;
@@ -60,7 +60,7 @@ export class BandwidthCalculator {
   getBandwidth(
     seconds: number,
     ignoreThresholdTimestamp = Number.NEGATIVE_INFINITY,
-    now = performance.now()
+    now = performance.now(),
   ) {
     if (!this.timestamps.length) return 0;
     const milliseconds = seconds * 1000;

diff --git a/packages/p2p-media-loader-core/src/core.ts b/packages/p2p-media-loader-core/src/core.ts
@@ -53,7 +53,7 @@ export class Core<TStream extends Stream = Stream> {
   hasSegment(segmentLocalId: string): boolean {
     const segment = StreamUtils.getSegmentFromStreamsMap(
       this.streams,
-      segmentLocalId
+      segmentLocalId,
     );
     return !!segment;
   }
@@ -73,7 +73,7 @@ export class Core<TStream extends Stream = Stream> {
   updateStream(
     streamLocalId: string,
     addSegments?: SegmentBase[],
-    removeSegmentIds?: string[]
+    removeSegmentIds?: string[],
   ): void {
     const stream = this.streams.get(streamLocalId);
     if (!stream) return;
@@ -94,7 +94,7 @@ export class Core<TStream extends Stream = Stream> {
     if (!this.segmentStorage) {
       this.segmentStorage = new SegmentsMemoryStorage(
         this.manifestResponseUrl,
-        this.settings
+        this.settings,
       );
       await this.segmentStorage.initialize();
     }
@@ -144,7 +144,7 @@ export class Core<TStream extends Stream = Stream> {
 
     const segment = StreamUtils.getSegmentFromStreamsMap(
       this.streams,
-      segmentId
+      segmentId,
     );
     if (!segment) {
       throw new Error(`Not found segment with id: ${segmentId}`);
@@ -168,7 +168,7 @@ export class Core<TStream extends Stream = Stream> {
         this.settings,
         this.bandwidthCalculators,
         this.segmentStorage,
-        this.eventHandlers
+        this.eventHandlers,
       );
     };
     const streamTypeLoaderKeyMap = {

diff --git a/packages/p2p-media-loader-core/src/declarations.d.ts b/packages/p2p-media-loader-core/src/declarations.d.ts
@@ -11,7 +11,7 @@ declare module "bittorrent-tracker" {
 
     on<E extends keyof TrackerClientEvents>(
       event: E,
-      handler: TrackerClientEvents[E]
+      handler: TrackerClientEvents[E],
     ): void;
 
     start(): void;

diff --git a/packages/p2p-media-loader-core/src/http-loader.ts b/packages/p2p-media-loader-core/src/http-loader.ts
@@ -17,7 +17,7 @@ export class HttpRequestExecutor {
 
   constructor(
     private readonly request: Request,
-    private readonly settings: HttpSettings
+    private readonly settings: HttpSettings,
   ) {
     const { byteRange } = this.request.segment;
     if (byteRange) this.byteRange = { ...byteRange };
@@ -42,7 +42,7 @@ export class HttpRequestExecutor {
       {
         abort: () => this.abortController.abort("abort"),
         notReceivingBytesTimeoutMs: httpNotReceivingBytesTimeoutMs,
-      }
+      },
     );
     void this.fetch();
   }
@@ -92,7 +92,7 @@ export class HttpRequestExecutor {
         if (response.status !== 206) {
           throw new RequestError(
             "http-unexpected-status-code",
-            response.statusText
+            response.statusText,
           );
         }
         const contentLengthHeader = response.headers.get("Content-Length");
@@ -146,7 +146,7 @@ export class HttpRequestExecutor {
 }
 
 async function* readStream(
-  reader: ReadableStreamDefaultReader<Uint8Array>
+  reader: ReadableStreamDefaultReader<Uint8Array>,
 ): AsyncGenerator<Uint8Array> {
   while (true) {
     const { done, value } = await reader.read();

diff --git a/packages/p2p-media-loader-core/src/hybrid-loader.ts b/packages/p2p-media-loader-core/src/hybrid-loader.ts
@@ -40,7 +40,7 @@ export class HybridLoader {
     private readonly settings: Settings,
     private readonly bandwidthCalculators: BandwidthCalculators,
     private readonly segmentStorage: SegmentsMemoryStorage,
-    private readonly eventHandlers?: Pick<CoreEventHandlers, "onSegmentLoaded">
+    private readonly eventHandlers?: Pick<CoreEventHandlers, "onSegmentLoaded">,
   ) {
     const activeStream = this.lastRequestedSegment.stream;
     this.playback = { position: this.lastRequestedSegment.startTime, rate: 1 };
@@ -49,7 +49,7 @@ export class HybridLoader {
       this.requestProcessQueueMicrotask,
       this.bandwidthCalculators,
       this.playback,
-      this.settings
+      this.settings,
     );
 
     if (!this.segmentStorage.isInitialized) {
@@ -60,15 +60,15 @@ export class HybridLoader {
       return StreamUtils.isSegmentActualInPlayback(
         segment,
         this.playback,
-        this.settings
+        this.settings,
       );
     });
     this.p2pLoaders = new P2PLoadersContainer(
       this.streamManifestUrl,
       this.lastRequestedSegment.stream,
       this.requests,
       this.segmentStorage,
-      this.settings
+      this.settings,
     );
 
     this.logger = debug(`core:hybrid-loader-${activeStream.type}`);
@@ -102,7 +102,7 @@ export class HybridLoader {
       if (data) {
         engineRequest.resolve(
           data,
-          this.bandwidthCalculators.all.getBandwidthLoadingOnly(3)
+          this.bandwidthCalculators.all.getBandwidthLoadingOnly(3),
         );
       }
     } else {
@@ -135,7 +135,7 @@ export class HybridLoader {
 
   private processRequests(
     queueSegmentIds: Set<string>,
-    queueDownloadRatio: number
+    queueDownloadRatio: number,
   ) {
     const { stream } = this.lastRequestedSegment;
     const { httpErrorRetries } = this.settings;
@@ -163,7 +163,7 @@ export class HybridLoader {
           if (engineRequest) {
             engineRequest.resolve(
               request.data,
-              this.getBandwidth(queueDownloadRatio)
+              this.getBandwidth(queueDownloadRatio),
             );
             this.engineRequest = undefined;
           }
@@ -308,7 +308,7 @@ export class HybridLoader {
     this.engineRequest.abort();
     this.logger(
       "abort: ",
-      LoggerUtils.getSegmentString(this.engineRequest.segment)
+      LoggerUtils.getSegmentString(this.engineRequest.segment),
     );
     this.engineRequest = undefined;
   }
@@ -339,7 +339,7 @@ export class HybridLoader {
     for (const { segment, statuses } of QueueUtils.generateQueue(
       this.lastRequestedSegment,
       this.playback,
-      this.settings
+      this.settings,
     )) {
       if (
         !statuses.isHttpDownloadable ||
@@ -372,7 +372,7 @@ export class HybridLoader {
 
   private abortLastHttpLoadingInQueueAfterItem(
     queue: QueueUtils.QueueItem[],
-    segment: Segment
+    segment: Segment,
   ): boolean {
     for (const { segment: itemSegment } of Utils.arrayBackwards(queue)) {
       if (itemSegment === segment) break;
@@ -387,7 +387,7 @@ export class HybridLoader {
 
   private abortLastP2PLoadingInQueueAfterItem(
     queue: QueueUtils.QueueItem[],
-    segment: Segment
+    segment: Segment,
   ): boolean {
     for (const { segment: itemSegment } of Utils.arrayBackwards(queue)) {
       if (itemSegment === segment) break;
@@ -408,7 +408,7 @@ export class HybridLoader {
     for (const item of QueueUtils.generateQueue(
       this.lastRequestedSegment,
       this.playback,
-      this.settings
+      this.settings,
     )) {
       maxPossibleLength++;
       const { segment } = item;
@@ -444,19 +444,19 @@ export class HybridLoader {
     const bandwidth = Math.max(
       all.getBandwidth(30, levelChangedTimestamp),
       all.getBandwidth(60, levelChangedTimestamp),
-      all.getBandwidth(90, levelChangedTimestamp)
+      all.getBandwidth(90, levelChangedTimestamp),
     );
     if (queueDownloadRatio >= 0.8 || bandwidth >= activeLevelBitrate * 0.9) {
       return Math.max(
         all.getBandwidthLoadingOnly(1),
         all.getBandwidthLoadingOnly(3),
-        all.getBandwidthLoadingOnly(5)
+        all.getBandwidthLoadingOnly(5),
       );
     }
     const httpRealBandwidth = Math.max(
       http.getBandwidthLoadingOnly(1),
       http.getBandwidthLoadingOnly(3),
-      http.getBandwidthLoadingOnly(5)
+      http.getBandwidthLoadingOnly(5),
     );
     return Math.max(bandwidth, httpRealBandwidth);
   }