@aglyn/tenant-data-admin 1.0.0-beta.224 → 1.0.0-beta.226

package/src/lib/server/serve-media-cdn.js

@@ -18,6 +18,7 @@ import { _ as _extends } from "@swc/helpers/_/_extends";
 import { BANDWIDTH_CAP_RETRY_AFTER_SECONDS, bandwidthCapApplies, bandwidthCapEngaged, bandwidthCeilingDegradesHost, bandwidthCeilingMonthKey, isLockdownActive, MEDIA_BANDWIDTH_DAY_FIELD, MEDIA_CDN_POSTER_PARAM, MEDIA_CDN_RENDITION_AUTO, MEDIA_CDN_RENDITION_PARAM, MEDIA_CDN_ROUTE, MEDIA_CDN_VERSION_PARAM, MEDIA_POSTER_OBJECT_SUFFIX, MEDIA_VARIANT_ENCODER_VERSION, MEDIA_VARIANT_ENCODER_VERSION_FIELD, isSecurityClassLockdownReason, mediaDisplayObjectPath, mediaPosterObjectPath, mediaVariantEncoderVersionOf, mediaRenditionObjectPath, normalizeHostLockdown, normalizeOrgLockdown, parseMediaCdnVersionToken, parseMediaRenditions } from "@aglyn/aglyn/server";
 // By path, and out of every barrel: see the module note in `media-cdn-scope`.
 import { MEDIA_CDN_SEGMENT, mediaCdnScopeRefusal, parseMediaCdnScope } from "@aglyn/aglyn/app-utils/media-cdn-scope";
+import { scheduleAfterResponse } from "@aglyn/aglyn/app-utils/after-response";
 import { mediaDeliveryProvider } from "@aglyn/aglyn/plugin-manager/media-delivery-provider";
 import { parseSiteIconSpec, SITE_ICON_BACKGROUND_PARAM, SITE_ICON_PARAM, SITE_ICON_VERSION_PARAM } from "@aglyn/aglyn/app-utils/site-icon-set";
 import { analyticsDayExpiresAt } from "./analytics-retention.js";
@@ -173,6 +174,21 @@ const SEGMENT = MEDIA_CDN_SEGMENT;
  * hour, which is what `s-maxage` is for. Images only — every other type keeps
  * the stable policy, for the AGL-1515 reasons above.
  */ export const MEDIA_CDN_VERSIONED_CACHE_CONTROL = 'public, max-age=31536000, s-maxage=3600, stale-while-revalidate=86400, immutable';
+/**
+ * The generated width that answers a `?w=` request (AGL-3486): the width
+ * itself when the asset has it, otherwise the smallest larger one, and `null`
+ * when every variant is narrower than asked — then the display copy or the
+ * original is the closest picture there is.
+ */ export function mediaCdnVariantFor(variants, width) {
+    if (!(width > 0)) return null;
+    let best = null;
+    for (const candidate of variants){
+        if (typeof candidate !== 'number' || !Number.isInteger(candidate)) continue;
+        if (candidate === width) return width;
+        if (candidate > width && (best === null || candidate < best)) best = candidate;
+    }
+    return best;
+}
 /**
  * Whether a versioned request may be answered with
  * {@link MEDIA_CDN_VERSIONED_CACHE_CONTROL} (AGL-3485).
@@ -617,23 +633,6 @@ const lockPending = new Map();
         contentType
     };
 }
-/**
- * Runs `task` once the response has been sent, through Next's `after()`.
- * Required when first asked for rather than imported, for the reason
- * `capture-email-check.ts` gives; false where there is no request to run
- * after — a spec, a script — and the task is then not run at all.
- */ function scheduleAfterResponse(task) {
-    try {
-        const loaded = require('next/server');
-        if (typeof (loaded == null ? void 0 : loaded.after) !== 'function') return false;
-        loaded.after(()=>task().catch((error)=>{
-                console.error('[media-cdn] after-response task failed', error);
-            }));
-        return true;
-    } catch (unused) {
-        return false;
-    }
-}
 /**
  * Whether `?poster=1` was asked for (AGL-2743).
  *
@@ -1180,9 +1179,10 @@ export function parseMediaCdnRange(header, size) {
      *
      * ## Falling back to the master is right for a WIDTH and wrong for a POSTER
      *
-     * `?w=` on an asset with no such variant serves the original, and that has
-     * always been safe because both answers are the same KIND of thing: an
-     * image, larger than asked for. A rendition inherits it for the same
+     * `?w=` on an asset with no such variant serves the next larger variant,
+     * or the display copy or original when none is larger, and that is safe
+     * because every answer is the same KIND of thing: an image, larger than
+     * asked for. A rendition inherits it for the same
      * reason — an unknown `?r=` serves the master, which is the same video in
      * more bytes.
      *
@@ -1237,7 +1237,18 @@ export function parseMediaCdnRange(header, size) {
             // handed out without it would be reused across representations.
             res.setHeader('Vary', 'Accept');
         }
-        const useVariant = !usePoster && !rendition && Boolean(width) && variants.includes(width);
+        /*
+     * The variant that answers `?w=`: the width itself, or the smallest one
+     * above it the asset has (AGL-3486). An asset made by an older encoder
+     * lacks steps the page now asks for — generation 1 had 320/640/1280/1920
+     * and srcsets ask for 768 — and answering those from the original sent
+     * every phone the full-size JPEG. The next width up is the same picture,
+     * a little larger than asked for, as a WebP. Only an exact width is a
+     * `variantServed` for the year-long policy: a stand-in is replaced by the
+     * real width once the asset is regenerated.
+     */ const variantWidth = !usePoster && !rendition && width > 0 ? mediaCdnVariantFor(variants, width) : null;
+        const useVariant = variantWidth !== null;
+        const exactVariant = variantWidth === width;
         // Read only here, past every gate — a refusal above returns before the
         // parameter is ever looked at, so `?download=1` can never be the reason
         // a response happens (AGL-1411).
@@ -1272,7 +1283,7 @@ export function parseMediaCdnRange(header, size) {
      * revalidates. Between an image variant and its original that is a wrong
      * size; between a poster and its video it is a 40 KB still standing in
      * for a 40 MB film, or the reverse.
-     */ const representation = usePoster ? `-poster${usePosterVariant ? `-w${width}` : ''}` : rendition ? `-r${rendition.key}` : useVariant ? `-w${width}${encoderTag}` : useDisplay ? `-d${encoderTag}` : '';
+     */ const representation = usePoster ? `-poster${usePosterVariant ? `-w${width}` : ''}` : rendition ? `-r${rendition.key}` : useVariant ? `-w${variantWidth}${encoderTag}` : useDisplay ? `-d${encoderTag}` : '';
         // Stable URL: revalidate against an ETag so a replaced asset is picked
         // up (a conditional GET returns 304 while the content is unchanged).
         //
@@ -1298,7 +1309,7 @@ export function parseMediaCdnRange(header, size) {
             token: parseMediaCdnVersionToken(req.query[MEDIA_CDN_VERSION_PARAM]),
             currentHash,
             widthRequested: Boolean(width),
-            variantServed: useVariant,
+            variantServed: exactVariant,
             otherRepresentation: usePoster || Boolean(rendition),
             documentEncoderVersion: snapshot.get(MEDIA_VARIANT_ENCODER_VERSION_FIELD)
         });
@@ -1443,7 +1454,7 @@ export function parseMediaCdnRange(header, size) {
             [MEDIA_VARIANT_ENCODER_VERSION_FIELD]: snapshot.get(MEDIA_VARIANT_ENCODER_VERSION_FIELD),
             variantRegeneration: snapshot.get('variantRegeneration')
         })) {
-            scheduleAfterResponse(async ()=>{
+            await scheduleAfterResponse(async ()=>{
                 const regenerationPath = mediaStoragePathInScope({
                     storagePath: snapshot.get('storagePath'),
                     base: `${isOrg ? 'orgs' : 'hosts'}/${scopeId}`,
@@ -1458,7 +1469,7 @@ export function parseMediaCdnRange(header, size) {
                 if (outcome === 'failed') {
                     console.error('[media-cdn] delivery copies could not be regenerated', scopeSegment, mediaId);
                 }
-            });
+            }, '[media-cdn]');
         }
         if (!hashed) {
             setCacheControl(stableCacheControlFor(docServedType));
@@ -1497,7 +1508,7 @@ export function parseMediaCdnRange(header, size) {
         // and `parseMediaRendition` refuses a key or extension that is not
         // `[a-z0-9-]`. So no representation can address an object the master
         // could not.
-        const objectPath = usePoster ? usePosterVariant ? `${basePath}${MEDIA_POSTER_OBJECT_SUFFIX}__w${width}.webp` : mediaPosterObjectPath(basePath) : rendition ? mediaRenditionObjectPath(basePath, rendition) : useVariant ? `${basePath}__w${width}.webp` : useDisplay ? mediaDisplayObjectPath(basePath) : basePath;
+        const objectPath = usePoster ? usePosterVariant ? `${basePath}${MEDIA_POSTER_OBJECT_SUFFIX}__w${width}.webp` : mediaPosterObjectPath(basePath) : rendition ? mediaRenditionObjectPath(basePath, rendition) : useVariant ? `${basePath}__w${variantWidth}.webp` : useDisplay ? mediaDisplayObjectPath(basePath) : basePath;
         let file = bucket.file(objectPath);
         // The caller's count (AGL-2812), asked here and nowhere earlier: past every
         // gate and the 304 exit, where the Storage reads begin. It starts before the
@@ -1672,8 +1683,9 @@ export function parseMediaCdnRange(header, size) {
             merge: true
         }).catch((error)=>logUncountedServe(scopeSegment, mediaId, error));
         // Totalled beside the stream rather than ahead of it, and awaited — with
-        // the count above — once the stream ends, so the function lives until
-        // both are done.
+        // the count above — once the stream ends. The request is over by then;
+        // `runLegacyHandler` hands what this still awaits to `after()`, which is
+        // what keeps the function alive until both are written.
         const evaluation = countedBytes > 0 ? mediaCdnBandwidthEvaluation(scope, countedBytes) : null;
         if (partial) res.status(206);
         // `start`/`end` are inclusive in `createReadStream`, matching the parsed