5htp-core 0.2.7-9 → 0.2.8

package/package.json

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

package/src/client/components/Select/ChoiceSelector.tsx

@@ -126,16 +126,18 @@ export default React.forwardRef<HTMLDivElement, Props>(({
                        return (
                            <li>
                                <Button size="s" onClick={() => {
-
                                     onChange( current => {
+
+                                        console.log("click select", current, multiple, choice);
+
                                         return multiple 
                                             ? (isCurrent
                                                 ? current.filter(c => c.value !== choice.value)
                                                 : [...(current || []), choice] 
                                             )
                                             : (isCurrent
-                                                ? choice
-                                                : undefined
+                                                ? undefined
+                                                : choice
                                             )
                                     });
 

package/src/server/app/index.ts

@@ -68,6 +68,7 @@ export default abstract class Application extends Service<Config, Hooks, /* TODO
         public: process.cwd() + '/public',
 
         // TODO: move to disk
+        var: process.cwd() + '/var',
         typings: process.cwd() + '/var/typings',
         cache: process.cwd() + '/var/cache',
         data: process.cwd() + '/var/data',

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

@@ -39,6 +39,11 @@ export type TOutputFileOptions = {
     encoding: string
 }
 
+export type TReadFileOptions = {
+    encoding?: 'string'|'buffer',
+    withMetas?: boolean
+}
+
 /*----------------------------------
 - CLASS
 ----------------------------------*/
@@ -56,7 +61,11 @@ export default abstract class FsDriver<
     
     public abstract readDir( bucketName: TBucketName, dirname?: string ): Promise<SourceFile[]>;
 
-    public abstract readFile( bucketName: TBucketName, filename: string ): Promise<string>;
+    public abstract readFile( 
+        bucketName: TBucketName, 
+        filename: string, 
+        options: TReadFileOptions
+    ): Promise<string>;
 
     public abstract createReadStream( bucketName: TBucketName, filename: string );
 

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

@@ -21,6 +21,7 @@ import type { GlobImportedWithMetas } from 'babel-plugin-glob-import';
 // Core
 import Application, { Service } from '@server/app';
 import context from '@server/context';
+import type DiskDriver from '@server/services/disks/driver';
 import { CoreError, NotFound } from '@common/errors';
 import BaseRouter, {
     TRoute, TErrorRoute, TRouteModule,
@@ -88,6 +89,8 @@ export type Config<
 
     debug: boolean,
 
+    disk: DiskDriver,
+
     http: HttpServiceConfig
 
     // Set it as a function, so when we instanciate the services, we can callthis.router to pass the router instance in roiuter services

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

@@ -8,7 +8,6 @@
 ----------------------------------*/
 
 // Npm
-import fs from 'fs-extra';
 import express from 'express';
 
 // Core
@@ -241,28 +240,29 @@ export default class ServerResponse<
     }
 
     // TODO: https://github.com/adonisjs/http-server/blob/develop/src/Response/index.ts#L430
-    public file( fichier: string ) {
+    public async file( fichier: string ) {
 
         // Securité
         if (fichier.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;
+        // // Force absolute path
+        // if (!fichier.startsWith( this.app.path.root ))
+        //     fichier = fichier[0] === '/'
+        //         ? this.app.path.root + '/bin' + fichier
+        //         : this.app.path.data + '/' + fichier;
 
-        console.log(`[response] Serving file "${fichier}"`);
+        const disk = this.router.config.disk;
 
         // Verif existance
-        if (!fs.existsSync(fichier)) {
+        const fileExists = await disk.exists('data', fichier);
+        if (!fileExists) {
             console.log("File " + fichier + " was not found.");
             throw new NotFound();
         }
 
         // envoi fichier
-        this.data = fs.readFileSync(fichier);
+        this.data = await disk.readFile('data', fichier);
         return this.end();
     }