refactor and lint fix

Author: conico974

packages/cloudflare/src/api/cloudflare-context.ts

@@ -57,11 +57,14 @@ declare global {
     NEXT_CACHE_DO_QUEUE_DISABLE_SQLITE?: string;
 
     // Below are the optional env variables for purging the cache
-    // Durable Object namespace to use for the durable object queue
+    // Durable Object namespace to use for the durable object cache purge
     NEXT_CACHE_DO_PURGE?: DurableObjectNamespace<BucketCachePurge>;
-    CACHE_ZONE_ID?: string;
-    CACHE_API_TOKEN?: string;
-    CACHE_BUFFER_TIME_IN_SECONDS?: string;
+    // The amount of time in seconds that the cache purge will wait before purging the cache
+    NEXT_CACHE_DO_PURGE_BUFFER_TIME_IN_SECONDS?: string;
+    // The zone ID to use for the cache purge https://developers.cloudflare.com/fundamentals/setup/find-account-and-zone-ids/
+    CACHE_PURGE_ZONE_ID?: string;
+    // The API token to use for the cache purge. It should have the `Cache Purge` permission
+    CACHE_PURGE_API_TOKEN?: string;
   }
 }
 

packages/cloudflare/src/api/durable-objects/bucket-cache-purge.spec.ts

@@ -12,7 +12,6 @@ vi.mock("cloudflare:workers", () => ({
   },
 }));
 
-
 const createBucketCachePurge = () => {
   const mockState = {
     waitUntil: vi.fn(),
@@ -39,7 +38,7 @@ describe("BucketCachePurge", () => {
     expect(cache.ctx.blockConcurrencyWhile).toHaveBeenCalled();
     // @ts-expect-error - testing private method
     expect(cache.ctx.storage.sql.exec).toHaveBeenCalledWith(
-      expect.stringContaining("CREATE TABLE IF NOT EXISTS cache_purge"),
+      expect.stringContaining("CREATE TABLE IF NOT EXISTS cache_purge")
     );
   });
 
@@ -51,12 +50,12 @@ describe("BucketCachePurge", () => {
       // @ts-expect-error - testing private method
       expect(cache.ctx.storage.sql.exec).toHaveBeenCalledWith(
         expect.stringContaining("INSERT OR REPLACE INTO cache_purge"),
-        [tags[0]],
+        [tags[0]]
       );
       // @ts-expect-error - testing private method
       expect(cache.ctx.storage.sql.exec).toHaveBeenCalledWith(
         expect.stringContaining("INSERT OR REPLACE INTO cache_purge"),
-        [tags[1]],
+        [tags[1]]
       );
     });
 
@@ -77,7 +76,7 @@ describe("BucketCachePurge", () => {
       // @ts-expect-error - testing private method
       expect(cache.ctx.storage.setAlarm).not.toHaveBeenCalled();
     });
-  })
+  });
 
   describe("alarm", () => {
     it("should purge cache by tags and delete them from the sql table", async () => {
@@ -90,7 +89,7 @@ describe("BucketCachePurge", () => {
       // @ts-expect-error - testing private method
       expect(cache.ctx.storage.sql.exec).toHaveBeenCalledWith(
         expect.stringContaining("DELETE FROM cache_purge"),
-        ["tag1", "tag2"],
+        ["tag1", "tag2"]
       );
     });
     it("should not purge cache if no tags are found", async () => {
@@ -103,7 +102,7 @@ describe("BucketCachePurge", () => {
       // @ts-expect-error - testing private method
       expect(cache.ctx.storage.sql.exec).not.toHaveBeenCalledWith(
         expect.stringContaining("DELETE FROM cache_purge"),
-        [],
+        []
       );
     });
 
@@ -119,7 +118,7 @@ describe("BucketCachePurge", () => {
       expect(internalPurgeCacheByTagsSpy).toHaveBeenCalledWith(
         // @ts-expect-error - testing private method
         cache.env,
-        tags,
+        tags
       );
       // @ts-expect-error - testing private method 1st is constructor, 2nd is to get the tags and 3rd is to delete them
       expect(cache.ctx.storage.sql.exec).toHaveBeenCalledTimes(3);
@@ -137,16 +136,14 @@ describe("BucketCachePurge", () => {
       expect(internalPurgeCacheByTagsSpy).toHaveBeenCalledWith(
         // @ts-expect-error - testing private method
         cache.env,
-        tags,
+        tags
       );
       // @ts-expect-error - testing private method 1st is constructor, 2nd is to get the tags and 3rd is to delete them, 4th is to get the next 100 tags
       expect(cache.ctx.storage.sql.exec).toHaveBeenCalledTimes(4);
       // @ts-expect-error - testing private method
       expect(cache.ctx.storage.sql.exec).toHaveBeenLastCalledWith(
-        expect.stringContaining("SELECT * FROM cache_purge LIMIT 100"),
+        expect.stringContaining("SELECT * FROM cache_purge LIMIT 100")
       );
     });
-
-
-  })
-});
+  });
+});

packages/cloudflare/src/api/durable-objects/bucket-cache-purge.ts

@@ -9,8 +9,8 @@ export class BucketCachePurge extends DurableObject<CloudflareEnv> {
 
   constructor(state: DurableObjectState, env: CloudflareEnv) {
     super(state, env);
-    this.bufferTimeInSeconds = env.CACHE_BUFFER_TIME_IN_SECONDS
-      ? parseInt(env.CACHE_BUFFER_TIME_IN_SECONDS)
+    this.bufferTimeInSeconds = env.NEXT_CACHE_DO_PURGE_BUFFER_TIME_IN_SECONDS
+      ? parseInt(env.NEXT_CACHE_DO_PURGE_BUFFER_TIME_IN_SECONDS)
       : DEFAULT_BUFFER_TIME; // Default buffer time
 
     // Initialize the sql table if it doesn't exist
@@ -21,7 +21,7 @@ export class BucketCachePurge extends DurableObject<CloudflareEnv> {
       );
       CREATE UNIQUE INDEX IF NOT EXISTS tag_index ON cache_purge (tag);
       `);
-    })
+    });
   }
 
   async purgeCacheByTags(tags: string[]) {

packages/cloudflare/src/api/overrides/cache-purge/index.ts

@@ -17,7 +17,6 @@ export const purgeCache = ({ type = "direct" }: PurgeOptions) => {
       if (type === "direct") {
         await internalPurgeCacheByTags(env, tags);
       } else {
-        console.log("purgeCacheByTags DO", tags);
         const durableObject = env.NEXT_CACHE_DO_PURGE;
         if (!durableObject) {
           debugCache("cdnInvalidation", "No durable object found. Skipping cache purge.");

packages/cloudflare/src/api/overrides/internal.ts

@@ -52,21 +52,18 @@ export async function purgeCacheByTags(tags: string[]) {
 }
 
 export async function internalPurgeCacheByTags(env: CloudflareEnv, tags: string[]) {
-  //TODO: Remove this before commit
-  console.log("purgeCacheByTags", tags);
-
-  if (!env.CACHE_ZONE_ID && !env.CACHE_API_TOKEN) {
+  if (!env.CACHE_PURGE_ZONE_ID && !env.CACHE_PURGE_API_TOKEN) {
     // THIS IS A NO-OP
     debugCache("purgeCacheByTags", "No cache zone ID or API token provided. Skipping cache purge.");
     return;
   }
 
   try {
     const response = await fetch(
-      `https://api.cloudflare.com/client/v4/zones/${env.CACHE_ZONE_ID}/purge_cache`,
+      `https://api.cloudflare.com/client/v4/zones/${env.CACHE_PURGE_ZONE_ID}/purge_cache`,
       {
         headers: {
-          Authorization: `Bearer ${env.CACHE_API_TOKEN}`,
+          Authorization: `Bearer ${env.CACHE_PURGE_ZONE_ID}`,
           "Content-Type": "application/json",
         },
         method: "POST",
@@ -82,7 +79,6 @@ export async function internalPurgeCacheByTags(env: CloudflareEnv, tags: string[
     const bodyResponse = (await response.json()) as {
       success: boolean;
       errors: Array<{ code: number; message: string }>;
-      messages: Array<{ code: number; message: string }>;
     };
     if (!bodyResponse.success) {
       throw new Error(`Failed to purge cache: ${JSON.stringify(bodyResponse.errors)}`);