5htp-core 0.5.1-6 → 0.5.1-8

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.5.1-6",
+	"version": "0.5.1-8",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",
@@ -73,7 +73,6 @@
 		"react-textarea-autosize": "^8.3.3",
 		"regenerator-runtime": "^0.13.9",
 		"request": "^2.88.2",
-		"sharp": "^0.29.1",
 		"slugify": "^1.6.6",
 		"sql-formatter": "^4.0.2",
 		"stopword": "^3.1.1",
@@ -85,7 +84,8 @@
 		"yaml": "^1.10.2",
 		"yargs-parser": "^21.1.1",
 		"youch": "^3.3.3",
-		"youch-terminal": "^2.2.3"
+		"youch-terminal": "^2.2.3",
+		"zod": "^3.24.2"
 	},
 	"devDependencies": {
 		"@types/cookie": "^0.4.1",
@@ -99,7 +99,8 @@
 		"@types/webpack-env": "^1.16.2",
 		"@types/ws": "^7.4.7",
 		"@types/yargs-parser": "^21.0.0",
-		"schema-dts": "^1.1.2"
+		"schema-dts": "^1.1.2",
+		"sharp": "^0.33.5"
 	},
 	"peerDependencies": {
 		"5htp": "0.4.5"

package/src/common/errors/index.tsx

@@ -154,6 +154,27 @@ export class AuthRequired extends CoreError {
     public static msgDefaut = "Please Login to Continue.";
 }
 
+export class UpgradeRequired extends CoreError {
+    public http = 402;
+    public title = "Upgrade Required";
+    public static msgDefaut = "Please Upgrade to Continue.";
+
+    public constructor( 
+        message: string, 
+        public feature: string,
+        details?: TErrorDetails
+    ) {
+        super(message, details);
+    }
+
+    public json(): TJsonError & { feature: string } {
+        return {
+            ...super.json(),
+            feature: this.feature,
+        }
+    }
+}
+
 export class Forbidden extends CoreError {
     public http = 403;
     public title = "Access Denied";
@@ -235,6 +256,8 @@ export const fromJson = ({ code, message, ...details }: TJsonError) => {
 
         case 401: return new AuthRequired( message, details );
 
+        case 402: return new UpgradeRequired( message, details.feature, details );
+
         case 403: return new Forbidden( message, details );
 
         case 404: return new NotFound( message, details );

package/src/server/app/service/index.ts

@@ -318,9 +318,11 @@ export default abstract class Service<
         return Promise.all( 
             callbacks.map(
                 cb => cb(...args).catch(e => {
-                    console.error(`[hook] Error while executing hook ${name}:`, e);
+
                     if (name !== 'error')
                         this.runHook('error', e);
+                    else 
+                        console.error(`[hook] Error while executing hook ${name}:`, e);
                 })
             ) 
         ).then(() => {

package/src/server/services/fetch/index.ts

@@ -3,7 +3,7 @@
 ----------------------------------*/
 
 // Npm
-import sharp from 'sharp';
+import type { default as sharp, Sharp } from 'sharp';
 import fs from 'fs-extra';
 import got, { Method, Options } from 'got';
 
@@ -43,6 +43,7 @@ export type Services = {
 ----------------------------------*/
 
 export type TImageConfig = {
+    sharp: typeof sharp,
     width: number,
     height: number,
     fit: keyof sharp.FitEnum,
@@ -172,7 +173,7 @@ export default class FetchService extends Service<Config, Hooks, Application, Se
 
     public async image( 
         imageFileUrl: string, 
-        { width, height, fit, quality }: TImageConfig, 
+        imageMod: TImageConfig, 
         saveToBucket: string,
         saveToPath?: string,
         disk?: string
@@ -183,7 +184,7 @@ export default class FetchService extends Service<Config, Hooks, Application, Se
             throw new Error(`Please provide a Disks service in order to download files.`);
 
         // Download
-        let imageBuffer: Buffer;
+        let imageBuffer: Buffer | null;
         try {
             imageBuffer = await this.toBuffer( imageFileUrl );
         } catch (error) {
@@ -191,21 +192,27 @@ export default class FetchService extends Service<Config, Hooks, Application, Se
             return null;
         }
 
-        // Resize
-        const processing = sharp( imageBuffer )
-            // Max dimensions (save space)
-            .resize(width, height, { fit }) 
+        if (imageMod) {
 
-        // Convert to webp and finalize
-        const processedBuffer = await processing.webp({ quality }).toBuffer().catch(e => {
-            console.error(LogPrefix, `Error while processing image at ${imageFileUrl}:`, e);
-            return null;
-        })
+            const { sharp, width, height, fit, quality } = imageMod;
+
+            // Resize
+            const processing = sharp( imageBuffer )
+                // Max dimensions (save space)
+                .resize(width, height, { fit }) 
+    
+            // Convert to webp and finalize
+            imageBuffer = await processing.webp({ quality }).toBuffer().catch(e => {
+                console.error(LogPrefix, `Error while processing image at ${imageFileUrl}:`, e);
+                return null;
+            })
+
+        }
 
         // Save file
-        if (saveToPath !== undefined && processedBuffer !== null) {
+        if (saveToPath !== undefined && imageBuffer !== null) {
             console.log(LogPrefix, `Saving ${imageFileUrl} logo to ${saveToPath}`);
-            await this.disk.outputFile(saveToBucket, saveToPath, processedBuffer);
+            await this.disk.outputFile(saveToBucket, saveToPath, imageBuffer);
         }
 
         // We return the original, because Vibrant.js doesn't support webp

package/src/server/services/router/http/index.ts

@@ -164,7 +164,7 @@ export default class HttpServer {
             // Décodage des données post
             express.json({
                 // TODO: prendre en considération les upload de fichiers
-                limit: '2mb',
+                limit: bytes(this.config.upload.maxSize),
                 verify: (req, res, buf, encoding) => {
                     // Store the raw request body so we can access it later
                     req.rawBody = buf;

package/src/server/services/router/index.ts

@@ -583,11 +583,8 @@ declare type Routes = {
     private async handleError( e: CoreError, request: ServerRequest<ServerRouter> ) {
 
         const code = 'http' in e ? e.http : 500;
-        const route = this.errors[code];
-        if (route === undefined)
-            throw new Error(`No route for error code ${code}`);
 
-        const response = new ServerResponse(request).status(code).setRoute(route);
+        const response = new ServerResponse(request).status(code)
 
         // Rapport / debug
         if (code === 500) {
@@ -613,10 +610,16 @@ declare type Routes = {
 
         // Return error based on the request format
         if (request.accepts("html")) {
+
+            const route = this.errors[code];
+            if (route === undefined)
+                throw new Error(`No route for error code ${code}`);
+
             const jsonError = errorToJson(e);
-            await response.runController(route, { 
+            await response.setRoute(route).runController(route, { 
                 error: jsonError
             });
+
         } else if (request.accepts("json")) {
             const jsonError = errorToJson(e);
             await response.json(jsonError);