quake2ts 0.0.220 → 0.0.221

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quake2ts",
-  "version": "0.0.220",
+  "version": "0.0.221",
   "description": "Quake II re-release port to TypeScript with WebGL renderer - A complete game engine with physics, networking, and BSP rendering",
   "type": "module",
   "packageManager": "pnpm@8.15.7",

package/packages/server/dist/index.cjs

@@ -174,7 +174,8 @@ function createClient(index, net) {
       playerState: createEmptyPlayerState(),
       numEntities: 0,
       firstEntity: 0,
-      sentTime: 0
+      sentTime: 0,
+      entities: []
     });
   }
   return {
@@ -825,23 +826,26 @@ var DedicatedServer = class {
     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
-        };
+        this.sv.baselines[ent.index] = this.entityToState(ent);
       }
     });
   }
+  entityToState(ent) {
+    return {
+      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.frameTimeout) clearTimeout(this.frameTimeout);
     if (this.wss) this.wss.close();
@@ -1036,7 +1040,11 @@ var DedicatedServer = class {
     const writer = new import_shared4.BinaryWriter(MTU);
     writer.writeByte(import_shared4.ServerCommand.frame);
     writer.writeLong(this.sv.frame);
-    writer.writeLong(0);
+    let deltaFrame = 0;
+    if (client.lastFrame && client.lastFrame < this.sv.frame && client.lastFrame >= this.sv.frame - import_shared4.UPDATE_BACKUP) {
+      deltaFrame = client.lastFrame;
+    }
+    writer.writeLong(deltaFrame);
     writer.writeByte(0);
     writer.writeByte(0);
     writer.writeByte(import_shared4.ServerCommand.playerinfo);
@@ -1070,13 +1078,26 @@ var DedicatedServer = class {
     writer.writeByte(import_shared4.ServerCommand.packetentities);
     const entities = snapshot.packetEntities || [];
     const currentEntityIds = [];
-    for (const entity of entities) {
+    const frameIdx = this.sv.frame % import_shared4.UPDATE_BACKUP;
+    const currentFrame = client.frames[frameIdx];
+    currentFrame.entities = entities;
+    let oldEntities = [];
+    if (deltaFrame > 0) {
+      const oldFrameIdx = deltaFrame % import_shared4.UPDATE_BACKUP;
+      oldEntities = client.frames[oldFrameIdx].entities;
+    }
+    for (const entityState of currentFrame.entities) {
       if (writer.getOffset() > MTU - 200) {
         console.warn("Packet MTU limit reached, dropping remaining entities");
         break;
       }
-      currentEntityIds.push(entity.number);
-      writeDeltaEntity({}, entity, writer, false, true);
+      currentEntityIds.push(entityState.number);
+      const oldState = oldEntities.find((e) => e.number === entityState.number);
+      if (oldState) {
+        writeDeltaEntity(oldState, entityState, writer, false, false);
+      } else {
+        writeDeltaEntity({}, entityState, writer, false, true);
+      }
     }
     for (const oldId of client.lastPacketEntities) {
       if (writer.getOffset() > MTU - 10) {

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

@@ -1,4 +1,4 @@
-import { NetDriver, ServerCommand, PlayerState, UserCommand, BinaryStream } from '@quake2ts/shared';
+import { NetDriver, ServerCommand, PlayerState, EntityState, UserCommand, BinaryStream } from '@quake2ts/shared';
 import WebSocket from 'ws';
 import { GameEngine, MulticastType, Entity } from '@quake2ts/game';
 
@@ -28,6 +28,7 @@ declare class DedicatedServer implements GameEngine {
     constructor(port?: number);
     start(mapName: string): Promise<void>;
     private populateBaselines;
+    private entityToState;
     stop(): void;
     private handleConnection;
     private onClientMessage;
@@ -65,6 +66,7 @@ interface ClientFrame {
     numEntities: number;
     firstEntity: number;
     sentTime: number;
+    entities: EntityState[];
 }
 interface Client {
     index: number;

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

@@ -1,4 +1,4 @@
-import { NetDriver, ServerCommand, PlayerState, UserCommand, BinaryStream } from '@quake2ts/shared';
+import { NetDriver, ServerCommand, PlayerState, EntityState, UserCommand, BinaryStream } from '@quake2ts/shared';
 import WebSocket from 'ws';
 import { GameEngine, MulticastType, Entity } from '@quake2ts/game';
 
@@ -28,6 +28,7 @@ declare class DedicatedServer implements GameEngine {
     constructor(port?: number);
     start(mapName: string): Promise<void>;
     private populateBaselines;
+    private entityToState;
     stop(): void;
     private handleConnection;
     private onClientMessage;
@@ -65,6 +66,7 @@ interface ClientFrame {
     numEntities: number;
     firstEntity: number;
     sentTime: number;
+    entities: EntityState[];
 }
 interface Client {
     index: number;

package/packages/server/dist/index.js

@@ -134,7 +134,8 @@ function createClient(index, net) {
       playerState: createEmptyPlayerState(),
       numEntities: 0,
       firstEntity: 0,
-      sentTime: 0
+      sentTime: 0,
+      entities: []
     });
   }
   return {
@@ -263,7 +264,7 @@ var ClientMessageParser = class {
 };
 
 // src/dedicated.ts
-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 { 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 { parseBsp } from "@quake2ts/engine";
 import fs from "fs/promises";
 import { createPlayerInventory, createPlayerWeaponStates } from "@quake2ts/game";
@@ -785,23 +786,26 @@ var DedicatedServer = class {
     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
-        };
+        this.sv.baselines[ent.index] = this.entityToState(ent);
       }
     });
   }
+  entityToState(ent) {
+    return {
+      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.frameTimeout) clearTimeout(this.frameTimeout);
     if (this.wss) this.wss.close();
@@ -996,7 +1000,11 @@ var DedicatedServer = class {
     const writer = new BinaryWriter2(MTU);
     writer.writeByte(ServerCommand2.frame);
     writer.writeLong(this.sv.frame);
-    writer.writeLong(0);
+    let deltaFrame = 0;
+    if (client.lastFrame && client.lastFrame < this.sv.frame && client.lastFrame >= this.sv.frame - UPDATE_BACKUP2) {
+      deltaFrame = client.lastFrame;
+    }
+    writer.writeLong(deltaFrame);
     writer.writeByte(0);
     writer.writeByte(0);
     writer.writeByte(ServerCommand2.playerinfo);
@@ -1030,13 +1038,26 @@ var DedicatedServer = class {
     writer.writeByte(ServerCommand2.packetentities);
     const entities = snapshot.packetEntities || [];
     const currentEntityIds = [];
-    for (const entity of entities) {
+    const frameIdx = this.sv.frame % UPDATE_BACKUP2;
+    const currentFrame = client.frames[frameIdx];
+    currentFrame.entities = entities;
+    let oldEntities = [];
+    if (deltaFrame > 0) {
+      const oldFrameIdx = deltaFrame % UPDATE_BACKUP2;
+      oldEntities = client.frames[oldFrameIdx].entities;
+    }
+    for (const entityState of currentFrame.entities) {
       if (writer.getOffset() > MTU - 200) {
         console.warn("Packet MTU limit reached, dropping remaining entities");
         break;
       }
-      currentEntityIds.push(entity.number);
-      writeDeltaEntity({}, entity, writer, false, true);
+      currentEntityIds.push(entityState.number);
+      const oldState = oldEntities.find((e) => e.number === entityState.number);
+      if (oldState) {
+        writeDeltaEntity(oldState, entityState, writer, false, false);
+      } else {
+        writeDeltaEntity({}, entityState, writer, false, true);
+      }
     }
     for (const oldId of client.lastPacketEntities) {
       if (writer.getOffset() > MTU - 10) {