quake2ts 0.0.213 → 0.0.215

package/packages/server/dist/index.js

@@ -112,7 +112,7 @@ var WebSocketNetDriver = class {
 
 // src/dedicated.ts
 import { WebSocketServer } from "ws";
-import { createGame } from "@quake2ts/game";
+import { createGame, MulticastType, Solid } from "@quake2ts/game";
 
 // src/client.ts
 import { UPDATE_BACKUP } from "@quake2ts/shared";
@@ -161,7 +161,8 @@ function createClient(index, net) {
     lastMessage: 0,
     lastConnect: Date.now(),
     challenge: 0,
-    messageQueue: []
+    messageQueue: [],
+    lastPacketEntities: []
   };
 }
 function createEmptyUserCommand() {
@@ -262,7 +263,7 @@ var ClientMessageParser = class {
 };
 
 // src/dedicated.ts
-import { BinaryWriter, ServerCommand, BinaryStream as BinaryStream2, traceBox, MAX_CONFIGSTRINGS as MAX_CONFIGSTRINGS2, MAX_EDICTS, CollisionEntityIndex } from "@quake2ts/shared";
+import { BinaryWriter as BinaryWriter2, ServerCommand as ServerCommand2, BinaryStream as BinaryStream2, traceBox, MAX_CONFIGSTRINGS as MAX_CONFIGSTRINGS2, MAX_EDICTS, CollisionEntityIndex, inPVS, inPHS } from "@quake2ts/shared";
 import { parseBsp } from "@quake2ts/engine";
 import fs from "fs/promises";
 import { createPlayerInventory, createPlayerWeaponStates } from "@quake2ts/game";
@@ -305,6 +306,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) {
@@ -509,6 +528,113 @@ function writePlayerState(writer, ps) {
   }
 }
 
+// src/protocol/write.ts
+import { ServerCommand, TempEntity } from "@quake2ts/shared";
+function writeServerCommand(writer, event, ...args) {
+  writer.writeByte(event);
+  switch (event) {
+    case ServerCommand.print: {
+      const level = args[0];
+      const text = args[1];
+      writer.writeByte(level);
+      writer.writeString(text);
+      break;
+    }
+    case ServerCommand.muzzleflash: {
+      const entIndex = args[0];
+      const flashType = args[1];
+      writer.writeShort(entIndex);
+      writer.writeByte(flashType);
+      break;
+    }
+    case 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 TempEntity.ROCKET_EXPLOSION:
+    case TempEntity.GRENADE_EXPLOSION:
+    case TempEntity.EXPLOSION1:
+    case TempEntity.EXPLOSION2:
+    case TempEntity.ROCKET_EXPLOSION_WATER:
+    case TempEntity.GRENADE_EXPLOSION_WATER:
+    case TempEntity.BFG_EXPLOSION:
+    case TempEntity.BFG_BIGEXPLOSION:
+    case TempEntity.PLASMA_EXPLOSION:
+    case TempEntity.PLAIN_EXPLOSION:
+    case TempEntity.TRACKER_EXPLOSION:
+    case TempEntity.EXPLOSION1_BIG:
+    case TempEntity.EXPLOSION1_NP:
+    case TempEntity.EXPLOSION1_NL:
+    case TempEntity.EXPLOSION2_NL:
+    case TempEntity.BERSERK_SLAM:
+      writer.writePos(args[0]);
+      break;
+    case TempEntity.BLASTER:
+    case TempEntity.FLECHETTE:
+      writer.writePos(args[0]);
+      writer.writeDir(args[1]);
+      break;
+    case TempEntity.RAILTRAIL:
+    case TempEntity.DEBUGTRAIL:
+    case TempEntity.BUBBLETRAIL:
+    case TempEntity.BUBBLETRAIL2:
+    case TempEntity.BFG_LASER:
+    case TempEntity.LIGHTNING_BEAM:
+    case TempEntity.LIGHTNING:
+      writer.writePos(args[0]);
+      writer.writePos(args[1]);
+      break;
+    case TempEntity.LASER_SPARKS:
+    case TempEntity.WELDING_SPARKS:
+    case TempEntity.TUNNEL_SPARKS:
+    case TempEntity.ELECTRIC_SPARKS:
+    case TempEntity.HEATBEAM_SPARKS:
+    case TempEntity.HEATBEAM_STEAM:
+    case TempEntity.STEAM:
+      writer.writeByte(args[0]);
+      writer.writePos(args[1]);
+      writer.writeDir(args[2]);
+      writer.writeByte(args[3] || 0);
+      break;
+    case TempEntity.PARASITE_ATTACK:
+    case TempEntity.MEDIC_CABLE_ATTACK:
+      const ent = args[0];
+      writer.writeShort(ent ? ent.index : 0);
+      writer.writePos(args[1]);
+      writer.writePos(args[2]);
+      break;
+    case TempEntity.GUNSHOT:
+    case TempEntity.BLOOD:
+    case TempEntity.SPARKS:
+    case TempEntity.BULLET_SPARKS:
+    case TempEntity.SCREEN_SPARKS:
+    case TempEntity.SHIELD_SPARKS:
+      writer.writePos(args[0]);
+      writer.writeDir(args[1]);
+      break;
+    case TempEntity.SPLASH:
+    case TempEntity.POWER_SPLASH:
+    case 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;
@@ -649,10 +775,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 >= MAX_EDICTS) return;
+      if (ent.modelindex > 0 || ent.solid !== 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();
@@ -715,14 +864,14 @@ var DedicatedServer = class {
       client.userInfo = userInfo;
       console.log(`Client ${client.index} connected: ${userInfo}`);
       this.sendServerData(client);
-      const writer = new BinaryWriter();
-      writer.writeByte(ServerCommand.stufftext);
+      const writer = new BinaryWriter2();
+      writer.writeByte(ServerCommand2.stufftext);
       writer.writeString("precache\n");
       client.net.send(writer.getData());
     } else {
       console.log(`Client ${client.index} rejected: ${result}`);
-      const writer = new BinaryWriter();
-      writer.writeByte(ServerCommand.print);
+      const writer = new BinaryWriter2();
+      writer.writeByte(ServerCommand2.print);
       writer.writeByte(2);
       writer.writeString(`Connection rejected: ${result}
 `);
@@ -746,8 +895,8 @@ var DedicatedServer = class {
     console.log(`Client ${client.index} entered game`);
   }
   sendServerData(client) {
-    const writer = new BinaryWriter();
-    writer.writeByte(ServerCommand.serverdata);
+    const writer = new BinaryWriter2();
+    writer.writeByte(ServerCommand2.serverdata);
     writer.writeLong(34);
     writer.writeLong(this.sv.frame);
     writer.writeByte(0);
@@ -761,7 +910,7 @@ var DedicatedServer = class {
     }
     for (let i = 0; i < MAX_EDICTS; i++) {
       if (this.sv.baselines[i]) {
-        writer.writeByte(ServerCommand.spawnbaseline);
+        writer.writeByte(ServerCommand2.spawnbaseline);
         writeDeltaEntity({}, this.sv.baselines[i], writer, true, true);
       }
     }
@@ -770,7 +919,7 @@ var DedicatedServer = class {
   SV_SetConfigString(index, value) {
     if (index < 0 || index >= MAX_CONFIGSTRINGS2) return;
     this.sv.configStrings[index] = value;
-    const writer = new BinaryWriter();
+    const writer = new BinaryWriter2();
     this.SV_WriteConfigString(writer, index, value);
     const data = writer.getData();
     for (const client of this.svs.clients) {
@@ -780,7 +929,7 @@ var DedicatedServer = class {
     }
   }
   SV_WriteConfigString(writer, index, value) {
-    writer.writeByte(ServerCommand.configstring);
+    writer.writeByte(ServerCommand2.configstring);
     writer.writeShort(index);
     writer.writeString(value);
   }
@@ -836,13 +985,13 @@ var DedicatedServer = class {
     }
   }
   SV_SendClientFrame(client, snapshot) {
-    const writer = new BinaryWriter();
-    writer.writeByte(ServerCommand.frame);
+    const writer = new BinaryWriter2();
+    writer.writeByte(ServerCommand2.frame);
     writer.writeLong(this.sv.frame);
     writer.writeLong(0);
     writer.writeByte(0);
     writer.writeByte(0);
-    writer.writeByte(ServerCommand.playerinfo);
+    writer.writeByte(ServerCommand2.playerinfo);
     const ps = {
       pm_type: snapshot.pmType,
       origin: snapshot.origin,
@@ -870,24 +1019,67 @@ var DedicatedServer = class {
       stats: snapshot.stats
     };
     writePlayerState(writer, ps);
-    writer.writeByte(ServerCommand.packetentities);
+    writer.writeByte(ServerCommand2.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 BinaryWriter2();
+    writeServerCommand(writer, event, ...args);
+    const data = writer.getData();
+    const reliable = event === ServerCommand2.print || event === ServerCommand2.configstring;
+    for (const client of this.svs.clients) {
+      if (!client || client.state < 4 /* Active */ || !client.edict) {
+        continue;
+      }
+      let send = false;
+      switch (type) {
+        case MulticastType.All:
+          send = true;
+          break;
+        case MulticastType.Pvs:
+          if (this.sv.collisionModel) {
+            send = inPVS(origin, client.edict.origin, this.sv.collisionModel);
+          } else {
+            send = true;
+          }
+          break;
+        case MulticastType.Phs:
+          if (this.sv.collisionModel) {
+            send = 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 BinaryWriter2();
+      writeServerCommand(writer, event, ...args);
+      client.net.send(writer.getData());
     }
   }
   configstring(index, value) {