feat: upgrade for deno_graph now handling redirects (#50)

Author: dsherret

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.DENOBOT_PAT }}
 

cache.ts

@@ -21,6 +21,6 @@ export class FetchCacher {
     checksum?: string,
   ): Promise<LoadResponse | undefined> => {
     const url = new URL(specifier);
-    return this.#fileFetcher.fetch(url, { cacheSetting, checksum });
+    return this.#fileFetcher.fetchOnce(url, { cacheSetting, checksum });
   };
 }

deno.json

@@ -25,11 +25,11 @@
   ],
   "exports": "./mod.ts",
   "imports": {
-    "@deno/graph": "jsr:@deno/graph@^0.69.7",
-    "@std/assert": "jsr:@std/assert@^0.218.2",
-    "@std/fmt": "jsr:@std/fmt@^0.218.2",
-    "@std/fs": "jsr:@std/fs@^0.218.2",
-    "@std/io": "jsr:@std/io@^0.218.2",
-    "@std/path": "jsr:@std/path@^0.218.2"
+    "@deno/graph": "jsr:@deno/graph@^0.73.1",
+    "@std/assert": "jsr:@std/assert@^0.223",
+    "@std/fmt": "jsr:@std/fmt@^0.223",
+    "@std/fs": "jsr:@std/fs@^0.223",
+    "@std/io": "jsr:@std/io@^0.223",
+    "@std/path": "jsr:@std/path@^0.223"
   }
 }

deno.lock

@@ -1,6 +1,6 @@
 // Copyright 2018-2024 the Deno authors. MIT license.
 
-import { ensureDir } from "@std/fs/ensure_dir";
+import { ensureDir } from "@std/fs/ensure-dir";
 import { dirname, isAbsolute, join } from "@std/path";
 import { readAll, writeAll } from "@std/io";
 import { assert, CACHE_PERM } from "./util.ts";

disk_cache.ts

@@ -137,7 +137,7 @@ export class FileFetcher {
     options: ResolvedFetchOptions,
     httpCache: HttpCache,
   ): Promise<LoadResponse> {
-    const cached = this.#fetchCached(specifier, 0, options, httpCache);
+    const cached = this.fetchCachedOnce(specifier, options, httpCache);
     if (cached) {
       return cached;
     }
@@ -163,26 +163,22 @@ export class FileFetcher {
     };
   }
 
-  #fetchCached(
+  fetchCachedOnce(
     specifier: URL,
-    redirectLimit: number,
     options: ResolvedFetchOptions,
     httpCache: HttpCache,
   ): LoadResponse | undefined {
-    if (redirectLimit < 0) {
-      throw new Deno.errors.Http(
-        `Too many redirects.\n  Specifier: "${specifier.toString()}"`,
-      );
-    }
-
     const headers = httpCache.getHeaders(specifier);
     if (!headers) {
       return undefined;
     }
     const location = headers["location"];
     if (location != null && location.length > 0) {
       const redirect = new URL(location, specifier);
-      return this.#fetchCached(redirect, redirectLimit - 1, options, httpCache);
+      return {
+        kind: "redirect",
+        specifier: redirect.toString(),
+      };
     }
     const content = httpCache.get(specifier, options);
     if (content == null) {
@@ -196,22 +192,14 @@ export class FileFetcher {
     };
   }
 
-  async #fetchRemote(
+  async #fetchRemoteOnce(
     specifier: URL,
-    redirectLimit: number,
     options: ResolvedFetchOptions,
     httpCache: HttpCache,
   ): Promise<LoadResponse | undefined> {
-    if (redirectLimit < 0) {
-      throw new Deno.errors.Http(
-        `Too many redirects.\n  Specifier: "${specifier.toString()}"`,
-      );
-    }
-
     if (shouldUseCache(options.cacheSetting, specifier)) {
-      const response = this.#fetchCached(
+      const response = this.fetchCachedOnce(
         specifier,
-        redirectLimit,
         options,
         httpCache,
       );
@@ -283,6 +271,25 @@ export class FileFetcher {
   }
 
   async fetch(
+    specifier: URL,
+    // Providing a checksum here doesn't make sense because the provided
+    // checksum will change based on the specifier being requested, which
+    // could be invalided by a redirect
+    options?: Omit<FetchOptions, "checksum">,
+  ): Promise<LoadResponse | undefined> {
+    for (let i = 0; i <= 10; i++) {
+      const response = await this.fetchOnce(specifier, options);
+      if (response?.kind !== "redirect") {
+        return response;
+      }
+      specifier = new URL(response.specifier);
+    }
+    throw new Deno.errors.Http(
+      `Too many redirects.\n  Specifier: "${specifier.toString()}"`,
+    );
+  }
+
+  async fetchOnce(
     specifier: URL,
     options?: FetchOptions,
   ): Promise<LoadResponse | undefined> {
@@ -306,9 +313,8 @@ export class FileFetcher {
         `A remote specifier was requested: "${specifier.toString()}", but --no-remote is specified.`,
       );
     } else {
-      const response = await this.#fetchRemote(
+      const response = await this.#fetchRemoteOnce(
         specifier,
-        10,
         this.#resolveOptions(options),
         await this.#resolveHttpCache(),
       );

file_fetcher.ts

@@ -27,15 +27,15 @@ Deno.test({
     {
       // should error
       await assertRejects(async () => {
-        await fileFetcher.fetch(
+        await fileFetcher.fetchOnce(
           new URL("https://deno.land/x/oak@v10.5.1/mod.ts"),
           {
             checksum: "bad",
           },
         );
       });
       // ok for good checksum
-      await fileFetcher.fetch(
+      await fileFetcher.fetchOnce(
         new URL("https://deno.land/x/oak@v10.5.1/mod.ts"),
         {
           checksum:
@@ -52,7 +52,7 @@ Deno.test({
     const denoDir = new DenoDir();
     const fileFetcher = new FileFetcher(() => denoDir.createHttpCache());
     await assertRejects(async () => {
-      await fileFetcher.fetch(
+      await fileFetcher.fetchOnce(
         new URL("https://deno.land/x/oak@v10.5.1/mod.ts"),
         {
           cacheSetting: "reload",
@@ -68,10 +68,13 @@ Deno.test({
   async fn() {
     const denoDir = new DenoDir();
     const fileFetcher = new FileFetcher(() => denoDir.createHttpCache());
-    await fileFetcher.fetch(new URL("https://deno.land/x/oak@v10.5.1/mod.ts"), {
-      cacheSetting: "reload",
-      checksum:
-        "7a1b5169ef702e96dd994168879dbcbd8af4f639578b6300cbe1c6995d7f3f32",
-    });
+    await fileFetcher.fetchOnce(
+      new URL("https://deno.land/x/oak@v10.5.1/mod.ts"),
+      {
+        cacheSetting: "reload",
+        checksum:
+          "7a1b5169ef702e96dd994168879dbcbd8af4f639578b6300cbe1c6995d7f3f32",
+      },
+    );
   },
 });

file_fetcher_test.ts

@@ -3,9 +3,9 @@
 import { isAbsolute } from "@std/path";
 import { assert } from "./util.ts";
 import {
-  GlobalHttpCache,
+  type GlobalHttpCache,
   instantiate,
-  LocalHttpCache,
+  type LocalHttpCache,
 } from "./lib/deno_cache_dir.generated.js";
 
 export interface HttpCacheCreateOptions {