@bloopjs/engine 0.0.87 → 0.0.89

package/js/contexts/netContext.ts

@@ -1,3 +1,24 @@
+import {
+  MAX_PLAYERS,
+  NET_CTX_PEERS_OFFSET,
+  NET_CTX_LAST_ROLLBACK_DEPTH_OFFSET,
+  NET_CTX_TOTAL_ROLLBACKS_OFFSET,
+  NET_CTX_FRAMES_RESIMULATED_OFFSET,
+  NET_CTX_PEER_COUNT_OFFSET,
+  NET_CTX_LOCAL_PEER_ID_OFFSET,
+  NET_CTX_IN_SESSION_OFFSET,
+  NET_CTX_STATUS_OFFSET,
+  NET_CTX_MATCH_FRAME_OFFSET,
+  NET_CTX_SESSION_START_FRAME_OFFSET,
+  NET_CTX_ROOM_CODE_OFFSET,
+  NET_CTX_WANTS_ROOM_CODE_OFFSET,
+  NET_CTX_WANTS_DISCONNECT_OFFSET,
+  PEER_CTX_SIZE,
+  PEER_CTX_CONNECTED_OFFSET,
+  PEER_CTX_SEQ_OFFSET,
+  PEER_CTX_ACK_OFFSET,
+} from "../codegen/offsets";
+
 /**
  * Network status values matching Zig NetStatus enum
  */
@@ -28,17 +49,6 @@ export type PeerInfo = {
   ack: number; // -1 if no packets received
 };
 
-const MAX_PEERS = 12;
-const PEERS_ARRAY_OFFSET = 32; // After _pad at offset 29-31
-const PEER_CTX_SIZE = 8; // connected(1) + packet_count(1) + seq(2) + ack(2) + ack_count(1) + pad(1)
-
-// Offsets within PeerCtx struct
-const PEER_CONNECTED_OFFSET = 0;
-const PEER_PACKET_COUNT_OFFSET = 1;
-const PEER_SEQ_OFFSET = 2;
-const PEER_ACK_OFFSET = 4;
-const PEER_ACK_COUNT_OFFSET = 6;
-
 const STATUS_MAP: Record<number, NetStatus> = {
   0: "offline",
   1: "local",
@@ -48,14 +58,8 @@ const STATUS_MAP: Record<number, NetStatus> = {
 };
 
 /**
- * NetCtx struct layout (from context.zig):
- * - peer_count: u8 (offset 0)
- * - local_peer_id: u8 (offset 1)
- * - in_session: u8 (offset 2)
- * - status: u8 (offset 3)
- * - match_frame: u32 (offset 4)
- * - session_start_frame: u32 (offset 8)
- * - room_code: [8]u8 (offset 12)
+ * NetCtx struct layout is defined in context.zig.
+ * Field offsets are generated in codegen/offsets.ts.
  *
  * All getters read directly from the engine's memory via DataView.
  * State is managed by the Zig engine, not TypeScript.
@@ -64,7 +68,7 @@ export class NetContext {
   dataView?: DataView;
 
   // Pre-allocated peer objects to avoid GC pressure
-  #peers: PeerInfo[] = Array.from({ length: MAX_PEERS }, () => ({
+  #peers: PeerInfo[] = Array.from({ length: MAX_PLAYERS }, () => ({
     isLocal: false,
     seq: -1,
     ack: -1,
@@ -87,7 +91,7 @@ export class NetContext {
     if (!this.#hasValidBuffer()) {
       throw new Error("NetContext dataView is not valid");
     }
-    return this.dataView!.getUint8(0);
+    return this.dataView!.getUint8(NET_CTX_PEER_COUNT_OFFSET);
   }
 
   /** Local peer ID in the session */
@@ -95,7 +99,7 @@ export class NetContext {
     if (!this.#hasValidBuffer()) {
       throw new Error("NetContext dataView is not valid");
     }
-    return this.dataView!.getUint8(1);
+    return this.dataView!.getUint8(NET_CTX_LOCAL_PEER_ID_OFFSET);
   }
 
   /** Whether we're in an active multiplayer session */
@@ -103,7 +107,7 @@ export class NetContext {
     if (!this.#hasValidBuffer()) {
       throw new Error("NetContext dataView is not valid");
     }
-    return this.dataView!.getUint8(2) !== 0;
+    return this.dataView!.getUint8(NET_CTX_IN_SESSION_OFFSET) !== 0;
   }
 
   /** Current network status */
@@ -111,7 +115,7 @@ export class NetContext {
     if (!this.#hasValidBuffer()) {
       throw new Error("NetContext dataView is not valid");
     }
-    const statusByte = this.dataView!.getUint8(3);
+    const statusByte = this.dataView!.getUint8(NET_CTX_STATUS_OFFSET);
     return STATUS_MAP[statusByte] ?? "local";
   }
 
@@ -120,7 +124,7 @@ export class NetContext {
     if (!this.#hasValidBuffer()) {
       throw new Error("NetContext dataView is not valid");
     }
-    return this.dataView!.getUint32(4, true);
+    return this.dataView!.getUint32(NET_CTX_MATCH_FRAME_OFFSET, true);
   }
 
   /**
@@ -131,7 +135,7 @@ export class NetContext {
     if (!this.#hasValidBuffer()) {
       throw new Error("NetContext dataView is not valid");
     }
-    return this.dataView!.getUint32(8, true);
+    return this.dataView!.getUint32(NET_CTX_SESSION_START_FRAME_OFFSET, true);
   }
 
   /** Current room code (empty string if not in a room) */
@@ -139,10 +143,10 @@ export class NetContext {
     if (!this.#hasValidBuffer()) {
       throw new Error("NetContext dataView is not valid");
     }
-    // Read 8 bytes starting at offset 12, convert to string until null terminator
+    // Read 8 bytes starting at room_code offset, convert to string until null terminator
     const bytes: number[] = [];
     for (let i = 0; i < 8; i++) {
-      const byte = this.dataView!.getUint8(12 + i);
+      const byte = this.dataView!.getUint8(NET_CTX_ROOM_CODE_OFFSET + i);
       if (byte === 0) break;
       bytes.push(byte);
     }
@@ -154,10 +158,10 @@ export class NetContext {
     if (!this.#hasValidBuffer()) {
       return undefined;
     }
-    // Read 8 bytes starting at offset 20, convert to string until null terminator
+    // Read 8 bytes starting at wants_room_code offset, convert to string until null terminator
     const bytes: number[] = [];
     for (let i = 0; i < 8; i++) {
-      const byte = this.dataView!.getUint8(20 + i);
+      const byte = this.dataView!.getUint8(NET_CTX_WANTS_ROOM_CODE_OFFSET + i);
       if (byte === 0) break;
       bytes.push(byte);
     }
@@ -170,12 +174,12 @@ export class NetContext {
     }
     // Clear first
     for (let i = 0; i < 8; i++) {
-      this.dataView!.setUint8(20 + i, 0);
+      this.dataView!.setUint8(NET_CTX_WANTS_ROOM_CODE_OFFSET + i, 0);
     }
     if (code) {
       // Write up to 7 chars (leave room for null terminator)
       for (let i = 0; i < Math.min(code.length, 7); i++) {
-        this.dataView!.setUint8(20 + i, code.charCodeAt(i));
+        this.dataView!.setUint8(NET_CTX_WANTS_ROOM_CODE_OFFSET + i, code.charCodeAt(i));
       }
     }
   }
@@ -185,14 +189,14 @@ export class NetContext {
     if (!this.#hasValidBuffer()) {
       return false;
     }
-    return this.dataView!.getUint8(28) !== 0;
+    return this.dataView!.getUint8(NET_CTX_WANTS_DISCONNECT_OFFSET) !== 0;
   }
 
   set wantsDisconnect(value: boolean) {
     if (!this.#hasValidBuffer()) {
       throw new Error("NetContext dataView is not valid");
     }
-    this.dataView!.setUint8(28, value ? 1 : 0);
+    this.dataView!.setUint8(NET_CTX_WANTS_DISCONNECT_OFFSET, value ? 1 : 0);
   }
 
   /**
@@ -216,14 +220,15 @@ export class NetContext {
     const localPeerId = this.localPeerId;
     const matchFrame = this.matchFrame;
 
-    // Calculate local peer ack = min(seq) across connected remotes with packets
+    // Calculate local peer ack = min(seq) across connected remotes with data
     let minRemoteSeq = -1;
-    for (let i = 0; i < MAX_PEERS; i++) {
+    for (let i = 0; i < MAX_PLAYERS; i++) {
       if (i === localPeerId) continue;
-      const peerOffset = PEERS_ARRAY_OFFSET + i * PEER_CTX_SIZE;
-      if (dv.getUint8(peerOffset + PEER_CONNECTED_OFFSET) !== 1) continue;
-      if (dv.getUint8(peerOffset + PEER_PACKET_COUNT_OFFSET) === 0) continue;
-      const seq = dv.getUint16(peerOffset + PEER_SEQ_OFFSET, true);
+      const peerOffset = NET_CTX_PEERS_OFFSET + i * PEER_CTX_SIZE;
+      if (dv.getUint8(peerOffset + PEER_CTX_CONNECTED_OFFSET) !== 1) continue;
+      // seq is now i16 with -1 meaning "no data yet"
+      const seq = dv.getInt16(peerOffset + PEER_CTX_SEQ_OFFSET, true);
+      if (seq < 0) continue; // No data from this peer yet
       if (minRemoteSeq === -1 || seq < minRemoteSeq) {
         minRemoteSeq = seq;
       }
@@ -231,9 +236,9 @@ export class NetContext {
 
     // Update pre-allocated peer objects and build result array
     this.#peersResult.length = 0;
-    for (let i = 0; i < MAX_PEERS; i++) {
-      const peerOffset = PEERS_ARRAY_OFFSET + i * PEER_CTX_SIZE;
-      if (dv.getUint8(peerOffset + PEER_CONNECTED_OFFSET) !== 1) continue;
+    for (let i = 0; i < MAX_PLAYERS; i++) {
+      const peerOffset = NET_CTX_PEERS_OFFSET + i * PEER_CTX_SIZE;
+      if (dv.getUint8(peerOffset + PEER_CTX_CONNECTED_OFFSET) !== 1) continue;
 
       const peer = this.#peers[i];
       if (!peer) {
@@ -246,13 +251,37 @@ export class NetContext {
         peer.seq = matchFrame;
         peer.ack = minRemoteSeq;
       } else {
-        const packetCount = dv.getUint8(peerOffset + PEER_PACKET_COUNT_OFFSET);
-        const ackCount = dv.getUint8(peerOffset + PEER_ACK_COUNT_OFFSET);
-        peer.seq = packetCount === 0 ? -1 : dv.getUint16(peerOffset + PEER_SEQ_OFFSET, true);
-        peer.ack = ackCount === 0 ? -1 : dv.getUint16(peerOffset + PEER_ACK_OFFSET, true);
+        // seq and ack are now i16 with -1 meaning "no data yet"
+        peer.seq = dv.getInt16(peerOffset + PEER_CTX_SEQ_OFFSET, true);
+        peer.ack = dv.getInt16(peerOffset + PEER_CTX_ACK_OFFSET, true);
       }
       this.#peersResult.push(peer);
     }
     return this.#peersResult;
   }
+
+  /** Last rollback depth (how many frames were rolled back) */
+  get lastRollbackDepth(): number {
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
+    }
+    return this.dataView!.getUint32(NET_CTX_LAST_ROLLBACK_DEPTH_OFFSET, true);
+  }
+
+  /** Total number of rollbacks during this session */
+  get totalRollbacks(): number {
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
+    }
+    return this.dataView!.getUint32(NET_CTX_TOTAL_ROLLBACKS_OFFSET, true);
+  }
+
+  /** Total frames resimulated during this session */
+  get framesResimulated(): number {
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
+    }
+    // Read u64 as BigInt then convert to number (safe for reasonable frame counts)
+    return Number(this.dataView!.getBigUint64(NET_CTX_FRAMES_RESIMULATED_OFFSET, true));
+  }
 }

package/js/contexts/timeContext.ts

@@ -1,3 +1,9 @@
+import {
+  TIME_CTX_FRAME_OFFSET,
+  TIME_CTX_DT_MS_OFFSET,
+  TIME_CTX_TOTAL_MS_OFFSET,
+} from "../codegen/offsets";
+
 export class TimeContext {
   dataView?: DataView;
 
@@ -10,7 +16,7 @@ export class TimeContext {
     if (!this.dataView) {
       throw new Error("TimeContext DataView is not initialized");
     }
-    return this.dataView.getUint32(0, true);
+    return this.dataView.getUint32(TIME_CTX_FRAME_OFFSET, true);
   }
 
   /** The number of seconds since the last frame */
@@ -18,7 +24,7 @@ export class TimeContext {
     if (!this.dataView) {
       throw new Error("TimeContext DataView is not initialized");
     }
-    return this.dataView.getUint32(4, true) / 1000;
+    return this.dataView.getUint32(TIME_CTX_DT_MS_OFFSET, true) / 1000;
   }
 
   /** The total number of seconds since the engine started */
@@ -26,6 +32,6 @@ export class TimeContext {
     if (!this.dataView) {
       throw new Error("TimeContext DataView is not initialized");
     }
-    return this.dataView.getUint32(8, true) / 1000;
+    return this.dataView.getUint32(TIME_CTX_TOTAL_MS_OFFSET, true) / 1000;
   }
 }

package/js/defaultUrl.ts

@@ -1 +1 @@
-export const DEFAULT_WASM_URL: URL = new URL("https://unpkg.com/@bloopjs/engine@0.0.87/wasm/bloop.wasm");
+export const DEFAULT_WASM_URL: URL = new URL("https://unpkg.com/@bloopjs/engine@0.0.89/wasm/bloop.wasm");

package/js/inputs.ts

@@ -1,20 +1,24 @@
 import * as Enums from "./codegen/enums";
 
-// Constants for memory layout
-// TODO: move magic numbers to codegen
-export const MAX_PLAYERS = 12;
+// Re-export layout constants from generated offsets
+export {
+  MAX_PLAYERS,
+  KEY_CTX_SIZE,
+  MOUSE_CTX_SIZE,
+  PLAYER_INPUTS_SIZE,
+  INPUT_CTX_SIZE,
+  PLAYER_INPUTS_KEY_CTX_OFFSET,
+  PLAYER_INPUTS_MOUSE_CTX_OFFSET,
+  MOUSE_CTX_BUTTON_STATES_OFFSET,
+} from "./codegen/offsets";
 
-// Per-player offsets (relative to start of PlayerInputs)
-export const KEYBOARD_OFFSET = 0;
-export const KEYBOARD_SIZE = 256;
-export const MOUSE_OFFSET = 256; // After keyboard
-export const MOUSE_BUTTONS_OFFSET = 16; // Within MouseCtx, after x, y, wheel_x, wheel_y (4 floats = 16 bytes)
-
-// PlayerInputs size = KeyCtx (256) + MouseCtx (24) = 280 bytes
-export const PLAYER_INPUTS_SIZE = 280;
-
-// InputCtx layout: players[12] = 12 * 280 = 3360 bytes
-export const INPUT_CTX_SIZE = MAX_PLAYERS * PLAYER_INPUTS_SIZE;
+// Backwards compatibility aliases
+export {
+  PLAYER_INPUTS_KEY_CTX_OFFSET as KEYBOARD_OFFSET,
+  KEY_CTX_SIZE as KEYBOARD_SIZE,
+  PLAYER_INPUTS_MOUSE_CTX_OFFSET as MOUSE_OFFSET,
+  MOUSE_CTX_BUTTON_STATES_OFFSET as MOUSE_BUTTONS_OFFSET,
+} from "./codegen/offsets";
 
 export const EVENT_PAYLOAD_SIZE = 8;
 export const EVENT_PAYLOAD_ALIGN = 4;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bloopjs/engine",
-  "version": "0.0.87",
+  "version": "0.0.89",
   "type": "module",
   "repository": {
     "type": "git",