@homie-rocks/studio 0.47.0 → 0.48.1

package/worker/hosted.mjs

@@ -19,6 +19,7 @@ import { compileMap, compileRules } from '../rules/rules.ts';
 /** game id → { rules, tune, map, settings, seats, build } as the build wrote it, and what compiling each gave. */
 const games = new Map();
 const compiled = new Map();
+const readiness = new WeakMap();
 
 /** The table of this studio's server-hosted games (the build's site/src/rules/index.mjs). Called once, at load. */
 export function hostRules(table) {
@@ -33,6 +34,21 @@ export function hostRules(table) {
 export const hostedGame = (id) => games.has(id);
 export const hostedBuild = (id) => games.get(id);
 
+/** Optional engines load at room start. Ordinary games keep their synchronous startup path. */
+export function prepareHost(id) {
+  const entry = games.get(id);
+  if (!entry?.initialize) return;
+  const previous = readiness.get(entry);
+  if (previous === true) return;
+  if (previous) return previous;
+  const pending = Promise.resolve().then(() => entry.initialize()).then(
+    () => { readiness.set(entry, true); },
+    error => { readiness.delete(entry); throw error; },
+  );
+  readiness.set(entry, pending);
+  return pending;
+}
+
 /** A game's rules, compiled once per isolate. Throws, naming the declaration, when they do not fit the contract. */
 export function compiledFor(id) {
   if (compiled.has(id)) return compiled.get(id);

package/worker/index.mjs

@@ -89,7 +89,7 @@ import { appRole, openPath } from './app-format.mjs';
  */
 import { playerEnabled, EMBED_GAME_JS } from './embed.mjs';
 import { NetRoom, WATCH_POLICIES, departure, errorLine, versionOf } from './room.mjs';
-import { hostedGame, hostedBuild, compiledFor, startHost } from './hosted.mjs';
+import { hostedGame, hostedBuild, compiledFor, prepareHost, startHost } from './hosted.mjs';
 import { roomStore, restoreDelay, LOOSE_SAVE } from './room-store.mjs';
 import { appCors, isAppOrigin } from './standalone.mjs';
 import { ROOM_ID, badRoomPage, embedAncestors, embedPreview, frameAncestors, noWatchPage, playPage, shellKey, shellStandIn, watchPage } from './pages.mjs';
@@ -1592,13 +1592,13 @@ export class Table {
     this.say({ ev: 'persist-failed', build: hostedBuild(this.game)?.build, error: this.storageHealth.message });
   }
 
-  readRoom(validateHost = false) {
+  readRoom(validateHost = false, alreadyRead) {
     if (this.skipSave) { this.skipSave = false; return null; }
     try {
       const boot = this.durable?.boots();
       this.persistentStored = boot?.persistent === true;
       if (boot?.retired === true) { this.clearRoom(); return null; }
-      const saved = this.durable?.read();
+      const saved = alreadyRead ?? this.durable?.read();
       if (!saved) return null;
       if (saved.v !== 1 || typeof saved.game !== 'string' || typeof saved.room !== 'string' ||
           this.game && saved.game !== this.game || this.code && saved.room !== this.code ||
@@ -1759,7 +1759,18 @@ export class Table {
     if (!room || !this.hostRt) {
       if (this.ctx.storage.sql?.exec("SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'save'").toArray().length) {
         this.durable ??= this.openStore(false);
-        const saved = this.cleanupPending ? null : this.readRoom(true);
+        let saved = this.cleanupPending ? null : this.readRoom();
+        if (saved) {
+          const generation = this.cleanupGeneration;
+          const preparing = prepareHost(saved.game);
+          if (preparing) {
+            await preparing;
+            // A join or office action can arrive while the optional engine loads.
+            // Re-read that lifecycle instead of writing the pre-await checkpoint.
+            if (this.room !== room || this.hostRt || this.cleanupGeneration !== generation) return this.runRoomAlarm();
+          }
+          saved = this.readRoom(true, saved);
+        }
         if (saved) {
           this.game = saved.game; this.code = saved.room;
           if (this.isPersistent()) return;
@@ -2167,6 +2178,8 @@ export class Table {
     if (url.pathname === '/__recall') {
       const { account } = await request.json();
       return this.withCharacter(account, async () => {
+        const preparing = prepareHost(game);
+        if (preparing) await preparing;
         this.ensureHost(room, true);
         if (!this.hostRt || this.persistentFailed || room.hostFailed) return json({ ok: false }, 503);
         await this.flushCharacters();
@@ -2232,6 +2245,8 @@ export class Table {
     const said = url.searchParams.has('cur');
     if (said) { room.setStall(url.searchParams.get('stall')); room.setCurrent(url.searchParams.get('cur') || null); }
     // Restore before applying the Worker's current policy: a save must not replace a newer policy.
+    const preparing = prepareHost(game);
+    if (preparing) await preparing;
     this.ensureHost(room, url.searchParams.get('host') === 'server');
     // The room's policy (section 17), composed by the Worker for every socket: a newer one than the room's applies.
     const pol = decodeFacts(url.searchParams.get('pol'));

package/worker/version.mjs

@@ -1,2 +1,2 @@
 /** The @homie-rocks/studio version this Worker code is (package.json's; a test keeps them equal). Cache-busts /_homie/site.js. */
-export const STUDIO_VERSION_TAG = '0.47.0';
+export const STUDIO_VERSION_TAG = '0.48.1';