5htp-core 0.6.0-79 → 0.6.0-81

package/common/errors/index.tsx

@@ -55,11 +55,13 @@ export type ServerBug = {
     },
     
     // Error
-    error: Error,
-    stacktrace: string,
+    title?: string,
+    errors: TCatchedError[],
     logs: TJsonLog[],
 }
 
+export type TCatchedError = Error | CoreError | Anomaly;
+
 /*----------------------------------
 - ERREURS
 ----------------------------------*/

package/package.json

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

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

@@ -17,7 +17,7 @@ import Ansi2Html from 'ansi-to-html';
 // Core libs
 import type ApplicationContainer from '..';
 import context from '@server/context';
-import type { ServerBug, Anomaly, CoreError } from '@common/errors';
+import type { ServerBug, TCatchedError, CoreError } from '@common/errors';
 import type ServerRequest from '@server/services/router/request';
 import { SqlError } from '@server/services/database/debug';
 
@@ -99,8 +99,6 @@ export type TJsonLog = {
 
 const LogPrefix = '[console]'
 
-const errorMailInterval = (1 * 60 * 60 * 1000); // 1 hour
-
 const logLevels = {
     'log': 0, 
     'info': 3, 
@@ -144,13 +142,6 @@ export default class Console {
     public logger!: Logger<ILogObj>;
     // Buffers
     public logs: TJsonLog[] = [];
-    // Bug ID => Timestamp latest send
-    private sentBugs: {[bugId: string]: number} = {};
-
-    // Old (still useful???)
-    /*public clients: TGuestLogs[] = [];
-    public requests: TRequestLogs[] = [];
-    public sqlQueries: TDbQueryLog[] = [];*/
 
     /*----------------------------------
     - LIFECYCLE
@@ -283,11 +274,9 @@ export default class Console {
             this.logs = this.logs.slice(bufferOverflow);
     }
 
-    public async createBugReport( error: Error | CoreError | Anomaly, request?: ServerRequest ) {
+    // We don't prevent duplicates because we want to receive all variants of the same error
+    public async createBugReport( error: TCatchedError, request?: ServerRequest ) {
 
-        // Print error
-        const originalError = ('originalError' in error && error.originalError) ? error.originalError : error;
-        this.logger.error(LogPrefix, `Sending bug report for the following error:`, error, originalError);
         /*const youchRes = new Youch(error, {});
         const jsonResponse = await youchRes.toJSON()
         console.log( forTerminal(jsonResponse, {
@@ -314,28 +303,6 @@ export default class Console {
         if (application === undefined) 
             return console.error(LogPrefix, "Can't send bug report because the application is not instanciated");
 
-        // Print the error so it's accessible via logs
-        if (error instanceof SqlError)  {
-            let printedQuery: string;
-            try {
-                printedQuery = this.printSql( error.query );
-            } catch (error) {
-                printedQuery = 'Failed to print query:' + (error || 'unknown error');
-            }
-            console.error(`Error caused by this query:`, printedQuery);
-        }
-
-        if (('dataForDebugging' in error) && error.dataForDebugging !== undefined)
-            console.error(LogPrefix, `More data about the error:`, error.dataForDebugging);
-
-        // Prevent spamming the mailbox if infinite loop 
-        const bugId = ['server', request?.user?.name, undefined, error.message].filter(e => !!e).join('::');
-        const lastSending = this.sentBugs[bugId];
-        this.sentBugs[bugId] = Date.now();
-        const shouldSendReport = lastSending === undefined || lastSending < Date.now() - errorMailInterval;
-        if (!shouldSendReport)
-            return;
-
         // Get context
         const now = new Date();
         const hash = uuid();
@@ -345,6 +312,35 @@ export default class Console {
         // 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 errors: TCatchedError[] = []
+        let currentError: TCatchedError | undefined = error;
+        let title: string | undefined;
+        while (currentError !== undefined) {
+
+            this.logger.error(LogPrefix, `Sending bug report for the following error:`, currentError);
+            if (('dataForDebugging' in currentError) && currentError.dataForDebugging !== undefined)
+                console.error(LogPrefix, `More data about the error:`, 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);
+            }
+
+            if (title === undefined)
+                title = currentError.message;
+
+            errors.push(currentError);
+            currentError = 'originalError' in currentError 
+                ? currentError.originalError
+                : undefined
+        }
+
         const bugReport: ServerBug = {
 
             // Context
@@ -372,8 +368,8 @@ export default class Console {
             } : {}),
 
             // Error
-            error: originalError,
-            stacktrace: (originalError.stack || originalError.message || error.stack || error.message) as string,
+            title,
+            errors,
             logs
         }
 
@@ -392,12 +388,22 @@ export default class Console {
     ----------------------------------*/
 
     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.errors.map(e => `
+    <hr />
+    <b>Error</b>: ${e.message}<br />
+    ${this.printHtml(e.stack || e.message)}<br />
+    ${'dataForDebugging' in e ? `
+        <b>Data for debugging</b><br />
+        ${this.jsonToHTML(e.dataForDebugging)}<br />
+    ` : ''}
+`).join('')}
+
 ${report.request ? `
     <hr />
     <b>Request</b>: ${report.request.method} ${report.request.url}<br />
@@ -433,7 +439,7 @@ Logs: ${this.config.enable ? `<br/>` + this.logsToHTML(report.logs) : 'Logs coll
         });
 
         // Print args as ANSI
-        const logArgsAndErrorsMarkup = this.logger.runtime.prettyFormatLogObj(log.args, this.logger.settings);
+        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");

package/server/utils/rte.ts

@@ -43,6 +43,7 @@ export type LexicalNode = {
 
 type TRenderOptions = {
 
+    format?: 'html' | 'text', // Default = html
     transform?: RteUtils["transformNode"],
 
     render?: (
@@ -91,17 +92,9 @@ export class RteUtils {
         }
 
         // Parse content if string
-        let json: LexicalState;
-        if (typeof content === 'string' && content.trim().startsWith('{')) {
-            try {
-                json = JSON.parse(content) as LexicalState;
-            } catch (error) { 
-                throw new Anomaly("Invalid JSON format for the given JSON RTE content.");
-            }
-        } else if (content && typeof content === 'object' && content.root)
-            json = content;
-        else
-            return { html: '', json: content, ...assets };
+        let json = this.parseState(content);
+        if (json === false)
+            return { html: '', json: content, ...assets }
 
         // Parse prev version if string
         if (typeof options?.attachements?.prevVersion === 'string') {
@@ -128,11 +121,30 @@ export class RteUtils {
         }
 
         // Convert json to HTML
-        const html = await this.jsonToHtml( json, options );
+        let html: string;
+        if (options.format === 'text')
+            html = await this.jsonToText( json.root );
+        else
+            html = await this.jsonToHtml( json, options );
 
         return { html, json: content, ...assets };
     }
 
+    private parseState( content: string | LexicalState ): LexicalState | false {
+
+        if (typeof content === 'string' && content.trim().startsWith('{')) {
+            try {
+                return JSON.parse(content) as LexicalState;
+            } catch (error) { 
+                throw new Anomaly("Invalid JSON format for the given JSON RTE content.");
+            }
+        } else if (content && typeof content === 'object' && content.root)
+            return content;
+        else
+            return false;
+        
+    }
+
     private async processContent( 
         node: LexicalNode, 
         parent: LexicalNode | null,

package/types/icons.d.ts

@@ -1 +1 @@
-export type TIcones = "times"|"solid/spinner-third"|"long-arrow-right"|"sack-dollar"|"bell"|"bullseye"|"project-diagram"|"user-friends"|"eye"|"lock"|"comments"|"phone"|"chalkboard-teacher"|"rocket"|"chart-bar"|"crosshairs"|"arrow-right"|"plus-circle"|"comments-alt"|"user-circle"|"user-plus"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"link"|"key"|"user"|"at"|"user-shield"|"shield-alt"|"chart-line"|"money-bill-wave"|"star"|"file-alt"|"long-arrow-left"|"magnet"|"paper-plane"|"plus"|"calendar-alt"|"clock"|"cog"|"trash"|"ellipsis-h"|"binoculars"|"brands/linkedin"|"search"|"lightbulb"|"angle-up"|"angle-down"|"solid/crown"|"brands/discord"|"pen"|"file"|"envelope"|"coins"|"times-circle"|"angle-right"|"download"|"check"|"info-circle"|"check-circle"|"exclamation-circle"|"meh-rolling-eyes"|"arrow-left"|"solid/star"|"solid/star-half-alt"|"regular/star"|"chevron-left"|"power-off"|"bars"|"plane-departure"|"brands/whatsapp"|"wind"|"play"|"minus-circle"|"question-circle"|"external-link"|"exclamation-triangle"|"solid/check-circle"|"solid/exclamation-triangle"|"solid/times-circle"|"broom"|"comment-alt"|"minus"|"map-marker-alt"|"arrow-to-bottom"|"users"|"bug"|"solid/magic"|"briefcase"|"map-marker"|"fire"|"magic"|"globe"|"industry"|"calendar"|"building"|"graduation-cap"|"coin"|"unlink"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"code"|"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"
+export type TIcones = "long-arrow-right"|"times"|"solid/spinner-third"|"sack-dollar"|"bell"|"bullseye"|"project-diagram"|"user-friends"|"eye"|"lock"|"comments"|"phone"|"chalkboard-teacher"|"rocket"|"chart-bar"|"crosshairs"|"arrow-right"|"user-circle"|"plus-circle"|"comments-alt"|"user-shield"|"shield-alt"|"chart-line"|"money-bill-wave"|"star"|"link"|"file-alt"|"long-arrow-left"|"at"|"calendar-alt"|"paper-plane"|"user-plus"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"key"|"user"|"magnet"|"plus"|"binoculars"|"brands/linkedin"|"clock"|"cog"|"trash"|"ellipsis-h"|"times-circle"|"search"|"lightbulb"|"solid/crown"|"brands/discord"|"pen"|"file"|"envelope"|"angle-up"|"angle-down"|"coins"|"angle-right"|"download"|"info-circle"|"check-circle"|"exclamation-circle"|"check"|"meh-rolling-eyes"|"arrow-left"|"users"|"bug"|"solid/star"|"solid/star-half-alt"|"regular/star"|"chevron-left"|"power-off"|"bars"|"question-circle"|"plane-departure"|"brands/whatsapp"|"wind"|"play"|"minus-circle"|"external-link"|"broom"|"exclamation-triangle"|"solid/check-circle"|"solid/exclamation-triangle"|"solid/times-circle"|"minus"|"comment-alt"|"arrow-to-bottom"|"map-marker-alt"|"solid/magic"|"briefcase"|"map-marker"|"fire"|"industry"|"calendar"|"magic"|"globe"|"building"|"graduation-cap"|"coin"|"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"