@bloopjs/web 0.0.79 → 0.0.81

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

@@ -1 +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"}
+{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../src/netcode/scaffold.ts"],"names":[],"mappings":"AACA,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,CAuJN"}

package/package.json

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

package/src/App.ts

@@ -20,7 +20,7 @@ export type StartOptions = {
   /** A pre-mounted sim instance, defaults to mount with default options */
   sim?: Sim;
   /** An override url to use to fetch the engine wasm */
-  engineWasmUrl?: URL;
+  wasmUrl?: URL;
   /** Whether the sim should pause before running the first frame, defaults to false */
   startPaused?: boolean;
   /** Whether the sim should be recording to tape from initialization, defaults to true */
@@ -38,7 +38,7 @@ export async function start(opts: StartOptions): Promise<App> {
   if (!opts.sim) {
     const { sim } = await mount(opts.game, {
       startRecording: opts.startRecording ?? true,
-      wasmUrl: opts.engineWasmUrl,
+      wasmUrl: opts.wasmUrl,
     });
     opts.sim = sim;
   }

package/src/netcode/scaffold.ts

@@ -1,3 +1,4 @@
+import { unwrap } from "@bloopjs/bloop";
 import type { App } from "../App.ts";
 import * as Debug from "../debugui/mod.ts";
 import { logger } from "./logs.ts";
@@ -40,13 +41,16 @@ export function joinRollbackRoom(
 
   function receivePackets() {
     for (const packetData of incomingPackets) {
-      app.sim.net.receivePacket(packetData);
+      app.sim.emit.packet(packetData);
 
       if (remotePeerId == null) {
         return;
       }
 
-      const peerState = app.sim.net.getPeerState(remotePeerId);
+      const peerState = unwrap(
+        app.sim.net.peers[remotePeerId],
+        `Remote peer state not found for peerId ${remotePeerId}`,
+      );
       Debug.updatePeer(remoteStringPeerId!, {
         ack: peerState.ack,
         seq: peerState.seq,
@@ -70,7 +74,7 @@ export function joinRollbackRoom(
       return;
     }
 
-    const packet = app.sim.net.getOutboundPacket(remotePeerId);
+    const packet = app.sim.getOutboundPacket(remotePeerId);
 
     if (!packet) {
       console.warn("[netcode] No packet to send");
@@ -97,7 +101,7 @@ export function joinRollbackRoom(
     onDataChannelClose(peerId, reliable) {
       console.log(`Data channel closed: ${peerId} (reliable: ${reliable})`);
       if (!reliable && remotePeerId !== null) {
-        app.sim.net.disconnectPeer(remotePeerId);
+        app.sim.emit.network("peer:leave", { peerId: remotePeerId });
         sessionActive = false;
         opts?.onSessionEnd?.();
       }
@@ -119,12 +123,11 @@ export function joinRollbackRoom(
         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);
+        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;
         console.log(`[netcode] Session started at frame ${app.sim.time.frame}`);
@@ -146,7 +149,7 @@ export function joinRollbackRoom(
     onPeerDisconnected(peerId) {
       Debug.removePeer(peerId);
       if (remotePeerId !== null && peerId === remoteStringPeerId) {
-        app.sim.net.disconnectPeer(remotePeerId);
+        app.sim.emit.network("peer:leave", { peerId: remotePeerId });
         sessionActive = false;
         opts?.onSessionEnd?.();
       }