5htp-core 0.2.4-3 → 0.2.5

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

@@ -8,6 +8,7 @@ import mysql from 'mysql2/promise';
 // Core: general
 import Application from '@server/app';
 import Service from '@server/app/service';
+import { Anomaly } from '@common/errors';
 
 // Core: specific
 import { SqlError } from './debug';
@@ -26,14 +27,19 @@ const LogPrefix = '[database][connection]';
 - SERVICE CONFIG
 ----------------------------------*/
 
-export type DatabaseServiceConfig = {
-    list: string[],
+type ConnectionConfig = {
+    name: string,
+    databases: string[],
     host: string,
     port: number,
     login: string,
     password: string,
 }
 
+export type DatabaseServiceConfig = {
+    connections: ConnectionConfig[]
+}
+
 export type THooks = {
 
 }
@@ -63,10 +69,11 @@ type TSelectQueryResult = any;
 /*----------------------------------
 - SERVICES
 ----------------------------------*/
-export default class DatabaseConnection extends Service<DatabaseServiceConfig, THooks, Application> {
+export default class DatabaseManager extends Service<DatabaseServiceConfig, THooks, Application> {
 
     private initialized = false;
     public connection!: mysql.Pool;
+    public connectionConfig?: ConnectionConfig;
 
     public tables: TDatabasesList = {};
     public metas = new MetadataParser(this);
@@ -84,35 +91,49 @@ export default class DatabaseConnection extends Service<DatabaseServiceConfig, T
 
         this.initialized = false;
 
-        this.app.on('cleanup', () => this.cleanup());
+        // Try to connect to one of the databases
+        const connectionErrors: string[] = []
+        for (const connectionConfig of this.config.connections){
+            try {
+                this.connection = await this.connect(connectionConfig);
+                this.connectionConfig = connectionConfig;
+            } catch (error) {
+                console.warn(LogPrefix, `Failed to connect to ${connectionConfig.name}: ` + error);
+                connectionErrors.push(connectionConfig.name + ': ' + error);
+            }
+        }
+
+        // Coudnt connect to any database
+        if (this.connectionConfig === undefined)
+            throw new Anomaly(`Couldnt connect to any database.`, { connectionErrors });
 
-        this.connection = await this.connect();
+        // Disconnect from the database when the app is terminated
+        this.app.on('cleanup', () => this.disconnect());
 
-        this.tables = await this.metas.load( this.config.list );
+        // Load tables metas
+        this.tables = await this.metas.load( this.connectionConfig.databases );
 
+        // Ready to make queries
         this.initialized = true;
-
     }
 
-    public async cleanup() {
+    public async disconnect() {
         return this.connection.end();
     }
 
     /*----------------------------------
     - INIT
     ----------------------------------*/
-    public async connect() {
-
-        console.info(LogPrefix, `Connecting to databases ...`);
-
+    public async connect({ name, databases, host, login, password, port }: ConnectionConfig) {
+        console.info(LogPrefix, `Trying to connect to ${name} ...`);
         return await mysql.createPool({
 
             // Identification
-            host: this.config.host,
-            port: this.config.port,
-            user: this.config.login,
-            password: this.config.password,
-            database: this.config.list[0],
+            host: host,
+            port: port,
+            user: login,
+            password: password,
+            database: databases[0],
 
             // Pool
             waitForConnections: true,
@@ -137,7 +158,7 @@ export default class DatabaseConnection extends Service<DatabaseServiceConfig, T
                 //console.info(LogPrefix, 'queryFormat', query);
                 return query;
             }
-        });
+        })
     }
 
     private typeCast( field: mysql.Field, next: Function ) {
@@ -216,13 +237,16 @@ export default class DatabaseConnection extends Service<DatabaseServiceConfig, T
 
     public getTable( path: string ): TMetasTable {
 
+        if (this.connectionConfig === undefined)
+            throw new Error(`No connection has been initialised.`);
+
         // Parse path
         let db: string, table: string;
         if (path.includes('.'))
             ([db, table] = path.split('.'));
         else {
             // Only the table = use the main database (first of the list in the config)
-            db = this.config.list[0];
+            db = this.connectionConfig.databases[0];
             table = path;
         }
             

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

@@ -27,7 +27,7 @@ import BaseRouter, {
     TRouteOptions, defaultOptions
 } from '@common/router';
 import { buildRegex, getRegisterPageArgs } from '@common/router/register';
-import { layoutsList } from '@common/router/layouts';
+import { layoutsList, getLayout } from '@common/router/layouts';
 import { TFetcherList, TFetcher } from '@common/router/request/api';
 import type { TFrontRenderer } from '@common/router/response/page';
 import type { TSsrUnresolvedRoute, TRegisterPageArgs } from '@client/services/router';
@@ -147,7 +147,6 @@ export default class ServerRouter<
         // Since route registering requires all services to be ready,
         // We load routes only when all services are ready
         this.app.on('ready', async () => {
-
             // Use require to avoid circular references
             this.registerRoutes([
                 ...require("metas:@/server/routes/**/*.ts"),
@@ -228,9 +227,13 @@ export default class ServerRouter<
         options: TRoute["options"],
         renderer: TFrontRenderer<{}, { message: string }>
     ) {
+
+        // Automatic layout form the nearest _layout folder
+        const layout = getLayout('Error ' + code, options);
+
         this.errors[code] = {
             code,
-            controller: (context: TRouterContext<this>) => new Page(null, renderer, context),
+            controller: (context: TRouterContext<this>) => new Page(null, renderer, context, layout),
             options
         };
     }
@@ -503,7 +506,7 @@ declare type Routes = {
                 return response;
         }
 
-        throw new NotFound(`The requested endpoint was not found.`);
+        throw new NotFound();
     }
 
     private async resolveApiBatch( fetchers: TFetcherList, request: ServerRequest<this> ) {
@@ -542,9 +545,14 @@ declare type Routes = {
         // Rapport / debug
         if (code === 500) {
 
+            // Report error
             await this.app.runHook('error', e, request);
 
-            // Pour déboguer les erreurs HTTP
+            // Don't exose technical errors to users
+            if (this.app.env.profile === 'prod')
+                e.message = "We encountered an internal error, and our team has just been notified. Sorry for the inconvenience.";
+
+        // Pour déboguer les erreurs HTTP
         } else if (this.app.env.profile === "dev")
             console.warn(e);
 

package/src/client/pages/_layout/base.less

@@ -1,13 +0,0 @@
-#page {
-    transition: opacity 5s cubic-bezier(0,.3,0,.99);
-    animation: showMain 1s ease-out;
-    @keyframes showMain { 
-        0% {    opacity: 0.3; }
-        100% {   opacity: 1; }
-    }
-
-    body.loading & {
-        cursor: wait;
-        opacity: 0.1;
-    }
-}

package/src/client/pages/_layout/landing/index.less

@@ -1,5 +0,0 @@
-body {
-
-    
-
-}

package/src/client/pages/_layout/landing/index.tsx

@@ -1,55 +0,0 @@
-/*----------------------------------
-- DEPENDANCES
-----------------------------------*/
-
-// Npm
-import React from 'react';
-
-// Core
-
-// Core components
-import Button, { Props as ButtonProps } from '@client/components/button';
-import useHeader from '@client/pages/useHeader';
-
-/*----------------------------------
-- CONTROLEUR
-----------------------------------*/
-import './index.less';
-export default ({ headline, subtitle, cta, preview }: {
-    
-    headline: string,
-    subtitle: string,
-    cta: ButtonProps,
-    preview: [string, string]
-
-}) => {
-
-    useHeader({
-        title: headline,
-        subtitle: subtitle,
-    });
-
-    /*----------------------------------
-    - RENDER
-    ----------------------------------*/
-    return (
-        <div id="landing">
-
-            <header>
-                <div class="text card">
-                    <h1>{headline}</h1>
-                    <p>
-                        {subtitle}
-                    </p>
-                    <Button type="guide" {...cta} />
-                </div>
-
-                <figure>        
-                    <img class="image" src={preview[0]} />
-                    <legend>{preview[1]}</legend>
-                </figure>
-            </header>
-            
-        </div>
-    )
-}