quake2ts 0.0.181 → 0.0.183

package/packages/server/dist/index.cjs

@@ -155,37 +155,82 @@ var import_ws2 = require("ws");
 var import_game = require("@quake2ts/game");
 
 // src/client.ts
+var import_shared = require("@quake2ts/shared");
 var ClientState = /* @__PURE__ */ ((ClientState2) => {
   ClientState2[ClientState2["Free"] = 0] = "Free";
-  ClientState2[ClientState2["Connected"] = 1] = "Connected";
-  ClientState2[ClientState2["Primed"] = 2] = "Primed";
-  ClientState2[ClientState2["Active"] = 3] = "Active";
-  ClientState2[ClientState2["Spawned"] = 4] = "Spawned";
+  ClientState2[ClientState2["Zombie"] = 1] = "Zombie";
+  ClientState2[ClientState2["Connected"] = 2] = "Connected";
+  ClientState2[ClientState2["Spawned"] = 3] = "Spawned";
+  ClientState2[ClientState2["Active"] = 4] = "Active";
   return ClientState2;
 })(ClientState || {});
 function createClient(index, net) {
+  const frames = [];
+  for (let i = 0; i < import_shared.UPDATE_BACKUP; i++) {
+    frames.push({
+      areaBytes: 0,
+      areaBits: new Uint8Array(0),
+      // Size depends on map areas
+      playerState: createEmptyPlayerState(),
+      numEntities: 0,
+      firstEntity: 0,
+      sentTime: 0
+    });
+  }
   return {
     index,
-    state: 1 /* Connected */,
+    state: 2 /* Connected */,
     net,
-    name: `Player ${index}`,
     userInfo: "",
+    lastFrame: 0,
+    lastCmd: createEmptyUserCommand(),
+    commandMsec: 0,
+    frameLatency: [],
+    ping: 0,
+    messageSize: [],
+    rate: 25e3,
+    // Default rate
+    suppressCount: 0,
     edict: null,
-    lastCmd: {
-      msec: 0,
-      buttons: 0,
-      angles: { x: 0, y: 0, z: 0 },
-      forwardmove: 0,
-      sidemove: 0,
-      upmove: 0
-    },
-    lastPacketTime: Date.now(),
-    lastFrame: 0
+    name: `Player ${index}`,
+    messageLevel: 0,
+    datagram: new Uint8Array(0),
+    frames,
+    downloadSize: 0,
+    downloadCount: 0,
+    lastMessage: 0,
+    lastConnect: Date.now(),
+    challenge: 0,
+    messageQueue: []
+  };
+}
+function createEmptyUserCommand() {
+  return {
+    msec: 0,
+    buttons: 0,
+    angles: { x: 0, y: 0, z: 0 },
+    forwardmove: 0,
+    sidemove: 0,
+    upmove: 0
+  };
+}
+function createEmptyPlayerState() {
+  return {
+    origin: { x: 0, y: 0, z: 0 },
+    velocity: { x: 0, y: 0, z: 0 },
+    viewAngles: { x: 0, y: 0, z: 0 },
+    onGround: false,
+    waterLevel: 0,
+    mins: { x: -16, y: -16, z: -24 },
+    maxs: { x: 16, y: 16, z: 32 },
+    damageAlpha: 0,
+    damageIndicators: [],
+    blend: [0, 0, 0, 0]
   };
 }
 
 // src/protocol.ts
-var import_shared = require("@quake2ts/shared");
+var import_shared2 = require("@quake2ts/shared");
 var ClientMessageParser = class {
   constructor(stream, handler) {
     this.stream = stream;
@@ -196,16 +241,16 @@ var ClientMessageParser = class {
       const cmdId = this.stream.readByte();
       if (cmdId === -1) break;
       switch (cmdId) {
-        case import_shared.ClientCommand.move:
+        case import_shared2.ClientCommand.move:
           this.parseMove();
           break;
-        case import_shared.ClientCommand.userinfo:
+        case import_shared2.ClientCommand.userinfo:
           this.parseUserInfo();
           break;
-        case import_shared.ClientCommand.stringcmd:
+        case import_shared2.ClientCommand.stringcmd:
           this.parseStringCmd();
           break;
-        case import_shared.ClientCommand.nop:
+        case import_shared2.ClientCommand.nop:
           this.handler.onNop();
           break;
         default:
@@ -251,10 +296,150 @@ var ClientMessageParser = class {
 };
 
 // src/dedicated.ts
-var import_shared2 = require("@quake2ts/shared");
+var import_shared3 = require("@quake2ts/shared");
 var import_engine = require("@quake2ts/engine");
 var import_promises = __toESM(require("fs/promises"), 1);
 var import_game2 = require("@quake2ts/game");
+
+// src/protocol/entity.ts
+var U_ORIGIN1 = 1 << 0;
+var U_ORIGIN2 = 1 << 1;
+var U_ANGLE2 = 1 << 2;
+var U_ANGLE3 = 1 << 3;
+var U_FRAME8 = 1 << 4;
+var U_EVENT = 1 << 5;
+var U_REMOVE = 1 << 6;
+var U_MOREBITS1 = 1 << 7;
+var U_NUMBER16 = 1 << 8;
+var U_ORIGIN3 = 1 << 9;
+var U_ANGLE1 = 1 << 10;
+var U_MODEL = 1 << 11;
+var U_RENDERFX8 = 1 << 12;
+var U_EFFECTS8 = 1 << 14;
+var U_MOREBITS2 = 1 << 15;
+var U_SKIN8 = 1 << 16;
+var U_FRAME16 = 1 << 17;
+var U_RENDERFX16 = 1 << 18;
+var U_EFFECTS16 = 1 << 19;
+var U_MOREBITS3 = 1 << 23;
+var U_OLDORIGIN = 1 << 24;
+var U_SKIN16 = 1 << 25;
+var U_SOUND = 1 << 26;
+var U_SOLID = 1 << 27;
+var NULL_STATE = {
+  number: 0,
+  origin: { x: 0, y: 0, z: 0 },
+  angles: { x: 0, y: 0, z: 0 },
+  modelIndex: 0,
+  frame: 0,
+  skinNum: 0,
+  effects: 0,
+  renderfx: 0,
+  solid: 0,
+  sound: 0,
+  event: 0
+};
+function writeDeltaEntity(from, to, writer, force, newEntity) {
+  let bits = 0;
+  if (newEntity) {
+    from = NULL_STATE;
+  }
+  if (to.modelIndex !== from.modelIndex || force) {
+    bits |= U_MODEL;
+  }
+  if (to.origin.x !== from.origin.x || force) {
+    bits |= U_ORIGIN1;
+  }
+  if (to.origin.y !== from.origin.y || force) {
+    bits |= U_ORIGIN2;
+  }
+  if (to.origin.z !== from.origin.z || force) {
+    bits |= U_ORIGIN3;
+  }
+  if (to.angles.x !== from.angles.x || force) {
+    bits |= U_ANGLE1;
+  }
+  if (to.angles.y !== from.angles.y || force) {
+    bits |= U_ANGLE2;
+  }
+  if (to.angles.z !== from.angles.z || force) {
+    bits |= U_ANGLE3;
+  }
+  if (to.frame !== from.frame || force) {
+    if (to.frame >= 256) bits |= U_FRAME16;
+    else bits |= U_FRAME8;
+  }
+  if (to.skinNum !== from.skinNum || force) {
+    if (to.skinNum >= 256) bits |= U_SKIN16;
+    else bits |= U_SKIN8;
+  }
+  if (to.effects !== from.effects || force) {
+    if (to.effects >= 256) bits |= U_EFFECTS16;
+    else bits |= U_EFFECTS8;
+  }
+  if (to.renderfx !== from.renderfx || force) {
+    if (to.renderfx >= 256) bits |= U_RENDERFX16;
+    else bits |= U_RENDERFX8;
+  }
+  if (to.solid !== from.solid || force) {
+    bits |= U_SOLID;
+  }
+  if (to.sound !== from.sound || force) {
+    bits |= U_SOUND;
+  }
+  if (to.event !== from.event || force) {
+    bits |= U_EVENT;
+  }
+  if (to.number >= 256) {
+    bits |= U_NUMBER16;
+  }
+  if (bits & 4294967040) {
+    bits |= U_MOREBITS1;
+  }
+  if (bits & 4294901760) {
+    bits |= U_MOREBITS2;
+  }
+  if (bits & 4278190080) {
+    bits |= U_MOREBITS3;
+  }
+  writer.writeByte(bits & 255);
+  if (bits & U_MOREBITS1) {
+    writer.writeByte(bits >> 8 & 255);
+  }
+  if (bits & U_MOREBITS2) {
+    writer.writeByte(bits >> 16 & 255);
+  }
+  if (bits & U_MOREBITS3) {
+    writer.writeByte(bits >> 24 & 255);
+  }
+  if (bits & U_NUMBER16) {
+    writer.writeShort(to.number);
+  } else {
+    writer.writeByte(to.number);
+  }
+  if (bits & U_MODEL) writer.writeByte(to.modelIndex);
+  if (bits & U_FRAME8) writer.writeByte(to.frame);
+  if (bits & U_FRAME16) writer.writeShort(to.frame);
+  if (bits & U_SKIN8) writer.writeByte(to.skinNum);
+  if (bits & U_SKIN16) writer.writeShort(to.skinNum);
+  if (bits & U_EFFECTS8) writer.writeByte(to.effects);
+  if (bits & U_EFFECTS16) writer.writeShort(to.effects);
+  if (bits & U_RENDERFX8) writer.writeByte(to.renderfx);
+  if (bits & U_RENDERFX16) writer.writeShort(to.renderfx);
+  if (bits & U_ORIGIN1) writer.writeCoord(to.origin.x);
+  if (bits & U_ORIGIN2) writer.writeCoord(to.origin.y);
+  if (bits & U_ORIGIN3) writer.writeCoord(to.origin.z);
+  if (bits & U_ANGLE1) writer.writeAngle(to.angles.x);
+  if (bits & U_ANGLE2) writer.writeAngle(to.angles.y);
+  if (bits & U_ANGLE3) writer.writeAngle(to.angles.z);
+  if (bits & U_OLDORIGIN) {
+  }
+  if (bits & U_SOUND) writer.writeByte(to.sound ?? 0);
+  if (bits & U_EVENT) writer.writeByte(to.event ?? 0);
+  if (bits & U_SOLID) writer.writeShort(to.solid);
+}
+
+// src/dedicated.ts
 var MAX_CLIENTS = 16;
 var FRAME_RATE = 10;
 var FRAME_TIME_MS = 1e3 / FRAME_RATE;
@@ -265,27 +450,43 @@ var DedicatedServer = class {
     this.game = null;
     this.frameInterval = null;
     this.svs = {
-      clients: new Array(MAX_CLIENTS).fill(null)
+      initialized: false,
+      realTime: 0,
+      mapCmd: "",
+      spawnCount: 0,
+      clients: new Array(MAX_CLIENTS).fill(null),
+      lastHeartbeat: 0,
+      challenges: []
     };
     this.sv = {
+      state: 0 /* Dead */,
+      attractLoop: false,
+      loadGame: false,
       startTime: 0,
+      // Initialize startTime
       time: 0,
       frame: 0,
-      mapName: "",
-      collisionModel: null
+      name: "",
+      collisionModel: null,
+      configStrings: new Array(import_shared3.MAX_CONFIGSTRINGS).fill(""),
+      baselines: new Array(import_shared3.MAX_EDICTS).fill(null),
+      multicastBuf: new Uint8Array(0)
     };
   }
   async start(mapName) {
     console.log(`Starting Dedicated Server on port ${this.port}...`);
-    this.sv.mapName = mapName;
+    this.sv.name = mapName;
+    this.svs.initialized = true;
+    this.svs.spawnCount++;
     this.wss = new import_ws2.WebSocketServer({ port: this.port });
     this.wss.on("connection", (ws) => {
       console.log("New connection");
       this.handleConnection(ws);
     });
     try {
-      console.log(`Loading map ${this.sv.mapName}...`);
-      const mapData = await import_promises.default.readFile(this.sv.mapName);
+      console.log(`Loading map ${this.sv.name}...`);
+      this.sv.state = 1 /* Loading */;
+      const mapData = await import_promises.default.readFile(this.sv.name);
       const arrayBuffer = mapData.buffer.slice(mapData.byteOffset, mapData.byteOffset + mapData.byteLength);
       const bspMap = (0, import_engine.parseBsp)(arrayBuffer);
       this.sv.collisionModel = bspMap;
@@ -308,7 +509,7 @@ var DedicatedServer = class {
             ent: null
           };
         }
-        const result = (0, import_shared2.traceBox)({
+        const result = (0, import_shared3.traceBox)({
           start,
           end,
           mins: mins || void 0,
@@ -342,6 +543,7 @@ var DedicatedServer = class {
     });
     this.game.init(0);
     this.game.spawnWorld();
+    this.sv.state = 2 /* Game */;
     this.frameInterval = setInterval(() => this.runFrame(), FRAME_TIME_MS);
     console.log("Server started.");
   }
@@ -349,6 +551,7 @@ var DedicatedServer = class {
     if (this.frameInterval) clearInterval(this.frameInterval);
     if (this.wss) this.wss.close();
     this.game?.shutdown();
+    this.sv.state = 0 /* Dead */;
   }
   handleConnection(ws) {
     let clientIndex = -1;
@@ -371,19 +574,7 @@ var DedicatedServer = class {
   }
   onClientMessage(client, data) {
     const buffer = data.byteOffset === 0 && data.byteLength === data.buffer.byteLength ? data.buffer : data.slice().buffer;
-    const reader = new import_shared2.BinaryStream(buffer);
-    const parser = new ClientMessageParser(reader, {
-      onMove: (checksum, lastFrame, cmd) => this.handleMove(client, cmd),
-      onUserInfo: (info) => this.handleUserInfo(client, info),
-      onStringCmd: (cmd) => this.handleStringCmd(client, cmd),
-      onNop: () => {
-      },
-      onBad: () => {
-        console.warn(`Bad command from client ${client.index}`);
-        client.net.disconnect();
-      }
-    });
-    parser.parseMessage();
+    client.messageQueue.push(new Uint8Array(buffer));
   }
   onClientDisconnect(client) {
     console.log(`Client ${client.index} disconnected`);
@@ -391,8 +582,8 @@ var DedicatedServer = class {
   }
   handleMove(client, cmd) {
     client.lastCmd = cmd;
-    client.lastPacketTime = Date.now();
-    if (client.state === 1 /* Connected */) {
+    client.lastMessage = this.sv.frame;
+    if (client.state === 2 /* Connected */) {
       this.spawnClient(client);
     }
   }
@@ -409,12 +600,12 @@ var DedicatedServer = class {
       buttons: 0
     });
     client.edict = ent;
-    client.state = 3 /* Active */;
+    client.state = 4 /* Active */;
     this.sendServerData(client);
   }
   sendServerData(client) {
-    const writer = new import_shared2.BinaryWriter();
-    writer.writeByte(import_shared2.ServerCommand.serverdata);
+    const writer = new import_shared3.BinaryWriter();
+    writer.writeByte(import_shared3.ServerCommand.serverdata);
     writer.writeLong(34);
     writer.writeLong(this.sv.frame);
     writer.writeByte(0);
@@ -424,41 +615,74 @@ var DedicatedServer = class {
     client.net.send(writer.getData());
   }
   SV_ReadPackets() {
+    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 reader = new import_shared3.BinaryStream(data.buffer);
+        const parser = new ClientMessageParser(reader, {
+          onMove: (checksum, lastFrame, cmd) => this.handleMove(client, cmd),
+          onUserInfo: (info) => this.handleUserInfo(client, info),
+          onStringCmd: (cmd) => this.handleStringCmd(client, cmd),
+          onNop: () => {
+          },
+          onBad: () => {
+            console.warn(`Bad command from client ${client.index}`);
+          }
+        });
+        try {
+          parser.parseMessage();
+        } catch (e) {
+          console.error(`Error parsing message from client ${client.index}:`, e);
+        }
+      }
+    }
   }
   runFrame() {
     if (!this.game) return;
     this.sv.frame++;
+    this.sv.time += 100;
     this.SV_ReadPackets();
     for (const client of this.svs.clients) {
-      if (client && client.state === 3 /* Active */ && client.edict) {
+      if (client && client.state === 4 /* Active */ && client.edict) {
         this.game.clientThink(client.edict, client.lastCmd);
       }
     }
-    this.game.frame({
+    const snapshot = this.game.frame({
       frame: this.sv.frame,
       deltaMs: FRAME_TIME_MS,
       nowMs: Date.now()
     });
-    this.SV_SendClientMessages();
+    if (snapshot && snapshot.state) {
+      this.SV_SendClientMessages(snapshot.state);
+    }
   }
-  SV_SendClientMessages() {
+  SV_SendClientMessages(snapshot) {
     for (const client of this.svs.clients) {
-      if (client && client.state === 3 /* Active */) {
-        this.SV_SendClientFrame(client);
+      if (client && client.state === 4 /* Active */) {
+        this.SV_SendClientFrame(client, snapshot);
       }
     }
   }
-  SV_SendClientFrame(client) {
-    const writer = new import_shared2.BinaryWriter();
-    writer.writeByte(import_shared2.ServerCommand.frame);
+  SV_SendClientFrame(client, snapshot) {
+    const writer = new import_shared3.BinaryWriter();
+    writer.writeByte(import_shared3.ServerCommand.frame);
     writer.writeLong(this.sv.frame);
     writer.writeLong(0);
     writer.writeByte(0);
     writer.writeByte(0);
-    writer.writeByte(import_shared2.ServerCommand.playerinfo);
+    writer.writeByte(import_shared3.ServerCommand.playerinfo);
     writer.writeShort(0);
     writer.writeLong(0);
+    writer.writeByte(import_shared3.ServerCommand.packetentities);
+    const entities = snapshot.packetEntities || [];
+    for (const entity of entities) {
+      writeDeltaEntity({}, entity, writer, false, true);
+    }
+    writer.writeShort(0);
     client.net.send(writer.getData());
+    client.lastFrame = this.sv.frame;
   }
   // GameEngine Implementation
   trace(start, end) {

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

@@ -1,4 +1,4 @@
-import { NetDriver, ServerCommand, UserCommand, BinaryStream } from '@quake2ts/shared';
+import { NetDriver, ServerCommand, PlayerState, UserCommand, BinaryStream } from '@quake2ts/shared';
 import WebSocket from 'ws';
 import { GameEngine, MulticastType, Entity } from '@quake2ts/game';
 
@@ -46,21 +46,44 @@ declare class DedicatedServer implements GameEngine {
 
 declare enum ClientState {
     Free = 0,
-    Connected = 1,// Connection established, waiting for challenge/info
-    Primed = 2,// Sent info, waiting for gamestate
-    Active = 3,// In game
-    Spawned = 4
+    Zombie = 1,// client has been disconnected, but don't reuse connection for a couple seconds
+    Connected = 2,// has been assigned to a client_t, but not in game yet
+    Spawned = 3,// client is fully in game
+    Active = 4
+}
+interface ClientFrame {
+    areaBytes: number;
+    areaBits: Uint8Array;
+    playerState: PlayerState;
+    numEntities: number;
+    firstEntity: number;
+    sentTime: number;
 }
 interface Client {
     index: number;
     state: ClientState;
     net: NetDriver;
-    name: string;
     userInfo: string;
-    edict: Entity | null;
-    lastCmd: UserCommand;
-    lastPacketTime: number;
     lastFrame: number;
+    lastCmd: UserCommand;
+    commandMsec: number;
+    frameLatency: number[];
+    ping: number;
+    messageSize: number[];
+    rate: number;
+    suppressCount: number;
+    edict: Entity | null;
+    name: string;
+    messageLevel: number;
+    datagram: Uint8Array;
+    frames: ClientFrame[];
+    download?: Uint8Array;
+    downloadSize: number;
+    downloadCount: number;
+    lastMessage: number;
+    lastConnect: number;
+    challenge: number;
+    messageQueue: Uint8Array[];
 }
 declare function createClient(index: number, net: NetDriver): Client;
 
@@ -81,4 +104,4 @@ declare class ClientMessageParser {
     private parseStringCmd;
 }
 
-export { type Client, type ClientMessageHandler, ClientMessageParser, ClientState, DedicatedServer, WebSocketNetDriver, createClient };
+export { type Client, type ClientFrame, type ClientMessageHandler, ClientMessageParser, ClientState, DedicatedServer, WebSocketNetDriver, createClient };

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

@@ -1,4 +1,4 @@
-import { NetDriver, ServerCommand, UserCommand, BinaryStream } from '@quake2ts/shared';
+import { NetDriver, ServerCommand, PlayerState, UserCommand, BinaryStream } from '@quake2ts/shared';
 import WebSocket from 'ws';
 import { GameEngine, MulticastType, Entity } from '@quake2ts/game';
 
@@ -46,21 +46,44 @@ declare class DedicatedServer implements GameEngine {
 
 declare enum ClientState {
     Free = 0,
-    Connected = 1,// Connection established, waiting for challenge/info
-    Primed = 2,// Sent info, waiting for gamestate
-    Active = 3,// In game
-    Spawned = 4
+    Zombie = 1,// client has been disconnected, but don't reuse connection for a couple seconds
+    Connected = 2,// has been assigned to a client_t, but not in game yet
+    Spawned = 3,// client is fully in game
+    Active = 4
+}
+interface ClientFrame {
+    areaBytes: number;
+    areaBits: Uint8Array;
+    playerState: PlayerState;
+    numEntities: number;
+    firstEntity: number;
+    sentTime: number;
 }
 interface Client {
     index: number;
     state: ClientState;
     net: NetDriver;
-    name: string;
     userInfo: string;
-    edict: Entity | null;
-    lastCmd: UserCommand;
-    lastPacketTime: number;
     lastFrame: number;
+    lastCmd: UserCommand;
+    commandMsec: number;
+    frameLatency: number[];
+    ping: number;
+    messageSize: number[];
+    rate: number;
+    suppressCount: number;
+    edict: Entity | null;
+    name: string;
+    messageLevel: number;
+    datagram: Uint8Array;
+    frames: ClientFrame[];
+    download?: Uint8Array;
+    downloadSize: number;
+    downloadCount: number;
+    lastMessage: number;
+    lastConnect: number;
+    challenge: number;
+    messageQueue: Uint8Array[];
 }
 declare function createClient(index: number, net: NetDriver): Client;
 
@@ -81,4 +104,4 @@ declare class ClientMessageParser {
     private parseStringCmd;
 }
 
-export { type Client, type ClientMessageHandler, ClientMessageParser, ClientState, DedicatedServer, WebSocketNetDriver, createClient };
+export { type Client, type ClientFrame, type ClientMessageHandler, ClientMessageParser, ClientState, DedicatedServer, WebSocketNetDriver, createClient };