5htp-core 0.0.8 → 0.1.0

package/src/common/data/input/validators/build.ts

@@ -3,7 +3,7 @@
 ----------------------------------*/
 
 // Libs
-import { ErreurSaisie } from '@common/errors';
+import { InputError } from '@common/errors';
 import * as basicValidators from './basic';
 
 // Components
@@ -39,7 +39,7 @@ export const champ = <TValeur>(
                     return undefined;
                 // Requis
                 else
-                    throw new ErreurSaisie("Please enter a value");
+                    throw new InputError("Please enter a value");
             }
 
             if (opts.valider !== undefined)

package/src/common/data/number/percentage.ts

@@ -11,11 +11,13 @@ export type TVariation = {
     color: string,
 }
 
-export const variationStr = (value: number, reference: number, lowerIsBetter: boolean = false): TVariation => {
+export const variationStr = (value: number, reference: number, options: {
+    lowerIsBetter?: boolean
+} = {}): TVariation => {
     const pc = variation(value, reference);
     const pcStr = pc.toFixed(2);
     return {
         txt: ((pc > 0) ? '+' + pcStr : pcStr) + '%',
-        color: (lowerIsBetter ? pc > 0 : pc < 0) ? 'ea3943' : '16c784'
+        color: (options.lowerIsBetter ? pc > 0 : pc < 0) ? 'ea3943' : '16c784'
     }
 }

package/src/common/errors/index.ts

@@ -66,13 +66,13 @@ export abstract class Erreur extends Error {
     }
 }
 
-export class ErreurSaisie extends Erreur {
+export class InputError extends Erreur {
     public http = 400;
     public title = "Bad Request";
     public static msgDefaut = "Bad Request.";
 }
 
-export class ErreurSaisieSchema extends Erreur {
+export class InputErrorSchema extends Erreur {
 
     public http = 400;
     public title = "Bad Request";
@@ -89,7 +89,7 @@ export class ErreurSaisieSchema extends Erreur {
 
     public constructor(message: TListeErreursSaisie, details?: TDetailsErreur) {
 
-        super( ErreurSaisieSchema.listeToString(message), details );
+        super( InputErrorSchema.listeToString(message), details );
 
         this.erreursSaisie = message;
 
@@ -103,29 +103,33 @@ export class ErreurSaisieSchema extends Erreur {
     }
 }
 
-export class AuthRequise extends Erreur {
+export class AuthRequired extends Erreur {
     public http = 401;
     public title = "Authentication Required";
     public static msgDefaut = "Please Login to Continue.";
 }
 
-export class AccesRefuse extends Erreur {
+export class Forbidden extends Erreur {
     public http = 403;
     public title = "Access Denied";
     public static msgDefaut = "You're not allowed to access to this resource.";
 }
 
-export class Introuvable extends Erreur {
+export class NotFound extends Erreur {
     public http = 404;
     public title = "Not Found";
     public static msgDefaut = "The resource you asked for was not found.";
 }
 
-export class ErreurCritique extends Erreur {
+export class Anomaly extends Erreur {
 
     public http = 500;
     public title = "Technical Error";
     public static msgDefaut = "A technical error has occurred. A notification has just been sent to the admin.";
+
+    public constructor(message, public data: object) {
+        super(message);
+    }
 }
 
 export class NotAvailable extends Erreur {
@@ -148,13 +152,13 @@ export const instancierViaCode = (
 ): Erreur => {
 
     if (typeof message === 'object')
-        return new ErreurSaisieSchema(message, details);
+        return new InputErrorSchema(message, details);
 
     switch (code) {
-        case 400: return new ErreurSaisie( message, details);
-        case 401: return new AuthRequise( message, details);
-        case 403: return new AccesRefuse( message, details);
-        case 404: return new Introuvable( message, details);
-        default: return new ErreurCritique( message, details);
+        case 400: return new InputError( message, details);
+        case 401: return new AuthRequired( message, details);
+        case 403: return new Forbidden( message, details);
+        case 404: return new NotFound( message, details);
+        default: return new Anomaly( message, details);
     }
 }

package/src/common/router/index.ts

@@ -35,7 +35,7 @@ const getLayout = (routePath: string | undefined): Layout | undefined => {
             if (routePath === layoutPath || routePath.startsWith( layoutPath + '/' ))
                 layout = { path: layoutPath, Component: layouts[layoutPath] };
     }
-    layout && console.log(`Using Layout: ${layout.path}`);
+    //layout && console.log(`${routePath}: Using Layout: ${layout.path}`);
     return layout;
 }
 

package/src/server/app/index.ts

@@ -15,7 +15,7 @@ import ConfigParser, { TEnvConfig } from './config';
 ----------------------------------*/
 
 type THookName = 'ready' | 'cleanup' | 'error'
-type THook = () => void;
+type THook = () => Promise<void>;
 
 type TServiceOptions = {
     instanciate: boolean
@@ -91,6 +91,20 @@ export class App {
     ----------------------------------*/
 
     public constructor() {
+
+        // Gestion crash
+        process.on('unhandledRejection', (error: any, promise: any) => {
+
+            console.error("Unhandled promise rejection:", error);
+
+            // Send email report
+            if (this.isLoaded('console'))
+                $.console.bugReport.server(error);
+            else
+                console.error(`Unable to send bug report: console service not loaded.`);
+
+        });
+
         // Load config files
         const configParser = new ConfigParser( this.path.root );
         this.env = configParser.env();
@@ -106,21 +120,47 @@ export class App {
         console.log("Configure services with", this.config);
     }
 
-    public register( id: string, Service: TServiceClass, options: Partial<TServiceOptions> = {}) {
+    // Register a service
+    public register<TServiceName extends keyof Core.Services>( 
+        id: TServiceName, 
+        Service: TServiceClass, 
+        options: Partial<TServiceOptions> = {}
+    ) {
 
         // Pas d'export default new Service pour chaque fichier de service,
         //  dissuaded'importer ms service sn'importe où, ce qui créé des références circulaires
-        console.log(`Launching service ${id} ...`, Service);
+        console.log(`[services] Registering service ${id} ...`);
         const service = options.instanciate !== false ? new Service() : Service;
-        this.services[id] = service;
-
-        // Lorsque service.load est async, une propriété loading doit etre présente 
-        //     De façon à ce que les autres services puissent savoir quand ce service est prêt
-        if ('loading' in service) {
-            service.loading = service.load();
-            this.loading.push(service.loading);
-        } else if ('load' in service)
-            service.load();
+        this.services[id as string] = service;
+
+        if ('load' in service) {
+
+            console.log(`[services] Starting service ${id} ...`);
+
+            // Lorsque service.load est async, une propriété loading doit etre présente 
+            //     De façon à ce que les autres services puissent savoir quand ce service est prêt
+            if ('loading' in service) {
+                
+                console.log(`[services] Waiting service ${id} to be fully loaded ...`);
+                service.loading = service.load().then(() => {
+                    console.info(`[service] Service ${id} successfully started.`);
+                }).catch(e => {
+                    // Bug report via email
+                    console.error(`[service] Error while starting the ${id} service:`, e);
+                    e.message = `Start ${id} service: ` + e.message;
+                    $.console.bugReport.server(e);
+                });;
+
+                this.loading.push(service.loading);
+                
+            } else
+                service.load();
+        }
+    }
+
+    // Test if a service was registered
+    public isLoaded( id: keyof Core.Services ) {
+        return id in this.services;
     }
 
     public on( name: THookName, callback: THook ) {
@@ -128,23 +168,36 @@ export class App {
         return this;
     }
 
+    public runHook( hookName: THookName ) {
+        console.info(`[hook] Run all ${hookName} hook (${this.hooks.ready.length}).`);
+        return Promise.all( 
+            this.hooks.ready.map(
+                cb => cb().catch(e => {
+                    console.error(`[hook] Error while executing hook ${hookName}:`, e);
+                })
+            ) 
+        ).then(() => {
+            console.info(`[hook] Hooks ${hookName} executed with success.`);
+        })
+    }
+
     /*----------------------------------
     - LAUNCH
     ----------------------------------*/
     public async launch() {
 
-        console.info(`Waiting for services to be ready ...`);
+        console.info(`[boot] Waiting for all services to be ready ...`);
         await Promise.all( this.loading );
 
-        console.info(`Launching application ...`);
-        await Promise.all( this.hooks.ready.map(cb => cb()) );
+        console.info(`[boot] Launching application ...`);
+        await this.runHook('ready');
 
         // NOTE: Useless ?
         /*if (this.hmr)
             this.activateHMR();*/
 
-        console.info(`Application is ready.`);
-
+        console.info(`[boot] Application is ready.`);
+        
         this.launched = true;
 
     }

package/src/server/data/Cache.ts

@@ -14,6 +14,12 @@ import app from '@server/app';
 
 // Libs
 
+/*----------------------------------
+- CONFIG
+----------------------------------*/
+
+const debug = false;
+
 /*----------------------------------
 - TYPES
 ----------------------------------*/
@@ -50,7 +56,7 @@ class Cache {
 
     private cleanMem() {
 
-        console.log("[cache] Clean memory");
+        debug && console.log("[cache] Clean memory");
 
         const now = Date.now();
         for (const key in this.data) {
@@ -88,11 +94,11 @@ class Cache {
 
         let retour: CacheEntry | undefined = this.data[cle];
 
-        console.log(`[cache] Get "${cle}".`);
+        debug && console.log(`[cache] Get "${cle}".`);
 
         // Expired
         if (retour?.expiration && retour.expiration < Date.now()){
-            console.log(`[cache] Key ${cle} expired.`);
+            debug && console.log(`[cache] Key ${cle} expired.`);
             retour = undefined;
         }
 
@@ -133,7 +139,7 @@ class Cache {
      */
     public set( cle: string, val: TPrimitiveValue, expiration: TExpirationDelay = null ): void {
         
-        console.log("[cache] Updating cache " + cle);
+        debug && console.log("[cache] Updating cache " + cle);
         this.data[ cle ] = {
             value: val,
             expiration: this.delayToTimestamp(expiration)

package/src/server/data/Token.olg.ts

@@ -15,7 +15,7 @@ import hInterval from 'human-interval';
 
 // Core
 import Cron, { CronTask } from '@server/services/cron';
-import { AccesRefuse } from '@common/errors';
+import { Forbidden } from '@common/errors';
 
 const debug = true;
 
@@ -82,7 +82,7 @@ class Tokens {
         debug && console.log("Get token", token, options);
         if (options === undefined) {
             if (critical)
-                throw new AccesRefuse(`Invalid token.`);
+                throw new Forbidden(`Invalid token.`);
             else
                 return undefined;
         }

package/src/server/data/aes.ts

@@ -6,7 +6,7 @@
 import crypto from 'crypto';
 
 // Core
-import { AccesRefuse } from '@common/errors';
+import { Forbidden } from '@common/errors';
 
 const debug = true;
 
@@ -43,7 +43,7 @@ class AES {
 
         } catch (error) {
 
-            throw new AccesRefuse("Invalid token.");
+            throw new Forbidden("Invalid token.");
             
         }
         

package/src/server/patch.ts

@@ -4,17 +4,6 @@ moduleAlias.addAliases({
     'react-dom': "preact/compat",
 })
 
-/*----------------------------------
-- DEBUG
-----------------------------------*/
-
-// Gestion crash
-process.on('unhandledRejection', (error: any, promise: any) => {
-
-    console.error("Unhandled promise rejection:", error);
-
-});
-
 /*----------------------------------
 - DATES & TIMZEONE
 ----------------------------------*/

package/src/server/routes/auth.ts

@@ -90,6 +90,12 @@ route.post('/auth/logout', async ({ auth }) => {
 
 });
 
+
+
+
+
+
+// Too specific to project
 route.get('/invite', async ({ auth, schema }) => {
 
     const user = await auth.check("USER");

package/src/server/services/auth/base.ts

@@ -7,7 +7,7 @@ import md5 from 'md5';
 import { OAuth2Client, LoginTicket } from 'google-auth-library';
 
 // Core libs
-import { ErreurSaisie, AuthRequise, AccesRefuse } from '@common/errors';
+import { Forbidden } from '@common/errors';
 
 // App Libs
 import { IP } from '@models';
@@ -38,7 +38,7 @@ export type AuthConfig = {
         key: string,
         expiration: string,
     },
-    google: {
+    google?: {
         web: {
             clientId: string,
             secret: string,
@@ -75,11 +75,13 @@ export default abstract class UserAuthBase {
     public abstract beforeSignup(user: User): Promise< void >;
     public abstract afterSignup(user: User): Promise<{ redirect: string }>;
     
-    private googleClient = new OAuth2Client(
-        app.config.auth.google.web.clientId, // Google Client ID
-        app.config.auth.google.web.secret, // Private key
-        "https://" + app.env.domain + "/auth/google/response" // Redirect url
-    );
+    private googleClient = app.config.auth.google
+        ? new OAuth2Client(
+            app.config.auth.google.web.clientId, // Google Client ID
+            app.config.auth.google.web.secret, // Private key
+            "https://" + app.env.domain + "/auth/google/response" // Redirect url
+        )
+        : undefined;
 
     public async load() {
 
@@ -101,6 +103,9 @@ export default abstract class UserAuthBase {
 
     public async FromGoogle(request: ServerRequest): Promise<string> {
 
+        if (!this.googleClient)
+            throw new Forbidden(`Authentication method disabled.`);
+
         // Register  start time, so we can determine the signup time to display
         request.response?.cookie('signupstart', Date.now());
 
@@ -126,8 +131,11 @@ export default abstract class UserAuthBase {
         request: ServerRequest,
     ): Promise<AuthResponse> {
 
+        if (!this.googleClient)
+            throw new Forbidden(`Authentication method disabled.`);
+
         if (codeOrToken === undefined)
-            throw new AccesRefuse("Bad code / token");
+            throw new Forbidden("Bad code / token");
 
         if (type === 'code') {
             const r = await this.googleClient.getToken(codeOrToken);
@@ -146,16 +154,16 @@ export default abstract class UserAuthBase {
                 ]
             });
         } catch (error) {
-            throw new AccesRefuse(`Google denied your login attempt: ` + error.message + `. If you don't think it's normal, please contact us.`);
+            throw new Forbidden(`Google denied your login attempt: ` + error.message + `. If you don't think it's normal, please contact us.`);
         }
 
         const payload = ticket.getPayload();
         if (payload === undefined)
-            throw new AccesRefuse("Invalid payload");
+            throw new Forbidden("Invalid payload");
         const { email, sub: google_id } = payload;
 
         if (email === undefined)
-            throw new AccesRefuse("Unable to get your email address from the Google sign-in.");
+            throw new Forbidden("Unable to get your email address from the Google sign-in.");
 
         return await this.Auth(email, request, true);
 
@@ -180,7 +188,7 @@ export default abstract class UserAuthBase {
 
         } else if (!canPass) { // Send login email
 
-            throw new AccesRefuse("This option is not available");
+            throw new Forbidden("This option is not available");
 
             // If the current IP was used to connect to another account that the current
             ip = await request.detect.botsAndMultiaccount(user.name);

package/src/server/services/console/bugReporter.ts

@@ -70,7 +70,7 @@ export default class BugReporter {
     public async server( error: Error, request?: ServerRequest ) {
 
         // error should be printed in the console, so they're acccessible from logs
-        console.error(error);
+        console.error(`Sending bug report for the following error:`, error);
 
         // Prevent duplicates
         if (!this.shouldSendReport('server', request?.user?.name, undefined, error.message))
@@ -79,7 +79,6 @@ export default class BugReporter {
         // Get context
         const now = new Date();
         const hash = uuid();
-        const erroTitle = "Server Bug: " + error.message;
         const { channelType, channelId } = this.console.getChannel();
 
         // On envoi l'email avant l'insertion dans bla bdd
@@ -90,31 +89,36 @@ export default class BugReporter {
         );
 
         // Send notification
-        $.email.send({
-            to: app.identity.author.email,
-            subject: "Bug serveur: " + erroTitle,
-            html: `
-                <a href="${app.env.url}/admin/activity/requests/${channelId}">
-                    View Request details & console
-                </a>
-                <br/>
-                ${logsHtml}
-            `
-        });
-        // Memorize
-        $.sql.insert('BugServer', {
-            // Context
-            hash: hash,
-            date: now,
-            channelType, 
-            channelId,
-            // User
-            user: request?.user?.name,
-            ip: request?.ip,
-            // Error
-            stacktrace: error.stack || error.message,
-            logs: logsHtml
-        });
+        if (app.isLoaded('email'))
+            $.email.send({
+                to: app.identity.author.email,
+                subject: "Server bug: " + error.message,
+                html: `
+                    <a href="${app.env.url}/admin/activity/requests/${channelId}">
+                        View Request details & console
+                    </a>
+                    <br/>
+                    ${logsHtml}
+                `
+            });
+        else
+            console.error("Unable to send bug report: email service not loaded.");
+
+        /*if (app.isLoaded('sql'))
+            // Memorize
+            $.sql.insert('BugServer', {
+                // Context
+                hash: hash,
+                date: now,
+                channelType, 
+                channelId,
+                // User
+                user: request?.user?.name,
+                ip: request?.ip,
+                // Error
+                stacktrace: error.stack || error.message,
+                logs: logsHtml
+            });*/
 
         // Update error message
         error.message = "A bug report has been sent to my personal mailbox. Sorry for the inconvenience.";

package/src/server/services/console/index.ts

@@ -256,7 +256,7 @@ export class Console {
         let html = logs.map( log => logToHTML( log, this )).join('\n');
 
         if (full) {
-            const consoleCss = `background: #000; padding: 20px; font-family: 'monospace'; font-size: 12px; line-height: 20px;`
+            const consoleCss = `background: #000; padding: 20px; font-family: 'Fira Mono', 'monospace', 'Monaco'; font-size: 12px; line-height: 20px;`
             html = '<div style="' + consoleCss + '">' + html + '</div>';
         }
 

package/src/server/services/cron/index.ts

@@ -3,7 +3,7 @@
 ----------------------------------*/
 
 // Core
-import { Introuvable } from '@common/errors';
+import { NotFound } from '@common/errors';
 import app from '@server/app';
 import context from '@server/context';
 
@@ -99,7 +99,7 @@ export class CronManager {
         const tache = CronManager.taches[nom];
 
         if (tache === undefined)
-            throw new Introuvable("Tâche introuvable: " + nom);
+            throw new NotFound("Tâche NotFound: " + nom);
 
         await tache.run(true);
 

package/src/server/services/database/index.ts

@@ -9,7 +9,7 @@ const safeStringify = require('fast-safe-stringify'); // remplace les référenc
 
 // Core: general
 import app, { $ } from '@server/app';
-import { Introuvable } from '@common/errors';
+import { NotFound } from '@common/errors';
 
 // Services
 import './connection';
@@ -113,7 +113,7 @@ export function sql<TRowData extends TObjetDonnees = {}>(strings: TemplateString
         fetchStats(columns, string, periodStr, intervalStr)*/
 
     query.mergeValues = (options: TQueryOptions = {}) => 
-        sql.query(string, options).then(queriesResult => {
+        sql.query(string, options).then( queriesResult => {
 
             const data: TObjetDonnees = {};
             for (const queryResult of queriesResult)
@@ -211,7 +211,8 @@ sql.query = async <TRowData extends TObjetDonnees = {}>(
                     time: Date.now() - startTime,
                 });
         }
-        return rows;
+
+        return rows as unknown as TRowData[];
         
     } catch (error) {
         
@@ -251,7 +252,7 @@ sql.firstOrFail = <TRowData extends TObjetDonnees = {}>(query: string, message?:
     sql.query(query, opts).then((resultatRequetes: any) => {
 
         if (resultatRequetes.length === 0)
-            throw new Introuvable(message);
+            throw new NotFound(message);
 
         return resultatRequetes[0];
 
@@ -359,18 +360,15 @@ sql.insert = async <TData extends TObjetDonnees>(
         }).join(', ');
 
     if (opts.upsert !== undefined)
-        query += ' ON DUPLICATE KEY UPDATE ' + opts.upsert.map(col => 
+        query += ' ON DUPLICATE KEY UPDATE ' + opts.upsert.map( col => 
             '`' + col + '` = ' + (opts.upsertMode === 'increment' ? '`' + col + '` + ' : '') + 'VALUES(' + col + ')'
         )
 
     const queryResult = await sql.query(query + ';', opts);
 
-    if (opts.returnQuery)
-        return queryResult;
-    else {
-        data.id = queryResult.insertId;
-        return data;
-    }
+    console.log("opts.returnQuery", opts.returnQuery, "queryResult", queryResult);
+    
+    return [data, queryResult.insertId, queryResult];
 }
 
 /*----------------------------------

package/src/server/services/email/index.ts

@@ -135,7 +135,7 @@ export default class Email {
                 const template = templates[email.template];
 
                 if (template === undefined)
-                    throw new Error(`Impossible de charger la template email ${email.template} depuis le cache (introuvable).`);
+                    throw new Error(`Impossible de charger la template email ${email.template} depuis le cache (NotFound).`);
 
                 const txt = template(email.data || {})
 
@@ -197,7 +197,4 @@ declare global {
             email: Email;
         }
     }
-}
-
-// Register transporters
-require("./transports/*");
+}

package/src/server/services/router/index.ts

@@ -22,7 +22,7 @@ import TrackingService from './request/services/tracking';
 
 // Core: libs
 import app, { $ } from '@server/app';
-import { Introuvable } from '@common/errors';
+import { NotFound } from '@common/errors';
 
 // Core: types
 import type { TSsrUnresolvedRoute, TRegisterPageArgs } from '@client/router';
@@ -439,7 +439,7 @@ export class Router extends BaseRouter {
                 return response;
         }
 
-        throw new Introuvable(`The requested endpoint was not found.`);
+        throw new NotFound(`The requested endpoint was not found.`);
     }
 
 }