@bloopjs/web 0.0.87 → 0.0.89

package/dist/mod.js

@@ -82,16 +82,21 @@ __export2(exports_engine, {
   SNAPSHOT_HEADER_ENGINE_LEN_OFFSET: () => SNAPSHOT_HEADER_ENGINE_LEN_OFFSET,
   PlayerInputContext: () => PlayerInputContext,
   PLAYER_INPUTS_SIZE: () => PLAYER_INPUTS_SIZE,
+  PLAYER_INPUTS_MOUSE_CTX_OFFSET: () => PLAYER_INPUTS_MOUSE_CTX_OFFSET,
+  PLAYER_INPUTS_KEY_CTX_OFFSET: () => PLAYER_INPUTS_KEY_CTX_OFFSET,
   NetContext: () => NetContext,
   NET_CTX_OFFSET: () => NET_CTX_OFFSET,
   MouseContext: () => MouseContext,
-  MOUSE_OFFSET: () => MOUSE_OFFSET,
-  MOUSE_BUTTONS_OFFSET: () => MOUSE_BUTTONS_OFFSET,
+  MOUSE_OFFSET: () => PLAYER_INPUTS_MOUSE_CTX_OFFSET,
+  MOUSE_CTX_SIZE: () => MOUSE_CTX_SIZE,
+  MOUSE_CTX_BUTTON_STATES_OFFSET: () => MOUSE_CTX_BUTTON_STATES_OFFSET,
+  MOUSE_BUTTONS_OFFSET: () => MOUSE_CTX_BUTTON_STATES_OFFSET,
   MAX_ROLLBACK_FRAMES: () => MAX_ROLLBACK_FRAMES,
   MAX_PLAYERS: () => MAX_PLAYERS,
   KeyboardContext: () => KeyboardContext,
-  KEYBOARD_SIZE: () => KEYBOARD_SIZE,
-  KEYBOARD_OFFSET: () => KEYBOARD_OFFSET,
+  KEY_CTX_SIZE: () => KEY_CTX_SIZE,
+  KEYBOARD_SIZE: () => KEY_CTX_SIZE,
+  KEYBOARD_OFFSET: () => PLAYER_INPUTS_KEY_CTX_OFFSET,
   InputContext: () => InputContext,
   INPUT_CTX_SIZE: () => INPUT_CTX_SIZE,
   INPUT_CTX_OFFSET: () => INPUT_CTX_OFFSET,
@@ -387,33 +392,38 @@ var NetJoinFailReason;
   NetJoinFailReason2[NetJoinFailReason2["room_not_found"] = 3] = "room_not_found";
   NetJoinFailReason2[NetJoinFailReason2["already_in_room"] = 4] = "already_in_room";
 })(NetJoinFailReason ||= {});
-var MAX_PLAYERS = 12;
-var KEYBOARD_OFFSET = 0;
-var KEYBOARD_SIZE = 256;
-var MOUSE_OFFSET = 256;
-var MOUSE_BUTTONS_OFFSET = 16;
+var TIME_CTX_FRAME_OFFSET = 0;
+var TIME_CTX_DT_MS_OFFSET = 4;
+var TIME_CTX_TOTAL_MS_OFFSET = 8;
+var PEER_CTX_CONNECTED_OFFSET = 0;
+var PEER_CTX_SEQ_OFFSET = 2;
+var PEER_CTX_ACK_OFFSET = 4;
+var PEER_CTX_SIZE = 8;
+var NET_CTX_PEER_COUNT_OFFSET = 0;
+var NET_CTX_LOCAL_PEER_ID_OFFSET = 1;
+var NET_CTX_IN_SESSION_OFFSET = 2;
+var NET_CTX_STATUS_OFFSET = 3;
+var NET_CTX_MATCH_FRAME_OFFSET = 4;
+var NET_CTX_SESSION_START_FRAME_OFFSET = 8;
+var NET_CTX_ROOM_CODE_OFFSET = 12;
+var NET_CTX_WANTS_ROOM_CODE_OFFSET = 20;
+var NET_CTX_WANTS_DISCONNECT_OFFSET = 28;
+var NET_CTX_PEERS_OFFSET = 32;
+var NET_CTX_LAST_ROLLBACK_DEPTH_OFFSET = 128;
+var NET_CTX_TOTAL_ROLLBACKS_OFFSET = 132;
+var NET_CTX_FRAMES_RESIMULATED_OFFSET = 136;
+var MOUSE_CTX_X_OFFSET = 0;
+var MOUSE_CTX_Y_OFFSET = 4;
+var MOUSE_CTX_WHEEL_X_OFFSET = 8;
+var MOUSE_CTX_WHEEL_Y_OFFSET = 12;
+var MOUSE_CTX_BUTTON_STATES_OFFSET = 16;
+var MOUSE_CTX_SIZE = 24;
+var KEY_CTX_SIZE = 256;
+var PLAYER_INPUTS_KEY_CTX_OFFSET = 0;
+var PLAYER_INPUTS_MOUSE_CTX_OFFSET = 256;
 var PLAYER_INPUTS_SIZE = 280;
-var INPUT_CTX_SIZE = MAX_PLAYERS * PLAYER_INPUTS_SIZE;
-var EVENT_PAYLOAD_SIZE = 8;
-var EVENT_PAYLOAD_ALIGN = 4;
-function keyToKeyCode(key) {
-  return Key[key];
-}
-function keyCodeToKey(code) {
-  return Key[code];
-}
-function mouseButtonToMouseButtonCode(button) {
-  return MouseButton[button];
-}
-function mouseButtonCodeToMouseButton(code) {
-  return MouseButton[code];
-}
-function inputSourceToInputSourceCode(source) {
-  return InputSource[source];
-}
-function inputSourceCodeToInputSource(code) {
-  return InputSource[code];
-}
+var INPUT_CTX_SIZE = 3360;
+var MAX_PLAYERS = 12;
 
 class PlayerInputContext {
   #dataView;
@@ -424,13 +434,13 @@ class PlayerInputContext {
   }
   get keys() {
     if (!this.#keys) {
-      this.#keys = new KeyboardContext(new DataView(this.#dataView.buffer, this.#dataView.byteOffset + KEYBOARD_OFFSET));
+      this.#keys = new KeyboardContext(new DataView(this.#dataView.buffer, this.#dataView.byteOffset + PLAYER_INPUTS_KEY_CTX_OFFSET));
     }
     return this.#keys;
   }
   get mouse() {
     if (!this.#mouse) {
-      this.#mouse = new MouseContext(new DataView(this.#dataView.buffer, this.#dataView.byteOffset + MOUSE_OFFSET));
+      this.#mouse = new MouseContext(new DataView(this.#dataView.buffer, this.#dataView.byteOffset + PLAYER_INPUTS_MOUSE_CTX_OFFSET));
     }
     return this.#mouse;
   }
@@ -455,6 +465,9 @@ class InputContext {
     this.#dataView = dataView;
     this.#buildPlayers();
   }
+  hasDataView() {
+    return !!this.#dataView;
+  }
   #buildPlayers() {
     this.#players = [];
     for (let i = 0;i < MAX_PLAYERS; i++) {
@@ -487,19 +500,19 @@ class MouseContext {
     this.#dataView = dataView;
   }
   get x() {
-    return this.#dataView.getFloat32(0, true);
+    return this.#dataView.getFloat32(MOUSE_CTX_X_OFFSET, true);
   }
   get y() {
-    return this.#dataView.getFloat32(4, true);
+    return this.#dataView.getFloat32(MOUSE_CTX_Y_OFFSET, true);
   }
   get wheel() {
     return { x: this.wheelX, y: this.wheelY };
   }
   get wheelX() {
-    return this.#dataView.getFloat32(8, true);
+    return this.#dataView.getFloat32(MOUSE_CTX_WHEEL_X_OFFSET, true);
   }
   get wheelY() {
-    return this.#dataView.getFloat32(12, true);
+    return this.#dataView.getFloat32(MOUSE_CTX_WHEEL_Y_OFFSET, true);
   }
   get left() {
     return this.#buttonState(1);
@@ -518,7 +531,7 @@ class MouseContext {
       state = { down: false, held: false, up: false };
       this.#buttonStates.set(code, state);
     }
-    const offset = MOUSE_BUTTONS_OFFSET;
+    const offset = MOUSE_CTX_BUTTON_STATES_OFFSET;
     state.held = !!(this.#dataView.getUint8(offset + code) & 1);
     state.down = state.held && !(this.#dataView.getUint8(offset + code) & 2);
     state.up = !state.held && !!(this.#dataView.getUint8(offset + code) & 2);
@@ -1140,14 +1153,6 @@ class KeyboardContext {
     return state;
   }
 }
-var MAX_PEERS = 12;
-var PEERS_ARRAY_OFFSET = 32;
-var PEER_CTX_SIZE = 8;
-var PEER_CONNECTED_OFFSET = 0;
-var PEER_PACKET_COUNT_OFFSET = 1;
-var PEER_SEQ_OFFSET = 2;
-var PEER_ACK_OFFSET = 4;
-var PEER_ACK_COUNT_OFFSET = 6;
 var STATUS_MAP = {
   0: "offline",
   1: "local",
@@ -1158,7 +1163,7 @@ var STATUS_MAP = {
 
 class NetContext {
   dataView;
-  #peers = Array.from({ length: MAX_PEERS }, () => ({
+  #peers = Array.from({ length: MAX_PLAYERS }, () => ({
     isLocal: false,
     seq: -1,
     ack: -1
@@ -1176,38 +1181,38 @@ 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);
   }
   get localPeerId() {
     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);
   }
   get isInSession() {
     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;
   }
   get status() {
     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";
   }
   get matchFrame() {
     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);
   }
   get sessionStartFrame() {
     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);
   }
   get roomCode() {
     if (!this.#hasValidBuffer()) {
@@ -1215,7 +1220,7 @@ class NetContext {
     }
     const bytes = [];
     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);
@@ -1228,7 +1233,7 @@ class NetContext {
     }
     const bytes = [];
     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);
@@ -1240,11 +1245,11 @@ class NetContext {
       throw new Error("NetContext dataView is not valid");
     }
     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) {
       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));
       }
     }
   }
@@ -1252,13 +1257,13 @@ 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) {
     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);
   }
   get peers() {
     if (!this.#hasValidBuffer()) {
@@ -1268,23 +1273,23 @@ class NetContext {
     const localPeerId = this.localPeerId;
     const matchFrame = this.matchFrame;
     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)
+      const peerOffset = NET_CTX_PEERS_OFFSET + i * PEER_CTX_SIZE;
+      if (dv.getUint8(peerOffset + PEER_CTX_CONNECTED_OFFSET) !== 1)
         continue;
-      if (dv.getUint8(peerOffset + PEER_PACKET_COUNT_OFFSET) === 0)
+      const seq = dv.getInt16(peerOffset + PEER_CTX_SEQ_OFFSET, true);
+      if (seq < 0)
         continue;
-      const seq = dv.getUint16(peerOffset + PEER_SEQ_OFFSET, true);
       if (minRemoteSeq === -1 || seq < minRemoteSeq) {
         minRemoteSeq = seq;
       }
     }
     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)
+    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) {
@@ -1296,15 +1301,31 @@ 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);
+        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;
   }
+  get lastRollbackDepth() {
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
+    }
+    return this.dataView.getUint32(NET_CTX_LAST_ROLLBACK_DEPTH_OFFSET, true);
+  }
+  get totalRollbacks() {
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
+    }
+    return this.dataView.getUint32(NET_CTX_TOTAL_ROLLBACKS_OFFSET, true);
+  }
+  get framesResimulated() {
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
+    }
+    return Number(this.dataView.getBigUint64(NET_CTX_FRAMES_RESIMULATED_OFFSET, true));
+  }
 }
 
 class TimeContext {
@@ -1316,21 +1337,41 @@ 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);
   }
   get dt() {
     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;
   }
   get time() {
     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;
   }
 }
+var EVENT_PAYLOAD_SIZE = 8;
+var EVENT_PAYLOAD_ALIGN = 4;
+function keyToKeyCode(key) {
+  return Key[key];
+}
+function keyCodeToKey(code) {
+  return Key[code];
+}
+function mouseButtonToMouseButtonCode(button) {
+  return MouseButton[button];
+}
+function mouseButtonCodeToMouseButton(code) {
+  return MouseButton[code];
+}
+function inputSourceToInputSourceCode(source) {
+  return InputSource[source];
+}
+function inputSourceCodeToInputSource(code) {
+  return InputSource[code];
+}
 var TAPE_MAGIC = 1413566533;
 function readTapeHeader(tape) {
   const view = new DataView(tape.buffer, tape.byteOffset, tape.byteLength);
@@ -1346,7 +1387,7 @@ function readTapeHeader(tape) {
     eventCount: view.getUint16(14, true)
   };
 }
-var DEFAULT_WASM_URL = new URL("https://unpkg.com/@bloopjs/engine@0.0.87/wasm/bloop.wasm");
+var DEFAULT_WASM_URL = new URL("https://unpkg.com/@bloopjs/engine@0.0.89/wasm/bloop.wasm");
 var MAX_ROLLBACK_FRAMES = 500;
 var TIME_CTX_OFFSET = 0;
 var INPUT_CTX_OFFSET = TIME_CTX_OFFSET + 4;
@@ -1611,6 +1652,7 @@ async function mount(mountable, options) {
       memory,
       __systems: function(system_handle, ptr) {
         mountable.hooks.setBuffer(memory.buffer);
+        mountable.hooks.setContext(ptr);
         mountable.hooks.systemsCallback(system_handle, ptr);
       },
       __before_frame: function(ptr, frame) {
@@ -1757,9 +1799,15 @@ class Bloop {
       const inputCtxPtr = dv.getUint32(INPUT_CTX_OFFSET, true);
       const netCtxPtr = dv.getUint32(NET_CTX_OFFSET, true);
       this.#context.rawPointer = ptr;
-      this.#context.inputs.dataView = new DataView(this.#engineBuffer, inputCtxPtr);
-      this.#context.time.dataView = new DataView(this.#engineBuffer, timeCtxPtr);
-      this.#context.net.dataView = new DataView(this.#engineBuffer, netCtxPtr);
+      if (!this.#context.inputs.hasDataView() || this.#context.inputs.dataView.buffer !== this.#engineBuffer || this.#context.inputs.dataView.byteOffset !== inputCtxPtr) {
+        this.#context.inputs.dataView = new DataView(this.#engineBuffer, inputCtxPtr);
+      }
+      if (this.#context.time.dataView?.buffer !== this.#engineBuffer || this.#context.time.dataView?.byteOffset !== timeCtxPtr) {
+        this.#context.time.dataView = new DataView(this.#engineBuffer, timeCtxPtr);
+      }
+      if (this.#context.net.dataView?.buffer !== this.#engineBuffer || this.#context.net.dataView?.byteOffset !== netCtxPtr) {
+        this.#context.net.dataView = new DataView(this.#engineBuffer, netCtxPtr);
+      }
     },
     systemsCallback: (system_handle, ptr) => {
       this.hooks.setContext(ptr);
@@ -1864,6 +1912,13 @@ class Bloop {
               system.netcode?.(this.#context);
               break;
             }
+            case exports_enums.EventType.NetSessionInit:
+              console.log("[bloop] NetSessionInit event received");
+              this.#context.event = {
+                type: "session:start"
+              };
+              system.netcode?.(this.#context);
+              break;
             default:
               break;
           }
@@ -2166,15 +2221,33 @@ var NetJoinFailReason2;
   NetJoinFailReason22[NetJoinFailReason22["room_not_found"] = 3] = "room_not_found";
   NetJoinFailReason22[NetJoinFailReason22["already_in_room"] = 4] = "already_in_room";
 })(NetJoinFailReason2 ||= {});
-var MAX_PLAYERS2 = 12;
-var KEYBOARD_OFFSET2 = 0;
-var MOUSE_OFFSET2 = 256;
-var MOUSE_BUTTONS_OFFSET2 = 16;
+var PEER_CTX_CONNECTED_OFFSET2 = 0;
+var PEER_CTX_SEQ_OFFSET2 = 2;
+var PEER_CTX_ACK_OFFSET2 = 4;
+var PEER_CTX_SIZE2 = 8;
+var NET_CTX_PEER_COUNT_OFFSET2 = 0;
+var NET_CTX_LOCAL_PEER_ID_OFFSET2 = 1;
+var NET_CTX_IN_SESSION_OFFSET2 = 2;
+var NET_CTX_STATUS_OFFSET2 = 3;
+var NET_CTX_MATCH_FRAME_OFFSET2 = 4;
+var NET_CTX_SESSION_START_FRAME_OFFSET2 = 8;
+var NET_CTX_ROOM_CODE_OFFSET2 = 12;
+var NET_CTX_WANTS_ROOM_CODE_OFFSET2 = 20;
+var NET_CTX_WANTS_DISCONNECT_OFFSET2 = 28;
+var NET_CTX_PEERS_OFFSET2 = 32;
+var NET_CTX_LAST_ROLLBACK_DEPTH_OFFSET2 = 128;
+var NET_CTX_TOTAL_ROLLBACKS_OFFSET2 = 132;
+var NET_CTX_FRAMES_RESIMULATED_OFFSET2 = 136;
+var MOUSE_CTX_X_OFFSET2 = 0;
+var MOUSE_CTX_Y_OFFSET2 = 4;
+var MOUSE_CTX_WHEEL_X_OFFSET2 = 8;
+var MOUSE_CTX_WHEEL_Y_OFFSET2 = 12;
+var MOUSE_CTX_BUTTON_STATES_OFFSET2 = 16;
+var PLAYER_INPUTS_KEY_CTX_OFFSET2 = 0;
+var PLAYER_INPUTS_MOUSE_CTX_OFFSET2 = 256;
 var PLAYER_INPUTS_SIZE2 = 280;
-var INPUT_CTX_SIZE2 = MAX_PLAYERS2 * PLAYER_INPUTS_SIZE2;
-function mouseButtonCodeToMouseButton2(code) {
-  return MouseButton2[code];
-}
+var MAX_PLAYERS2 = 12;
+
 class PlayerInputContext2 {
   #dataView;
   #keys;
@@ -2184,13 +2257,13 @@ class PlayerInputContext2 {
   }
   get keys() {
     if (!this.#keys) {
-      this.#keys = new KeyboardContext2(new DataView(this.#dataView.buffer, this.#dataView.byteOffset + KEYBOARD_OFFSET2));
+      this.#keys = new KeyboardContext2(new DataView(this.#dataView.buffer, this.#dataView.byteOffset + PLAYER_INPUTS_KEY_CTX_OFFSET2));
     }
     return this.#keys;
   }
   get mouse() {
     if (!this.#mouse) {
-      this.#mouse = new MouseContext2(new DataView(this.#dataView.buffer, this.#dataView.byteOffset + MOUSE_OFFSET2));
+      this.#mouse = new MouseContext2(new DataView(this.#dataView.buffer, this.#dataView.byteOffset + PLAYER_INPUTS_MOUSE_CTX_OFFSET2));
     }
     return this.#mouse;
   }
@@ -2215,6 +2288,9 @@ class InputContext2 {
     this.#dataView = dataView;
     this.#buildPlayers();
   }
+  hasDataView() {
+    return !!this.#dataView;
+  }
   #buildPlayers() {
     this.#players = [];
     for (let i = 0;i < MAX_PLAYERS2; i++) {
@@ -2247,19 +2323,19 @@ class MouseContext2 {
     this.#dataView = dataView;
   }
   get x() {
-    return this.#dataView.getFloat32(0, true);
+    return this.#dataView.getFloat32(MOUSE_CTX_X_OFFSET2, true);
   }
   get y() {
-    return this.#dataView.getFloat32(4, true);
+    return this.#dataView.getFloat32(MOUSE_CTX_Y_OFFSET2, true);
   }
   get wheel() {
     return { x: this.wheelX, y: this.wheelY };
   }
   get wheelX() {
-    return this.#dataView.getFloat32(8, true);
+    return this.#dataView.getFloat32(MOUSE_CTX_WHEEL_X_OFFSET2, true);
   }
   get wheelY() {
-    return this.#dataView.getFloat32(12, true);
+    return this.#dataView.getFloat32(MOUSE_CTX_WHEEL_Y_OFFSET2, true);
   }
   get left() {
     return this.#buttonState(1);
@@ -2278,7 +2354,7 @@ class MouseContext2 {
       state = { down: false, held: false, up: false };
       this.#buttonStates.set(code, state);
     }
-    const offset = MOUSE_BUTTONS_OFFSET2;
+    const offset = MOUSE_CTX_BUTTON_STATES_OFFSET2;
     state.held = !!(this.#dataView.getUint8(offset + code) & 1);
     state.down = state.held && !(this.#dataView.getUint8(offset + code) & 2);
     state.up = !state.held && !!(this.#dataView.getUint8(offset + code) & 2);
@@ -2900,14 +2976,6 @@ class KeyboardContext2 {
     return state;
   }
 }
-var MAX_PEERS2 = 12;
-var PEERS_ARRAY_OFFSET2 = 32;
-var PEER_CTX_SIZE2 = 8;
-var PEER_CONNECTED_OFFSET2 = 0;
-var PEER_PACKET_COUNT_OFFSET2 = 1;
-var PEER_SEQ_OFFSET2 = 2;
-var PEER_ACK_OFFSET2 = 4;
-var PEER_ACK_COUNT_OFFSET2 = 6;
 var STATUS_MAP2 = {
   0: "offline",
   1: "local",
@@ -2918,7 +2986,7 @@ var STATUS_MAP2 = {
 
 class NetContext2 {
   dataView;
-  #peers = Array.from({ length: MAX_PEERS2 }, () => ({
+  #peers = Array.from({ length: MAX_PLAYERS2 }, () => ({
     isLocal: false,
     seq: -1,
     ack: -1
@@ -2936,38 +3004,38 @@ class NetContext2 {
     if (!this.#hasValidBuffer()) {
       throw new Error("NetContext dataView is not valid");
     }
-    return this.dataView.getUint8(0);
+    return this.dataView.getUint8(NET_CTX_PEER_COUNT_OFFSET2);
   }
   get localPeerId() {
     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_OFFSET2);
   }
   get isInSession() {
     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_OFFSET2) !== 0;
   }
   get status() {
     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_OFFSET2);
     return STATUS_MAP2[statusByte] ?? "local";
   }
   get matchFrame() {
     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_OFFSET2, true);
   }
   get sessionStartFrame() {
     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_OFFSET2, true);
   }
   get roomCode() {
     if (!this.#hasValidBuffer()) {
@@ -2975,7 +3043,7 @@ class NetContext2 {
     }
     const bytes = [];
     for (let i = 0;i < 8; i++) {
-      const byte = this.dataView.getUint8(12 + i);
+      const byte = this.dataView.getUint8(NET_CTX_ROOM_CODE_OFFSET2 + i);
       if (byte === 0)
         break;
       bytes.push(byte);
@@ -2988,7 +3056,7 @@ class NetContext2 {
     }
     const bytes = [];
     for (let i = 0;i < 8; i++) {
-      const byte = this.dataView.getUint8(20 + i);
+      const byte = this.dataView.getUint8(NET_CTX_WANTS_ROOM_CODE_OFFSET2 + i);
       if (byte === 0)
         break;
       bytes.push(byte);
@@ -3000,11 +3068,11 @@ class NetContext2 {
       throw new Error("NetContext dataView is not valid");
     }
     for (let i = 0;i < 8; i++) {
-      this.dataView.setUint8(20 + i, 0);
+      this.dataView.setUint8(NET_CTX_WANTS_ROOM_CODE_OFFSET2 + i, 0);
     }
     if (code) {
       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_OFFSET2 + i, code.charCodeAt(i));
       }
     }
   }
@@ -3012,13 +3080,13 @@ class NetContext2 {
     if (!this.#hasValidBuffer()) {
       return false;
     }
-    return this.dataView.getUint8(28) !== 0;
+    return this.dataView.getUint8(NET_CTX_WANTS_DISCONNECT_OFFSET2) !== 0;
   }
   set wantsDisconnect(value) {
     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_OFFSET2, value ? 1 : 0);
   }
   get peers() {
     if (!this.#hasValidBuffer()) {
@@ -3028,23 +3096,23 @@ class NetContext2 {
     const localPeerId = this.localPeerId;
     const matchFrame = this.matchFrame;
     let minRemoteSeq = -1;
-    for (let i = 0;i < MAX_PEERS2; i++) {
+    for (let i = 0;i < MAX_PLAYERS2; i++) {
       if (i === localPeerId)
         continue;
-      const peerOffset = PEERS_ARRAY_OFFSET2 + i * PEER_CTX_SIZE2;
-      if (dv.getUint8(peerOffset + PEER_CONNECTED_OFFSET2) !== 1)
+      const peerOffset = NET_CTX_PEERS_OFFSET2 + i * PEER_CTX_SIZE2;
+      if (dv.getUint8(peerOffset + PEER_CTX_CONNECTED_OFFSET2) !== 1)
         continue;
-      if (dv.getUint8(peerOffset + PEER_PACKET_COUNT_OFFSET2) === 0)
+      const seq = dv.getInt16(peerOffset + PEER_CTX_SEQ_OFFSET2, true);
+      if (seq < 0)
         continue;
-      const seq = dv.getUint16(peerOffset + PEER_SEQ_OFFSET2, true);
       if (minRemoteSeq === -1 || seq < minRemoteSeq) {
         minRemoteSeq = seq;
       }
     }
     this.#peersResult.length = 0;
-    for (let i = 0;i < MAX_PEERS2; i++) {
-      const peerOffset = PEERS_ARRAY_OFFSET2 + i * PEER_CTX_SIZE2;
-      if (dv.getUint8(peerOffset + PEER_CONNECTED_OFFSET2) !== 1)
+    for (let i = 0;i < MAX_PLAYERS2; i++) {
+      const peerOffset = NET_CTX_PEERS_OFFSET2 + i * PEER_CTX_SIZE2;
+      if (dv.getUint8(peerOffset + PEER_CTX_CONNECTED_OFFSET2) !== 1)
         continue;
       const peer = this.#peers[i];
       if (!peer) {
@@ -3056,15 +3124,34 @@ class NetContext2 {
         peer.seq = matchFrame;
         peer.ack = minRemoteSeq;
       } else {
-        const packetCount = dv.getUint8(peerOffset + PEER_PACKET_COUNT_OFFSET2);
-        const ackCount = dv.getUint8(peerOffset + PEER_ACK_COUNT_OFFSET2);
-        peer.seq = packetCount === 0 ? -1 : dv.getUint16(peerOffset + PEER_SEQ_OFFSET2, true);
-        peer.ack = ackCount === 0 ? -1 : dv.getUint16(peerOffset + PEER_ACK_OFFSET2, true);
+        peer.seq = dv.getInt16(peerOffset + PEER_CTX_SEQ_OFFSET2, true);
+        peer.ack = dv.getInt16(peerOffset + PEER_CTX_ACK_OFFSET2, true);
       }
       this.#peersResult.push(peer);
     }
     return this.#peersResult;
   }
+  get lastRollbackDepth() {
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
+    }
+    return this.dataView.getUint32(NET_CTX_LAST_ROLLBACK_DEPTH_OFFSET2, true);
+  }
+  get totalRollbacks() {
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
+    }
+    return this.dataView.getUint32(NET_CTX_TOTAL_ROLLBACKS_OFFSET2, true);
+  }
+  get framesResimulated() {
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
+    }
+    return Number(this.dataView.getBigUint64(NET_CTX_FRAMES_RESIMULATED_OFFSET2, true));
+  }
+}
+function mouseButtonCodeToMouseButton2(code) {
+  return MouseButton2[code];
 }
 var TAPE_MAGIC2 = 1413566533;
 function readTapeHeader2(tape) {
@@ -3081,7 +3168,7 @@ function readTapeHeader2(tape) {
     eventCount: view.getUint16(14, true)
   };
 }
-var DEFAULT_WASM_URL2 = new URL("https://unpkg.com/@bloopjs/engine@0.0.87/wasm/bloop.wasm");
+var DEFAULT_WASM_URL2 = new URL("https://unpkg.com/@bloopjs/engine@0.0.89/wasm/bloop.wasm");
 var TIME_CTX_OFFSET2 = 0;
 var INPUT_CTX_OFFSET2 = TIME_CTX_OFFSET2 + 4;
 var EVENTS_OFFSET2 = INPUT_CTX_OFFSET2 + 4;
@@ -6293,6 +6380,138 @@ function joinRoom(brokerUrl, _roomId, cbs) {
   }
 }
 
+// src/netcode/reconcile.ts
+var udp = null;
+var localPeerId = null;
+var remotePeerId = null;
+var localStringPeerId = null;
+var remoteStringPeerId = null;
+var incomingPackets = [];
+var actual = {
+  roomCode: ""
+};
+async function reconcile(app, signal) {
+  app.beforeFrame.subscribe((_frame) => {
+    if (!app.game.context.net.isInSession) {
+      return;
+    }
+    try {
+      receivePackets(app);
+      sendPacket(app);
+    } catch (e4) {
+      console.error("Error in beforeFrame:", e4);
+    }
+  });
+  logger.onLog = (log) => {
+    addLog(log);
+  };
+  while (!signal.aborted) {
+    const { net } = app.game.context;
+    if (net.wantsRoomCode && actual.roomCode !== net.wantsRoomCode) {
+      console.log("[netcode] wants a room code", {
+        actual: actual.roomCode,
+        wants: net.wantsRoomCode
+      });
+      actual.roomCode = net.wantsRoomCode;
+      joinRollbackRoom(net.wantsRoomCode, app);
+    }
+    await sleep(150);
+  }
+}
+async function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function joinRollbackRoom(roomId, app) {
+  app.joinRoom(roomId, {
+    onPeerIdAssign: (peerId) => {
+      localStringPeerId = peerId;
+    },
+    onBrokerMessage: (_message) => {},
+    onMessage(_peerId, data, _reliable) {
+      incomingPackets.push(new Uint8Array(data));
+    },
+    onDataChannelClose(_peerId, reliable) {
+      if (!reliable && remotePeerId !== null) {
+        app.sim.emit.network("peer:leave", { peerId: remotePeerId });
+      }
+    },
+    onDataChannelOpen(peerId, reliable, channel) {
+      if (!reliable) {
+        udp = channel;
+        if (localStringPeerId === null) {
+          console.error("[netcode] Local peer ID not assigned yet!");
+          return;
+        }
+        const ids = assignPeerIds(localStringPeerId, peerId);
+        localPeerId = ids.local;
+        setLocalId(localPeerId);
+        remotePeerId = ids.remote;
+        remoteStringPeerId = peerId;
+        setRemoteId(remotePeerId);
+        app.sim.emit.network("peer:join", { peerId: localPeerId });
+        app.sim.emit.network("peer:join", { peerId: remotePeerId });
+        app.sim.emit.network("peer:assign_local_id", { peerId: localPeerId });
+        app.sim.emit.network("session:start", {});
+      }
+    },
+    onPeerConnected(peerId) {
+      addPeer({
+        id: peerId,
+        nickname: peerId.substring(0, 6),
+        ack: -1,
+        seq: -1,
+        lastPacketTime: performance.now()
+      });
+      console.log(`[netcode] Peer connected: ${peerId}. Total peers: ${debugState.netStatus.value.peers.length}`);
+    },
+    onPeerDisconnected(peerId) {
+      removePeer(peerId);
+      if (remotePeerId !== null && peerId === remoteStringPeerId) {
+        app.sim.emit.network("peer:leave", { peerId: remotePeerId });
+        app.sim.emit.network("session:end", {});
+      }
+    }
+  });
+}
+function assignPeerIds(localId, remoteId) {
+  if (localId < remoteId) {
+    return { local: 0, remote: 1 };
+  } else {
+    return { local: 1, remote: 0 };
+  }
+}
+function receivePackets(app) {
+  for (const packetData of incomingPackets) {
+    app.sim.emit.packet(packetData);
+    if (remotePeerId == null) {
+      return;
+    }
+    const peerState = unwrap(app.sim.net.peers[remotePeerId], `Remote peer state not found for peerId ${remotePeerId}`);
+    updatePeer(remoteStringPeerId, {
+      ack: peerState.ack,
+      seq: peerState.seq,
+      lastPacketTime: performance.now()
+    });
+  }
+  incomingPackets.length = 0;
+}
+function sendPacket(app) {
+  if (!udp || remotePeerId === null) {
+    console.warn("[netcode] Cannot send packet, udp or remotePeerId is null");
+    return;
+  }
+  if (udp.readyState !== "open") {
+    console.warn("[netcode] Data channel not open, cannot send packet. readyState=", udp.readyState);
+    return;
+  }
+  const packet = app.sim.getOutboundPacket(remotePeerId);
+  if (!packet) {
+    console.warn("[netcode] No packet to send");
+    return;
+  }
+  udp.send(packet);
+}
+
 // src/App.ts
 var DEFAULT_BROKER_URL = "wss://webrtc-divine-glade-8064.fly.dev/ws";
 async function start(opts) {
@@ -6316,6 +6535,7 @@ class App {
   #unsubscribe = null;
   #now = performance.now();
   #debugUi = null;
+  #abortController = new AbortController;
   constructor(sim, game, brokerUrl, debugUiOpts) {
     this.#sim = sim;
     this.game = game;
@@ -6329,6 +6549,9 @@ class App {
       this.beforeFrame.notify(frame);
     };
     this.subscribe();
+    reconcile(this, this.#abortController.signal).catch((err) => {
+      console.error("Error in lemmyloop:", err);
+    });
   }
   get sim() {
     return this.#sim;
@@ -6534,6 +6757,7 @@ class App {
     this.afterFrame.unsubscribeAll();
     this.onHmr.unsubscribeAll();
     this.#debugUi?.unmount();
+    this.#abortController.abort();
   }
   async acceptHmr(module, opts) {
     const game = module.game ?? module;
@@ -6578,131 +6802,13 @@ var PacketType;
   PacketType2[PacketType2["None"] = 0] = "None";
   PacketType2[PacketType2["Inputs"] = 1] = "Inputs";
 })(PacketType ||= {});
-// src/netcode/scaffold.ts
-function joinRollbackRoom(roomId, app, opts) {
-  let udp = null;
-  let sessionActive = false;
-  let localPeerId = null;
-  let remotePeerId = null;
-  let localStringPeerId = null;
-  let remoteStringPeerId = null;
-  const incomingPackets = [];
-  function assignPeerIds(localId, remoteId) {
-    if (localId < remoteId) {
-      return { local: 0, remote: 1 };
-    } else {
-      return { local: 1, remote: 0 };
-    }
-  }
-  function receivePackets() {
-    for (const packetData of incomingPackets) {
-      app.sim.emit.packet(packetData);
-      if (remotePeerId == null) {
-        return;
-      }
-      const peerState = unwrap(app.sim.net.peers[remotePeerId], `Remote peer state not found for peerId ${remotePeerId}`);
-      updatePeer(remoteStringPeerId, {
-        ack: peerState.ack,
-        seq: peerState.seq,
-        lastPacketTime: performance.now()
-      });
-    }
-    incomingPackets.length = 0;
-  }
-  function sendPacket() {
-    if (!udp || remotePeerId === null) {
-      console.warn("[netcode] Cannot send packet, udp or remotePeerId is null");
-      return;
-    }
-    if (udp.readyState !== "open") {
-      console.warn("[netcode] Data channel not open, cannot send packet. readyState=", udp.readyState);
-      return;
-    }
-    const packet = app.sim.getOutboundPacket(remotePeerId);
-    if (!packet) {
-      console.warn("[netcode] No packet to send");
-      return;
-    }
-    udp.send(packet);
-  }
-  logger.onLog = (log) => {
-    addLog(log);
-  };
-  app.joinRoom(roomId, {
-    onPeerIdAssign: (peerId) => {
-      localStringPeerId = peerId;
-    },
-    onBrokerMessage: (_message) => {},
-    onMessage(_peerId, data, _reliable) {
-      incomingPackets.push(new Uint8Array(data));
-    },
-    onDataChannelClose(peerId, reliable) {
-      if (!reliable && remotePeerId !== null) {
-        app.sim.emit.network("peer:leave", { peerId: remotePeerId });
-        sessionActive = false;
-        opts?.onSessionEnd?.();
-      }
-    },
-    onDataChannelOpen(peerId, reliable, channel) {
-      if (!reliable) {
-        udp = channel;
-        if (localStringPeerId === null) {
-          console.error("[netcode] Local peer ID not assigned yet!");
-          return;
-        }
-        const ids = assignPeerIds(localStringPeerId, peerId);
-        localPeerId = ids.local;
-        setLocalId(localPeerId);
-        remotePeerId = ids.remote;
-        remoteStringPeerId = peerId;
-        setRemoteId(remotePeerId);
-        app.sim.emit.network("peer:join", { peerId: localPeerId });
-        app.sim.emit.network("peer:join", { peerId: remotePeerId });
-        app.sim.emit.network("peer:assign_local_id", { peerId: localPeerId });
-        app.sim.emit.network("session:start", {});
-        sessionActive = true;
-        opts?.onSessionStart?.();
-      }
-    },
-    onPeerConnected(peerId) {
-      addPeer({
-        id: peerId,
-        nickname: peerId.substring(0, 6),
-        ack: -1,
-        seq: -1,
-        lastPacketTime: performance.now()
-      });
-      console.log(`[netcode] Peer connected: ${peerId}. Total peers: ${debugState.netStatus.value.peers.length}`);
-    },
-    onPeerDisconnected(peerId) {
-      removePeer(peerId);
-      if (remotePeerId !== null && peerId === remoteStringPeerId) {
-        app.sim.emit.network("peer:leave", { peerId: remotePeerId });
-        sessionActive = false;
-        opts?.onSessionEnd?.();
-      }
-    }
-  });
-  app.beforeFrame.subscribe((_frame) => {
-    if (!sessionActive || !udp || remotePeerId === null) {
-      return;
-    }
-    try {
-      receivePackets();
-      sendPacket();
-    } catch (e4) {
-      console.error("Error in beforeFrame:", e4);
-    }
-  });
-}
 export {
   start,
   logger,
-  joinRollbackRoom,
   PacketType,
   exports_mod as Debug,
   App
 };
 
-//# debugId=B9819EC38DD29BBA64756E2164756E21
+//# debugId=164BA35FD7424E1864756E2164756E21
 //# sourceMappingURL=mod.js.map