cdk-nextjs 0.6.2 → 0.7.1

package/assets/lambdas/post-deploy/post-deploy.lambda/index.js

@@ -827,40 +827,133 @@ var import_client_s3 = require("@aws-sdk/client-s3");
 var import_debug = __toESM(require_src());
 var debug = (0, import_debug.default)("cdk-nextjs:post-deploy:prune-cache-bucket");
 var s3Client = new import_client_s3.S3Client();
+var PRUNE_BUDGET_MS = 3 * 6e4;
 async function pruneCacheBucket(props) {
   const { bucketName, currentBuildId } = props;
+  const deadline = Date.now() + PRUNE_BUDGET_MS;
+  const oldPrefixes = [];
+  let deleted = 0;
+  let continuationToken;
+  do {
+    const page = await s3Client.send(
+      new import_client_s3.ListObjectsV2Command({
+        Bucket: bucketName,
+        Delimiter: "/",
+        ContinuationToken: continuationToken
+      })
+    );
+    for (const { Prefix } of page.CommonPrefixes ?? []) {
+      if (Prefix && Prefix !== `${currentBuildId}/`) oldPrefixes.push(Prefix);
+    }
+    deleted += await deleteObjects(bucketName, page.Contents);
+    continuationToken = page.NextContinuationToken;
+  } while (continuationToken);
+  debug(`Found ${oldPrefixes.length} old build prefixes to delete`);
+  for (const [i, prefix] of oldPrefixes.entries()) {
+    continuationToken = void 0;
+    do {
+      if (Date.now() > deadline) {
+        console.warn(
+          `Cache bucket pruning stopped at its time budget after deleting ${deleted} objects; ${oldPrefixes.length - i} old build prefixes are left for the next deploy`
+        );
+        return;
+      }
+      const page = await s3Client.send(
+        new import_client_s3.ListObjectsV2Command({
+          Bucket: bucketName,
+          Prefix: prefix,
+          ContinuationToken: continuationToken
+        })
+      );
+      deleted += await deleteObjects(bucketName, page.Contents);
+      continuationToken = page.NextContinuationToken;
+    } while (continuationToken);
+  }
+  debug(
+    `Cache bucket pruning complete. Deleted ${deleted} objects from ${bucketName}`
+  );
+}
+async function deleteObjects(bucketName, contents = []) {
+  const objects = contents.filter((obj) => obj.Key).map((obj) => ({ Key: obj.Key }));
+  if (objects.length === 0) return 0;
+  try {
+    debug(
+      `Deleting cache objects: ${objects.map((o) => o.Key)} from ${bucketName}`
+    );
+    await s3Client.send(
+      new import_client_s3.DeleteObjectsCommand({
+        Bucket: bucketName,
+        Delete: { Objects: objects }
+      })
+    );
+  } catch (error) {
+    console.error("Error deleting cache objects:", error);
+  }
+  return objects.length;
+}
+
+// src/lambdas/post-deploy/prune-revalidation-table.ts
+var import_client_dynamodb = require("@aws-sdk/client-dynamodb");
+var import_debug3 = __toESM(require_src());
+
+// src/lambdas/post-deploy/prune-s3.ts
+var import_client_s32 = require("@aws-sdk/client-s3");
+var import_debug2 = __toESM(require_src());
+var debug2 = (0, import_debug2.default)("cdk-nextjs:post-deploy:prune-s3");
+var s3Client2 = new import_client_s32.S3Client();
+var MAX_CONCURRENT_OPERATIONS = 50;
+var BUILD_ID_METADATA_KEY = "build_id";
+async function pruneS3(props) {
+  const { bucketName, currentBuildId, msTtl, keyPrefix } = props;
+  const bare = (keyPrefix || "").replace(/^\/+/, "").replace(/\/+$/, "");
+  const prefix = bare ? `${bare}/_next/` : "_next/";
+  const cutoffDate = new Date(Date.now() - msTtl);
   const objectsToDelete = [];
   let continuationToken = void 0;
   let listObjectsCount = 0;
   do {
     const listObjectsV2Input = {
       Bucket: bucketName,
-      ContinuationToken: continuationToken
+      ContinuationToken: continuationToken,
+      Prefix: prefix
     };
-    const listResponse = await s3Client.send(
-      new import_client_s3.ListObjectsV2Command(listObjectsV2Input)
+    const listResponse = await s3Client2.send(
+      new import_client_s32.ListObjectsV2Command(listObjectsV2Input)
     );
-    if (!listResponse.Contents || listResponse.Contents.length === 0) {
-      break;
-    }
-    const oldCacheObjects = listResponse.Contents.filter((obj) => {
-      if (!obj.Key) return false;
-      const buildIdMatch = obj.Key.match(/^([^\/]+)\//);
-      if (buildIdMatch) {
-        const objectBuildId = buildIdMatch[1];
-        return objectBuildId !== currentBuildId;
-      }
-      return true;
+    const contents = listResponse.Contents ?? [];
+    const oldObjects = contents.filter((obj) => {
+      const lastModified = obj.LastModified || /* @__PURE__ */ new Date();
+      return obj.Key && lastModified < cutoffDate;
     });
-    debug(
-      `Found ${oldCacheObjects.length} cache objects with old BUILD_ID prefixes to delete`
+    debug2(
+      `Checking old objects metadata to determine pruning: ${oldObjects.map((o) => o.Key)}`
+    );
+    const checkResults = await processBatch(
+      oldObjects,
+      MAX_CONCURRENT_OPERATIONS,
+      async (object) => {
+        if (!object.Key) return null;
+        try {
+          const headResponse = await s3Client2.send(
+            new import_client_s32.HeadObjectCommand({
+              Bucket: bucketName,
+              Key: object.Key
+            })
+          );
+          const objectBuildId = headResponse.Metadata?.[BUILD_ID_METADATA_KEY];
+          if (objectBuildId && objectBuildId !== currentBuildId) {
+            return { Key: object.Key };
+          }
+        } catch (error) {
+          console.error(`Error checking object ${object.Key}:`, error);
+        }
+        return null;
+      }
     );
     objectsToDelete.push(
-      ...oldCacheObjects.filter((obj) => obj.Key).map((obj) => ({ Key: obj.Key }))
+      ...checkResults.filter(Boolean)
     );
-    if (listResponse.NextContinuationToken) {
-      continuationToken = listResponse.NextContinuationToken;
-    }
+    continuationToken = listResponse.NextContinuationToken;
     listObjectsCount++;
   } while (continuationToken && listObjectsCount <= 100);
   if (objectsToDelete.length > 0) {
@@ -875,24 +968,24 @@ async function pruneCacheBucket(props) {
       // Process up to 5 delete batches in parallel
       async (batch) => {
         try {
-          debug(
-            `Deleting cache objects: ${batch.map((b) => b.Key)} from ${bucketName}`
+          debug2(
+            `Deleting objects: ${batch.map((b) => b.Key)} from ${bucketName}`
           );
-          await s3Client.send(
-            new import_client_s3.DeleteObjectsCommand({
+          await s3Client2.send(
+            new import_client_s32.DeleteObjectsCommand({
               Bucket: bucketName,
               Delete: { Objects: batch }
             })
           );
-          debug(`Deleted ${batch.length} cache objects from ${bucketName}`);
+          debug2(`Deleted ${batch.length} objects from ${bucketName}`);
         } catch (error) {
-          console.error("Error deleting cache objects:", error);
+          console.error("Error deleting objects:", error);
         }
       }
     );
   }
-  debug(
-    `Cache bucket pruning complete. Deleted ${objectsToDelete.length} objects from ${bucketName}`
+  debug2(
+    `Pruning complete. Deleted ${objectsToDelete.length} objects from ${bucketName}`
   );
 }
 async function processBatch(items, batchSize, processFn) {
@@ -906,9 +999,7 @@ async function processBatch(items, batchSize, processFn) {
 }
 
 // src/lambdas/post-deploy/prune-revalidation-table.ts
-var import_client_dynamodb = require("@aws-sdk/client-dynamodb");
-var import_debug2 = __toESM(require_src());
-var debug2 = (0, import_debug2.default)("cdk-nextjs:post-deploy:prune-revalidation-table");
+var debug3 = (0, import_debug3.default)("cdk-nextjs:post-deploy:prune-revalidation-table");
 var dynamoClient = new import_client_dynamodb.DynamoDBClient();
 async function pruneRevalidationTable(props) {
   const { tableName, currentBuildId } = props;
@@ -924,34 +1015,34 @@ async function pruneRevalidationTable(props) {
     const metadataResponse = await dynamoClient.send(getCommand);
     previousBuildId = metadataResponse.Item?.buildId?.S;
   } catch (error) {
-    debug2("No metadata entry found, this may be the first deployment");
+    debug3("No metadata entry found, this may be the first deployment");
   }
   if (!previousBuildId) {
-    debug2("No previous build to prune");
+    debug3("No previous build to prune");
     await updateMetadata(tableName, currentBuildId);
     return;
   }
   if (previousBuildId === currentBuildId) {
-    debug2(
+    debug3(
       `Previous build ID matches current build ID (${currentBuildId}), nothing to prune`
     );
     return;
   }
-  debug2(`Pruning revalidation entries for previous build: ${previousBuildId}`);
+  debug3(`Pruning revalidation entries for previous build: ${previousBuildId}`);
   const itemsToDelete = [];
-  let lastEvaluatedKey = void 0;
-  do {
-    const queryCommand = new import_client_dynamodb.QueryCommand({
-      TableName: tableName,
-      KeyConditionExpression: "pk = :pk",
-      ExpressionAttributeValues: {
-        ":pk": { S: previousBuildId }
-      },
-      ExclusiveStartKey: lastEvaluatedKey
-    });
-    const response = await dynamoClient.send(queryCommand);
-    if (response.Items && response.Items.length > 0) {
-      for (const item of response.Items) {
+  for (const pk of [previousBuildId, `${previousBuildId}#log`]) {
+    let lastEvaluatedKey = void 0;
+    do {
+      const queryCommand = new import_client_dynamodb.QueryCommand({
+        TableName: tableName,
+        KeyConditionExpression: "pk = :pk",
+        ExpressionAttributeValues: {
+          ":pk": { S: pk }
+        },
+        ExclusiveStartKey: lastEvaluatedKey
+      });
+      const response = await dynamoClient.send(queryCommand);
+      for (const item of response.Items ?? []) {
         if (item.pk?.S && item.sk?.S) {
           itemsToDelete.push({
             pk: { S: item.pk.S },
@@ -959,10 +1050,10 @@ async function pruneRevalidationTable(props) {
           });
         }
       }
-    }
-    lastEvaluatedKey = response.LastEvaluatedKey;
-  } while (lastEvaluatedKey);
-  debug2(
+      lastEvaluatedKey = response.LastEvaluatedKey;
+    } while (lastEvaluatedKey);
+  }
+  debug3(
     `Found ${itemsToDelete.length} revalidation entries to delete for build ${previousBuildId}`
   );
   if (itemsToDelete.length > 0) {
@@ -971,7 +1062,7 @@ async function pruneRevalidationTable(props) {
       const batch = itemsToDelete.slice(i, i + 25);
       deleteBatches.push(batch);
     }
-    await processBatch2(
+    await processBatch(
       deleteBatches,
       5,
       // Process up to 5 delete batches in parallel
@@ -982,7 +1073,7 @@ async function pruneRevalidationTable(props) {
               Key: item
             }
           }));
-          debug2(
+          debug3(
             `Deleting revalidation entries: ${batch.map((b) => `${b.pk.S}/${b.sk.S}`).join(", ")} from ${tableName}`
           );
           await dynamoClient.send(
@@ -992,7 +1083,7 @@ async function pruneRevalidationTable(props) {
               }
             })
           );
-          debug2(
+          debug3(
             `Deleted ${batch.length} revalidation entries from ${tableName}`
           );
         } catch (error) {
@@ -1002,7 +1093,7 @@ async function pruneRevalidationTable(props) {
     );
   }
   await updateMetadata(tableName, currentBuildId);
-  debug2(
+  debug3(
     `Revalidation table pruning complete. Deleted ${itemsToDelete.length} entries from ${tableName}`
   );
 }
@@ -1017,119 +1108,7 @@ async function updateMetadata(tableName, currentBuildId) {
     }
   });
   await dynamoClient.send(putCommand);
-  debug2(`Updated metadata with current build ID: ${currentBuildId}`);
-}
-async function processBatch2(items, batchSize, processFn) {
-  const results = [];
-  for (let i = 0; i < items.length; i += batchSize) {
-    const batch = items.slice(i, i + batchSize);
-    const batchResults = await Promise.all(batch.map(processFn));
-    results.push(...batchResults);
-  }
-  return results;
-}
-
-// src/lambdas/post-deploy/prune-s3.ts
-var import_client_s32 = require("@aws-sdk/client-s3");
-var import_debug3 = __toESM(require_src());
-var debug3 = (0, import_debug3.default)("cdk-nextjs:post-deploy:prune-s3");
-var s3Client2 = new import_client_s32.S3Client();
-var MAX_CONCURRENT_OPERATIONS = 50;
-async function pruneS3(props) {
-  const { bucketName, currentBuildId, msTtl, keyPrefix } = props;
-  const bare = (keyPrefix || "").replace(/^\/+/, "").replace(/\/+$/, "");
-  const prefix = bare ? `${bare}/` : void 0;
-  const cutoffDate = new Date(Date.now() - msTtl);
-  const objectsToDelete = [];
-  let continuationToken = void 0;
-  let listObjectsCount = 0;
-  do {
-    const listObjectsV2Input = {
-      Bucket: bucketName,
-      ContinuationToken: continuationToken,
-      Prefix: prefix
-    };
-    const listResponse = await s3Client2.send(
-      new import_client_s32.ListObjectsV2Command(listObjectsV2Input)
-    );
-    if (!listResponse.Contents || listResponse.Contents.length === 0) {
-      break;
-    }
-    const oldObjects = listResponse.Contents.filter((obj) => {
-      const lastModified = obj.LastModified || /* @__PURE__ */ new Date();
-      return obj.Key && lastModified < cutoffDate;
-    });
-    debug3(
-      `Checking old objects metadata to determine pruning: ${oldObjects.map((o) => o.Key)}`
-    );
-    const checkResults = await processBatch3(
-      oldObjects,
-      MAX_CONCURRENT_OPERATIONS,
-      async (object) => {
-        if (!object.Key) return null;
-        try {
-          const headResponse = await s3Client2.send(
-            new import_client_s32.HeadObjectCommand({
-              Bucket: bucketName,
-              Key: object.Key
-            })
-          );
-          const objectBuildId = headResponse.Metadata?.["next-build-id"];
-          if (objectBuildId !== currentBuildId) {
-            return { Key: object.Key };
-          }
-        } catch (error) {
-          console.error(`Error checking object ${object.Key}:`, error);
-        }
-        return null;
-      }
-    );
-    objectsToDelete.push(
-      ...checkResults.filter(Boolean)
-    );
-    continuationToken = listResponse.NextContinuationToken;
-    listObjectsCount++;
-  } while (continuationToken && listObjectsCount <= 100);
-  if (objectsToDelete.length > 0) {
-    const deleteBatches = [];
-    for (let i = 0; i < objectsToDelete.length; i += 1e3) {
-      const batch = objectsToDelete.slice(i, i + 1e3);
-      deleteBatches.push(batch);
-    }
-    await processBatch3(
-      deleteBatches,
-      5,
-      // Process up to 5 delete batches in parallel
-      async (batch) => {
-        try {
-          debug3(
-            `Deleting objects: ${batch.map((b) => b.Key)} from ${bucketName}`
-          );
-          await s3Client2.send(
-            new import_client_s32.DeleteObjectsCommand({
-              Bucket: bucketName,
-              Delete: { Objects: batch }
-            })
-          );
-          debug3(`Deleted ${batch.length} objects from ${bucketName}`);
-        } catch (error) {
-          console.error("Error deleting objects:", error);
-        }
-      }
-    );
-  }
-  debug3(
-    `Pruning complete. Deleted ${objectsToDelete.length} objects from ${bucketName}`
-  );
-}
-async function processBatch3(items, batchSize, processFn) {
-  const results = [];
-  for (let i = 0; i < items.length; i += batchSize) {
-    const batch = items.slice(i, i + batchSize);
-    const batchResults = await Promise.all(batch.map(processFn));
-    results.push(...batchResults);
-  }
-  return results;
+  debug3(`Updated metadata with current build ID: ${currentBuildId}`);
 }
 
 // src/lambdas/utils.ts