5htp-core 0.3.1-1 → 0.3.1-2

package/package.json

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

package/src/server/app/index.ts

@@ -4,9 +4,13 @@
 
 // Core
 import AppContainer from './container';
-import ApplicationService, { AnyService } from './service';
+import ApplicationService, { StartedServicesIndex } from './service';
 import CommandsManager from './commands';
-import ServicesContainer, { TRegisteredService, TServiceMetas } from './service/container';
+import ServicesContainer, { 
+    ServicesContainer as ServicesContainerClass, 
+    TRegisteredService, 
+    TServiceMetas 
+} from './service/container';
 import type { ServerBug } from '../services/console';
 
 // Built-in
@@ -49,7 +53,12 @@ export const Service = ServicesContainer;
 /*----------------------------------
 - FUNCTIONS
 ----------------------------------*/
-export class Application extends ApplicationService<Config, Hooks, /* TODO: this ? */Application, {}> {
+export class Application<
+    TServicesContainer extends ServicesContainerClass = ServicesContainerClass
+> extends ApplicationService<Config, Hooks, /* TODO: this ? */Application, {}> {
+
+    public app!: this;
+    public servicesContainer!: TServicesContainer;
 
     /*----------------------------------
     - PROPERTIES

package/src/server/app/service/container.ts

@@ -53,7 +53,7 @@ export class ServicesContainer<
     public registered: TRegisteredServicesIndex = {}
 
     // All service instances by service id
-    public allServices: {[serviceId: string]: AnyService} = {}
+    public allServices: TServicesIndex = {} as TServicesIndex
 
     public setup<TServiceId extends keyof TServicesIndex>( 
         serviceId: keyof TServicesIndex, 

package/src/server/app/service/index.ts

@@ -12,7 +12,8 @@ import ServicesContainer from './container';
 - TYPES: OPTIONS
 ----------------------------------*/
 
-export type AnyService = Service<{}, {}, Application, {}>
+export type AnyService<TSubServices extends StartedServicesIndex = StartedServicesIndex> = 
+    Service<{}, {}, Application, TSubServices>
 
 type TServiceConfig = {
     debug?: boolean
@@ -40,6 +41,12 @@ export type StartedServicesIndex = {
     [serviceId: string]: AnyService
 }
 
+type ClassType<T = {}> = new (...args: any[]) => T;
+
+type ServiceWithSubservices<TService extends ClassType<AnyService>, TSubservices extends StartedServicesIndex> = {
+    new (...args: any[]): TService & { services: TSubservices }
+  };
+
 /*----------------------------------
 - CONFIG
 ----------------------------------*/
@@ -140,10 +147,21 @@ export default abstract class Service<
     // this.use immediatly instanciate the subservice for few reasons:
     // - The subservice instance can be accesses from another service in the constructor, no matter the order of loading of the services
     // - Consistency: the subserviuce proprties shouldn't be assogned to two different values according depending on the app lifecycle
-    public use<TServiceId extends keyof TServicesIndex>( 
+    public use<
+        TInstalledServices extends this["app"]["servicesContainer"]["allServices"],
+        TServiceId extends keyof TInstalledServices,
+        TServiceClass extends TInstalledServices[TServiceId],
+        TSubServices extends TServiceClass["services"],
+    >( 
         serviceId: TServiceId, 
-        // TODO: Only subservices types supported by the parent service
-        subServices: TServicesIndex[TServiceId]["services"] = {}
+        subServices?: TSubServices
+    ): (
+        {
+            new (...args: any[]): TServiceClass & { services: TSubServices }
+        }
+        /*Omit<TServiceClass, 'services'> & {
+            services: TSubServices
+        }*/
     ) {
 
         // Check of the service has been configurated
@@ -152,7 +170,7 @@ export default abstract class Service<
             throw new Error(`Unable to use service "${serviceId}": This one hasn't been setup.`);
 
         // Bind subservices
-        registered.subServices = subServices;
+        registered.subServices = subServices || {};
 
         // Check if not already instanciated
         const existing = ServicesContainer.allServices[ serviceId ];
@@ -176,7 +194,7 @@ export default abstract class Service<
         return service;
     }
 
-    protected bindService( localName: string, service: AnyService ) {
+    public bindService( localName: string, service: AnyService ) {
 
         const serviceScope = this.constructor.name + '.' + localName;
 
@@ -196,7 +214,7 @@ export default abstract class Service<
         
     }
 
-    protected async startService( localName: string, service: AnyService ) {
+    public async startService( localName: string, service: AnyService ) {
         // Service already started
         if (!service.started) {
 

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

@@ -121,6 +121,7 @@ export const mysqlToJs = {
 
     // Strings
     'VARCHAR': 'string',
+    'BLOB': 'string',
     'CHAR': 'string',
     'VAR_STRING': 'string',
     'LONGTEXT': 'string',

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

@@ -5,7 +5,6 @@
 // Core
 import type { Application } from '@server/app';
 import Service, { AnyService } from '@server/app/service';
-import type { TRegisteredServicesIndex } from '@server/app/service/container';
 
 // Specific
 import type Driver from './driver';
@@ -25,7 +24,7 @@ export type Hooks = {
 }
 
 export type Services = {
-
+    [diskId: string]: Driver
 }
 
 /*----------------------------------

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

@@ -225,7 +225,7 @@ export default class HttpServer {
         // Impossible donc de créer un serveur http ici, on le fera dans start.js
         console.info("Lancement du serveur web");
         this.http.listen(this.config.port, () => {
-            console.info(`Serveur web démarré sur ${this.publicUrl}`);
+            console.info(`Web server ready on ${this.publicUrl}`);
         });
 
     }

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

@@ -95,8 +95,6 @@ export type Config<
 }
 
 export type Services = {
-    disks?: DisksManager
-} & {
     [routerServiceId: string]: RouterService
 }
 
@@ -113,14 +111,15 @@ export type Hooks = {
 - CLASSE
 ----------------------------------*/
 export default class ServerRouter<
-    TConfig extends Config = Config,
-    TApplication extends Application = Application
-> extends Service<TConfig, Hooks, TApplication, Services> implements BaseRouter {
+    TSubservices extends Services = Services
+> extends Service<Config, Hooks, Application, TSubservices> implements BaseRouter {
 
+    public disks = this.use('Core/Disks') as unknown as DisksManager;
+    
     // Services
     public http: HTTP;
     public render: DocumentRenderer<this>;
-    protected routerServices: {[serviceId: string]: RouterService} = {}
+    protected routerServices: TSubservices = {} as TSubservices
 
     // Indexed
     public routes: TRoute[] = []; // API + pages front front
@@ -133,9 +132,9 @@ export default class ServerRouter<
 
     public constructor( 
         parent: AnyService, 
-        config: TConfig,
+        config: Config,
         services: Services,
-        app: TApplication, 
+        app: Application, 
     ) {
 
         super(parent, config, services, app);

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

@@ -242,11 +242,11 @@ export default class ServerResponse<
         //         ? this.app.path.root + '/bin' + fichier
         //         : this.app.path.data + '/' + fichier;
         // Disk not provided = file response disabled
-        if (this.router.services.disks === undefined)
+        if (this.router.disks === undefined)
             throw new Anomaly("Router: Unable to return file response in router, because no disk has been given in the router config.");
 
         // Retirve disk driver
-        const disk = this.router.services.disks.get('default');
+        const disk = this.router.disks.get('default');
 
         // Verif existance
         const fileExists = await disk.exists('data', fichier);

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

@@ -14,7 +14,6 @@ import RequestValidator, { TConfig } from '../request';
 - TYPES
 ----------------------------------*/
 
-type TRouterWithSchema<TAuthService extends SchemaRouterService> = Router<RouterConfig<{ auth: TAuthService }>>
 
 /*----------------------------------
 - SERVICE
@@ -43,7 +42,7 @@ export default class SchemaRouterService<
     - ROUTER SERVICE LIFECYCLE
     ----------------------------------*/
 
-    public requestService( request: ServerRequest< TRouterWithSchema<this>> ): RequestValidator {
+    public requestService( request: ServerRequest ): RequestValidator {
         return new RequestValidator( request, this.config );
     }
 }