Fix LRU Cache removing files from file cache (#861)

* Fix LRU Cache removing files from file cache

* Update tests to reflect changes

Author: matheusgr

blocks/loader.ts

@@ -1,7 +1,7 @@
 // deno-lint-ignore-file no-explicit-any
 import JsonViewer from "../components/JsonViewer.tsx";
 import { RequestContext } from "../deco.ts";
-import { ValueType, weakcache } from "../deps.ts";
+import { ValueType } from "../deps.ts";
 import type { Block, BlockModule, InstanceOf } from "../engine/block.ts";
 import { FieldResolver } from "../engine/core/resolver.ts";
 import { singleFlight } from "../engine/core/utils.ts";
@@ -117,11 +117,6 @@ export const wrapCaughtErrors = async <
   }
 };
 
-export const LOADER_CACHE_START_TRESHOLD =
-  Deno.env.get("LOADER_CACHE_START_TRESHOLD") ?? 0;
-
-export const LOADER_CACHE_SIZE = Deno.env.get("LOADER_CACHE_SIZE") ?? 1_024_000;
-
 const stats = {
   cache: meter.createCounter("loader_cache", {
     unit: "1",
@@ -154,8 +149,6 @@ const inFuture = (maybeDate: string) => {
 
 const noop = () => "";
 
-let countCache = null as (weakcache.WeakLRUCache<any, any> | null);
-
 /**
  * Wraps the loader written by the user by adding support for:
  * 1. Caching
@@ -229,28 +222,6 @@ const wrapLoader = (
         ctx.vary?.push(loader, cacheKeyValue);
         RequestContext?.signal?.throwIfAborted();
 
-        if (countCache === null) {
-          countCache = new weakcache.WeakLRUCache({
-            cacheSize: +LOADER_CACHE_SIZE,
-          });
-        }
-
-        const cc = countCache.getValue(cacheKeyValue) ?? { count: 0 };
-
-        if (cc.count === 0) {
-          cc.count = 1;
-          countCache.setValue(cacheKeyValue, cc);
-        } else {
-          cc.count += 1;
-        }
-
-        if (cc.count < LOADER_CACHE_START_TRESHOLD) {
-          status = "bypass";
-          stats.cache.add(1, { status, loader });
-
-          return await handler(props, req, ctx);
-        }
-
         const cache = maybeCache;
 
         const timing = ctx.monitoring?.timings.start("loader-hash");

runtime/caches/fileSystem.ts

@@ -147,13 +147,10 @@ function createFileSystemCache(): CacheStorage {
         /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Cache/delete) */
         delete: async (
           request: RequestInfo | URL,
-          options?: CacheQueryOptions,
+          _options?: CacheQueryOptions,
         ): Promise<boolean> => {
-          assertNoOptions(options);
-
-          const deleteResponse = await deleteFile(
-            await requestURLSHA1(request),
-          );
+          const cacheKey = await requestURLSHA1(request);
+          const deleteResponse = await deleteFile(cacheKey);
           return deleteResponse;
         },
         /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Cache/keys) */

runtime/caches/lrucache.ts

@@ -6,8 +6,10 @@ import {
   createBaseCacheStorage,
 } from "./utils.ts";
 
+// keep compatible with old variable name
 const CACHE_MAX_SIZE = parseInt(
-  Deno.env.get("CACHE_MAX_SIZE") ?? "1073824",
+  Deno.env.get("CACHE_MAX_SIZE") ?? Deno.env.get("MAX_CACHE_SIZE") ??
+    "1073741824",
 ); // 1 GB max size of cache
 const CACHE_TTL_AUTOPURGE = Deno.env.get("CACHE_TTL_AUTOPURGE") !== "false"; // automatically delete expired items
 const CACHE_ALLOW_STALE = Deno.env.get("CACHE_ALLOW_STALE") !== "false"; // automatically allow stale
@@ -51,10 +53,6 @@ function createLruCacheStorage(cacheStorageInner: CacheStorage): CacheStorage {
           if (fileCache.has(cacheKey)) {
             fileCache.get(cacheKey);
             const result = cacheInner.match(cacheKey);
-            if (!result) {
-              // innercache miss
-              fileCache.delete(cacheKey);
-            }
             return result;
           }
           return undefined;

runtime/caches/mod.test.ts

@@ -2,7 +2,7 @@ import { assert, assertEquals, assertNotEquals } from "@std/assert";
 import { caches as lruCache } from "./lrucache.ts";
 import { caches as headersCache } from "./headerscache.ts";
 
-const MAX_CACHE_SIZE = 1073824;
+const MAX_CACHE_SIZE = 1073741824;
 
 const NOT_IMPLEMENTED = () => {
   throw new Error("Not Implemented");
@@ -52,7 +52,7 @@ const baseTest = async (cacheStorageUT: CacheStorage) => {
   const cache = await headersCache(lruCache(cacheStorageUT)).open(CACHE_NAME);
   const response = () =>
     new Response("Hello, World!", {
-      headers: { "Content-length": `${MAX_CACHE_SIZE / 2}` },
+      headers: { "Content-length": `${MAX_CACHE_SIZE / 2 }` },
     });
   for (let i = 0; i < 5; i++) {
     const request = createRequest(i);