@bloopjs/bloop 0.0.21 → 0.0.22

package/dist/bloop.d.ts

@@ -1,8 +1,7 @@
-import { type EnginePointer } from "@bloopjs/engine";
 import type { Context } from "./context";
 import type { Bag } from "./data/bag";
 import type { BloopSchema } from "./data/schema";
-import type { DeserializeFn, SerializeFn } from "./runtime";
+import type { EngineHooks } from "./runtime";
 import type { System } from "./system";
 export type BloopOpts<B extends Bag> = {
     /** defaults to "Game" */
@@ -27,26 +26,26 @@ export declare class Bloop<GS extends BloopSchema> {
      * Bloop.create() is the way to create a new bloop instance.
      */
     static create<B extends Bag>(opts?: BloopOpts<B>): Bloop<MakeGS<B>>;
+    /**
+     * DO NOT USE `new Bloop` - use `Bloop.create()` instead for proper type hints.
+     */
     constructor(opts: BloopOpts<GS["B"]> | undefined, dontCallMeDirectly: string);
-    get bag(): GS["B"];
-    get context(): Readonly<Context<GS>>;
     /**
-     * Take a snapshot of the game state outside the engine
-     * @returns linear memory representation of the game state that the engine is unaware of
+     * Read the game singleton bag
      */
-    serialize: () => ReturnType<SerializeFn>;
+    get bag(): GS["B"];
     /**
-     * Restore a snapshot of the game state outside the engine
-     * @returns linear memory representation of the game state that the engine is unaware of
+     * Read the game context object
      */
-    deserialize: DeserializeFn;
+    get context(): Readonly<Context<GS>>;
     /**
      * Register a system with the game loop.
-     *
      */
     system(label: string, system: System<GS>): number;
-    systemsCallback(system_handle: number, ptr: EnginePointer): void;
-    setBuffer(buffer: ArrayBuffer): void;
+    /**
+     * Low level hooks to engine functionality. Editing these is for advanced use cases, defaults should usually work.
+     */
+    hooks: EngineHooks;
 }
 type MakeGS<B extends Bag> = BloopSchema<B>;
 export {};

package/dist/bloop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bloop.d.ts","sourceRoot":"","sources":["../src/bloop.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAWnB,MAAM,iBAAiB,CAAC;AACzB,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,aAAa,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC5D,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;gBAIhC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,YAAK,EAAE,kBAAkB,EAAE,MAAM;IAerE,IAAI,GAAG,IAAI,EAAE,CAAC,GAAG,CAAC,CAEjB;IAED,IAAI,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAEnC;IAED;;;OAGG;IACH,SAAS,QAAO,UAAU,CAAC,WAAW,CAAC,CAYrC;IAEF;;;OAGG;IACH,WAAW,EAAE,aAAa,CAUxB;IAEF;;;OAGG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM;IAMjD,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa;IA6FzD,SAAS,CAAC,MAAM,EAAE,WAAW;CAG9B;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":"AAaA,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,EAAiB,WAAW,EAAe,MAAM,WAAW,CAAC;AACzE,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;IAerE;;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,CAsIhB;CACH;AAUD,KAAK,MAAM,CAAC,CAAC,SAAS,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC"}

package/dist/mod.d.ts

@@ -1,4 +1,8 @@
-export * from "./runtime";
-export * from "./bloop";
+export type * as typesRuntime from "./runtime";
+export type * as typesMount from "./mount";
+export type * as typesBloop from "./bloop";
+export type * as typesContext from "./context";
 export * as Util from "./util";
+export { mount } from "./mount";
+export { Bloop } from "./bloop";
 //# sourceMappingURL=mod.d.ts.map

package/dist/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AAEvB,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,YAAY,KAAK,YAAY,MAAM,WAAW,CAAA;AAC9C,YAAY,KAAK,UAAU,MAAM,SAAS,CAAA;AAC1C,YAAY,KAAK,UAAU,MAAM,SAAS,CAAA;AAC1C,YAAY,KAAK,YAAY,MAAM,WAAW,CAAA;AAE9C,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAE/B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA"}

package/dist/mod.js

@@ -9,6 +9,31 @@ var __export = (target, all) => {
     });
 };
 
+// src/util.ts
+var exports_util = {};
+__export(exports_util, {
+  unwrap: () => unwrap,
+  toHexString: () => toHexString,
+  assert: () => assert
+});
+function toHexString(dataView, length) {
+  length ??= dataView.byteLength;
+  let hexString = "";
+  for (let i = 0;i < length; i++) {
+    const byte = dataView.getUint8(i);
+    hexString += `${byte.toString(16).padStart(2, "0")} `;
+  }
+  return hexString.trim();
+}
+function assert(condition, message) {
+  if (condition == null || condition === false) {
+    throw new Error(message ?? "Assertion failed");
+  }
+}
+function unwrap(value, message) {
+  assert(value != null, message ?? `Unwrap failed: value is ${value}`);
+  return value;
+}
 // ../engine/dist/engine.js
 var __defProp2 = Object.defineProperty;
 var __export2 = (target, all) => {
@@ -991,32 +1016,6 @@ var EVENTS_OFFSET = INPUT_CTX_OFFSET + 4;
 var SNAPSHOT_HEADER_USER_LEN_OFFSET = 4;
 var SNAPSHOT_HEADER_ENGINE_LEN_OFFSET = 8;
 
-// src/util.ts
-var exports_util = {};
-__export(exports_util, {
-  unwrap: () => unwrap,
-  toHexString: () => toHexString,
-  assert: () => assert
-});
-function toHexString(dataView, length) {
-  length ??= dataView.byteLength;
-  let hexString = "";
-  for (let i = 0;i < length; i++) {
-    const byte = dataView.getUint8(i);
-    hexString += `${byte.toString(16).padStart(2, "0")} `;
-  }
-  return hexString.trim();
-}
-function assert(condition, message) {
-  if (condition == null || condition === false) {
-    throw new Error(message ?? "Assertion failed");
-  }
-}
-function unwrap(value, message) {
-  assert(value != null, message ?? `Unwrap failed: value is ${value}`);
-  return value;
-}
-
 // src/runtime.ts
 class Runtime {
   wasm;
@@ -1109,18 +1108,20 @@ class Runtime {
     }
   };
 }
+
+// src/mount.ts
 async function mount(opts) {
-  if (opts.serialize && !opts.deserialize || !opts.serialize && opts.deserialize) {
-    throw new Error("Snapshot and restore hooks must be provided together");
-  }
-  const bytes = await Bun.file(opts.wasmUrl ?? DEFAULT_WASM_URL).arrayBuffer();
+  const bytes = await fetch(opts.wasmUrl ?? DEFAULT_WASM_URL).then((res) => res.arrayBuffer()).catch((e) => {
+    console.error(`Failed to fetch wasm at ${opts.wasmUrl ?? DEFAULT_WASM_URL}`, e);
+    throw e;
+  });
   const memory = new WebAssembly.Memory({ initial: 17, maximum: 1000 });
   const wasmInstantiatedSource = await WebAssembly.instantiate(bytes, {
     env: {
       memory,
       __cb: function(system_handle, ptr) {
-        opts.setBuffer(memory.buffer);
-        opts.systemsCallback(system_handle, ptr);
+        opts.hooks.setBuffer(memory.buffer);
+        opts.hooks.systemsCallback(system_handle, ptr);
       },
       console_log: function(ptr, len) {
         const bytes2 = new Uint8Array(memory.buffer, ptr, len);
@@ -1128,31 +1129,23 @@ async function mount(opts) {
         console.log(string);
       },
       user_data_len: function() {
-        const serializer = opts.serialize ? opts.serialize() : null;
+        const serializer = opts.hooks.serialize();
         return serializer ? serializer.size : 0;
       },
       user_data_serialize: function(ptr, len) {
-        if (!opts.serialize) {
-          return;
-        }
-        const serializer = opts.serialize();
-        if (len !== serializer.size) {
-          throw new Error(`user_data_write length mismatch, expected=${serializer.size} got=${len}`);
-        }
+        const serializer = opts.hooks.serialize();
+        assert(len === serializer.size, `user_data_serialize length mismatch, expected=${serializer.size} got=${len}`);
         serializer.write(memory.buffer, ptr);
       },
       user_data_deserialize: function(ptr, len) {
-        if (!opts.deserialize) {
-          return;
-        }
-        opts.deserialize(memory.buffer, ptr, len);
+        opts.hooks.deserialize(memory.buffer, ptr, len);
       }
     }
   });
   const wasm = wasmInstantiatedSource.instance.exports;
   wasm.initialize();
   const runtime = new Runtime(wasm, memory, {
-    serialize: opts.serialize
+    serialize: opts.hooks.serialize
   });
   if (opts.startRecording ?? true) {
     runtime.record();
@@ -1187,99 +1180,101 @@ class Bloop {
   get context() {
     return this.#context;
   }
-  serialize = () => {
-    const str = JSON.stringify(this.#context.bag);
-    const encoder = new TextEncoder;
-    const textBytes = encoder.encode(str);
-    return {
-      size: textBytes.byteLength,
-      write: (buffer, ptr) => {
-        const memoryView = new Uint8Array(buffer, ptr, textBytes.byteLength);
-        memoryView.set(textBytes);
-      }
-    };
-  };
-  deserialize = (buffer, ptr, len) => {
-    const bagBytes = new Uint8Array(buffer, ptr, len);
-    const decoder = new TextDecoder;
-    const str = decoder.decode(bagBytes);
-    try {
-      this.#context.bag = JSON.parse(str);
-    } catch (e) {
-      console.error("failed to deserialize bag", { json: str, error: e });
-    }
-  };
   system(label, system) {
     system.label ??= label;
     this.#systems.push(system);
     return this.#systems.length;
   }
-  systemsCallback(system_handle, ptr) {
-    const dv = new DataView(this.#engineBuffer, ptr);
-    const timeCtxPtr = dv.getUint32(TIME_CTX_OFFSET, true);
-    const inputCtxPtr = dv.getUint32(INPUT_CTX_OFFSET, true);
-    const eventsPtr = dv.getUint32(EVENTS_OFFSET, true);
-    this.#context.rawPointer = ptr;
-    this.#context.inputs.dataView = new DataView(this.#engineBuffer, inputCtxPtr);
-    this.#context.time.dataView = new DataView(this.#engineBuffer, timeCtxPtr);
-    const eventsDataView = new DataView(this.#engineBuffer, eventsPtr);
-    for (const system of this.#systems) {
-      system.update?.(this.#context);
-      const eventCount = eventsDataView.getUint32(0, true);
-      let offset = Uint32Array.BYTES_PER_ELEMENT;
-      for (let i = 0;i < eventCount; i++) {
-        const eventType = eventsDataView.getUint8(offset);
-        const payloadSize = EVENT_PAYLOAD_SIZE;
-        const payloadByte = eventsDataView.getUint8(offset + EVENT_PAYLOAD_ALIGN);
-        const payloadVec2 = {
-          x: eventsDataView.getFloat32(offset + EVENT_PAYLOAD_ALIGN, true),
-          y: eventsDataView.getFloat32(offset + EVENT_PAYLOAD_ALIGN + Float32Array.BYTES_PER_ELEMENT, true)
-        };
-        switch (eventType) {
-          case exports_enums.EventType.KeyDown: {
-            system.keydown?.(attachEvent(this.#context, {
-              key: keyCodeToKey(payloadByte)
-            }));
-            break;
+  hooks = {
+    serialize: () => {
+      const str = JSON.stringify(this.#context.bag);
+      const encoder = new TextEncoder;
+      const textBytes = encoder.encode(str);
+      return {
+        size: textBytes.byteLength,
+        write: (buffer, ptr) => {
+          const memoryView = new Uint8Array(buffer, ptr, textBytes.byteLength);
+          memoryView.set(textBytes);
+        }
+      };
+    },
+    deserialize: (buffer, ptr, len) => {
+      const bagBytes = new Uint8Array(buffer, ptr, len);
+      const decoder = new TextDecoder;
+      const str = decoder.decode(bagBytes);
+      try {
+        this.#context.bag = JSON.parse(str);
+      } catch (e) {
+        console.error("failed to deserialize bag", { json: str, error: e });
+      }
+    },
+    setBuffer: (buffer) => {
+      this.#engineBuffer = buffer;
+    },
+    systemsCallback: (system_handle, ptr) => {
+      const dv = new DataView(this.#engineBuffer, ptr);
+      const timeCtxPtr = dv.getUint32(TIME_CTX_OFFSET, true);
+      const inputCtxPtr = dv.getUint32(INPUT_CTX_OFFSET, true);
+      const eventsPtr = dv.getUint32(EVENTS_OFFSET, true);
+      this.#context.rawPointer = ptr;
+      this.#context.inputs.dataView = new DataView(this.#engineBuffer, inputCtxPtr);
+      this.#context.time.dataView = new DataView(this.#engineBuffer, timeCtxPtr);
+      const eventsDataView = new DataView(this.#engineBuffer, eventsPtr);
+      for (const system of this.#systems) {
+        system.update?.(this.#context);
+        const eventCount = eventsDataView.getUint32(0, true);
+        let offset = Uint32Array.BYTES_PER_ELEMENT;
+        for (let i = 0;i < eventCount; i++) {
+          const eventType = eventsDataView.getUint8(offset);
+          const payloadSize = EVENT_PAYLOAD_SIZE;
+          const payloadByte = eventsDataView.getUint8(offset + EVENT_PAYLOAD_ALIGN);
+          const payloadVec2 = {
+            x: eventsDataView.getFloat32(offset + EVENT_PAYLOAD_ALIGN, true),
+            y: eventsDataView.getFloat32(offset + EVENT_PAYLOAD_ALIGN + Float32Array.BYTES_PER_ELEMENT, true)
+          };
+          switch (eventType) {
+            case exports_enums.EventType.KeyDown: {
+              system.keydown?.(attachEvent(this.#context, {
+                key: keyCodeToKey(payloadByte)
+              }));
+              break;
+            }
+            case exports_enums.EventType.KeyUp:
+              system.keyup?.(attachEvent(this.#context, {
+                key: keyCodeToKey(payloadByte)
+              }));
+              break;
+            case exports_enums.EventType.MouseDown:
+              system.mousedown?.(attachEvent(this.#context, {
+                button: mouseButtonCodeToMouseButton(payloadByte)
+              }));
+              break;
+            case exports_enums.EventType.MouseUp:
+              system.mouseup?.(attachEvent(this.#context, {
+                button: mouseButtonCodeToMouseButton(payloadByte)
+              }));
+              break;
+            case exports_enums.EventType.MouseMove:
+              system.mousemove?.(attachEvent(this.#context, {
+                x: payloadVec2.x,
+                y: payloadVec2.y
+              }));
+              break;
+            case exports_enums.EventType.MouseWheel:
+              system.mousewheel?.(attachEvent(this.#context, {
+                x: payloadVec2.x,
+                y: payloadVec2.y
+              }));
+              break;
+            default:
+              throw new Error(`Unknown event type: ${eventType}`);
           }
-          case exports_enums.EventType.KeyUp:
-            system.keyup?.(attachEvent(this.#context, {
-              key: keyCodeToKey(payloadByte)
-            }));
-            break;
-          case exports_enums.EventType.MouseDown:
-            system.mousedown?.(attachEvent(this.#context, {
-              button: mouseButtonCodeToMouseButton(payloadByte)
-            }));
-            break;
-          case exports_enums.EventType.MouseUp:
-            system.mouseup?.(attachEvent(this.#context, {
-              button: mouseButtonCodeToMouseButton(payloadByte)
-            }));
-            break;
-          case exports_enums.EventType.MouseMove:
-            system.mousemove?.(attachEvent(this.#context, {
-              x: payloadVec2.x,
-              y: payloadVec2.y
-            }));
-            break;
-          case exports_enums.EventType.MouseWheel:
-            system.mousewheel?.(attachEvent(this.#context, {
-              x: payloadVec2.x,
-              y: payloadVec2.y
-            }));
-            break;
-          default:
-            throw new Error(`Unknown event type: ${eventType}`);
+          offset += EVENT_PAYLOAD_ALIGN + EVENT_PAYLOAD_SIZE;
         }
-        offset += EVENT_PAYLOAD_ALIGN + EVENT_PAYLOAD_SIZE;
+        this.#context.event = undefined;
       }
-      this.#context.event = undefined;
     }
-  }
-  setBuffer(buffer) {
-    this.#engineBuffer = buffer;
-  }
+  };
 }
 function attachEvent(context, event) {
   context.event = event;
@@ -1288,9 +1283,8 @@ function attachEvent(context, event) {
 export {
   mount,
   exports_util as Util,
-  Runtime,
   Bloop
 };
 
-//# debugId=586D28D5F65F094D64756E2164756E21
+//# debugId=43C3568B8A190DC064756E2164756E21
 //# sourceMappingURL=mod.js.map