@bloopjs/web 0.0.49 → 0.0.51

package/dist/netcode/mod.d.ts

@@ -2,6 +2,8 @@ export type { PeerId, BrokerMessage, PeerMessage } from "./protocol.ts";
 export type { Log, LogOpts, LogDirection, LogSeverity, OnLogCallback, } from "./logs.ts";
 export type { WebRtcPipe } from "./transport.ts";
 export type { RoomEvents } from "./broker.ts";
+export type { JoinRollbackRoomOptions } from "./scaffold.ts";
 export { PacketType } from "./protocol.ts";
 export { logger } from "./logs.ts";
+export { joinRollbackRoom } from "./scaffold.ts";
 //# sourceMappingURL=mod.d.ts.map

package/dist/netcode/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/netcode/mod.ts"],"names":[],"mappings":"AACA,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACxE,YAAY,EACV,GAAG,EACH,OAAO,EACP,YAAY,EACZ,WAAW,EACX,aAAa,GACd,MAAM,WAAW,CAAC;AACnB,YAAY,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,YAAY,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/netcode/mod.ts"],"names":[],"mappings":"AACA,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACxE,YAAY,EACV,GAAG,EACH,OAAO,EACP,YAAY,EACZ,WAAW,EACX,aAAa,GACd,MAAM,WAAW,CAAC;AACnB,YAAY,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,YAAY,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,YAAY,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAE7D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC"}

package/dist/netcode/scaffold.d.ts

@@ -0,0 +1,13 @@
+import type { App } from "../App.ts";
+export type JoinRollbackRoomOptions = {
+    /** Called when session becomes active */
+    onSessionStart?: () => void;
+    /** Called when session ends */
+    onSessionEnd?: () => void;
+};
+/**
+ * Join a rollback netcode room and wire up packet processing.
+ * This is a scaffold/stopgap - not the final architecture.
+ */
+export declare function joinRollbackRoom(roomId: string, app: App, opts?: JoinRollbackRoomOptions): void;
+//# sourceMappingURL=scaffold.d.ts.map

package/dist/netcode/scaffold.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../src/netcode/scaffold.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAIrC,MAAM,MAAM,uBAAuB,GAAG;IACpC,yCAAyC;IACzC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,+BAA+B;IAC/B,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;CAC3B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,GAAG,EACR,IAAI,CAAC,EAAE,uBAAuB,GAC7B,IAAI,CAqJN"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bloopjs/web",
-  "version": "0.0.49",
+  "version": "0.0.51",
   "author": "Neil Sarkar",
   "type": "module",
   "repository": {
@@ -33,8 +33,8 @@
     "typescript": "^5"
   },
   "dependencies": {
-    "@bloopjs/bloop": "0.0.49",
-    "@bloopjs/engine": "0.0.49",
+    "@bloopjs/bloop": "0.0.51",
+    "@bloopjs/engine": "0.0.51",
     "@preact/signals": "^1.3.1",
     "partysocket": "^1.1.6",
     "preact": "^10.25.4"

package/src/App.ts

@@ -88,7 +88,7 @@ export class App {
 
     this.game.hooks.beforeFrame = (frame: number) => {
       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);
     };
 

package/src/netcode/mod.ts

@@ -9,6 +9,8 @@ export type {
 } from "./logs.ts";
 export type { WebRtcPipe } from "./transport.ts";
 export type { RoomEvents } from "./broker.ts";
+export type { JoinRollbackRoomOptions } from "./scaffold.ts";
 
 export { PacketType } from "./protocol.ts";
 export { logger } from "./logs.ts";
+export { joinRollbackRoom } from "./scaffold.ts";

package/src/netcode/scaffold.ts

@@ -0,0 +1,169 @@
+import type { App } from "../App.ts";
+import * as Debug from "../debugui/mod.ts";
+import { logger } from "./logs.ts";
+
+export type JoinRollbackRoomOptions = {
+  /** Called when session becomes active */
+  onSessionStart?: () => void;
+  /** Called when session ends */
+  onSessionEnd?: () => void;
+};
+
+/**
+ * Join a rollback netcode room and wire up packet processing.
+ * This is a scaffold/stopgap - not the final architecture.
+ */
+export function joinRollbackRoom(
+  roomId: string,
+  app: App,
+  opts?: JoinRollbackRoomOptions,
+): void {
+  // State
+  let udp: RTCDataChannel | null = null;
+  let sessionActive = false;
+  let localPeerId: number | null = null;
+  let remotePeerId: number | null = null;
+  let localStringPeerId: string | null = null;
+  let remoteStringPeerId: string | null = null;
+  const incomingPackets: Uint8Array[] = [];
+
+  function assignPeerIds(
+    localId: string,
+    remoteId: string,
+  ): { local: number; remote: number } {
+    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);
+      Debug.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);
+  }
+
+  // Wire up logger to debug state
+  logger.onLog = (log) => {
+    Debug.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;
+        Debug.setLocalId(localPeerId);
+        remotePeerId = ids.remote;
+        remoteStringPeerId = peerId;
+        Debug.setRemoteId(remotePeerId);
+
+        // Initialize the session in the engine (2 players)
+        app.sim.sessionInit(2);
+
+        // Set up local and remote peers in net state
+        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) {
+      Debug.addPeer({
+        id: peerId,
+        nickname: peerId.substring(0, 6),
+        ack: -1,
+        seq: -1,
+        lastPacketTime: performance.now(),
+      });
+      console.log(
+        `[netcode] Peer connected: ${peerId}. Total peers: ${Debug.debugState.netStatus.value.peers.length}`,
+      );
+    },
+    onPeerDisconnected(peerId) {
+      Debug.removePeer(peerId);
+      if (remotePeerId !== null && peerId === remoteStringPeerId) {
+        app.sim.net.disconnectPeer(remotePeerId);
+        sessionActive = false;
+        opts?.onSessionEnd?.();
+      }
+    },
+  });
+
+  // Process packets and send our state each frame
+  app.beforeFrame.subscribe((_frame) => {
+    if (!sessionActive || !udp || remotePeerId === null) {
+      return;
+    }
+
+    try {
+      receivePackets();
+      sendPacket();
+    } catch (e) {
+      console.error("Error in beforeFrame:", e);
+    }
+  });
+}