5htp-core 0.6.2-4 → 0.6.2-6

package/client/app/index.ts

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

package/package.json

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

@@ -301,45 +301,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[0] );
+        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 +355,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 +425,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 +444,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

@@ -208,8 +208,6 @@ export abstract class Application<
                         ? route.schema.parse( context.request.data )
                         : {};
 
-                    console.log('-----data', data);
-
                     // Run controller
                     return origController.bind( service )(
                         data, 

package/server/app/service/index.ts

@@ -144,13 +144,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;
     }
 
     /*----------------------------------

package/server/services/router/response/page/document.tsx

@@ -137,8 +137,8 @@ export default class DocumentRenderer<TRouter extends Router> {
 
     private async scripts( response: ServerResponse<TRouter>, page: Page ) {
 
-        const context = safeStringify( response.forSsr(page) );
-
+        const ssrData = response.forSsr(page);
+        const context = safeStringify( ssrData );
         const routesForClient = JSON.stringify( this.router.ssrRoutes );
 
         return <>

package/types/icons.d.ts

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