Configured Sonar static code analyzer

mrlika · mrlika · commit dedc981530e3 · 2019-03-05T13:07:43.000+02:00
diff --git a/lib/fast-tracker.ts b/lib/fast-tracker.ts
@@ -62,8 +62,8 @@ export class FastTracker implements Tracker {
     }
 
     private processAnnounce(json: any, peer: InternalPeerContext, completed: boolean = false) {
-        const infoHash: string = json.info_hash;
-        const peerId: string = json.peer_id;
+        const infoHash = json.info_hash;
+        const peerId = json.peer_id;
 
         let swarmContext: SwarmContext | undefined;
 
@@ -82,28 +82,7 @@ export class FastTracker implements Tracker {
         }
 
         if (swarmContext === undefined) {
-            let swarm = this.swarms.get(infoHash);
-
-            if (swarm === undefined) {
-                if (typeof infoHash !== "string") {
-                    throw new TrackerError("announce: info_hash field is missing or wrong");
-                }
-
-                ldebug(() => ["announce: swarm created:", Buffer.from(infoHash).toString("hex")]);
-                swarm = new Swarm(infoHash);
-                this.swarms.set(infoHash, swarm);
-            }
-
-            ldebug(() => ["announce: peer", Buffer.from(peerId).toString("hex"), "added to swarm", Buffer.from(infoHash).toString("hex")]);
-
-            const previousPeer = swarm.peers.get(peerId);
-            if (previousPeer !== undefined) {
-                removePeerFromSwarm(previousPeer, infoHash);
-            }
-
-            swarm.addPeer(peer);
-            swarmContext = { completed: false, swarm: swarm };
-            peer.swarms!.push(swarmContext);
+            swarmContext = this.addPeerToSwarm(peer, infoHash);
         }
 
         const swarm = swarmContext.swarm;
@@ -122,49 +101,70 @@ export class FastTracker implements Tracker {
             incomplete: swarm.peers.size - swarm.completedCount
         });
 
-        const offers: any[] | undefined = json.offers;
-        if (offers == undefined) {
+        this.sendOffersToPeers(json, swarmPeers, peer, infoHash);
+    }
+
+    private addPeerToSwarm(peer: InternalPeerContext, infoHash: any) {
+        let swarm = this.swarms.get(infoHash);
+
+        if (swarm === undefined) {
+            if (typeof infoHash !== "string") {
+                throw new TrackerError("announce: info_hash field is missing or wrong");
+            }
+
+            ldebug(() => ["announce: swarm created:", Buffer.from(infoHash).toString("hex")]);
+            swarm = new Swarm(infoHash);
+            this.swarms.set(infoHash, swarm);
+        }
+
+        ldebug(() => ["announce: peer", Buffer.from(peer.id!).toString("hex"), "added to swarm", Buffer.from(infoHash).toString("hex")]);
+
+        const previousPeer = swarm.peers.get(peer.id!);
+        if (previousPeer !== undefined) {
+            removePeerFromSwarm(previousPeer, infoHash);
+        }
+
+        swarm.addPeer(peer);
+        const swarmContext = { completed: false, swarm: swarm };
+        peer.swarms!.push(swarmContext);
+
+        return swarmContext;
+    }
+
+    private sendOffersToPeers(json: any, peers: ReadonlyArray<InternalPeerContext>, peer: InternalPeerContext, infoHash: string) {
+        if (peers.length <= 1) {
             return;
-        } else if (!(offers instanceof Array)) {
-            throw new TrackerError("announce: offers field is not an array");
         }
 
-        if (swarmPeers.length <= 1) {
+        const offers: any = json.offers;
+        if (offers == undefined) {
             return;
+        } else if (!(offers instanceof Array)) {
+            throw new TrackerError("announce: offers field is not an array");
         }
 
         const numwant = json.numwant;
         if (!Number.isInteger(numwant)) {
             return;
         }
 
-        const countPeersToSend = swarmPeers.length - 1;
+        const countPeersToSend = peers.length - 1;
         const countOffersToSend = Math.min(countPeersToSend, offers.length, this.settings.maxOffers, numwant);
 
-        if (countOffersToSend == countPeersToSend) {
-            // we have offers for all the peers from the swarm - send offers to all
-            const offersIterator = offers.values();
-            for (const toPeer of swarmPeers) {
-                if (toPeer !== peer) {
-                    sendOffer(offersIterator.next().value, peerId, toPeer, infoHash);
-                }
-            }
-        } else {
-            let peerIndex = Math.floor(Math.random() * swarmPeers.length);
-            // send offers to random peers
-            for (let i = 0; i < countOffersToSend; i++) {
-                const toPeer = swarmPeers[peerIndex];
+        let peerIndex = (countOffersToSend == countPeersToSend) ? 0 : Math.floor(Math.random() * peers.length);
 
-                if (toPeer === peer) {
-                    i--; // do one more iteration
-                } else {
-                    sendOffer(offers[i], peerId, toPeer, infoHash);
-                }
+        for (let i = 0; i < countOffersToSend; i++) {
+            const toPeer = peers[peerIndex];
 
-                peerIndex++;
-                if (peerIndex == swarmPeers.length) {
-                    peerIndex = 0;
-                }
+            if (toPeer === peer) {
+                i--; // do one more iteration
+            } else {
+                sendOffer(offers[i], peer.id!, toPeer, infoHash);
+            }
+
+            peerIndex++;
+            if (peerIndex == peers.length) {
+                peerIndex = 0;
             }
         }
 
diff --git a/lib/run-uws-tracker.ts b/lib/run-uws-tracker.ts
@@ -73,8 +73,10 @@ async function main() {
     }
 }
 
-try {
-    main();
-} catch (e) {
-    console.error(e);
-}
+(async () => {
+    try {
+        await main();
+    } catch (e) {
+        console.error(e);
+    }
+})();
diff --git a/lib/uws-tracker.ts b/lib/uws-tracker.ts
@@ -23,6 +23,7 @@ import { ldebug } from "./lambda-debug";
 
 const debugWebSockets = Debug("wt-tracker:uws-tracker");
 const ldebugMessages = ldebug(Debug("wt-tracker:uws-tracker-messages"));
+const decoder = new StringDecoder();
 
 export class UWebSocketsTracker {
     private app_: TemplatedApp;
@@ -62,8 +63,6 @@ export class UWebSocketsTracker {
     }
 
     private buildApplication() {
-        const decoder = new StringDecoder();
-
         this.app_
         .ws(this.settings.websockets.path, {
             compression: this.settings.websockets.compression,
@@ -73,59 +72,65 @@ export class UWebSocketsTracker {
                 this.webSocketsCount++;
                 debugWebSockets("connected via URL", request.getUrl());
             },
-            message: (ws: WebSocket, message: ArrayBuffer, isBinary: boolean) => {
-                debugWebSockets("message of size", message.byteLength);
-
-                let json: any;
-                try {
-                    json = JSON.parse(decoder.end(new Uint8Array(message) as any));
-                } catch (e) {
-                    debugWebSockets("failed to parse JSON message", e);
-                    ws.close();
-                    return;
-                }
-
-                let peer: PeerContext | undefined = (ws as any).peer;
-
-                ldebugMessages(() => ["in", (peer && peer.id) ? Buffer.from(peer.id).toString("hex") : "unknown peer", json]);
-
-                if (peer === undefined) {
-                    peer = {
-                        sendMessage: (json: any) => {
-                            ws.send(JSON.stringify(json), false, false);
-                            ldebugMessages(() => ["out", peer!.id ? Buffer.from(peer!.id).toString("hex") : "unknown peer", json]);
-                        }
-                    };
-                    (ws as any).peer = peer;
-                }
-
-                try {
-                    this.tracker.processMessage(json, peer);
-                } catch (e) {
-                    if (e instanceof TrackerError) {
-                        debugWebSockets("failed to process message from the peer:", e);
-                    } else {
-                        throw e;
-                    }
-                    ws.close();
-                    return;
-                }
-            },
             drain: (ws: WebSocket) => {
-                debugWebSockets("backpressure", ws.getBufferedAmount());
+                debugWebSockets("drain", ws.getBufferedAmount());
             },
-            close: (ws: WebSocket, code: number, message: ArrayBuffer) => {
-                this.webSocketsCount--;
-                const peer: PeerContext | undefined = (ws as any).peer;
+            message: this.onMessage,
+            close: this.onClose
+        });
+    }
 
-                if (peer !== undefined) {
-                    delete (ws as any).peer;
-                    this.tracker.disconnectPeer(peer);
+    private onMessage = (ws: WebSocket, message: ArrayBuffer, isBinary: boolean) => {
+        debugWebSockets("message of size", message.byteLength);
+
+        let json: any;
+        try {
+            json = JSON.parse(decoder.end(new Uint8Array(message) as any));
+        } catch (e) {
+            debugWebSockets("failed to parse JSON message", e);
+            ws.close();
+            return;
+        }
+
+        let peer: PeerContext | undefined = (ws as any).peer;
+
+        ldebugMessages(() => ["in",
+                (peer && peer.id) ? Buffer.from(peer.id).toString("hex") : "unknown peer", json]);
+
+        if (peer === undefined) {
+            peer = {
+                sendMessage: (json: any) => {
+                    ws.send(JSON.stringify(json), false, false);
+                    ldebugMessages(() => ["out",
+                            peer!.id ? Buffer.from(peer!.id).toString("hex") : "unknown peer", json]);
                 }
-
-                debugWebSockets("closed with code", code);
+            };
+            (ws as any).peer = peer;
+        }
+
+        try {
+            this.tracker.processMessage(json, peer);
+        } catch (e) {
+            if (e instanceof TrackerError) {
+                debugWebSockets("failed to process message from the peer:", e);
+            } else {
+                throw e;
             }
-        });
+            ws.close();
+            return;
+        }
+    }
+
+    private onClose = () => (ws: WebSocket, code: number, message: ArrayBuffer) => {
+        this.webSocketsCount--;
+        const peer: PeerContext | undefined = (ws as any).peer;
+
+        if (peer !== undefined) {
+            delete (ws as any).peer;
+            this.tracker.disconnectPeer(peer);
+        }
+
+        debugWebSockets("closed with code", code);
     }
 
     public async run() {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -54,6 +54,7 @@
     "nyc": "^13.3.0",
     "rimraf": "^2.6.3",
     "tslint": "^5.13.1",
+    "tslint-sonarts": "^1.9.0",
     "typescript": "^3.3.3333"
   }
 }
diff --git a/test/simulation.test.ts b/test/simulation.test.ts
@@ -112,7 +112,7 @@ describe("simulation", () => {
 
                 if ((peer as any).swarms[0].swarm.peers.get(peerData.peerId) === peer) {
                     activePeersCount++;
-                    torrents.add(peerData.infoHash!);
+                    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");
diff --git a/tslint.json b/tslint.json
@@ -54,5 +54,6 @@
     "jsdoc-format": true,
     "eofline": true
   },
-  "defaultSeverity": "warning"
+  "defaultSeverity": "warning",
+  "extends": ["tslint-sonarts"]
 }

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@`
`54`	`54`	`"nyc": "^13.3.0",`
`55`	`55`	`"rimraf": "^2.6.3",`
`56`	`56`	`"tslint": "^5.13.1",`
	`57`	`+ "tslint-sonarts": "^1.9.0",`
`57`	`58`	`"typescript": "^3.3.3333"`
`58`	`59`	`}`
`59`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ describe("simulation", () => {`
`112`	`112`
`113`	`113`	`if ((peer as any).swarms[0].swarm.peers.get(peerData.peerId) === peer) {`
`114`	`114`	`activePeersCount++;`
`115`		`- torrents.add(peerData.infoHash!);`
	`115`	`+ torrents.add(peerData.infoHash);`
`116`	`116`	`}`
`117`	`117`	`} else {`
`118`	`118`	`expect(((peer as any).swarms === undefined) \|\| ((peer as any).swarms.length === 0), "the peer should not be in a swarm");`
Original file line number	Diff line number	Diff line change
`@@ -54,5 +54,6 @@`
`54`	`54`	`"jsdoc-format": true,`
`55`	`55`	`"eofline": true`
`56`	`56`	`},`
`57`		`- "defaultSeverity": "warning"`
	`57`	`+ "defaultSeverity": "warning",`
	`58`	`+ "extends": ["tslint-sonarts"]`
`58`	`59`	`}`