@websolutespa/bom-mixer-image 1.0.3 → 1.0.5

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @websolutespa/bom-mixer-image
 
+## 1.0.5
+
+### Patch Changes
+
+- Modified: imageHandler
+- Updated dependencies
+  - @websolutespa/bom-core@1.7.6
+
+## 1.0.4
+
+### Patch Changes
+
+- Modified: imageHandler getOriginalImage
+- Updated dependencies
+  - @websolutespa/bom-core@1.7.5
+
 ## 1.0.3
 
 ### 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) {
@@ -119,7 +118,7 @@ function imageHandler({ domains = [] }) {
   });
 }
 function getOriginalImage(url, domains) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     if (url.indexOf("http") === 0) {
       if (!checkUrlValidity(url, domains)) {
         console.error("imageHandler.getOriginalImage.error invalid url");
@@ -136,7 +135,7 @@ function getOriginalImage(url, domains) {
           return reject({ status: response.status, message: response.statusText });
         }
         response.arrayBuffer().then((buffer) => {
-          return resolve(Buffer.from(buffer));
+          return resolve2(Buffer.from(buffer));
         }).catch((error) => {
           return reject(error);
         });
@@ -144,24 +143,23 @@ function getOriginalImage(url, domains) {
         return reject(error);
       });
     } else {
-      const isProduction = (0, import_bom_core.getIsProduction)();
-      const filePath = isProduction ? path.join(process.cwd(), url) : path.join(process.cwd(), "public", url);
+      const filePath = path.resolve(".", "public", url);
       fs.readFile(filePath, (error, data) => {
         if (error) {
           return reject(error);
         }
-        return resolve(data);
+        return resolve2(data);
       });
     }
   });
 }
 function getCachedImage(pathname) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     fs.readFile(pathname, (error, data) => {
       if (error) {
         return reject(error);
       }
-      return resolve(data);
+      return resolve2(data);
     });
   });
 }

package/dist/index.mjs

@@ -2,7 +2,6 @@
 import * as fs from "fs";
 import * as path from "path";
 import sharp from "sharp";
-import { getIsProduction } from "@websolutespa/bom-core";
 
 // src/api/api.handler.ts
 function apiHandler(handler) {
@@ -83,7 +82,7 @@ function imageHandler({ domains = [] }) {
   });
 }
 function getOriginalImage(url, domains) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     if (url.indexOf("http") === 0) {
       if (!checkUrlValidity(url, domains)) {
         console.error("imageHandler.getOriginalImage.error invalid url");
@@ -100,7 +99,7 @@ function getOriginalImage(url, domains) {
           return reject({ status: response.status, message: response.statusText });
         }
         response.arrayBuffer().then((buffer) => {
-          return resolve(Buffer.from(buffer));
+          return resolve2(Buffer.from(buffer));
         }).catch((error) => {
           return reject(error);
         });
@@ -108,24 +107,23 @@ function getOriginalImage(url, domains) {
         return reject(error);
       });
     } else {
-      const isProduction = getIsProduction();
-      const filePath = isProduction ? path.join(process.cwd(), url) : path.join(process.cwd(), "public", url);
+      const filePath = path.resolve(".", "public", url);
       fs.readFile(filePath, (error, data) => {
         if (error) {
           return reject(error);
         }
-        return resolve(data);
+        return resolve2(data);
       });
     }
   });
 }
 function getCachedImage(pathname) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     fs.readFile(pathname, (error, data) => {
       if (error) {
         return reject(error);
       }
-      return resolve(data);
+      return resolve2(data);
     });
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-image",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Mixer Image module of the BOM Repository",
   "keywords": [
     "bom",
@@ -25,7 +25,7 @@
   "dependencies": {},
   "peerDependencies": {
     "@websolutespa/bom-core": "*",
-    "next": ">= 13.4.19",
+    "next": ">= 14.1.4",
     "sharp": ">= 0.30.4"
   },
   "devDependencies": {
@@ -39,7 +39,7 @@
     "sharp": "0.30.4",
     "ts-node": "^10.9.1",
     "tsup": "^6.7.0",
-    "typescript": "^5.1.6"
+    "typescript": "^5.4.5"
   },
   "publishConfig": {
     "access": "public"

package/src/image/image.handler.ts

@@ -7,7 +7,6 @@ import * as path from 'path';
 // Importing 'sharp' for image processing
 import sharp from 'sharp';
 // Importing 'apiHandler' from '../api/api.handler'
-import { getIsProduction } from '@websolutespa/bom-core';
 import { apiHandler } from '../api/api.handler';
 
 const IMAGE_MAX_AGE = 604800;
@@ -46,6 +45,7 @@ export function imageHandler({ domains = [] }: { domains: string[] }) {
         const cachedName = urlToCachedName(url, width, height, quality);
         // Checking if the cached image exists
         if (fs.existsSync(cachedName)) {
+          // console.log('imageHandler.fromCache', cachedName);
           // Reading the cached image
           const cachedImage = await getCachedImage(cachedName);
           // Setting the 'Content-Type' header to 'image/webp'
@@ -125,10 +125,18 @@ function getOriginalImage(url: string, domains: string[]): Promise<Buffer> {
         });
     } else {
       // Reading the image from the file system
-      const isProduction = getIsProduction();
-      const filePath = isProduction ?
-        path.join(process.cwd(), url) :
-        path.join(process.cwd(), 'public', url);
+      // console.log('imageHandler.getOriginalImage.isDevelopment', isDevelopment);
+      const filePath = path.resolve('.', '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);