@volter/world-core 3.0.33 → 3.0.34

package/dist/src/index.d.ts

@@ -36,7 +36,7 @@ export { VendorUnreachableError } from './vendor-call.js';
 export { isReadOnlyRequest, READ_ONLY_REQUEST_HEADER } from './request-scope.js';
 export { serveHttp, serveStream, type HttpHandler, type HttpServer, type ServeHttpOptions } from './serve-http.js';
 export type { TwinStream, TwinStreamConnection, TwinStreamSink } from './twin-fetch.js';
-export { siteLabel, siteUrlOf, twinSiteUrl } from './twin-fetch.js';
+export { siteLabel, siteUrlOf, twinSiteUrl, twinVendorUrl } from './twin-fetch.js';
 export { statefulTwinManifest, twinManifest } from './scenario.js';
 export { assetContentType, packAsset } from './pack-assets.js';
 export { bytesResponse, contentTypeOf, fileResponse } from './file-response.js';

package/dist/src/index.js

@@ -29,7 +29,7 @@ export { isReadOnlyRequest, READ_ONLY_REQUEST_HEADER } from "./request-scope.js"
 // ── the serve factory ──────────────────────────────────────────────────────────────────────────
 export { serveHttp, serveStream } from "./serve-http.js";
 // where a page links a hostname its twin answers, inside the World that shows it
-export { siteLabel, siteUrlOf, twinSiteUrl } from "./twin-fetch.js";
+export { siteLabel, siteUrlOf, twinSiteUrl, twinVendorUrl } from "./twin-fetch.js";
 export { statefulTwinManifest, twinManifest } from "./scenario.js";
 export { assetContentType, packAsset } from "./pack-assets.js";
 export { bytesResponse, contentTypeOf, fileResponse } from "./file-response.js";

package/dist/src/runtime.d.ts

@@ -4,7 +4,7 @@ export { parseScenarioDocument, scenarioFaultResult, ScenarioEngine, ScenarioErr
 export { WORLD_CLOCK_ENV, worldNow } from './world-clock.js';
 export { WORLD_ENV_NAMES_ENV, worldEnvValue } from './world-env.js';
 export { ORIGINAL_PATH_HEADER } from './sigv4.js';
-export { createTwinFetchFromHandler, placedCookies, TWIN_PREFIX_HEADER, TWIN_REQUEST_SCOPES, TWIN_SITES_HEADER, siteLabel, siteUrlOf, twinPublicBase, twinSiteUrl, withRequestScopes } from './twin-fetch.js';
+export { createTwinFetchFromHandler, placedCookies, TWIN_PREFIX_HEADER, TWIN_REQUEST_SCOPES, TWIN_SITES_HEADER, TWIN_SITE_HEADER, siteLabel, siteUrlOf, twinPublicBase, twinSiteUrl, twinVendorUrl, withRequestScopes } from './twin-fetch.js';
 export { isReadOnlyRequest, READ_ONLY_REQUEST_HEADER, ReadOnlyRequestError, runAsReadOnlyRequest, runAsVendorMove, writesRefused } from './request-scope.js';
 export { compileSurface, createDerivedFetch, matchOperation } from './derived.js';
 export { currentTraceparent, deliveryTraceHeaders, newTraceparent, parseTraceparent, runWithRequestTrace, runWithTraceparent, TRACEPARENT_HEADER, traceparentForDelivery, validTraceparent } from './trace-context.js';

package/dist/src/runtime.js

@@ -12,7 +12,7 @@ export { parseScenarioDocument, scenarioFaultResult, ScenarioEngine, ScenarioErr
 export { WORLD_CLOCK_ENV, worldNow } from "./world-clock.js";
 export { WORLD_ENV_NAMES_ENV, worldEnvValue } from "./world-env.js";
 export { ORIGINAL_PATH_HEADER } from "./sigv4.js";
-export { createTwinFetchFromHandler, placedCookies, TWIN_PREFIX_HEADER, TWIN_REQUEST_SCOPES, TWIN_SITES_HEADER, siteLabel, siteUrlOf, twinPublicBase, twinSiteUrl, withRequestScopes } from "./twin-fetch.js";
+export { createTwinFetchFromHandler, placedCookies, TWIN_PREFIX_HEADER, TWIN_REQUEST_SCOPES, TWIN_SITES_HEADER, TWIN_SITE_HEADER, siteLabel, siteUrlOf, twinPublicBase, twinSiteUrl, twinVendorUrl, withRequestScopes } from "./twin-fetch.js";
 export { isReadOnlyRequest, READ_ONLY_REQUEST_HEADER, ReadOnlyRequestError, runAsReadOnlyRequest, runAsVendorMove, writesRefused } from "./request-scope.js";
 export { compileSurface, createDerivedFetch, matchOperation } from "./derived.js";
 export { currentTraceparent, deliveryTraceHeaders, newTraceparent, parseTraceparent, runWithRequestTrace, runWithTraceparent, TRACEPARENT_HEADER, traceparentForDelivery, validTraceparent } from "./trace-context.js";

package/dist/src/twin-fetch.d.ts

@@ -13,6 +13,8 @@ export declare function twinPublicBase(request: Request): string;
  *  where one wildcard certificate covers the host's names (`https://{site}--<world>--<org>.volterdev.com`). A World that
  *  routes its sites to a browser sends the template on every request it forwards to a twin. */
 export declare const TWIN_SITES_HEADER = "x-volter-world-sites";
+/** The real host of the page whose hosted-site session owns this request, including a /_host/ request. */
+export declare const TWIN_SITE_HEADER = "x-volter-world-site";
 /** A hostname as one DNS label: its dots as hyphens (`www.volter.ai` is `www-volter-ai`). */
 export declare const siteLabel: (hostname: string) => string;
 /** The address a sites template gives `hostname`, or null where the template is not one or the name makes no address
@@ -22,6 +24,10 @@ export declare function siteUrlOf(template: string, hostname: string, browser?:
  *  hostname itself (reached through the World's proxy, or the vendor). A pack's screen links a site from this, as it
  *  mints its own URLs from twinPublicBase. */
 export declare function twinSiteUrl(request: Request, hostname: string): string;
+/** A URL on the page's vendor: hosted sites keep it on the page's origin, with another of the vendor's hosts under
+ *  /_host/. The World checks that target's vendor and applies the page's session; a pack supplies only its own
+ *  vendor URLs. Without hosted-site headers (the local proxy or a path-mounted page), the URL is unchanged. */
+export declare function twinVendorUrl(request: Request, vendorUrl: string): string;
 /** A twin's BYTE-STREAM door: a pack whose clients speak a TCP protocol (SMTP, the MySQL wire) serves
  *  it over whatever carries the bytes — a local listener's socket, or a WebSocket to a hosted World.
  *  The pack owns framing and protocol; the host owns the transport. `open` greets through the sink;

package/dist/src/twin-fetch.js

@@ -47,6 +47,8 @@ export function twinPublicBase(request) {
  *  where one wildcard certificate covers the host's names (`https://{site}--<world>--<org>.volterdev.com`). A World that
  *  routes its sites to a browser sends the template on every request it forwards to a twin. */
 export const TWIN_SITES_HEADER = 'x-volter-world-sites';
+/** The real host of the page whose hosted-site session owns this request, including a /_host/ request. */
+export const TWIN_SITE_HEADER = 'x-volter-world-site';
 /** A hostname as one DNS label: its dots as hyphens (`www.volter.ai` is `www-volter-ai`). */
 export const siteLabel = (hostname) => hostname.toLowerCase().replace(/\./g, '-');
 /** The address a sites template gives `hostname`, or null where the template is not one or the name makes no address
@@ -90,6 +92,29 @@ export function twinSiteUrl(request, hostname) {
     }
     return (at ? siteUrlOf(at, hostname, browser) : null) ?? `https://${hostname.toLowerCase()}`;
 }
+/** A URL on the page's vendor: hosted sites keep it on the page's origin, with another of the vendor's hosts under
+ *  /_host/. The World checks that target's vendor and applies the page's session; a pack supplies only its own
+ *  vendor URLs. Without hosted-site headers (the local proxy or a path-mounted page), the URL is unchanged. */
+export function twinVendorUrl(request, vendorUrl) {
+    const site = request.headers.get(TWIN_SITE_HEADER);
+    if (!site || !request.headers.has(TWIN_SITES_HEADER))
+        return vendorUrl;
+    let target;
+    try {
+        target = new URL(vendorUrl);
+    }
+    catch {
+        return vendorUrl;
+    }
+    if (target.protocol !== 'https:' || target.username || target.password || target.port)
+        return vendorUrl;
+    const forwarded = request.headers.get('x-forwarded-host');
+    const proto = request.headers.get('x-forwarded-proto');
+    const origin = forwarded && /^[A-Za-z0-9.-]+(:\d+)?$/.test(forwarded) && (proto === 'https' || proto === 'http')
+        ? `${proto}://${forwarded}` : new URL(request.url).origin;
+    const prefix = target.hostname === site.toLowerCase() ? '' : `/_host/${target.hostname}`;
+    return `${origin}${prefix}${target.pathname}${target.search}${target.hash}`;
+}
 /** The request scopes a pack wrapped in `withRequestScopes` enforces, advertised on its `GET /twin` as
  *  `requestScopes`: `read` — a request carrying `x-volter-read-only: 1` (request-scope.ts) has every
  *  write it attempts refused at the kernel's write seam, whatever operation it names. A World's doors

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/world-core",
-  "version": "3.0.33",
+  "version": "3.0.34",
   "description": "The kernel of Volter World: one log per twin, branches as pointers, checkpoints, the fold that keeps a twin current, the head that performs a write against the vendor, references, and the git plane. A twin package builds on it; the runtime serves it.",
   "keywords": [
     "twin",

package/src/index.ts

@@ -52,7 +52,7 @@ export { isReadOnlyRequest, READ_ONLY_REQUEST_HEADER } from './request-scope.ts'
 export { serveHttp, serveStream, type HttpHandler, type HttpServer, type ServeHttpOptions } from './serve-http.ts';
 export type { TwinStream, TwinStreamConnection, TwinStreamSink } from './twin-fetch.ts';
 // where a page links a hostname its twin answers, inside the World that shows it
-export { siteLabel, siteUrlOf, twinSiteUrl } from './twin-fetch.ts';
+export { siteLabel, siteUrlOf, twinSiteUrl, twinVendorUrl } from './twin-fetch.ts';
 export { statefulTwinManifest, twinManifest } from './scenario.ts';
 export { assetContentType, packAsset } from './pack-assets.ts';
 export { bytesResponse, contentTypeOf, fileResponse } from './file-response.ts';

package/src/runtime.ts

@@ -13,7 +13,7 @@ export { parseScenarioDocument, scenarioFaultResult, ScenarioEngine, ScenarioErr
 export { WORLD_CLOCK_ENV, worldNow } from './world-clock.ts';
 export { WORLD_ENV_NAMES_ENV, worldEnvValue } from './world-env.ts';
 export { ORIGINAL_PATH_HEADER } from './sigv4.ts';
-export { createTwinFetchFromHandler, placedCookies, TWIN_PREFIX_HEADER, TWIN_REQUEST_SCOPES, TWIN_SITES_HEADER, siteLabel, siteUrlOf, twinPublicBase, twinSiteUrl, withRequestScopes } from './twin-fetch.ts';
+export { createTwinFetchFromHandler, placedCookies, TWIN_PREFIX_HEADER, TWIN_REQUEST_SCOPES, TWIN_SITES_HEADER, TWIN_SITE_HEADER, siteLabel, siteUrlOf, twinPublicBase, twinSiteUrl, twinVendorUrl, withRequestScopes } from './twin-fetch.ts';
 export { isReadOnlyRequest, READ_ONLY_REQUEST_HEADER, ReadOnlyRequestError, runAsReadOnlyRequest, runAsVendorMove, writesRefused } from './request-scope.ts';
 export { compileSurface, createDerivedFetch, matchOperation } from './derived.ts';
 export { currentTraceparent, deliveryTraceHeaders, newTraceparent, parseTraceparent, runWithRequestTrace, runWithTraceparent, TRACEPARENT_HEADER, traceparentForDelivery, validTraceparent } from './trace-context.ts';

package/src/twin-fetch.ts

@@ -50,6 +50,8 @@ export function twinPublicBase(request: Request): string {
  *  where one wildcard certificate covers the host's names (`https://{site}--<world>--<org>.volterdev.com`). A World that
  *  routes its sites to a browser sends the template on every request it forwards to a twin. */
 export const TWIN_SITES_HEADER = 'x-volter-world-sites';
+/** The real host of the page whose hosted-site session owns this request, including a /_host/ request. */
+export const TWIN_SITE_HEADER = 'x-volter-world-site';
 
 /** A hostname as one DNS label: its dots as hyphens (`www.volter.ai` is `www-volter-ai`). */
 export const siteLabel = (hostname: string): string => hostname.toLowerCase().replace(/\./g, '-');
@@ -77,6 +79,23 @@ export function twinSiteUrl(request: Request, hostname: string): string {
   return (at ? siteUrlOf(at, hostname, browser) : null) ?? `https://${hostname.toLowerCase()}`;
 }
 
+/** A URL on the page's vendor: hosted sites keep it on the page's origin, with another of the vendor's hosts under
+ *  /_host/. The World checks that target's vendor and applies the page's session; a pack supplies only its own
+ *  vendor URLs. Without hosted-site headers (the local proxy or a path-mounted page), the URL is unchanged. */
+export function twinVendorUrl(request: Request, vendorUrl: string): string {
+  const site = request.headers.get(TWIN_SITE_HEADER);
+  if (!site || !request.headers.has(TWIN_SITES_HEADER)) return vendorUrl;
+  let target: URL;
+  try { target = new URL(vendorUrl); } catch { return vendorUrl; }
+  if (target.protocol !== 'https:' || target.username || target.password || target.port) return vendorUrl;
+  const forwarded = request.headers.get('x-forwarded-host');
+  const proto = request.headers.get('x-forwarded-proto');
+  const origin = forwarded && /^[A-Za-z0-9.-]+(:\d+)?$/.test(forwarded) && (proto === 'https' || proto === 'http')
+    ? `${proto}://${forwarded}` : new URL(request.url).origin;
+  const prefix = target.hostname === site.toLowerCase() ? '' : `/_host/${target.hostname}`;
+  return `${origin}${prefix}${target.pathname}${target.search}${target.hash}`;
+}
+
 /** A twin's BYTE-STREAM door: a pack whose clients speak a TCP protocol (SMTP, the MySQL wire) serves
  *  it over whatever carries the bytes — a local listener's socket, or a WebSocket to a hosted World.
  *  The pack owns framing and protocol; the host owns the transport. `open` greets through the sink;