quake2ts 0.0.301 → 0.0.303

package/packages/client/dist/cjs/index.cjs

@@ -2442,10 +2442,14 @@ var _NetChan = class _NetChan2 {
     this.incomingReliableSequence = 0;
     this.outgoingReliableSequence = 0;
     this.reliableLength = 0;
+    this.fragmentSendOffset = 0;
+    this.fragmentBuffer = null;
+    this.fragmentLength = 0;
+    this.fragmentReceived = 0;
     this.lastReceived = 0;
     this.lastSent = 0;
     this.remoteAddress = null;
-    this.reliableMessage = new BinaryWriter(_NetChan2.MAX_MSGLEN);
+    this.reliableMessage = new BinaryWriter(_NetChan2.MAX_RELIABLE_BUFFER);
     const now = Date.now();
     this.lastReceived = now;
     this.lastSent = now;
@@ -2471,6 +2475,10 @@ var _NetChan = class _NetChan2 {
     this.outgoingReliableSequence = 0;
     this.reliableLength = 0;
     this.reliableMessage.reset();
+    this.fragmentSendOffset = 0;
+    this.fragmentBuffer = null;
+    this.fragmentLength = 0;
+    this.fragmentReceived = 0;
     this.lastReceived = Date.now();
     this.lastSent = Date.now();
   }
@@ -2480,18 +2488,38 @@ var _NetChan = class _NetChan2 {
   transmit(unreliableData) {
     this.outgoingSequence++;
     this.lastSent = Date.now();
+    let sendReliableLength = 0;
+    let isFragment = false;
+    let fragmentStart = 0;
+    if (this.reliableLength > 0) {
+      if (this.reliableLength > _NetChan2.FRAGMENT_SIZE) {
+        isFragment = true;
+        if (this.fragmentSendOffset >= this.reliableLength) {
+          this.fragmentSendOffset = 0;
+        }
+        const remaining = this.reliableLength - this.fragmentSendOffset;
+        sendReliableLength = remaining;
+        if (sendReliableLength > _NetChan2.FRAGMENT_SIZE) {
+          sendReliableLength = _NetChan2.FRAGMENT_SIZE;
+        }
+        fragmentStart = this.fragmentSendOffset;
+        this.fragmentSendOffset += sendReliableLength;
+      } else {
+        sendReliableLength = this.reliableLength;
+      }
+    }
     const headerSize = _NetChan2.PACKET_HEADER;
-    const reliableSize = this.reliableLength > 0 ? this.reliableLength + 2 : 0;
+    const reliableHeaderSize = sendReliableLength > 0 ? 2 + (isFragment ? 8 : 0) : 0;
     let unreliableSize = unreliableData ? unreliableData.length : 0;
-    if (headerSize + reliableSize + unreliableSize > _NetChan2.MAX_MSGLEN) {
-      unreliableSize = _NetChan2.MAX_MSGLEN - headerSize - reliableSize;
+    if (headerSize + reliableHeaderSize + sendReliableLength + unreliableSize > _NetChan2.MAX_MSGLEN) {
+      unreliableSize = _NetChan2.MAX_MSGLEN - headerSize - reliableHeaderSize - sendReliableLength;
       if (unreliableSize < 0) unreliableSize = 0;
     }
-    const buffer = new ArrayBuffer(headerSize + reliableSize + unreliableSize);
+    const buffer = new ArrayBuffer(headerSize + reliableHeaderSize + sendReliableLength + unreliableSize);
     const view = new DataView(buffer);
     const result = new Uint8Array(buffer);
     let sequence = this.outgoingSequence;
-    if (this.reliableLength > 0) {
+    if (sendReliableLength > 0) {
       sequence |= 2147483648;
       if ((this.outgoingReliableSequence & 1) !== 0) {
         sequence |= 1073741824;
@@ -2505,13 +2533,23 @@ var _NetChan = class _NetChan2 {
     view.setUint32(4, ack, true);
     view.setUint16(8, this.qport, true);
     let offset = headerSize;
-    if (this.reliableLength > 0) {
-      view.setUint16(offset, this.reliableLength, true);
+    if (sendReliableLength > 0) {
+      let lengthField = sendReliableLength;
+      if (isFragment) {
+        lengthField |= 32768;
+      }
+      view.setUint16(offset, lengthField, true);
       offset += 2;
+      if (isFragment) {
+        view.setUint32(offset, fragmentStart, true);
+        offset += 4;
+        view.setUint32(offset, this.reliableLength, true);
+        offset += 4;
+      }
       const reliableBuffer = this.reliableMessage.getBuffer();
-      const reliableBytes = reliableBuffer.subarray(0, this.reliableLength);
+      const reliableBytes = reliableBuffer.subarray(fragmentStart, fragmentStart + sendReliableLength);
       result.set(reliableBytes, offset);
-      offset += this.reliableLength;
+      offset += sendReliableLength;
     }
     if (unreliableData && unreliableSize > 0) {
       const chunk = unreliableData.slice(0, unreliableSize);
@@ -2552,6 +2590,7 @@ var _NetChan = class _NetChan2 {
         this.reliableLength = 0;
         this.reliableMessage.reset();
         this.outgoingReliableSequence ^= 1;
+        this.fragmentSendOffset = 0;
       }
     }
     const hasReliableData = (sequence & 2147483648) !== 0;
@@ -2560,13 +2599,45 @@ var _NetChan = class _NetChan2 {
     let reliableData = null;
     if (hasReliableData) {
       if (payloadOffset + 2 > packet.byteLength) return null;
-      const reliableLen = view.getUint16(payloadOffset, true);
+      let reliableLen = view.getUint16(payloadOffset, true);
       payloadOffset += 2;
+      const isFragment = (reliableLen & 32768) !== 0;
+      reliableLen &= 32767;
       const expectedBit = this.incomingReliableSequence & 1;
       if (reliableSeqBit === expectedBit) {
-        this.incomingReliableSequence++;
-        if (payloadOffset + reliableLen > packet.byteLength) return null;
-        reliableData = packet.slice(payloadOffset, payloadOffset + reliableLen);
+        if (isFragment) {
+          if (payloadOffset + 8 > packet.byteLength) return null;
+          const fragStart = view.getUint32(payloadOffset, true);
+          payloadOffset += 4;
+          const fragTotal = view.getUint32(payloadOffset, true);
+          payloadOffset += 4;
+          if (fragTotal > _NetChan2.MAX_RELIABLE_BUFFER) {
+            console.warn(`NetChan: received invalid fragment total ${fragTotal} > ${_NetChan2.MAX_RELIABLE_BUFFER}`);
+            return null;
+          }
+          if (!this.fragmentBuffer || this.fragmentBuffer.length !== fragTotal) {
+            this.fragmentBuffer = new Uint8Array(fragTotal);
+            this.fragmentLength = fragTotal;
+            this.fragmentReceived = 0;
+          }
+          if (payloadOffset + reliableLen > packet.byteLength) return null;
+          const data = packet.subarray(payloadOffset, payloadOffset + reliableLen);
+          if (fragStart === this.fragmentReceived && fragStart + reliableLen <= fragTotal) {
+            this.fragmentBuffer.set(data, fragStart);
+            this.fragmentReceived += reliableLen;
+            if (this.fragmentReceived >= fragTotal) {
+              reliableData = this.fragmentBuffer;
+              this.incomingReliableSequence++;
+              this.fragmentBuffer = null;
+              this.fragmentLength = 0;
+              this.fragmentReceived = 0;
+            }
+          }
+        } else {
+          this.incomingReliableSequence++;
+          if (payloadOffset + reliableLen > packet.byteLength) return null;
+          reliableData = packet.slice(payloadOffset, payloadOffset + reliableLen);
+        }
       }
       payloadOffset += reliableLen;
     }
@@ -2593,7 +2664,7 @@ var _NetChan = class _NetChan2 {
    * Writes a byte to the reliable message buffer
    */
   writeReliableByte(value) {
-    if (this.reliableLength + 1 > _NetChan2.MAX_MSGLEN - _NetChan2.HEADER_OVERHEAD) {
+    if (this.reliableLength + 1 > _NetChan2.MAX_RELIABLE_BUFFER) {
       throw new Error("NetChan reliable buffer overflow");
     }
     this.reliableMessage.writeByte(value);
@@ -2603,7 +2674,7 @@ var _NetChan = class _NetChan2 {
    * Writes a short to the reliable message buffer
    */
   writeReliableShort(value) {
-    if (this.reliableLength + 2 > _NetChan2.MAX_MSGLEN - _NetChan2.HEADER_OVERHEAD) {
+    if (this.reliableLength + 2 > _NetChan2.MAX_RELIABLE_BUFFER) {
       throw new Error("NetChan reliable buffer overflow");
     }
     this.reliableMessage.writeShort(value);
@@ -2613,7 +2684,7 @@ var _NetChan = class _NetChan2 {
    * Writes a long to the reliable message buffer
    */
   writeReliableLong(value) {
-    if (this.reliableLength + 4 > _NetChan2.MAX_MSGLEN - _NetChan2.HEADER_OVERHEAD) {
+    if (this.reliableLength + 4 > _NetChan2.MAX_RELIABLE_BUFFER) {
       throw new Error("NetChan reliable buffer overflow");
     }
     this.reliableMessage.writeLong(value);
@@ -2624,7 +2695,7 @@ var _NetChan = class _NetChan2 {
    */
   writeReliableString(value) {
     const len2 = value.length + 1;
-    if (this.reliableLength + len2 > _NetChan2.MAX_MSGLEN - _NetChan2.HEADER_OVERHEAD) {
+    if (this.reliableLength + len2 > _NetChan2.MAX_RELIABLE_BUFFER) {
       throw new Error("NetChan reliable buffer overflow");
     }
     this.reliableMessage.writeString(value);
@@ -2657,6 +2728,7 @@ _NetChan.MAX_MSGLEN = 1400;
 _NetChan.FRAGMENT_SIZE = 1024;
 _NetChan.PACKET_HEADER = 10;
 _NetChan.HEADER_OVERHEAD = _NetChan.PACKET_HEADER + 2;
+_NetChan.MAX_RELIABLE_BUFFER = 262144;
 var AmmoType = /* @__PURE__ */ ((AmmoType22) => {
   AmmoType22[AmmoType22["Bullets"] = 0] = "Bullets";
   AmmoType22[AmmoType22["Shells"] = 1] = "Shells";
@@ -9066,6 +9138,28 @@ function writeUserCommand(writer, cmd) {
   writer.writeByte(0);
   writer.writeByte(0);
 }
+var RenderFx = /* @__PURE__ */ ((RenderFx2) => {
+  RenderFx2[RenderFx2["MinLight"] = 1] = "MinLight";
+  RenderFx2[RenderFx2["ViewerModel"] = 2] = "ViewerModel";
+  RenderFx2[RenderFx2["WeaponModel"] = 4] = "WeaponModel";
+  RenderFx2[RenderFx2["FullBright"] = 8] = "FullBright";
+  RenderFx2[RenderFx2["DepthHack"] = 16] = "DepthHack";
+  RenderFx2[RenderFx2["Translucent"] = 32] = "Translucent";
+  RenderFx2[RenderFx2["FrameLerp"] = 64] = "FrameLerp";
+  RenderFx2[RenderFx2["Beam"] = 128] = "Beam";
+  RenderFx2[RenderFx2["CustomLight"] = 256] = "CustomLight";
+  RenderFx2[RenderFx2["Glow"] = 512] = "Glow";
+  RenderFx2[RenderFx2["ShellRed"] = 1024] = "ShellRed";
+  RenderFx2[RenderFx2["ShellGreen"] = 2048] = "ShellGreen";
+  RenderFx2[RenderFx2["ShellBlue"] = 4096] = "ShellBlue";
+  RenderFx2[RenderFx2["IrVisible"] = 32768] = "IrVisible";
+  RenderFx2[RenderFx2["ShellDouble"] = 65536] = "ShellDouble";
+  RenderFx2[RenderFx2["ShellHalfDam"] = 131072] = "ShellHalfDam";
+  RenderFx2[RenderFx2["MinLightPlus"] = 262144] = "MinLightPlus";
+  RenderFx2[RenderFx2["ExtraLight"] = 524288] = "ExtraLight";
+  RenderFx2[RenderFx2["BeamLightning"] = 1048576] = "BeamLightning";
+  return RenderFx2;
+})(RenderFx || {});
 var entityFlags_exports2 = {};
 __export3(entityFlags_exports2, {
   U_ANGLE1: () => U_ANGLE13,
@@ -9426,10 +9520,14 @@ var _NetChan3 = class _NetChan4 {
     this.incomingReliableSequence = 0;
     this.outgoingReliableSequence = 0;
     this.reliableLength = 0;
+    this.fragmentSendOffset = 0;
+    this.fragmentBuffer = null;
+    this.fragmentLength = 0;
+    this.fragmentReceived = 0;
     this.lastReceived = 0;
     this.lastSent = 0;
     this.remoteAddress = null;
-    this.reliableMessage = new BinaryWriter2(_NetChan4.MAX_MSGLEN);
+    this.reliableMessage = new BinaryWriter2(_NetChan4.MAX_RELIABLE_BUFFER);
     const now = Date.now();
     this.lastReceived = now;
     this.lastSent = now;
@@ -9455,6 +9553,10 @@ var _NetChan3 = class _NetChan4 {
     this.outgoingReliableSequence = 0;
     this.reliableLength = 0;
     this.reliableMessage.reset();
+    this.fragmentSendOffset = 0;
+    this.fragmentBuffer = null;
+    this.fragmentLength = 0;
+    this.fragmentReceived = 0;
     this.lastReceived = Date.now();
     this.lastSent = Date.now();
   }
@@ -9464,18 +9566,38 @@ var _NetChan3 = class _NetChan4 {
   transmit(unreliableData) {
     this.outgoingSequence++;
     this.lastSent = Date.now();
+    let sendReliableLength = 0;
+    let isFragment = false;
+    let fragmentStart = 0;
+    if (this.reliableLength > 0) {
+      if (this.reliableLength > _NetChan4.FRAGMENT_SIZE) {
+        isFragment = true;
+        if (this.fragmentSendOffset >= this.reliableLength) {
+          this.fragmentSendOffset = 0;
+        }
+        const remaining = this.reliableLength - this.fragmentSendOffset;
+        sendReliableLength = remaining;
+        if (sendReliableLength > _NetChan4.FRAGMENT_SIZE) {
+          sendReliableLength = _NetChan4.FRAGMENT_SIZE;
+        }
+        fragmentStart = this.fragmentSendOffset;
+        this.fragmentSendOffset += sendReliableLength;
+      } else {
+        sendReliableLength = this.reliableLength;
+      }
+    }
     const headerSize = _NetChan4.PACKET_HEADER;
-    const reliableSize = this.reliableLength > 0 ? this.reliableLength + 2 : 0;
+    const reliableHeaderSize = sendReliableLength > 0 ? 2 + (isFragment ? 8 : 0) : 0;
     let unreliableSize = unreliableData ? unreliableData.length : 0;
-    if (headerSize + reliableSize + unreliableSize > _NetChan4.MAX_MSGLEN) {
-      unreliableSize = _NetChan4.MAX_MSGLEN - headerSize - reliableSize;
+    if (headerSize + reliableHeaderSize + sendReliableLength + unreliableSize > _NetChan4.MAX_MSGLEN) {
+      unreliableSize = _NetChan4.MAX_MSGLEN - headerSize - reliableHeaderSize - sendReliableLength;
       if (unreliableSize < 0) unreliableSize = 0;
     }
-    const buffer = new ArrayBuffer(headerSize + reliableSize + unreliableSize);
+    const buffer = new ArrayBuffer(headerSize + reliableHeaderSize + sendReliableLength + unreliableSize);
     const view = new DataView(buffer);
     const result = new Uint8Array(buffer);
     let sequence = this.outgoingSequence;
-    if (this.reliableLength > 0) {
+    if (sendReliableLength > 0) {
       sequence |= 2147483648;
       if ((this.outgoingReliableSequence & 1) !== 0) {
         sequence |= 1073741824;
@@ -9489,13 +9611,23 @@ var _NetChan3 = class _NetChan4 {
     view.setUint32(4, ack, true);
     view.setUint16(8, this.qport, true);
     let offset = headerSize;
-    if (this.reliableLength > 0) {
-      view.setUint16(offset, this.reliableLength, true);
+    if (sendReliableLength > 0) {
+      let lengthField = sendReliableLength;
+      if (isFragment) {
+        lengthField |= 32768;
+      }
+      view.setUint16(offset, lengthField, true);
       offset += 2;
+      if (isFragment) {
+        view.setUint32(offset, fragmentStart, true);
+        offset += 4;
+        view.setUint32(offset, this.reliableLength, true);
+        offset += 4;
+      }
       const reliableBuffer = this.reliableMessage.getBuffer();
-      const reliableBytes = reliableBuffer.subarray(0, this.reliableLength);
+      const reliableBytes = reliableBuffer.subarray(fragmentStart, fragmentStart + sendReliableLength);
       result.set(reliableBytes, offset);
-      offset += this.reliableLength;
+      offset += sendReliableLength;
     }
     if (unreliableData && unreliableSize > 0) {
       const chunk = unreliableData.slice(0, unreliableSize);
@@ -9536,6 +9668,7 @@ var _NetChan3 = class _NetChan4 {
         this.reliableLength = 0;
         this.reliableMessage.reset();
         this.outgoingReliableSequence ^= 1;
+        this.fragmentSendOffset = 0;
       }
     }
     const hasReliableData = (sequence & 2147483648) !== 0;
@@ -9544,13 +9677,45 @@ var _NetChan3 = class _NetChan4 {
     let reliableData = null;
     if (hasReliableData) {
       if (payloadOffset + 2 > packet.byteLength) return null;
-      const reliableLen = view.getUint16(payloadOffset, true);
+      let reliableLen = view.getUint16(payloadOffset, true);
       payloadOffset += 2;
+      const isFragment = (reliableLen & 32768) !== 0;
+      reliableLen &= 32767;
       const expectedBit = this.incomingReliableSequence & 1;
       if (reliableSeqBit === expectedBit) {
-        this.incomingReliableSequence++;
-        if (payloadOffset + reliableLen > packet.byteLength) return null;
-        reliableData = packet.slice(payloadOffset, payloadOffset + reliableLen);
+        if (isFragment) {
+          if (payloadOffset + 8 > packet.byteLength) return null;
+          const fragStart = view.getUint32(payloadOffset, true);
+          payloadOffset += 4;
+          const fragTotal = view.getUint32(payloadOffset, true);
+          payloadOffset += 4;
+          if (fragTotal > _NetChan4.MAX_RELIABLE_BUFFER) {
+            console.warn(`NetChan: received invalid fragment total ${fragTotal} > ${_NetChan4.MAX_RELIABLE_BUFFER}`);
+            return null;
+          }
+          if (!this.fragmentBuffer || this.fragmentBuffer.length !== fragTotal) {
+            this.fragmentBuffer = new Uint8Array(fragTotal);
+            this.fragmentLength = fragTotal;
+            this.fragmentReceived = 0;
+          }
+          if (payloadOffset + reliableLen > packet.byteLength) return null;
+          const data = packet.subarray(payloadOffset, payloadOffset + reliableLen);
+          if (fragStart === this.fragmentReceived && fragStart + reliableLen <= fragTotal) {
+            this.fragmentBuffer.set(data, fragStart);
+            this.fragmentReceived += reliableLen;
+            if (this.fragmentReceived >= fragTotal) {
+              reliableData = this.fragmentBuffer;
+              this.incomingReliableSequence++;
+              this.fragmentBuffer = null;
+              this.fragmentLength = 0;
+              this.fragmentReceived = 0;
+            }
+          }
+        } else {
+          this.incomingReliableSequence++;
+          if (payloadOffset + reliableLen > packet.byteLength) return null;
+          reliableData = packet.slice(payloadOffset, payloadOffset + reliableLen);
+        }
       }
       payloadOffset += reliableLen;
     }
@@ -9577,7 +9742,7 @@ var _NetChan3 = class _NetChan4 {
    * Writes a byte to the reliable message buffer
    */
   writeReliableByte(value) {
-    if (this.reliableLength + 1 > _NetChan4.MAX_MSGLEN - _NetChan4.HEADER_OVERHEAD) {
+    if (this.reliableLength + 1 > _NetChan4.MAX_RELIABLE_BUFFER) {
       throw new Error("NetChan reliable buffer overflow");
     }
     this.reliableMessage.writeByte(value);
@@ -9587,7 +9752,7 @@ var _NetChan3 = class _NetChan4 {
    * Writes a short to the reliable message buffer
    */
   writeReliableShort(value) {
-    if (this.reliableLength + 2 > _NetChan4.MAX_MSGLEN - _NetChan4.HEADER_OVERHEAD) {
+    if (this.reliableLength + 2 > _NetChan4.MAX_RELIABLE_BUFFER) {
       throw new Error("NetChan reliable buffer overflow");
     }
     this.reliableMessage.writeShort(value);
@@ -9597,7 +9762,7 @@ var _NetChan3 = class _NetChan4 {
    * Writes a long to the reliable message buffer
    */
   writeReliableLong(value) {
-    if (this.reliableLength + 4 > _NetChan4.MAX_MSGLEN - _NetChan4.HEADER_OVERHEAD) {
+    if (this.reliableLength + 4 > _NetChan4.MAX_RELIABLE_BUFFER) {
       throw new Error("NetChan reliable buffer overflow");
     }
     this.reliableMessage.writeLong(value);
@@ -9608,7 +9773,7 @@ var _NetChan3 = class _NetChan4 {
    */
   writeReliableString(value) {
     const len2 = value.length + 1;
-    if (this.reliableLength + len2 > _NetChan4.MAX_MSGLEN - _NetChan4.HEADER_OVERHEAD) {
+    if (this.reliableLength + len2 > _NetChan4.MAX_RELIABLE_BUFFER) {
       throw new Error("NetChan reliable buffer overflow");
     }
     this.reliableMessage.writeString(value);
@@ -9641,6 +9806,7 @@ _NetChan3.MAX_MSGLEN = 1400;
 _NetChan3.FRAGMENT_SIZE = 1024;
 _NetChan3.PACKET_HEADER = 10;
 _NetChan3.HEADER_OVERHEAD = _NetChan3.PACKET_HEADER + 2;
+_NetChan3.MAX_RELIABLE_BUFFER = 262144;
 var NetChan = _NetChan3;
 var AmmoType2 = /* @__PURE__ */ ((AmmoType22) => {
   AmmoType22[AmmoType22["Bullets"] = 0] = "Bullets";
@@ -10251,6 +10417,21 @@ function buildRenderableEntities(latestEntities, previousEntities, alpha, config
     mat4_exports.rotateX(mat, mat, angles.x * Math.PI / 180);
     mat4_exports.scale(mat, mat, [scale3, scale3, scale3]);
     const skinName = skinNum !== void 0 && skinNum > 0 ? configStrings.getImageName(skinNum) : void 0;
+    let tint;
+    const renderfx = ent.renderfx ?? 0;
+    if ((renderfx & (RenderFx.ShellGreen | RenderFx.ShellBlue)) === (RenderFx.ShellGreen | RenderFx.ShellBlue)) {
+      tint = [0, 1, 1, 1];
+    } else if (renderfx & RenderFx.ShellRed) {
+      tint = [1, 0, 0, 1];
+    } else if (renderfx & RenderFx.ShellGreen) {
+      tint = [0, 1, 0, 1];
+    } else if (renderfx & RenderFx.ShellBlue) {
+      tint = [0, 0, 1, 1];
+    } else if (renderfx & RenderFx.ShellDouble) {
+      tint = [1, 1, 0, 1];
+    } else if (renderfx & RenderFx.ShellHalfDam) {
+      tint = [0.5, 0.5, 0.5, 1];
+    }
     if (model.header.magic === 844121161) {
       renderables.push({
         type: "md2",
@@ -10263,7 +10444,8 @@ function buildRenderableEntities(latestEntities, previousEntities, alpha, config
         },
         transform: mat,
         skin: skinName,
-        alpha: normalizedAlpha
+        alpha: normalizedAlpha,
+        tint
       });
     } else if (model.header.magic === 860898377) {
       renderables.push({
@@ -10275,7 +10457,8 @@ function buildRenderableEntities(latestEntities, previousEntities, alpha, config
           lerp: alpha
         },
         transform: mat,
-        alpha: normalizedAlpha
+        alpha: normalizedAlpha,
+        tint
         // Lighting? Skins?
       });
     }