@websolutespa/bom-mixer-image 1.0.6 → 1.0.8

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @websolutespa/bom-mixer-image
 
+## 1.0.8
+
+### Patch Changes
+
+- Added: Cache-Control
+
+## 1.0.7
+
+### Patch Changes
+
+- Fixing: imageHandler Vercel support
+- Updated dependencies
+  - @websolutespa/bom-core@1.7.7
+
 ## 1.0.6
 
 ### Patch Changes

package/dist/index.js

@@ -38,7 +38,6 @@ module.exports = __toCommonJS(src_exports);
 var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
 var import_sharp = __toESM(require("sharp"));
-var import_bom_core = require("@websolutespa/bom-core");
 
 // src/api/api.handler.ts
 function apiHandler(handler) {
@@ -95,6 +94,9 @@ function imageHandler({ domains = [] }) {
           response.setHeader("Cache-Control", `public, max-age=${IMAGE_MAX_AGE}`);
           return response.send(cachedImage);
         }
+        if (url.indexOf("http") === -1 && isVercel()) {
+          response.redirect(307, url);
+        }
         const originalImage = await getOriginalImage(url, domains, request.headers);
         if (originalImage) {
           const resizedImage = (0, import_sharp.default)(originalImage).resize({
@@ -104,11 +106,14 @@ function imageHandler({ domains = [] }) {
             position: import_sharp.default.strategy.entropy,
             withoutEnlargement: true
           }).webp({
-            quality,
-            nearLossless: true
+            quality
+            // nearLossless: true,
           });
           resizedImage.toFile(cachedName).then(() => console.log("imageHandler.sharp.cached", cachedName)).catch((error) => console.error("error caching image", cachedName, error));
           const data = await resizedImage.toBuffer();
+          response.setHeader("Content-Type", "image/webp");
+          response.setHeader("Expires", new Date(Date.now() + IMAGE_MAX_AGE * 1e3).toUTCString());
+          response.setHeader("Cache-Control", `public, max-age=${IMAGE_MAX_AGE}`);
           return response.end(data);
         }
       } catch (error) {
@@ -145,17 +150,12 @@ function getOriginalImage(url, domains, headers, skipUrlValidity = false) {
       });
     } else {
       const filePath = path.join(process.cwd(), "public", url);
-      if (fs.existsSync(filePath)) {
-        fs.readFile(filePath, (error, data) => {
-          if (error) {
-            return reject(error);
-          }
-          return resolve(data);
-        });
-      } else {
-        const origin = (0, import_bom_core.getOrigin)(headers);
-        return getOriginalImage(`${origin}${url}`, domains, headers, true);
-      }
+      fs.readFile(filePath, (error, data) => {
+        if (error) {
+          return reject(error);
+        }
+        return resolve(data);
+      });
     }
   });
 }

package/dist/index.mjs

@@ -2,7 +2,6 @@
 import * as fs from "fs";
 import * as path from "path";
 import sharp from "sharp";
-import { getOrigin } from "@websolutespa/bom-core";
 
 // src/api/api.handler.ts
 function apiHandler(handler) {
@@ -59,6 +58,9 @@ function imageHandler({ domains = [] }) {
           response.setHeader("Cache-Control", `public, max-age=${IMAGE_MAX_AGE}`);
           return response.send(cachedImage);
         }
+        if (url.indexOf("http") === -1 && isVercel()) {
+          response.redirect(307, url);
+        }
         const originalImage = await getOriginalImage(url, domains, request.headers);
         if (originalImage) {
           const resizedImage = sharp(originalImage).resize({
@@ -68,11 +70,14 @@ function imageHandler({ domains = [] }) {
             position: sharp.strategy.entropy,
             withoutEnlargement: true
           }).webp({
-            quality,
-            nearLossless: true
+            quality
+            // nearLossless: true,
           });
           resizedImage.toFile(cachedName).then(() => console.log("imageHandler.sharp.cached", cachedName)).catch((error) => console.error("error caching image", cachedName, error));
           const data = await resizedImage.toBuffer();
+          response.setHeader("Content-Type", "image/webp");
+          response.setHeader("Expires", new Date(Date.now() + IMAGE_MAX_AGE * 1e3).toUTCString());
+          response.setHeader("Cache-Control", `public, max-age=${IMAGE_MAX_AGE}`);
           return response.end(data);
         }
       } catch (error) {
@@ -109,17 +114,12 @@ function getOriginalImage(url, domains, headers, skipUrlValidity = false) {
       });
     } else {
       const filePath = path.join(process.cwd(), "public", url);
-      if (fs.existsSync(filePath)) {
-        fs.readFile(filePath, (error, data) => {
-          if (error) {
-            return reject(error);
-          }
-          return resolve(data);
-        });
-      } else {
-        const origin = getOrigin(headers);
-        return getOriginalImage(`${origin}${url}`, domains, headers, true);
-      }
+      fs.readFile(filePath, (error, data) => {
+        if (error) {
+          return reject(error);
+        }
+        return resolve(data);
+      });
     }
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-image",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Mixer Image module of the BOM Repository",
   "keywords": [
     "bom",

package/src/image/image.handler.ts

@@ -8,7 +8,6 @@ import * as path from 'path';
 // Importing 'sharp' for image processing
 import sharp from 'sharp';
 // Importing 'apiHandler' from '../api/api.handler'
-import { getOrigin } from '@websolutespa/bom-core';
 import { apiHandler } from '../api/api.handler';
 
 const IMAGE_MAX_AGE = 604800;
@@ -59,6 +58,10 @@ export function imageHandler({ domains = [] }: { domains: string[] }) {
           // Ending the response and sending the cached image
           return response.send(cachedImage);
         }
+        // Temporarily fix Vercel local image issue
+        if (url.indexOf('http') === -1 && isVercel()) {
+          response.redirect(307, url);
+        }
         // Reading the original image
         const originalImage = await getOriginalImage(url, domains, request.headers);
         // Checking if the original image exists
@@ -74,14 +77,21 @@ export function imageHandler({ domains = [] }: { domains: string[] }) {
             })
             .webp({
               quality,
-              nearLossless: true,
+              // nearLossless: true,
             });
           // Saving the resized image to the cache
           resizedImage.toFile(cachedName)
             .then(() => console.log('imageHandler.sharp.cached', cachedName))
-            .catch(error => console.error('error caching image', cachedName, error));
-          // Converting the resized image to a buffer and sending it in the response
+            .catch((error: any) => console.error('error caching image', cachedName, error));
+          // Converting the resized image to a buffer
           const data = await resizedImage.toBuffer();
+          // Setting the 'Content-Type' header to 'image/webp'
+          response.setHeader('Content-Type', 'image/webp');
+          // Setting the 'Expires' header to the current time plus the maximum age of the image (in seconds)
+          response.setHeader('Expires', new Date(Date.now() + IMAGE_MAX_AGE * 1000).toUTCString());
+          // Setting the 'Cache-Control' header to 'public' and setting 'max-age' to the maximum age of the image
+          response.setHeader('Cache-Control', `public, max-age=${IMAGE_MAX_AGE}`);
+          // Sending data in the response
           return response.end(data);
         }
       } catch (error) {
@@ -130,18 +140,16 @@ function getOriginalImage(url: string, domains: string[], headers: IncomingHttpH
         });
     } else {
       // Reading the image from the file system
-      // console.log('imageHandler.getOriginalImage.isDevelopment', isDevelopment);
       const filePath = path.join(process.cwd(), 'public', url);
-      /*
-      const { serverRuntimeConfig } = getConfig();
-      const filePath = path.join(serverRuntimeConfig.PROJECT_ROOT, 'public', url);
-      */
-      /*
-      const filePath = isDevelopment ?
-        path.join(process.cwd(), 'public', url) :
-        path.join(process.cwd(), url);
-        */
       // console.log('imageHandler.getOriginalImage.filePath', filePath);
+      fs.readFile(filePath, (error, data) => {
+        if (error) {
+          return reject(error);
+        }
+        // Resolving the promise with the image data
+        return resolve(data);
+      });
+      /*
       // Check if the file exists
       if (fs.existsSync(filePath)) {
         fs.readFile(filePath, (error, data) => {
@@ -155,14 +163,6 @@ function getOriginalImage(url: string, domains: string[], headers: IncomingHttpH
         const origin = getOrigin(headers);
         return getOriginalImage(`${origin}${url}`, domains, headers, true);
       }
-      /*
-      fs.readFile(filePath, (error, data) => {
-        if (error) {
-          return reject(error);
-        }
-        // Resolving the promise with the image data
-        return resolve(data);
-      });
       */
     }
   });