fix: 修复节点被 ban 仍然分发流量的问题

SaltWood-Studio · Sep 30, 2024 · 7e4b213 · 7e4b213
1 parent 6b8fc67
commit 7e4b213
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/FileList.ts b/src/FileList.ts
@@ -79,7 +79,7 @@ export class FileList {
         const availableClusters: ClusterEntity[] = [];
         const values = clusters? clusters : this._clusters;
 
-        for (const cluster of values.filter(c => c.isOnline)) {
+        for (const cluster of values.filter(c => c.isOnline && !(c.isBanned))) {
             if (FileList.availableInCluster(file, cluster)) {
                 availableClusters.push(cluster);
             }

diff --git a/src/Server.ts b/src/Server.ts
@@ -792,10 +792,23 @@ export class Server {
                 return;
             }
             cluster.isBanned = Number(data.ban);
+            cluster.doOffline("This cluster is banned.");
             this.db.update(cluster);
             res.setHeader('Content-Type', 'application/json');
             res.status(200).json(cluster.getJson(true, false));
         });
+        this.app.post('/93AtHome/super/cluster/kick', (req: Request, res: Response) => {
+            if (!Utilities.verifyAdmin(req, res, this.db)) return;
+            const clusterId = req.query.clusterId as string || "";
+            const cluster = this.clusters.find(c => c.clusterId === clusterId);
+            if (!cluster) {
+                res.status(404).send(); // 集群不存在
+                return;
+            }
+            cluster.doOffline("Operator kicked this cluster.");
+            this.db.update(cluster);
+            res.status(200).json(cluster.getJson(true, false));
+        });
         this.app.post('/93AtHome/super/cluster/profile', (req: Request, res: Response) => {
             if (!Utilities.verifyAdmin(req, res, this.db)) return;
             const userId = JwtHelper.getInstance().verifyToken(req.cookies.token, 'user') as { userId: number };
@@ -1035,6 +1048,7 @@ export class Server {
                     }
                     else if (cluster?.isBanned) {
                         socket.send("This cluster is banned.");
+                        cluster.doOffline("This cluster is banned.");
                     }
                     ack([null, false]);
                 }