5htp-core 0.2.9 → 0.3.0

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

@@ -7,10 +7,11 @@ import path from 'path';
 
 // Npm
 import hInterval from 'human-interval';
-import fs from 'fs-extra';
 
 // Core
-import Application, { Service } from '@server/app';
+import type { Application } from '@server/app';
+import Service, { AnyService, TRegisteredService } from '@server/app/service';
+import type { default as DisksManager, Driver } from '../disks';
 
 // Specific
 import registerCommands from './commands';
@@ -56,7 +57,8 @@ type TCacheGetOnlyArgs = [
 ----------------------------------*/
 
 export type Config = {
-    debug: boolean
+    debug: boolean,
+    disk: string, // TODO: keyof disks
 }
 
 export type Hooks = {
@@ -69,34 +71,58 @@ export type Hooks = {
 export default class Cache extends Service<Config, Hooks, Application> {
 
     public commands = registerCommands(this);
-    
-    private cacheDir = this.app.path.cache;
 
     public data: {[key: string]: CacheEntry | undefined} = {};
-    
-    public async register() {
 
-        
+    private disk: Driver;
+
+    public constructor( 
+        parent: AnyService, 
+        config: Config,
+        services: {
+            disks: TRegisteredService< DisksManager >,
+        },
+        app: Application, 
+    ) {
 
+        super(parent, config, services, app);
+
+        this.disk = this.services.disks.get(config.disk)
     }
 
-    public async start() {
+    /*----------------------------------
+    - LIFECYCLE
+    ----------------------------------*/
+
+    protected async start() {
 
         setInterval(() => this.cleanMem(), 10000);
 
         // Restore persisted data
-        await this.restore();
+        //await this.restore();
     }
 
-    private restore() {
-        const files = fs.readdirSync( this.cacheDir );
+    public async ready() {
+
+    }
+
+    public async shutdown() {
+
+    }
+
+    /*----------------------------------
+    - ACTIONS
+    ----------------------------------*/
+    private async restore() {
+        const files = await this.disk.readDir('data', 'cache')
         for (const file of files) {
 
-            if (!file.endsWith('.json'))
+            if (!file.name.endsWith('.json'))
                 continue;
 
-            const entryKey = file.substring(0, file.length - 5);
-            this.data[ entryKey ] = fs.readJSONSync( path.join(this.cacheDir, file) );
+            const entryKey = file.name.substring(0, file.name.length - 5);
+            const filePath = path.join('cache', file.name);
+            this.data[ entryKey ] = await this.disk.readJSON('data', filePath);
             console.log(LogPrefix, `Restored cache entry ${entryKey}`);
         }
     }
@@ -229,7 +255,7 @@ export default class Cache extends Service<Config, Hooks, Application> {
         }
     };
 
-    public del( key?: string ): void {
+    public del( key: string ): void {
 
         if (key === undefined) {
             this.data = {};

package/src/server/services/cache/service.json

@@ -0,0 +1,6 @@
+{
+    "id": "Core/Cache",
+    "name": "Cache",
+    "parent": "app",
+    "dependences": []
+}

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

@@ -3,12 +3,13 @@
 ----------------------------------*/
 // Npm
 import { v4 as uuid } from 'uuid';
-import { Logger, ILogObject } from "tslog";
+import log from 'ololog';
 import { format as formatSql } from 'sql-formatter';
 import highlight from 'cli-highlight';
 
 // Core libs
-import Application, { Service, TPriority } from '@server/app';
+import type { Application } from '@server/app';
+import Service from '@server/app/service';
 import context from '@server/context';
 import type ServerRequest from '@server/services/router/request';
 import { SqlError } from '@server/services/database/debug';
@@ -73,7 +74,7 @@ export type TRequestLogs = {
     time: number
 }
 
-export type TQueryLogs = ChannelInfos & {
+export type TDbQueryLog = ChannelInfos & {
     date: Date, 
     query: string,
     time: number,
@@ -84,6 +85,7 @@ export type TLog = ILogObject &  ChannelInfos
 /*----------------------------------
 - TYPES: BUG REPORT
 ----------------------------------*/
+
 export type ServerBug = {
     // Context
     hash: string,
@@ -129,9 +131,6 @@ const logFields = [
 ----------------------------------*/
 export default class Console extends Service<Config, Hooks, Application> {
 
-    // Load before all
-    public priority: TPriority = 2;
-
     // Services
     public logger!: Logger;
 
@@ -139,7 +138,7 @@ export default class Console extends Service<Config, Hooks, Application> {
     public logs: TLog[] = [];
     public clients: TGuestLogs[] = [];
     public requests: TRequestLogs[] = [];
-    public sqlQueries: TQueryLogs[] = [];
+    public sqlQueries: TDbQueryLog[] = [];
     // Bug ID => Timestamp latest send
     private sentBugs: {[bugId: string]: number} = {};
 
@@ -150,17 +149,17 @@ export default class Console extends Service<Config, Hooks, Application> {
     public error = console.error;
 
     /*----------------------------------
-    - INSTANCE
+    - LIFECYCLE
     ----------------------------------*/
-    public async register() {
 
-    }
-
-    public async start() {
+    protected async start() {
 
         const envConfig = this.config[ this.app.env.profile ];
 
-        this.logger = new Logger({
+        /*const origConsole = console;
+        console.log = (...args: unknown[]) => log(...args)*/
+
+        /*this.logger = new Logger({
             overwriteConsole: true,
             //type: this.app.env.profile === 'dev' ? 'pretty' : 'hidden',
             requestId: (): string => {
@@ -168,6 +167,7 @@ export default class Console extends Service<Config, Hooks, Application> {
                 return channelId === undefined ? channelType : channelType + ':' + channelId;
             },
             displayRequestId: false,
+            hideLogPositionForProduction: this.app.env.profile === 'prod',
             prettyInspectOptions: {
                 depth: 2
             }
@@ -181,7 +181,7 @@ export default class Console extends Service<Config, Hooks, Application> {
             warn: this.logEntry.bind(this),
             error: this.logEntry.bind(this),
             fatal: this.logEntry.bind(this),
-        }, envConfig.level);
+        }, envConfig.level);*/
 
         setInterval(() => this.clean(), 10000);
 
@@ -189,6 +189,18 @@ export default class Console extends Service<Config, Hooks, Application> {
         this.app.on('error', this.createBugReport.bind(this));
     }
 
+    public async ready() {
+
+    }
+
+    public async shutdown() {
+
+    }
+
+    /*----------------------------------
+    - ACTIONS
+    ----------------------------------*/
+
     private clean() {
         /*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;
@@ -196,10 +208,6 @@ export default class Console extends Service<Config, Hooks, Application> {
             this.logs = this.logs.slice(bufferOverflow);*/
     }
 
-    /*----------------------------------
-    - LOGGING
-    ----------------------------------*/
-
     public async createBugReport( error: Error, request?: ServerRequest ) {
 
         // Print the error so it's accessible via logs
@@ -277,11 +285,11 @@ export default class Console extends Service<Config, Hooks, Application> {
         this.logs.push(miniLog as TLog);
     }
 
-    public client(client: TGuestLogs) {
+    public client( client: TGuestLogs ) {
         this.clients.push(client);
     }
 
-    public request(request: TRequestLogs) {
+    public request( request: TRequestLogs ) {
 
         if (request.id === 'admin')
             return;
@@ -289,6 +297,11 @@ export default class Console extends Service<Config, Hooks, Application> {
         this.requests.push( request );
     }
 
+    public database( dbQuery: TDbQueryLog ) {
+
+        this.requests.push( dbQuery );
+    }
+
     /*----------------------------------
     - READ
     ----------------------------------*/
@@ -333,7 +346,7 @@ export default class Console extends Service<Config, Hooks, Application> {
 
     public getQueries( channelType: ChannelInfos["channelType"], channelId?: string ) {
 
-        const filters: Partial<TQueryLogs> = { channelType };
+        const filters: Partial<TDbQueryLog> = { channelType };
         if (channelId !== undefined)
             filters.channelId = channelId;
 
@@ -347,7 +360,7 @@ export default class Console extends Service<Config, Hooks, Application> {
 
     public async getLogs( channelType: ChannelInfos["channelType"], channelId?: string ) {
 
-        const filters: Partial<TQueryLogs> = { channelType };
+        const filters: Partial<TDbQueryLog> = { channelType };
         if (channelId !== undefined)
             filters.channelId = channelId;
 

package/src/server/services/console/service.json

@@ -0,0 +1,6 @@
+{
+    "id": "Core/Console",
+    "name": "Console",
+    "parent": "app",
+    "dependences": []
+}

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

@@ -3,7 +3,8 @@
 ----------------------------------*/
 
 // Core
-import Application, { Service } from '@server/app';
+import type { Application } from '@server/app';
+import Service from '@server/app/service';
 import { NotFound } from '@common/errors';
 import context from '@server/context';
 
@@ -37,14 +38,10 @@ export default class CronManager extends Service<Config, Hooks, Application> {
     public static timer: NodeJS.Timeout;
 
     /*----------------------------------
-    - HOOKS
+    - LIFECICLE
     ----------------------------------*/
 
-    public async register() {
-
-    }
-
-    public async start() {
+    protected async start() {
         
         this.app.on('cleanup', () => this.cleanup());
 
@@ -56,10 +53,13 @@ export default class CronManager extends Service<Config, Hooks, Application> {
 
         }, 10000);
     }
-
-    public async cleanup() {
-        clearInterval(CronManager.timer);
-        CronManager.taches = {}
+  
+    public async ready() {
+  
+    }
+  
+    public async shutdown() {
+  
     }
 
     /*----------------------------------

package/src/server/services/cron/service.json

@@ -0,0 +1,6 @@
+{
+    "id": "Core/Cron",
+    "name": "Cron",
+    "parent": "app",
+    "dependences": []
+}

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

@@ -6,13 +6,11 @@
 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 type SQL from '.';
 import { SqlError } from './debug';
-import type Console from '../console';
 import MetadataParser, { TDatabasesList, TMetasTable, TColumnTypes, TMetasColonne } from './metas';
 import { TMySQLTypeName, mysqlToJs, js as jsTypes } from './datatypes';
 import Bucket from './bucket';
@@ -38,7 +36,8 @@ type ConnectionConfig = {
 
 export type DatabaseServiceConfig = {
     debug: boolean,
-    connections: ConnectionConfig[]
+    connections: ConnectionConfig[],
+    connectionsLimit: number
 }
 
 export type THooks = {
@@ -70,7 +69,7 @@ type TSelectQueryResult = any;
 /*----------------------------------
 - SERVICES
 ----------------------------------*/
-export default class DatabaseManager extends Service<DatabaseServiceConfig, THooks, Application> {
+export default class DatabaseManager {
 
     private initialized = false;
     public connection!: mysql.Pool;
@@ -79,13 +78,19 @@ export default class DatabaseManager extends Service<DatabaseServiceConfig, THoo
     public tables: TDatabasesList = {};
     public metas = new MetadataParser(this);
 
+    public status: 'disconnected' | 'connected' = 'disconnected'
+
+    public constructor(
+        protected sql: SQL,
+        protected config: DatabaseServiceConfig,
+        public app = sql.app
+    ) {
+        
+    }
+
     /*----------------------------------
     - HOOKS
     ----------------------------------*/
-
-    public async register() {
-
-    }
     
     public loading: Promise<void> | undefined = undefined;
     public async start() {
@@ -99,13 +104,13 @@ export default class DatabaseManager extends Service<DatabaseServiceConfig, THoo
                 await this.connect(connectionConfig)
                 break;
             } catch (error) {
-                console.warn(LogPrefix, `Failed to connect to ${connectionConfig.name}: ` + error);
+                this.config.debug && console.warn(LogPrefix, `Failed to connect to ${connectionConfig.name}: ` + error);
                 connectionErrors.push(connectionConfig.name + ': ' + error);
             }
         }
 
         // Coudnt connect to any database
-        if (this.connectionConfig === undefined)
+        if (this.status !== 'connected')
             throw new Anomaly(`Couldnt connect to any database.`, { connectionErrors });
 
         // Disconnect from the database when the app is terminated
@@ -124,7 +129,7 @@ export default class DatabaseManager extends Service<DatabaseServiceConfig, THoo
     ----------------------------------*/
     public async connect(config: ConnectionConfig) {
 
-        console.info(LogPrefix, `Trying to connect to ${config.name} ...`);
+        this.config.debug && console.info(LogPrefix, `Trying to connect to ${config.name} ...`);
         this.connection = mysql.createPool({
 
             // Identification
@@ -136,7 +141,7 @@ export default class DatabaseManager extends Service<DatabaseServiceConfig, THoo
 
             // Pool
             waitForConnections: true,
-            connectionLimit: 100,
+            connectionLimit: this.config.connectionsLimit, 
             queueLimit: 0,
 
             // Dates & timezone
@@ -159,10 +164,10 @@ export default class DatabaseManager extends Service<DatabaseServiceConfig, THoo
             }
         })
 
-        this.connectionConfig = config;
-
         this.tables = await this.metas.load( config.databases );
-        console.info(LogPrefix, `Successfully connected to ${config.name}.`);
+        this.connectionConfig = config; // Memorise configuration if connection succeed
+        this.status = 'connected';
+        this.config.debug && console.info(LogPrefix, `Successfully connected to ${config.name}.`);
     }
 
     private typeCast( field: mysql.Field, next: Function ) {
@@ -331,8 +336,11 @@ export default class DatabaseManager extends Service<DatabaseServiceConfig, THoo
         const startTime = Date.now();
         return this.connection.query(query).then(([rows, fields]) => {
 
-            if (opts.log !== false)
-                this.log(query, startTime);
+            this.sql.runHook('afterQuery', {
+                date: new Date(),
+                query: query.trim(),
+                time: Date.now() - startTime,
+            });
 
             return rows as unknown as TResult;
 
@@ -342,20 +350,4 @@ export default class DatabaseManager extends Service<DatabaseServiceConfig, THoo
 
         })
     }
-
-    private log( query: string, startTime: number ) {
-
-        const console = this.app.use<Console>('console');
-        if (!console) return;
-
-        const { channelType, channelId } = console.getChannel();
-        if (channelId !== 'admin')
-            console.sqlQueries.push({
-                channelType,
-                channelId,
-                date: new Date(),
-                query: query.trim(),
-                time: Date.now() - startTime,
-            });
-    }
 }

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

@@ -9,9 +9,8 @@ import dottie from 'dottie';
 const safeStringify = require('fast-safe-stringify'); // remplace les références circulairs par un [Circular]
 
 // Core: general
-import type Application from '@server/app';
-import Service from '@server/app/service';
-import { callableInstance } from '@common/data/objets';
+import { Application, Services } from '@server/app';
+import Service, { AnyService, TRegisteredServicesIndex } from '@server/app/service';
 import { NotFound } from '@common/errors';
 
 // Services
@@ -24,9 +23,7 @@ import type { TMetasTable } from './metas';
 
 export { default as Repository } from './repository';
 
-export type Config = {
-
-}
+export type Config = DatabaseServiceConfig
 
 export type Hooks = {
 
@@ -69,9 +66,6 @@ type TColsToUpsert<TData extends TObjetDonnees> = (
 
 const LogPrefix = '[database]'
 
-const equalities = (data: TObjetDonnees, keys = Object.keys(data)) => 
-    keys.map(k => '' + k + ' = ' + mysql.escape( data[k] ))
-
 /*----------------------------------
 - CORE
 ----------------------------------*/
@@ -82,23 +76,46 @@ export default class SQL extends Service<Config, Hooks, Application> {
 
     public database: Database;
 
-    public constructor( app: Application, config: DatabaseServiceConfig ) {
-        
-        super(app, {});
+    public constructor( 
+        parent: AnyService, 
+        config: Config,
+        drivers: TRegisteredServicesIndex,
+        app: Application, 
+    ) {
 
-        this.database = new Database(app, config);
+        super(parent, config, drivers, app);
+
+        this.database = new Database(this, config);
     }
 
-    public async register() {
-        await this.database.register();
+    public static createInstance(
+        parent: AnyService, 
+        config: Config,
+        services: TRegisteredServicesIndex,
+        app: Application
+    ) {
+        return Services.callableInstance(
+            new SQL(parent, config, services, app),
+            'sql'
+        )
     }
 
+    /*----------------------------------
+    - LIFECYCLE
+    ----------------------------------*/
+
     public async start() {
+
         await this.database.start();
+        
     }
 
-    public callableInstance() {
-        return callableInstance( this, 'sql' );
+    public async ready() {
+
+    }
+
+    public async shutdown() {
+
     }
 
     /*----------------------------------
@@ -191,7 +208,7 @@ export default class SQL extends Service<Config, Hooks, Application> {
 
                         const keyword = prefix === '&' ? ' AND ' : ', '
 
-                        value = Object.keys(value).length === 0 ? '1' : equalities(value).join( keyword );
+                        value = Object.keys(value).length === 0 ? '1' : this.equalities(value).join( keyword );
                         
                     // String: `SET :${column} = ${data}` => `SET balance = 10`
                     } else {
@@ -214,6 +231,9 @@ export default class SQL extends Service<Config, Hooks, Application> {
         }).join(' ').trim();
     }
 
+    public equalities = (data: TObjetDonnees, keys = Object.keys(data)) => 
+        keys.map(k => '' + k + ' = ' + mysql.escape( data[k] ))
+
     /*----------------------------------
     - OPERATIONS: LOW LEVELf
     ----------------------------------*/
@@ -336,8 +356,8 @@ export default class SQL extends Service<Config, Hooks, Application> {
         }
 
         // Create equalities
-        const egalitesData = equalities(data).join(', ')
-        const egalitesWhere = equalities(where).join(' AND ')
+        const egalitesData = this.equalities(data).join(', ')
+        const egalitesWhere = this.equalities(where).join(' AND ')
 
         // Build query
         return this.database.query(`
@@ -509,7 +529,7 @@ export default class SQL extends Service<Config, Hooks, Application> {
 
         const whereSql = typeof where === 'function' && where['string'] !== undefined
             ? where['string']
-            : equalities(where).join(' AND ');
+            : this.equalities(where).join(' AND ');
 
         return this.database.query(`DELETE FROM ${table} WHERE ${whereSql};`, opts);   
     }

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

@@ -4,10 +4,11 @@
 
 // Npm
 import fs from 'fs-extra';
+import path from 'path';
 import type mysql from 'mysql2/promise';
 
 // Core
-import Application from '@server/app';
+import Container from '@server/app/container';
 import { ucfirst } from '@common/data/chaines';
 
 // Database
@@ -120,13 +121,14 @@ export default class MySQLMetasParser {
     public constructor( 
         private database: DatabaseConnection,
         public app = database.app,
+        public debug = database.config.debug
     ) {
 
     }
 
     public async load( toLoad: string[] ) {
         
-        console.info(`${toLoad.length} databases to load`);
+        this.debug && console.info(`${toLoad.length} databases to load`);
         if (toLoad.length === 0)
             return {};
 
@@ -139,12 +141,12 @@ export default class MySQLMetasParser {
         if (this.app.env.profile === 'dev')
             this.genTypesDef(metas);
 
-        console.log(`Databases are loaded.`);
+            this.debug && console.log(`Databases are loaded.`);
         return metas;
     }
 
     private async query( databases: string[] ) {
-        console.log(`Loading tables metadatas for the following databases: ${databases.join(', ')} ...`);
+        this.debug && console.log(`Loading tables metadatas for the following databases: ${databases.join(', ')} ...`);
         return (await this.database.connection.query(`
             SELECT
 
@@ -170,7 +172,7 @@ export default class MySQLMetasParser {
 
     private importTables( dbColumns: TDatabaseColumn[] ): TDatabasesList {
 
-        console.log(`Processing ${dbColumns.length} rows of metadatas`);
+        this.debug && console.log(`Processing ${dbColumns.length} rows of metadatas`);
 
         const tablesIndex: TDatabasesList = {};
 
@@ -366,8 +368,11 @@ export default class MySQLMetasParser {
             }
         }
 
-        fs.outputFileSync( modelsTypesPath, types.join('\n') );
-        console.log(LogPrefix, `Wrote database types to ${modelsTypesPath}`);
+        fs.outputFileSync( 
+            path.join( Container.path.server.generated, 'models.ts'), 
+            types.join('\n') 
+        );
+        this.debug && console.log(LogPrefix, `Wrote database types to ${modelsTypesPath}`);
         
     }
 }

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

@@ -14,13 +14,4 @@ import type Database from '.';
 ----------------------------------*/
 export default class QueriesRepository {
 
-    public constructor( 
-        protected database: Database
-    ) {
-
-    }
-
-    protected sql( strings: TemplateStringsArray, ...data: any[] ) {
-        return this.database.sql(strings, ...data);
-    }
 }

package/src/server/services/database/service.json

@@ -0,0 +1,6 @@
+{
+    "id": "Core/Database/SQL",
+    "name": "SQL",
+    "parent": "app",
+    "dependences": []
+}