Remove cacheTtl/cacheTtlByStatus support from Cache API

The Workers Cache API only supports the `cacheKey` property of the
`request.cf` object. Miniflare incorrectly supported `cacheTtl` and
`cacheTtlByStatus`.

Refs: #37, #248, #337

Author: mrbbot

packages/cache/src/cache.ts

@@ -2,7 +2,6 @@ import { URL } from "url";
 import {
   Request,
   RequestInfo,
-  RequestInitCfProperties,
   Response,
   withStringFormDataFiles,
 } from "@miniflare/core";
@@ -57,36 +56,11 @@ function getKey(req: BaseRequest | Request): string {
   }
 }
 
-const cacheTtlByStatusRangeRegexp = /^(?<from>\d+)(-(?<to>\d+))?$/;
-
 function getExpirationTtl(
   clock: Clock,
   req: BaseRequest | Request,
   res: BaseResponse | Response
 ): number | undefined {
-  // Check cf property first for expiration TTL
-  // @ts-expect-error cf doesn't exist on BaseRequest, but it will just be
-  // undefined if it doesn't
-  const cf: RequestInitCfProperties | undefined = req.cf;
-  if (cf?.cacheTtl) return cf.cacheTtl * 1000;
-  if (cf?.cacheTtlByStatus) {
-    for (const [range, ttl] of Object.entries(cf.cacheTtlByStatus)) {
-      const match = cacheTtlByStatusRangeRegexp.exec(range);
-      const fromString: string | undefined = match?.groups?.from;
-      // If no match, skip to next range
-      if (!fromString) continue;
-      const from = parseInt(fromString);
-      const toString: string | undefined = match?.groups?.to;
-      // If matched "to" group, check range, otherwise, just check equal status
-      if (toString) {
-        const to = parseInt(toString);
-        if (from <= res.status && res.status <= to) return ttl * 1000;
-      } else if (res.status === from) {
-        return ttl * 1000;
-      }
-    }
-  }
-
   // Cloudflare ignores request Cache-Control
   const reqHeaders = normaliseHeaders(req.headers);
   delete reqHeaders["cache-control"];

packages/cache/test/cache.spec.ts

@@ -1,7 +1,7 @@
 import assert from "assert";
 import { URL } from "url";
 import { Cache, CacheError, CachedMeta } from "@miniflare/cache";
-import { Request, RequestInitCfProperties, Response } from "@miniflare/core";
+import { Request, Response } from "@miniflare/core";
 import {
   EXTERNAL_SUBREQUEST_LIMIT_BUNDLED,
   RequestContext,
@@ -147,59 +147,6 @@ test("Cache: respects cache key", async (t) => {
   t.is(await match1?.text(), "value1");
   t.is(await match2?.text(), "value2");
 });
-test("Cache: put respects cf cacheTtl", async (t) => {
-  const { clock, cache } = t.context;
-  await cache.put(
-    new Request("http://localhost/test", { cf: { cacheTtl: 1 } }),
-    new BaseResponse("value")
-  );
-  t.not(await cache.match("http://localhost/test"), undefined);
-  clock.timestamp += 500;
-  t.not(await cache.match("http://localhost/test"), undefined);
-  clock.timestamp += 500;
-  t.is(await cache.match("http://localhost/test"), undefined);
-});
-test("Cache: put respects cf cacheTtlByStatus", async (t) => {
-  const { clock, cache } = t.context;
-  const cf: RequestInitCfProperties = {
-    cacheTtlByStatus: { "200-299": 2, "? :D": 99, "404": 1, "500-599": 0 },
-  };
-  const headers = { "Cache-Control": "max-age=5" };
-  const req200 = new Request("http://localhost/200", { cf });
-  const req201 = new Request("http://localhost/201", { cf });
-  const req302 = new Request("http://localhost/302", { cf });
-  const req404 = new Request("http://localhost/404", { cf });
-  const req599 = new Request("http://localhost/599", { cf });
-  await cache.put(req200, new BaseResponse(null, { status: 200, headers }));
-  await cache.put(req201, new BaseResponse(null, { status: 201, headers }));
-  await cache.put(req302, new BaseResponse(null, { status: 302, headers }));
-  await cache.put(req404, new BaseResponse(null, { status: 404, headers }));
-  await cache.put(req599, new BaseResponse(null, { status: 599, headers }));
-
-  // Check all but 5xx responses cached
-  t.not(await cache.match("http://localhost/200"), undefined);
-  t.not(await cache.match("http://localhost/201"), undefined);
-  t.not(await cache.match("http://localhost/302"), undefined);
-  t.not(await cache.match("http://localhost/404"), undefined);
-  t.is(await cache.match("http://localhost/599"), undefined);
-
-  // Check 404 response expires after 1 second
-  clock.timestamp += 1000;
-  t.not(await cache.match("http://localhost/200"), undefined);
-  t.not(await cache.match("http://localhost/201"), undefined);
-  t.not(await cache.match("http://localhost/302"), undefined);
-  t.is(await cache.match("http://localhost/404"), undefined);
-
-  // Check 2xx responses expire after 2 seconds
-  clock.timestamp += 1000;
-  t.is(await cache.match("http://localhost/200"), undefined);
-  t.is(await cache.match("http://localhost/201"), undefined);
-  t.not(await cache.match("http://localhost/302"), undefined);
-
-  // Check 302 response expires after 5 seconds
-  clock.timestamp += 3000;
-  t.is(await cache.match("http://localhost/302"), undefined);
-});
 
 test("Cache: put increments subrequest count", async (t) => {
   const { cache } = t.context;