5htp-core 0.4.9-93 → 0.4.9-95

package/package.json

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

package/src/client/components/inputv3/Rte/Editor.tsx

@@ -205,7 +205,7 @@ export default ({ value, setValue, props }: {
 
                     {isMaxLength && <MaxLengthPlugin maxLength={30} />}
                     <DragDropPaste />
-                    <AutoFocusPlugin />
+                    {props.preview && <AutoFocusPlugin />}
                     <ClearEditorPlugin />
                     <ComponentPickerPlugin />
                     <EmojiPickerPlugin />

package/src/client/components/inputv3/Rte/index.tsx

@@ -66,10 +66,10 @@ export default (props: Props & InputBaseProps<string>) => {
             if (RichEditorUtils.active && RichEditorUtils.active?.title !== title)
                 RichEditorUtils.active.close();
 
-            // Set active editor
+            // Set active Editor
             RichEditorUtils.active = {
                 title,
-                close: () => setIsPreview(true)
+                close: () => preview ? setIsPreview(true) : null
             }
 
             // Load editor component if not alreayd done

package/src/common/errors/index.tsx

@@ -1,6 +1,10 @@
 import React from 'react';
 import type { ComponentChild } from 'preact';
 
+import type { TJsonLog } from '@server/app/container/console';
+import type ServerRequest from '@server/services/router/request';
+import type { TBasicUser } from '@server/services/auth';
+
 /*----------------------------------
 - TYPES
 ----------------------------------*/
@@ -25,19 +29,31 @@ type TDetailsErreur = {
 ----------------------------------*/
 
 export type ServerBug = {
+
     // Context
     hash: string,
     date: Date, // Timestamp
     channelType?: string, 
     channelId?: string,
 
-    user: string | null | undefined,
-    ip: string | null | undefined,
+    // User
+    user?: TBasicUser | null,
+    ip?: string | null,
+
+    // Request
+    request?: {
+        method: ServerRequest["method"],
+        url: ServerRequest["url"],
+        data: ServerRequest["data"],
+        validatedData: ServerRequest["validatedData"],
+        headers: ServerRequest["headers"],
+        cookies: ServerRequest["cookies"],
+    },
     
     // Error
     error: Error,
     stacktrace: string,
-    logs: string,
+    logs: TJsonLog[],
 }
 
 /*----------------------------------

package/src/server/app/container/config.ts

@@ -11,6 +11,9 @@
 import fs from 'fs-extra';
 import yaml from 'yaml';
 
+// Types
+import type { Config as TConsoleConfig } from './console';
+
 /*----------------------------------
 - TYPES
 ----------------------------------*/
@@ -31,6 +34,7 @@ export type TEnvConfig = {
     name: 'local' | 'server',
     profile: 'dev' | 'prod',
     version: string,
+    console: TConsoleConfig
 }
 
 type AppIdentityConfig = {

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

@@ -11,19 +11,16 @@ import forTerminal from 'youch-terminal';
 // Npm
 import { v4 as uuid } from 'uuid';
 import { Logger, IMeta, ILogObj, ISettings } from 'tslog';
-import { format as formatSql } from 'sql-formatter';
 import highlight from 'cli-highlight';
+import Ansi2Html from 'ansi-to-html';
 
 // Core libs
 import type ApplicationContainer from '..';
 import context from '@server/context';
-import type { ServerBug } from '@common/errors';
+import type { ServerBug, Anomaly, CoreError } from '@common/errors';
 import type ServerRequest from '@server/services/router/request';
 import { SqlError } from '@server/services/database/debug';
 
-// Specific
-import logToHTML from './html';
-
 /*----------------------------------
 - SERVICE CONFIG
 ----------------------------------*/
@@ -32,13 +29,9 @@ type TLogProfile = 'silly' | 'info' | 'warn' | 'error'
 
 export type Config = {
     debug?: boolean,
+    enable: boolean,
     bufferLimit: number,
-    dev: {
-        level: TLogProfile,
-    },
-    prod: {
-        level: TLogProfile
-    }
+    level: TLogProfile,
 }
 
 export type Hooks = {
@@ -113,7 +106,34 @@ const logLevels = {
     'info': 3, 
     'warn': 4, 
     'error': 5
-} as const
+} as const;
+
+
+var ansi2Html = new Ansi2Html({
+    newline: true,
+    // Material theme for Tilix
+    // https://github.com/gnunn1/tilix/blob/master/data/schemes/material.json
+    fg: '#fff',
+    bg: '#000',
+    colors: [
+        "#252525",
+        "#FF5252",
+        "#C3D82C",
+        "#FFC135",
+        "#42A5F5",
+        "#D81B60",
+        "#00ACC1",
+        "#F5F5F5",
+        "#708284",
+        "#FF5252",
+        "#C3D82C",
+        "#FFC135",
+        "#42A5F5",
+        "#D81B60",
+        "#00ACC1",
+        "#F5F5F5"
+    ]
+});
 
 /*----------------------------------
 - LOGGER
@@ -150,9 +170,6 @@ export default class Console {
 
         const Env = container.Environment;
 
-        const envConfig = this.config[ Env.profile === 'prod' ? 'prod' : 'dev' ];
-        const minLogLevel = logLevels[ envConfig.level ];
-
         this.logger = new Logger({
             // Use to improve performance in production
             hideLogPositionForProduction: Env.profile === 'prod',
@@ -168,7 +185,7 @@ export default class Console {
                         meta.path.filePathWithLine = this.shortenFilePath( meta.path.filePathWithLine );
                     }
 
-                    return this.logger._prettyFormatLogObjMeta( meta );
+                    return this.logger["_prettyFormatLogObjMeta"]( meta );
                 },
                 transportFormatted: (
                     logMetaMarkup: string, 
@@ -183,12 +200,25 @@ export default class Console {
             }
         }); 
 
-        if (console["_wrapped"] !== undefined)
+        if (!this.config.enable || console["_wrapped"] !== undefined)
             return;
 
-        for (const logLevel in logLevels) {
-            const levelNumber = logLevels[ logLevel ];
-            console[ logLevel ] = (...args: any[]) => {
+        this.enableLogging(origLog);
+    }
+
+    // Avoid to use lifecycle functions
+    protected async start() {}
+    public async ready() {}
+    public async shutdown() {}
+
+    private enableLogging( origLog: typeof console.log ) {
+
+        const minLogLevel = logLevels[this.config.level];
+
+        let logLevel: TLogLevel;
+        for (logLevel in logLevels) {
+            const levelNumber = logLevels[logLevel];
+            console[logLevel] = (...args: any[]) => {
 
                 // Dev mode = no care about performance = rich logging
                 if (levelNumber >= minLogLevel)
@@ -206,17 +236,12 @@ export default class Console {
                 });
             }
         }
-        
+
         console["_wrapped"] = true;
 
         setInterval(() => this.clean(), 10000);
     }
 
-    // Avoid to use lifecycle functions
-    protected async start() {}
-    public async ready() {}
-    public async shutdown() {}
-
     /*----------------------------------
     - LOGS FORMATTING
     ----------------------------------*/
@@ -263,7 +288,7 @@ export default class Console {
             this.logs = this.logs.slice(bufferOverflow);
     }
 
-    public async createBugReport( error: Error, request?: ServerRequest ) {
+    public async createBugReport( error: Error | CoreError | Anomaly, request?: ServerRequest ) {
 
         // Print error
         this.logger.error(LogPrefix, `Sending bug report for the following error:`, error);
@@ -304,7 +329,7 @@ export default class Console {
             console.error(`Error caused by this query:`, printedQuery);
         }
 
-        if (error.dataForDebugging !== undefined)
+        if (('dataForDebugging' in error) && error.dataForDebugging !== undefined)
             console.error(LogPrefix, `More data about the error:`, error.dataForDebugging);
 
         // Prevent spamming the mailbox if infinite loop 
@@ -322,24 +347,38 @@ 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 logsHtml = this.printHtml(
-            this.logs.filter( e => e.channel.channelId === channelId).slice(-100), 
-            true
-        );
+        const logs = this.logs.filter(e => e.channel.channelId === channelId).slice(-100);
 
         const bugReport: ServerBug = {
+
             // Context
             hash: hash,
             date: now,
             channelType, 
             channelId,
-            // User
-            user: request?.user?.email,
-            ip: request?.ip,
+
+            ...(request ? {
+
+                // User
+                user: request.user,
+                ip: request.ip,
+
+                // Request
+                request: {
+                    method: request.method,
+                    url: request.url,
+                    data: request.data,
+                    validatedData: request.validatedData,
+                    headers: request.headers,
+                    cookies: request.cookies,
+                }
+
+            } : {}),
+
             // Error
             error,
             stacktrace: error.stack || error.message,
-            logs: logsHtml
+            logs
         }
 
         await application.reportBug( bugReport );
@@ -353,10 +392,97 @@ export default class Console {
     }
 
     /*----------------------------------
-    - READ
+    - PRINT
     ----------------------------------*/
 
-    public async getLogs( channelType: ChannelInfos["channelType"], channelId?: string ) {
+    public bugToHtml( report: ServerBug ) {
+        return `
+<b>Channel</b>: ${report.channelType} (${report.channelId})<br />
+<b>User</b>: ${report.user ? (report.user.name + ' (' + report.user.email + ')') : 'Unknown'}<br />
+<b>IP</b>: ${report.ip}<br />
+<b>Error</b>: ${report.error.message}<br />
+${this.printHtml(report.stacktrace)}<br />
+${report.request ? `
+    <hr />
+    <b>Request</b>: ${report.request.method} ${report.request.url}<br />
+    <b>Headers</b>: ${this.jsonToHTML(report.request.headers)}<br />
+    <b>Cookies</b>: ${this.jsonToHTML(report.request.cookies)}<br />
+    <b>Raw Data</b>: ${this.jsonToHTML(report.request.data)}<br />
+    <b>Validated Data</b>: ${this.jsonToHTML(report.request.validatedData)}
+` : ''}
+<hr/>
+Logs: ${this.config.enable ? `<br/>` + this.logsToHTML(report.logs) : 'Logs collection is disabled'}<br />
+        `
+    }
+ 
+    public logsToHTML( logs: TJsonLog[] ): string {
+
+        let ansi = logs.map( logEntry => this.logToAnsi( logEntry )).join('<br />');
+
+        // Convert ANSI to HTML
+        const html = ansi2Html.toHtml(ansi)
+
+        return this.printHtml( html );
+    }
+
+    private logToAnsi( log: TJsonLog ) {
+
+        // Print metas as ANSI
+        const logMetaMarkup = this.logger["_prettyFormatLogObjMeta"]({
+            date: log.time,
+            logLevelId: this.getLogLevelId(log.level),
+            logLevelName: log.level,
+            // We consider that having the path is useless in this case
+            path: undefined,
+        });
+
+        // Print args as ANSI
+        const logArgsAndErrorsMarkup = this.logger.runtime.prettyFormatLogObj(log.args, this.logger.settings);
+        const logErrors = logArgsAndErrorsMarkup.errors;
+        const logArgs = logArgsAndErrorsMarkup.args;
+        const logErrorsStr = (logErrors.length > 0 && logArgs.length > 0 ? "\n" : "") + logErrors.join("\n");
+        this.logger.settings.prettyInspectOptions.colors = this.logger.settings.stylePrettyLogs;
+        let ansi = logMetaMarkup + formatWithOptions(this.logger.settings.prettyInspectOptions, ...logArgs) + logErrorsStr;
+
+        return ansi;
+    }
+
+    public jsonToHTML( json: unknown ): string {
+
+        const coloredJson = highlight(
+            JSON.stringify(json, null, 4),
+            { language: 'json', ignoreIllegals: true }
+        );
+
+        const html = ansi2Html.toHtml(coloredJson)
+
+        return this.printHtml( html );
+    }
+
+    public printHtml( html: string ): string {
+
+        if (!html)
+            return 'No data';
+
+        // Preserve spaces
+        html = html
+            .replace(/\t/g, '&nbsp;&nbsp;&nbsp;&nbsp;')
+            .replace(/ /g, '&nbsp;')
+            .replace(/\n/g, '<br />');
+
+        // Create console wrapper
+        const consoleCss = `background: #000; padding: 20px; font-family: 'Fira Mono', 'monospace', 'Monaco'; font-size: 12px; line-height: 20px;color: #aaa;`
+        html = '<div style="' + consoleCss + '">' + html + '</div>';
+
+        return html;
+    }
+
+    public printSql = (requete: string) => highlight(
+        requete,//formatSql(requete, { indent: ' '.repeat(4) }),
+        { language: 'sql', ignoreIllegals: true }
+    )
+
+    /*public async getLogs( channelType: ChannelInfos["channelType"], channelId?: string ) {
 
         const filters: Partial<TDbQueryLog> = { channelType };
         if (channelId !== undefined)
@@ -386,23 +512,6 @@ export default class Console {
         }
         
         return this.printHtml( entries );
-    }
- 
-    public printHtml( logs: TJsonLog[], full: boolean = false ): string {
-
-        let html = logs.map( logEntry => logToHTML( logEntry, this )).join('<br />');
-
-        if (full) {
-            const consoleCss = `background: #000; padding: 20px; font-family: 'Fira Mono', 'monospace', 'Monaco'; font-size: 12px; line-height: 20px;color: #aaa;`
-            html = '<div style="' + consoleCss + '">' + html + '</div>';
-        }
-
-        return html;
-    }
-
-    public printSql = (requete: string) => highlight(
-        requete,//formatSql(requete, { indent: ' '.repeat(4) }),
-        { language: 'sql', ignoreIllegals: true }
-    )
+    }*/
 
 }

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

@@ -13,6 +13,7 @@ import type { StartedServicesIndex } from '../service';
 import Services, { ServicesContainer } from '../service/container';
 import ConfigParser, { TEnvConfig } from './config';
 import Console from './console';
+import type ServerRequest from '@server/services/router/request';
 
 /*----------------------------------
 - CLASS
@@ -38,16 +39,7 @@ export class ApplicationContainer<
         const configParser = new ConfigParser( this.path.root );
         this.Environment = configParser.env();
         this.Identity = configParser.identity();
-        this.Console = new Console(this, {
-            debug: false,
-            bufferLimit: 10000,
-            dev: {
-                level: 'log'
-            },
-            prod: {
-                level: 'log'
-            }
-        });
+        this.Console = new Console(this, this.Environment.console);
     }
 
     // Context
@@ -85,11 +77,11 @@ export class ApplicationContainer<
         }
     }
 
-    public async handleBug( rejection: Error, message: string ) {
+    public async handleBug( rejection: Error, message: string, request?: ServerRequest ) {
         if (this.Console) {
             try {
 
-                this.Console.createBugReport(rejection);
+                this.Console.createBugReport(rejection, request);
 
             } catch (consoleError) {
                 console.error(

package/src/server/app/index.ts

@@ -84,7 +84,7 @@ export class Application<
         super(self, {}, {}, self);
         
         // Handle unhandled crash
-        this.on('error', e => this.container.handleBug(e, "An error occured in the 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");

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

@@ -65,6 +65,7 @@ export type TServices = {
 export type TBasicUser = {
     type: string,
     name: string,
+    email: string,
     roles: string[]
 }
 

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

@@ -49,6 +49,7 @@ export default class ServerRequest<
     public domain: string;
     public headers: HttpHeaders = {};
     public cookies: TObjetDonnees = {};
+    public validatedData?: TObjetDonnees; // Results from the last schema.validate
 
     // reponse
     public response?: ServerResponse<TRouter>;

package/src/server/services/schema/request.ts

@@ -53,6 +53,9 @@ export default class RequestValidator extends ServerSchemaValidator implements R
             validators: this
         }, []);
 
+        // For logging
+        this.request.validatedData = values;
+
         return values;
     }
 

package/src/server/app/container/console/html.ts

@@ -1,66 +0,0 @@
-/*----------------------------------
-- DEPENDANCES
-----------------------------------*/
-// Npm
-import Ansi2Html from 'ansi-to-html';
-import { formatWithOptions } from 'util';
-import type { default as Console, TJsonLog } from '.';;
-
-var ansi2Html = new Ansi2Html({
-    newline: true,
-    // Material theme for Tilix
-    // https://github.com/gnunn1/tilix/blob/master/data/schemes/material.json
-    fg: '#fff',
-    bg: '#000',
-    colors: [
-        "#252525",
-        "#FF5252",
-        "#C3D82C",
-        "#FFC135",
-        "#42A5F5",
-        "#D81B60",
-        "#00ACC1",
-        "#F5F5F5",
-        "#708284",
-        "#FF5252",
-        "#C3D82C",
-        "#FFC135",
-        "#42A5F5",
-        "#D81B60",
-        "#00ACC1",
-        "#F5F5F5"
-    ]
-});
-
-/*----------------------------------
-- METHOD
-----------------------------------*/
-export default (log: TJsonLog, c: Console) => {
-
-    // Print metas as ANSI
-    const logMetaMarkup = c.logger._prettyFormatLogObjMeta({
-        date: log.time,
-        logLevelId: c.getLogLevelId( log.level ),
-        logLevelName: log.level,
-        // We consider that having the path is useless in this case
-        path: undefined,
-    });
-
-    // Print args as ANSI
-    const logArgsAndErrorsMarkup =  c.logger.runtime.prettyFormatLogObj( log.args, c.logger.settings);
-    const logErrors = logArgsAndErrorsMarkup.errors;
-    const logArgs = logArgsAndErrorsMarkup.args;
-    const logErrorsStr = (logErrors.length > 0 && logArgs.length > 0 ? "\n" : "") + logErrors.join("\n");
-    c.logger.settings.prettyInspectOptions.colors = c.logger.settings.stylePrettyLogs;
-    let ansi = logMetaMarkup + formatWithOptions(c.logger.settings.prettyInspectOptions, ...logArgs) + logErrorsStr;
-
-    // Use HTML spaces
-    ansi = ansi.replace(/ {2}/g, ' ');
-    ansi = ansi.replace(/\t/g, ' '.repeat(8));
-    ansi = ansi.replace(/\n/g, '<br/>');
-
-    // Convert ANSI to HTML
-    const html = ansi2Html.toHtml(ansi)
-
-    return html;
-}