5htp-core 0.6.0-86 → 0.6.0-87

package/package.json

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

@@ -49,6 +49,11 @@ export type Services = {
 export type ChannelInfos = {
     channelType: 'cron' | 'master' | 'request' | 'socket',
     channelId?: string,
+
+    method?: string,
+    path?: string,
+
+    user?: string
 }
 
 export type TGuestLogs = {

package/server/services/router/index.ts

@@ -21,7 +21,6 @@ import type { GlobImportedWithMetas } from 'babel-plugin-glob-import';
 // Core
 import type { Application } from '@server/app';
 import Service, { AnyService, TServiceArgs } from '@server/app/service';
-import type { TRegisteredServicesIndex } from '@server/app/service/container';
 import context from '@server/context';
 import type DisksManager from '@server/services/disks';
 import { CoreError, NotFound, toJson as errorToJson } from '@common/errors';
@@ -173,6 +172,33 @@ export default class ServerRouter
         // Start HTTP server
         await this.http.start();
 
+
+        // override
+        const originalLog = console.log;
+        console.log = (...args: any[]) => {
+
+            // parse stack trace: skip this function and the console.log call
+            /*const stackLine = (new Error()).stack?.split('\n')[2] || '';
+            const match = stackLine.match(/at (\w+)\.(\w+) /);
+            const className = match ? match[1] : '<global>';
+            const methodName = match ? match[2] : '<anonymous>';*/
+
+            const contextData = context.getStore() || {
+                channelType: 'master',
+            }
+
+            const requestPrefix = contextData.channelType === 'request' 
+                ? `[${contextData.user ? contextData.user : 'guest'}] ${contextData.method} ${contextData.path} |` 
+                : 'master';
+
+            // prefix and forward
+            originalLog.call(
+                console, 
+                `${requestPrefix}`, // ${className}.${methodName}
+                ...args
+            );
+        };
+
     }
 
     public async shutdown() {
@@ -410,39 +436,34 @@ export default class ServerRouter
             this
         );
 
-        // Create request context so we can access request context across all the request-triggered libs
-        context.run({ channelType: 'request', channelId: requestId }, async () => {
-
-            let response: ServerResponse<this>;
-            try {
+        let response: ServerResponse<this>;
+        try {
 
-                // Hook
-                await this.runHook('request', request);
+            // Hook
+            await this.runHook('request', request);
 
-                // Bulk API Requests
-                if (request.path === '/api' && typeof request.data.fetchers === "object") {
+            // Bulk API Requests
+            if (request.path === '/api' && typeof request.data.fetchers === "object") {
 
-                    return await this.resolveApiBatch(request.data.fetchers, request);
+                return await this.resolveApiBatch(request.data.fetchers, request);
 
-                } else {
-                    response = await this.resolve(request);
-                }
-            } catch (e) {
-                response = await this.handleError(e, request);
-            }
-
-            if (!res.headersSent) {
-                // Status
-                res.status(response.statusCode);
-                // Headers
-                res.header(response.headers);
-                // Data
-                res.send(response.data);
-            } else if (response.data !== 'true') {
-                throw new Error("Can't return data from the controller since response has already been sent via express.");
+            } else {
+                response = await this.resolve(request);
             }
+        } catch (e) {
+            response = await this.handleError(e, request);
+        }
 
-        });
+        if (!res.headersSent) {
+            // Status
+            res.status(response.statusCode);
+            // Headers
+            res.header(response.headers);
+            // Data
+            res.send(response.data);
+        } else if (response.data !== 'true') {
+            throw new Error("Can't return data from the controller since response has already been sent via express.");
+        }
     }
 
     public createContextServices( request: ServerRequest<this> ) {
@@ -466,77 +487,86 @@ export default class ServerRouter
         return contextServices;
     }
 
-    public async resolve(request: ServerRequest<this>): Promise<ServerResponse<this>> {
+    public resolve = (request: ServerRequest<this>) => new Promise<ServerResponse<this>>((resolve, reject) => {
 
-        const logId = LogPrefix + ' ' + (request.isVirtual ? ' ---- ' : '') 
-            + request.ip + ' ' + request.user?.email + ' '
-            + request.method + ' ' + /*request.domain + ' ' +*/ request.path;
-        console.info(logId);
-        const timeStart = Date.now();
+        // Create request context so we can access request context across all the request-triggered libs
+        context.run({ 
+            // This is for debugging
+            channelType: 'request', 
+            channelId: request.id,
+            method: request.method,
+            path: request.path,
+        }, async () => {
+
+            const timeStart = Date.now();
+
+            if (this.status === 'starting') {
+                console.log(LogPrefix, `Waiting for servert to be resdy before resolving request`);
+                await this.started;
+            }
 
-        if (this.status === 'starting') {
-            console.log(LogPrefix, `Waiting for servert to be resdy before resolving request`);
-            await this.started;
-        }
+            try {
 
-        try {
+                const response = new ServerResponse<this>(request);
 
-            const response = new ServerResponse<this>(request);
+                await this.runHook('resolve', request);
 
-            await this.runHook('resolve', request);
+                // Controller route
+                let route = this.controllers[request.path];
+                if (route !== undefined) {
 
-            // Controller route
-            let route = this.controllers[request.path];
-            if (route !== undefined) {
+                    // Create response
+                    await this.resolvedRoute(route, response, timeStart);
+                    if (response.wasProvided)
+                        return resolve(response);
+                }
 
-                // Create response
-                await this.resolvedRoute(route, response, logId, timeStart);
-                if (response.wasProvided)
-                    return response;
-            }
+                const contextStore = context.getStore();
+                if (contextStore)
+                    contextStore.user = request.user?.email;
 
-            // Classic routes
-            for (route of this.routes) {
+                // Classic routes
+                for (route of this.routes) {
 
-                // Match Method
-                if (request.method !== route.method && route.method !== '*')
-                    continue;
+                    // Match Method
+                    if (request.method !== route.method && route.method !== '*')
+                        continue;
 
-                // Match Response format
-                if (!request.accepts(route.options.accept))
-                    continue;
+                    // Match Response format
+                    if (!request.accepts(route.options.accept))
+                        continue;
 
-                const isMatching = matchRoute(route, request);
-                if (!isMatching)
-                    continue;
+                    const isMatching = matchRoute(route, request);
+                    if (!isMatching)
+                        continue;
 
-                await this.resolvedRoute(route, response, logId, timeStart);
-                if (response.wasProvided)
-                    return response;
-            }
+                    await this.resolvedRoute(route, response, timeStart);
+                    if (response.wasProvided)
+                        return resolve(response);
+                }
 
-            throw new NotFound();
+                reject( new NotFound() );
 
-        } catch (error) {
+            } catch (error) {
 
-            if (this.app.env.profile === 'dev') {
-                console.log('API batch error:', request.method, request.path, error);
-                const errOrigin = request.method + ' ' + request.path;
-                if (error.details === undefined)
-                    error.details = { origin: errOrigin }
-                else
-                    error.details.origin = errOrigin;
-            }
+                if (this.app.env.profile === 'dev') {
+                    console.log('API batch error:', request.method, request.path, error);
+                    const errOrigin = request.method + ' ' + request.path;
+                    if (error.details === undefined)
+                        error.details = { origin: errOrigin }
+                    else
+                        error.details.origin = errOrigin;
+                }
 
-            this.printTakenTime(logId, timeStart);
-            throw error;
-        }
-    }
+                this.printTakenTime(timeStart);
+                reject( error );
+            }
+        });
+    });
 
     private async resolvedRoute( 
         route: TRoute, 
         response: ServerResponse<this>,
-        logId: string,
         timeStart: number
     ) {
 
@@ -549,14 +579,14 @@ export default class ServerRouter
             return;
 
         const timeEndResolving = Date.now();
-        this.printTakenTime(logId, timeStart, timeEndResolving);
+        this.printTakenTime(timeStart, timeEndResolving);
     }
 
-    private printTakenTime = (logId: string, timeStart: number, timeEndResolving?: number) => {
+    private printTakenTime = (timeStart: number, timeEndResolving?: number) => {
 
         if (this.app.env.name === 'server') return;
 
-        console.log(logId + ' ' + Math.round(Date.now() - timeStart) + 'ms' + 
+        console.log( Math.round(Date.now() - timeStart) + 'ms' + 
             (timeEndResolving === undefined ? '' : ' | Routing: ' + Math.round(timeEndResolving - timeStart))
         );
     }

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