@websolutespa/bom-mixer-image 1.0.2 → 1.0.4

package/CHANGELOG.md

@@ -1,19 +1,35 @@
-# @websolutespa/bom-mixer-image
-
-## 1.0.2
-
-### Patch Changes
-
-- 75b1311: Fixing: relative paths
-
-## 1.0.1
-
-### Patch Changes
-
-- Updating: dependencies
-
-## 1.0.0
-
-### Patch Changes
-
-- Added: first release
+# @websolutespa/bom-mixer-image
+
+## 1.0.4
+
+### Patch Changes
+
+- Modified: imageHandler getOriginalImage
+- Updated dependencies
+  - @websolutespa/bom-core@1.7.5
+
+## 1.0.3
+
+### Patch Changes
+
+- 43957d4: Fixing: production local asset public path
+- Updated dependencies
+  - @websolutespa/bom-core@1.7.4
+
+## 1.0.2
+
+### Patch Changes
+
+- 75b1311: Fixing: relative paths
+
+## 1.0.1
+
+### Patch Changes
+
+- Updating: dependencies
+
+## 1.0.0
+
+### Patch Changes
+
+- Added: first release

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_config = __toESM(require("next/config"));
 
 // src/api/api.handler.ts
 function apiHandler(handler) {
@@ -100,8 +101,12 @@ function imageHandler({ domains = [] }) {
             width,
             height: height ? height : void 0,
             fit: import_sharp.default.fit.cover,
-            position: import_sharp.default.strategy.entropy
-          }).webp({ quality });
+            position: import_sharp.default.strategy.entropy,
+            withoutEnlargement: true
+          }).webp({
+            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();
           return response.end(data);
@@ -139,7 +144,9 @@ function getOriginalImage(url, domains) {
         return reject(error);
       });
     } else {
-      fs.readFile(url, (error, data) => {
+      const { serverRuntimeConfig } = (0, import_config.default)();
+      const filePath = path.join(serverRuntimeConfig.PROJECT_ROOT, "public", url);
+      fs.readFile(filePath, (error, data) => {
         if (error) {
           return reject(error);
         }

package/dist/index.mjs

@@ -2,6 +2,7 @@
 import * as fs from "fs";
 import * as path from "path";
 import sharp from "sharp";
+import getConfig from "next/config";
 
 // src/api/api.handler.ts
 function apiHandler(handler) {
@@ -64,8 +65,12 @@ function imageHandler({ domains = [] }) {
             width,
             height: height ? height : void 0,
             fit: sharp.fit.cover,
-            position: sharp.strategy.entropy
-          }).webp({ quality });
+            position: sharp.strategy.entropy,
+            withoutEnlargement: true
+          }).webp({
+            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();
           return response.end(data);
@@ -103,7 +108,9 @@ function getOriginalImage(url, domains) {
         return reject(error);
       });
     } else {
-      fs.readFile(url, (error, data) => {
+      const { serverRuntimeConfig } = getConfig();
+      const filePath = path.join(serverRuntimeConfig.PROJECT_ROOT, "public", url);
+      fs.readFile(filePath, (error, data) => {
         if (error) {
           return reject(error);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-image",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Mixer Image module of the BOM Repository",
   "keywords": [
     "bom",
@@ -24,7 +24,8 @@
   },
   "dependencies": {},
   "peerDependencies": {
-    "next": ">= 13.4.19",
+    "@websolutespa/bom-core": "*",
+    "next": ">= 14.1.4",
     "sharp": ">= 0.30.4"
   },
   "devDependencies": {
@@ -38,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,6 +7,7 @@ import * as path from 'path';
 // Importing 'sharp' for image processing
 import sharp from 'sharp';
 // Importing 'apiHandler' from '../api/api.handler'
+import getConfig from 'next/config';
 import { apiHandler } from '../api/api.handler';
 
 const IMAGE_MAX_AGE = 604800;
@@ -45,6 +46,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'
@@ -67,8 +69,12 @@ export function imageHandler({ domains = [] }: { domains: string[] }) {
               height: height ? height : undefined,
               fit: sharp.fit.cover,
               position: sharp.strategy.entropy,
+              withoutEnlargement: true,
             })
-            .webp({ quality });
+            .webp({
+              quality,
+              nearLossless: true,
+            });
           // Saving the resized image to the cache
           resizedImage.toFile(cachedName)
             .then(() => console.log('imageHandler.sharp.cached', cachedName))
@@ -120,7 +126,16 @@ function getOriginalImage(url: string, domains: string[]): Promise<Buffer> {
         });
     } else {
       // Reading the image from the file system
-      fs.readFile(path.join(process.cwd(), 'public', url), (error, data) => {
+      const { serverRuntimeConfig } = getConfig();
+      // console.log('imageHandler.getOriginalImage.isDevelopment', isDevelopment);
+      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);
         }