quake2ts 0.0.213 → 0.0.215

package/packages/server/dist/index.cjs

@@ -201,7 +201,8 @@ function createClient(index, net) {
     lastMessage: 0,
     lastConnect: Date.now(),
     challenge: 0,
-    messageQueue: []
+    messageQueue: [],
+    lastPacketEntities: []
   };
 }
 function createEmptyUserCommand() {
@@ -302,7 +303,7 @@ var ClientMessageParser = class {
 };
 
 // src/dedicated.ts
-var import_shared3 = require("@quake2ts/shared");
+var import_shared4 = require("@quake2ts/shared");
 var import_engine = require("@quake2ts/engine");
 var import_promises = __toESM(require("fs/promises"), 1);
 var import_game2 = require("@quake2ts/game");
@@ -345,6 +346,24 @@ var NULL_STATE = {
   sound: 0,
   event: 0
 };
+function writeRemoveEntity(number, writer) {
+  let bits = U_REMOVE;
+  if (number >= 256) {
+    bits |= U_NUMBER16;
+  }
+  if (bits & 65280) {
+    bits |= U_MOREBITS1;
+  }
+  writer.writeByte(bits & 255);
+  if (bits & U_MOREBITS1) {
+    writer.writeByte(bits >> 8 & 255);
+  }
+  if (bits & U_NUMBER16) {
+    writer.writeShort(number);
+  } else {
+    writer.writeByte(number);
+  }
+}
 function writeDeltaEntity(from, to, writer, force, newEntity) {
   let bits = 0;
   if (newEntity) {
@@ -549,6 +568,113 @@ function writePlayerState(writer, ps) {
   }
 }
 
+// src/protocol/write.ts
+var import_shared3 = require("@quake2ts/shared");
+function writeServerCommand(writer, event, ...args) {
+  writer.writeByte(event);
+  switch (event) {
+    case import_shared3.ServerCommand.print: {
+      const level = args[0];
+      const text = args[1];
+      writer.writeByte(level);
+      writer.writeString(text);
+      break;
+    }
+    case import_shared3.ServerCommand.muzzleflash: {
+      const entIndex = args[0];
+      const flashType = args[1];
+      writer.writeShort(entIndex);
+      writer.writeByte(flashType);
+      break;
+    }
+    case import_shared3.ServerCommand.temp_entity: {
+      const type = args[0];
+      writer.writeByte(type);
+      writeTempEntity(writer, type, args.slice(1));
+      break;
+    }
+    default:
+      console.warn(`writeServerCommand: Unhandled command ${event}`);
+      break;
+  }
+}
+function writeTempEntity(writer, type, args) {
+  switch (type) {
+    case import_shared3.TempEntity.ROCKET_EXPLOSION:
+    case import_shared3.TempEntity.GRENADE_EXPLOSION:
+    case import_shared3.TempEntity.EXPLOSION1:
+    case import_shared3.TempEntity.EXPLOSION2:
+    case import_shared3.TempEntity.ROCKET_EXPLOSION_WATER:
+    case import_shared3.TempEntity.GRENADE_EXPLOSION_WATER:
+    case import_shared3.TempEntity.BFG_EXPLOSION:
+    case import_shared3.TempEntity.BFG_BIGEXPLOSION:
+    case import_shared3.TempEntity.PLASMA_EXPLOSION:
+    case import_shared3.TempEntity.PLAIN_EXPLOSION:
+    case import_shared3.TempEntity.TRACKER_EXPLOSION:
+    case import_shared3.TempEntity.EXPLOSION1_BIG:
+    case import_shared3.TempEntity.EXPLOSION1_NP:
+    case import_shared3.TempEntity.EXPLOSION1_NL:
+    case import_shared3.TempEntity.EXPLOSION2_NL:
+    case import_shared3.TempEntity.BERSERK_SLAM:
+      writer.writePos(args[0]);
+      break;
+    case import_shared3.TempEntity.BLASTER:
+    case import_shared3.TempEntity.FLECHETTE:
+      writer.writePos(args[0]);
+      writer.writeDir(args[1]);
+      break;
+    case import_shared3.TempEntity.RAILTRAIL:
+    case import_shared3.TempEntity.DEBUGTRAIL:
+    case import_shared3.TempEntity.BUBBLETRAIL:
+    case import_shared3.TempEntity.BUBBLETRAIL2:
+    case import_shared3.TempEntity.BFG_LASER:
+    case import_shared3.TempEntity.LIGHTNING_BEAM:
+    case import_shared3.TempEntity.LIGHTNING:
+      writer.writePos(args[0]);
+      writer.writePos(args[1]);
+      break;
+    case import_shared3.TempEntity.LASER_SPARKS:
+    case import_shared3.TempEntity.WELDING_SPARKS:
+    case import_shared3.TempEntity.TUNNEL_SPARKS:
+    case import_shared3.TempEntity.ELECTRIC_SPARKS:
+    case import_shared3.TempEntity.HEATBEAM_SPARKS:
+    case import_shared3.TempEntity.HEATBEAM_STEAM:
+    case import_shared3.TempEntity.STEAM:
+      writer.writeByte(args[0]);
+      writer.writePos(args[1]);
+      writer.writeDir(args[2]);
+      writer.writeByte(args[3] || 0);
+      break;
+    case import_shared3.TempEntity.PARASITE_ATTACK:
+    case import_shared3.TempEntity.MEDIC_CABLE_ATTACK:
+      const ent = args[0];
+      writer.writeShort(ent ? ent.index : 0);
+      writer.writePos(args[1]);
+      writer.writePos(args[2]);
+      break;
+    case import_shared3.TempEntity.GUNSHOT:
+    case import_shared3.TempEntity.BLOOD:
+    case import_shared3.TempEntity.SPARKS:
+    case import_shared3.TempEntity.BULLET_SPARKS:
+    case import_shared3.TempEntity.SCREEN_SPARKS:
+    case import_shared3.TempEntity.SHIELD_SPARKS:
+      writer.writePos(args[0]);
+      writer.writeDir(args[1]);
+      break;
+    case import_shared3.TempEntity.SPLASH:
+    case import_shared3.TempEntity.POWER_SPLASH:
+    case import_shared3.TempEntity.WIDOWSPLASH:
+      writer.writeByte(args[0]);
+      writer.writePos(args[1]);
+      writer.writeDir(args[2]);
+      writer.writeByte(args[3] || 0);
+      break;
+    default:
+      console.warn(`writeTempEntity: Unhandled TempEntity ${type}`);
+      break;
+  }
+}
+
 // src/dedicated.ts
 var MAX_CLIENTS = 16;
 var FRAME_RATE = 10;
@@ -579,11 +705,11 @@ var DedicatedServer = class {
       frame: 0,
       name: "",
       collisionModel: null,
-      configStrings: new Array(import_shared3.MAX_CONFIGSTRINGS).fill(""),
-      baselines: new Array(import_shared3.MAX_EDICTS).fill(null),
+      configStrings: new Array(import_shared4.MAX_CONFIGSTRINGS).fill(""),
+      baselines: new Array(import_shared4.MAX_EDICTS).fill(null),
       multicastBuf: new Uint8Array(0)
     };
-    this.entityIndex = new import_shared3.CollisionEntityIndex();
+    this.entityIndex = new import_shared4.CollisionEntityIndex();
   }
   async start(mapName) {
     console.log(`Starting Dedicated Server on port ${this.port}...`);
@@ -634,7 +760,7 @@ var DedicatedServer = class {
             ent: hitEntity
           };
         }
-        const worldResult = this.sv.collisionModel ? (0, import_shared3.traceBox)({
+        const worldResult = this.sv.collisionModel ? (0, import_shared4.traceBox)({
           start,
           end,
           mins: mins || void 0,
@@ -689,10 +815,33 @@ var DedicatedServer = class {
     });
     this.game.init(0);
     this.game.spawnWorld();
+    this.populateBaselines();
     this.sv.state = 2 /* Game */;
     this.frameInterval = setInterval(() => this.runFrame(), FRAME_TIME_MS);
     console.log("Server started.");
   }
+  populateBaselines() {
+    if (!this.game) return;
+    this.game.entities.forEachEntity((ent) => {
+      if (ent.index >= import_shared4.MAX_EDICTS) return;
+      if (ent.modelindex > 0 || ent.solid !== import_game.Solid.Not) {
+        this.sv.baselines[ent.index] = {
+          number: ent.index,
+          origin: { ...ent.origin },
+          angles: { ...ent.angles },
+          modelIndex: ent.modelindex,
+          frame: ent.frame,
+          skinNum: ent.skin,
+          effects: ent.effects,
+          renderfx: ent.renderfx,
+          solid: ent.solid,
+          sound: ent.sounds,
+          // Assuming ent.sounds maps to 'sound' field in EntityState
+          event: 0
+        };
+      }
+    });
+  }
   stop() {
     if (this.frameInterval) clearInterval(this.frameInterval);
     if (this.wss) this.wss.close();
@@ -755,14 +904,14 @@ var DedicatedServer = class {
       client.userInfo = userInfo;
       console.log(`Client ${client.index} connected: ${userInfo}`);
       this.sendServerData(client);
-      const writer = new import_shared3.BinaryWriter();
-      writer.writeByte(import_shared3.ServerCommand.stufftext);
+      const writer = new import_shared4.BinaryWriter();
+      writer.writeByte(import_shared4.ServerCommand.stufftext);
       writer.writeString("precache\n");
       client.net.send(writer.getData());
     } else {
       console.log(`Client ${client.index} rejected: ${result}`);
-      const writer = new import_shared3.BinaryWriter();
-      writer.writeByte(import_shared3.ServerCommand.print);
+      const writer = new import_shared4.BinaryWriter();
+      writer.writeByte(import_shared4.ServerCommand.print);
       writer.writeByte(2);
       writer.writeString(`Connection rejected: ${result}
 `);
@@ -786,31 +935,31 @@ var DedicatedServer = class {
     console.log(`Client ${client.index} entered game`);
   }
   sendServerData(client) {
-    const writer = new import_shared3.BinaryWriter();
-    writer.writeByte(import_shared3.ServerCommand.serverdata);
+    const writer = new import_shared4.BinaryWriter();
+    writer.writeByte(import_shared4.ServerCommand.serverdata);
     writer.writeLong(34);
     writer.writeLong(this.sv.frame);
     writer.writeByte(0);
     writer.writeString("baseq2");
     writer.writeShort(client.index);
     writer.writeString("maps/test.bsp");
-    for (let i = 0; i < import_shared3.MAX_CONFIGSTRINGS; i++) {
+    for (let i = 0; i < import_shared4.MAX_CONFIGSTRINGS; i++) {
       if (this.sv.configStrings[i]) {
         this.SV_WriteConfigString(writer, i, this.sv.configStrings[i]);
       }
     }
-    for (let i = 0; i < import_shared3.MAX_EDICTS; i++) {
+    for (let i = 0; i < import_shared4.MAX_EDICTS; i++) {
       if (this.sv.baselines[i]) {
-        writer.writeByte(import_shared3.ServerCommand.spawnbaseline);
+        writer.writeByte(import_shared4.ServerCommand.spawnbaseline);
         writeDeltaEntity({}, this.sv.baselines[i], writer, true, true);
       }
     }
     client.net.send(writer.getData());
   }
   SV_SetConfigString(index, value) {
-    if (index < 0 || index >= import_shared3.MAX_CONFIGSTRINGS) return;
+    if (index < 0 || index >= import_shared4.MAX_CONFIGSTRINGS) return;
     this.sv.configStrings[index] = value;
-    const writer = new import_shared3.BinaryWriter();
+    const writer = new import_shared4.BinaryWriter();
     this.SV_WriteConfigString(writer, index, value);
     const data = writer.getData();
     for (const client of this.svs.clients) {
@@ -820,7 +969,7 @@ var DedicatedServer = class {
     }
   }
   SV_WriteConfigString(writer, index, value) {
-    writer.writeByte(import_shared3.ServerCommand.configstring);
+    writer.writeByte(import_shared4.ServerCommand.configstring);
     writer.writeShort(index);
     writer.writeString(value);
   }
@@ -830,7 +979,7 @@ var DedicatedServer = class {
       while (client.messageQueue.length > 0) {
         const data = client.messageQueue.shift();
         if (!data) continue;
-        const reader = new import_shared3.BinaryStream(data.buffer);
+        const reader = new import_shared4.BinaryStream(data.buffer);
         const parser = new ClientMessageParser(reader, {
           onMove: (checksum, lastFrame, cmd) => this.handleMove(client, cmd),
           onUserInfo: (info) => this.handleUserInfo(client, info),
@@ -876,13 +1025,13 @@ var DedicatedServer = class {
     }
   }
   SV_SendClientFrame(client, snapshot) {
-    const writer = new import_shared3.BinaryWriter();
-    writer.writeByte(import_shared3.ServerCommand.frame);
+    const writer = new import_shared4.BinaryWriter();
+    writer.writeByte(import_shared4.ServerCommand.frame);
     writer.writeLong(this.sv.frame);
     writer.writeLong(0);
     writer.writeByte(0);
     writer.writeByte(0);
-    writer.writeByte(import_shared3.ServerCommand.playerinfo);
+    writer.writeByte(import_shared4.ServerCommand.playerinfo);
     const ps = {
       pm_type: snapshot.pmType,
       origin: snapshot.origin,
@@ -910,24 +1059,67 @@ var DedicatedServer = class {
       stats: snapshot.stats
     };
     writePlayerState(writer, ps);
-    writer.writeByte(import_shared3.ServerCommand.packetentities);
+    writer.writeByte(import_shared4.ServerCommand.packetentities);
     const entities = snapshot.packetEntities || [];
+    const currentEntityIds = [];
     for (const entity of entities) {
+      currentEntityIds.push(entity.number);
       writeDeltaEntity({}, entity, writer, false, true);
     }
+    for (const oldId of client.lastPacketEntities) {
+      if (!currentEntityIds.includes(oldId)) {
+        writeRemoveEntity(oldId, writer);
+      }
+    }
     writer.writeShort(0);
     client.net.send(writer.getData());
     client.lastFrame = this.sv.frame;
+    client.lastPacketEntities = currentEntityIds;
   }
   // GameEngine Implementation
   trace(start, end) {
     return { fraction: 1 };
   }
   multicast(origin, type, event, ...args) {
+    const writer = new import_shared4.BinaryWriter();
+    writeServerCommand(writer, event, ...args);
+    const data = writer.getData();
+    const reliable = event === import_shared4.ServerCommand.print || event === import_shared4.ServerCommand.configstring;
+    for (const client of this.svs.clients) {
+      if (!client || client.state < 4 /* Active */ || !client.edict) {
+        continue;
+      }
+      let send = false;
+      switch (type) {
+        case import_game.MulticastType.All:
+          send = true;
+          break;
+        case import_game.MulticastType.Pvs:
+          if (this.sv.collisionModel) {
+            send = (0, import_shared4.inPVS)(origin, client.edict.origin, this.sv.collisionModel);
+          } else {
+            send = true;
+          }
+          break;
+        case import_game.MulticastType.Phs:
+          if (this.sv.collisionModel) {
+            send = (0, import_shared4.inPHS)(origin, client.edict.origin, this.sv.collisionModel);
+          } else {
+            send = true;
+          }
+          break;
+      }
+      if (send) {
+        client.net.send(data);
+      }
+    }
   }
   unicast(ent, reliable, event, ...args) {
     const client = this.svs.clients.find((c) => c?.edict === ent);
-    if (client) {
+    if (client && client.state >= 2 /* Connected */) {
+      const writer = new import_shared4.BinaryWriter();
+      writeServerCommand(writer, event, ...args);
+      client.net.send(writer.getData());
     }
   }
   configstring(index, value) {

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

@@ -27,6 +27,7 @@ declare class DedicatedServer implements GameEngine {
     private entityIndex;
     constructor(port?: number);
     start(mapName: string): Promise<void>;
+    private populateBaselines;
     stop(): void;
     private handleConnection;
     private onClientMessage;
@@ -90,6 +91,7 @@ interface Client {
     lastConnect: number;
     challenge: number;
     messageQueue: Uint8Array[];
+    lastPacketEntities: number[];
 }
 declare function createClient(index: number, net: NetDriver): Client;
 

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

@@ -27,6 +27,7 @@ declare class DedicatedServer implements GameEngine {
     private entityIndex;
     constructor(port?: number);
     start(mapName: string): Promise<void>;
+    private populateBaselines;
     stop(): void;
     private handleConnection;
     private onClientMessage;
@@ -90,6 +91,7 @@ interface Client {
     lastConnect: number;
     challenge: number;
     messageQueue: Uint8Array[];
+    lastPacketEntities: number[];
 }
 declare function createClient(index: number, net: NetDriver): Client;