new version with wasm cache

Author: oscarotero

deno/README.md

@@ -7,27 +7,27 @@ Scripts to transform the source code of
 sh run.sh
 ```
 
-To import Imagemagick in your Deno project:
+To import ImageMagick into your Deno project:
 
 ```ts
 import {
   ImageMagick,
   IMagickImage,
-  initializeImageMagick,
+  initialize,
   MagickFormat,
 } from "https://deno.land/x/imagemagick_deno/mod.ts";
 
-await initializeImageMagick(); // make sure to initialize first!
+await initialize(); // make sure to initialize first!
 
 const data: Uint8Array = await Deno.readFile("image.jpg");
 
-ImageMagick.read(data, (img: IMagickImage) => {
+await ImageMagick.read(data, (img: IMagickImage) => {
   img.resize(200, 100);
   img.blur(20, 6);
 
-  img.write(
-    (data: Uint8Array) => Deno.writeFile("image-blur.jpg", data),
+  await img.write(
     MagickFormat.Jpeg,
+    (data: Uint8Array) => Deno.writeFile("image-blur.jpg", data),
   );
 });
 ```

deno/mod.ts

@@ -19,6 +19,6 @@ export async function initialize() {
   }
 
   const response = await fetch(wasmUrl);
-  await cache.put(wasmUrl, response);
-  await initializeImageMagick(await response.clone().arrayBuffer());
+  await cache.put(wasmUrl, response.clone());
+  await initializeImageMagick(await response.arrayBuffer());
 }

mod.ts

@@ -2,9 +2,23 @@ export * from "./src/index.ts";
 import { initializeImageMagick } from "./src/index.ts";
 
 export async function initialize() {
-  const wasmFile = import.meta.resolve("./src/wasm/magick_native.wasm");
-  const file = await fetch(wasmFile);
-  const wasm = await file.arrayBuffer();
+  const wasmUrl = new URL(import.meta.resolve("./src/wasm/magick_native.wasm"));
 
-  await initializeImageMagick(wasm);
+  if (wasmUrl.protocol === "file:") {
+    await initializeImageMagick(await Deno.readFile(wasmUrl));
+    return;
+  }
+
+  const cache = await caches.open("magick_native");
+  const cached = await cache.match(wasmUrl);
+
+  if (cached) {
+    const wasm = await cached.arrayBuffer();
+    await initializeImageMagick(wasm);
+    return;
+  }
+
+  const response = await fetch(wasmUrl);
+  await cache.put(wasmUrl, response.clone());
+  await initializeImageMagick(await response.arrayBuffer());
 }