quake2ts 0.0.289 → 0.0.291

package/packages/client/dist/esm/index.js

@@ -9571,6 +9571,7 @@ _NetChan3.MAX_MSGLEN = 1400;
 _NetChan3.FRAGMENT_SIZE = 1024;
 _NetChan3.PACKET_HEADER = 10;
 _NetChan3.HEADER_OVERHEAD = _NetChan3.PACKET_HEADER + 2;
+var NetChan = _NetChan3;
 var AmmoType2 = /* @__PURE__ */ ((AmmoType22) => {
   AmmoType22[AmmoType22["Bullets"] = 0] = "Bullets";
   AmmoType22[AmmoType22["Shells"] = 1] = "Shells";
@@ -11598,6 +11599,7 @@ var MultiplayerConnection = class {
     this.commandHistory = [];
     this.driver = new BrowserWebSocketNetDriver();
     this.options = options;
+    this.netchan = new NetChan();
     this.driver.onMessage((data) => this.handleMessage(data));
     this.driver.onClose(() => this.handleDisconnect());
     this.driver.onError((err2) => console.error("Network Error:", err2));
@@ -11608,6 +11610,7 @@ var MultiplayerConnection = class {
     }
     console.log(`Connecting to ${url}...`);
     this.state = 1 /* Connecting */;
+    this.netchan.reset();
     try {
       await this.driver.connect(url);
       console.log("WebSocket connected.");
@@ -11639,13 +11642,12 @@ var MultiplayerConnection = class {
       this.commandHistory.shift();
     }
     const writer = new BinaryWriter2();
-    writer.writeLong(0);
-    writer.writeLong(0);
     writer.writeByte(ClientCommand.move);
     writer.writeByte(0);
     writer.writeLong(this.latestServerFrame);
     writeUserCommand(writer, commandWithFrame);
-    this.driver.send(writer.getData());
+    const packet = this.netchan.transmit(writer.getData());
+    this.driver.send(packet);
   }
   handleMessage(data) {
     let buffer = data.buffer;
@@ -11654,11 +11656,15 @@ var MultiplayerConnection = class {
       new Uint8Array(newBuffer).set(data);
       buffer = newBuffer;
     }
-    const stream = new BinaryStream2(buffer);
-    const sequence = stream.readLong();
-    const sequenceAck = stream.readLong();
-    this.parser = new NetworkMessageParser(stream, this);
-    this.parser.parseMessage();
+    const processedData = this.netchan.process(new Uint8Array(buffer));
+    if (!processedData) {
+      return;
+    }
+    if (processedData.byteLength > 0) {
+      const stream = new BinaryStream2(processedData.buffer);
+      this.parser = new NetworkMessageParser(stream, this);
+      this.parser.parseMessage();
+    }
   }
   handleDisconnect() {
     console.log("Disconnected from server.");
@@ -11668,14 +11674,16 @@ var MultiplayerConnection = class {
     const builder = new NetworkMessageBuilder();
     builder.writeByte(ClientCommand.stringcmd);
     builder.writeString("getchallenge");
-    this.driver.send(builder.getData());
+    const packet = this.netchan.transmit(builder.getData());
+    this.driver.send(packet);
   }
   sendConnect(challenge) {
     const builder = new NetworkMessageBuilder();
     builder.writeByte(ClientCommand.stringcmd);
     const userinfo = `\\name\\${this.options.username}\\model\\${this.options.model}\\skin\\${this.options.skin}\\hand\\${this.options.hand ?? 0}\\fov\\${this.options.fov ?? 90}`;
     builder.writeString(`connect ${PROTOCOL_VERSION_RERELEASE} ${challenge} ${userinfo}`);
-    this.driver.send(builder.getData());
+    const packet = this.netchan.transmit(builder.getData());
+    this.driver.send(packet);
   }
   isConnected() {
     return this.state === 5 /* Active */;
@@ -11694,7 +11702,8 @@ var MultiplayerConnection = class {
     const builder = new NetworkMessageBuilder();
     builder.writeByte(ClientCommand.stringcmd);
     builder.writeString("new");
-    this.driver.send(builder.getData());
+    const packet = this.netchan.transmit(builder.getData());
+    this.driver.send(packet);
     this.state = 4 /* Loading */;
   }
   onConfigString(index, str3) {
@@ -11721,7 +11730,8 @@ var MultiplayerConnection = class {
     const builder = new NetworkMessageBuilder();
     builder.writeByte(ClientCommand.stringcmd);
     builder.writeString("begin");
-    this.driver.send(builder.getData());
+    const packet = this.netchan.transmit(builder.getData());
+    this.driver.send(packet);
     this.state = 5 /* Active */;
   }
   onFrame(frame) {