5htp-core 0.3.4 → 0.3.5

package/src/client/services/router/index.tsx

@@ -15,7 +15,9 @@ import type {
 import type { TBasicSSrData } from '@server/services/router/response';
 
 import BaseRouter, {
-    defaultOptions, TRoute, TErrorRoute, TClientOrServerContext, TRouteModule
+    defaultOptions, TRoute, TErrorRoute, 
+    TClientOrServerContext, TRouteModule,
+    buildUrl, TDomainsList
 } from '@common/router'
 import { getLayout } from '@common/router/layouts';
 import { getRegisterPageArgs, buildRegex } from '@common/router/register';
@@ -27,6 +29,7 @@ import type ClientApplication from '@client/app';
 import Service from '@client/app/service';
 
 // Specific
+import type { ClientContext } from '@/client/context';
 import ClientRequest from './request';
 import { location, history } from './request/history';
 import ClientResponse from './response';
@@ -122,7 +125,8 @@ type THookName = 'location.change' | 'page.changed'
 
 type Config<TAdditionnalContext extends {} = {}> = {
     preload: string[], // List of globs
-    context: (router: ClientRouter) => TAdditionnalContext
+    context: (context: ClientContext, router: ClientRouter) => TAdditionnalContext,
+    domains: TDomainsList
 }
 
 /*----------------------------------
@@ -134,8 +138,11 @@ export default class ClientRouter<
 > extends Service<Config<TAdditionnalContext>, ClientApplication> implements BaseRouter {
 
     // Context data
-    public context = window["ssr"] as (TBasicSSrData | undefined);
     public ssrRoutes = window["routes"] as TSsrUnresolvedRoute[];
+    public ssrContext = window["ssr"] as (TBasicSSrData | undefined);
+    public context!: ClientContext;
+
+    public setLoading!: React.Dispatch< React.SetStateAction<boolean> >;
 
     public constructor(app: TApplication, config: Config<TAdditionnalContext>) {
 
@@ -149,9 +156,13 @@ export default class ClientRouter<
         this.initialRender(currentRoute);
     }
 
+    public url = (path: string, params: {} = {}, absolute: boolean = true) => 
+        buildUrl(path, params, this.config.domains, absolute);
+
     public go( url: string ) {
+        url = this.url(url, {}, false);
         console.log( LogPrefix, "Go to", url);
-        history?.replace(url);
+        history?.replace( url );
     }
 
     /*----------------------------------
@@ -203,9 +214,9 @@ export default class ClientRouter<
             if (currentRoute === undefined) {
 
                 const isCurrentRoute = (
-                    this.context !== undefined
+                    this.ssrContext !== undefined
                     &&
-                    route.chunk === this.context.page.chunkId
+                    route.chunk === this.ssrContext.page.chunkId
                 );
 
                 if (isCurrentRoute) {
@@ -365,20 +376,18 @@ export default class ClientRouter<
 
         // Restituate SSR response
         let apiData: {} = {}
-        if (this.context) {
-
-            console.log("SSR Response restitution ...");
+        if (this.ssrContext) {
 
-            request.user = this.context.user || null;
+            request.user = this.ssrContext.user || null;
 
-            request.data = this.context.request.data;
+            request.data = this.ssrContext.request.data;
 
-            apiData = this.context.page.data || {};
+            apiData = this.ssrContext.page.data || {};
         }
 
         // Replacer api data par ssr data
 
-        const response = await this.createResponse(route, request, apiData)
+        const response = await this.createResponse(route, request, apiData);
 
         ReactDOM.hydrate((
             <App context={response.context} />

package/src/client/services/router/request/api.ts

@@ -39,7 +39,7 @@ export default class ApiClient implements ApiClientService {
     public constructor( 
         public app: ClientApplication, 
         public request: Request,
-        public router = request.router
+        public router = request.router,
     ) {
 
     }
@@ -66,30 +66,34 @@ export default class ApiClient implements ApiClientService {
     public delete = <TData extends unknown = unknown>(path: string, data?: TPostData, opts?: TApiFetchOptions) => 
         this.createFetcher<TData>('DELETE', path, data, opts);
 
-    
     public set( newData: TObjetDonnees ) {
 
-        console.log("[api] Update page data", newData);
-        if (this.app.page)
-            this.app.page.setAllData(curData => ({ ...curData, ...newData }));
-        
+        if (!('context' in this.router))
+            throw new Error("api.set is not available on server side.");
+
+        if (this.router.context.page)
+            this.router.context.page.setAllData(curData => ({ ...curData, ...newData }));
+        else
+            throw new Error(`[api] this.router.context.page undefined`)
     }
 
     public reload( ids?: string | string[], params?: TObjetDonnees ) {
+
+        if (!('context' in this.router))
+            throw new Error("api.set is not available on server side.");
         
-        if (this.app.page === undefined)
-            throw new Error("context.page is missing");
+        const page = this.router.context.page;
 
         if (ids === undefined)
-            ids = Object.keys(this.app.page.fetchers);
+            ids = Object.keys(page.fetchers);
         else if (typeof ids === 'string')   
             ids = [ids];
 
-        console.log("[api] Reload data", ids, params, this.app.page.fetchers);
+        console.log("[api] Reload data", ids, params, page.fetchers);
 
         for (const id of ids) {
 
-            const fetcher = this.app.page.fetchers[id];
+            const fetcher = page.fetchers[id];
             if (fetcher === undefined)
                 return console.error(`Unable to reload ${id}: Request not found in fetchers list.`);
 
@@ -169,12 +173,15 @@ export default class ApiClient implements ApiClientService {
     public configure = (...[method, path, data, options]: TFetcherArgs): AxiosRequestConfig => {
 
         const { onProgress, captcha } = options || {};
+
+        const url = this.router.url( path, {}, false );
     
-        debug && console.log(`[api] Sending request`, method, path, data);
+        debug && console.log(`[api] Sending request`, method, url, data);
     
+        // Create AXIOS config
         const config: AxiosRequestConfig = {
     
-            url: path,
+            url,
             method: method,
             headers: {
                 'Content-Type': "application/json",
@@ -192,6 +199,7 @@ export default class ApiClient implements ApiClientService {
     
         };
     
+        // Format request data
         if (data) {
             // URL params
             if (method === "GET") {

package/src/client/services/router/response/index.tsx

@@ -6,8 +6,8 @@
 import type ServerRouter from '@server/services/router';
 import type ServerResponse from '@server/services/router/response';
 
-import type { TRoute, TErrorRoute } from '@common/router';
-import BaseResponse from '@common/router/response';
+import type { TAnyRoute, TErrorRoute } from '@common/router';
+import BaseResponse, { TResponseData } from '@common/router/response';
 
 import type ClientApplication from '@client/app';
 import type { default as ClientRouter } from '@client/services/router'
@@ -15,7 +15,6 @@ import type ClientResponse from '@client/services/router/response'
 import ClientRequest from '@client/services/router/request'
 import ClientPage from '@client/services/router/response/page'
 import { history } from '@client/services/router/request/history';
-import CommonPage from '@common/router/response/page';
 
 /*----------------------------------
 - TYPES
@@ -34,12 +33,11 @@ export type TRouterContext<
     // ClientPage context
     {
         app: TApplication,
-        context: TRouterContext<TRouter, TApplication>,
         request: ClientRequest<TRouter>,
-        route: TRoute<TRouterContext>,
+        route: TAnyRoute<TRouterContext>,
         api: ClientRequest<TRouter>["api"],
         page: ClientPage<TRouter>,
-        user: User
+        data: TObjetDonnees
     }
     &
     // Expose client application services (api, socket, ...)
@@ -61,7 +59,7 @@ export default class ClientPageResponse<
 
     public constructor(
         public request: ClientRequest<TRouter>,
-        public route: TRoute | TErrorRoute,
+        public route: TAnyRoute | TErrorRoute,
 
         public app = request.app,
     ) {
@@ -76,22 +74,38 @@ export default class ClientPageResponse<
 
     private createContext(): TRouterContext<TRouter, TRouter["app"]> {
 
-        const context: TRouterContext<TRouter, TRouter["app"]> = {
+        const basicContext: TRouterContext<TRouter, TRouter["app"]> = {
+
             // App services (TODO: expose only services)
             ...this.request.app,
+
             // Router context
             app: this.app,
-            context: undefined as unknown as TRouterContext<TRouter, TRouter["app"]>,
             request: this.request,
             route: this.route,
             api: this.request.api,
+            // Will be assigned when the controller will be runned
+            page: undefined as unknown as ClientPage<TRouter>, 
+            data: {},
+        }
 
-            ...this.request.router.config.context( this.request.router )
+        const newContext: TRouterContext<TRouter, TRouter["app"]> = {
+            ...basicContext,
+            // Custom context
+            ...this.request.router.config.context( basicContext, this.request.router )
         }
 
-        context.context = context;
+        // Update context object if already exists
+        // NOTE: we don't create a nex instance of context because we don't want to rereder the full page (inc layout) to update the context given by thr react context provider
+        const existingContext = this.request.router.context;
+        if (existingContext === undefined) {
+
+            this.request.router.context = newContext
+
+        } else for(const key in newContext)
+            existingContext[ key ] = newContext[ key ];
 
-        return context;
+        return newContext
     }
 
     public async runController( additionnalData: {} = {} ): Promise<ClientPage> {

package/src/client/services/router/response/page.ts

@@ -45,7 +45,7 @@ export default class ClientPage<TRouter = ClientRouter> extends PageResponse<TRo
         this.context.page = this;
 
         // Data succesfully loaded
-        this.data = data || await this.fetchData();
+        this.context.data = this.data = data || await this.fetchData();
 
         return this;
     }

package/src/common/router/index.ts

@@ -107,10 +107,51 @@ export type TRouteModule<TRegisteredRoute = any> = {
     __register?: TAppArrowFunction<TRegisteredRoute> 
 }
 
+export type TDomainsList = {
+    [endpointId: string]: string
+} & {
+    current: string
+}
+
 export const defaultOptions = {
     priority: 0,
 }
 
+/*----------------------------------
+- FUNCTIONS
+----------------------------------*/
+export const buildUrl = (
+    path: string,
+    params: {} = {},
+    domains: TDomainsList,
+    absolute: boolean
+) => {
+
+    // Relative to domain
+    if (path[0] === '/' && absolute)
+        return domains.current + path;
+    // Other domains of the project
+    else if (path[0] === '@') {
+
+        // Extract domain ID from path
+        let domainId: string;
+        const slackPos = path.indexOf('/');
+        domainId = path.substring(1, slackPos);
+        path = path.substring(slackPos);
+
+        // Get domain
+        const domain = domains[ domainId ];
+        if (domain === undefined)
+            throw new Error("Unknown API endpoint ID: " + domainId);
+
+        // Return full url
+        return domain + path;
+
+    // Absolute URL
+    } else
+        return path;
+}
+
 /*----------------------------------
 - BASE ROUTER
 ----------------------------------*/

package/src/common/router/request/api.ts

@@ -72,6 +72,8 @@ export default abstract class ApiClient {
 
     public abstract delete<TData extends unknown = unknown>(path: string, data?: TObjetDonnees, opts?: TApiFetchOptions): TFetcher<TData>;
 
+    public abstract set( newData: TObjetDonnees );
+
     /*----------------------------------
     - LOW LEVEL
     ----------------------------------*/

package/src/common/router/response/index.ts

@@ -7,14 +7,14 @@ import { FunctionalComponent } from "preact";
 
 // Core
 import { TAnyRoute } from "..";
-import type ClientRequest from '@client/services/router';
+import type ClientRequest from '@client/services/router/request';
 import Page from '@client/services/router/response/page'
 
 /*----------------------------------
 - TYPES
 ----------------------------------*/
 
-type TResponseData = Page
+export type TResponseData = Page
 
 /*----------------------------------
 - CONTEXT

package/src/common/router/response/page.ts

@@ -35,6 +35,7 @@ export type TFrontRenderer<
         TAdditionnalData
         &
         {
+            context: TClientOrServerContext,
             data: {[key: string]: PrimitiveValue}
         }
     )

package/src/common/validation/validator.ts

@@ -10,6 +10,7 @@ import { InputError } from '@common/errors';
 
 // Specific
 import type { TValidateOptions } from './schema';
+import type { InputBaseProps } from '@client/components/inputv3/base';
 
 /*----------------------------------
 - TYPES
@@ -64,14 +65,23 @@ export const EXCLUDE_VALUE = "action:exclure" as const;
 /*----------------------------------
 - CLASS
 ----------------------------------*/
-export default class Validator<TValue, TOptions extends TValidator<TValue> = TValidator<TValue>> {
+export default class Validator<
+    TValue, 
+    TOptions extends TValidator<TValue> = TValidator<TValue>,
+    TComponent = React.FunctionComponent< InputBaseProps< TValue > >
+> {
 
     public constructor( 
         public type: string,
         public validateType: TValidationFunction<TValue>, 
-        public options: TOptions
+        public options: TOptions,
+        public componentAttributes: Partial<InputBaseProps<TValue>> = {}
     ) {
 
+        // Basic component attriutes
+        this.componentAttributes.required = options?.opt !== true;
+        //this.componentAttributes.validator = this;
+
     }
 
     public isEmpty = (val: any) => val === undefined || val === '' || val === null

package/src/common/validation/validators.ts

@@ -111,22 +111,22 @@ export default class SchemaValidators {
         })
     }
 
-    public choice = (values?: any[], opts: TValidator<any> & {} = {}) => 
+    public choice = (choices?: any[], opts: TValidator<any> & {} = {}) => 
         new Validator<any>('choice', (val, input, output) => {
 
             // Choice object
             if (typeof val === 'object' && ('value' in val) && typeof val.value !== 'object')
                 val = val.value;
 
-            if (values !== undefined) {
-                const isValid = values.some(v => v.value === val);
+            if (choices !== undefined) {
+                const isValid = choices.some(v => v.value === val);
                 if (!isValid)
-                    throw new InputError("Invalid value. Must be: " + values.map(v => v.value).join(', '));
+                    throw new InputError("Invalid value. Must be: " + choices.map(v => v.value).join(', '));
             }
 
             return val;
 
-        }, opts)
+        }, opts, { choices })
 
     /*----------------------------------
     - CHAINES

package/src/server/app/index.ts

@@ -165,7 +165,6 @@ export class Application<
     public async startServices() {
 
         const propsNames = Object.getOwnPropertyNames(this);
-        
         for (const propName of propsNames) {
 
             // Don't check services prop as it will trigger an error (it's a proxy)

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

@@ -41,6 +41,10 @@ export type StartedServicesIndex = {
     [serviceId: string]: AnyService
 }
 
+type TServiceUseOptions = {
+    optional?: boolean
+}
+
 /*----------------------------------
 - CONFIG
 ----------------------------------*/
@@ -147,7 +151,8 @@ export default abstract class Service<
         TSubServices extends TServiceClass["services"],
     >( 
         serviceId: TServiceId, 
-        subServices?: TSubServices
+        subServices?: TSubServices,
+        serviceUseOptions: TServiceUseOptions = {}
     ): (
         // We can't pass the services types as a generic to TServiceClass
         // So we overwrite the services property
@@ -164,8 +169,12 @@ export default abstract class Service<
 
         // Check of the service has been configurated
         const registered = ServicesContainer.registered[ serviceId ];
-        if (registered === undefined)
-            throw new Error(`Unable to use service "${serviceId}": This one hasn't been setup.`);
+        if (registered === undefined) { 
+            if (serviceUseOptions.optional)
+                return undefined;
+            else
+                throw new Error(`Unable to use service "${serviceId}": This one hasn't been setup.`);
+        }
 
         // Bind subservices
         if (subServices !== undefined)

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

@@ -137,8 +137,6 @@ export default class Console extends Service<Config, Hooks, Application, Service
 
     protected async start() {
 
-        return;
-
         const origLog = console.log
 
         this.logger = new Logger({
@@ -352,10 +350,10 @@ export default class Console extends Service<Config, Hooks, Application, Service
  
     public printHtml( logs: TJsonLog[], full: boolean = false ): string {
 
-        let html = logs.map( logEntry => logToHTML( logEntry, this )).join('\n');
+        let html = logs.map( logEntry => logToHTML( logEntry, this )).join('<br />');
 
         if (full) {
-            const consoleCss = `background: #000; padding: 20px; font-family: 'Fira Mono', 'monospace', 'Monaco'; font-size: 12px; line-height: 20px;`
+            const consoleCss = `background: #000; padding: 20px; font-family: 'Fira Mono', 'monospace', 'Monaco'; font-size: 12px; line-height: 20px;color: #aaa;`
             html = '<div style="' + consoleCss + '">' + html + '</div>';
         }
 

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

@@ -8,7 +8,7 @@ import express from 'express';
 import http from 'http';
 import https from 'https';
 import path from 'path';
-import cors from 'cors';
+import cors, { CorsOptions } from 'cors';
 //var serveStatic = require('serve-static')
 
 // Middlewares (npm)
@@ -52,7 +52,8 @@ export type Config = {
         styles?: string[],
         images?: string[],
         scripts: string[],
-    }
+    },
+    cors?: CorsOptions
 }
 
 export type Hooks = {
@@ -200,11 +201,8 @@ export default class HttpServer {
         - PAGES / API
         ----------------------------------*/
 
-        // TODO: Migrer dans app
-        //routes.use('/chrome', cors());
-        // TODO: Trouver une solution pour n'autoriser les requetes que depuis l'application & dopamyn.io
-        //      https://www.google.com/search?q=http+cors+from+android%7Cwindows%7Cdesktop%7Cmodile+app
-        //routes.use('/auth', cors());
+        if (this.config.cors !== undefined)
+            routes.use( cors( this.config.cors ));
 
         routes.use( csp.expressCspHeader({
             directives: {

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

@@ -24,7 +24,8 @@ import type DisksManager from '@server/services/disks';
 import { CoreError, NotFound } from '@common/errors';
 import BaseRouter, {
     TRoute, TErrorRoute, TRouteModule,
-    TRouteOptions, defaultOptions
+    TRouteOptions, defaultOptions,
+    buildUrl, TDomainsList
 } from '@common/router';
 import { buildRegex, getRegisterPageArgs } from '@common/router/register';
 import { layoutsList, getLayout } from '@common/router/layouts';
@@ -86,6 +87,8 @@ export type Config<
 
     disk?: string, // Disk driver ID
 
+    domains: TDomainsList,
+
     http: HttpServiceConfig
 
     context: (
@@ -114,7 +117,9 @@ export default class ServerRouter<
     TSubservices extends Services = Services
 > extends Service<Config, Hooks, Application, TSubservices> implements BaseRouter {
 
-    public disks = this.use('Core/Disks') as unknown as DisksManager;
+    public disks = this.use('Core/Disks', undefined, {
+        optional: true
+    }) as unknown as DisksManager | undefined;
     
     // Services
     public http: HTTP;
@@ -144,7 +149,6 @@ export default class ServerRouter<
 
         this.http = new HTTP(config.http, this);
         this.render = new DocumentRenderer(this);
-
     }
 
     /*----------------------------------
@@ -205,13 +209,8 @@ export default class ServerRouter<
         this.afterRegister();
     }
 
-    // TODO: Generate TS type of the routes list
-    public url<TRoutePath extends keyof Routes = keyof Routes>( 
-        path: TRoutePath, 
-        params: Routes[TRoutePath]["params"]
-    ) {
-        return this.http.publicUrl + path;
-    }
+    public url = (path: string, params: {} = {}, absolute: boolean = true) => 
+        buildUrl(path, params, this.config.domains, absolute);
 
     /*----------------------------------
     - REGISTER

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

@@ -47,6 +47,10 @@ export default class ApiClientRequest extends RequestService implements ApiClien
     public delete = <TData extends unknown = unknown>(path: string, data?: TObjetDonnees, opts?: TApiFetchOptions) => 
         this.createFetcher<TData>('DELETE', path, data, opts);
 
+    public set( newData: TObjetDonnees ) {
+        throw new Error("api.set is not available on server side.");
+    }
+
     /*----------------------------------
     - API CALLS FROM SERVER
     ----------------------------------*/
@@ -65,10 +69,11 @@ export default class ApiClientRequest extends RequestService implements ApiClien
 
         for (const id in fetchers) {
 
-            if (!fetchers[id])
+            const fetcher = fetchers[id]
+            if (!fetcher)
                 continue;
 
-            const { method, path, data, options } = fetchers[id];
+            const { method, path, data, options } = fetcher;
             //this.router.config.debug && console.log(`[api] Resolving from internal api`, method, path, data);
 
             // We don't fetch the already given data

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

@@ -31,7 +31,7 @@ const debug = true;
 export type TBasicSSrData = {
     request: { data: TObjetDonnees, id: string },
     page: { chunkId: string, data?: TObjetDonnees },
-    //user: User | null
+    user: User | null
 }
 
 export type TRouterContext<TRouter extends ServerRouter = ServerRouter> = (
@@ -245,17 +245,17 @@ export default class ServerResponse<
     }
 
     // TODO: https://github.com/adonisjs/http-server/blob/develop/src/Response/index.ts#L430
-    public async file( fichier: string ) {
+    public async file( filename: string ) {
 
         // Securité
-        if (fichier.includes('..'))
+        if (filename.includes('..'))
             throw new Forbidden("Disallowed");
 
         // // Force absolute path
-        // if (!fichier.startsWith( this.app.path.root ))
-        //     fichier = fichier[0] === '/'
-        //         ? this.app.path.root + '/bin' + fichier
-        //         : this.app.path.data + '/' + fichier;
+        // if (!filename.startsWith( this.app.path.root ))
+        //     filename = filename[0] === '/'
+        //         ? this.app.path.root + '/bin' + filename
+        //         : this.app.path.data + '/' + filename;
         // Disk not provided = file response disabled
         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.");
@@ -264,14 +264,15 @@ export default class ServerResponse<
         const disk = this.router.disks.get('default');
 
         // Verif existance
-        const fileExists = await disk.exists('data', fichier);
+        const fileExists = await disk.exists('data', filename);
         if (!fileExists) {
-            console.log("File " + fichier + " was not found.");
+            console.log("File " + filename + " was not found.");
             throw new NotFound();
         }
 
-        // envoi fichier
-        this.data = await disk.readFile('data', fichier, {});
+        // envoi filename
+        const file = await disk.readFile('data', filename, {});
+        this.data = file;
         return this.end();
     }
 
@@ -279,7 +280,7 @@ export default class ServerResponse<
 
         debug && console.log("[routeur][response] Redirect", url);
         this.statusCode = code;
-        this.headers['Location'] = url;
+        this.headers['Location'] = this.router.url( url );
         return this.end();
     }