@astrale-os/kernel-server 0.5.0-beta.55 → 0.5.0-beta.57

package/dist/routes/routes.d.ts

@@ -17,7 +17,7 @@ export interface RouteReservation {
     readonly path: string;
     readonly methods: readonly string[];
 }
-export declare function mountRoutes(app: ServerRouter, source: PublicationSource, deliveryProvider: DeliveryProvider | undefined, handler: Handler, active: ActiveOperations, nextInvocation: NextInvocationId, limits: RouteLimits, cors: CorsPolicy, hostFor: (request: Request) => ApplicationHost | undefined, reservations: readonly RouteReservation[], externalIssuer?: string): void;
+export declare function mountRoutes(app: ServerRouter, source: PublicationSource, deliveryProvider: DeliveryProvider | undefined, handler: Handler, active: ActiveOperations, nextInvocation: NextInvocationId, limits: RouteLimits, cors: CorsPolicy, hostFor: (request: Request) => ApplicationHost | undefined, reservations: readonly RouteReservation[], externalIssuer?: string, publicOrigin?: string): void;
 export declare function currentPublicationSnapshot(source: PublicationSource, limits: Pick<RouteLimits, 'maximumPublicationBytes' | 'maximumBundleBytes'>, serving?: {
     readonly origin: string;
     readonly issuer?: string;

package/dist/routes/routes.js

@@ -12,11 +12,11 @@ import { readPreparedPublicationSnapshot, } from '../publication/index.js';
 import { readBoundedBody } from '../transport/body.js';
 import {} from '../transport/router.js';
 import { interruptedStreamError } from '../transport/stream-error.js';
-export function mountRoutes(app, source, deliveryProvider, handler, active, nextInvocation, limits, cors, hostFor, reservations, externalIssuer) {
+export function mountRoutes(app, source, deliveryProvider, handler, active, nextInvocation, limits, cors, hostFor, reservations, externalIssuer, publicOrigin) {
     const publicationPath = externalIssuer === undefined
         ? PUBLICATION_PATH
         : new URL(publicationUrl(externalIssuer)).pathname;
-    const externalOrigin = externalIssuer === undefined ? undefined : new URL(externalIssuer).origin;
+    const externalOrigin = publicOrigin ?? (externalIssuer === undefined ? undefined : new URL(externalIssuer).origin);
     if (cors.enabled) {
         app.options(publicationPath, (context) => cors.preflight(context.req.raw, {
             methods: ['GET'],
@@ -27,7 +27,7 @@ export function mountRoutes(app, source, deliveryProvider, handler, active, next
         const responseCors = cors.response(context.req.raw, ['etag']);
         if (!active.isAccepting)
             return response({ error: 'Publication is unavailable while draining.' }, 503, responseCors);
-        const snapshot = servingSnapshot(source, limits, context.req.raw, reservations, externalIssuer);
+        const snapshot = servingSnapshot(source, limits, context.req.raw, reservations, externalIssuer, externalOrigin);
         if (snapshot === undefined)
             return response({ error: 'Publication is not ready.' }, 503, responseCors);
         const body = snapshot.publicationBytes;
@@ -52,7 +52,7 @@ export function mountRoutes(app, source, deliveryProvider, handler, active, next
         });
     });
     app.all('*', async (context) => {
-        const snapshot = servingSnapshot(source, limits, context.req.raw, reservations, externalIssuer);
+        const snapshot = servingSnapshot(source, limits, context.req.raw, reservations, externalIssuer, externalOrigin);
         if (snapshot === undefined)
             return context.notFound();
         const request = context.req.raw;
@@ -352,9 +352,10 @@ export function currentPublicationSnapshot(source, limits, serving) {
     }
     return prepared;
 }
-function servingSnapshot(source, limits, request, reservations, externalIssuer) {
+function servingSnapshot(source, limits, request, reservations, externalIssuer, publicOrigin) {
     return currentPublicationSnapshot(source, limits, {
-        origin: externalIssuer === undefined ? new URL(request.url).origin : new URL(externalIssuer).origin,
+        origin: publicOrigin ??
+            (externalIssuer === undefined ? new URL(request.url).origin : new URL(externalIssuer).origin),
         ...(externalIssuer === undefined ? {} : { issuer: externalIssuer }),
         reservations,
     });

package/dist/server.js

@@ -26,7 +26,8 @@ function createPreparedServer(input, config) {
     const app = createServerRouter();
     const hosts = new WeakMap();
     const externalIssuer = config.issuer?.issuer;
-    const externalOrigin = externalIssuer === undefined ? undefined : new URL(externalIssuer).origin;
+    const externalOrigin = config.publicOrigin ??
+        (externalIssuer === undefined ? undefined : new URL(externalIssuer).origin);
     const handleHttp = createHttpHandler({
         handler,
         active,
@@ -82,7 +83,7 @@ function createPreparedServer(input, config) {
         mountIssuer(app, config.issuer, config.cors, active, config.limits.invocationTimeoutMs, config.tokenExchange);
     }
     if (config.publication !== undefined) {
-        mountRoutes(app, config.publication, config.delivery, handler, active, config.invocation, config.limits, config.cors, (request) => hosts.get(request), config.routeReservations, externalIssuer);
+        mountRoutes(app, config.publication, config.delivery, handler, active, config.invocation, config.limits, config.cors, (request) => hosts.get(request), config.routeReservations, externalIssuer, externalOrigin);
     }
     app.onError((_error, context) => new Response('{"error":"Internal server error."}', {
         status: 500,
@@ -131,6 +132,7 @@ function captureHandler(input) {
     return Object.freeze({ dispatch });
 }
 function admitOptions(config) {
+    const publicOrigin = config.publicOrigin === undefined ? undefined : admitPublicOrigin(config.publicOrigin);
     const invocation = captureInvocationSource(config.invocation);
     const limits = admitLimits(config.limits);
     const path = admitRoute(config.path ?? '/', 'invocation path');
@@ -180,6 +182,7 @@ function admitOptions(config) {
     }
     return Object.freeze({
         invocation,
+        ...(publicOrigin === undefined ? {} : { publicOrigin }),
         limits,
         path,
         cors: prepareCors(config.cors),
@@ -264,3 +267,15 @@ function admitRoute(path, label) {
     }
     return path;
 }
+function admitPublicOrigin(input) {
+    const url = new URL(input);
+    if (!['http:', 'https:'].includes(url.protocol) ||
+        url.username !== '' ||
+        url.password !== '' ||
+        url.pathname !== '/' ||
+        url.search !== '' ||
+        url.hash !== '') {
+        throw new TypeError('Server publicOrigin must be an HTTP(S) origin.');
+    }
+    return url.origin;
+}

package/dist/types.d.ts

@@ -37,6 +37,8 @@ export interface ServerOptions {
         readonly probe: HealthProbe;
     } | false;
     readonly issuer?: Issuer;
+    /** Public HTTP origin for transport placement, independent of the stable issuer. */
+    readonly publicOrigin?: string;
     /** Present only for the configured self issuer; owns verification and signing. */
     readonly tokenExchange?: exchange.Provider;
     readonly publication?: PublicationSource;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrale-os/kernel-server",
-  "version": "0.5.0-beta.55",
+  "version": "0.5.0-beta.57",
   "description": "Portable HTTP and WebSocket boundary for Astrale invocation, publication, installation, and issuer protocols",
   "license": "Apache-2.0",
   "repository": {
@@ -33,9 +33,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@astrale-os/kernel-core": "0.9.0-beta.47",
-    "@astrale-os/kernel-dsl": "0.2.0-beta.33",
-    "@astrale-os/kernel-protocol": "0.5.0-beta.53",
+    "@astrale-os/kernel-core": "0.9.0-beta.49",
+    "@astrale-os/kernel-dsl": "0.2.0-beta.34",
+    "@astrale-os/kernel-protocol": "0.5.0-beta.55",
     "hono": "^4.6.20",
     "msgpackr": "^2.0.5"
   },