5htp-core 0.6.2-99 → 0.6.3-1

package/client/services/router/index.tsx

@@ -17,7 +17,7 @@ import type { TBasicSSrData } from '@server/services/router/response';
 import BaseRouter, {
     defaultOptions, TRoute, TErrorRoute, 
     TClientOrServerContextForPage, TRouteModule,
-    matchRoute, buildUrl, TDomainsList
+    matchRoute, buildUrl
 } from '@common/router'
 import { getLayout } from '@common/router/layouts';
 import { getRegisterPageArgs, buildRegex } from '@common/router/register';

package/common/data/dates.ts

@@ -134,6 +134,9 @@ const units: {[name: string]: TUnit} = {
 
 export function ago(date: Date | string, { min, max }: { min?: string, max?: string } = {}): string {
 
+    if (!date)
+        return '-';
+
     if (typeof date === 'string')
         date = new Date(date);
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.6.2-99",
+	"version": "0.6.3-1",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",

package/server/app/container/config.ts

@@ -12,7 +12,8 @@ import fs from 'fs-extra';
 import yaml from 'yaml';
 
 // Types
-import type { Config as TConsoleConfig } from './console';
+import type { TDomainsList } from '@common/router';
+import type { TLogProfile } from './console';
 
 /*----------------------------------
 - TYPES
@@ -29,12 +30,50 @@ declare global {
     }
 }
 
+/*
+    name: server
+    profile: prod
+
+    router:
+        port: 80
+        domains:
+            current: 'https://recruiters.becrosspath.com'
+            recruiters: 'https://recruiters.becrosspath.com'
+            landing: 'https://becrosspath.com'
+            employers: 'https://employers.becrosspath.com'
+            candidates: 'https://candidates.becrosspath.com'
+            csm: 'https://csm.becrosspath.com'
+
+    database:
+        name: 'aws'
+        databases: [railway]
+        host: 'mysql-z7vp.railway.internal'
+        port: 3306
+        login: root
+        password: "GMnVsczoyYkyzwvVqDkMUOAIjVsumEev"
+
+    console:
+        enable: false
+        debug: false
+        bufferLimit: 10000
+        level: 'log'
+*/
+
 export type TEnvName = TEnvConfig["name"];
 export type TEnvConfig = {
     name: 'local' | 'server',
-    profile: 'dev' | 'prod',
-    version: string,
-    console: TConsoleConfig
+    profile: 'dev' | 'testing' | 'prod',
+    
+    router: {
+        port: number,
+        domains: TDomainsList
+    },
+    console: {
+        enable: boolean,
+        debug: boolean,
+        bufferLimit: number,
+        level: TLogProfile,
+    },
 }
 
 type AppIdentityConfig = {

package/server/app/container/console/index.ts

@@ -27,7 +27,7 @@ import { SqlError } from '@server/services/database/debug';
 - SERVICE CONFIG
 ----------------------------------*/
 
-type TLogProfile = 'silly' | 'info' | 'warn' | 'error'
+export type TLogProfile = 'silly' | 'info' | 'warn' | 'error'
 
 export type Config = {
     debug?: boolean,

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

@@ -10,10 +10,12 @@ import {
     RouterService
 } from '@server/services/router';
 
+import type { Application } from '@server/app';
+
 import type { TRouterServiceArgs } from '@server/services/router/service';
 
 // Specific
-import type { default as UsersService, TUserRole } from '..';
+import type { default as UsersService, TUserRole, TBasicUser } from '..';
 import UsersRequestService from './request';
 
 /*----------------------------------
@@ -31,7 +33,7 @@ const LogPrefix = '[router][auth]';
 - SERVICE
 ----------------------------------*/
 export default class AuthenticationRouterService<
-    TUser extends {} = {},
+    TUser extends TBasicUser = TBasicUser,
     TRequest extends ServerRequest<Router> = ServerRequest<Router>,
 > extends RouterService {
 
@@ -39,7 +41,7 @@ export default class AuthenticationRouterService<
     - LIFECYCLE
     ----------------------------------*/
 
-    public users: UsersService;
+    public users: UsersService<TUser, Application>;
 
     public constructor(...args: TRouterServiceArgs) {
         super(...args);

package/server/services/database/connection.ts

@@ -36,7 +36,6 @@ type ConnectionConfig = {
 
 export type DatabaseServiceConfig = {
     debug: boolean,
-    connections: ConnectionConfig[],
     connectionsLimit: number
 }
 
@@ -66,6 +65,9 @@ export type TQueryResult = TSelectQueryResult;
 // TODO: specifiy return type of every mysql query type
 type TSelectQueryResult = any;
 
+const DATABASE_URL = process.env.DATABASE_URL;
+if (!DATABASE_URL) throw new Error("Missing env var: DATABASE_URL");
+
 /*----------------------------------
 - SERVICES
 ----------------------------------*/
@@ -99,14 +101,12 @@ export default class DatabaseManager {
 
         // Try to connect to one of the databases
         const connectionErrors: string[] = []
-        for (const connectionConfig of this.config.connections){
-            try {
-                await this.connect(connectionConfig)
-                break;
-            } catch (error) {
-                this.config.debug && console.warn(LogPrefix, `Failed to connect to ${connectionConfig.name}: ` + error);
-                connectionErrors.push(connectionConfig.name + ': ' + error);
-            }
+
+        try {
+            await this.connect()
+        } catch (error) {
+            this.config.debug && console.warn(LogPrefix, `Failed to connect to database: ` + error);
+            connectionErrors.push('database: ' + error);
         }
 
         // Coudnt connect to any database
@@ -127,17 +127,31 @@ export default class DatabaseManager {
     /*----------------------------------
     - INIT
     ----------------------------------*/
-    public async connect(config: ConnectionConfig) {
+    public async connect() {
+
+
+        const u = new URL(DATABASE_URL as string);
+        const connectionConfig = {
+            name: u.hostname,
+            databases: [u.pathname.replace(/^\//, "")],
+            host: u.hostname,
+            port: u.port ? Number(u.port) : 3306,
+            login: decodeURIComponent(u.username),
+            password: decodeURIComponent(u.password),
+        }
+
+        console.log('connectionConfig', connectionConfig);
+        
 
-        this.config.debug && console.info(LogPrefix, `Trying to connect to ${config.name} ...`);
+        this.config.debug && console.info(LogPrefix, `Trying to connect to database...`, connectionConfig);
         this.connection = mysql.createPool({
 
             // Identification
-            host: config.host,
-            port: config.port,
-            user: config.login,
-            password: config.password,
-            database: config.databases[0],
+            host: connectionConfig.host,
+            port: connectionConfig.port,
+            user: connectionConfig.login,
+            password: connectionConfig.password,
+            database: connectionConfig.databases[0],
 
             // Pool
             waitForConnections: true,
@@ -164,10 +178,10 @@ export default class DatabaseManager {
             }
         })
 
-        this.tables = await this.metas.load( config.databases );
-        this.connectionConfig = config; // Memorise configuration if connection succeed
+        this.tables = await this.metas.load(connectionConfig.databases);
+        this.connectionConfig = connectionConfig; // Memorise configuration if connection succeed
         this.status = 'connected';
-        this.config.debug && console.info(LogPrefix, `Successfully connected to ${config.name}.`);
+        this.config.debug && console.info(LogPrefix, `Successfully connected to database.`);
     }
 
     private typeCast( field: mysql.Field, next: Function ) {

package/server/services/email/index.ts

@@ -174,7 +174,7 @@ export default abstract class Email<TConfig extends Config>
         console.info(LogPrefix, `Sending ${emailsToSend.length} emails:`, emailsToSend[0].subject);
 
         // Pas d'envoi d'email quand local
-        if (this.app.env.name === 'local' && this.config.simulateWhenLocal === true) {
+        if (this.app.env.profile !== 'prod' && this.config.simulateWhenLocal === true) {
             console.log(LogPrefix, `Simulate email sending:\n`, emailsToSend[0].html);
             return;
         } else if (emailsToSend.length === 0) {

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

@@ -48,11 +48,11 @@ export type TRouterContext<TRouter extends TServerRouter> = (
         response: ServerResponse<TRouter>,
         route: TRoute,
         page?: Page,
-        user: TBasicUser,
 
         Router: TRouter,
     }
     & TRouterContextServices<TRouter>
+    //& TRouterRequestContext<TRouter>
 )
 
 export type TRouterContextServices< 
@@ -68,6 +68,10 @@ export type TRouterContextServices<
     }
 )
 
+export type TRouterRequestContext< 
+    TRouter extends TServerRouter
+> = ReturnType<TRouter["config"]["context"]>
+
 
 /*----------------------------------
 - CLASSE

package/types/global/utils.d.ts

@@ -63,11 +63,29 @@ declare type PrimitiveValue = string | number | boolean;
 - COPY FROM CLI/APP/INDEX.TS
 ----------------------------------*/
 
-type TEnvConfig = {
+/*type TEnvConfig = {
     name: 'local' | 'server',
-    profile: 'dev' | 'prod',
-    version: string,
-}
+    profile: 'dev' | 'testing' | 'prod',
+    
+    router: {
+        port: number,
+        domains: TDomainsList
+    },
+    database: {
+        name: string,
+        databases: string[],
+        host: string,
+        port: number,
+        login: string,
+        password: string,
+    },
+    console: {
+        enable: boolean,
+        debug: boolean,
+        bufferLimit: number,
+        level: TLogProfile,
+    },
+}*/
 
 type TServiceSetup = {
     id: string,

package/types/icons.d.ts

@@ -1 +1 @@
-export type TIcones = "solid/spinner-third"|"rocket"|"user-circle"|"brands/linkedin"|"play"|"stop"|"trash"|"times"|"at"|"star"|"plus"|"minus"|"magnet"|"paper-plane"|"search"|"check"|"plus-circle"|"regular/shield-check"|"angle-down"|"clock"|"cog"|"ellipsis-h"|"long-arrow-right"|"lightbulb"|"long-arrow-left"|"phone"|"arrow-right"|"plane-departure"|"comments-alt"|"user-shield"|"shield-alt"|"chart-line"|"money-bill-wave"|"link"|"file-alt"|"solid/crown"|"eye"|"pen"|"file"|"envelope"|"angle-up"|"user-plus"|"sack-dollar"|"info-circle"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"download"|"brands/google"|"brands/whatsapp"|"crown"|"check-circle"|"exclamation-circle"|"times-circle"|"arrow-left"|"key"|"building"|"briefcase"|"map-marker-alt"|"graduation-cap"|"solid/check-circle"|"solid/exclamation-triangle"|"solid/times-circle"|"hourglass"|"angle-left"|"angle-right"|"broom"|"question-circle"|"coin"|"coins"|"plug"|"arrow-to-bottom"|"external-link"|"magic"|"minus-circle"|"user"|"meh-rolling-eyes"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"code"|"unlink"|"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"
+export type TIcones = "solid/spinner-third"|"rocket"|"user-circle"|"search"|"long-arrow-right"|"lightbulb"|"long-arrow-left"|"magnet"|"at"|"phone"|"brands/linkedin"|"arrow-right"|"times"|"star"|"plus"|"minus"|"trash"|"paper-plane"|"play"|"stop"|"plus-circle"|"clock"|"cog"|"ellipsis-h"|"regular/shield-check"|"angle-down"|"check"|"angle-up"|"plane-departure"|"comments-alt"|"user-shield"|"shield-alt"|"chart-line"|"money-bill-wave"|"link"|"file-alt"|"solid/crown"|"eye"|"pen"|"file"|"user-plus"|"sack-dollar"|"info-circle"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"envelope"|"download"|"brands/google"|"brands/whatsapp"|"crown"|"check-circle"|"exclamation-circle"|"times-circle"|"arrow-left"|"key"|"broom"|"angle-left"|"angle-right"|"solid/check-circle"|"solid/exclamation-triangle"|"solid/times-circle"|"hourglass"|"building"|"briefcase"|"map-marker-alt"|"graduation-cap"|"coins"|"plug"|"coin"|"question-circle"|"arrow-to-bottom"|"external-link"|"minus-circle"|"magic"|"user"|"meh-rolling-eyes"|"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"