@homie-rocks/studio 0.45.2 → 0.45.3

package/worker/room.mjs

@@ -484,15 +484,16 @@ export class NetRoom {
 
   hasViewSchedule() {
     const view = this.server?.viewSettings;
-    return this.server?.viewRadiusM != null || Boolean(view?.precisionM > 0 || view?.nearM != null && view?.farHz != null);
+    return this.server?.privateDelivery || this.server?.viewRadiusM != null || Boolean(view?.precisionM > 0 || view?.nearM != null && view?.farHz != null);
   }
 
   /** The same per-player delivery role will run in Gates. Keyframes belong to sockets, not saved seats. */
   playerSnapshot(client, snap, welcome = false) {
     if (!snap || !this.hasViewSchedule()) return snap;
     client.viewSchedule ??= scheduledView(this.server.viewSettings ?? { radiusM: this.server.viewRadiusM }, this.tickHz);
-    const selected = client.viewSchedule(snap, client.seat);
-    client.snapEncoder ??= snapshotEncoder(this.tickHz, true);
+    let selected = client.viewSchedule(snap, client.seat);
+    if(this.server?.projectSnapshot) selected=this.server.projectSnapshot(selected,client.seat);
+    client.snapEncoder ??= snapshotEncoder(this.tickHz, !this.server?.privateDelivery);
     if (welcome) client.snapEncoder.reset();
     return client.snapEncoder.encode(selected, client.seat);
   }
@@ -918,11 +919,19 @@ export class NetRoom {
         this.onChat({ client: c }, m);
         return;
       }
+      case 'probeAck': {
+        if (c.probe && m.n === c.probe.n) {
+          const ms = now - c.probe.at; c.probe = null;
+          if(ms>=0 && ms<=10000){ c.measuredRtt=Math.min(c.measuredRtt??Infinity,ms); if(c.seat!==null)this.toServer({t:'latency',seat:c.seat,ms:c.measuredRtt}); }
+        }
+        return;
+      }
       case 'ping': {
         if (this.rules && c.rules && Number.isFinite(m.readySpeed)) { c.readySpeed = Math.max(0, Math.min(1, m.readySpeed)); c.readyAt = now; }
         const wasHidden = c.hidden;
         c.hidden = m.hid === true;
         this.send(c, { t: 'pong', c: m.c, st: now });
+        if(this.server && (!c.probe || now-c.probe.at>10000)){c.probe={n:crypto.randomUUID(),at:now};this.send(c,{t:'probe',n:c.probe.n});}
         // A host whose tab went to the background will stop ticking: hand the round on now.
         if (c.id === this.hostId && c.hidden && !wasHidden) this.yieldHost(c, 'host-hidden');
         return;

package/worker/saves-shell.mjs

@@ -98,11 +98,15 @@ export const SAVES_SHELL_JS = `${PASSKEY_JS}
           if (late) loaded.then(function () { tell('player', { player: me(), cache: snapshot(), same: true }); });
         });
       }
-      if (op === 'get') return loaded.then(function () { reply({ ok: true, value: valueOf(String(m.key)), version: versionOf(String(m.key)) }); });
+      if (op === 'get') return loaded.then(function () {
+        var key=String(m.key);if(key.indexOf('server:')===0&&KEY.test(key))return api('GET','/api/player/saves/'+GAME+'/'+encodeURIComponent(key)).then(function(r){if(r.ok){S.cache[key]={v:r.value,ver:r.version,at:r.updatedAt};persist();}reply(r);},function(){reply({ok:false,error:'offline',value:valueOf(key)});});
+        reply({ ok: true, value: valueOf(key), version: versionOf(key) });
+      });
       if (op === 'list') return loaded.then(function () { var keys = {}; Object.keys(S.cache).forEach(function (k) { keys[k] = 1; }); Object.keys(S.pending).forEach(function (k) { keys[k] = 1; });
         reply({ ok: true, keys: Object.keys(keys).filter(function (k) { return valueOf(k) !== null; }).sort().map(function (k) { var c = S.cache[k]; return { key: k, version: c ? c.ver : 0, updatedAt: c ? c.at : null, pending: !!S.pending[k] }; }) }); });
       if (op === 'set' || op === 'del') {
         var key = String(m.key || '');
+        if(key.indexOf('server:')===0)return reply({ok:false,error:'authority',message:'This record is written by the game server'});
         if (!KEY.test(key)) return reply({ ok: false, error: 'key', message: 'a save key is 1 to 64 letters, digits, _ . : or -' });
         if (op === 'set') {
           var text; try { text = JSON.stringify(m.value); } catch (e) { return reply({ ok: false, error: 'value', message: 'a save is JSON' }); }

package/worker/saves.mjs

@@ -85,6 +85,7 @@ export async function writeSaves(env, player, game, { set = [], del = [] } = {})
   const at = Date.now();
   for (const item of items) {
     const key = String(item?.key ?? '');
+    if(key.startsWith('server:')){results.push({key,ok:false,error:'authority',message:'This record is written by the game server'});continue;}
     if (!SAVE_KEY.test(key)) { results.push({ key, ok: false, error: 'key', message: 'a save key is 1 to 64 letters, digits, _ . : or -' }); continue; }
     const base = item.base === undefined || item.base === null ? null : Math.floor(Number(item.base));
     if (base !== null && !(base >= 0)) { results.push({ key, ok: false, error: 'base', message: 'base is the version the change was made from (0 when the key is new)' }); continue; }
@@ -148,7 +149,7 @@ export async function writeSaves(env, player, game, { set = [], del = [] } = {})
 export function wipeStatements(env, player, game, keep = []) {
   const kept = (Array.isArray(keep) ? keep : []).filter((k) => SAVE_KEY.test(String(k))).slice(0, SAVE_LIMITS.keys);
   const marks = kept.map((_, i) => `?${i + 3}`).join(', ');
-  return env.DB.prepare(`DELETE FROM saves WHERE player = ?1 AND game = ?2${kept.length ? ` AND key NOT IN (${marks})` : ''} RETURNING key, value, blob`).bind(player, game, ...kept);
+  return env.DB.prepare(`DELETE FROM saves WHERE player = ?1 AND game = ?2 AND key NOT LIKE 'server:%'${kept.length ? ` AND key NOT IN (${marks})` : ''} RETURNING key, value, blob`).bind(player, game, ...kept);
 }
 
 export async function wipeSaves(env, player, game, { keep = [] } = {}) {
@@ -289,3 +290,20 @@ export async function adoptStatements(env, from, to) {
     after: () => dropBlobs(env, clash.map(blobKey)),
   };
 }
+
+/** Server-only, idempotent bounded round receipts. Optimistic versions also
+ * serialize simultaneous rooms without dropping either room's result. */
+export async function appendServerRecord(env,player,game,key,record){
+ if(!key.startsWith('server:')||!SAVE_KEY.test(key)||typeof record.id!=='string')throw new Error('invalid server record');
+ for(let attempt=0;attempt<16;attempt++){
+  const old=await getSave(env,player,game,key),matches=Array.isArray(old.value?.matches)?old.value.matches:[];
+  if(matches.some(r=>r.id===record.id))return;
+  const kept=[record,...matches].sort((a,b)=>b.endedAt-a.endedAt||a.id.localeCompare(b.id)).slice(0,100);
+  let value=JSON.stringify({v:1,matches:kept}),bytes=bytesOf(value);
+  while(bytes>SAVE_LIMITS.valueBytes&&kept.length>1){kept.pop();value=JSON.stringify({v:1,matches:kept});bytes=bytesOf(value);}
+  if(bytes>SAVE_LIMITS.valueBytes)throw new Error('server record size');
+  const result=old.version?await env.DB.prepare('UPDATE saves SET value=?4,bytes=?5,version=version+1,updated_at=?6 WHERE player=?1 AND game=?2 AND key=?3 AND version=?7 RETURNING version').bind(player,game,key,value,bytes,Date.now(),old.version).first():await env.DB.prepare('INSERT INTO saves(player,game,key,value,bytes,version,updated_at,blob) VALUES(?1,?2,?3,?4,?5,1,?6,0) ON CONFLICT(player,game,key) DO NOTHING RETURNING version').bind(player,game,key,value,bytes,Date.now()).first();
+  if(result)return;
+ }
+ throw new Error('server record conflict; retry the durable outbox');
+}

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