5htp-core 0.5.9-1 → 0.5.9-2

package/client/components/Card/index.tsx

@@ -7,8 +7,7 @@ import React from 'react';
 import type { ComponentChild } from 'preact';
 
 // Core components
-import { Logo } from '@client/components';
-import { Link } from '@client/services/router';
+import { Logo, Link } from '@client/components';
 
 // Resources
 import './index.less';

package/client/index.ts

@@ -1,5 +1,6 @@
 import Application from '@/client';
 
 const app = new Application();
+app.app = app;
 
 app.start();

package/client/services/router/index.tsx

@@ -55,7 +55,6 @@ const LogPrefix = '[router]'
 
 // Client router can handle Client requests AND Server requests (for pages only)
 export type { default as ClientResponse, TRouterContext } from "./response";
-export { Link } from './components/Link';
 
 export type Router = ClientRouter | ServerRouter;
 

package/package.json

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

package/server/app/commands.ts

@@ -53,26 +53,7 @@ export default class CommandsManager extends Service<Config, Hooks, Application,
     public priority = 2 as 2;
 
     public commandsIndex: CommandsList = {}
-
-    /*----------------------------------
-    - LIFECYCLE
-    ----------------------------------*/
-
-    protected async start() {
-        
-    }
-
-    protected async ready() {
-
-    }
-
-    protected async shutdown() {
-
-    }
-
-    /*----------------------------------
-    - DEFINITIONS
-    ----------------------------------*/
+    
     public command<TArgs extends any[]>( 
         ...args: (
             [name: string, description: string, childrens: Command[]]

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

@@ -206,11 +206,6 @@ export default class Console {
         this.enableLogging(origLog);
     }
 
-    // Avoid to use lifecycle functions
-    protected async start() {}
-    public async ready() {}
-    public async shutdown() {}
-
     private enableLogging( origLog: typeof console.log ) {
 
         const minLogLevel = logLevels[this.config.level];

package/server/app/index.ts

@@ -7,7 +7,7 @@ import type express from 'express';
 
 // Core
 import AppContainer from './container';
-import ApplicationService, { StartedServicesIndex } from './service';
+import ApplicationService, { AnyService, StartedServicesIndex } from './service';
 import CommandsManager from './commands';
 import ServicesContainer, { 
     ServicesContainer as ServicesContainerClass, 
@@ -82,8 +82,12 @@ export abstract class Application<
     public debug: boolean = false;
     public launched: boolean = false;
 
-    protected abstract serviceNames: string[];
-    protected abstract servicesIdToName: { [serviceId: string]: string };
+    protected abstract registered: { 
+        [serviceId: string]: {
+            name: string,
+            start: () => AnyService
+        }
+    };
 
     /*----------------------------------
     - INIT
@@ -132,6 +136,8 @@ export abstract class Application<
         console.log("Core version", CORE_VERSION);
         const startTime = Date.now();
 
+        this.startServices();
+
         await this.ready();
         await this.runHook('ready');
 
@@ -151,16 +157,48 @@ export abstract class Application<
 
     }
 
+    private startServices() {
+
+        // Print services
+        console.log('----------------------------------');
+        console.log('- SERVICES');
+        console.log('----------------------------------');
+        const printService = (service, level: number = 0) => {
+
+            console.log('-' + '-'.repeat(level * 4), service.name, '(' + service.priority + ')');
+
+            if (service.subservices) for (const subservice of service.subservices)
+                printService(subservice, level + 1);
+        }
+        
+        // Satrt services
+        for (const serviceId in this.registered) {
+
+            const service = this.registered[serviceId];
+            printService(service, 0);
+            const instance = service.start();
+            this[service.name] = instance.getServiceInstance();
+        }
+    }
+
     protected async ready() {
 
-        console.info(`[boot] Prepare services`);
-        for (const serviceName of this.serviceNames) {
+        const processService = (service: AnyService) => {
 
-            const service = this[serviceName];
+            service.ready();
+            
+            // Subservices
+            for (const serviceId in service.services)
+                processService(service.services[serviceId]);
+        }
+
+        for (const serviceId in this.registered) {
 
-            if (typeof service.getServices === 'function')
-                service.services = service.getServices();
+            const registeredService = this.registered[serviceId];
+            const service = this[registeredService.name];
 
+            // TODO: move to router
+            //  Application.on('service.ready')
             const routes = service.__routes;
             if (routes) for (const route of routes) { 
 
@@ -182,7 +220,7 @@ export abstract class Application<
                 this.Router.controllers[ route.path ] = route;
             }
 
-            service.ready();
+            processService(service);
         }
     }
 

package/server/app/service/index.ts

@@ -110,7 +110,7 @@ export default abstract class Service<
         public config: TConfig,
         // Make this argument appear as instanciated sercices index
         // But actually, Setup.use returns a registered service, not yet launched
-        public getServices: TServicesIndex,
+        getServices: (instance: AnyService) => TServicesIndex,
         app: TApplication | 'self'
     ) {
 
@@ -120,6 +120,9 @@ export default abstract class Service<
         this.app = app === 'self'
             ? this as unknown as TApplication
             : app
+
+        if (typeof getServices === 'function')
+            this.services = getServices(this);
         
     }
 
@@ -143,11 +146,11 @@ export default abstract class Service<
 
     public use( serviceId: string ) {
 
-        const serviceName = this.app.servicesIdToName[serviceId];
-        if (serviceName === undefined)
-            throw new Error(`Service ${serviceName} not found.`);
+        const registeredService = this.app.registered[serviceId];
+        if (registeredService === undefined)
+            throw new Error(`Service ${registeredService} not found.`);
 
-        return this.app[ serviceName ];
+        return this.app[ registeredService.name ];
     }
 
     /*----------------------------------

package/server/services/auth/old.ts

@@ -13,7 +13,7 @@ type AuthResponse = {
 export default class {
 
 
-    protected async start() {
+    protected async ready() {
 
         // Google auth client
         if (this.config.google) {

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

@@ -37,9 +37,15 @@ export default class AuthenticationRouterService<
     - LIFECYCLE
     ----------------------------------*/
 
-    public users = this.services.users;
+    public users;
 
-    protected async start() {
+    public constructor(...args) {
+        super(...args);
+
+        this.users = this.services.users;
+    }
+
+    protected async ready() {
 
         // Decode current user
         this.parent.on('request', async (request: TRequest) => {
@@ -59,10 +65,6 @@ export default class AuthenticationRouterService<
         })
     }
 
-    protected async ready() {
-
-    }
-
     protected async shutdown() {
 
     }

package/server/services/cache/index.ts

@@ -96,16 +96,9 @@ export default class Cache extends Service<Config, Hooks, Application, Services>
     - LIFECYCLE
     ----------------------------------*/
 
-    protected async start() {
-
-        setInterval(() => this.cleanMem(), 10000);
-
-        // Restore persisted data
-        //await this.restore();
-    }
-
     public async ready() {
 
+        setInterval(() => this.cleanMem(), 10000);
     }
 
     public async shutdown() {

package/server/services/cron/index.ts

@@ -45,7 +45,7 @@ export default class CronManager extends Service<Config, Hooks, Application, Ser
     - LIFECICLE
     ----------------------------------*/
 
-    protected async start() {
+    public async ready() {
 
         clearInterval(CronManager.timer);
         CronManager.timer = setInterval(() => {
@@ -54,13 +54,6 @@ export default class CronManager extends Service<Config, Hooks, Application, Ser
                 CronManager.taches[id].run();
 
         }, 10000);
-    }
-  
-    public async ready() {
-  
-    }
-  
-    public async shutdown() {
   
     }
 

package/server/services/database/index.ts

@@ -98,7 +98,7 @@ export default class SQL extends Service<Config, Hooks, Application, Services> {
     public constructor( 
         parent: AnyService, 
         config: Config,
-        drivers: TRegisteredServicesIndex,
+        drivers: () => TRegisteredServicesIndex,
         app: Application, 
     ) {
 

package/server/services/database/stats.ts

@@ -77,8 +77,6 @@ export default class StatsService extends Service<TStatsServiceConfig> {
 
     }
 
-    protected async start() {}
-
     public async fetchStats<TDonnees extends TObjDonneesStats>(
         
         table: string, columns: (string | [string, string])[], {

package/server/services/disks/index.ts

@@ -4,7 +4,7 @@
 
 // Core
 import type { Application } from '@server/app';
-import Service, { AnyService } from '@server/app/service';
+import Service, { AnyService, TRegisteredServicesIndex } from '@server/app/service';
 
 // Specific
 import type Driver from './driver';
@@ -44,15 +44,20 @@ export default class DisksManager<
     - LIFECYCLE
     ----------------------------------*/
 
-    public async ready() {
+    public constructor( 
+        parent: AnyService, 
+        config: TConfig,
+        services: () => TRegisteredServicesIndex,
+        app: Application, 
+    ) {
+
+        super(parent, config, services, app);
 
         const drivers = this.services;
         
         if (Object.keys( drivers ).length === 0)
             throw new Error("At least one disk driver should be mounted.");
 
-        console.log('start disks service', Object.keys( drivers ), Object.keys( this.mounted ), Object.keys( this.services ));
-
         const defaultDisk = drivers[ this.config.default ];
         if (defaultDisk === undefined)
             console.log(`Default disk "${this.config.default as string}" not mounted.`);

package/server/services/email/transporter.ts

@@ -27,25 +27,5 @@ export type TBasicConfig = {
 export abstract class Transporter<TConfig extends TBasicConfig = TBasicConfig>
     extends Service<TConfig, {}, Application, {}> {
 
-    /*----------------------------------
-    - LIFECYCLE
-    ----------------------------------*/
-
-    protected async start() {
-        
-    }
-
-    protected async ready() {
-
-    }
-
-    protected async shutdown() {
-
-    }
-
-    /*----------------------------------
-    - ACTIONS
-    ----------------------------------*/
-
     public abstract send( emails: TCompleteEmail[] ): Promise<void>;
 }

package/server/services/prisma/index.ts

@@ -37,19 +37,6 @@ export type Services = {
 export default class ModelsManager extends Service<Config, Hooks, Application, Services> {
 
     public client = new PrismaClient();
-
-    /*----------------------------------
-    - LIFECICLE
-    ----------------------------------*/
-
-    protected async start() {
-
-        
-    }
-  
-    public async ready() {
-  
-    }
   
     public async shutdown() {
         await this.client.$disconnect()

package/server/services/router/index.ts

@@ -147,7 +147,7 @@ export default class ServerRouter<
     public constructor( 
         parent: AnyService, 
         config: Config,
-        services: TSubservices,
+        services: () => TSubservices,
         app: Application, 
     ) {
 
@@ -174,8 +174,8 @@ export default class ServerRouter<
          // Use require to avoid circular references
          this.registerRoutes([
             ...require("metas:@/server/routes/**/*.ts"),
-            ...require("metas:@/client/pages/**/*.tsx"),
-            ...require("metas:@client/pages/**/*.tsx")
+            ...require("metas:@/client/pages/**/([a-z0-9]*).tsx"),
+            ...require("metas:@/client/pages/**/([a-z0-9]*).tsx")
         ]);
 
         // Start HTTP server
@@ -192,7 +192,6 @@ export default class ServerRouter<
     ----------------------------------*/
 
     private registerRoutes(defModules: GlobImportedWithMetas<TRouteModule>) {
-
         for (const routeModule of defModules) {
 
             const register = routeModule.exports.__register;

package/server/services/router/request/api.ts

@@ -21,10 +21,6 @@ import ApiClientService, {
 ----------------------------------*/
 export default class ApiClientRequest extends RequestService implements ApiClientService {
 
-    protected async start() {
-
-    }
-
     /*----------------------------------
     - HIGH LEVEL
     ----------------------------------*/
@@ -66,9 +62,8 @@ export default class ApiClientRequest extends RequestService implements ApiClien
     public createFetcher<TData extends unknown = unknown>(...[method, path, data, options]: TFetcherArgs): TFetcher<TData> {
         return { 
             method, path, data, options,
-            then: () => { throw new Error("Async resolvers should not be run from server side."); },
-            run: () => { throw new Error("Async resolvers should not be run from server side."); },
-        };
+            // We don't put the then and catch methods so the api consumer on server side will know it's a fetcher and not a promize to wait
+        } as TFetcher<TData>;
     }
 
     public async fetchSync(fetchers: TFetcherList, alreadyLoadedData: {}): Promise<TObjetDonnees> {

package/server/services/socket/index.ts

@@ -72,7 +72,7 @@ export default class WebSocketCommander<
     ----------------------------------*/
 
     public loading: Promise<void> | undefined = undefined;
-    protected async start() {
+    protected async ready() {
 
         this.users.on('disconnect', async (userId: string) => {
             this.disconnect(userId, 'Logout');
@@ -120,10 +120,6 @@ export default class WebSocketCommander<
         console.info(`Socket commander bound to http server.`);
     }
 
-    public async ready() {
-
-    }
-
     public async shutdown() {
         this.closeAll();
     }

package/types/global/utils.d.ts

@@ -55,6 +55,51 @@ declare type Routes = {
 
 declare type PrimitiveValue = string | number | boolean;
 
+/*----------------------------------
+- COPY FROM CLI/APP/INDEX.TS
+----------------------------------*/
+
+type TEnvConfig = {
+    name: 'local' | 'server',
+    profile: 'dev' | 'prod',
+    version: string,
+}
+
+type TServiceSetup = {
+    id: string,
+    name: string,
+    config: {},
+    subservices: TServiceSubservices
+}
+
+type TServiceRef = {
+    refTo: string
+}
+
+type TServiceSubservices = {
+    [key: string]: TServiceSetup | TServiceRef
+}
+
 declare module '@cli/app' {
-    export const app: 'test';
+    type App = {
+
+        env: TEnvConfig;
+
+        use: (referenceName: string) => TServiceRef;
+
+        setup: (...args: [
+            // { user: app.setup('Core/User') }
+            servicePath: string,
+            serviceConfig?: {},
+            serviceSubservices?: TServiceSubservices
+        ] | [
+            // app.setup('User', 'Core/User')
+            serviceName: string, 
+            servicePath: string,
+            serviceConfig?: {},
+            serviceSubservices?: TServiceSubservices
+        ]) => TServiceSetup;
+    }
+    const app: App;
+    export = app;
 }

package/types/icons.d.ts

@@ -1 +1 @@
-export type TIcones = "solid/spinner-third"|"at"|"bell"|"times-circle"|"info-circle"|"check-circle"|"exclamation-circle"|"times"|"map-marker-alt"|"bullhorn"|"angle-down"|"search"|"check"|"eye"|"trash"|"meh-rolling-eyes"|"arrow-left"|"arrow-right"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"code"|"link"|"unlink"|"pen"|"file"|"font"|"empty-set"|"horizontal-rule"|"page-break"|"image"|"table"|"poll"|"columns"|"sticky-note"|"caret-right"|"plus"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"
+export type TIcones = "long-arrow-right"|"times"|"solid/spinner-third"|"sack-dollar"|"bell"|"bullseye"|"project-diagram"|"user-friends"|"eye"|"lock"|"comments"|"phone"|"chalkboard-teacher"|"chart-bar"|"at"|"arrow-right"|"rocket"|"magnet"|"search"|"file-excel"|"plus-circle"|"plus"|"user-plus"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"map-marker"|"link"|"industry"|"users"|"calendar-alt"|"file-invoice"|"binoculars"|"brands/linkedin"|"lightbulb"|"long-arrow-left"|"key"|"user"|"building"|"briefcase"|"times-circle"|"suitcase"|"brands/linkedin-in"|"phone-plus"|"envelope"|"home-alt"|"planet-ringed"|"user-circle"|"crosshairs"|"comments-alt"|"paper-plane"|"user-shield"|"shield-alt"|"chart-line"|"money-bill-wave"|"star"|"file-alt"|"angle-up"|"angle-down"|"solid/crown"|"brands/discord"|"pen"|"file"|"info-circle"|"check-circle"|"exclamation-circle"|"check"|"meh-rolling-eyes"|"arrow-left"|"trash"|"solid/star"|"solid/star-half-alt"|"regular/star"|"chevron-left"|"cog"|"power-off"|"usd-circle"|"trophy"|"bars"|"chevron-right"|"edit"|"map-marker-alt"|"clock"|"arrow-to-bottom"|"ellipsis-h"|"question-circle"|"play"|"minus-circle"|"plane-departure"|"wind"|"external-link"|"ban"|"heart"|"calendar-check"|"unlink"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"code"|"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"