@volter/world-core 3.0.30 → 3.0.31

package/dist/src/pack-fetch.js

@@ -5,8 +5,6 @@
 // `screens/<id>.tsx`), and the API (the derived dispatch over the generated surface, the handlers and the core). Every
 // one of them is answered over the contract's context, which the kernel opens: a pack opens none, reads the tree and
 // writes it only through one.
-import { startBrowserSession, endBrowserSession } from "./browser-session.js";
-import { BROWSER_SESSION_PATH, takeBrowserSessionPermit } from "./browser-session-permit.js";
 import { ORIGINAL_PATH_HEADER } from "./sigv4.js";
 import { placedCookies, TWIN_PREFIX_HEADER } from "./twin-fetch.js";
 import { PREFIX_PARAMS_HEADER } from "./derived.js";
@@ -21,7 +19,7 @@ import { deferPerform, performRequestGroup, RefusedWriteError, VendorWriteError
 import { withCors } from "./cors.js";
 import { contentAddressOf } from "./content-route.js";
 import { getPack } from "./packRegistry.js";
-import { hostRules } from '../vendor-hosts.cjs';
+import { hostRules } from '../host-routing.cjs';
 import { socketUpgrade } from "./sockets.js";
 import { MACHINE_POOL, POOL_KINDS } from "./machines.js";
 import { applyTwinWrite } from "./serve.js";
@@ -112,7 +110,6 @@ async function encoded(m, request, res) {
 /** A pack's HTTP surface, as the kernel serves it from the pack's parts. */
 export function createPackFetch(parts, options = {}) {
     const m = parts.manifest;
-    let browserSession = m.browserSession;
     const scope = {
         ...(options.root !== undefined ? { root: options.root } : {}),
         ...(options.clock ? { clock: options.clock } : {}),
@@ -223,7 +220,7 @@ export function createPackFetch(parts, options = {}) {
     });
     // the workspaces a person can be shown (Viewing a World): each built workspace screen's id and path, the pack's own
     // and its lanes'
-    const workspaces = () => [...(m.screens ?? []).filter((s) => s.kind === 'workspace' && s.status === 'done' && parts.screens?.[s.id]).map((s) => ({ id: s.id, path: s.path })), ...lanesWorkspaces(parts.lanes ?? {})];
+    const workspaces = () => [...(m.screens ?? []).filter((s) => s.kind === 'workspace' && s.status === 'done' && parts.screens?.[s.id]).map((s) => ({ id: s.id, path: s.path, host: s.host })), ...lanesWorkspaces(parts.lanes ?? {})];
     /** Whether a built screen a person views (a workspace or a flow, never content an API client reads) draws a url: its host
      *  one the screen names, its path the screen's or under it (a root screen draws its root alone). */
     // by what the pack declares built (a screen drawn by another's handler, as X's profile is by its web pages, is built)
@@ -231,7 +228,6 @@ export function createPackFetch(parts, options = {}) {
         const hosts = [s.host, ...(s.hosts ?? [])].map(hostMatcher);
         return { root: s.path.replace(/\/+$/, '') === '', host: (h) => hosts.some((match) => match(h)), path: pathMatcher(s.path, true) };
     });
-    const drawsScreens = viewed.length > 0 || Object.values(parts.lanes ?? {}).some((l) => l.fetch.drawsScreens);
     const drawsUrl = (at) => {
         try {
             const u = new URL(at);
@@ -381,7 +377,7 @@ export function createPackFetch(parts, options = {}) {
         if (request.method === 'GET' && path === '/twin' && m.discovery) {
             const d = m.discovery;
             // the workspaces a person can be shown (Viewing a World): each built workspace screen's id and path
-            const shown = { drawsScreens, ...(workspaces().length ? { screens: workspaces() } : {}), ...(browserSession ? { browserSession } : {}) };
+            const shown = workspaces().length ? { screens: workspaces() } : {};
             // a model vendor's: its state, and what its scenario scripts, with the scenario's live counts
             if (parts.scenario && d.behavior) {
                 return Response.json({ ...shown, ...twinManifest({
@@ -399,20 +395,6 @@ export function createPackFetch(parts, options = {}) {
         // header would make a payout time makes the caller's), but a tenant's, when the vendor keeps tenants apart
         if (parts.clock)
             await runAsVendorMove(async () => parts.clock(await open(new Request(request.url, m.tenant ? { headers: request.headers } : {}), 'clock', 'POST', '/_twin/clock', {})));
-        if (path === BROWSER_SESSION_PATH && browserSession) {
-            if (request.method !== 'POST' || readOnly)
-                return Response.json({ error: 'a browser session needs a permitted write' }, { status: 403 });
-            const choice = takeBrowserSessionPermit(request, m.service, options.root);
-            if (!choice)
-                return Response.json({ error: 'only the World can change this browser session' }, { status: 403 });
-            const ctx = await open(request, 'browser-session', 'POST', BROWSER_SESSION_PATH, {});
-            const person = choice.person === null ? null : ctx.rowsRaw('_person').find((p) => p.id === choice.person && typeof p.email === 'string');
-            if (person === undefined)
-                return Response.json({ error: 'that person is no longer in the World' }, { status: 404 });
-            const cleared = await endBrowserSession(ctx, browserSession.cookie);
-            const cookie = person ? await startBrowserSession(ctx, String(person.email), browserSession.cookie, browserSession.scope) : cleared;
-            return new Response(null, { status: 303, headers: { location: choice.land, 'set-cookie': cookie } });
-        }
         if (path.startsWith('/_twin/')) {
             // the World's machine pool, enrolled by the kernel for a vendor that runs images (machines.ts)
             if (m.machines && path === '/_twin/machine-pool' && request.method === 'POST') {
@@ -531,7 +513,7 @@ export function createPackFetch(parts, options = {}) {
     async (asked) => engineOf()?.serve(asked)) : undefined;
     // what serves each operation: the pack's own, and each lane's
     const owners = () => ({ ...api.owners(), ...lanesOwners(parts.lanes ?? {}) });
-    return derivedRequestScopes(m, Object.assign(served, { sessionDeclaration: (session) => { browserSession ??= session; }, owners, serves, workspaces, boards: Boolean(parts.board), drawsScreens, draws: drawsUrl, contentHosts, ...(upgrade ? { upgrade } : {}) }));
+    return derivedRequestScopes(m, Object.assign(served, { owners, serves, workspaces, boards: Boolean(parts.board), draws: drawsUrl, contentHosts, ...(upgrade ? { upgrade } : {}) }));
 }
 /** The vendor's gateway over its lanes: the lane a request goes to (a door to the lane that declares it, then the first
  *  route whose conditions all hold, then the default), behind the gateway's CORS; undefined when none takes it. */
@@ -591,9 +573,6 @@ const lanesOwners = (lanes) => Object.assign({}, ...Object.values(lanes).map((l)
 /** The workspaces a vendor's lanes draw, as one list. */
 const lanesWorkspaces = (lanes) => Object.values(lanes).flatMap((l) => l.fetch.workspaces?.() ?? []);
 export function createVendorFetch(manifest, lanes) {
-    if (manifest.browserSession)
-        for (const part of Object.values(lanes))
-            part.fetch.sessionDeclaration?.(manifest.browserSession);
     const lane = laneRouter(manifest.vendor, manifest.lanes, lanes);
     return Object.assign(async (request) => {
         const path = new URL(request.url).pathname.replace(/\/+$/, '') || '/';
@@ -616,7 +595,7 @@ export function createVendorFetch(manifest, lanes) {
         if (request.method === 'GET' && path === '/twin' && manifest.discovery) {
             // the vendor's screens are its lanes' (a dashboard drawn by one lane is the vendor's)
             const screens = lanesWorkspaces(lanes);
-            return Response.json({ ...statefulTwinManifest({ vendor: manifest.vendor, ...manifest.discovery }), drawsScreens: Object.values(lanes).some((l) => l.fetch.drawsScreens), ...(manifest.browserSession ? { browserSession: manifest.browserSession } : {}), ...(screens.length ? { screens } : {}) });
+            return Response.json({ ...statefulTwinManifest({ vendor: manifest.vendor, ...manifest.discovery }), ...(screens.length ? { screens } : {}) });
         }
         const to = lane(request);
         return to ? to(request) : Response.json({ error: `${manifest.vendor}: no lane serves ${request.method} ${path}` }, { status: 404 });