fix: XML Malformed Error DeleteObjectsCommand (#300)

* Double chunk DDB batch writes to not overwhelm DDB on load

.gitignore

@@ -19,7 +19,7 @@ next-env.d.ts
 
 .turbo
 # Tests
-tests-unit/coverage
+packages/tests-unit/coverage
 test-results
 
 .sst/

packages/open-next/src/adapters/cache.ts

@@ -15,7 +15,7 @@ import {
 import path from "path";
 
 import { MAX_DYNAMO_BATCH_WRITE_ITEM_COUNT } from "./constants.js";
-import { debug, error } from "./logger.js";
+import { debug, error, warn } from "./logger.js";
 import { chunk } from "./util.js";
 
 interface CachedFetchValue {
@@ -88,7 +88,7 @@ interface CacheHandlerValue {
   value: IncrementalCacheValue | null;
 }
 
-type Extension =
+type CacheExtension =
   | "json"
   | "html"
   | "rsc"
@@ -97,6 +97,13 @@ type Extension =
   | "fetch"
   | "redirect";
 
+/** Beginning single backslash is intentional, to look for the dot + the extension. Do not escape it again. */
+const CACHE_EXTENSION_REGEX = /\.(json|html|rsc|body|meta|fetch|redirect)$/;
+
+export function hasCacheExtension(key: string) {
+  return CACHE_EXTENSION_REGEX.test(key);
+}
+
 // Expected environment variables
 const {
   CACHE_BUCKET_NAME,
@@ -459,7 +466,7 @@ export default class S3Cache {
 
   // S3 handling
 
-  private buildS3Key(key: string, extension: Extension) {
+  private buildS3Key(key: string, extension: CacheExtension) {
     return path.posix.join(
       CACHE_BUCKET_KEY_PREFIX ?? "",
       extension === "fetch" ? "__fetch" : "",
@@ -484,7 +491,11 @@ export default class S3Cache {
     return (Contents ?? []).map(({ Key }) => Key) as string[];
   }
 
-  private async getS3Object(key: string, extension: Extension, keys: string[]) {
+  private async getS3Object(
+    key: string,
+    extension: CacheExtension,
+    keys: string[],
+  ) {
     try {
       if (!keys.includes(this.buildS3Key(key, extension)))
         return { Body: null, LastModified: null };
@@ -503,7 +514,7 @@ export default class S3Cache {
 
   private putS3Object(
     key: string,
-    extension: Extension,
+    extension: CacheExtension,
     value: PutObjectCommandInput["Body"],
   ) {
     return this.client.send(
@@ -517,11 +528,17 @@ export default class S3Cache {
 
   private async deleteS3Objects(key: string) {
     try {
-      const regex = new RegExp(`\.(json|rsc|html|body|meta|fetch|redirect)$`);
       const s3Keys = (await this.listS3Object(key)).filter(
-        (key) => key && regex.test(key),
+        (key) => key && hasCacheExtension(key),
       );
 
+      if (s3Keys.length === 0) {
+        warn(
+          `No s3 keys with a valid cache extension found for ${key}, see type CacheExtension in OpenNext for details`,
+        );
+        return;
+      }
+
       await this.client.send(
         new DeleteObjectsCommand({
           Bucket: CACHE_BUCKET_NAME,

packages/tests-unit/tests/cache.test.ts

@@ -0,0 +1,11 @@
+import { hasCacheExtension } from "../../open-next/src/adapters/cache";
+
+describe("hasCacheExtension", () => {
+  it("Should returns true if has an extension and it is a CacheExtension", () => {
+    expect(hasCacheExtension("hello.json")).toBeTruthy();
+  });
+
+  it("Should return false if does not have any extension", () => {
+    expect(hasCacheExtension("hello,json")).toBeFalsy();
+  });
+});