updates

Author: dsherret

cache_test.ts

@@ -12,9 +12,7 @@ async function setup() {
   });
   const denoDir = new DenoDir(tempdir);
   const fileFetcher = new FileFetcher(
-    () => {
-      return denoDir.createHttpCache();
-    },
+    denoDir.createHttpCache(),
     "use",
     true,
   );

deno_dir.ts

@@ -26,7 +26,7 @@ export class DenoDir {
 
   createHttpCache(
     options?: { vendorRoot?: string | URL; readOnly?: boolean },
-  ): Promise<HttpCache> {
+  ): HttpCache {
     return HttpCache.create({
       root: join(this.root, "remote"),
       vendorRoot: options?.vendorRoot == null

file_fetcher.ts

@@ -116,20 +116,18 @@ export class FileFetcher {
   #authTokens: AuthTokens;
   #cache = new Map<string, LoadResponse>();
   #cacheSetting: CacheSetting;
-  #httpCache: HttpCache | undefined;
-  #httpCachePromise: Promise<HttpCache> | undefined;
-  #httpCacheFactory: () => Promise<HttpCache>;
+  #httpCache: HttpCache;
 
   constructor(
-    httpCacheFactory: () => Promise<HttpCache>,
+    httpCache: HttpCache,
     cacheSetting: CacheSetting = "use",
     allowRemote = true,
   ) {
     Deno.permissions.request({ name: "env", variable: "DENO_AUTH_TOKENS" });
     this.#authTokens = new AuthTokens(Deno.env.get("DENO_AUTH_TOKENS"));
     this.#allowRemote = allowRemote;
     this.#cacheSetting = cacheSetting;
-    this.#httpCacheFactory = httpCacheFactory;
+    this.#httpCache = httpCache;
   }
 
   async #fetchBlobDataUrl(
@@ -300,7 +298,7 @@ export class FileFetcher {
       const response = await this.#fetchBlobDataUrl(
         specifier,
         this.#resolveOptions(options),
-        await this.#resolveHttpCache(),
+        this.#httpCache,
       );
       await this.#cache.set(specifier.toString(), response);
       return response;
@@ -312,7 +310,7 @@ export class FileFetcher {
       const response = await this.#fetchRemoteOnce(
         specifier,
         this.#resolveOptions(options),
-        await this.#resolveHttpCache(),
+        this.#httpCache,
       );
       if (response) {
         await this.#cache.set(specifier.toString(), response);
@@ -326,20 +324,6 @@ export class FileFetcher {
     options.cacheSetting = options.cacheSetting ?? this.#cacheSetting;
     return options as ResolvedFetchOptions;
   }
-
-  #resolveHttpCache(): Promise<HttpCache> {
-    if (this.#httpCache != null) {
-      return Promise.resolve(this.#httpCache);
-    }
-    if (!this.#httpCachePromise) {
-      this.#httpCachePromise = this.#httpCacheFactory().then((cache) => {
-        this.#httpCache = cache;
-        this.#httpCachePromise = undefined;
-        return cache;
-      });
-    }
-    return this.#httpCachePromise;
-  }
 }
 
 export async function fetchWithRetries(

file_fetcher_test.ts

@@ -8,7 +8,7 @@ Deno.test({
   name: "FileFetcher",
   async fn() {
     const denoDir = new DenoDir();
-    const fileFetcher = new FileFetcher(() => denoDir.createHttpCache());
+    const fileFetcher = new FileFetcher(denoDir.createHttpCache());
     const graph = await createGraph("https://deno.land/x/oak@v10.5.1/mod.ts", {
       load(specifier) {
         return fileFetcher.fetch(new URL(specifier));
@@ -23,7 +23,7 @@ Deno.test({
   name: "FileFetcher - bad checksum no cache",
   async fn() {
     const denoDir = new DenoDir();
-    const fileFetcher = new FileFetcher(() => denoDir.createHttpCache());
+    const fileFetcher = new FileFetcher(denoDir.createHttpCache());
     {
       // should error
       await assertRejects(async () => {
@@ -50,7 +50,7 @@ Deno.test({
   name: "FileFetcher - bad checksum reload",
   async fn() {
     const denoDir = new DenoDir();
-    const fileFetcher = new FileFetcher(() => denoDir.createHttpCache());
+    const fileFetcher = new FileFetcher(denoDir.createHttpCache());
     await assertRejects(async () => {
       await fileFetcher.fetchOnce(
         new URL("https://deno.land/x/oak@v10.5.1/mod.ts"),
@@ -67,7 +67,7 @@ Deno.test({
   name: "FileFetcher - good checksum reload",
   async fn() {
     const denoDir = new DenoDir();
-    const fileFetcher = new FileFetcher(() => denoDir.createHttpCache());
+    const fileFetcher = new FileFetcher(denoDir.createHttpCache());
     await fileFetcher.fetchOnce(
       new URL("https://deno.land/x/oak@v10.5.1/mod.ts"),
       {

http_cache.ts

@@ -2,10 +2,7 @@
 
 import { isAbsolute } from "@std/path";
 import { assert } from "./util.ts";
-import {
-  GlobalHttpCache,
-  LocalHttpCache,
-} from "./lib/deno_cache_dir_wasm.js";
+import { GlobalHttpCache, LocalHttpCache } from "./lib/deno_cache_dir_wasm.js";
 
 export interface HttpCacheCreateOptions {
   root: string;
@@ -37,7 +34,7 @@ export class HttpCache implements Disposable {
     this.#readOnly = readOnly;
   }
 
-  static async create(options: HttpCacheCreateOptions): Promise<HttpCache> {
+  static create(options: HttpCacheCreateOptions): HttpCache {
     assert(isAbsolute(options.root), "Root must be an absolute path.");
 
     if (options.vendorRoot != null) {

mod.ts

@@ -98,12 +98,10 @@ export function createCache({
 }: CacheOptions = {}): Loader {
   const denoDir = new DenoDir(root);
   const fileFetcher = new FileFetcher(
-    () => {
-      return denoDir.createHttpCache({
-        readOnly,
-        vendorRoot,
-      });
-    },
+    denoDir.createHttpCache({
+      readOnly,
+      vendorRoot,
+    }),
     cacheSetting,
     allowRemote,
   );

rs_lib/lib.rs

@@ -15,12 +15,12 @@ use sys_traits::impls::wasm_string_to_path;
 use url::Url;
 use wasm_bindgen::prelude::*;
 
+use deno_cache_dir::CacheEntry;
 use deno_cache_dir::CacheReadFileError;
 use deno_cache_dir::Checksum;
-use deno_cache_dir::HttpCache;
-use deno_cache_dir::CacheEntry;
 use deno_cache_dir::GlobalToLocalCopy;
 use deno_cache_dir::HeadersMap;
+use deno_cache_dir::HttpCache;
 
 #[wasm_bindgen]
 pub fn url_to_filename(url: &str) -> Result<String, JsValue> {