5htp-core 0.6.0-81 → 0.6.0-83

package/common/errors/index.tsx

@@ -56,8 +56,8 @@ export type ServerBug = {
     
     // Error
     title?: string,
-    errors: TCatchedError[],
-    logs: TJsonLog[],
+    stacktraces: string[],
+    context: object[],
 }
 
 export type TCatchedError = Error | CoreError | Anomaly;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.6.0-81",
+	"version": "0.6.0-83",
 	"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

@@ -310,16 +310,26 @@ 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[] = [];
 
-        const errors: TCatchedError[] = []
         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);
-            if (('dataForDebugging' in currentError) && currentError.dataForDebugging !== undefined)
+            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)  {
@@ -332,10 +342,7 @@ export default class Console {
                 console.error(`Error caused by this query:`, printedQuery);
             }
 
-            if (title === undefined)
-                title = currentError.message;
-
-            errors.push(currentError);
+            // Go deeper
             currentError = 'originalError' in currentError 
                 ? currentError.originalError
                 : undefined
@@ -369,8 +376,8 @@ export default class Console {
 
             // Error
             title,
-            errors,
-            logs
+            stacktraces,
+            context
         }
 
         await application.runHook('bug', bugReport);
@@ -394,14 +401,15 @@ export default class Console {
 <b>User</b>: ${report.user ? (report.user.name + ' (' + report.user.email + ')') : 'Unknown'}<br />
 <b>IP</b>: ${report.ip}<br />
 
-${report.errors.map(e => `
+${report.stacktraces.map((stacktrace, index) => `
+    <hr />
+    <b>Error ${index + 1}</b>:
+    ${this.printHtml(stacktrace)}<br />
+`).join('')}
+
+${report.context.map((context, index) => `
     <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 />
-    ` : ''}
+    <b>Context ${index + 1}</b>: ${this.jsonToHTML(context)}<br />
 `).join('')}
 
 ${report.request ? `

package/server/utils/rte.ts

@@ -346,24 +346,52 @@ export class RteUtils {
         return html;
     }
 
-    private jsonToText( node: LexicalNode ) {
-
-        let text = '';
-
-        // Check if the node has text content
-        if (node.type === 'text' && node.text) {
-            text += node.text;
+    private jsonToText(root: LexicalNode): string {
+        let result = '';
+      
+        function traverse(node: LexicalNode) {
+          switch (node.type) {
+            case 'text':
+              // Leaf text node
+              result += node.text ?? '';
+              break;
+            case 'linebreak':
+              // Explicit line break node
+              result += '\n';
+              break;
+            default:
+              // Container or block node: dive into children if any
+              if (node.children) {
+                node.children.forEach(traverse);
+              }
+              // After finishing a block-level node, append newline
+              if (isBlockNode(node.type)) {
+                result += '\n';
+              }
+              break;
+          }
         }
-
-        // Recursively process children nodes
-        if (node.children && Array.isArray(node.children)) {
-            node.children.forEach(childNode => {
-                text += this.jsonToText(childNode);
-            });
+      
+        // Heuristic: treat these as blocks
+        function isBlockNode(type: string): boolean {
+          return [
+            'root',
+            'paragraph',
+            'heading',
+            'listitem',
+            'unorderedlist',
+            'orderedlist',
+            'quote',
+            'codeblock',
+            'table',
+          ].includes(type);
         }
-
-        return text;
-    }
+      
+        traverse(root);
+      
+        // Trim trailing whitespace/newlines
+        return result.replace(/\s+$/, '');
+      }
 
     public async htmlToJson(htmlString: string): Promise<LexicalState> {
 

package/types/icons.d.ts

@@ -1 +1 @@
-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"
+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"|"user-shield"|"shield-alt"|"chart-line"|"money-bill-wave"|"star"|"link"|"file-alt"|"long-arrow-left"|"arrow-right"|"plus-circle"|"comments-alt"|"key"|"user"|"at"|"user-plus"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"magnet"|"paper-plane"|"plus"|"binoculars"|"brands/linkedin"|"clock"|"cog"|"trash"|"ellipsis-h"|"times-circle"|"search"|"lightbulb"|"calendar-alt"|"angle-up"|"angle-down"|"solid/crown"|"brands/discord"|"pen"|"file"|"envelope"|"coins"|"download"|"check"|"meh-rolling-eyes"|"arrow-left"|"info-circle"|"check-circle"|"exclamation-circle"|"bars"|"solid/star"|"solid/star-half-alt"|"regular/star"|"chevron-left"|"power-off"|"plane-departure"|"brands/whatsapp"|"wind"|"play"|"minus-circle"|"broom"|"exclamation-triangle"|"external-link"|"solid/check-circle"|"solid/exclamation-triangle"|"solid/times-circle"|"question-circle"|"minus"|"comment-alt"|"map-marker-alt"|"arrow-to-bottom"|"solid/magic"|"users"|"industry"|"map-marker"|"calendar"|"briefcase"|"fire"|"globe"|"magic"|"bug"|"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"