quake2ts 0.0.173 → 0.0.175

package/packages/game/dist/types/index.d.ts

@@ -47,6 +47,7 @@ export interface GameStateSnapshot {
     readonly damageAlpha: number;
     readonly damageIndicators: any[];
 }
+import { UserCommand } from '@quake2ts/shared';
 import { Entity } from './entities/entity.js';
 import { GameTraceResult } from './imports.js';
 export interface GameExports extends GameSimulation<GameStateSnapshot> {
@@ -56,12 +57,14 @@ export interface GameExports extends GameSimulation<GameStateSnapshot> {
     centerprintf(entity: Entity, message: string): void;
     readonly time: number;
     readonly deathmatch: boolean;
+    readonly random: RandomGenerator;
     trace(start: Vec3, mins: Vec3 | null, maxs: Vec3 | null, end: Vec3, passent: Entity | null, contentmask: number): GameTraceResult;
     multicast(origin: Vec3, type: MulticastType, event: ServerCommand, ...args: any[]): void;
     unicast(ent: Entity, reliable: boolean, event: ServerCommand, ...args: any[]): void;
     createSave(mapName: string, difficulty: number, playtimeSeconds: number): GameSaveFile;
     loadSave(save: GameSaveFile): void;
     clientBegin(client: PlayerClient): Entity;
+    clientThink(ent: Entity, cmd: UserCommand): void;
 }
 export { hashGameState, hashEntitySystem } from './checksum.js';
 export * from './save/index.js';

package/packages/game/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/packages/server/dist/index.cjs

@@ -262,35 +262,41 @@ var DedicatedServer = class {
   constructor(port = 27910) {
     this.port = port;
     this.wss = null;
-    this.clients = new Array(MAX_CLIENTS).fill(null);
     this.game = null;
     this.frameInterval = null;
-    this.startTime = 0;
-    this.frameCount = 0;
-    // Physics
-    this.collisionModel = null;
+    this.svs = {
+      clients: new Array(MAX_CLIENTS).fill(null)
+    };
+    this.sv = {
+      startTime: 0,
+      time: 0,
+      frame: 0,
+      mapName: "",
+      collisionModel: null
+    };
   }
   async start(mapName) {
     console.log(`Starting Dedicated Server on port ${this.port}...`);
+    this.sv.mapName = mapName;
     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 ${mapName}...`);
-      const mapData = await import_promises.default.readFile(mapName);
+      console.log(`Loading map ${this.sv.mapName}...`);
+      const mapData = await import_promises.default.readFile(this.sv.mapName);
       const arrayBuffer = mapData.buffer.slice(mapData.byteOffset, mapData.byteOffset + mapData.byteLength);
       const bspMap = (0, import_engine.parseBsp)(arrayBuffer);
-      this.collisionModel = bspMap;
+      this.sv.collisionModel = bspMap;
       console.log(`Map loaded successfully.`);
     } catch (e) {
       console.warn("Failed to load map:", e);
     }
-    this.startTime = Date.now();
+    this.sv.startTime = Date.now();
     const imports = {
       trace: (start, mins, maxs, end, passent, contentmask) => {
-        if (!this.collisionModel) {
+        if (!this.sv.collisionModel) {
           return {
             fraction: 1,
             endpos: { ...end },
@@ -307,7 +313,7 @@ var DedicatedServer = class {
           end,
           mins: mins || void 0,
           maxs: maxs || void 0,
-          model: this.collisionModel
+          model: this.sv.collisionModel
         });
         return {
           allsolid: result.allsolid,
@@ -347,7 +353,7 @@ var DedicatedServer = class {
   handleConnection(ws) {
     let clientIndex = -1;
     for (let i = 0; i < MAX_CLIENTS; i++) {
-      if (this.clients[i] === null || this.clients[i].state === 0 /* Free */) {
+      if (this.svs.clients[i] === null || this.svs.clients[i].state === 0 /* Free */) {
         clientIndex = i;
         break;
       }
@@ -359,7 +365,7 @@ var DedicatedServer = class {
     const driver = new WebSocketNetDriver();
     driver.attach(ws);
     const client = createClient(clientIndex, driver);
-    this.clients[clientIndex] = client;
+    this.svs.clients[clientIndex] = client;
     driver.onMessage((data) => this.onClientMessage(client, data));
     driver.onClose(() => this.onClientDisconnect(client));
   }
@@ -381,7 +387,7 @@ var DedicatedServer = class {
   }
   onClientDisconnect(client) {
     console.log(`Client ${client.index} disconnected`);
-    this.clients[client.index] = null;
+    this.svs.clients[client.index] = null;
   }
   handleMove(client, cmd) {
     client.lastCmd = cmd;
@@ -410,34 +416,42 @@ var DedicatedServer = class {
     const writer = new import_shared2.BinaryWriter();
     writer.writeByte(import_shared2.ServerCommand.serverdata);
     writer.writeLong(34);
-    writer.writeLong(this.frameCount);
+    writer.writeLong(this.sv.frame);
     writer.writeByte(0);
     writer.writeString("baseq2");
     writer.writeShort(client.index);
     writer.writeString("maps/test.bsp");
     client.net.send(writer.getData());
   }
+  SV_ReadPackets() {
+  }
   runFrame() {
     if (!this.game) return;
-    this.frameCount++;
+    this.sv.frame++;
+    this.SV_ReadPackets();
+    for (const client of this.svs.clients) {
+      if (client && client.state === 3 /* Active */ && client.edict) {
+        this.game.clientThink(client.edict, client.lastCmd);
+      }
+    }
     this.game.frame({
-      frame: this.frameCount,
+      frame: this.sv.frame,
       deltaMs: FRAME_TIME_MS,
       nowMs: Date.now()
     });
-    this.sendClientMessages();
+    this.SV_SendClientMessages();
   }
-  sendClientMessages() {
-    for (const client of this.clients) {
+  SV_SendClientMessages() {
+    for (const client of this.svs.clients) {
       if (client && client.state === 3 /* Active */) {
-        this.sendClientFrame(client);
+        this.SV_SendClientFrame(client);
       }
     }
   }
-  sendClientFrame(client) {
+  SV_SendClientFrame(client) {
     const writer = new import_shared2.BinaryWriter();
     writer.writeByte(import_shared2.ServerCommand.frame);
-    writer.writeLong(this.frameCount);
+    writer.writeLong(this.sv.frame);
     writer.writeLong(0);
     writer.writeByte(0);
     writer.writeByte(0);
@@ -453,7 +467,7 @@ var DedicatedServer = class {
   multicast(origin, type, event, ...args) {
   }
   unicast(ent, reliable, event, ...args) {
-    const client = this.clients.find((c) => c?.edict === ent);
+    const client = this.svs.clients.find((c) => c?.edict === ent);
     if (client) {
     }
   }

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

@@ -20,12 +20,10 @@ declare class WebSocketNetDriver implements NetDriver {
 declare class DedicatedServer implements GameEngine {
     private port;
     private wss;
-    private clients;
+    private svs;
+    private sv;
     private game;
     private frameInterval;
-    private startTime;
-    private frameCount;
-    private collisionModel;
     constructor(port?: number);
     start(mapName: string): Promise<void>;
     stop(): void;
@@ -37,9 +35,10 @@ declare class DedicatedServer implements GameEngine {
     private handleStringCmd;
     private spawnClient;
     private sendServerData;
+    private SV_ReadPackets;
     private runFrame;
-    private sendClientMessages;
-    private sendClientFrame;
+    private SV_SendClientMessages;
+    private SV_SendClientFrame;
     trace(start: any, end: any): any;
     multicast(origin: any, type: MulticastType, event: ServerCommand, ...args: any[]): void;
     unicast(ent: Entity, reliable: boolean, event: ServerCommand, ...args: any[]): void;

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

@@ -20,12 +20,10 @@ declare class WebSocketNetDriver implements NetDriver {
 declare class DedicatedServer implements GameEngine {
     private port;
     private wss;
-    private clients;
+    private svs;
+    private sv;
     private game;
     private frameInterval;
-    private startTime;
-    private frameCount;
-    private collisionModel;
     constructor(port?: number);
     start(mapName: string): Promise<void>;
     stop(): void;
@@ -37,9 +35,10 @@ declare class DedicatedServer implements GameEngine {
     private handleStringCmd;
     private spawnClient;
     private sendServerData;
+    private SV_ReadPackets;
     private runFrame;
-    private sendClientMessages;
-    private sendClientFrame;
+    private SV_SendClientMessages;
+    private SV_SendClientFrame;
     trace(start: any, end: any): any;
     multicast(origin: any, type: MulticastType, event: ServerCommand, ...args: any[]): void;
     unicast(ent: Entity, reliable: boolean, event: ServerCommand, ...args: any[]): void;

package/packages/server/dist/index.js

@@ -222,35 +222,41 @@ var DedicatedServer = class {
   constructor(port = 27910) {
     this.port = port;
     this.wss = null;
-    this.clients = new Array(MAX_CLIENTS).fill(null);
     this.game = null;
     this.frameInterval = null;
-    this.startTime = 0;
-    this.frameCount = 0;
-    // Physics
-    this.collisionModel = null;
+    this.svs = {
+      clients: new Array(MAX_CLIENTS).fill(null)
+    };
+    this.sv = {
+      startTime: 0,
+      time: 0,
+      frame: 0,
+      mapName: "",
+      collisionModel: null
+    };
   }
   async start(mapName) {
     console.log(`Starting Dedicated Server on port ${this.port}...`);
+    this.sv.mapName = mapName;
     this.wss = new WebSocketServer({ port: this.port });
     this.wss.on("connection", (ws) => {
       console.log("New connection");
       this.handleConnection(ws);
     });
     try {
-      console.log(`Loading map ${mapName}...`);
-      const mapData = await fs.readFile(mapName);
+      console.log(`Loading map ${this.sv.mapName}...`);
+      const mapData = await fs.readFile(this.sv.mapName);
       const arrayBuffer = mapData.buffer.slice(mapData.byteOffset, mapData.byteOffset + mapData.byteLength);
       const bspMap = parseBsp(arrayBuffer);
-      this.collisionModel = bspMap;
+      this.sv.collisionModel = bspMap;
       console.log(`Map loaded successfully.`);
     } catch (e) {
       console.warn("Failed to load map:", e);
     }
-    this.startTime = Date.now();
+    this.sv.startTime = Date.now();
     const imports = {
       trace: (start, mins, maxs, end, passent, contentmask) => {
-        if (!this.collisionModel) {
+        if (!this.sv.collisionModel) {
           return {
             fraction: 1,
             endpos: { ...end },
@@ -267,7 +273,7 @@ var DedicatedServer = class {
           end,
           mins: mins || void 0,
           maxs: maxs || void 0,
-          model: this.collisionModel
+          model: this.sv.collisionModel
         });
         return {
           allsolid: result.allsolid,
@@ -307,7 +313,7 @@ var DedicatedServer = class {
   handleConnection(ws) {
     let clientIndex = -1;
     for (let i = 0; i < MAX_CLIENTS; i++) {
-      if (this.clients[i] === null || this.clients[i].state === 0 /* Free */) {
+      if (this.svs.clients[i] === null || this.svs.clients[i].state === 0 /* Free */) {
         clientIndex = i;
         break;
       }
@@ -319,7 +325,7 @@ var DedicatedServer = class {
     const driver = new WebSocketNetDriver();
     driver.attach(ws);
     const client = createClient(clientIndex, driver);
-    this.clients[clientIndex] = client;
+    this.svs.clients[clientIndex] = client;
     driver.onMessage((data) => this.onClientMessage(client, data));
     driver.onClose(() => this.onClientDisconnect(client));
   }
@@ -341,7 +347,7 @@ var DedicatedServer = class {
   }
   onClientDisconnect(client) {
     console.log(`Client ${client.index} disconnected`);
-    this.clients[client.index] = null;
+    this.svs.clients[client.index] = null;
   }
   handleMove(client, cmd) {
     client.lastCmd = cmd;
@@ -370,34 +376,42 @@ var DedicatedServer = class {
     const writer = new BinaryWriter();
     writer.writeByte(ServerCommand.serverdata);
     writer.writeLong(34);
-    writer.writeLong(this.frameCount);
+    writer.writeLong(this.sv.frame);
     writer.writeByte(0);
     writer.writeString("baseq2");
     writer.writeShort(client.index);
     writer.writeString("maps/test.bsp");
     client.net.send(writer.getData());
   }
+  SV_ReadPackets() {
+  }
   runFrame() {
     if (!this.game) return;
-    this.frameCount++;
+    this.sv.frame++;
+    this.SV_ReadPackets();
+    for (const client of this.svs.clients) {
+      if (client && client.state === 3 /* Active */ && client.edict) {
+        this.game.clientThink(client.edict, client.lastCmd);
+      }
+    }
     this.game.frame({
-      frame: this.frameCount,
+      frame: this.sv.frame,
       deltaMs: FRAME_TIME_MS,
       nowMs: Date.now()
     });
-    this.sendClientMessages();
+    this.SV_SendClientMessages();
   }
-  sendClientMessages() {
-    for (const client of this.clients) {
+  SV_SendClientMessages() {
+    for (const client of this.svs.clients) {
       if (client && client.state === 3 /* Active */) {
-        this.sendClientFrame(client);
+        this.SV_SendClientFrame(client);
       }
     }
   }
-  sendClientFrame(client) {
+  SV_SendClientFrame(client) {
     const writer = new BinaryWriter();
     writer.writeByte(ServerCommand.frame);
-    writer.writeLong(this.frameCount);
+    writer.writeLong(this.sv.frame);
     writer.writeLong(0);
     writer.writeByte(0);
     writer.writeByte(0);
@@ -413,7 +427,7 @@ var DedicatedServer = class {
   multicast(origin, type, event, ...args) {
   }
   unicast(ent, reliable, event, ...args) {
-    const client = this.clients.find((c) => c?.edict === ent);
+    const client = this.svs.clients.find((c) => c?.edict === ent);
     if (client) {
     }
   }