@websolutespa/bom-mixer-image 1.0.5 → 1.0.6

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @websolutespa/bom-mixer-image
 
+## 1.0.6
+
+### Patch Changes
+
+- Modified: imageHandler, re-route not found to origin
+
 ## 1.0.5
 
 ### Patch Changes

package/dist/index.js

@@ -38,6 +38,7 @@ 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) {
@@ -94,7 +95,7 @@ function imageHandler({ domains = [] }) {
           response.setHeader("Cache-Control", `public, max-age=${IMAGE_MAX_AGE}`);
           return response.send(cachedImage);
         }
-        const originalImage = await getOriginalImage(url, domains);
+        const originalImage = await getOriginalImage(url, domains, request.headers);
         if (originalImage) {
           const resizedImage = (0, import_sharp.default)(originalImage).resize({
             width,
@@ -117,10 +118,10 @@ function imageHandler({ domains = [] }) {
     }
   });
 }
-function getOriginalImage(url, domains) {
-  return new Promise((resolve2, reject) => {
+function getOriginalImage(url, domains, headers, skipUrlValidity = false) {
+  return new Promise((resolve, reject) => {
     if (url.indexOf("http") === 0) {
-      if (!checkUrlValidity(url, domains)) {
+      if (!skipUrlValidity && !checkUrlValidity(url, domains)) {
         console.error("imageHandler.getOriginalImage.error invalid url");
         return reject({ status: 401, message: "invalid url" });
       }
@@ -135,7 +136,7 @@ function getOriginalImage(url, domains) {
           return reject({ status: response.status, message: response.statusText });
         }
         response.arrayBuffer().then((buffer) => {
-          return resolve2(Buffer.from(buffer));
+          return resolve(Buffer.from(buffer));
         }).catch((error) => {
           return reject(error);
         });
@@ -143,23 +144,28 @@ function getOriginalImage(url, domains) {
         return reject(error);
       });
     } else {
-      const filePath = path.resolve(".", "public", url);
-      fs.readFile(filePath, (error, data) => {
-        if (error) {
-          return reject(error);
-        }
-        return resolve2(data);
-      });
+      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);
+      }
     }
   });
 }
 function getCachedImage(pathname) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve, reject) => {
     fs.readFile(pathname, (error, data) => {
       if (error) {
         return reject(error);
       }
-      return resolve2(data);
+      return resolve(data);
     });
   });
 }

package/dist/index.mjs

@@ -2,6 +2,7 @@
 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) {
@@ -58,7 +59,7 @@ function imageHandler({ domains = [] }) {
           response.setHeader("Cache-Control", `public, max-age=${IMAGE_MAX_AGE}`);
           return response.send(cachedImage);
         }
-        const originalImage = await getOriginalImage(url, domains);
+        const originalImage = await getOriginalImage(url, domains, request.headers);
         if (originalImage) {
           const resizedImage = sharp(originalImage).resize({
             width,
@@ -81,10 +82,10 @@ function imageHandler({ domains = [] }) {
     }
   });
 }
-function getOriginalImage(url, domains) {
-  return new Promise((resolve2, reject) => {
+function getOriginalImage(url, domains, headers, skipUrlValidity = false) {
+  return new Promise((resolve, reject) => {
     if (url.indexOf("http") === 0) {
-      if (!checkUrlValidity(url, domains)) {
+      if (!skipUrlValidity && !checkUrlValidity(url, domains)) {
         console.error("imageHandler.getOriginalImage.error invalid url");
         return reject({ status: 401, message: "invalid url" });
       }
@@ -99,7 +100,7 @@ function getOriginalImage(url, domains) {
           return reject({ status: response.status, message: response.statusText });
         }
         response.arrayBuffer().then((buffer) => {
-          return resolve2(Buffer.from(buffer));
+          return resolve(Buffer.from(buffer));
         }).catch((error) => {
           return reject(error);
         });
@@ -107,23 +108,28 @@ function getOriginalImage(url, domains) {
         return reject(error);
       });
     } else {
-      const filePath = path.resolve(".", "public", url);
-      fs.readFile(filePath, (error, data) => {
-        if (error) {
-          return reject(error);
-        }
-        return resolve2(data);
-      });
+      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);
+      }
     }
   });
 }
 function getCachedImage(pathname) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve, reject) => {
     fs.readFile(pathname, (error, data) => {
       if (error) {
         return reject(error);
       }
-      return resolve2(data);
+      return resolve(data);
     });
   });
 }

package/package.json

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

package/src/image/image.handler.ts

@@ -1,3 +1,4 @@
+import { IncomingHttpHeaders } from 'http';
 // Importing the 'fs' module to work with the file system
 import * as fs from 'fs';
 // Importing the 'NextApiRequest' and 'NextApiResponse' from 'next' for handling API requests and responses
@@ -7,6 +8,7 @@ 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;
@@ -58,7 +60,7 @@ export function imageHandler({ domains = [] }: { domains: string[] }) {
           return response.send(cachedImage);
         }
         // Reading the original image
-        const originalImage = await getOriginalImage(url, domains);
+        const originalImage = await getOriginalImage(url, domains, request.headers);
         // Checking if the original image exists
         if (originalImage) {
           // Resizing the original image and converting it to WebP format
@@ -92,12 +94,15 @@ export function imageHandler({ domains = [] }: { domains: string[] }) {
 }
 
 // Defining the 'getOriginalImage' function
-function getOriginalImage(url: string, domains: string[]): Promise<Buffer> {
+function getOriginalImage(url: string, domains: string[], headers: IncomingHttpHeaders, skipUrlValidity: boolean = false): Promise<Buffer> {
   // Returning a new promise
   return new Promise((resolve, reject) => {
     // Checking if 'url' starts with 'http'
     if (url.indexOf('http') === 0) {
-      if (!checkUrlValidity(url, domains)) {
+      if (
+        !skipUrlValidity &&
+        !checkUrlValidity(url, domains)
+      ) {
         console.error('imageHandler.getOriginalImage.error invalid url');
         return reject({ status: 401, message: 'invalid url' });
       }
@@ -126,7 +131,7 @@ function getOriginalImage(url: string, domains: string[]): Promise<Buffer> {
     } else {
       // Reading the image from the file system
       // console.log('imageHandler.getOriginalImage.isDevelopment', isDevelopment);
-      const filePath = path.resolve('.', 'public', url);
+      const filePath = path.join(process.cwd(), 'public', url);
       /*
       const { serverRuntimeConfig } = getConfig();
       const filePath = path.join(serverRuntimeConfig.PROJECT_ROOT, 'public', url);
@@ -137,6 +142,20 @@ function getOriginalImage(url: string, domains: string[]): Promise<Buffer> {
         path.join(process.cwd(), url);
         */
       // console.log('imageHandler.getOriginalImage.filePath', filePath);
+      // Check if the file exists
+      if (fs.existsSync(filePath)) {
+        fs.readFile(filePath, (error, data) => {
+          if (error) {
+            return reject(error);
+          }
+          // Resolving the promise with the image data
+          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);
@@ -144,6 +163,7 @@ function getOriginalImage(url: string, domains: string[]): Promise<Buffer> {
         // Resolving the promise with the image data
         return resolve(data);
       });
+      */
     }
   });
 }