@volter/world-core 3.0.17 → 3.0.18

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 { twinSiteUrl } from './twin-fetch.js';
+export { siteLabel, siteUrlOf, twinSiteUrl } 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 { twinSiteUrl } from "./twin-fetch.js";
+export { siteLabel, siteUrlOf, twinSiteUrl } 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, TWIN_PREFIX_HEADER, TWIN_REQUEST_SCOPES, TWIN_SITES_HEADER, twinPublicBase, twinSiteUrl, withRequestScopes } from './twin-fetch.js';
+export { createTwinFetchFromHandler, TWIN_PREFIX_HEADER, TWIN_REQUEST_SCOPES, TWIN_SITES_HEADER, siteLabel, siteUrlOf, twinPublicBase, twinSiteUrl, 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, TWIN_PREFIX_HEADER, TWIN_REQUEST_SCOPES, TWIN_SITES_HEADER, twinPublicBase, twinSiteUrl, withRequestScopes } from "./twin-fetch.js";
+export { createTwinFetchFromHandler, TWIN_PREFIX_HEADER, TWIN_REQUEST_SCOPES, TWIN_SITES_HEADER, siteLabel, siteUrlOf, twinPublicBase, twinSiteUrl, 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

@@ -8,9 +8,16 @@ export declare const TWIN_PREFIX_HEADER = "x-forwarded-prefix";
  *  callback) from this, never from the bare origin, so the URL works behind a served World. */
 export declare function twinPublicBase(request: Request): string;
 /** Where a World shows a hostname its twins answer (a Workers Custom Domain, an R2 public domain): the address a person
- *  opens it at, `{host}` standing for the hostname (`http://{host}.<world>--<org>.localhost:<port>`). A World that routes
- *  its sites to a browser sends it on every request it forwards to a twin. */
+ *  opens it at, from the World's sites template. `{host}` stands for the hostname as it is, where the host's names nest
+ *  (`http://{host}.<world>--<org>.localhost:<port>`); `{site}` for the hostname as one DNS label, its dots as hyphens,
+ *  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";
+/** 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
+ *  (a label over 63 characters). */
+export declare function siteUrlOf(template: string, hostname: string): string | null;
 /** Where a page links a hostname the twin answers: the World's address for it when the World shows sites, else the
  *  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. */

package/dist/src/twin-fetch.js

@@ -41,16 +41,35 @@ export function twinPublicBase(request) {
     return `${origin}${prefix.replace(/\/+$/, '')}`;
 }
 /** Where a World shows a hostname its twins answer (a Workers Custom Domain, an R2 public domain): the address a person
- *  opens it at, `{host}` standing for the hostname (`http://{host}.<world>--<org>.localhost:<port>`). A World that routes
- *  its sites to a browser sends it on every request it forwards to a twin. */
+ *  opens it at, from the World's sites template. `{host}` stands for the hostname as it is, where the host's names nest
+ *  (`http://{host}.<world>--<org>.localhost:<port>`); `{site}` for the hostname as one DNS label, its dots as hyphens,
+ *  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';
+/** 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
+ *  (a label over 63 characters). */
+export function siteUrlOf(template, hostname) {
+    const host = hostname.toLowerCase();
+    if (!/^[a-z0-9.-]+$/.test(host))
+        return null;
+    // a one-label site is never an IDN's (`xn--…` would be read as punycode, and is no address)
+    const filled = /^https?:\/\/\{host\}\.[A-Za-z0-9.-]+(:\d+)?$/.test(template) ? template.replace('{host}', host)
+        : /^https?:\/\/\{site\}--[A-Za-z0-9.-]+(:\d+)?$/.test(template) && !host.startsWith('xn--') ? template.replace('{site}', siteLabel(host)) : null;
+    try {
+        return filled && new URL(filled).hostname.split('.').every((l) => l.length > 0 && l.length <= 63) ? filled : null;
+    }
+    catch {
+        return null;
+    }
+}
 /** Where a page links a hostname the twin answers: the World's address for it when the World shows sites, else the
  *  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 function twinSiteUrl(request, hostname) {
     const at = request.headers.get(TWIN_SITES_HEADER);
-    const host = hostname.toLowerCase();
-    return at && /^https?:\/\/\{host\}\.[A-Za-z0-9.-]+(:\d+)?$/.test(at) && /^[a-z0-9.-]+$/.test(host) ? at.replace('{host}', host) : `https://${host}`;
+    return (at ? siteUrlOf(at, hostname) : null) ?? `https://${hostname.toLowerCase()}`;
 }
 /** 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/world-core",
-  "version": "3.0.17",
+  "version": "3.0.18",
   "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 { twinSiteUrl } from './twin-fetch.ts';
+export { siteLabel, siteUrlOf, twinSiteUrl } 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, TWIN_PREFIX_HEADER, TWIN_REQUEST_SCOPES, TWIN_SITES_HEADER, twinPublicBase, twinSiteUrl, withRequestScopes } from './twin-fetch.ts';
+export { createTwinFetchFromHandler, TWIN_PREFIX_HEADER, TWIN_REQUEST_SCOPES, TWIN_SITES_HEADER, siteLabel, siteUrlOf, twinPublicBase, twinSiteUrl, 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

@@ -44,17 +44,32 @@ export function twinPublicBase(request: Request): string {
 }
 
 /** Where a World shows a hostname its twins answer (a Workers Custom Domain, an R2 public domain): the address a person
- *  opens it at, `{host}` standing for the hostname (`http://{host}.<world>--<org>.localhost:<port>`). A World that routes
- *  its sites to a browser sends it on every request it forwards to a twin. */
+ *  opens it at, from the World's sites template. `{host}` stands for the hostname as it is, where the host's names nest
+ *  (`http://{host}.<world>--<org>.localhost:<port>`); `{site}` for the hostname as one DNS label, its dots as hyphens,
+ *  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';
 
+/** 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, '-');
+
+/** The address a sites template gives `hostname`, or null where the template is not one or the name makes no address
+ *  (a label over 63 characters). */
+export function siteUrlOf(template: string, hostname: string): string | null {
+  const host = hostname.toLowerCase();
+  if (!/^[a-z0-9.-]+$/.test(host)) return null;
+  // a one-label site is never an IDN's (`xn--…` would be read as punycode, and is no address)
+  const filled = /^https?:\/\/\{host\}\.[A-Za-z0-9.-]+(:\d+)?$/.test(template) ? template.replace('{host}', host)
+    : /^https?:\/\/\{site\}--[A-Za-z0-9.-]+(:\d+)?$/.test(template) && !host.startsWith('xn--') ? template.replace('{site}', siteLabel(host)) : null;
+  try { return filled && new URL(filled).hostname.split('.').every((l) => l.length > 0 && l.length <= 63) ? filled : null; } catch { return null; }
+}
+
 /** Where a page links a hostname the twin answers: the World's address for it when the World shows sites, else the
  *  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 function twinSiteUrl(request: Request, hostname: string): string {
   const at = request.headers.get(TWIN_SITES_HEADER);
-  const host = hostname.toLowerCase();
-  return at && /^https?:\/\/\{host\}\.[A-Za-z0-9.-]+(:\d+)?$/.test(at) && /^[a-z0-9.-]+$/.test(host) ? at.replace('{host}', host) : `https://${host}`;
+  return (at ? siteUrlOf(at, hostname) : null) ?? `https://${hostname.toLowerCase()}`;
 }
 
 /** A twin's BYTE-STREAM door: a pack whose clients speak a TCP protocol (SMTP, the MySQL wire) serves