@netlify/plugin-nextjs 5.14.4 → 5.14.6

package/dist/run/storage/regional-blob-store.cjs

@@ -384,6 +384,25 @@ var Store = class _Store {
       throw new BlobsInternalError(res);
     }
   }
+  async deleteAll() {
+    let totalDeletedBlobs = 0;
+    let hasMore = true;
+    while (hasMore) {
+      const res = await this.client.makeRequest({ method: "delete", storeName: this.name });
+      if (res.status !== 200) {
+        throw new BlobsInternalError(res);
+      }
+      const data = await res.json();
+      if (typeof data.blobs_deleted !== "number") {
+        throw new BlobsInternalError(res);
+      }
+      totalDeletedBlobs += data.blobs_deleted;
+      hasMore = typeof data.has_more === "boolean" && data.has_more;
+    }
+    return {
+      deletedBlobs: totalDeletedBlobs
+    };
+  }
   async get(key, options) {
     return withActiveSpan(getTracer(), "blobs.get", async (span) => {
       const { consistency, type } = options ?? {};
@@ -401,6 +420,7 @@ var Store = class _Store {
         storeName: this.name
       });
       span?.setAttributes({
+        "blobs.response.body.size": res.headers.get("content-length") ?? void 0,
         "blobs.response.status": res.status
       });
       if (res.status === 404) {
@@ -475,6 +495,7 @@ var Store = class _Store {
       });
       const responseETag = res?.headers.get("etag") ?? void 0;
       span?.setAttributes({
+        "blobs.response.body.size": res.headers.get("content-length") ?? void 0,
         "blobs.response.etag": responseETag,
         "blobs.response.status": res.status
       });

package/dist/run/storage/request-scoped-in-memory-cache.cjs

@@ -1400,6 +1400,9 @@ var import_blob_types = require("../../shared/blob-types.cjs");
 var import_request_context = require("../handlers/request-context.cjs");
 var import_tracer = require("../handlers/tracer.cjs");
 var NullValue = Symbol.for("null-value");
+var isDataWithEtag = (value) => {
+  return typeof value === "object" && value !== null && "data" in value && "etag" in value;
+};
 var IN_MEMORY_CACHE_MAX_SIZE = Symbol.for("nf-in-memory-cache-max-size");
 var IN_MEMORY_LRU_CACHE = Symbol.for("nf-in-memory-lru-cache");
 var extendedGlobalThis = globalThis;
@@ -1413,24 +1416,29 @@ var isPositiveNumber = (value) => {
   return typeof value === "number" && value > 0;
 };
 var BASE_BLOB_SIZE = 25;
+var BASE_BLOB_WITH_ETAG_SIZE = BASE_BLOB_SIZE + 34;
 var estimateBlobKnownTypeSize = (valueToStore) => {
-  if (valueToStore === null || (0, import_types.isPromise)(valueToStore) || (0, import_blob_types.isTagManifest)(valueToStore)) {
+  if (valueToStore === null || (0, import_types.isPromise)(valueToStore)) {
     return BASE_BLOB_SIZE;
   }
-  if ((0, import_blob_types.isHtmlBlob)(valueToStore)) {
-    return BASE_BLOB_SIZE + valueToStore.html.length;
+  const { data, baseSize } = isDataWithEtag(valueToStore) ? { data: valueToStore.data, baseSize: BASE_BLOB_WITH_ETAG_SIZE } : { data: valueToStore, baseSize: BASE_BLOB_SIZE };
+  if ((0, import_blob_types.isTagManifest)(data)) {
+    return baseSize;
+  }
+  if ((0, import_blob_types.isHtmlBlob)(data)) {
+    return baseSize + data.html.length;
   }
-  if (valueToStore.value?.kind === "FETCH") {
-    return BASE_BLOB_SIZE + valueToStore.value.data.body.length;
+  if (data.value?.kind === "FETCH") {
+    return baseSize + data.value.data.body.length;
   }
-  if (valueToStore.value?.kind === "APP_PAGE") {
-    return BASE_BLOB_SIZE + valueToStore.value.html.length + (valueToStore.value.rscData?.length ?? 0);
+  if (data.value?.kind === "APP_PAGE") {
+    return baseSize + data.value.html.length + (data.value.rscData?.length ?? 0);
   }
-  if (valueToStore.value?.kind === "PAGE" || valueToStore.value?.kind === "PAGES") {
-    return BASE_BLOB_SIZE + valueToStore.value.html.length + JSON.stringify(valueToStore.value.pageData).length;
+  if (data.value?.kind === "PAGE" || data.value?.kind === "PAGES") {
+    return baseSize + data.value.html.length + JSON.stringify(data.value.pageData).length;
   }
-  if (valueToStore.value?.kind === "ROUTE" || valueToStore.value?.kind === "APP_ROUTE") {
-    return BASE_BLOB_SIZE + valueToStore.value.body.length;
+  if (data.value?.kind === "ROUTE" || data.value?.kind === "APP_ROUTE") {
+    return baseSize + data.value.body.length;
   }
 };
 var estimateBlobSize = (valueToStore) => {
@@ -1456,13 +1464,22 @@ var estimateBlobSize = (valueToStore) => {
 function getInMemoryLRUCache() {
   if (typeof extendedGlobalThis[IN_MEMORY_LRU_CACHE] === "undefined") {
     const maxSize = typeof extendedGlobalThis[IN_MEMORY_CACHE_MAX_SIZE] === "number" ? extendedGlobalThis[IN_MEMORY_CACHE_MAX_SIZE] : DEFAULT_FALLBACK_MAX_SIZE;
-    extendedGlobalThis[IN_MEMORY_LRU_CACHE] = maxSize === 0 ? null : new LRUCache({
-      max: 1e3,
-      maxSize,
-      sizeCalculation: (valueToStore) => {
-        return estimateBlobSize(valueToStore === NullValue ? null : valueToStore);
-      }
-    });
+    if (maxSize === 0) {
+      extendedGlobalThis[IN_MEMORY_LRU_CACHE] = null;
+    } else {
+      const global = /* @__PURE__ */ new Map();
+      const perRequest = new LRUCache({
+        max: 1e3,
+        maxSize,
+        sizeCalculation: (valueToStore) => {
+          return estimateBlobSize(valueToStore === NullValue ? null : valueToStore);
+        }
+      });
+      extendedGlobalThis[IN_MEMORY_LRU_CACHE] = {
+        perRequest,
+        global
+      };
+    }
   }
   return extendedGlobalThis[IN_MEMORY_LRU_CACHE];
 }
@@ -1473,8 +1490,27 @@ var getRequestScopedInMemoryCache = () => {
     get(key) {
       if (!requestContext) return;
       try {
-        const value = inMemoryLRUCache?.get(`${requestContext.requestID}:${key}`);
-        return value === NullValue ? null : value;
+        const currentRequestValue = inMemoryLRUCache?.perRequest.get(
+          `${requestContext.requestID}:${key}`
+        );
+        if (currentRequestValue) {
+          return {
+            conditional: false,
+            currentRequestValue: currentRequestValue === NullValue ? null : isDataWithEtag(currentRequestValue) ? currentRequestValue.data : currentRequestValue
+          };
+        }
+        const globalEntry = inMemoryLRUCache?.global.get(key);
+        if (globalEntry) {
+          const derefencedGlobalEntry = globalEntry.deref();
+          if (derefencedGlobalEntry) {
+            return {
+              conditional: true,
+              globalValue: derefencedGlobalEntry.data,
+              etag: derefencedGlobalEntry.etag
+            };
+          }
+          inMemoryLRUCache?.global.delete(key);
+        }
       } catch (error) {
         (0, import_tracer.recordWarning)(new Error("Failed to get value from memory cache", { cause: error }));
       }
@@ -1482,7 +1518,10 @@ var getRequestScopedInMemoryCache = () => {
     set(key, value) {
       if (!requestContext) return;
       try {
-        inMemoryLRUCache?.set(`${requestContext?.requestID}:${key}`, value ?? NullValue);
+        if (isDataWithEtag(value)) {
+          inMemoryLRUCache?.global.set(key, new WeakRef(value));
+        }
+        inMemoryLRUCache?.perRequest.set(`${requestContext.requestID}:${key}`, value ?? NullValue);
       } catch (error) {
         (0, import_tracer.recordWarning)(new Error("Failed to store value in memory cache", { cause: error }));
       }

package/dist/run/storage/storage.cjs

@@ -51,15 +51,32 @@ var getMemoizedKeyValueStoreBackedByRegionalBlobStore = (...args) => {
     async get(key, otelSpanTitle) {
       const inMemoryCache = (0, import_request_scoped_in_memory_cache.getRequestScopedInMemoryCache)();
       const memoizedValue = inMemoryCache.get(key);
-      if (typeof memoizedValue !== "undefined") {
-        return memoizedValue;
+      if (memoizedValue?.conditional === false && typeof memoizedValue?.currentRequestValue !== "undefined") {
+        return memoizedValue.currentRequestValue;
       }
       const blobKey = await encodeBlobKey(key);
       const getPromise = (0, import_tracer.withActiveSpan)(tracer, otelSpanTitle, async (span) => {
-        span?.setAttributes({ key, blobKey });
-        const blob = await store.get(blobKey, { type: "json" });
-        inMemoryCache.set(key, blob);
-        span?.addEvent(blob ? "Hit" : "Miss");
+        const { etag: previousEtag, globalValue: previousBlob } = memoizedValue?.conditional ? memoizedValue : {};
+        span?.setAttributes({ key, blobKey, previousEtag });
+        const result = await store.getWithMetadata(blobKey, {
+          type: "json",
+          etag: previousEtag
+        });
+        const shouldReuseMemoizedBlob = result?.etag && previousEtag === result?.etag;
+        const blob = shouldReuseMemoizedBlob ? previousBlob : result?.data;
+        if (result?.etag && blob) {
+          inMemoryCache.set(key, {
+            data: blob,
+            etag: result?.etag
+          });
+        } else {
+          inMemoryCache.set(key, blob);
+        }
+        span?.setAttributes({
+          etag: result?.etag,
+          reusingPreviouslyFetchedBlob: shouldReuseMemoizedBlob,
+          status: blob ? shouldReuseMemoizedBlob ? "Hit, no change" : "Hit" : "Miss"
+        });
         return blob;
       });
       inMemoryCache.set(key, getPromise);
@@ -71,7 +88,14 @@ var getMemoizedKeyValueStoreBackedByRegionalBlobStore = (...args) => {
       const blobKey = await encodeBlobKey(key);
       return (0, import_tracer.withActiveSpan)(tracer, otelSpanTitle, async (span) => {
         span?.setAttributes({ key, blobKey });
-        return await store.setJSON(blobKey, value);
+        const writeResult = await store.setJSON(blobKey, value);
+        if (writeResult?.etag) {
+          inMemoryCache.set(key, {
+            data: value,
+            etag: writeResult.etag
+          });
+        }
+        return writeResult;
       });
     }
   };

package/edge-runtime/shim/node.js

@@ -1,16 +1,21 @@
 // NOTE: This is a fragment of a JavaScript program that will be inlined with
 // a Webpack bundle. You should not import this file from anywhere in the
 // application.
-import { AsyncLocalStorage } from 'node:async_hooks'
-
 import { createRequire } from 'node:module' // used in dynamically generated part
-import process from 'node:process'
 
 import { registerCJSModules } from '../edge-runtime/lib/cjs.ts' // used in dynamically generated part
 
-globalThis.process = process
+if (typeof process === 'undefined') {
+  globalThis.process = (await import('node:process')).default
+}
+
+if (typeof AsyncLocalStorage === 'undefined') {
+  globalThis.AsyncLocalStorage = (await import('node:async_hooks')).AsyncLocalStorage
+}
 
-globalThis.AsyncLocalStorage = AsyncLocalStorage
+if (typeof Buffer === 'undefined') {
+  globalThis.Buffer = (await import('node:buffer')).Buffer
+}
 
 // needed for path.relative and path.resolve to work
 Deno.cwd = () => ''

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "5.14.4",
+  "version": "5.14.6",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",