@getcronit/pylon 3.0.0-canary-20250313071244.331210b68b70cedb9ce4101707a66d25a2981975 → 3.0.0-canary-20250313103250.6c6911913c81ddeeda2d705c53a45cd6c8ce214c

package/dist/index.js

@@ -1628,9 +1628,7 @@ var setup = (app2) => {
         return Object.keys(supportedFormats).includes(format2);
       };
       var isSupportedFormat = isSupportedFormat2;
-      const sharp = (await import("sharp")).default;
       const { src, w, h, q = "75", format = "webp" } = c.req.query();
-      const queryStringHash = createHash("sha256").update(JSON.stringify(c.req.query())).digest("hex");
       if (!src) {
         return c.json({ error: "Missing parameters." }, 400);
       }
@@ -1643,6 +1641,22 @@ var setup = (app2) => {
       } catch {
         return c.json({ error: "Image not found" }, 404);
       }
+      const cachedImageFileName = getCachedImagePath(
+        src,
+        w ? parseInt(w) : 0,
+        h ? parseInt(h) : 0,
+        format
+      );
+      if (IS_IMAGE_CACHE_POSSIBLE) {
+        try {
+          await fs2.promises.access(cachedImageFileName);
+          const stream = fs2.createReadStream(cachedImageFileName);
+          c.res.headers.set("Content-Type", getContentType(format));
+          return c.body(Readable.toWeb(stream));
+        } catch (e) {
+        }
+      }
+      const sharp = (await import("sharp")).default;
       const metadata = await sharp(imagePath).metadata();
       if (!metadata.width || !metadata.height) {
         return c.json(
@@ -1658,26 +1672,24 @@ var setup = (app2) => {
         w ? parseInt(w) : void 0,
         h ? parseInt(h) : void 0
       );
-      const cachePath = path3.join(IMAGE_CACHE_DIR, queryStringHash);
       let imageFormat = format.toLowerCase();
       if (!isSupportedFormat2(imageFormat)) {
         throw new Error("Unsupported image format");
       }
       const quality = parseInt(q);
+      const data = sharp(imagePath).resize(finalWidth, finalHeight).toFormat(imageFormat, {
+        quality
+      });
       if (IS_IMAGE_CACHE_POSSIBLE) {
-        const image = await sharp(imagePath).resize(finalWidth, finalHeight).toFormat(imageFormat, {
-          quality
-        }).toFile(cachePath);
+        const image = await data.toFile(cachedImageFileName);
         c.res.headers.set("Content-Type", getContentType(image.format));
         return c.body(
           Readable.toWeb(
-            fs2.createReadStream(cachePath)
+            fs2.createReadStream(cachedImageFileName)
           )
         );
       } else {
-        const image = await sharp(imagePath).resize(finalWidth, finalHeight).toFormat(imageFormat, {
-          quality
-        }).toBuffer({ resolveWithObject: true });
+        const image = await data.toBuffer({ resolveWithObject: true });
         c.res.headers.set("Content-Type", getContentType(image.info.format));
         return c.body(image.data);
       }
@@ -1694,6 +1706,13 @@ try {
 } catch (error) {
   IS_IMAGE_CACHE_POSSIBLE = false;
 }
+var getCachedImagePath = (src, width, height, format) => {
+  const fileName = `${path3.basename(
+    createHash("md5").update(src).digest("hex"),
+    path3.extname(src)
+  )}-${width}x${height}.${format}`;
+  return path3.join(IMAGE_CACHE_DIR, fileName);
+};
 var calculateDimensions = (originalWidth, originalHeight, width, height) => {
   if (!width && !height) {
     return { width: originalWidth, height: originalHeight };
@@ -1942,19 +1961,12 @@ var imagePlugin = {
       const image = sharp(args.path);
       const metadata = await image.metadata();
       const url = `${publicPath}/media/${path6.basename(args.path)}`;
-      const searchParams = new URLSearchParams({});
-      if (metadata.width) {
-        searchParams.set("w", metadata.width.toString());
-      }
-      if (metadata.height) {
-        searchParams.set("h", metadata.height.toString());
-      }
       const output = image.resize({
         width: Math.min(metadata.width ?? 16, 16),
         height: Math.min(metadata.height ?? 16, 16),
         fit: "inside"
       }).toFormat("webp", {
-        quality: 20,
+        quality: 30,
         alphaQuality: 20,
         smartSubsample: true
       });
@@ -1962,12 +1974,14 @@ var imagePlugin = {
       const dataURIBase64 = `data:image/${info.format};base64,${data.toString(
         "base64"
       )}`;
-      if (dataURIBase64) {
-        searchParams.set("blurDataURL", dataURIBase64);
-      }
       return {
-        contents: `${url}?${searchParams.toString()}`,
-        loader: "text"
+        contents: JSON.stringify({
+          url,
+          width: metadata.width,
+          height: metadata.height,
+          blurDataURL: dataURIBase64
+        }),
+        loader: "json"
       };
     });
   }