fix

src/Peer.ts

@@ -50,14 +50,21 @@ export class Peer implements PeerMessage, PeerQuality, RouterConfig {
     this.time = data.time;
   }
 
-  update(time: number) {
+  update(): PeerQuality {
     if (this.reliability === 0) {
       return;
     }
+
     // 有几个包没到
-    const step = Math.floor((time - this.time + this.delay - config.interval) / config.interval);
+    const step = Math.floor((Date.now() - this.time + this.delay - config.interval) / config.interval);
     if (step > config.timeout) {
       this.reset();
     }
+
+    return {
+      delay: Math.round(this.delay),
+      jitter: 0,
+      reliability: this.reliability
+    };
   }
 }

src/Server.ts

@@ -4,7 +4,7 @@ import config from '../config/config.json';
 
 import { RouteWriter } from './RouteWriter';
 import { Peer } from './Peer';
-import { DownloadMessage, PeerMessage, PeerQuality, UploadMessage } from '../protocol';
+import { DownloadMessage, PeerMessage, UploadMessage } from '../protocol';
 
 export class Server {
   ack = 0;
@@ -13,7 +13,7 @@ export class Server {
     console.log(message);
 
     if (message.seq && this.ack !== message.seq) {
-      console.log("seq mismatch rejected");
+      console.log('seq mismatch rejected');
       return;
     }
 
@@ -39,26 +39,11 @@ export class Server {
   }
 
   update(socket: Socket, self: PeerMessage, peers: Peer[]) {
-    const p: Record<number, PeerQuality> = {};
-
-    for (const peer of peers) {
-      if (peer.reliability === 0) {
-        continue;
-      }
-      // 有几个包没到
-      const step = Math.max(0, Math.floor((self.time - peer.time + peer.delay - config.interval / 2) / config.interval));
-      if (step >= config.timeout) {
-        peer.reset();
-        continue;
-      }
-
-      const { id, delay } = peer;
-      const reliability = (peer.reliability * (config.timeout - step)) / config.timeout;
-      // TODO: jitter 没算
-      p[id] = { delay: Math.round(delay), jitter: 0, reliability };
-    }
-
-    const message: UploadMessage = { id: self.id, ack: this.ack, peers: p };
+    const message: UploadMessage = {
+      id: self.id,
+      ack: this.ack,
+      peers: Object.fromEntries(peers.map(peer => [peer.id, peer.update()]))
+    };
     // console.log(message);
     socket.send(JSON.stringify(message), config.server_port, config.server_address);
   }

src/main.ts

@@ -38,10 +38,8 @@ const socket = dgram
 socket.bind(config.port);
 
 setInterval(() => {
-  self.time = Date.now();
   const message = JSON.stringify(self);
   for (const peer of peers) {
-    peer.update(self.time);
     socket.send(message, config.port, `10.200.${peer.id}.${self.id}`);
   }
   server.update(socket, self, peers);