@homie-rocks/studio 0.58.8 → 0.58.11

package/worker/routes.mjs

@@ -1,3 +1,4 @@
+import {drainStatus} from './move-drain.mjs';
 import {lobbyFor} from './lobby-shards.mjs';
 /** Route dispatch; large interfaces and tool runtimes load at their own entry points. */
 import {customRoute} from './custom-routes.mjs';
@@ -19,6 +20,7 @@ import { isLoungePath, loungeRoutes } from './lounge.mjs';
 import { doorPage, serverPage, serversPage } from './site.mjs';
 import { isLocalOrigin, qrSvg } from './qr.mjs';
 import { gateFor } from './gate-routing.mjs';
+import { isReadOnly } from './read-only.mjs';
 
 import { SITE_JS, atomFeed, creditsPage, customPage, gameCover, gameLanding, gamesPage, homeLd, homePage, jsonFeed, landingLd, mediaIndexPage, notFoundPage, postPage, postsPage, roomsPage, sectionsOf, songPage, videoPage, watchOf } from './site.mjs';
 import { cookieValues, countVisit, onlyOf, ownerAllowed, playedByGame, playedThisWeek, rangeOf, readStats } from './stats.mjs';
@@ -32,6 +34,8 @@ import { ldScript, studioNode } from './schema.mjs';
 import { licenseOf } from './license.mjs';
 import { isPartsPath, partsRoutes, withPartsBand } from './parts.mjs';
 import { GAME_ID, POST_SLUG, BROWSER_KEY, json, sellingShop, availableShellShop, postsOf, directoryOf, claimOf, named, roomsOf, MEDIA_SLUG, assetWithRange, mediaObject, ASSET_CACHE, heldInR2, mediaRow, chatWho, reportAllowed, notAHomie, gameDocument, gameAsset, shareDaily, mediaBeat, studioTools, serverLive, weekOf, fallback } from './runtime-support.mjs';
+/** Rooms whose admission row (move-drain.mjs) this isolate already wrote. */
+const REGISTERED_ROOMS = new Set();
 export default async function route(request, env, ctx) {
   const url = new URL(request.url);
   const path = url.pathname;
@@ -156,9 +160,11 @@ export default async function route(request, env, ctx) {
       ...(shopOf(cat)?.open ? { shop: { open: true, till: shopOf(cat).till, currency: shopOf(cat).currency, page: `${url.origin}/shop/` } } : {}),
     }, 200, { 'access-control-allow-origin': '*' });
   }
+  if (path === '/api/move-status' && read) return json(await drainStatus(env,await getAll()),200,{'cache-control':'no-store'});
   if (path === '/api/games') {
     const cat = await getCat();
-    return json({ studio: cat.studio, games: (cat.games ?? []).map(g => g.room?.host === 'server' && !hostedGame(g.id) ? { ...g, rulesError: RULES_WIRING_MESSAGE } : g), live: (await roomsOf(env, cat.games ?? [])).live });
+    // readOnly: the owner's switch (worker/read-only.mjs), here so a tool can check it without sending a write.
+    return json({ studio: cat.studio, readOnly: isReadOnly(env), games: (cat.games ?? []).map(g => g.room?.host === 'server' && !hostedGame(g.id) ? { ...g, rulesError: RULES_WIRING_MESSAGE } : g), live: (await roomsOf(env, cat.games ?? [])).live });
   }
   if (path === '/api/rooms') {
     if(!read)return json({ok:false,error:'method'},405);
@@ -639,6 +645,11 @@ export default async function route(request, env, ctx) {
       // one; none on a kids server, none for an AI or a watcher.
       const pid = !ag && !w && sub === '__net' ? parts.find((x) => x.startsWith('p-'))?.slice(2) : null;
       const badge = pid ? await roomBadge(env, cat, pid, { kids: pol.kids }) : null;
+      // Keep an admission registry independent of expiring lobby reports. A later move
+      // must inspect even a quiet named room and its durable outboxes.
+      // Once per room in this isolate: the row is idempotent, so later sockets to the same room cost no D1 write.
+      const roomKey='move-room:'+game+':'+room;
+      if(env.DB&&!isReadOnly(env)&&!REGISTERED_ROOMS.has(roomKey)){await env.DB.prepare("INSERT OR IGNORE INTO meta(key,value) VALUES(?1,'1')").bind(roomKey).run();REGISTERED_ROOMS.add(roomKey);}
       const stub = sub === '__net' ? gateFor(env, game, room, max, b) : env.TABLE.get(env.TABLE.idFromName(`${game}/${room}`));
       // Revision 9 (NETPLAY.md sections 22 and 23): the build that is live now (`cur`, always said, empty when the game
       // names none), the build this socket's page was served with (`gv`, from the socket's own address), and the game's

package/worker/stream-objects.mjs

@@ -1,6 +1,7 @@
+import {readOnlyEnv} from './read-only.mjs';
 /** Streams use independent namespaces so subscribers never warm matchmaking state. */
 export class AppRecordHub {
-  constructor(ctx, env) { this.ctx=ctx; this.env=env; }
+  constructor(ctx, env) { this.ctx=ctx; this.env=readOnlyEnv(env); }
   async records(){const {AppRecordStreams}=await import('./app-streams.mjs');return this.streams??=new AppRecordStreams(this.env,this.ctx);}
   async fetch(request) {
     const streams=await this.records();
@@ -17,7 +18,7 @@ export class AppRecordHub {
   async webSocketError(socket){return (await this.records()).closeSocket(socket);}
 }
 export class EventHub {
-  constructor(ctx, env) { this.ctx=ctx; this.env=env; }
+  constructor(ctx, env) { this.ctx=ctx; this.env=readOnlyEnv(env); }
   async fetch(request) {
     const {EventStreams}=await import('./event-resources.mjs');
     this.streams??=new EventStreams(this.env,this.ctx);

package/worker/table.mjs

@@ -22,6 +22,7 @@ import {holders,regateArgs,verifyControl} from './office.mjs';
 
 import {json} from './responses.mjs';
 import {catalogue} from './catalogue.mjs';
+import {readOnlyEnv} from './read-only.mjs';
 
 import {ROOM_ALARM_MS,ROOM_PAUSE_MS,roomEndAt} from './room-lifecycle.mjs';
 
@@ -29,7 +30,8 @@ export class Table {
   constructor(ctx, env) {
     this.ctx = ctx;
     this.watchSockets = new WatchSockets(ctx);
-    this.env = env;
+    // Read-only (worker/read-only.mjs): the room plays on; its D1 writes wait in its outbox or for the next report.
+    this.env = readOnlyEnv(env);
     this.room = null;
     this.timer = null;
     this.saved = null;
@@ -1087,6 +1089,13 @@ export class Table {
     }
     // The back office (worker/office.mjs), from the studio's Worker only: the room as its owner sees it, and the
     // owner's signed controls, which this room verifies before it applies one (NETPLAY.md section 15).
+    if (url.pathname === '/__move-status') {
+      await this.flushRoundRecords();await this.flushFunctionEvents();
+      const sql=this.ctx.storage.sql;
+      let pending=0;
+      for(const name of ['round_outbox','function_outbox'])if(sql?.exec("SELECT name FROM sqlite_master WHERE name=?",name).toArray().length)pending+=Number(sql.exec('SELECT COUNT(*) AS n FROM '+name).toArray()[0].n);
+      return json({clients:room.live().length,pending});
+    }
     if (url.pathname === '/__facts') return json({ ...room.officeFacts(), gates: [...(this.gateMetrics?.values() ?? [])], durability: this.storageHealth ?? { ok: true }, ...(this.house ? { brains: this.house.facts() } : {}) });
     // A chat line as the room keeps it (section 19), for a report: the Worker files the room's own copy, never a reporter's.
     if (url.pathname === '/__chat') {

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.58.8';
+export const STUDIO_VERSION_TAG = '0.58.11';