@astrale-os/kernel-server 0.5.0-beta.51 → 0.5.0-beta.53

package/dist/publication/snapshot.js

@@ -1,3 +1,4 @@
+import { bundleUrl } from '@astrale-os/kernel-protocol/publication';
 import { verifyBundleBytes } from '@astrale-os/kernel-protocol/publication/bundle-evidence';
 import { accept as acceptPublication, encode as encodePublication, } from '@astrale-os/kernel-protocol/publication/publication';
 import { admitTable } from './table.js';
@@ -16,6 +17,14 @@ export function preparePublicationSnapshot(input) {
         throw new TypeError('Publication snapshot Domain identity differs from its Publication.');
     }
     const table = admitTable(admittedPublication, input.table, domain);
+    const addressed = new URL(bundleUrl(admittedPublication.identity.issuer, admittedPublication.schema.bundle.ref));
+    const addressedDirectory = addressed.pathname.slice(0, addressed.pathname.lastIndexOf('/') + 1);
+    const servingBundle = new URL(admittedPublication.schema.bundle.href);
+    if (servingBundle.origin === addressed.origin &&
+        servingBundle.pathname.startsWith(addressedDirectory) &&
+        servingBundle.href !== addressed.href) {
+        throw new TypeError('Publication bundle URL differs from its artifact digest.');
+    }
     const publicationBytes = encodePublication(admittedPublication);
     const snapshot = Object.freeze({ publication: admittedPublication });
     const prepared = Object.freeze({

package/dist/routes/routes.js

@@ -1,6 +1,7 @@
 import * as codecs from '@astrale-os/kernel-protocol/codecs';
 import * as errors from '@astrale-os/kernel-protocol/errors';
 import * as protocol from '@astrale-os/kernel-protocol/invocation';
+import { bundleUrl } from '@astrale-os/kernel-protocol/publication';
 import { mediaType as publicationMediaType, PATH as PUBLICATION_PATH, url as publicationUrl, } from '@astrale-os/kernel-protocol/publication/publication';
 import { reference as publicationReference } from '@astrale-os/kernel-protocol/publication/reference';
 import * as routes from '@astrale-os/kernel-protocol/routes';
@@ -59,6 +60,9 @@ export function mountRoutes(app, source, deliveryProvider, handler, active, next
             return publicationPreflight(cors, request, snapshot, externalOrigin);
         }
         const responseCors = cors.response(request);
+        const descriptor = snapshot.publication.schema.bundle;
+        const addressed = bundleUrl(snapshot.publication.identity.issuer, descriptor.ref);
+        const immutable = descriptor.href === addressed;
         if (sameRoute(request.url, snapshot.publication.schema.bundle.href, externalOrigin)) {
             if (!active.isAccepting)
                 return response({ error: 'Publication artifact is unavailable while draining.' }, 503, responseCors);
@@ -68,16 +72,32 @@ export function mountRoutes(app, source, deliveryProvider, handler, active, next
             if (body.byteLength !== snapshot.publication.schema.bundle.ref.size) {
                 return response({ error: 'Bundle differs from its Publication.' }, 500, responseCors);
             }
-            return new Response(toBody(body), {
-                status: 200,
+            const etag = quoteEtag(descriptor.ref.digest);
+            const unchanged = request.headers.get('if-none-match') === etag;
+            return new Response(unchanged ? null : toBody(body), {
+                status: unchanged ? 304 : 200,
                 headers: {
                     ...responseCors,
                     'content-type': snapshot.publication.schema.bundle.ref.mediaType,
-                    etag: quoteEtag(snapshot.publication.schema.bundle.ref.digest),
-                    'cache-control': 'public, max-age=31536000, immutable, no-transform',
+                    etag,
+                    'cache-control': immutable
+                        ? 'public, max-age=31536000, immutable, no-transform'
+                        : 'public, max-age=0, must-revalidate, no-transform',
                 },
             });
         }
+        if (request.method === 'GET' && immutable) {
+            const pathname = new URL(addressed).pathname;
+            const directory = pathname.slice(0, pathname.lastIndexOf('/') + 1);
+            const requested = new URL(request.url);
+            if (requested.pathname.startsWith(directory) &&
+                /^[0-9a-f]{64}\.json$/u.test(requested.pathname.slice(directory.length))) {
+                return new Response(null, {
+                    status: 404,
+                    headers: { ...responseCors, 'cache-control': 'no-store' },
+                });
+            }
+        }
         const deliveryUrl = snapshot.publication.delivery?.href;
         if (deliveryUrl !== undefined && sameRoute(request.url, deliveryUrl, externalOrigin)) {
             return handleDelivery(request, snapshot, deliveryProvider, active, limits, cors.response(request));
@@ -206,12 +226,14 @@ function streamingBinaryResponse(binary, operation, cors, request) {
     const iterator = binary.body[Symbol.asyncIterator]();
     const applicationHeaders = applicationBinaryHeaders(binary.headers);
     let terminal = false;
+    let controller;
     let stopping;
-    const stop = () => {
-        stopping ??= Promise.resolve().then(async () => {
-            if (terminal)
-                return;
-            terminal = true;
+    const stop = (reason = 'Binary response was interrupted.') => {
+        if (terminal)
+            return stopping ?? Promise.resolve();
+        terminal = true;
+        controller?.error(new Error(reason));
+        stopping = Promise.resolve().then(async () => {
             try {
                 await iterator.return?.();
             }
@@ -222,6 +244,9 @@ function streamingBinaryResponse(binary, operation, cors, request) {
         return stopping;
     };
     const body = new ReadableStream({
+        start(output) {
+            controller = output;
+        },
         async pull(controller) {
             if (terminal)
                 return;
@@ -238,6 +263,8 @@ function streamingBinaryResponse(binary, operation, cors, request) {
                 controller.enqueue(next.value);
             }
             catch (cause) {
+                if (terminal)
+                    return;
                 terminal = true;
                 controller.error(cause);
                 operation.settle();

package/dist/transport/http/handler.js

@@ -6,7 +6,7 @@ import { invocationContext, publicationRouteDecision, } from '../../invocation/i
 import { readBoundedBody } from '../body.js';
 import { loadCodecs } from '../codecs.js';
 import { resolveCredential } from '../credential.js';
-import { renderHttpError, renderHttpResult } from './render.js';
+import { isStreamingBinary, renderHttpError, renderHttpResult, } from './render.js';
 export function createHttpHandler(config) {
     return async (request, host) => {
         const cors = (exposedHeaders) => config.cors.response(request, exposedHeaders);
@@ -146,7 +146,8 @@ export function createHttpHandler(config) {
                     active,
                     maximumResponseBytes: config.maximumResponseBytes,
                 });
-                handedOff = result.kind === 'stream';
+                handedOff =
+                    result.kind === 'stream' || (result.kind === 'binary' && isStreamingBinary(result.value));
                 return response;
             }
             catch (input) {

package/dist/transport/http/render.js

@@ -90,12 +90,14 @@ function streamingBinaryHttpResponse(binary, context) {
         headers: binary.headers,
     }), context.cors, true);
     let terminal = false;
+    let controller;
     let stopping;
-    const stop = () => {
-        stopping ??= Promise.resolve().then(async () => {
-            if (terminal)
-                return;
-            terminal = true;
+    const stop = (reason = 'Binary response was interrupted.') => {
+        if (terminal)
+            return stopping ?? Promise.resolve();
+        terminal = true;
+        controller?.error(new Error(reason));
+        stopping = Promise.resolve().then(async () => {
             try {
                 await iterator.return?.();
             }
@@ -106,6 +108,9 @@ function streamingBinaryHttpResponse(binary, context) {
         return stopping;
     };
     const body = new ReadableStream({
+        start(output) {
+            controller = output;
+        },
         async pull(controller) {
             if (terminal)
                 return;
@@ -122,6 +127,8 @@ function streamingBinaryHttpResponse(binary, context) {
                 controller.enqueue(next.value);
             }
             catch (cause) {
+                if (terminal)
+                    return;
                 terminal = true;
                 controller.error(cause);
                 context.active.settle();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrale-os/kernel-server",
-  "version": "0.5.0-beta.51",
+  "version": "0.5.0-beta.53",
   "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.45",
+    "@astrale-os/kernel-core": "0.9.0-beta.46",
     "@astrale-os/kernel-dsl": "0.2.0-beta.33",
-    "@astrale-os/kernel-protocol": "0.5.0-beta.49",
+    "@astrale-os/kernel-protocol": "0.5.0-beta.51",
     "hono": "^4.6.20",
     "msgpackr": "^2.0.5"
   },