@dnax/core 0.9.4 → 0.9.6

package/app/hono.ts

@@ -1,5 +1,8 @@
 import type { Q, Tenant, sessionCtx } from "../types/";
-
+import fs from "fs-extra";
+import sharp from "sharp";
+import path from "path";
+import mime from "mime-types";
 import { Hono } from "hono";
 import { getCookie, setCookie } from "hono/cookie";
 import colors from "@colors/colors/safe";
@@ -302,18 +305,9 @@ function HonoInstance(): typeof app {
 
       var response;
       var parseBody;
+      var body;
       var { action, collection, cleanDeep, useCache, name } =
         c.req.query() as Q;
-      const service = getService(name, c.var["tenant-id"]);
-      const col = getCollection(collection, c.var["tenant-id"]);
-      const body = await c?.req
-        ?.json()
-        .then((e) => e)
-        .catch((err) => null);
-
-      useCache = stringToBoolean(useCache, false);
-      if (body?.useCache) useCache = stringToBoolean(body.useCache, false);
-
       if (
         c.req.raw?.headers
           ?.get("content-type")
@@ -325,7 +319,17 @@ function HonoInstance(): typeof app {
           (await c?.req.parseBody({
             all: true,
           })) || {};
+      } else {
+        body = await c?.req
+          ?.json()
+          .then((e) => e)
+          .catch((err) => null);
       }
+      const service = getService(name, c.var["tenant-id"]);
+      const col = getCollection(collection, c.var["tenant-id"]);
+
+      useCache = stringToBoolean(useCache, false);
+      if (body?.useCache) useCache = stringToBoolean(body.useCache, false);
 
       const rest = new useRest({
         tenant_id: c.var["tenant-id"],
@@ -550,15 +554,68 @@ function HonoInstance(): typeof app {
     }
   });
 
+  // serve static files
+  app.get("/files/:folder/public/:filename", async (c, next) => {
+    let { folder, filename } = c.req.param();
+    const filePath = path.join(
+      cleanPath("uploads/" + folder + "/public/"),
+      filename
+    );
+    const width = parseInt(c.req.query("w")) || null;
+    const height = parseInt(c.req.query("h")) || null;
+    const quality = parseInt(c.req.query("q")) || 80;
+    // Vérifier si le fichier existe
+    if (!fs.existsSync(filePath)) {
+      return c.text("file not found", 404);
+    }
+
+    // Obtenir le type MIME du fichier
+    const mimeType = mime.lookup(filePath);
+
+    // Si ce n'est pas une image, retourner le fichier original
+    if (!mimeType || !mimeType.startsWith("image/")) {
+      const originalFile = fs.readFileSync(filePath);
+      return c.body(originalFile, 200, {
+        "Content-Type": mimeType || "application/octet-stream",
+      });
+    }
+
+    try {
+      // Redimensionner l'image avec Sharp
+      const buffer = await sharp(filePath)
+        .resize(width, height)
+        .jpeg({ quality })
+        .toBuffer();
+
+      // Retourner l'image redimensionnée
+      return c.body(buffer, 200, {
+        "Content-Type": "image/jpeg",
+      });
+    } catch (error) {
+      // Si une erreur se produit avec Sharp, retourner le fichier original
+      const file = fs.readFileSync(filePath);
+      return c.body(file, 200, {
+        "Content-Type": mimeType || "application/octet-stream",
+      });
+    }
+  });
+
   // media endpoints
-  Cfg.collections?.map((c) => {
-    if (c?.type == "media" && c.media?.enabled) {
-      let mediaPath = cleanPath(
-        "/files/" + (c?.media?.overwriteFolderName || c?.slug) + "/public/*"
-      );
-
-      //console.log("Media Path :", mediaPath);
-      app.get(
+  //Cfg.collections?.map((c) => {
+  // if (c?.type == "media" && c.media?.enabled) {
+  //let mediaPath = cleanPath(
+  //  "/files/" + (c?.media?.overwriteFolderName || c?.slug) + "/public/*"
+  // );
+
+  /*   app.get(optimizeImage, async (c, next) => {
+        let width = parseInt(c.req.query("w")) || null;
+        let height = parseInt(c.req.query("h")) || null;
+        let quality = parseInt(c.req.query("q")) || 80;
+
+      }); */
+
+  //console.log("Media Path :", mediaPath);
+  /* app.get(
         mediaPath,
         serveStatic({
           root: cleanPath("uploads"),
@@ -567,9 +624,9 @@ function HonoInstance(): typeof app {
             console.log(`${path} is not found, you access ${c.req.path}`);
           },
         })
-      );
-    }
-  });
+      ); */
+  //}
+  //});
 
   // Endpoint
   Cfg?.endpoints?.map((e) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.9.4",
+  "version": "0.9.6",
   "module": "index.ts",
   "type": "module",
   "bin": {
@@ -8,6 +8,8 @@
   },
   "devDependencies": {
     "@types/bun": "latest",
+    "@types/fs-extra": "^11.0.4",
+    "@types/mime-types": "^2.1.4",
     "@types/nodemailer": "^6.4.15",
     "@types/uuid": "^10.0.0"
   },
@@ -35,11 +37,13 @@
     "joi": "^17.13.3",
     "json-joy": "^16.8.0",
     "jsonwebtoken": "^9.0.2",
+    "mime-types": "^2.1.35",
     "mingo": "^6.4.15",
     "moment": "^2.30.1",
     "mongodb": "^6.8.0",
     "nodemailer": "^6.9.14",
     "radash": "^12.1.0",
+    "sharp": "^0.33.5",
     "signaldb": "^0.18.0",
     "socket.io": "^4.7.5",
     "ufo": "^1.5.3",