@volter/world-host 3.0.12 → 3.0.14

package/dist/src/twins-host.js

@@ -17,7 +17,7 @@
 import { chmodSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { assertStateRemovable, serveHttp, stateDirName, withAncestryLock, withStateRemoval } from '@volter/world-core/runtime';
 import { dirname, join, resolve } from 'node:path';
-import { assertWorldStateRemovable, resolveCatalog, CONSOLE_BASE, consoleRedirect, initWorld, LocalBranches, loadWorldConfig, localWorldOrigin, mountWorld, pathOfWorld, worldOriginLabel, serveConsoleApart, siteOfHost, worldDoorUnderConsole, TOKEN_HEADER, worldOfHost } from '@volter/world-runtime';
+import { assertWorldStateRemovable, resolveCatalog, CONSOLE_BASE, consoleRedirect, followParentPins, initWorld, LocalBranches, loadWorldConfig, localWorldOrigin, mountWorld, pagesOfHost, pagesOriginOf, pathOfWorld, worldOriginLabel, serveConsoleApart, siteOfHost, worldDoorUnderConsole, TOKEN_HEADER, worldOfHost } from '@volter/world-runtime';
 import { issuerKeys, trustableIssuer } from '@volter/world-access';
 export { CONSOLE_BASE };
 const NAME = /^[a-z0-9][a-z0-9._-]{0,63}$/i;
@@ -115,6 +115,10 @@ export async function createWorldHost(options) {
         : (served) => (port ? localWorldOrigin(served, port) : null);
     // sites are routed only at this machine's loopback origins (the front's siteOfHost)
     const sitesOrigin = origins && !originBase ? (served) => (port ? localWorldOrigin(served, port) : null) : undefined;
+    // each World's content plane beside its origin (`<world>--<org>--pages`): its twins' pages, apart from its doors
+    const pagesOrigin = !origins ? undefined : originBase
+        ? (served) => pagesOriginOf(served, advertised?.protocol ?? 'https:', originBase, advertised?.port || undefined)
+        : (served) => (port ? pagesOriginOf(served, 'http:', 'localhost', port) : null);
     // one key reader per trusted platform, shared by every World here (each caches its platform's key set)
     // https only, or http on this machine: keys read over plain http elsewhere could be swapped, and a swapped key forges passes
     const passIssuers = (options.trust ?? []).map((origin) => {
@@ -128,8 +132,22 @@ export async function createWorldHost(options) {
     const branches = new LocalBranches({ dir, origin: () => loopback, worlds: byServed, mount: (root) => mount({ name: '', root }), ...(options.announce ? { announce: options.announce } : {}) });
     const mount = async (w) => {
         const config = loadWorldConfig(join(w.root, '.volter', 'world.json'), w.root).config;
-        return mountWorld(config.id, { root: w.root, branches: (served) => branches.doorsFor(served), ...(browserOrigin ? { browserOrigin } : {}), ...(sitesOrigin ? { sitesOrigin } : {}), ...(passIssuers.length ? { passIssuers } : {}) });
+        return mountWorld(config.id, { root: w.root, branches: (served) => branches.doorsFor(served), ...(browserOrigin ? { browserOrigin } : {}), ...(sitesOrigin ? { sitesOrigin } : {}), ...(pagesOrigin ? { pagesOrigin } : {}), ...(passIssuers.length ? { passIssuers } : {}) });
     };
+    // a branch beside its parent takes the parent's twin versions before it mounts (followParentPins), parents first: a
+    // branch of a branch follows its parent only once that parent has followed its own
+    const fromOf = new Map(found.map((w) => { try {
+        return [w.name, JSON.parse(readFileSync(join(w.root, stateDirName(), 'branch.json'), 'utf8')).from];
+    }
+    catch {
+        return [w.name, undefined];
+    } }));
+    const depth = (name, seen = new Set()) => { const up = fromOf.get(name); return up && fromOf.has(up) && !seen.has(up) ? 1 + depth(up, seen.add(name)) : 0; };
+    for (const w of [...found].sort((a, b) => depth(a.name) - depth(b.name))) {
+        const parent = found.find((p) => p.name === fromOf.get(w.name));
+        if (parent)
+            followParentPins(parent.root, w.root);
+    }
     for (const w of found)
         byServed.set(w.name, await mount(w));
     const host = options.host ?? '127.0.0.1';
@@ -281,6 +299,10 @@ export async function createWorldHost(options) {
             const site = origins && !originBase ? siteOfHost(at.hostname, byServed.keys()) : undefined;
             if (site)
                 return byServed.get(site.world).site(request, site.site);
+            // a World's content plane serves that World's twins' pages and nothing else of this host's (no console, no admin)
+            const pagesFor = origins ? pagesOfHost(at.hostname, byServed.keys(), originBase) : undefined;
+            if (pagesFor)
+                return path === '/-/ping' ? json({ ok: true, worlds: [pagesFor] }) : byServed.get(pagesFor).handle(request);
             const own = origins ? worldOfHost(at.hostname, byServed.keys(), originBase) : undefined;
             if (own === null)
                 return json({ error: `no world at ${at.host}` }, 404);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/world-host",
-  "version": "3.0.12",
+  "version": "3.0.14",
   "description": "The hosted remote: worlds under one URL, each holding the canonical history of a real vendor account and its sealed credential — what a local world clones from and pushes to.",
   "keywords": [
     "twin",
@@ -27,11 +27,11 @@
   },
   "dependencies": {
     "@volter/world-access": "3.0.1",
-    "@volter/world-core": "3.0.12",
-    "@volter/world-runtime": "3.0.12"
+    "@volter/world-core": "3.0.14",
+    "@volter/world-runtime": "3.0.14"
   },
   "peerDependencies": {
-    "@volter/world-console": "3.0.7"
+    "@volter/world-console": "3.0.9"
   },
   "peerDependenciesMeta": {
     "@volter/world-console": {
@@ -39,7 +39,7 @@
     }
   },
   "devDependencies": {
-    "@volter/world-console": "3.0.7"
+    "@volter/world-console": "3.0.9"
   },
   "exports": {
     ".": {

package/src/twins-host.ts

@@ -17,7 +17,7 @@
 import { chmodSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { assertStateRemovable, serveHttp, stateDirName, withAncestryLock, withStateRemoval } from '@volter/world-core/runtime';
 import { dirname, join, resolve } from 'node:path';
-import { assertWorldStateRemovable, resolveCatalog, CONSOLE_BASE, consoleRedirect, initWorld, LocalBranches, loadWorldConfig, localWorldOrigin, mountWorld, pathOfWorld, worldOriginLabel, serveConsoleApart, siteOfHost, worldDoorUnderConsole, TOKEN_HEADER, worldOfHost, type ConsoleMount, type MountedWorld } from '@volter/world-runtime';
+import { assertWorldStateRemovable, resolveCatalog, CONSOLE_BASE, consoleRedirect, followParentPins, initWorld, LocalBranches, loadWorldConfig, localWorldOrigin, mountWorld, pagesOfHost, pagesOriginOf, pathOfWorld, worldOriginLabel, serveConsoleApart, siteOfHost, worldDoorUnderConsole, TOKEN_HEADER, worldOfHost, type ConsoleMount, type MountedWorld } from '@volter/world-runtime';
 
 import { issuerKeys, trustableIssuer, type TrustedIssuer } from '@volter/world-access';
 
@@ -124,6 +124,10 @@ export async function createWorldHost(options: WorldHostOptions): Promise<WorldH
     : (served: string) => (port ? localWorldOrigin(served, port) : null);
   // sites are routed only at this machine's loopback origins (the front's siteOfHost)
   const sitesOrigin = origins && !originBase ? (served: string) => (port ? localWorldOrigin(served, port) : null) : undefined;
+  // each World's content plane beside its origin (`<world>--<org>--pages`): its twins' pages, apart from its doors
+  const pagesOrigin = !origins ? undefined : originBase
+    ? (served: string) => pagesOriginOf(served, advertised?.protocol ?? 'https:', originBase, advertised?.port || undefined)
+    : (served: string) => (port ? pagesOriginOf(served, 'http:', 'localhost', port) : null);
   // one key reader per trusted platform, shared by every World here (each caches its platform's key set)
   // https only, or http on this machine: keys read over plain http elsewhere could be swapped, and a swapped key forges passes
   const passIssuers: TrustedIssuer[] = (options.trust ?? []).map((origin) => {
@@ -136,8 +140,16 @@ export async function createWorldHost(options: WorldHostOptions): Promise<WorldH
   const branches: LocalBranches = new LocalBranches({ dir, origin: () => loopback, worlds: byServed, mount: (root) => mount({ name: '', root }), ...(options.announce ? { announce: options.announce } : {}) });
   const mount = async (w: { name: string; root: string }): Promise<MountedWorld> => {
     const config = loadWorldConfig(join(w.root, '.volter', 'world.json'), w.root).config;
-    return mountWorld(config.id, { root: w.root, branches: (served) => branches.doorsFor(served), ...(browserOrigin ? { browserOrigin } : {}), ...(sitesOrigin ? { sitesOrigin } : {}), ...(passIssuers.length ? { passIssuers } : {}) });
+    return mountWorld(config.id, { root: w.root, branches: (served) => branches.doorsFor(served), ...(browserOrigin ? { browserOrigin } : {}), ...(sitesOrigin ? { sitesOrigin } : {}), ...(pagesOrigin ? { pagesOrigin } : {}), ...(passIssuers.length ? { passIssuers } : {}) });
   };
+  // a branch beside its parent takes the parent's twin versions before it mounts (followParentPins), parents first: a
+  // branch of a branch follows its parent only once that parent has followed its own
+  const fromOf = new Map(found.map((w) => { try { return [w.name, (JSON.parse(readFileSync(join(w.root, stateDirName(), 'branch.json'), 'utf8')) as { from?: string }).from] as const; } catch { return [w.name, undefined] as const; } }));
+  const depth = (name: string, seen = new Set<string>()): number => { const up = fromOf.get(name); return up && fromOf.has(up) && !seen.has(up) ? 1 + depth(up, seen.add(name)) : 0; };
+  for (const w of [...found].sort((a, b) => depth(a.name) - depth(b.name))) {
+    const parent = found.find((p) => p.name === fromOf.get(w.name));
+    if (parent) followParentPins(parent.root, w.root);
+  }
   for (const w of found) byServed.set(w.name, await mount(w));
   const host = options.host ?? '127.0.0.1';
   let url = '';
@@ -245,6 +257,9 @@ export async function createWorldHost(options: WorldHostOptions): Promise<WorldH
       // this machine's loopback origins, where the World's own page needs no token either
       const site = origins && !originBase ? siteOfHost(at.hostname, byServed.keys()) : undefined;
       if (site) return byServed.get(site.world)!.site(request, site.site);
+      // a World's content plane serves that World's twins' pages and nothing else of this host's (no console, no admin)
+      const pagesFor = origins ? pagesOfHost(at.hostname, byServed.keys(), originBase) : undefined;
+      if (pagesFor) return path === '/-/ping' ? json({ ok: true, worlds: [pagesFor] }) : byServed.get(pagesFor)!.handle(request);
       const own = origins ? worldOfHost(at.hostname, byServed.keys(), originBase) : undefined;
       if (own === null) return json({ error: `no world at ${at.host}` }, 404);
       if (own && !pathOfWorld(path, own, CONSOLE_BASE)) return json({ error: `this origin serves ${own} only` }, 404);