5htp-core 0.3.6-9 → 0.3.7-1

package/package.json

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

package/src/client/assets/css/utils/layouts.less

@@ -130,6 +130,20 @@
     &.sep-1 > * + * { border-top: solid 1px var(--cLine); }
 
     > .col-1 { align-self: stretch; }
+
+    &.unibody {
+
+        gap: 0;
+        
+        > :not(:first-child) {
+            border-top-left-radius: 0;
+            border-top-right-radius: 0;
+        }
+        > :not(:last-child) {
+            border-bottom-left-radius: 0;
+            border-bottom-right-radius: 0;
+        }
+    }
 }
 
 .row, 

package/src/client/components/Table/index.tsx

@@ -23,7 +23,7 @@ export type Props<TRow> = {
     columns: (row: TRow, rows: TRow[], index: number) => TColumn[];
 
     setData?: (rows: TRow[]) => void,
-    empty?: ComponentChild,
+    empty?: ComponentChild | false,
     className?: string,
 
     actions?: TAction<TRow>[]
@@ -40,15 +40,17 @@ export type TColumn = {
 - COMPOSANTS
 ----------------------------------*/
 export default function Liste<TRow extends TDonneeInconnue>({
-    data: rows, setData, empty ,
+    data: rows, setData, empty,
     columns, actions, ...props
 }: Props<TRow>) {
 
     if (rows.length === 0)
-        return (
-            <div class="card pd-2 col al-center">
-                <i src="meh-rolling-eyes" class="xl" />
-                Uh ... No rows here.
+        return empty === false ? null : (
+            <div class="pd-2 col al-center">
+                {empty || <>
+                    <i src="meh-rolling-eyes" class="xl" />
+                    Uh ... No rows here.
+                </>}
             </div>
         );
 

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

@@ -12,7 +12,7 @@ import ApiClientService, {
     TApiFetchOptions, TFetcherList, TFetcherArgs, TFetcher,
     TDataReturnedByFetchers
 } from '@common/router/request/api';
-import { instancierViaCode, NetworkError } from '@common/errors';
+import { viaHttpCode, NetworkError } from '@common/errors';
 import type ClientApplication from '@client/app';
 
 import { toMultipart } from './multipart';
@@ -233,7 +233,7 @@ export default class ApiClient implements ApiClientService {
                 if (e.response !== undefined) {
     
                     console.warn(`[api] Failure:`, e);
-                    throw instancierViaCode(
+                    throw viaHttpCode(
                         e.response.status || 500,
                         e.response.data
                     );

package/src/common/errors/index.ts

@@ -169,12 +169,13 @@ export class NetworkError extends Error {
 }
 
 
-export const instancierViaCode = (
+export const viaHttpCode = (
     code: number, 
     message?: string | TListeErreursSaisie, 
     details?: TDetailsErreur
 ): CoreError => {
 
+    // TODO: more reliablme detection of form errors
     if (typeof message === 'object')
         return new InputErrorSchema(message, details);
 

package/src/common/validation/validators.ts

@@ -145,11 +145,13 @@ export default class SchemaValidators {
     /*----------------------------------
     - CHAINES
     ----------------------------------*/
-    public string = ({ min, max, ...opts }: TValidator<string> & { 
+    public string = ({ min, max, include, ...opts }: TValidator<string> & { 
         min?: number, 
-        max?: number 
+        max?: number,
+        include?: string
     } = {}) => new Validator<string>('string', (val, input, output, corriger?: boolean) => {
 
+        // Check type
         if (val === '')
             return undefined;
         else if (typeof val === 'number')
@@ -157,14 +159,14 @@ export default class SchemaValidators {
         else if (typeof val !== 'string')
             throw new InputError("This value must be a string.");
 
-        // Espaces blancs
+        // Whitespace
         val = trim(val);
 
-        // Taille min
+        // Min size
         if (min !== undefined && val.length < min)
             throw new InputError(`Must be at least ` + min + ' characters');
 
-        // Taille max
+        // Max size
         if (max !== undefined && val.length > max)
             if (corriger)
                 val = val.substring(0, max);
@@ -192,8 +194,6 @@ export default class SchemaValidators {
             if (opts.normalize !== undefined)
                 val = normalizeUrl(val, opts.normalize);
 
-            console.log("@@@@@@@@@@@@@NORMALISZE URL", opts.normalize, val);
-
             return val;
         }, opts)
 

package/src/server/app/index.ts

@@ -101,7 +101,7 @@ export class Application<
         this.parent = this;
         this.app = this;
 
-        // Gestion crash
+        // Handle unhandled crash
         process.on('unhandledRejection', (error: any, promise: any) => {
             // We don't log the error here because it's the role of the app to decidehiw to log errors
             this.runHook('error', error);

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

@@ -193,16 +193,36 @@ export default abstract class Service<
 
         // Instanciate
         console.log(`[app] Load service`, registered.metas.id);
-        const ServiceClass = registered.metas.class().default;
+        let ServiceClass;
+        try {
+            ServiceClass = registered.metas.class().default;
+        } catch (error) {
+            console.error("Failed to get the class of the", registered.metas.id, "service:", error);
+            process.exit();
+        }
 
         // Create class instance
-        const service = new ServiceClass(
-            this, 
-            registered.config, 
-            registered.subServices, 
-            this.app || this
-        )
-        const serviceInstance = service.getServiceInstance();
+        let service;
+        try {
+            service = new ServiceClass(
+                this, 
+                registered.config, 
+                registered.subServices, 
+                this.app || this
+            )
+        } catch (error) {
+            console.error("Failed to instanciate class of the", registered.metas.id, "service:", error);
+            process.exit();
+        }
+
+        // Hande custom instance getter (ex: SQL callable class)
+        let serviceInstance;
+        try {
+            serviceInstance = service.getServiceInstance();
+        } catch (error) {
+            console.error("Failed to get service instance for the ", registered.metas.id, "service:", error);
+            process.exit();
+        }
 
         // Bind his own metas
         service.metas = registered.metas;

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

@@ -5,6 +5,7 @@
 // Npm
 import sharp from 'sharp';
 import fs from 'fs-extra';
+import got, { Method, Options } from 'got';
 
 // Node
 import request from 'request';
@@ -12,6 +13,10 @@ import request from 'request';
 // Core: general
 import type { Application } from '@server/app';
 import Service, { AnyService } from '@server/app/service';
+import { viaHttpCode } from '@common/errors';
+
+// Local
+import type RouterService from '../router';
 import type DisksManager from '../disks';
 import type FsDriver from '../disks/driver';
 
@@ -29,7 +34,8 @@ export type Hooks = {
 }
 
 export type Services = {
-    disks: DisksManager
+    disks: DisksManager,
+    router?: RouterService
 }
 
 /*----------------------------------
@@ -89,7 +95,63 @@ export default class FetchService extends Service<Config, Hooks, Application, Se
     }
 
     /*----------------------------------
-    - ACTIONS
+    - EXTERNAL API REQUESTS
+    ----------------------------------*/
+
+    public post( 
+        url: string, 
+        data: {[k: string]: any}, 
+        options: {} = {} 
+    ) {
+
+        return this.request('POST', url, data, options);
+
+    }
+
+    public async request( 
+        method: Method,
+        url: string, 
+        data: {[k: string]: any}, 
+        options: Options = {} 
+    ) {
+
+        // Parse url if router service is provided
+        if (this.services.router !== undefined)
+            url = this.services.router.url(url);
+
+        // Send request
+        const res = await got(url, {
+            throwHttpErrors: false,
+            headers: {
+                'Accept': 'application/json',
+            },
+            method,
+            ...(method === 'GET' ? {
+                searchParams: data
+            } : {
+                json: data
+            })
+        })
+
+        // Handle errors
+        if (res.statusCode !== 200) {
+
+            // Instanciate error from HTTP code
+            const error = viaHttpCode( res.statusCode, res.body );
+            if (error)
+                throw error;
+
+            // Not catched via viaHttpCode
+            console.log("RESPONSE", res.body);
+            throw new Error("Error while contacting the API");
+        }
+
+        // Format & return response
+        return JSON.parse( res.body );
+    }
+
+    /*----------------------------------
+    - IMAGES
     ----------------------------------*/
 
     public toBuffer( uri: string ): Promise<Buffer> {