@volter/world-console 3.0.12 → 3.0.14

package/client/console.tsx

@@ -1761,17 +1761,20 @@ function Compare({ name, token, frame, onClose, reads }: { name: string; token:
   const [made, setMade] = useState<string | null>(null);
   // the copies this panel made, kept out of the choices after they are gone (the list is read again only every so often)
   const mine = useRef(new Set<string>());
-  const branches = useDoor<{ branches: Array<{ name: string; origin?: string; at: { instant?: string; label?: string; live?: boolean } | null; expiresAt: string | null }> }>(token, `/-/${name}/branches`, reads);
+  const branches = useDoor<{ branches: Array<{ name: string; origin?: string; sites?: string; at: { instant?: string; label?: string; live?: boolean } | null; expiresAt: string | null }> }>(token, `/-/${name}/branches`, reads);
   const choices = branches.state === 'ok' ? branches.data.branches.filter((b) => b.name !== made && !mine.current.has(b.name)) : [];
   // its changes, read for this comparison alone
   const listed = useDoor<{ total: number; acts: BoardAct[] }>(token, `/-/${name}/board/changes?frame=${encodeURIComponent(frameKey(frame))}`, reads);
   // a branch's page beside this World's: a site at the branch's own site address, a vendor's page on the branch's own
   // content plane through this World's branch door (a one-time read pass), never running on this World's origin
-  const pageOf = async (branch: string, origin: URL | null, isClosed: () => boolean): Promise<{ url: string } | { why: string }> => {
+  const pageOf = async (branch: string, sites: string | null, isClosed: () => boolean): Promise<{ url: string } | { why: string }> => {
     const shown = frame.at!;
     if ('site' in shown) {
-      if (!origin) return { why: 'This World shows sites only at its own local address.' };
-      const u = new URL(frame.url); return { url: `${origin.protocol}//${u.hostname}.${origin.host}${u.pathname}${u.search}` };
+      // the branch's site at its address, where it nests under the branch on this machine; a hosted World's sites are
+      // private to its people and open through the World's own address
+      const u = new URL(frame.url);
+      const nested = sites && /^https?:\/\/\{host\}\./.test(sites) ? sites.replace('{host}', u.hostname.toLowerCase()) : null;
+      return nested ? { url: `${nested}${u.pathname}${u.search}` } : { why: "This World shows its branches' sites only on this machine." };
     }
     const beside = `${WORLDS}/-/${name}/branches/${branch}/pages?${new URLSearchParams({ land: `/${branch}/${frame.vendor}${shown.screen}` }).toString()}`;
     // the door answers a navigation with the branch's address; a host that shows no content plane says so instead
@@ -1787,7 +1790,7 @@ function Compare({ name, token, frame, onClose, reads }: { name: string; token:
       setBefore({ state: 'opening' });
       const row = branches.state === 'ok' ? branches.data.branches.find((b) => b.name === base) : undefined;
       // a moment's wait, so passing over a branch on the way to another opens nothing
-      const wait = setTimeout(() => void pageOf(base, httpOrigin(row?.origin), () => closed).then((r) => { if (!closed) setBefore('url' in r ? { state: 'ok', url: r.url } : { state: 'none', why: r.why }); }), 300);
+      const wait = setTimeout(() => void pageOf(base, row?.sites ?? null, () => closed).then((r) => { if (!closed) setBefore('url' in r ? { state: 'ok', url: r.url } : { state: 'none', why: r.why }); }), 300);
       return () => { closed = true; clearTimeout(wait); };
     }
     if (!frame.since) { setBefore({ state: 'none', why: 'Nothing here has changed since the World was last cut.' }); return; }
@@ -1798,10 +1801,10 @@ function Compare({ name, token, frame, onClose, reads }: { name: string; token:
     const wait = setTimeout(() => void (async () => {
       const r = await door(token, `/-/${name}/branches`, { method: 'POST', body: JSON.stringify({ at: { instant: at }, ttl: 3600 }), signal: AbortSignal.timeout(60000) }).catch(() => null);
       if (!r?.ok) { setBefore({ state: 'none', why: `The World made no copy of itself as it was then${r ? `: ${await failure(r)}` : ''}.` }); return; }
-      const b = (await r.json()) as { name: string; origin?: string };
+      const b = (await r.json()) as { name: string; origin?: string; sites?: string };
       copy = b.name; setMade(b.name); mine.current.add(b.name);
       if (closed) { void door(token, `/-/${name}/branches/${b.name}`, { method: 'DELETE' }).catch(() => null); return; }
-      const page = await pageOf(b.name, httpOrigin(b.origin), () => closed);
+      const page = await pageOf(b.name, b.sites ?? null, () => closed);
       if (!closed) setBefore('url' in page ? { state: 'ok', url: page.url, at } : { state: 'none', why: page.why });
     })(), 500);
     // the copy goes with the comparison, and with the page: a reload or a closed tab runs no cleanup of its own