@irtio/runtime 0.9.0 → 0.10.0

package/dist/{chunk-ADZZEVJU.js → chunk-KGZEQTJR.js}

@@ -1079,7 +1079,8 @@ var MatterRuntime = class {
       const plainColl = plainEntity(this.core.plain, desc.name);
       for (const id of plainColl.ids()) {
         const attached = this.bodies.get(bodyKey(desc.name, id));
-        if (attached) fn(desc.name, id, attached.body);
+        if (attached)
+          fn(desc.name, id, attached.body, plainColl.get(id));
       }
     }
   }
@@ -1534,7 +1535,7 @@ var PhysicsRuntime = class {
       const plainColl = plainEntity(this.core.plain, desc.name);
       for (const id of plainColl.ids()) {
         const body = this.bodies.get(bodyKey2(desc.name, id));
-        if (body) fn(desc.name, id, body);
+        if (body) fn(desc.name, id, body, plainColl.get(id));
       }
     }
   }
@@ -1939,7 +1940,7 @@ var Rapier2dRuntime = class {
       const plainColl = plainEntity(this.core.plain, desc.name);
       for (const id of plainColl.ids()) {
         const body = this.bodies.get(bodyKey3(desc.name, id));
-        if (body) fn(desc.name, id, body);
+        if (body) fn(desc.name, id, body, plainColl.get(id));
       }
     }
   }
@@ -2456,23 +2457,45 @@ import {
 
 // src/core/history.ts
 var HISTORY_MAX_TICKS = 240;
+var HISTORY_MAX_CHANNELS = 8;
 var STRIDE = 13;
 function emptyPose() {
   return { x: 0, y: 0, z: 0, qx: 0, qy: 0, qz: 0, qw: 1, vx: 0, vy: 0, vz: 0, wx: 0, wy: 0, wz: 0 };
 }
 function newEntry() {
-  return { tick: -1, count: 0, collections: [], ids: [], values: new Float64Array(0) };
+  return {
+    tick: -1,
+    count: 0,
+    collections: [],
+    ids: [],
+    values: new Float64Array(0),
+    channels: new Float32Array(0)
+  };
 }
 var PoseHistory = class {
   depth;
+  /** Declared channels by collection. Empty in a room that declared none. */
+  channels;
+  /**
+   * Slots per body in `entry.channels`: the widest declared count, so a body's channels sit at
+   * `i * channelStride` under the same body index the pose uses. `0` when nothing is declared, and
+   * that zero is what short-circuits the whole channel path per body.
+   */
+  channelStride;
   entries = [];
   /** Index of the newest entry in `entries`, or -1 when nothing has been captured. */
   head = -1;
   size = 0;
   /** Reused across every body of every capture: the capture path allocates nothing per body. */
   scratchPose = emptyPose();
-  constructor(depth) {
+  /** Collections whose `read` hook has already thrown, so the log is one line, not one per tick. */
+  hookFailed = /* @__PURE__ */ new Set();
+  constructor(depth, channels) {
     this.depth = Math.max(1, Math.min(HISTORY_MAX_TICKS, Math.floor(depth)));
+    this.channels = channels ?? /* @__PURE__ */ new Map();
+    let stride = 0;
+    for (const spec of this.channels.values()) stride = Math.max(stride, spec.count);
+    this.channelStride = stride;
     for (let i = 0; i < this.depth; i++) this.entries.push(newEntry());
   }
   get length() {
@@ -2502,14 +2525,14 @@ var PoseHistory = class {
     entry.count = 0;
     const pose = this.scratchPose;
     const kind = physics.engineKind;
-    physics.eachTrackedBody((collection, id, body) => {
+    physics.eachTrackedBody((collection, id, body, instance) => {
       if (kind === "rapier3d") readRapierPose(body, pose);
       else if (kind === "rapier2d") readRapier2dPose(body, pose);
       else readMatterPose(body, pose);
-      this.push(entry, collection, id, pose);
+      this.push(entry, collection, id, pose, instance);
     });
   }
-  push(entry, collection, id, pose) {
+  push(entry, collection, id, pose, instance) {
     const i = entry.count;
     const need = (i + 1) * STRIDE;
     if (entry.values.length < need) {
@@ -2517,6 +2540,34 @@ var PoseHistory = class {
       grown.set(entry.values);
       entry.values = grown;
     }
+    const stride = this.channelStride;
+    if (stride > 0) {
+      const want = (i + 1) * stride;
+      if (entry.channels.length < want) {
+        const grown = new Float32Array(Math.max(want, entry.channels.length * 2, stride * 8));
+        grown.set(entry.channels);
+        entry.channels = grown;
+      }
+      const o2 = i * stride;
+      entry.channels.fill(0, o2, o2 + stride);
+      const spec = this.channels.get(collection);
+      if (spec) {
+        const scratch = spec.scratch;
+        scratch.fill(0);
+        try {
+          spec.read(instance, scratch);
+          entry.channels.set(scratch, o2);
+        } catch (err) {
+          if (!this.hookFailed.has(collection)) {
+            this.hookFailed.add(collection);
+            console.error(
+              `physics.history.channels.${collection}.read threw; that body's channels are zeros`,
+              err
+            );
+          }
+        }
+      }
+    }
     entry.collections[i] = collection;
     entry.ids[i] = id;
     const v = entry.values;
@@ -2587,6 +2638,10 @@ function poseAt(entry, index, into) {
   into.wy = v[o + 11];
   into.wz = v[o + 12];
 }
+function channelsAt(entry, index, stride, count) {
+  const o = index * stride;
+  return entry.channels.subarray(o, o + count);
+}
 function readRapierPose(body, into) {
   const t = body.translation();
   const r = body.rotation();
@@ -2639,10 +2694,20 @@ function readMatterPose(body, into) {
   into.wy = 0;
   into.wz = body.angularVelocity;
 }
-function historyDepthOf(config) {
+function historyOf(config) {
   const declared = config?.history;
-  if (typeof declared !== "number" || !Number.isFinite(declared) || declared <= 0) return void 0;
-  return Math.min(HISTORY_MAX_TICKS, Math.floor(declared));
+  const raw = typeof declared === "number" ? declared : typeof declared === "object" && declared !== null ? declared.depth : void 0;
+  if (typeof raw !== "number" || !Number.isFinite(raw) || raw <= 0) return void 0;
+  const depth = Math.min(HISTORY_MAX_TICKS, Math.floor(raw));
+  const channels = /* @__PURE__ */ new Map();
+  if (typeof declared === "object" && declared !== null) {
+    const spec = declared.channels;
+    for (const [name, s] of Object.entries(spec ?? {})) {
+      const count = Math.min(HISTORY_MAX_CHANNELS, Math.floor(s.count));
+      channels.set(name, { count, read: s.read, scratch: new Float32Array(count) });
+    }
+  }
+  return { depth, channels };
 }
 function keyOf(collection, id) {
   return `${collection} ${id}`;
@@ -2992,8 +3057,8 @@ var RewindState = class {
   history;
   scratch;
   inside = false;
-  constructor(depth) {
-    this.history = new PoseHistory(depth);
+  constructor(setup) {
+    this.history = new PoseHistory(setup.depth, setup.channels);
   }
   free() {
     this.scratch?.free();
@@ -3012,7 +3077,29 @@ var RewindState = class {
       );
     }
     this.scratch ??= physics.engineKind === "rapier3d" ? new RapierScratch(physics, this.history.depth, tickNow) : physics.engineKind === "rapier2d" ? new Rapier2dScratch(physics, this.history.depth, tickNow) : new MatterScratch(physics, this.history.depth, tickNow);
-    const view = this.scratch.view(resolved.entry, resolved.tick, requested, resolved.clamped);
+    const engineView = this.scratch.view(
+      resolved.entry,
+      resolved.tick,
+      requested,
+      resolved.clamped
+    );
+    const entry = resolved.entry;
+    const history = this.history;
+    const view = {
+      ...engineView,
+      // A linear scan of the entry rather than an index: an entry holds one room's tracked bodies,
+      // and building a map per rewind would cost more than the scan it saved.
+      channels: (collection, id) => {
+        const spec = history.channels.get(collection);
+        if (!spec) return void 0;
+        for (let i = 0; i < entry.count; i++) {
+          if (entry.collections[i] === collection && entry.ids[i] === id) {
+            return channelsAt(entry, i, history.channelStride, spec.count);
+          }
+        }
+        return void 0;
+      }
+    };
     this.inside = true;
     try {
       return fn(view);
@@ -3896,8 +3983,8 @@ var RoomCore = class _RoomCore {
     this.loop = new Loop(self);
     this.api = createRoomApi(self, options.publicUrl ?? DEFAULT_PUBLIC_URL);
     this.physics = this.buildPhysics(restored);
-    const historyDepth = this.physics ? historyDepthOf(definition.config.physics) : void 0;
-    this.rewindState = historyDepth === void 0 ? void 0 : new RewindState(historyDepth);
+    const historySetup = this.physics ? historyOf(definition.config.physics) : void 0;
+    this.rewindState = historySetup === void 0 ? void 0 : new RewindState(historySetup);
     this.subscribeDeclaredChannels();
     if (restored) {
       const onWake = definition.config.onWake;
@@ -3984,7 +4071,7 @@ var RoomCore = class _RoomCore {
     const engine4 = loadedPhysics();
     if (!engine4) {
       throw new Error(
-        "RoomCore: this room declares physics but the engine is not initialized \u2014 the host must `await initPhysics()` (from '@irtio/runtime') before constructing the room; handlers are synchronous, so the WASM cannot be loaded later"
+        "RoomCore: this room declares physics but the engine is not initialized \u2014 the host must `await initPhysics()` (in tests: from '@irtio/testing') before constructing the room; handlers are synchronous, so the WASM cannot be loaded later"
       );
     }
     let section;

package/dist/{chunk-SBDZ45JG.js → chunk-MTBMGUGG.js}

@@ -1,7 +1,7 @@
 import {
   parseHibernationBlob,
   writeHibernationBlob
-} from "./chunk-ADZZEVJU.js";
+} from "./chunk-KGZEQTJR.js";
 
 // src/migrate.ts
 import { PRESENCE_COLLECTION, withBuiltins } from "@irtio/protocol";

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { D as DEFAULT_TIMELINE_MAX_RECORDS, a as DEFAULT_TIMELINE_MAX_TICKS, E as EVENT_RING_SIZE, H as HOST_CALL_TIMEOUT_MS, b as HostCall, c as HostCallResult, J as JoinOptions, d as JoinResult, L as LogLevel, R as RoomCoreApi, e as RoomCoreOptions, f as RoomEvent, g as RoomEventKind, h as RoomFullError, i as RoomHost, j as RoomInspection, k as RoomStats, T as TimelineDump, l as TimelineFrame, m as TimelineRecorder, n as TimelineRecorderOptions, o as inspectState } from './contract-C5aqs49-.js';
-export { C as CRASH_AFTER_THROWS, M as MAX_CATCHUP, a as MatterBodyRecord, b as MatterSection, c as Mulberry32, P as PhysicsEngineTag, d as PhysicsSection, R as RoomCore, e as decodeMatterBodies, f as decodeMatterSectionEnvelope, g as decodePhysicsSection, h as decodeRapier2dSectionEnvelope, i as encodeMatterBodies, j as encodeMatterSectionEnvelope, k as encodePhysicsSection, l as encodeRapier2dSectionEnvelope, m as initMatter, n as initPhysics, o as initRapier2d, p as loadedMatter, q as loadedPhysics, r as loadedRapier2d, s as physicsSectionEngine, t as resetMatterForTests, u as resetPhysicsForTests, v as resetRapier2dForTests } from './room-C4RZJ2KO.js';
+export { C as CRASH_AFTER_THROWS, M as MAX_CATCHUP, a as MatterBodyRecord, b as MatterSection, c as Mulberry32, P as PhysicsEngineTag, d as PhysicsSection, R as RoomCore, e as decodeMatterBodies, f as decodeMatterSectionEnvelope, g as decodePhysicsSection, h as decodeRapier2dSectionEnvelope, i as encodeMatterBodies, j as encodeMatterSectionEnvelope, k as encodePhysicsSection, l as encodeRapier2dSectionEnvelope, m as initMatter, n as initPhysics, o as initRapier2d, p as loadedMatter, q as loadedPhysics, r as loadedRapier2d, s as physicsSectionEngine, t as resetMatterForTests, u as resetPhysicsForTests, v as resetRapier2dForTests } from './room-Db3iPBKM.js';
 import { CollectionDesc, AnySchema, PlainState, DirtySet } from '@irtio/schema';
 import '@irtio/protocol';
 import '@irtio/server';

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   fromMigrationState,
   migrateSnapshot,
   toMigrationState
-} from "./chunk-SBDZ45JG.js";
+} from "./chunk-MTBMGUGG.js";
 import {
   CRASH_AFTER_THROWS,
   DEFAULT_TIMELINE_MAX_RECORDS,
@@ -47,7 +47,7 @@ import {
   visibleNames,
   visibleTo,
   writeHibernationBlob
-} from "./chunk-ADZZEVJU.js";
+} from "./chunk-KGZEQTJR.js";
 export {
   CRASH_AFTER_THROWS,
   DEFAULT_TIMELINE_MAX_RECORDS,

package/dist/{room-C4RZJ2KO.d.ts → room-Db3iPBKM.d.ts}

@@ -105,7 +105,7 @@ interface PhysicsApi {
      * the only thing outside the engine runtimes that sees a live body other than through
      * `bodyFor`, and it never hands out the map itself.
      */
-    eachTrackedBody(fn: (collection: string, id: string, body: unknown) => void): void;
+    eachTrackedBody(fn: (collection: string, id: string, body: unknown, instance: Record<string, unknown>) => void): void;
     /** rapier3d and rapier2d: the engine namespace. `engineKind` says which module it is. */
     readonly rapier: unknown;
     /** rapier3d and rapier2d: the live `World`. */
@@ -363,7 +363,7 @@ declare class MatterRuntime {
      * D72: every tracked body, in the order `sync()` walks them. The matter half of the same
      * read-only accessor `PhysicsRuntime` carries; see its comment for what calls it and when.
      */
-    eachTrackedBody(fn: (collection: string, id: string, body: MatterBody) => void): void;
+    eachTrackedBody(fn: (collection: string, id: string, body: MatterBody, instance: Record<string, unknown>) => void): void;
     private applyState;
     private applyRecordToBody;
     reconcile(): void;
@@ -533,7 +533,7 @@ declare class PhysicsRuntime {
      * The pose history calls this once per tick and the rewind scratch calls it per rewind; a room
      * that declares no `physics.history` never calls it at all.
      */
-    eachTrackedBody(fn: (collection: string, id: string, body: RapierRigidBody) => void): void;
+    eachTrackedBody(fn: (collection: string, id: string, body: RapierRigidBody, instance: Record<string, unknown>) => void): void;
     private applyRecordToBody;
     /**
      * Creates bodies for new instances and destroys bodies whose instance is gone. Runs once per
@@ -650,7 +650,7 @@ declare class Rapier2dRuntime {
      * D72: every tracked body, in the order `sync()` walks them (collection order, then instance
      * order). The rapier2d third of the same read-only accessor the other two runtimes carry.
      */
-    eachTrackedBody(fn: (collection: string, id: string, body: Rapier2dRigidBody) => void): void;
+    eachTrackedBody(fn: (collection: string, id: string, body: Rapier2dRigidBody, instance: Record<string, unknown>) => void): void;
     private applyRecordToBody;
     /**
      * Creates bodies for new instances and destroys bodies whose instance is gone. Runs once per

package/dist/test/index.d.ts

@@ -1,5 +1,5 @@
-import { R as RoomCore } from '../room-C4RZJ2KO.js';
-export { m as initMatter, n as initPhysics, o as initRapier2d } from '../room-C4RZJ2KO.js';
+import { R as RoomCore } from '../room-Db3iPBKM.js';
+export { m as initMatter, n as initPhysics, o as initRapier2d } from '../room-Db3iPBKM.js';
 import { ErrorCodeName, FrameType } from '@irtio/protocol';
 import { NpcConfig, LeaveReason, Room, RoomDefinition } from '@irtio/server';
 import { i as RoomHost, L as LogLevel, R as RoomCoreApi, b as HostCall, c as HostCallResult, k as RoomStats } from '../contract-C5aqs49-.js';

package/dist/test/index.js

@@ -5,7 +5,7 @@ import {
   initPhysics,
   initRapier2d,
   visibleNames
-} from "../chunk-ADZZEVJU.js";
+} from "../chunk-KGZEQTJR.js";
 
 // src/test/clock.ts
 var FakeClock = class {

package/dist/worker/index.js

@@ -1,6 +1,6 @@
 import {
   migrateSnapshot
-} from "../chunk-SBDZ45JG.js";
+} from "../chunk-MTBMGUGG.js";
 import {
   RoomCore,
   RoomFullError,
@@ -9,7 +9,7 @@ import {
   initRapier2d,
   onFirstRapierStep,
   rapierHasStepped
-} from "../chunk-ADZZEVJU.js";
+} from "../chunk-KGZEQTJR.js";
 
 // src/worker/index.ts
 import { getHeapStatistics } from "v8";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@irtio/runtime",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "irtio room runtime: RoomCore, worker_threads host, in-process test harness",
   "license": "MIT",
   "publishConfig": {
@@ -31,9 +31,9 @@
     "@dimforge/rapier2d-compat": "0.20.0",
     "@dimforge/rapier3d-compat": "0.20.0",
     "matter-js": "0.20.0",
-    "@irtio/schema": "0.9.0",
-    "@irtio/server": "0.9.0",
-    "@irtio/protocol": "0.9.0"
+    "@irtio/protocol": "0.10.0",
+    "@irtio/schema": "0.10.0",
+    "@irtio/server": "0.10.0"
   },
   "devDependencies": {
     "@types/matter-js": "0.20.2"