Remove completedCount

Novage · Jun 23, 2024 · 96adec1 · 96adec1
1 parent 1e6c0e9
commit 96adec1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/lib/fast-tracker.ts b/lib/fast-tracker.ts
@@ -68,7 +68,6 @@ export class FastTracker implements Tracker {
       swarm = {
         infoHash,
         peers: [],
-        completedCount: 0,
       };
 
       this.#swarms.set(infoHash, swarm);
@@ -88,16 +87,13 @@ export class FastTracker implements Tracker {
         swarm.completedPeers = new Set();
       }
       swarm.completedPeers.add(peer.peerId);
-      swarm.completedCount++;
     }
   }
 
   private removePeerFromSwarm(swarm: Swarm, peer: PeerContext) {
     const peerIndex = swarm.peers.indexOf(peer);
 
-    if (swarm.completedPeers?.delete(peer.peerId)) {
-      swarm.completedCount--;
-    }
+    swarm.completedPeers?.delete(peer.peerId);
 
     const lastPeer = swarm.peers.pop()!;
     if (peerIndex < swarm.peers.length) {
@@ -110,7 +106,6 @@ export class FastTracker implements Tracker {
       swarm.completedPeers = new Set();
     }
     swarm.completedPeers.add(peer.peerId);
-    swarm.completedCount++;
   }
 
   private startClearPeersInterval(): void {
@@ -258,13 +253,15 @@ export class FastTracker implements Tracker {
       throw new TrackerError("announce: peerId mismatch");
     }
 
+    const complete = swarm.completedPeers?.size ?? 0;
+
     socket.sendMessage(
       {
         action: "announce",
         interval: this.settings.announceInterval,
         info_hash: infoHash,
-        complete: swarm.completedCount,
-        incomplete: swarm.peers.length - swarm.completedCount,
+        complete,
+        incomplete: swarm.peers.length - complete,
       },
       socket,
     );
@@ -382,20 +379,22 @@ export class FastTracker implements Tracker {
 
     if (infoHash === undefined) {
       for (const swarm of this.#swarms.values()) {
+        const complete = swarm.completedPeers?.size ?? 0;
         files[swarm.infoHash] = {
-          complete: swarm.completedCount,
-          incomplete: swarm.peers.length - swarm.completedCount,
-          downloaded: swarm.completedCount,
+          complete,
+          incomplete: swarm.peers.length - complete,
+          downloaded: complete,
         };
       }
     } else if (infoHash instanceof Array) {
       for (const singleInfoHash of infoHash as unknown[]) {
         const swarm = this.#swarms.get(singleInfoHash as string);
         if (swarm !== undefined) {
+          const complete = swarm.completedPeers?.size ?? 0;
           files[singleInfoHash as string] = {
-            complete: swarm.completedCount,
-            incomplete: swarm.peers.length - swarm.completedCount,
-            downloaded: swarm.completedCount,
+            complete,
+            incomplete: swarm.peers.length - complete,
+            downloaded: complete,
           };
         } else if (typeof singleInfoHash === "string") {
           files[singleInfoHash] = {
@@ -408,10 +407,11 @@ export class FastTracker implements Tracker {
     } else {
       const swarm = this.#swarms.get(infoHash as string);
       if (swarm !== undefined) {
+        const complete = swarm.completedPeers?.size ?? 0;
         files[infoHash as string] = {
-          complete: swarm.completedCount,
-          incomplete: swarm.peers.length - swarm.completedCount,
-          downloaded: swarm.completedCount,
+          complete,
+          incomplete: swarm.peers.length - complete,
+          downloaded: complete,
         };
       } else if (typeof infoHash === "string") {
         files[infoHash] = {

diff --git a/lib/tracker.ts b/lib/tracker.ts
@@ -20,7 +20,6 @@ export interface SocketContext {
 
 export type Swarm = {
   infoHash: string;
-  completedCount: number;
   completedPeers?: Set<string>;
   peers: PeerContext[];
 };