quake2ts 0.0.288 → 0.0.289

package/packages/server/dist/index.cjs

@@ -175,13 +175,17 @@ function createClient(index, net) {
       numEntities: 0,
       firstEntity: 0,
       sentTime: 0,
-      entities: []
+      entities: [],
+      packetCRC: 0
     });
   }
+  const netchan = new import_shared.NetChan();
+  netchan.setup(Math.floor(Math.random() * 65536));
   return {
     index,
     state: 2 /* Connected */,
     net,
+    netchan,
     userInfo: "",
     lastFrame: 0,
     lastCmd: createEmptyUserCommand(),
@@ -203,7 +207,10 @@ function createClient(index, net) {
     lastConnect: Date.now(),
     challenge: 0,
     messageQueue: [],
-    lastPacketEntities: []
+    lastPacketEntities: [],
+    commandQueue: [],
+    lastCommandTime: 0,
+    commandCount: 0
   };
 }
 function createEmptyUserCommand() {
@@ -1007,9 +1014,17 @@ var DedicatedServer = class {
       client.net.disconnect();
     }
   }
-  handleMove(client, cmd) {
+  handleMove(client, cmd, checksum, lastFrame) {
+    if (lastFrame > 0 && lastFrame <= client.lastFrame && lastFrame > client.lastFrame - import_shared4.UPDATE_BACKUP) {
+      const frameIdx = lastFrame % import_shared4.UPDATE_BACKUP;
+      const frame = client.frames[frameIdx];
+      if (frame.packetCRC !== checksum) {
+        console.warn(`Client ${client.index} checksum mismatch for frame ${lastFrame}: expected ${frame.packetCRC}, got ${checksum}`);
+      }
+    }
     client.lastCmd = cmd;
     client.lastMessage = this.sv.frame;
+    client.commandCount++;
   }
   handleUserInfo(client, info) {
     client.userInfo = info;
@@ -1091,12 +1106,20 @@ var DedicatedServer = class {
   SV_SetConfigString(index, value) {
     if (index < 0 || index >= import_shared4.MAX_CONFIGSTRINGS) return;
     this.sv.configStrings[index] = value;
-    const writer = new import_shared4.BinaryWriter();
-    this.SV_WriteConfigString(writer, index, value);
-    const data = writer.getData();
     for (const client of this.svs.clients) {
       if (client && client.state >= 2 /* Connected */) {
-        client.net.send(data);
+        if (client.netchan) {
+          try {
+            client.netchan.writeReliableByte(import_shared4.ServerCommand.configstring);
+            client.netchan.writeReliableShort(index);
+            client.netchan.writeReliableString(value);
+            const packet = client.netchan.transmit();
+            client.net.send(packet);
+          } catch (e) {
+            console.warn(`Client ${client.index} reliable buffer overflow`);
+            this.dropClient(client);
+          }
+        }
       }
     }
   }
@@ -1109,11 +1132,18 @@ var DedicatedServer = class {
     for (const client of this.svs.clients) {
       if (!client || client.state === 0 /* Free */) continue;
       while (client.messageQueue.length > 0) {
-        const data = client.messageQueue.shift();
-        if (!data) continue;
+        const rawData = client.messageQueue.shift();
+        if (!rawData) continue;
+        const data = client.netchan.process(rawData);
+        if (!data) {
+          continue;
+        }
+        if (data.length === 0) {
+          continue;
+        }
         const reader = new import_shared4.BinaryStream(data.buffer);
         const parser = new ClientMessageParser(reader, {
-          onMove: (checksum, lastFrame, cmd) => this.handleMove(client, cmd),
+          onMove: (checksum, lastFrame, cmd) => this.handleMove(client, cmd, checksum, lastFrame),
           onUserInfo: (info) => this.handleUserInfo(client, info),
           onStringCmd: (cmd) => this.handleStringCmd(client, cmd),
           onNop: () => {
@@ -1147,6 +1177,16 @@ var DedicatedServer = class {
         }
       }
       if (client && client.state === 4 /* Active */ && client.edict) {
+        const now = Date.now();
+        if (now - client.lastCommandTime >= 1e3) {
+          client.lastCommandTime = now;
+          client.commandCount = 0;
+        }
+        if (client.commandCount > 200) {
+          console.warn(`Client ${client.index} kicked for command flooding`);
+          this.dropClient(client);
+          continue;
+        }
         this.game.clientThink(client.edict, client.lastCmd);
       }
     }
@@ -1242,7 +1282,10 @@ var DedicatedServer = class {
       }
     }
     writer.writeShort(0);
-    client.net.send(writer.getData());
+    const frameData = writer.getData();
+    currentFrame.packetCRC = (0, import_shared4.crc8)(frameData);
+    const packet = client.netchan.transmit(frameData);
+    client.net.send(packet);
     client.lastFrame = this.sv.frame;
     client.lastPacketEntities = currentEntityIds;
   }

package/packages/server/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { NetDriver, ServerCommand, PlayerState, EntityState, UserCommand, BinaryStream } from '@quake2ts/shared';
+import { NetDriver, ServerCommand, PlayerState, EntityState, NetChan, UserCommand, BinaryStream } from '@quake2ts/shared';
 import WebSocket from 'ws';
 import { GameEngine, MulticastType, Entity } from '@quake2ts/game';
 
@@ -68,11 +68,13 @@ interface ClientFrame {
     firstEntity: number;
     sentTime: number;
     entities: EntityState[];
+    packetCRC: number;
 }
 interface Client {
     index: number;
     state: ClientState;
     net: NetDriver;
+    netchan: NetChan;
     userInfo: string;
     lastFrame: number;
     lastCmd: UserCommand;
@@ -95,6 +97,9 @@ interface Client {
     challenge: number;
     messageQueue: Uint8Array[];
     lastPacketEntities: number[];
+    commandQueue: UserCommand[];
+    lastCommandTime: number;
+    commandCount: number;
 }
 declare function createClient(index: number, net: NetDriver): Client;
 

package/packages/server/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { NetDriver, ServerCommand, PlayerState, EntityState, UserCommand, BinaryStream } from '@quake2ts/shared';
+import { NetDriver, ServerCommand, PlayerState, EntityState, NetChan, UserCommand, BinaryStream } from '@quake2ts/shared';
 import WebSocket from 'ws';
 import { GameEngine, MulticastType, Entity } from '@quake2ts/game';
 
@@ -68,11 +68,13 @@ interface ClientFrame {
     firstEntity: number;
     sentTime: number;
     entities: EntityState[];
+    packetCRC: number;
 }
 interface Client {
     index: number;
     state: ClientState;
     net: NetDriver;
+    netchan: NetChan;
     userInfo: string;
     lastFrame: number;
     lastCmd: UserCommand;
@@ -95,6 +97,9 @@ interface Client {
     challenge: number;
     messageQueue: Uint8Array[];
     lastPacketEntities: number[];
+    commandQueue: UserCommand[];
+    lastCommandTime: number;
+    commandCount: number;
 }
 declare function createClient(index: number, net: NetDriver): Client;
 

package/packages/server/dist/index.js

@@ -115,7 +115,7 @@ import { WebSocketServer } from "ws";
 import { createGame, MulticastType, Solid } from "@quake2ts/game";
 
 // src/client.ts
-import { UPDATE_BACKUP } from "@quake2ts/shared";
+import { UPDATE_BACKUP, NetChan } from "@quake2ts/shared";
 var ClientState = /* @__PURE__ */ ((ClientState2) => {
   ClientState2[ClientState2["Free"] = 0] = "Free";
   ClientState2[ClientState2["Zombie"] = 1] = "Zombie";
@@ -135,13 +135,17 @@ function createClient(index, net) {
       numEntities: 0,
       firstEntity: 0,
       sentTime: 0,
-      entities: []
+      entities: [],
+      packetCRC: 0
     });
   }
+  const netchan = new NetChan();
+  netchan.setup(Math.floor(Math.random() * 65536));
   return {
     index,
     state: 2 /* Connected */,
     net,
+    netchan,
     userInfo: "",
     lastFrame: 0,
     lastCmd: createEmptyUserCommand(),
@@ -163,7 +167,10 @@ function createClient(index, net) {
     lastConnect: Date.now(),
     challenge: 0,
     messageQueue: [],
-    lastPacketEntities: []
+    lastPacketEntities: [],
+    commandQueue: [],
+    lastCommandTime: 0,
+    commandCount: 0
   };
 }
 function createEmptyUserCommand() {
@@ -271,7 +278,7 @@ var ClientMessageParser = class {
 };
 
 // src/dedicated.ts
-import { BinaryWriter as BinaryWriter2, ServerCommand as ServerCommand2, BinaryStream as BinaryStream2, traceBox, UPDATE_BACKUP as UPDATE_BACKUP2, MAX_CONFIGSTRINGS as MAX_CONFIGSTRINGS2, MAX_EDICTS, CollisionEntityIndex, inPVS, inPHS } from "@quake2ts/shared";
+import { BinaryWriter as BinaryWriter2, ServerCommand as ServerCommand2, BinaryStream as BinaryStream2, traceBox, UPDATE_BACKUP as UPDATE_BACKUP2, MAX_CONFIGSTRINGS as MAX_CONFIGSTRINGS2, MAX_EDICTS, CollisionEntityIndex, inPVS, inPHS, crc8 } from "@quake2ts/shared";
 import { parseBsp } from "@quake2ts/engine";
 import fs from "fs/promises";
 import { createPlayerInventory, createPlayerWeaponStates } from "@quake2ts/game";
@@ -967,9 +974,17 @@ var DedicatedServer = class {
       client.net.disconnect();
     }
   }
-  handleMove(client, cmd) {
+  handleMove(client, cmd, checksum, lastFrame) {
+    if (lastFrame > 0 && lastFrame <= client.lastFrame && lastFrame > client.lastFrame - UPDATE_BACKUP2) {
+      const frameIdx = lastFrame % UPDATE_BACKUP2;
+      const frame = client.frames[frameIdx];
+      if (frame.packetCRC !== checksum) {
+        console.warn(`Client ${client.index} checksum mismatch for frame ${lastFrame}: expected ${frame.packetCRC}, got ${checksum}`);
+      }
+    }
     client.lastCmd = cmd;
     client.lastMessage = this.sv.frame;
+    client.commandCount++;
   }
   handleUserInfo(client, info) {
     client.userInfo = info;
@@ -1051,12 +1066,20 @@ var DedicatedServer = class {
   SV_SetConfigString(index, value) {
     if (index < 0 || index >= MAX_CONFIGSTRINGS2) return;
     this.sv.configStrings[index] = value;
-    const writer = new BinaryWriter2();
-    this.SV_WriteConfigString(writer, index, value);
-    const data = writer.getData();
     for (const client of this.svs.clients) {
       if (client && client.state >= 2 /* Connected */) {
-        client.net.send(data);
+        if (client.netchan) {
+          try {
+            client.netchan.writeReliableByte(ServerCommand2.configstring);
+            client.netchan.writeReliableShort(index);
+            client.netchan.writeReliableString(value);
+            const packet = client.netchan.transmit();
+            client.net.send(packet);
+          } catch (e) {
+            console.warn(`Client ${client.index} reliable buffer overflow`);
+            this.dropClient(client);
+          }
+        }
       }
     }
   }
@@ -1069,11 +1092,18 @@ var DedicatedServer = class {
     for (const client of this.svs.clients) {
       if (!client || client.state === 0 /* Free */) continue;
       while (client.messageQueue.length > 0) {
-        const data = client.messageQueue.shift();
-        if (!data) continue;
+        const rawData = client.messageQueue.shift();
+        if (!rawData) continue;
+        const data = client.netchan.process(rawData);
+        if (!data) {
+          continue;
+        }
+        if (data.length === 0) {
+          continue;
+        }
         const reader = new BinaryStream2(data.buffer);
         const parser = new ClientMessageParser(reader, {
-          onMove: (checksum, lastFrame, cmd) => this.handleMove(client, cmd),
+          onMove: (checksum, lastFrame, cmd) => this.handleMove(client, cmd, checksum, lastFrame),
           onUserInfo: (info) => this.handleUserInfo(client, info),
           onStringCmd: (cmd) => this.handleStringCmd(client, cmd),
           onNop: () => {
@@ -1107,6 +1137,16 @@ var DedicatedServer = class {
         }
       }
       if (client && client.state === 4 /* Active */ && client.edict) {
+        const now = Date.now();
+        if (now - client.lastCommandTime >= 1e3) {
+          client.lastCommandTime = now;
+          client.commandCount = 0;
+        }
+        if (client.commandCount > 200) {
+          console.warn(`Client ${client.index} kicked for command flooding`);
+          this.dropClient(client);
+          continue;
+        }
         this.game.clientThink(client.edict, client.lastCmd);
       }
     }
@@ -1202,7 +1242,10 @@ var DedicatedServer = class {
       }
     }
     writer.writeShort(0);
-    client.net.send(writer.getData());
+    const frameData = writer.getData();
+    currentFrame.packetCRC = crc8(frameData);
+    const packet = client.netchan.transmit(frameData);
+    client.net.send(packet);
     client.lastFrame = this.sv.frame;
     client.lastPacketEntities = currentEntityIds;
   }