5htp-core 0.6.2-97 → 0.6.2-99

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.6.2-97",
+	"version": "0.6.2-99",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",

package/server/app/index.ts

@@ -17,6 +17,7 @@ import ServicesContainer, {
 // Built-in
 import type { default as Router, Request as ServerRequest, TRoute } from '@server/services/router';
 import { Anomaly } from '@common/errors';
+import { preprocessSchema } from '@server/services/router/request/validation/zod';
 
 export { default as Services } from './service/container';
 export type { TEnvConfig as Environment } from './container/config';
@@ -150,7 +151,9 @@ export abstract class Application<
         console.log('----------------------------------');
         console.log('- SERVICES');
         console.log('----------------------------------');
-        await this.ready();
+        const startingServices = await this.ready();
+        await Promise.all(startingServices);
+        console.log('All services are ready');
         await this.runHook('ready');
 
         const startedTime = (Date.now() - startTime) / 1000;
@@ -179,12 +182,14 @@ export abstract class Application<
 
     public register( service: AnyService ) {
 
-        service.ready();
+        return service.ready();
 
     }
 
     protected async ready() {
 
+        const startingServices: Promise<any>[] = [];
+
         // Print services
         const processService = async (propKey: string, service: AnyService, level: number = 0) => {
 
@@ -193,7 +198,8 @@ export abstract class Application<
 
             // Services start shouldn't block app boot
             // use await ServiceName.started to make services depends on each other
-            this.starting = service.ready();
+            service.starting = service.ready();
+            startingServices.push(service.starting);
             service.status = 'running';
             console.log('-' + '-'.repeat(level * 1), propKey + ': ' + service.constructor.name);
 
@@ -203,12 +209,14 @@ export abstract class Application<
 
                 console.log('Attached service', service.constructor.name, 'to route', route.path);
 
+                const preprocessedSchema = route.schema ? preprocessSchema(route.schema) : undefined;
+
                 const origController = route.controller;
                 route.controller = (context: RouterContext) => {
 
                     // Filter data
-                    const data = route.schema 
-                        ? route.schema.parse( context.request.data )
+                    const data = preprocessedSchema 
+                        ? preprocessedSchema.parse( context.request.data )
                         : {};
 
                     // Run controller
@@ -253,6 +261,8 @@ export abstract class Application<
             // Services start shouldn't block app boot
             processService(serviceId, service);
         }
+
+        return startingServices;
     }
 
 }

package/server/services/disks/index.ts

@@ -50,8 +50,6 @@ export default class DisksManager<
         super(...args);
 
         const drivers = this.config.drivers;
-
-        console.log('drivers', args);
         
         if (Object.keys( drivers ).length === 0)
             throw new Error("At least one disk driver should be mounted.");

package/server/services/router/index.ts

@@ -168,11 +168,6 @@ export default class ServerRouter<
 
     public async ready() {
 
-        // Every hours
-        setInterval(() => {
-            this.refreshStaticPages();
-        }, 1000 * 60 * 60);
-
         // Detect router services
         for (const serviceName in this.config.plugins) {
             const service = this.config.plugins[serviceName];
@@ -216,6 +211,12 @@ export default class ServerRouter<
             );
         };
 
+
+        // When all the services are ready, initialize static routes
+        this.app.on('ready', () => {
+            this.initStaticRoutes();
+        });
+
     }
 
     public async shutdown() {
@@ -238,6 +239,8 @@ export default class ServerRouter<
 
         if (!rendered) {
 
+            console.log('[router] renderStatic: url', url);
+
             const fullUrl = this.url(url, {}, true);
             const response = await got( fullUrl, {
                 method: 'GET',
@@ -266,6 +269,26 @@ export default class ServerRouter<
         
     }
 
+    private initStaticRoutes() {
+
+        for (const route of this.routes) {
+
+            if (!route.options.static)
+                continue;
+
+            // Add to static pages
+            // Should be a GET oage that don't take any parameter
+            for (const url of route.options.static.urls) {
+                this.renderStatic(url, route.options.static);
+            }
+        }
+
+        // Every hours, refresh static pages
+        setInterval(() => {
+            this.refreshStaticPages();
+        }, 1000 * 60 * 60);
+    }
+
     private refreshStaticPages() {
 
         console.log('[router] refreshStaticPages');
@@ -275,15 +298,10 @@ export default class ServerRouter<
             if (page.expire && page.expire < Date.now()) {
 
                 this.renderStatic(pageUrl, page.options);
-
             }
         }
     }
 
-
-
-
-
     private registerRoutes(defModules: GlobImportedWithMetas<TRouteModule>) {
         for (const routeModule of defModules) {
 
@@ -332,14 +350,6 @@ export default class ServerRouter<
 
         this.routes.push(route);
 
-        // Add to static pages
-        // Should be a GET oage that don't take any parameter
-        if (options.static) {
-            for (const url of options.static.urls) {
-                this.renderStatic(url, options.static);
-            }
-        }
-
         return this;
 
     }

package/server/services/router/request/validation/zod.ts

@@ -5,42 +5,61 @@ export type TRichTextValidatorOptions = {
     attachements?: boolean
 }
 
-// Recursive function to validate each node
-function validateLexicalNode(node: any, opts: TRichTextValidatorOptions ) {
+export const preprocessSchema = (schema: zod.ZodObject): zod.ZodObject => {
 
-    // Each node should be an object with a `type` property
-    if (typeof node !== 'object' || !node.type || typeof node.type !== 'string')
-        throw new InputError("Invalid rich text value (3).");
+    // Not working, data is {}
+    return schema;
 
-    // Validate text nodes
-    if (node.type === 'text') {
+    if (!(schema instanceof zod.ZodObject))
+        return schema;
 
-        if (typeof node.text !== 'string')
-            throw new InputError("Invalid rich text value (4).");
+    if (schema.withPreprocessing)
+        return schema;
 
-        // Validate paragraph, heading, or other structural nodes that may contain children
-    } else if (['paragraph', 'heading', 'list', 'listitem'].includes(node.type)) {
+    const shape = schema.def.shape;
+    const newShape: Record<string, zod.ZodTypeAny> = {};
 
-        if (!Array.isArray(node.children) || !node.children.every(children => validateLexicalNode(children, opts))) {
-            throw new InputError("Invalid rich text value (5).");
-        }
+    for (const key in shape) {
 
-        // Files upload
-    } else if (node.type === 'image') {
+        if (!['newEntity', 'email'].includes(key))
+            continue;
 
-        // Check if allowed
-        /*if (opts.attachements === undefined)
-            throw new InputError("Image attachments not allowed in this rich text field.");*/
+        let current: zod.ZodTypeAny = shape[key];
+        while (current) {
+            
+            const origType = current.type;
+            const preprocessor = toPreprocess[origType];
 
-        // TODO: check mime
+            if (origType === 'object') {
+                newShape[key] = preprocessSchema(current as zod.ZodObject);
+                break;
+            }
 
+            if (preprocessor) {
+                newShape[key] = preprocessor(current);
+                console.log('====newShape', key, newShape[key]);
+                break;
+            }
 
-        // Upload file
+            current = current.def;
+        }
+    }
 
+    const newSchema = zod.object(newShape);
+    newSchema.withPreprocessing = true;
+    return newSchema;
+}
 
-    }
+const toPreprocess = {
+
+    string: (zString: zod.ZodString) => zod.preprocess( val => {
+        return val === '' ? undefined : val;
+    }, zString),
+
+    int: (zInt: zod.ZodInt) => zod.preprocess( val => {
+        return typeof val === 'string' ? Number.parseInt(val) : val;
+    }, zInt),
 
-    return true;
 }
 
 export const schema = { 
@@ -56,15 +75,6 @@ export const schema = {
         return zod.file();
     },
 
-    int: () => zod.preprocess( val => {
-
-        if (typeof val === "string")
-            return Number.parseInt(val);
-          
-        return val;
-
-    }, zod.int()),
-
     choice: ( choices: string[] | { value: any, label: string }[] | _ZodType, options: { multiple?: boolean } = {} ) => {
 
         const normalizeValue = (value: any) => typeof value === 'object' ? value.value : value;
@@ -129,4 +139,42 @@ export const schema = {
     })
 }
 
-export type { default as z } from 'zod';
+// Recursive function to validate each node
+function validateLexicalNode(node: any, opts: TRichTextValidatorOptions ) {
+
+    // Each node should be an object with a `type` property
+    if (typeof node !== 'object' || !node.type || typeof node.type !== 'string')
+        throw new InputError("Invalid rich text value (3).");
+
+    // Validate text nodes
+    if (node.type === 'text') {
+
+        if (typeof node.text !== 'string')
+            throw new InputError("Invalid rich text value (4).");
+
+        // Validate paragraph, heading, or other structural nodes that may contain children
+    } else if (['paragraph', 'heading', 'list', 'listitem'].includes(node.type)) {
+
+        if (!Array.isArray(node.children) || !node.children.every(children => validateLexicalNode(children, opts))) {
+            throw new InputError("Invalid rich text value (5).");
+        }
+
+        // Files upload
+    } else if (node.type === 'image') {
+
+        // Check if allowed
+        /*if (opts.attachements === undefined)
+            throw new InputError("Image attachments not allowed in this rich text field.");*/
+
+        // TODO: check mime
+
+
+        // Upload file
+
+
+    }
+
+    return true;
+}
+
+export type { default as z } from 'zod';

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

@@ -313,11 +313,11 @@ export default class ServerResponse<
         return this.end();
     }
 
-    public redirect(url: string, code: number = 302) {
+    public redirect(url: string, code: number = 302, absolute: boolean = false) {
 
         debug && console.log("[routeur][response] Redirect", url);
         this.statusCode = code;
-        this.headers['Location'] = this.router.url( url );
+        this.headers['Location'] = this.router.url( url, {}, absolute );
         return this.end();
     }
 

package/server/services/schema/request.ts

@@ -12,7 +12,7 @@ import {
 } from '@server/services/router';
 
 // Ap
-import { schema } from '@server/services/router/request/validation/zod';
+import { preprocessSchema, schema } from '@server/services/router/request/validation/zod';
 
 /*----------------------------------
 - SERVICE CONFIG
@@ -42,6 +42,8 @@ export default(
 
         const schema = typeof fields === 'object' ? zod.object(fields) : fields;
 
-        return schema.parse(request.data);
+        const preprocessedSchema = preprocessSchema(schema);
+
+        return preprocessedSchema.parse(request.data);
     },
 })

package/types/icons.d.ts

@@ -1 +1 @@
-export type TIcones = "solid/spinner-third"|"rocket"|"user-circle"|"times"|"at"|"star"|"plus"|"minus"|"trash"|"magnet"|"search"|"paper-plane"|"brands/linkedin"|"play"|"stop"|"check"|"plus-circle"|"clock"|"cog"|"ellipsis-h"|"long-arrow-right"|"lightbulb"|"long-arrow-left"|"phone"|"arrow-right"|"regular/shield-check"|"angle-down"|"plane-departure"|"comments-alt"|"user-shield"|"shield-alt"|"chart-line"|"money-bill-wave"|"link"|"file-alt"|"envelope"|"solid/crown"|"eye"|"pen"|"file"|"angle-up"|"user-plus"|"sack-dollar"|"info-circle"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"download"|"brands/google"|"brands/whatsapp"|"crown"|"check-circle"|"exclamation-circle"|"times-circle"|"arrow-left"|"broom"|"solid/check-circle"|"solid/exclamation-triangle"|"solid/times-circle"|"hourglass"|"key"|"building"|"briefcase"|"map-marker-alt"|"graduation-cap"|"angle-left"|"angle-right"|"plug"|"coin"|"coins"|"minus-circle"|"external-link"|"question-circle"|"arrow-to-bottom"|"magic"|"user"|"meh-rolling-eyes"|"unlink"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"code"|"font"|"empty-set"|"horizontal-rule"|"page-break"|"image"|"table"|"poll"|"columns"|"sticky-note"|"caret-right"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"
+export type TIcones = "solid/spinner-third"|"rocket"|"user-circle"|"brands/linkedin"|"play"|"stop"|"trash"|"times"|"at"|"star"|"plus"|"minus"|"magnet"|"paper-plane"|"search"|"check"|"plus-circle"|"regular/shield-check"|"angle-down"|"clock"|"cog"|"ellipsis-h"|"long-arrow-right"|"lightbulb"|"long-arrow-left"|"phone"|"arrow-right"|"plane-departure"|"comments-alt"|"user-shield"|"shield-alt"|"chart-line"|"money-bill-wave"|"link"|"file-alt"|"solid/crown"|"eye"|"pen"|"file"|"envelope"|"angle-up"|"user-plus"|"sack-dollar"|"info-circle"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"download"|"brands/google"|"brands/whatsapp"|"crown"|"check-circle"|"exclamation-circle"|"times-circle"|"arrow-left"|"key"|"building"|"briefcase"|"map-marker-alt"|"graduation-cap"|"solid/check-circle"|"solid/exclamation-triangle"|"solid/times-circle"|"hourglass"|"angle-left"|"angle-right"|"broom"|"question-circle"|"coin"|"coins"|"plug"|"arrow-to-bottom"|"external-link"|"magic"|"minus-circle"|"user"|"meh-rolling-eyes"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"code"|"unlink"|"font"|"empty-set"|"horizontal-rule"|"page-break"|"image"|"table"|"poll"|"columns"|"sticky-note"|"caret-right"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"