5htp-core 0.6.0-8 → 0.6.0-82

package/common/errors/index.tsx

@@ -55,11 +55,13 @@ export type ServerBug = {
     },
     
     // Error
-    error: Error,
-    stacktrace: string,
-    logs: TJsonLog[],
+    title?: string,
+    stacktraces: string[],
+    context: object[],
 }
 
+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-8",
+	"version": "0.6.0-82",
 	"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();
@@ -343,7 +310,43 @@ 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 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 bugReport: ServerBug = {
 
@@ -372,9 +375,9 @@ export default class Console {
             } : {}),
 
             // Error
-            error: originalError,
-            stacktrace: (originalError.stack || originalError.message || error.stack || error.message) as string,
-            logs
+            title,
+            stacktraces,
+            context
         }
 
         await application.runHook('bug', bugReport);
@@ -392,12 +395,23 @@ 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.stacktraces.map((stacktrace, index) => `
+    <hr />
+    <b>Error ${index + 1}</b>:
+    ${this.printHtml(stacktrace)}<br />
+`).join('')}
+
+${report.context.map((context, index) => `
+    <hr />
+    <b>Context ${index + 1}</b>: ${this.jsonToHTML(context)}<br />
+`).join('')}
+
 ${report.request ? `
     <hr />
     <b>Request</b>: ${report.request.method} ${report.request.url}<br />
@@ -433,7 +447,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/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"|"user-circle"|"chart-bar"|"crosshairs"|"plus-circle"|"comments-alt"|"user-shield"|"shield-alt"|"chart-line"|"money-bill-wave"|"star"|"link"|"file-alt"|"long-arrow-left"|"arrow-right"|"at"|"calendar-alt"|"paper-plane"|"search"|"lightbulb"|"magnet"|"brands/linkedin"|"user-plus"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"key"|"user"|"solid/crown"|"brands/discord"|"pen"|"plus"|"file"|"envelope"|"angle-up"|"angle-down"|"clock"|"cog"|"trash"|"ellipsis-h"|"binoculars"|"times-circle"|"coins"|"download"|"angle-right"|"info-circle"|"check-circle"|"exclamation-circle"|"check"|"meh-rolling-eyes"|"arrow-left"|"bars"|"users"|"bug"|"solid/star"|"solid/star-half-alt"|"regular/star"|"chevron-left"|"power-off"|"play"|"minus-circle"|"external-link"|"question-circle"|"plane-departure"|"brands/whatsapp"|"wind"|"arrow-to-bottom"|"map-marker-alt"|"exclamation-triangle"|"solid/check-circle"|"solid/exclamation-triangle"|"solid/times-circle"|"broom"|"minus"|"comment-alt"|"briefcase"|"map-marker"|"fire"|"solid/magic"|"industry"|"calendar"|"globe"|"magic"|"coin"|"building"|"graduation-cap"|"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"
+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"|"user-circle"|"crosshairs"|"plus-circle"|"comments-alt"|"arrow-right"|"link"|"key"|"user"|"at"|"user-shield"|"shield-alt"|"chart-line"|"money-bill-wave"|"star"|"file-alt"|"long-arrow-left"|"user-plus"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"calendar-alt"|"paper-plane"|"brands/linkedin"|"search"|"lightbulb"|"magnet"|"angle-up"|"angle-down"|"solid/crown"|"brands/discord"|"pen"|"plus"|"file"|"envelope"|"clock"|"cog"|"trash"|"ellipsis-h"|"binoculars"|"coins"|"times-circle"|"download"|"info-circle"|"check-circle"|"exclamation-circle"|"check"|"meh-rolling-eyes"|"arrow-left"|"bars"|"solid/star"|"solid/star-half-alt"|"regular/star"|"chevron-left"|"power-off"|"play"|"minus-circle"|"external-link"|"question-circle"|"plane-departure"|"brands/whatsapp"|"wind"|"map-marker-alt"|"arrow-to-bottom"|"users"|"bug"|"broom"|"solid/check-circle"|"solid/exclamation-triangle"|"solid/times-circle"|"minus"|"solid/magic"|"exclamation-triangle"|"industry"|"map-marker"|"calendar"|"briefcase"|"fire"|"magic"|"globe"|"comment-alt"|"coin"|"building"|"graduation-cap"|"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"