@bloopjs/bloop 0.0.80 → 0.0.82

package/dist/bloop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bloop.d.ts","sourceRoot":"","sources":["../src/bloop.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAQjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,GAAG,IAAI;IACrC,yBAAyB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;OAIG;IAEH;;OAEG;IAEH;;;OAGG;IACH,GAAG,CAAC,EAAE,CAAC,CAAC;CAET,CAAC;AAEF,qBAAa,KAAK,CAAC,EAAE,SAAS,WAAW;;IAKvC;;OAEG;IACH,MAAM,CAAC,MAAM,CAGX,CAAC,SAAS,GAAG,EAGb,IAAI,GAAE,SAAS,CAAC,CAAC,CAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAI5C;;OAEG;gBACS,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,YAAK,EAAE,kBAAkB,EAAE,MAAM;IAoBrE;;OAEG;IACH,IAAI,GAAG,IAAI,EAAE,CAAC,GAAG,CAAC,CAEjB;IAED;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAEnC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM;IAMjD;;OAEG;IACH,KAAK,EAAE,WAAW,CAqJhB;CACH;AAUD,KAAK,MAAM,CAAC,CAAC,SAAS,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"bloop.d.ts","sourceRoot":"","sources":["../src/bloop.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAQjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,GAAG,IAAI;IACrC,yBAAyB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;OAIG;IAEH;;OAEG;IAEH;;;OAGG;IACH,GAAG,CAAC,EAAE,CAAC,CAAC;CAET,CAAC;AAEF,qBAAa,KAAK,CAAC,EAAE,SAAS,WAAW;;IAKvC;;OAEG;IACH,MAAM,CAAC,MAAM,CAGX,CAAC,SAAS,GAAG,EAGb,IAAI,GAAE,SAAS,CAAC,CAAC,CAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAI5C;;OAEG;gBACS,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,YAAK,EAAE,kBAAkB,EAAE,MAAM;IAoBrE;;OAEG;IACH,IAAI,GAAG,IAAI,EAAE,CAAC,GAAG,CAAC,CAEjB;IAED;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAEnC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM;IAMjD;;OAEG;IACH,KAAK,EAAE,WAAW,CAmNhB;CACH;AAUD,KAAK,MAAM,CAAC,CAAC,SAAS,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC"}

package/dist/mod.js

@@ -104,6 +104,7 @@ var __export2 = (target, all) => {
 };
 var exports_enums = {};
 __export2(exports_enums, {
+  NetJoinFailReason: () => NetJoinFailReason,
   MouseButton: () => MouseButton,
   Key: () => Key,
   InputSource: () => InputSource,
@@ -119,11 +120,13 @@ var EventType;
   EventType2[EventType2["MouseUp"] = 5] = "MouseUp";
   EventType2[EventType2["MouseWheel"] = 6] = "MouseWheel";
   EventType2[EventType2["FrameStart"] = 7] = "FrameStart";
-  EventType2[EventType2["SessionInit"] = 8] = "SessionInit";
-  EventType2[EventType2["SessionSetLocalPeer"] = 9] = "SessionSetLocalPeer";
-  EventType2[EventType2["SessionConnectPeer"] = 10] = "SessionConnectPeer";
-  EventType2[EventType2["SessionDisconnectPeer"] = 11] = "SessionDisconnectPeer";
-  EventType2[EventType2["SessionEnd"] = 12] = "SessionEnd";
+  EventType2[EventType2["NetJoinOk"] = 8] = "NetJoinOk";
+  EventType2[EventType2["NetJoinFail"] = 9] = "NetJoinFail";
+  EventType2[EventType2["NetPeerJoin"] = 10] = "NetPeerJoin";
+  EventType2[EventType2["NetPeerLeave"] = 11] = "NetPeerLeave";
+  EventType2[EventType2["NetPeerAssignLocalId"] = 12] = "NetPeerAssignLocalId";
+  EventType2[EventType2["NetPacketReceived"] = 13] = "NetPacketReceived";
+  EventType2[EventType2["NetSessionInit"] = 14] = "NetSessionInit";
 })(EventType ||= {});
 var MouseButton;
 ((MouseButton2) => {
@@ -367,6 +370,14 @@ var InputSource;
   InputSource2[InputSource2["RemotePeer11"] = 139] = "RemotePeer11";
   InputSource2[InputSource2["Unmapped"] = 255] = "Unmapped";
 })(InputSource ||= {});
+var NetJoinFailReason;
+((NetJoinFailReason2) => {
+  NetJoinFailReason2[NetJoinFailReason2["unknown"] = 0] = "unknown";
+  NetJoinFailReason2[NetJoinFailReason2["timeout"] = 1] = "timeout";
+  NetJoinFailReason2[NetJoinFailReason2["room_full"] = 2] = "room_full";
+  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;
@@ -1120,30 +1131,171 @@ 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",
+  2: "join:pending",
+  3: "connected",
+  4: "disconnected"
+};
 
 class NetContext {
   dataView;
+  #peers = Array.from({ length: MAX_PEERS }, () => ({
+    isLocal: false,
+    seq: -1,
+    ack: -1
+  }));
+  #peersResult = [];
   constructor(dataView) {
     this.dataView = dataView;
   }
+  #hasValidBuffer() {
+    if (!this.dataView)
+      return false;
+    return this.dataView.buffer.byteLength > 0;
+  }
   get peerCount() {
-    if (!this.dataView) {
-      throw new Error("NetContext DataView is not initialized");
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
     }
     return this.dataView.getUint8(0);
   }
+  get localPeerId() {
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
+    }
+    return this.dataView.getUint8(1);
+  }
   get isInSession() {
-    if (!this.dataView) {
-      throw new Error("NetContext DataView is not initialized");
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
     }
     return this.dataView.getUint8(2) !== 0;
   }
+  get status() {
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
+    }
+    const statusByte = this.dataView.getUint8(3);
+    return STATUS_MAP[statusByte] ?? "local";
+  }
   get matchFrame() {
-    if (!this.dataView) {
-      throw new Error("NetContext DataView is not initialized");
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
     }
     return this.dataView.getUint32(4, true);
   }
+  get sessionStartFrame() {
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
+    }
+    return this.dataView.getUint32(8, true);
+  }
+  get roomCode() {
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
+    }
+    const bytes = [];
+    for (let i = 0;i < 8; i++) {
+      const byte = this.dataView.getUint8(12 + i);
+      if (byte === 0)
+        break;
+      bytes.push(byte);
+    }
+    return String.fromCharCode(...bytes);
+  }
+  get wantsRoomCode() {
+    if (!this.#hasValidBuffer()) {
+      return;
+    }
+    const bytes = [];
+    for (let i = 0;i < 8; i++) {
+      const byte = this.dataView.getUint8(20 + i);
+      if (byte === 0)
+        break;
+      bytes.push(byte);
+    }
+    return bytes.length > 0 ? String.fromCharCode(...bytes) : undefined;
+  }
+  set wantsRoomCode(code) {
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
+    }
+    for (let i = 0;i < 8; i++) {
+      this.dataView.setUint8(20 + i, 0);
+    }
+    if (code) {
+      for (let i = 0;i < Math.min(code.length, 7); i++) {
+        this.dataView.setUint8(20 + i, code.charCodeAt(i));
+      }
+    }
+  }
+  get wantsDisconnect() {
+    if (!this.#hasValidBuffer()) {
+      return false;
+    }
+    return this.dataView.getUint8(28) !== 0;
+  }
+  set wantsDisconnect(value) {
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
+    }
+    this.dataView.setUint8(28, value ? 1 : 0);
+  }
+  get peers() {
+    if (!this.#hasValidBuffer()) {
+      throw new Error("NetContext dataView is not valid");
+    }
+    const dv = this.dataView;
+    const localPeerId = this.localPeerId;
+    const matchFrame = this.matchFrame;
+    let minRemoteSeq = -1;
+    for (let i = 0;i < MAX_PEERS; 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);
+      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)
+        continue;
+      const peer = this.#peers[i];
+      if (!peer) {
+        throw new Error(`Unexpected missing peer object at index ${i}`);
+      }
+      const isLocal = i === localPeerId;
+      peer.isLocal = isLocal;
+      if (isLocal) {
+        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);
+      }
+      this.#peersResult.push(peer);
+    }
+    return this.#peersResult;
+  }
 }
 
 class TimeContext {
@@ -1185,7 +1337,7 @@ function readTapeHeader(tape) {
     eventCount: view.getUint16(14, true)
   };
 }
-var DEFAULT_WASM_URL = new URL("https://unpkg.com/@bloopjs/engine@0.0.80/wasm/bloop.wasm");
+var DEFAULT_WASM_URL = new URL("https://unpkg.com/@bloopjs/engine@0.0.82/wasm/bloop.wasm");
 var MAX_ROLLBACK_FRAMES = 500;
 var TIME_CTX_OFFSET = 0;
 var INPUT_CTX_OFFSET = TIME_CTX_OFFSET + 4;
@@ -1194,64 +1346,6 @@ 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;
-// src/net.ts
-class Net {
-  #wasm;
-  #memory;
-  constructor(wasm, memory) {
-    this.#wasm = wasm;
-    this.#memory = memory;
-  }
-  setLocalPeer(peerId) {
-    this.#wasm.session_set_local_peer(peerId);
-  }
-  connectPeer(peerId) {
-    this.#wasm.session_peer_connect(peerId);
-  }
-  disconnectPeer(peerId) {
-    this.#wasm.session_peer_disconnect(peerId);
-  }
-  getOutboundPacket(targetPeer) {
-    this.#wasm.build_outbound_packet(targetPeer);
-    const len = this.#wasm.get_outbound_packet_len();
-    if (len === 0) {
-      return null;
-    }
-    const ptr = this.#wasm.get_outbound_packet();
-    assert(ptr > 0, `Invalid outbound packet pointer: ${ptr}`);
-    const memoryView = new Uint8Array(this.#memory.buffer, ptr, len);
-    const copy = new Uint8Array(len);
-    copy.set(memoryView);
-    return copy;
-  }
-  receivePacket(data) {
-    if (data.length === 0) {
-      return;
-    }
-    const ptr = this.#wasm.alloc(data.byteLength);
-    assert(ptr > 0, `Failed to allocate ${data.byteLength} bytes for received packet`);
-    const memoryView = new Uint8Array(this.#memory.buffer, ptr, data.byteLength);
-    memoryView.set(data);
-    const result = this.#wasm.receive_packet(ptr, data.byteLength);
-    this.#wasm.free(ptr, data.byteLength);
-    if (result !== 0) {
-      const errorMessages = {
-        1: "No active session",
-        2: "Buffer too small",
-        3: "Unsupported packet version",
-        4: "Invalid event count"
-      };
-      throw new Error(errorMessages[result] ?? `Unknown packet error: ${result}`);
-    }
-  }
-  getPeerState(peer) {
-    return {
-      seq: this.#wasm.get_peer_seq(peer),
-      ack: this.#wasm.get_peer_ack(peer)
-    };
-  }
-}
-
 // src/sim.ts
 var originalConsole = globalThis.console;
 var noop = () => {};
@@ -1270,7 +1364,7 @@ class Sim {
   #time;
   #serialize;
   #isPaused = false;
-  net;
+  #net;
   onTapeFull;
   constructor(wasm, memory, opts) {
     this.wasm = wasm;
@@ -1278,7 +1372,7 @@ class Sim {
     this.#time = new TimeContext(new DataView(this.#memory.buffer, this.wasm.get_time_ctx()));
     this.id = `${Math.floor(Math.random() * 1e6)}`;
     this.#serialize = opts?.serialize;
-    this.net = new Net(wasm, memory);
+    this.#net = new NetContext;
   }
   step(ms) {
     if (this.#isPaused) {
@@ -1359,7 +1453,9 @@ class Sim {
     assert(tapePtr > 0, `failed to allocate ${tape.byteLength} bytes for tape load, pointer=${tapePtr}`);
     const memoryView = new Uint8Array(this.#memory.buffer, tapePtr, tape.byteLength);
     memoryView.set(tape);
-    this.wasm.stop_recording();
+    if (this.isRecording) {
+      this.wasm.stop_recording();
+    }
     const result = this.wasm.load_tape(tapePtr, tape.byteLength);
     assert(result === 0, `failed to load tape, error code=${result}`);
     this.wasm.free(tapePtr, tape.byteLength);
@@ -1381,6 +1477,12 @@ class Sim {
     }
     return this.#time;
   }
+  get net() {
+    if (!this.#net.dataView || this.#net.dataView.buffer !== this.#memory.buffer) {
+      this.#net.dataView = new DataView(this.#memory.buffer, this.wasm.get_net_ctx());
+    }
+    return this.#net;
+  }
   get buffer() {
     return this.#memory.buffer;
   }
@@ -1411,16 +1513,77 @@ class Sim {
     },
     mousewheel: (x, y, peerId = 0) => {
       this.wasm.emit_mousewheel(x, y, peerId);
+    },
+    network: (type, data) => {
+      switch (type) {
+        case "join:ok": {
+          const roomCode = data.roomCode;
+          const encoded = new TextEncoder().encode(roomCode);
+          const ptr = this.wasm.alloc(encoded.length);
+          new Uint8Array(this.#memory.buffer, ptr, encoded.length).set(encoded);
+          this.wasm.emit_net_join_ok(ptr, encoded.length);
+          this.wasm.free(ptr, encoded.length);
+          break;
+        }
+        case "join:fail":
+          this.wasm.emit_net_join_fail(0);
+          break;
+        case "peer:join": {
+          const peerId = data.peerId;
+          this.wasm.emit_net_peer_join(peerId);
+          break;
+        }
+        case "peer:leave": {
+          const peerId = data.peerId;
+          this.wasm.emit_net_peer_leave(peerId);
+          break;
+        }
+        case "peer:assign_local_id": {
+          const peerId = data.peerId;
+          this.wasm.emit_net_peer_assign_local_id(peerId);
+          break;
+        }
+        case "session:start":
+          this.wasm.emit_net_session_init();
+          break;
+        case "session:end":
+          this.wasm.emit_net_session_end();
+          break;
+      }
+    },
+    packet: (data) => {
+      if (data.length === 0) {
+        return;
+      }
+      const ptr = this.wasm.alloc(data.byteLength);
+      assert(ptr > 0, `Failed to allocate ${data.byteLength} bytes for received packet`);
+      const memoryView = new Uint8Array(this.#memory.buffer, ptr, data.byteLength);
+      memoryView.set(data);
+      const result = this.wasm.emit_receive_packet(ptr, data.byteLength);
+      this.wasm.free(ptr, data.byteLength);
+      if (result !== 0) {
+        const errorMessages = {
+          1: "No active session",
+          2: "Buffer too small",
+          3: "Unsupported packet version",
+          4: "Invalid event count"
+        };
+        throw new Error(errorMessages[result] ?? `Unknown packet error: ${result}`);
+      }
     }
   };
-  sessionInit(peerCount) {
-    const serializer = this.#serialize ? this.#serialize() : null;
-    const size = serializer ? serializer.size : 0;
-    const result = this.wasm.session_init(peerCount, size);
-    assert(result === 0, `failed to initialize session, error code=${result}`);
-  }
-  sessionEnd() {
-    this.wasm.session_end();
+  getOutboundPacket(targetPeer) {
+    this.wasm.build_outbound_packet(targetPeer);
+    const len = this.wasm.get_outbound_packet_len();
+    if (len === 0) {
+      throw new Error(`No outbound packet available for peer ${targetPeer}`);
+    }
+    const ptr = this.wasm.get_outbound_packet();
+    assert(ptr > 0, `Invalid outbound packet pointer: ${ptr}`);
+    const memoryView = new Uint8Array(this.#memory.buffer, ptr, len);
+    const copy = new Uint8Array(len);
+    copy.set(memoryView);
+    return copy;
   }
 }
 
@@ -1641,8 +1804,59 @@ class Bloop {
                 y: payloadVec2.y
               }));
               break;
+            case exports_enums.EventType.NetJoinOk: {
+              const roomCodeBytes = [];
+              for (let j = 0;j < 8; j++) {
+                const byte = eventsDataView.getUint8(payloadOffset + j);
+                if (byte === 0)
+                  break;
+                roomCodeBytes.push(byte);
+              }
+              const roomCode = String.fromCharCode(...roomCodeBytes);
+              this.#context.event = {
+                type: "join:ok",
+                data: { roomCode }
+              };
+              system.netcode?.(this.#context);
+              break;
+            }
+            case exports_enums.EventType.NetJoinFail: {
+              const reasonCode = eventsDataView.getUint8(payloadOffset);
+              const reasons = [
+                "unknown",
+                "timeout",
+                "room_full",
+                "room_not_found",
+                "already_in_room"
+              ];
+              const reason = reasons[reasonCode] ?? "unknown";
+              this.#context.event = {
+                type: "join:fail",
+                data: { reason }
+              };
+              system.netcode?.(this.#context);
+              break;
+            }
+            case exports_enums.EventType.NetPeerJoin: {
+              const peerId = eventsDataView.getUint8(payloadOffset);
+              this.#context.event = {
+                type: "peer:join",
+                data: { peerId }
+              };
+              system.netcode?.(this.#context);
+              break;
+            }
+            case exports_enums.EventType.NetPeerLeave: {
+              const peerId = eventsDataView.getUint8(payloadOffset);
+              this.#context.event = {
+                type: "peer:leave",
+                data: { peerId }
+              };
+              system.netcode?.(this.#context);
+              break;
+            }
             default:
-              throw new Error(`Unknown event type: ${eventType}`);
+              break;
           }
           offset += 12;
         }
@@ -1665,5 +1879,5 @@ export {
   Bloop
 };
 
-//# debugId=59A3AB7EB5C7F7D364756E2164756E21
+//# debugId=D5243D77F62CBF8A64756E2164756E21
 //# sourceMappingURL=mod.js.map