bunnyquery 1.8.8 → 1.8.9

package/bunnyquery.js

@@ -566,8 +566,41 @@ Index the REMAINING windows - one record per row/item, looking at any page image
   var EXPIRED_ATTACHMENT_URL_ORIGIN = "https://" + EXPIRED_ATTACHMENT_URL_HOST;
   var LINK_LABEL_MAX_DISPLAY_CHARS = 32;
   var EXPIRED_LINK_REFRESH_EXPIRES_SECONDS = 20 * 60;
+  var PREVIEW_URL_EXPIRES_SECONDS = 60 * 60;
   var PREVIEW_BROWSER_CACHE_SECONDS = 7 * 24 * 60 * 60;
   var LINK_REFRESH_WINDOW_MS = (EXPIRED_LINK_REFRESH_EXPIRES_SECONDS - 5 * 60) * 1e3;
+  var MINT_CACHE_GENERATION = 2;
+  function mintCacheBustStamp(now) {
+    return Math.floor((Date.now() ) / LINK_REFRESH_WINDOW_MS);
+  }
+  function previewMintCacheToken(refresh) {
+    if (!refresh) return String(MINT_CACHE_GENERATION);
+    return MINT_CACHE_GENERATION + "." + mintCacheBustStamp();
+  }
+  var PRESIGN_SAFETY_MARGIN_MS = 60 * 1e3;
+  function presignExpiryEpochMs(url) {
+    if (!url) return null;
+    var q = url.indexOf("?");
+    if (q < 0) return null;
+    var params;
+    try {
+      params = new URLSearchParams(url.slice(q + 1));
+    } catch (e) {
+      return null;
+    }
+    var v2 = params.get("Expires");
+    if (v2 && /^\d+$/.test(v2)) return parseInt(v2, 10) * 1e3;
+    var signed = params.get("X-Amz-Date");
+    var lifetime = params.get("X-Amz-Expires");
+    if (signed && lifetime && /^\d+$/.test(lifetime)) {
+      var m = /^(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})Z$/.exec(signed);
+      if (m) {
+        var at = Date.UTC(+m[1], +m[2] - 1, +m[3], +m[4], +m[5], +m[6]);
+        return at + parseInt(lifetime, 10) * 1e3;
+      }
+    }
+    return null;
+  }
   function createInlineLinkRegex() {
     return /src::(\S+)|\[([^\]\n]+)\]\((https?:\/\/(?:[^\s()]|\([^\s()]*\))+)\)|\[([^\]\n]+)\]\(((?:[^()\n]|\([^()\n]*\))+)\)|(https?:\/\/[^\s<>"']+)/g;
   }
@@ -812,6 +845,13 @@ Index the REMAINING windows - one record per row/item, looking at any page image
   function linkUnavailableKeyForHref(href) {
     return "href:" + (href || "");
   }
+  function linkUnavailableKeysForPath(remotePath) {
+    if (!remotePath) return [];
+    return [
+      linkUnavailableKeyForPath(remotePath),
+      linkUnavailableKeyForHref(buildDisplayExpiredAttachmentHref(remotePath))
+    ];
+  }
   function isLinkUnavailable(link, map) {
     if (!link || !map) return false;
     if (link.remotePath && map[linkUnavailableKeyForPath(link.remotePath)]) return true;
@@ -1206,8 +1246,11 @@ Index the REMAINING windows - one record per row/item, looking at any page image
   }
   function peekImagePreviewUrl(ctx, remotePath) {
     var hit = previewUrlCache[cacheKey(ctx.scope, remotePath)];
-    if (hit && Date.now() - hit.at < LINK_REFRESH_WINDOW_MS) return hit.url;
-    return null;
+    if (!hit) return null;
+    if (Date.now() - hit.at >= LINK_REFRESH_WINDOW_MS) return null;
+    var dies = presignExpiryEpochMs(hit.url);
+    if (dies !== null && Date.now() >= dies - PRESIGN_SAFETY_MARGIN_MS) return null;
+    return hit.url;
   }
   function resolveImagePreviewUrl(ctx, remotePath, contentType, refresh) {
     var key = cacheKey(ctx.scope, remotePath);
@@ -1257,6 +1300,7 @@ Index the REMAINING windows - one record per row/item, looking at any page image
     img.setAttribute("data-bq-img-state", "loading");
     img.addEventListener("load", function() {
       img.setAttribute("data-bq-img-state", "ready");
+      img.removeAttribute("data-bq-img-retry");
       if (ctx.onLoad) ctx.onLoad(path);
     });
     img.addEventListener("error", function() {
@@ -8217,7 +8261,7 @@ Index the REMAINING windows - one record per row/item, looking at any page image
       if (cdn === false && opts.browserCache) {
         reqOpts.method = "get";
         reqOpts.stableGateway = true;
-        if (opts.refresh) reqOpts.revalidate = true;
+        body.nocache = previewMintCacheToken(opts.refresh);
         body.browser_cache = opts.browserCache;
         var uid = S.user && S.user.user_id;
         if (uid) body.uid = uid;
@@ -8736,10 +8780,7 @@ Index the REMAINING windows - one record per row/item, looking at any page image
       return getTemporaryUrlDb(remotePath, EXPIRED_LINK_REFRESH_EXPIRES_SECONDS, false);
     }
     var unavailableRepaintQueued = false;
-    function markLinkUnavailable(key) {
-      if (!key || unavailableLinkMap[key]) return;
-      unavailableLinkMap[key] = true;
-      if (!refreshedLinkExpiryTimer) scheduleNextLinkExpiryBoundary();
+    function queueUnavailableRepaint() {
       if (unavailableRepaintQueued) return;
       unavailableRepaintQueued = true;
       setTimeout(function() {
@@ -8747,18 +8788,37 @@ Index the REMAINING windows - one record per row/item, looking at any page image
         renderMessages();
       }, 0);
     }
+    function markLinkUnavailable(key) {
+      if (!key || unavailableLinkMap[key]) return;
+      unavailableLinkMap[key] = true;
+      if (!refreshedLinkExpiryTimer) scheduleNextLinkExpiryBoundary();
+      queueUnavailableRepaint();
+    }
+    function clearLinkUnavailable(keys) {
+      var changed = false;
+      for (var i = 0; i < (keys || []).length; i++) {
+        var k = keys[i];
+        if (!k || !unavailableLinkMap[k]) continue;
+        delete unavailableLinkMap[k];
+        changed = true;
+      }
+      if (changed) queueUnavailableRepaint();
+    }
     function imagePreviewCtx() {
       return {
         scope: S.projectId || "default",
         mint: function(remotePath, contentType, refresh) {
-          return getTemporaryUrlDb(remotePath, EXPIRED_LINK_REFRESH_EXPIRES_SECONDS, false, contentType, {
+          return getTemporaryUrlDb(remotePath, PREVIEW_URL_EXPIRES_SECONDS, false, contentType, {
             browserCache: PREVIEW_BROWSER_CACHE_SECONDS,
             refresh
           });
         },
         // An image arriving late pushes the conversation down under the
-        // viewport. Re-pin only if the user was already at the bottom.
-        onLoad: function() {
+        // viewport. Re-pin only if the user was already at the bottom. A
+        // paint is also proof the file is reachable, so it lifts any mark an
+        // earlier failure left on this file's chips.
+        onLoad: function(path) {
+          clearLinkUnavailable(linkUnavailableKeysForPath(path));
           scrollToBottomIfSticky(false);
         },
         // The mint was refused, or the url it minted would not load. Either

package/dist/engine.cjs

@@ -603,8 +603,41 @@ var EXPIRED_ATTACHMENT_URL_HOST = "_expired_.url";
 var EXPIRED_ATTACHMENT_URL_ORIGIN = "https://" + EXPIRED_ATTACHMENT_URL_HOST;
 var LINK_LABEL_MAX_DISPLAY_CHARS = 32;
 var EXPIRED_LINK_REFRESH_EXPIRES_SECONDS = 20 * 60;
+var PREVIEW_URL_EXPIRES_SECONDS = 60 * 60;
 var PREVIEW_BROWSER_CACHE_SECONDS = 7 * 24 * 60 * 60;
 var LINK_REFRESH_WINDOW_MS = (EXPIRED_LINK_REFRESH_EXPIRES_SECONDS - 5 * 60) * 1e3;
+var MINT_CACHE_GENERATION = 2;
+function mintCacheBustStamp(now) {
+  return Math.floor((now == null ? Date.now() : now) / LINK_REFRESH_WINDOW_MS);
+}
+function previewMintCacheToken(refresh) {
+  if (!refresh) return String(MINT_CACHE_GENERATION);
+  return MINT_CACHE_GENERATION + "." + mintCacheBustStamp();
+}
+var PRESIGN_SAFETY_MARGIN_MS = 60 * 1e3;
+function presignExpiryEpochMs(url) {
+  if (!url) return null;
+  var q = url.indexOf("?");
+  if (q < 0) return null;
+  var params;
+  try {
+    params = new URLSearchParams(url.slice(q + 1));
+  } catch (e) {
+    return null;
+  }
+  var v2 = params.get("Expires");
+  if (v2 && /^\d+$/.test(v2)) return parseInt(v2, 10) * 1e3;
+  var signed = params.get("X-Amz-Date");
+  var lifetime = params.get("X-Amz-Expires");
+  if (signed && lifetime && /^\d+$/.test(lifetime)) {
+    var m = /^(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})Z$/.exec(signed);
+    if (m) {
+      var at = Date.UTC(+m[1], +m[2] - 1, +m[3], +m[4], +m[5], +m[6]);
+      return at + parseInt(lifetime, 10) * 1e3;
+    }
+  }
+  return null;
+}
 function createInlineLinkRegex() {
   return /src::(\S+)|\[([^\]\n]+)\]\((https?:\/\/(?:[^\s()]|\([^\s()]*\))+)\)|\[([^\]\n]+)\]\(((?:[^()\n]|\([^()\n]*\))+)\)|(https?:\/\/[^\s<>"']+)/g;
 }
@@ -855,6 +888,13 @@ function linkUnavailableKeyForPath(remotePath) {
 function linkUnavailableKeyForHref(href) {
   return "href:" + (href || "");
 }
+function linkUnavailableKeysForPath(remotePath) {
+  if (!remotePath) return [];
+  return [
+    linkUnavailableKeyForPath(remotePath),
+    linkUnavailableKeyForHref(buildDisplayExpiredAttachmentHref(remotePath))
+  ];
+}
 function isLinkUnavailable(link, map) {
   if (!link || !map) return false;
   if (link.remotePath && map[linkUnavailableKeyForPath(link.remotePath)]) return true;
@@ -1277,8 +1317,11 @@ function clearImagePreviewCache(scope) {
 }
 function peekImagePreviewUrl(ctx, remotePath) {
   var hit = previewUrlCache[cacheKey(ctx.scope, remotePath)];
-  if (hit && Date.now() - hit.at < LINK_REFRESH_WINDOW_MS) return hit.url;
-  return null;
+  if (!hit) return null;
+  if (Date.now() - hit.at >= LINK_REFRESH_WINDOW_MS) return null;
+  var dies = presignExpiryEpochMs(hit.url);
+  if (dies !== null && Date.now() >= dies - PRESIGN_SAFETY_MARGIN_MS) return null;
+  return hit.url;
 }
 function resolveImagePreviewUrl(ctx, remotePath, contentType, refresh) {
   var key = cacheKey(ctx.scope, remotePath);
@@ -1328,6 +1371,7 @@ function hydrateOne(img, ctx) {
   img.setAttribute("data-bq-img-state", "loading");
   img.addEventListener("load", function() {
     img.setAttribute("data-bq-img-state", "ready");
+    img.removeAttribute("data-bq-img-retry");
     if (ctx.onLoad) ctx.onLoad(path);
   });
   img.addEventListener("error", function() {
@@ -6109,12 +6153,15 @@ exports.MAX_OUTPUT_BY_MODEL = MAX_OUTPUT_BY_MODEL;
 exports.MAX_OUTPUT_TOKENS = MAX_OUTPUT_TOKENS;
 exports.MAX_PARSED_CONTENT_CHARS = MAX_PARSED_CONTENT_CHARS;
 exports.MCP_NAME = MCP_NAME;
+exports.MINT_CACHE_GENERATION = MINT_CACHE_GENERATION;
 exports.MIN_INPUT_TOKEN_BUDGET = MIN_INPUT_TOKEN_BUDGET;
 exports.MIN_PER_REQUEST_INPUT_CAP = MIN_PER_REQUEST_INPUT_CAP;
 exports.OUTPUT_TOKEN_RESERVE = OUTPUT_TOKEN_RESERVE;
 exports.POLL_INTERVAL = POLL_INTERVAL;
+exports.PRESIGN_SAFETY_MARGIN_MS = PRESIGN_SAFETY_MARGIN_MS;
 exports.PREVIEWABLE_IMAGE_CONTENT_TYPES = PREVIEWABLE_IMAGE_CONTENT_TYPES;
 exports.PREVIEW_BROWSER_CACHE_SECONDS = PREVIEW_BROWSER_CACHE_SECONDS;
+exports.PREVIEW_URL_EXPIRES_SECONDS = PREVIEW_URL_EXPIRES_SECONDS;
 exports.RENDER_FROM_TOKEN = RENDER_FROM_TOKEN;
 exports.RTF_EXTS = RTF_EXTS;
 exports.RUN_RECORD_WORKING_STALE_MS = RUN_RECORD_WORKING_STALE_MS;
@@ -6194,12 +6241,14 @@ exports.isServerExtractable = isServerExtractable;
 exports.isServiceDbAttachmentHref = isServiceDbAttachmentHref;
 exports.linkUnavailableKeyForHref = linkUnavailableKeyForHref;
 exports.linkUnavailableKeyForPath = linkUnavailableKeyForPath;
+exports.linkUnavailableKeysForPath = linkUnavailableKeysForPath;
 exports.listClaudeModels = listClaudeModels;
 exports.listOpenAIModels = listOpenAIModels;
 exports.looksLikeRtf = looksLikeRtf;
 exports.makeExtractPlaceholder = makeExtractPlaceholder;
 exports.mapHistoryListToMessages = mapHistoryListToMessages;
 exports.markImagePreviewStale = markImagePreviewStale;
+exports.mintCacheBustStamp = mintCacheBustStamp;
 exports.needsBomForExt = needsBomForExt;
 exports.normalizeAttachmentPathCandidate = normalizeAttachmentPathCandidate;
 exports.normalizeExt = normalizeExt;
@@ -6212,7 +6261,9 @@ exports.parseIndexingLabel = parseIndexingLabel;
 exports.parseIndexingRequestText = parseIndexingRequestText;
 exports.peekImagePreviewUrl = peekImagePreviewUrl;
 exports.prepareDownloadText = prepareDownloadText;
+exports.presignExpiryEpochMs = presignExpiryEpochMs;
 exports.previewImageContentType = previewImageContentType;
+exports.previewMintCacheToken = previewMintCacheToken;
 exports.previewableExtOf = previewableExtOf;
 exports.readExpiredAttachmentHref = readExpiredAttachmentHref;
 exports.registerAttachmentParser = registerAttachmentParser;