@volter/world-host 3.0.12 → 3.0.13

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, 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;
@@ -130,6 +130,20 @@ export async function createWorldHost(options) {
         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 } : {}) });
     };
+    // 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';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/world-host",
-  "version": "3.0.12",
+  "version": "3.0.13",
   "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.13",
+    "@volter/world-runtime": "3.0.13"
   },
   "peerDependencies": {
-    "@volter/world-console": "3.0.7"
+    "@volter/world-console": "3.0.8"
   },
   "peerDependenciesMeta": {
     "@volter/world-console": {
@@ -39,7 +39,7 @@
     }
   },
   "devDependencies": {
-    "@volter/world-console": "3.0.7"
+    "@volter/world-console": "3.0.8"
   },
   "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, 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';
 
@@ -138,6 +138,14 @@ export async function createWorldHost(options: WorldHostOptions): Promise<WorldH
     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 } : {}) });
   };
+  // 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 = '';