@homie-rocks/studio 0.55.0 → 0.56.0

package/worker/room.mjs

@@ -53,6 +53,10 @@ export class NetRoom {
     this.agentsOut = null;
     /** Revision 7: the game's agents.json (the Table reads it once), the only words an AI here may say. */
     this.vocab = null;
+    this.rawVocab = null;
+    this.officeDirty = false;
+    this.endedMatch = null;
+    this.snapAt = new Map();
     this.code = code;
     this.rules = rules === true;
     this.tickHz = tickHz;
@@ -401,7 +405,7 @@ export class NetRoom {
   /* ------------------------------------------------------------ sockets */
 
   /** A new relay socket. Returns the two callbacks the transport must call. */
-  attach(conn) {
+  attach(conn, resume = null) {
     const now = this.now();
     const c = {
       id: randomId(6), conn, ip: conn.ip ?? null, browser: conn.browser ?? null, player: conn.player ?? null, via: conn.via ?? null, helloed: false, seat: null, token: null, name: '', typed: '', colour: 0,
@@ -422,6 +426,7 @@ export class NetRoom {
       // address, so a helper from before revisions carries it too) when the transport gives one, else the hello's.
       verWord: 'ver' in conn ? versionOf(conn.ver) : undefined, ver: null, feat: [], staleTold: false,
     };
+    if(resume)Object.assign(c,resume,{conn});
     this.clients.set(c.id, c);
     return {
       id: c.id,
@@ -451,18 +456,19 @@ export class NetRoom {
    * The shell's watch socket: the room's facts, and (revision 6) the party's vote from the play page's card. A vote
    * from it counts as the seat of the client in this room with the same browser key (`conn.browser`).
    */
-  watch(conn) {
+  watch(conn, restored = null) {
     this.watchers.add(conn);
-    this.sendText(conn, JSON.stringify(this.facts()));
+    if (!restored) this.sendText(conn, JSON.stringify(this.facts()));
     // A shell that comes back to a room it was kicked from (or that is closed) hears so at once.
     const held = this.heldNotice(conn);
-    if (held) this.sendText(conn, JSON.stringify(held));
+    if (!restored && held) this.sendText(conn, JSON.stringify(held));
     // Room chat (section 19): the last few minutes, so a page that just opened has the conversation (never to a page the
     // studio holds out of the room, or a room it closed).
     // A line of this browser's or this account's own says so (`mine`), on this page's copy only: it may take it down.
-    if ((!held || held.t === 'muted') && (!conn.hub || this.chatRules().hub)) this.sendText(conn, JSON.stringify({ t: 'lines', lines: this.recentChat().map((r) => (this.ownLine(r, conn) ? { ...this.wireLine(r), mine: true } : this.wireLine(r))) }));
-    const rate = [];
+    if (!restored && (!held || held.t === 'muted') && (!conn.hub || this.chatRules().hub)) this.sendText(conn, JSON.stringify({ t: 'lines', lines: this.recentChat().map((r) => (this.ownLine(r, conn) ? { ...this.wireLine(r), mine: true } : this.wireLine(r))) }));
+    const rate = restored?.rate ?? [];
     return {
+      state: {rate},
       onClose: () => this.watchers.delete(conn),
       onMessage: (text) => {
         const now = this.now();
@@ -974,7 +980,7 @@ export class NetRoom {
     const behind = !lite && this.currentVer !== undefined && c.ver !== this.currentVer;
     if (behind) c.staleTold = true;
     this.send(c, {
-      t: 'welcome', v: NET_VERSION, rev: NET_REVISION, id: c.id, room: this.code, seat: c.seat, token: c.token, name: c.name, colour: c.colour,
+      t: 'welcome', v: NET_VERSION, rev: NET_REVISION, ...(c.conn.idlePing ? {idlePing:true} : {}), id: c.id, room: this.code, seat: c.seat, token: c.token, name: c.name, colour: c.colour,
       ...(this.gameVer ? { ver: this.gameVer } : {}), ...(behind ? { stale: { ver: this.currentVer } } : {}), stall: this.stallMs,
       role, why, host: this.hostRef(), peers: this.peers(), ...(this.rules ? { held: this.heldPeers() } : {}), st: now, max: this.maxPlayers,
       round: this.lastRound, roster: this.lastRoster, snap: lite ? null : this.playerSnapshot(c, this.lastSnap, true), state: lite ? {} : this.stateObject(),
@@ -1345,18 +1351,19 @@ export class NetRoom {
   }
 
   /** Call every ~250 ms (setInterval locally, an alarm or the socket traffic on a Durable Object). */
-  tick() {
+  tick(idle = false) {
     const now = this.now();
     // Sockets that never said hello, or went silent (a slept phone, a half-open link): close them, and a seat
     // becomes a bot instead of a frozen body.
     for (const c of [...this.clients.values()]) {
+      c.lastSeen=Math.max(c.lastSeen,c.conn.lastPing?.()??0);
       if (!c.helloed) { if (now - c.joinedAt > 5000) { this.clients.delete(c.id); try { c.conn.close(4000, 'no-hello'); } catch { /* gone */ } } continue; }
       // A loopback (the Table's own house agent) cannot be half-open: it is never closed for silence.
       if (now - c.lastSeen > this.idleMs && !c.conn.loopback) this.kick(c, 'silent', 4000);
     }
     // A host that stopped sending snapshots while others are present.
     const h = this.host();
-    if (h && this.live().length > 1) {
+    if (!idle && h && this.live().length > 1) {
       const since = Math.max(h.lastSnapAt, this.hostSince, this.lastJoinAt);
       if (now - since > this.stallMs) {
         const next = this.elect(h.id, 'host-stalled');

package/worker/route-auth.mjs

@@ -0,0 +1,22 @@
+import {launchOf, settingsOf, accessOf, sameOrigin} from './office.mjs';
+import {catalogue} from './catalogue.mjs';
+/** Uses the same live session/account checks as the studio office. */
+export async function isOwner(request, env) {
+  return (await import('./office.mjs')).isOwner(request, env);
+}
+/** Checks an app's declared role with its existing link, session and grant rules. */
+export async function hasRole(request, env, app, role) {
+  const url = new URL(request.url);
+  const cat = await catalogue(env, url.origin);
+  const meta = cat.games?.find(item => item.id === app && item.kind === 'app');
+  if (!meta || typeof role !== 'string' || !Object.hasOwn(meta.roles ?? {}, role)) return false;
+  const launch = launchOf(meta, await settingsOf(env, {fresh:true}), env);
+  if (launch !== 'public' && !(await accessOf(request, env, app, launch)).ok) return false;
+  url.searchParams.set('role', role);
+  return (await (await import('./app-records.mjs')).appAccess(request, env, meta, url)).ok === true;
+}
+
+/** Return a refusal response, or null when the browser supplied same-origin evidence. */
+export function requireSameOrigin(request) {
+  return sameOrigin(request, new URL(request.url)) ? null : new Response('Same origin required', {status:403});
+}

package/worker/routes.mjs

@@ -1,4 +1,6 @@
+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';
 import { catalogue } from './catalogue.mjs';
 
 import { RULES_WIRING_MESSAGE } from './rules-wiring.mjs';
@@ -40,6 +42,7 @@ export default async function route(request, env, ctx) {
   let pubP = null;
   // Every game (for a game's own pages and the owner's), and the public ones (every list, the rooms, the manifest).
   const getAll = () => (catP ??= catalogue(env, url.origin).then((cat) => named(cat, env)));
+  const customFallback = async () => (await customRoute(request, env, ctx)) ?? fallback(request, env, url, getCat);
   const getCat = () => (pubP ??= Promise.all([getAll(), settingsOf(env)]).then(([cat, settings]) => publicCatalogue(cat, settings, env)));
 
   // Keep tool transports and discovery on the alias; redirect browser pages only.
@@ -281,7 +284,7 @@ export default async function route(request, env, ctx) {
   if (game && GAME_ID.test(game)) {
     const all = await getAll();
     const meta = (all.games ?? []).find((g) => g.id === game);
-    if (!meta) return fallback(request, env, url, getCat);
+    if (!meta) return customFallback();
     if (parts.length === 1 && !path.endsWith('/')) return Response.redirect(`${url.origin}/${game}/`, 301);
     let sub = parts.slice(1).join('/');
     // Game bundles were already public assets; only the document carries access context.
@@ -338,7 +341,7 @@ export default async function route(request, env, ctx) {
         if(!meta.room)return appRoleSession((await import('./records-page.mjs')).recordsPage(meta,url,cat,await availableShellShop(env,cat,game),Boolean(await (await import('./local-test.mjs')).localSession(request,env)),launch!=='public'?await appAssetTicket(env,game,undefined,{request,meta,launch}):null),request,env,meta,launch);
       }
     }
-    const lobby = () => env.LOBBY.get(env.LOBBY.idFromName(game));
+    const lobby = () => lobbyFor(env,game,/^[A-Za-z0-9_-]{16,43}$/.test(url.searchParams.get('b')??'')?url.searchParams.get('b'):'');
     if (sub === 'invite') return redeemInvite(request, env, url, cat, meta, settings);
 
     // SERVERS (worker/servers.mjs, NETPLAY.md section 17): which server a request is for — its path (/s/<id>/), its
@@ -629,7 +632,7 @@ export default async function route(request, env, ctx) {
       const cur = versionOf(meta?.netplay?.version) ?? '';
       const gv = versionOf(url.searchParams.get('gv')) ?? '';
       const stall = Number(meta?.netplay?.stallMs) || 0;
-      const target = `https://table/${sub}?game=${encodeURIComponent(game)}&room=${encodeURIComponent(room)}&max=${max}${b ? `&b=${b}` : ''}${who ? `&via=${encodeURIComponent(who)}` : ''}${sub === '__net' ? `&wp=${policy}${w ? '&w=1' : ''}` : ''}&pol=${encodeFacts(pol)}&chat=${encodeFacts(lean)}${acct ? '&acct=1' : ''}${member ? '&mem=1' : ''}${hub ? '&hub=1' : ''}${ag ? `&ag=${encodeFacts(ag)}` : ''}${badge ? `&bd=${encodeURIComponent(badge)}` : ''}&cur=${encodeURIComponent(cur)}${gv ? `&gv=${encodeURIComponent(gv)}` : ''}${stall ? `&stall=${stall}` : ''}${meta?.room?.contract ? `&rules=1&hz=${meta.room.tickHz ?? 20}` : ''}${meta?.room?.host === 'server' ? '&host=server' : ''}`;
+      const target = `https://table/${sub}?relay=1&game=${encodeURIComponent(game)}&room=${encodeURIComponent(room)}&max=${max}${b ? `&b=${b}` : ''}${who ? `&via=${encodeURIComponent(who)}` : ''}${sub === '__net' ? `&wp=${policy}${w ? '&w=1' : ''}` : ''}&pol=${encodeFacts(pol)}&chat=${encodeFacts(lean)}${acct ? '&acct=1' : ''}${member ? '&mem=1' : ''}${hub ? '&hub=1' : ''}${ag ? `&ag=${encodeFacts(ag)}` : ''}${badge ? `&bd=${encodeURIComponent(badge)}` : ''}&cur=${encodeURIComponent(cur)}${gv ? `&gv=${encodeURIComponent(gv)}` : ''}${stall ? `&stall=${stall}` : ''}${meta?.room?.contract ? `&rules=1&hz=${meta.room.tickHz ?? 20}` : ''}${meta?.room?.host === 'server' ? '&host=server' : ''}`;
       // The room's own failure to answer is told apart from the browser going away while it was connecting (a closed
       // tab, a reload racing its own socket): the second is a departure, said in one line with its room, never an
       // uncaught error with nothing on it.
@@ -663,5 +666,5 @@ export default async function route(request, env, ctx) {
     }
     if (sub.startsWith('__game/')) return gameAsset(request, env, url, game, sub.slice('__game/'.length));
   }
-  return fallback(request, env, url, getCat);
+  return customFallback();
 }

package/worker/runtime-support.mjs

@@ -1,6 +1,8 @@
+import {lobbyFor} from './lobby-shards.mjs';
 import {studioTools,directoryOf} from './tool-registry.mjs';
 export {useTools,getStudioTools} from './tool-registry.mjs';
 import {json,finish} from './responses.mjs';
+import {liveRoomSummaries} from './lobby-summary.mjs';
 /** Shared catalogue, assets, and room presentation helpers. */
 import {catalogue,builtPosts} from './catalogue.mjs';
 
@@ -138,11 +140,11 @@ async function roomsOf(env, games, { servers = null } = {}) {
   const live = {};
   // Room chat (section 19): whether each room's chat is on and may show on homie.rocks's page for it.
   const chatRows = await chatRowsOf(env);
-  const summaries=null;
+  const summaries=await liveRoomSummaries(env);
   await Promise.all(games.map(async (g) => {
     let list = [];
     if(summaries)list=summaries.get(g.id)??[];
-    else try { list = (await (await env.LOBBY.get(env.LOBBY.idFromName(g.id)).fetch('https://lobby/rooms')).json()).rooms ?? []; } catch { list = []; }
+    else try { list = (await (await lobbyFor(env,g.id).fetch('https://lobby/rooms')).json()).rooms ?? []; } catch { list = []; }
     const busy = list.filter((r) => (r.players || 0) > 0);
     live[g.id] = busy.reduce((n, r) => n + (r.players || 0), 0);
     const known = busy.some((r) => r.server && r.server !== 'public') ? (servers?.[g.id] ?? await serversOf(env, g).catch(() => [])) : [];
@@ -428,7 +430,7 @@ async function weekOf(env, game) {
   const w = await playedThisWeek(env, game);
   if (!w) return null;
   let peak = 0;
-  try { peak = (await (await env.LOBBY.get(env.LOBBY.idFromName(game)).fetch('https://lobby/now')).json()).peak?.players ?? 0; } catch { peak = 0; }
+  try { peak = (await (await lobbyFor(env,game).fetch('https://lobby/now')).json()).peak?.players ?? 0; } catch { peak = 0; }
   return { plays: w.plays, rounds: w.rounds, ...(peak ? { peak } : {}) };
 }
 

package/worker/session-codec.mjs

@@ -0,0 +1,24 @@
+/** Explicit containers keep user checkpoint keys from colliding with type tags. */
+function pack(value) {
+  if(value===undefined)return ['u'];
+  if(typeof value==='number'&&!Number.isFinite(value))return ['n',String(value)];
+  if(value===null||typeof value!=='object')return ['v',value];
+  if(value instanceof Map)return ['m',[...value].map(([key,item])=>[pack(key),pack(item)])];
+  if(value instanceof Set)return ['s',[...value].map(pack)];
+  if(Array.isArray(value))return ['a',value.map(pack)];
+  return ['o',Object.entries(value).filter(([,item])=>typeof item!=='function').map(([key,item])=>[key,pack(item)])];
+}
+function unpack([type,value]) {
+  switch(type) {
+    case 'u':return undefined;
+    case 'n':return Number(value);
+    case 'v':return value;
+    case 'm':return new Map(value.map(([key,item])=>[unpack(key),unpack(item)]));
+    case 's':return new Set(value.map(unpack));
+    case 'a':return value.map(unpack);
+    case 'o':return Object.fromEntries(value.map(([key,item])=>[key,unpack(item)]));
+    default:throw new Error('Invalid room session value');
+  }
+}
+export const encodeSession=value=>JSON.stringify(pack(value));
+export const decodeSession=value=>unpack(JSON.parse(value));

package/worker/stats.mjs

@@ -1,3 +1,4 @@
+import {lobbyFor} from './lobby-shards.mjs';
 import {writePageMetric,analyticsStatus} from './analytics.mjs';
 /**
  * STUDIO METRICS: count, don't track (@homie-rocks/studio 0.6.0).
@@ -255,7 +256,7 @@ async function playingNow(env, games) {
   const out = {};
   await Promise.all(games.map(async (g) => {
     try {
-      const res = await env.LOBBY.get(env.LOBBY.idFromName(g.id)).fetch('https://lobby/now');
+      const res = await lobbyFor(env,g.id).fetch('https://lobby/now');
       const body = await res.json();
       out[g.id] = { players: Number(body.players) || 0, rooms: Number(body.rooms) || 0 };
     } catch { out[g.id] = { players: 0, rooms: 0 }; }