5htp-core 0.2.5 → 0.2.6-2

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

@@ -23,6 +23,8 @@ import logToHTML from './html';
 type TLogProfile = 'silly' | 'info' | 'warn' | 'error'
 
 export type Config = {
+    debug?: boolean,
+    bufferLimit: number,
     dev: {
         level: TLogProfile,
     },
@@ -77,17 +79,12 @@ export type TQueryLogs = ChannelInfos & {
     time: number,
 }
 
-export type TLog = ChannelInfos & {
-
-}
+export type TLog = ILogObject &  ChannelInfos
 
 /*----------------------------------
 - TYPES: BUG REPORT
 ----------------------------------*/
 export type ServerBug = {
-
-    type: 'server',
-
     // Context
     hash: string,
     date: Date, // Timestamp
@@ -125,7 +122,7 @@ const logFields = [
     'lineNumber',
     'argumentsArray',
     'stack',
-]
+] as const
 
 /*----------------------------------
 - LOGGER
@@ -186,14 +183,17 @@ export default class Console extends Service<Config, Hooks, Application> {
             fatal: this.logEntry.bind(this),
         }, envConfig.level);
 
-        setInterval(() => this.clean(), 60000);
+        setInterval(() => this.clean(), 10000);
 
         // Send email report
         this.app.on('error', this.createBugReport.bind(this));
     }
 
     private clean() {
-        // Clean memory from old logs
+        this.config.debug && console.log(LogPrefix, `Clean logs buffer. Current size:`, this.logs.length, '/', this.config.bufferLimit);
+        const bufferOverflow = this.logs.length - this.config.bufferLimit;
+        if (bufferOverflow > 0)
+            this.logs = this.logs.slice(bufferOverflow);
     }
 
     /*----------------------------------
@@ -235,9 +235,6 @@ export default class Console extends Service<Config, Hooks, Application> {
         );
 
         const bugReport: ServerBug = {
-
-            type: 'server',
-
             // Context
             hash: hash,
             date: now,
@@ -264,6 +261,7 @@ export default class Console extends Service<Config, Hooks, Application> {
 
     private logEntry(entry: ILogObject) {
 
+        // Don't keep logs from the admin sashboard
         const [channelType, channelId] = entry.requestId?.split(':') || ['master'];
         if (entry.requestId === 'admin')
             return;
@@ -274,22 +272,6 @@ export default class Console extends Service<Config, Hooks, Application> {
         for (const k of logFields)
             miniLog[k] = entry[k];
 
-        // remove webpack path
-        if (miniLog.filePath !== undefined) {
-
-            const appPrefix = '/webpack:/' + this.app.pkg.name + '/src/';
-            const appPrefixIndex = miniLog.filePath.indexOf(appPrefix);
-
-            const corePrefix = '/webpack:/' + this.app.pkg.name + '/node_modules/5htp-core/src/';
-            const corePrefixIndex = miniLog.filePath.indexOf(corePrefix);
-
-            if (appPrefixIndex !== -1)
-                miniLog.filePath = '@/' + miniLog.filePath.substring(appPrefixIndex + appPrefix.length);
-            else if (corePrefixIndex !== -1)
-                miniLog.filePath = '@' + miniLog.filePath.substring(corePrefixIndex + corePrefix.length);
-
-        }
-
         this.logs.push(miniLog as TLog);
     }
 
@@ -367,11 +349,30 @@ export default class Console extends Service<Config, Hooks, Application> {
         if (channelId !== undefined)
             filters.channelId = channelId;
 
-        const fromBuffer = this.logs.filter(
-            e => e.channelId === channelId && e.channelType === channelType
-        ).reverse();
+        const entries: TLog[] = []
+        for (const log of this.logs) {
+
+            // Filters
+            if (!(log.channelId === channelId && log.channelType === channelType))
+                continue;
+
+            // Remove path prefixs
+            if (log.filePath !== undefined) {
+
+                const appPrefix = '/webpack:/' + this.app.pkg.name + '/src/';
+                const appPrefixIndex = log.filePath.indexOf(appPrefix);
+    
+                const corePrefix = '/webpack:/' + this.app.pkg.name + '/node_modules/5htp-core/src/';
+                const corePrefixIndex = log.filePath.indexOf(corePrefix);
+    
+                if (appPrefixIndex !== -1)
+                    log.filePath = '@/' + log.filePath.substring(appPrefixIndex + appPrefix.length);
+                else if (corePrefixIndex !== -1)
+                    log.filePath = '@' + log.filePath.substring(corePrefixIndex + corePrefix.length);
+            }
+        }
         
-        return this.printHtml(fromBuffer);
+        return this.printHtml( entries.reverse() );
     }
  
     public printHtml(logs: TLog[], full: boolean = false): string {

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

@@ -95,8 +95,8 @@ export default class DatabaseManager extends Service<DatabaseServiceConfig, THoo
         const connectionErrors: string[] = []
         for (const connectionConfig of this.config.connections){
             try {
-                this.connection = await this.connect(connectionConfig);
-                this.connectionConfig = connectionConfig;
+                await this.connect(connectionConfig)
+                break;
             } catch (error) {
                 console.warn(LogPrefix, `Failed to connect to ${connectionConfig.name}: ` + error);
                 connectionErrors.push(connectionConfig.name + ': ' + error);
@@ -110,9 +110,6 @@ export default class DatabaseManager extends Service<DatabaseServiceConfig, THoo
         // Disconnect from the database when the app is terminated
         this.app.on('cleanup', () => this.disconnect());
 
-        // Load tables metas
-        this.tables = await this.metas.load( this.connectionConfig.databases );
-
         // Ready to make queries
         this.initialized = true;
     }
@@ -124,16 +121,17 @@ export default class DatabaseManager extends Service<DatabaseServiceConfig, THoo
     /*----------------------------------
     - INIT
     ----------------------------------*/
-    public async connect({ name, databases, host, login, password, port }: ConnectionConfig) {
-        console.info(LogPrefix, `Trying to connect to ${name} ...`);
-        return await mysql.createPool({
+    public async connect(config: ConnectionConfig) {
+
+        console.info(LogPrefix, `Trying to connect to ${config.name} ...`);
+        this.connection = mysql.createPool({
 
             // Identification
-            host: host,
-            port: port,
-            user: login,
-            password: password,
-            database: databases[0],
+            host: config.host,
+            port: config.port,
+            user: config.login,
+            password: config.password,
+            database: config.databases[0],
 
             // Pool
             waitForConnections: true,
@@ -159,6 +157,11 @@ export default class DatabaseManager extends Service<DatabaseServiceConfig, THoo
                 return query;
             }
         })
+
+        this.connectionConfig = config;
+
+        this.tables = await this.metas.load( config.databases );
+        console.info(LogPrefix, `Successfully connected to ${config.name}.`);
     }
 
     private typeCast( field: mysql.Field, next: Function ) {

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

@@ -548,6 +548,8 @@ declare type Routes = {
             // Report error
             await this.app.runHook('error', e, request);
 
+            console.log("ERROR 500 VIA ROUTER", e);
+
             // 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.";

package/src/server/services/schema/request.ts

@@ -54,7 +54,6 @@ export default class RequestValidator extends ServerSchemaValidator implements R
             {
                 debug: this.config.debug,
                 throwError: true,
-                validateAll: true,
                 validateDeps: false
             },
             []

package/src/client/components/input/Date/index.less

@@ -1,167 +0,0 @@
-.champ.periode {
-
-    display: flex;
-
-    > .input-date {
-
-        display: flex;
-        justify-content: center;
-        align-items: center;
-
-        > input[type=number] {
-            -moz-appearance: textfield;
-            padding: 0;
-            text-align: center;
-
-            width: 30px;
-            &.annee { width: 45px; }
-
-            &::-webkit-outer-spin-button,
-            &::-webkit-inner-spin-button {
-              -webkit-appearance: none;
-              margin: 0;
-            }
-        }
-
-    }
-}
-
-// https://github.com/wojtekmaj/react-calendar/blob/master/src/Calendar.less
-.react-calendar {
-  
-    &--doubleView {
-      width: 700px;
-  
-      .react-calendar__viewContainer {
-        display: flex;
-        margin: -.5em;
-  
-        > * {
-          width: 50%;
-          margin: .5em;
-        }
-      }
-    }
-  
-    &, & *, & *:before, & *:after {
-      -moz-box-sizing: border-box;
-      -webkit-box-sizing: border-box;
-      box-sizing: border-box;
-    }
-  
-    button {
-      margin: 0;
-      border: 0;
-      outline: none;
-      border-radius: @radiusBase;
-  
-      &:enabled {
-        &:hover {
-          cursor: pointer;
-        }
-      }
-    }
-  
-    &__navigation {
-      height: 40px;
-  
-      button {
-        min-width: 44px;
-        background: none;
-  
-        &:enabled {
-          &:hover, &:focus {
-            background-color: var(--cBgControl)
-          }
-        }
-  
-        &[disabled] {
-          color: var(--cTxtDiscret)
-        }
-      }
-    }
-  
-    &__month-view {
-      &__weekdays {
-        text-align: center;
-        text-transform: uppercase;
-        font-weight: bold;
-        font-size: .75em;
-  
-        &__weekday {
-          padding: .5em;
-        }
-      }
-  
-      &__weekNumbers {
-        font-weight: bold;
-  
-        .react-calendar__tile {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          font-size: .75em;
-          padding: calc(.75em / .75) calc(.5em / .75);
-        }
-      }
-  
-      &__days {
-        &__day {
-          &--weekend {
-            //color: rgb(209, 0, 0);
-          }
-  
-          &--neighboringMonth {
-          color: var(--cTxtDesc)
-          }
-        }
-      }
-    }
-  
-    &__year-view,
-    &__decade-view,
-    &__century-view {
-      .react-calendar__tile {
-        padding: 2em .5em;
-      }
-    }
-  
-    &__tile {
-      max-width: 100%;
-      text-align: center;
-      padding: .75em .5em;
-      background: none;
-  
-      &:disabled {
-          color: var(--cTxtDiscret)
-      }
-  
-      &:enabled {
-        &:hover, &:focus {
-            background-color: var(--cBgControl)
-        }
-      }
-  
-      &--now {
-        font-weight: 700;
-      }
-  
-      &--hasActive {
-        background: var(--cPrincipale);
-        color: #fff;
-      }
-  
-      &--active {
-        background: var(--cPrincipale);
-        color: #fff;
-      }
-    }
-  
-    &--selectRange {
-      .react-calendar__tile {
-        &--hover {
-            background-color: var(--cBgControl)
-        }
-      }
-    }
-  }

package/src/client/components/input/Date/index.tsx

@@ -1,90 +0,0 @@
-/*----------------------------------
-- DEPENDANCES
-----------------------------------*/
-import React from 'react';
-import Champ from '../Base';
-import dayjs from 'dayjs';
-import Popover from '@client/components/Conteneurs/Popover';
-import Calendar from 'react-calendar';
-
-/*----------------------------------
-- TYPES
-----------------------------------*/
-type TValeur = string | Date;
-type TValeurDefaut = Date;
-type TValeurOut = Date;
-const valeurDefaut = undefined;
-
-export type Props = {
-    valeur: TValeur,
-    placeholder?: string,
-    min?: string,
-    max?: string
-}
-
-/*----------------------------------
-- COMPOSANT
-----------------------------------*/
-import './index.less';
-export default Champ<Props, TValeurDefaut, TValeurOut>('date', { valeurDefaut }, ({
-    // Spread TOUTES les props dont on a besoin pour éviter les problèmes de référence avec props
-    prefixe, className, min, max
-}, { state, valeur, setState }, rendre) => {
-
-    const maintenant = new Date;
-
-    /* TODO: onchange saisie input = pas de validation
-                 onchange click calendrier = validation immédiate
-        */
-
-    const [affCalendrier, setAffCalendrier] = React.useState<boolean>(false);
-
-    const saisieValide = valeur !== undefined && (
-        typeof valeur !== 'string' || !isNaN( Date.parse( valeur ) )
-    );
-
-    /*----------------------------------
-    - CONSTRUCTION CHAMP
-    ----------------------------------*/
-    if (prefixe === undefined)
-        prefixe = <i src="calendar-alt" />;
-    
-    /*----------------------------------
-    - RENDU DU CHAMP
-    ----------------------------------*/
-    return rendre(<>
-
-        <Popover
-            afficher={affCalendrier}
-            fermer={() => setAffCalendrier(false)}
-            interactions
-            //{...props}
-            className={"bloc input-date" + (className ? ' ' + className : '')} 
-            width={300}
-            content={(
-                <div>
-                    <Calendar
-                        minDate={min ? new Date(min) : maintenant}
-                        maxDate={max ? new Date(max) : undefined}
-                        value={saisieValide ? new Date(valeur) : maintenant}
-                        showDoubleView={false}
-                        onChange={(val: Date) => {
-                            setAffCalendrier(false)
-                            setState({ valeur: val });
-                        }}
-                    />
-                </div>
-            )}
-        >
-            <input
-                className="champ"
-                value={saisieValide ? dayjs(valeur).format('DD/MM/YYYY') : valeur}
-                onChange={(e) => setState({ valeur: e.target.value })}
-                onFocus={() => setAffCalendrier(true)}
-                placeholder='DD/MM/YYYY'
-                readOnly
-            />
-        </Popover>
-
-    </>, { prefixe }); // Les propétés modifiées sont passées ici
-})