@bloopjs/web 0.0.49 → 0.0.51

package/dist/mod.js

@@ -81,6 +81,8 @@ __export2(exports_engine, {
   SNAPSHOT_HEADER_ENGINE_LEN_OFFSET: () => SNAPSHOT_HEADER_ENGINE_LEN_OFFSET,
   PlayerInputContext: () => PlayerInputContext,
   PLAYER_INPUTS_SIZE: () => PLAYER_INPUTS_SIZE,
+  NetContext: () => NetContext,
+  NET_CTX_OFFSET: () => NET_CTX_OFFSET,
   MouseContext: () => MouseContext,
   MOUSE_OFFSET: () => MOUSE_OFFSET,
   MOUSE_BUTTONS_OFFSET: () => MOUSE_BUTTONS_OFFSET,
@@ -1145,10 +1147,30 @@ class TimeContext {
     return this.dataView.getUint32(8, true) / 1000;
   }
 }
+
+class NetContext {
+  dataView;
+  constructor(dataView) {
+    this.dataView = dataView;
+  }
+  get peerCount() {
+    if (!this.dataView) {
+      throw new Error("NetContext DataView is not initialized");
+    }
+    return this.dataView.getUint8(0);
+  }
+  get matchFrame() {
+    if (!this.dataView) {
+      throw new Error("NetContext DataView is not initialized");
+    }
+    return this.dataView.getUint32(4, true);
+  }
+}
 var DEFAULT_WASM_URL = new URL("../wasm/bloop.wasm", import.meta.url);
 var TIME_CTX_OFFSET = 0;
 var INPUT_CTX_OFFSET = TIME_CTX_OFFSET + 4;
 var EVENTS_OFFSET = INPUT_CTX_OFFSET + 4;
+var NET_CTX_OFFSET = EVENTS_OFFSET + 4;
 var SNAPSHOT_HEADER_LEN = 16;
 var SNAPSHOT_HEADER_USER_LEN_OFFSET = 4;
 var SNAPSHOT_HEADER_ENGINE_LEN_OFFSET = 8;
@@ -1401,8 +1423,10 @@ async function mount(opts) {
         opts.hooks.setBuffer(memory.buffer);
         opts.hooks.systemsCallback(system_handle, ptr);
       },
-      __before_frame: function(frame) {
+      __before_frame: function(ptr, frame) {
         try {
+          opts.hooks.setBuffer(memory.buffer);
+          opts.hooks.setContext(ptr);
           opts.hooks.beforeFrame?.(frame);
         } catch (e) {
           console.error("Error in beforeFrame hook:", e);
@@ -1461,7 +1485,8 @@ class Bloop {
       get players() {
         return inputs.players;
       },
-      rawPointer: -1
+      rawPointer: -1,
+      net: new NetContext
     };
   }
   get bag() {
@@ -1508,9 +1533,11 @@ class Bloop {
       const dv = new DataView(this.#engineBuffer, ptr);
       const timeCtxPtr = dv.getUint32(TIME_CTX_OFFSET, true);
       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);
     },
     systemsCallback: (system_handle, ptr) => {
       this.hooks.setContext(ptr);
@@ -2588,6 +2615,7 @@ var DEFAULT_WASM_URL2 = new URL("../wasm/bloop.wasm", import.meta.url);
 var TIME_CTX_OFFSET2 = 0;
 var INPUT_CTX_OFFSET2 = TIME_CTX_OFFSET2 + 4;
 var EVENTS_OFFSET2 = INPUT_CTX_OFFSET2 + 4;
+var NET_CTX_OFFSET2 = EVENTS_OFFSET2 + 4;
 
 // ../../node_modules/partysocket/dist/chunk-V6LO7DXK.mjs
 if (!globalThis.EventTarget || !globalThis.Event) {
@@ -5105,7 +5133,7 @@ class App {
     }
     this.game.hooks.beforeFrame = (frame) => {
       logger.frameNumber = this.#sim.time.frame;
-      logger.matchFrame = this.#sim.wasm.get_match_frame();
+      logger.matchFrame = this.game.context.net.matchFrame;
       this.beforeFrame.notify(frame);
     };
     this.subscribe();
@@ -5274,13 +5302,134 @@ 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.net.receivePacket(packetData);
+      if (remotePeerId == null) {
+        return;
+      }
+      const peerState = app.sim.net.getPeerState(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.net.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) => {
+      console.log(`Assigned peer ID: ${peerId}`);
+      localStringPeerId = peerId;
+    },
+    onBrokerMessage: (_message) => {},
+    onMessage(_peerId, data, _reliable) {
+      incomingPackets.push(new Uint8Array(data));
+    },
+    onDataChannelClose(peerId, reliable) {
+      console.log(`Data channel closed: ${peerId} (reliable: ${reliable})`);
+      if (!reliable && remotePeerId !== null) {
+        app.sim.net.disconnectPeer(remotePeerId);
+        sessionActive = false;
+        opts?.onSessionEnd?.();
+      }
+    },
+    onDataChannelOpen(peerId, reliable, channel) {
+      console.log(`Data channel opened: ${peerId} (reliable: ${reliable})`);
+      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.sessionInit(2);
+        app.sim.net.setLocalPeer(localPeerId);
+        app.sim.net.connectPeer(remotePeerId);
+        sessionActive = true;
+        console.log(`[netcode] Session started at frame ${app.sim.time.frame}`);
+        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.net.disconnectPeer(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=12B4CFB64532934564756E2164756E21
+//# debugId=9734AFFABAFBA4F864756E2164756E21
 //# sourceMappingURL=mod.js.map