Refactored getting stats from tracker

Author: mrlika

lib/fast-tracker.ts

@@ -23,7 +23,7 @@ const debug = DebugModule("wt-tracker:fast-tracker");
 const ldebug = ldebugConstructor(debug);
 
 export class FastTracker implements Tracker {
-    private swarms = new Map<string, Swarm>();
+    private _swarms = new Map<string, Swarm>();
 
     constructor(readonly settings: any = {}) {
         this.settings = {
@@ -33,6 +33,10 @@ export class FastTracker implements Tracker {
         };
     }
 
+    public get swarms(): ReadonlyMap<string, { peers: ReadonlyMap<string, PeerContext> }> {
+        return this._swarms;
+    }
+
     public processMessage(json: any, peer: PeerContext) {
         const action: any = json.action;
 
@@ -74,7 +78,7 @@ export class FastTracker implements Tracker {
             swarm.removePeer(peer);
             if (swarm.peers.size === 0) {
                 ldebug(() => ["swarm removed (empty)", Buffer.from(swarm.infoHash).toString("hex")]);
-                this.swarms.delete(swarm.infoHash);
+                this._swarms.delete(swarm.infoHash);
             } else if (swarmContext.completed) {
                 swarm.completedCount--;
             }
@@ -128,7 +132,7 @@ export class FastTracker implements Tracker {
     }
 
     private addPeerToSwarm(peer: InternalPeerContext, infoHash: any) {
-        let swarm = this.swarms.get(infoHash);
+        let swarm = this._swarms.get(infoHash);
 
         if (swarm === undefined) {
             if (typeof infoHash !== "string") {
@@ -137,7 +141,7 @@ export class FastTracker implements Tracker {
 
             ldebug(() => ["announce: swarm created:", Buffer.from(infoHash).toString("hex")]);
             swarm = new Swarm(infoHash);
-            this.swarms.set(infoHash, swarm);
+            this._swarms.set(infoHash, swarm);
         }
 
         ldebug(() => ["announce: peer", Buffer.from(peer.id!).toString("hex"), "added to swarm", Buffer.from(infoHash).toString("hex")]);
@@ -243,7 +247,7 @@ export class FastTracker implements Tracker {
 
         if (swarm.peers.size === 0) {
             ldebug(() => ["stop event: swarm removed (empty)", Buffer.from(infoHash).toString("hex")]);
-            this.swarms.delete(infoHash);
+            this._swarms.delete(infoHash);
         }
     }
 
@@ -252,7 +256,7 @@ export class FastTracker implements Tracker {
         const files: {[key: string]: { complete: number, incomplete: number, downloaded: number}} = {};
 
         if (infoHash === undefined) {
-            for (const swarm of this.swarms.values()) {
+            for (const swarm of this._swarms.values()) {
                 files[swarm.infoHash] = {
                     complete: swarm.completedCount,
                     incomplete: swarm.peersOrdered.length - swarm.completedCount,
@@ -261,7 +265,7 @@ export class FastTracker implements Tracker {
             }
         } else if (infoHash instanceof Array) {
             for (const singleInfoHash of infoHash) {
-                const swarm = this.swarms.get(singleInfoHash);
+                const swarm = this._swarms.get(singleInfoHash);
                 if (swarm !== undefined) {
                     files[singleInfoHash] = {
                         complete: swarm.completedCount,
@@ -277,7 +281,7 @@ export class FastTracker implements Tracker {
                 }
             }
         } else {
-            const swarm = this.swarms.get(infoHash);
+            const swarm = this._swarms.get(infoHash);
             if (swarm !== undefined) {
                 files[infoHash] = {
                     complete: swarm.completedCount,
@@ -298,17 +302,6 @@ export class FastTracker implements Tracker {
             files: files,
         });
     }
-
-    public get stats() {
-        let peersCount = 0;
-        for (const swarm of this.swarms.values()) {
-            peersCount += swarm.peers.size;
-        }
-        return {
-            torrentsCount: this.swarms.size,
-            peersCount: peersCount,
-        };
-    }
 }
 
 interface SwarmContext {

lib/run-uws-tracker.ts

@@ -57,9 +57,16 @@ async function main() {
 
         server.app
         .get("/stats.json", (response: HttpResponse, request: HttpRequest) => {
+            const swarms = tracker.swarms;
+            let peersCount = 0;
+            for (const swarm of swarms.values()) {
+                peersCount += swarm.peers.size;
+            }
+
             response.writeHeader("Content-Type", "application/json")
             .end(JSON.stringify({
-                ...tracker.stats,
+                torrentsCount: swarms.size,
+                peersCount: peersCount,
                 ...server.stats,
             }));
         })

lib/tracker.ts

@@ -20,7 +20,7 @@ export interface PeerContext {
 }
 
 export interface Tracker {
-    readonly stats: { [x: string]: any; };
+    readonly swarms: ReadonlyMap<string, { peers: ReadonlyMap<string, PeerContext> }>;
     readonly settings: any;
     processMessage(json: any, peer: PeerContext): void;
     disconnectPeer(peer: PeerContext): void;

test/simulation.test.ts

@@ -21,8 +21,8 @@ import { expect } from "chai";
 describe("simulation", () => {
     it("should pass random simulations", () => {
         const simulationsCount = 1000;
-        const torrentsCount = 3;
-        const peersCount = 300;
+        const torrentsCount = 2;
+        const peersCount = 200;
         const offersCount = 10;
         const sameIdPeersRatio = 0.1;
 
@@ -93,30 +93,13 @@ describe("simulation", () => {
             doIteration();
         }
 
-        let activePeersCount = 0;
-        const torrents = new Set<string>();
-
-        for (let i = 0; i < peers.length; i++) {
-            const peer = peers[i];
-            const peerData = peersData[i];
-
-            if (peerData.infoHash) {
-                if ((peer as any).swarms.length !== 1) {
-                    continue;
-                }
-
-                expect((peer as any).swarms[0].swarm.infoHash === peerData.infoHash, "the peer is in a wrong swarm");
-
-                if ((peer as any).swarms[0].swarm.peers.get(peerData.peerId) === peer) {
-                    activePeersCount++;
-                    torrents.add(peerData.infoHash);
-                }
-            } else {
-                expect(((peer as any).swarms === undefined) || ((peer as any).swarms.length === 0), "the peer should not be in a swarm");
+        for (const [swarmId, swarm] of tracker.swarms) {
+            expect(swarm.peers.size > 0, "the swarm can't be empty");
+            for (const peer of swarm.peers.values()) {
+                const peerData = peersData.find(p => p.peerId === peer.id);
+                expect(peerData === undefined, "the peer is missing");
+                expect(peerData!.infoHash === swarmId, "the peer is in a wrong swarm");
             }
         }
-
-        expect(tracker.stats.torrentsCount === torrents.size);
-        expect(tracker.stats.peersCount === activePeersCount);
     });
 });