5htp-core 0.6.2 → 0.6.3-2

package/client/app/index.ts

@@ -21,7 +21,8 @@ import type { AnyService } from './service';
 export { default as Service } from './service';
 
 // Resources
-import '@client/assets/css/core.less';
+//import '@client/assets/css/core.less';
+//import '@mantine/core/styles.css';
 
 /*----------------------------------
 - TYPES

package/client/assets/css/components/table.less

@@ -1,6 +1,7 @@
 .table {
 
     overflow: auto;
+    display: block!important;
 
     &.scrollable {
         max-height: 90vh;

package/client/components/Input.tsx

@@ -13,8 +13,6 @@ import {
 
 // Core libs
 import { InputBaseProps, useMantineInput } from './utils';
-import { default as Validator } from '../../server/services/router/request/validation/validator';
-import type { SchemaValidators } from '@server/services/router/request/validation/validators';
 
 /*----------------------------------
 - TYPES

package/client/components/Rte/Editor.tsx

@@ -81,6 +81,8 @@ import ToolbarPlugin from './ToolbarPlugin';
 
 export const EMPTY_STATE = '{"root":{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1}],"direction":null,"format":"","indent":0,"type":"root","version":1}}';
 
+import './style.less';
+
 /*----------------------------------
 - TYPES
 ----------------------------------*/

package/client/components/Rte/index.tsx

@@ -11,7 +11,6 @@ import type { TToolbarDisplay } from './ToolbarPlugin';
 
 // Special componets
 import type TEditor from './Editor';
-import './style.less';
 
 /*----------------------------------
 - TYPES

package/client/services/router/index.tsx

@@ -17,7 +17,7 @@ import type { TBasicSSrData } from '@server/services/router/response';
 import BaseRouter, {
     defaultOptions, TRoute, TErrorRoute, 
     TClientOrServerContextForPage, TRouteModule,
-    matchRoute, buildUrl, TDomainsList
+    matchRoute, buildUrl
 } from '@common/router'
 import { getLayout } from '@common/router/layouts';
 import { getRegisterPageArgs, buildRegex } from '@common/router/register';

package/client/services/router/request/api.ts

@@ -50,18 +50,9 @@ export default class ApiClient implements ApiClientService {
         throw new Error("api.fetch shouldn't be called here.");
     }
 
-    public get = <TData extends unknown = unknown>(path: string, data?: TPostData, opts?: TApiFetchOptions) => 
-        this.createFetcher<TData>('GET', path, data, opts);
-
     public post = <TData extends unknown = unknown>(path: string, data?: TPostData, opts?: TApiFetchOptions) => 
         this.createFetcher<TData>('POST', path, data, opts);
 
-    public put = <TData extends unknown = unknown>(path: string, data?: TPostData, opts?: TApiFetchOptions) => 
-        this.createFetcher<TData>('PUT', path, data, opts);
-
-    public delete = <TData extends unknown = unknown>(path: string, data?: TPostData, opts?: TApiFetchOptions) => 
-        this.createFetcher<TData>('DELETE', path, data, opts);
-
     public set( newData: TObjetDonnees ) {
 
         if (!('context' in this.router))
@@ -111,51 +102,34 @@ export default class ApiClient implements ApiClientService {
     ----------------------------------*/
     public createFetcher<TData extends unknown = unknown>(...args: TFetcherArgs): TFetcher<TData> {
         const [method, path, data, options] = args;
-        return {
+
+        // Lazily create (and cache) the underlying promise so the fetcher behaves like a real promise instance.
+        let promise: Promise<TData> | undefined;
+
+        const fetcher = {
             method, path, data, options,
+        } as TFetcher<TData>;
+
+        const getPromise = () => {
+            if (!promise)
+                promise = this.fetchAsync<TData>(fetcher.method, fetcher.path, fetcher.data, fetcher.options);
 
-            // For async calls: api.post(...).then((data) => ...)
-            then: (callback: (data: any) => void) => this.fetchAsync<TData>(...args)
-                .then(callback)
-                .catch( e => {
-                    this.app.handleError(e);
-
-                    // Don't run what is next
-                    return {
-                        then: () => {},
-                        catch: () => {},
-                        finally: (callback: () => void) => {
-                            callback();
-                        },
-                    }
-                }),
-
-            // Default error behavior only if not handled before by the app
-            catch: (callback: (data: any) => false | void) => this.fetchAsync<TData>(...args)
-                .catch((e) => {
-
-                    const shouldThrow = callback(e);
-                    if (shouldThrow) 
-                        this.app.handleError(e);
-
-                    // Don't run what is next
-                    return {
-                        then: () => {},
-                        catch: () => {},
-                        finally: (callback: () => void) => {
-                            callback();
-                        },
-                    }
-
-                }),
-
-            finally: (callback: () => void) => this.fetchAsync<TData>(...args)
-                .finally(callback)
-                .catch( e => this.app.handleError(e)),
-
-            run: () => this.fetchAsync<TData>(...args)
-                .catch( e => this.app.handleError(e)),
+            return promise;
         };
+
+        // For async calls: api.post(...).then((data) => ...)
+        fetcher.then = (onfulfilled?: any, onrejected?: any) =>
+            getPromise().then(onfulfilled, onrejected) as any;
+
+        fetcher.catch = (onrejected?: any) =>
+            getPromise().catch(onrejected) as any;
+
+        fetcher.finally = (onfinally?: any) =>
+            getPromise().finally(onfinally) as any;
+
+        fetcher.run = () => getPromise();
+
+        return fetcher;
     }
 
     public async fetchAsync<TData extends unknown = unknown>(...[
@@ -290,4 +264,4 @@ export default class ApiClient implements ApiClientService {
             });
     }
     
-}
+}

package/common/data/dates.ts

@@ -134,6 +134,9 @@ const units: {[name: string]: TUnit} = {
 
 export function ago(date: Date | string, { min, max }: { min?: string, max?: string } = {}): string {
 
+    if (!date)
+        return '-';
+
     if (typeof date === 'string')
         date = new Date(date);
 

package/common/router/request/api.ts

@@ -63,14 +63,6 @@ export default abstract class ApiClient {
     - TOP LEVEL
     ----------------------------------*/
 
-    public abstract get<TData extends unknown = unknown>(path: string, data?: TObjetDonnees, opts?: TApiFetchOptions): TFetcher<TData>;
-
-    public abstract post<TData extends unknown = unknown>(path: string, data?: TObjetDonnees, opts?: TApiFetchOptions): TFetcher<TData>;
-
-    public abstract put<TData extends unknown = unknown>(path: string, data?: TObjetDonnees, opts?: TApiFetchOptions): TFetcher<TData>;
-
-    public abstract delete<TData extends unknown = unknown>(path: string, data?: TObjetDonnees, opts?: TApiFetchOptions): TFetcher<TData>;
-
     public abstract set( newData: TObjetDonnees );
 
     public abstract reload( ids?: string | string[], params?: TObjetDonnees );

package/package.json

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

package/server/app/container/config.ts

@@ -12,7 +12,8 @@ import fs from 'fs-extra';
 import yaml from 'yaml';
 
 // Types
-import type { Config as TConsoleConfig } from './console';
+import type { TDomainsList } from '@common/router';
+import type { TLogProfile } from './console';
 
 /*----------------------------------
 - TYPES
@@ -29,12 +30,50 @@ declare global {
     }
 }
 
+/*
+    name: server
+    profile: prod
+
+    router:
+        port: 80
+        domains:
+            current: 'https://recruiters.becrosspath.com'
+            recruiters: 'https://recruiters.becrosspath.com'
+            landing: 'https://becrosspath.com'
+            employers: 'https://employers.becrosspath.com'
+            candidates: 'https://candidates.becrosspath.com'
+            csm: 'https://csm.becrosspath.com'
+
+    database:
+        name: 'aws'
+        databases: [railway]
+        host: 'mysql-z7vp.railway.internal'
+        port: 3306
+        login: root
+        password: "GMnVsczoyYkyzwvVqDkMUOAIjVsumEev"
+
+    console:
+        enable: false
+        debug: false
+        bufferLimit: 10000
+        level: 'log'
+*/
+
 export type TEnvName = TEnvConfig["name"];
 export type TEnvConfig = {
     name: 'local' | 'server',
-    profile: 'dev' | 'prod',
-    version: string,
-    console: TConsoleConfig
+    profile: 'dev' | 'testing' | 'prod',
+    
+    router: {
+        port: number,
+        domains: TDomainsList
+    },
+    console: {
+        enable: boolean,
+        debug: boolean,
+        bufferLimit: number,
+        level: TLogProfile,
+    },
 }
 
 type AppIdentityConfig = {

package/server/app/container/console/index.ts

@@ -27,7 +27,7 @@ import { SqlError } from '@server/services/database/debug';
 - SERVICE CONFIG
 ----------------------------------*/
 
-type TLogProfile = 'silly' | 'info' | 'warn' | 'error'
+export type TLogProfile = 'silly' | 'info' | 'warn' | 'error'
 
 export type Config = {
     debug?: boolean,
@@ -197,9 +197,14 @@ export default class Console {
                     logErrors: string[], 
                     settings: ISettings<ILogObj>
                 ) => {
-                    const logErrorsStr = (logErrors.length > 0 && logArgs.length > 0 ? "\n" : "") + logErrors.join("\n");
-                    settings.prettyInspectOptions.colors = settings.stylePrettyLogs;
-                    origLog(logMetaMarkup + formatWithOptions(settings.prettyInspectOptions, ...logArgs) + logErrorsStr);
+                    try {
+                        const logErrorsStr = (logErrors.length > 0 && logArgs.length > 0 ? "\n" : "") + logErrors.join("\n");
+                        settings.prettyInspectOptions = settings.prettyInspectOptions || {};
+                        settings.prettyInspectOptions.colors = settings.stylePrettyLogs;
+                        origLog(logMetaMarkup + formatWithOptions(settings.prettyInspectOptions, ...logArgs) + logErrorsStr);
+                    } catch (error) {
+                        origLog("Error formatting log", error);
+                    }
                 },
             }
         }); 
@@ -301,45 +306,10 @@ export default class Console {
         // On envoi l'email avant l'insertion dans bla bdd
         // Car cette denrière a plus de chances de provoquer une erreur
         //const logs = this.logs.filter(e => e.channel.channelId === channelId).slice(-100);
-        const stacktraces: string[] = [];
-        const context: object[] = [];
-
-        let currentError: TCatchedError | undefined = error;
-        let title: string | undefined;
-        while (currentError !== undefined) {
-
-            if (title === undefined)
-                title = currentError.message;
-
-            // Stacktrace
-            this.logger.error(LogPrefix, `Sending bug report for the following error:`, currentError);
-            stacktraces.push(currentError.stack || currentError.message);
-
-            // Context
-            if (('dataForDebugging' in currentError) && currentError.dataForDebugging !== undefined) {
-                console.error(LogPrefix, `More data about the error:`, currentError.dataForDebugging);
-                context.push(currentError.dataForDebugging || {});
-            }
-
-            // Print the error so it's accessible via logs
-            if (currentError instanceof SqlError)  {
-                let printedQuery: string;
-                try {
-                    printedQuery = this.printSql( currentError.query );
-                } catch (error) {
-                    printedQuery = 'Failed to print query:' + (error || 'unknown error');
-                }
-                console.error(`Error caused by this query:`, printedQuery);
-            }
-
-            // Go deeper
-            currentError = 'originalError' in currentError 
-                ? currentError.originalError
-                : undefined
-        }
+        const inspection = this.getDetailledError(error);
 
         // Genertae unique error hash
-        const hash = md5( stacktraces.join('\n') );
+        const hash = md5( inspection.stacktraces[0] );
 
         // Don't send the same error twice in a row (avoid email spamming)
         const lastReport = this.reported[hash];
@@ -390,12 +360,56 @@ export default class Console {
             } : {}),
 
             // Error
-            title,
-            stacktraces,
-            context
+            title: inspection.title,
+            stacktraces: inspection.stacktraces,
+            context: inspection.context
         }
 
         await application.runHook('bug', bugReport);
+
+        return bugReport;
+    }
+
+    public getDetailledError( error: TCatchedError ) {
+
+        const stacktraces: string[] = [];
+        const context: object[] = [];
+
+        let currentError: TCatchedError | undefined = error;
+        let title: string | undefined;
+        while (currentError !== undefined) {
+
+            if (title === undefined)
+                title = currentError.message;
+
+            // Stacktrace
+            this.logger.error(LogPrefix, `Sending bug report for the following error:`, currentError);
+            stacktraces.push(currentError.stack || currentError.message);
+
+            // Context
+            if (('dataForDebugging' in currentError) && currentError.dataForDebugging !== undefined) {
+                console.error(LogPrefix, `More data about the error:`, currentError.dataForDebugging);
+                context.push(currentError.dataForDebugging || {});
+            }
+
+            // Print the error so it's accessible via logs
+            if (currentError instanceof SqlError)  {
+                let printedQuery: string;
+                try {
+                    printedQuery = this.printSql( currentError.query );
+                } catch (error) {
+                    printedQuery = 'Failed to print query:' + (error || 'unknown error');
+                }
+                console.error(`Error caused by this query:`, printedQuery);
+            }
+
+            // Go deeper
+            currentError = 'originalError' in currentError 
+                ? currentError.originalError
+                : undefined
+        }
+
+        return { title, stacktraces, context };
     }
 
     public getChannel() {
@@ -416,11 +430,7 @@ export default class Console {
 <b>User</b>: ${report.user ? (report.user.name + ' (' + report.user.email + ')') : 'Unknown'}<br />
 <b>IP</b>: ${report.ip}<br />
 
-${report.stacktraces.map((stacktrace, index) => `
-    <hr />
-    <b>Error ${index + 1}</b>:
-    ${this.printHtml(stacktrace)}<br />
-`).join('')}
+${this.stacktracesToHTML(report.stacktraces)}
 
 ${report.context.map((context, index) => `
     <hr />
@@ -439,6 +449,13 @@ ${report.request ? `
 Logs: ${this.config.enable ? `<br/>` + this.logsToHTML(report.logs) : 'Logs collection is disabled'}<br />
         `
     }
+
+    public stacktracesToHTML( stacktraces: string[] ): string {
+        return stacktraces.map((stacktrace, index) => `
+            <hr />
+            <b>Stacktrace ${index + 1}</b>: ${this.printHtml(stacktrace)}<br />
+        `).join('');
+    }
  
     public logsToHTML( logs: TJsonLog[] ): string {
 

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';
@@ -105,7 +106,10 @@ export abstract class Application<
         this.on('error', (e, request) => this.container.handleBug(e, "An error occured in the application", request));
         
         process.on('unhandledRejection', (error: any, promise: any) => {
-            console.log("unhandledRejection");
+
+            // Log so we know it's coming from unhandledRejection
+            console.error("unhandledRejection", error);
+
             // We don't log the error here because it's the role of the app to decidehiw to log errors
             this.runHook('error', error);
         });
@@ -147,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;
@@ -176,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) => {
 
@@ -190,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);
 
@@ -200,16 +209,16 @@ 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 )
                         : {};
 
-                    console.log('-----data', data);
-
                     // Run controller
                     return origController.bind( service )(
                         data, 
@@ -252,6 +261,8 @@ export abstract class Application<
             // Services start shouldn't block app boot
             processService(serviceId, service);
         }
+
+        return startingServices;
     }
 
 }

package/server/app/service/index.ts

@@ -2,6 +2,9 @@
 - DEPENDANCES
 ----------------------------------*/
 
+// Npm
+import zod from 'zod';
+
 // Specific
 import type { Application } from "..";
 import type { Command } from "../commands"; 
@@ -9,7 +12,8 @@ import type { TServiceMetas } from './container';
 import type { TControllerDefinition, TRoute } from '../../services/router';
 import { Anomaly } from "@common/errors";
 
-export { default as schema } from 'zod';
+export { schema } from '../../services/router/request/validation/zod';
+export type { z } from '../../services/router/request/validation/zod';
 
 /*----------------------------------
 - TYPES: OPTIONS
@@ -42,7 +46,7 @@ export type StartedServicesIndex = {
 
 export type TServiceArgs<TService extends AnyService> = [
     parent: AnyService | 'self',
-    getConfig: null | undefined | ((instance: TService) => {}),
+    config: null | undefined | TService['config'],
     app: TService['app'] | 'self'
 ]
 
@@ -52,7 +56,30 @@ export type TServiceArgs<TService extends AnyService> = [
 
 const LogPrefix = '[service]';
 
-export function Route(options: Omit<TControllerDefinition, 'controller'> = {}) {
+type TDecoratorArgs = (
+    [path: string] |
+    [path: string, schema: zod.ZodSchema] |
+    [path: string, schema: zod.ZodSchema, options?: Omit<TControllerDefinition, 'controller'|'schema'|'path'>] |
+    [options: Omit<TControllerDefinition, 'controller'>]
+)
+
+export function Route( ...args: TDecoratorArgs ) {
+
+    let path: string | undefined;
+    let schema: zod.ZodSchema | undefined;
+    let options: Omit<TControllerDefinition, 'controller'|'schema'|'path'> = {};
+
+    if (typeof args[0] === 'object') {
+        const { path: path_, schema: schema_, ...options_ } = args[0];
+        path = path_;
+        schema = schema_;
+        options = options_;
+    } else {
+        path = args[0];
+        schema = args[1];
+        options = args[2] || {};
+    }
+
     return function (
         target: any,
         propertyKey: string,
@@ -61,8 +88,8 @@ export function Route(options: Omit<TControllerDefinition, 'controller'> = {}) {
         // Store the original method
         const originalMethod = descriptor.value;
 
-        if (options.path === undefined)
-            options.path = target.constructor.name + '/' + propertyKey;
+        if (path === undefined)
+            path = target.constructor.name + '/' + propertyKey;
 
         // Ensure the class has a static property to collect routes
         if (!target.__routes) {
@@ -72,9 +99,9 @@ export function Route(options: Omit<TControllerDefinition, 'controller'> = {}) {
         // Create route object
         const route: TRoute = {
             method: 'POST',
-            path: '/api/' + options.path,
+            path: '/api/' + path,
             controller: originalMethod,
-            schema: options.schema,
+            schema: schema,
             options: {
                 priority: options.priority || 0
             }
@@ -95,7 +122,7 @@ export default abstract class Service<
     TConfig extends {}, 
     THooks extends THooksList,
     TApplication extends Application,
-    TParent extends AnyService | Application = Application
+    TParent extends AnyService
 > {
 
     public started?: Promise<void>;
@@ -109,18 +136,17 @@ export default abstract class Service<
     public app: TApplication;
     public config: TConfig = {} as TConfig;
 
-    public constructor(...[parent, getConfig, app]: TServiceArgs<AnyService>) {
+    public constructor(...[parent, config, app]: TServiceArgs<AnyService>) {
 
         this.parent = parent;
         if (this.parent === 'self') 
-            this.parent = this;
+            this.parent = this as unknown as TParent;
 
         this.app = app === 'self'
             ? this as unknown as TApplication
             : app
 
-        if (typeof getConfig === 'function')
-            this.config = getConfig(this);
+        this.config = config || {};
         
     }
 
@@ -144,13 +170,16 @@ export default abstract class Service<
     public use<TService extends AnyService = AnyService>( 
         serviceId: string,
         useOptions: { optional?: boolean } = {}
-    ): TService {
+    ): TService | undefined {
 
         const registeredService = this.app.registered[serviceId];
-        if (registeredService === undefined && useOptions.optional === false)
+        if (registeredService !== undefined) 
+            return this.app[ registeredService.name ];
+
+        if (useOptions.optional === false)
             throw new Error(`Service ${registeredService} not registered.`);
 
-        return this.app[ registeredService.name ];
+        return undefined;
     }
 
     /*----------------------------------
@@ -189,6 +218,17 @@ export default abstract class Service<
             ) 
         ).then(() => {
             //this.config.debug && console.info(`[hook] Hooks ${name} executed with success.`);
+        }).catch(e => {
+            if (name === 'error') {
+
+                // In error hook = avoid infinite loop
+                console.error("Error hook", e);
+
+            } else {
+
+                // Let the error hook handle it
+                throw e;
+            }
         })
     }