5htp-core 0.5.1-5 → 0.5.1-7

package/package.json

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

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

@@ -170,11 +170,11 @@ export default function Liste<TRow extends TDonneeInconnue>({
 
                     render = (
                         <div class="row sp-05">
-                            {cell.map((item, i) => (
+                            {cell.map((item, i) => typeof item === 'string' ? (
                                 <span class={"badge bg light" + ((i % 7) + 1)}>
                                     {item}
                                 </span>
-                            ))}
+                            ) : item)}
                         </div>
                     )
 

package/src/common/errors/index.tsx

@@ -154,6 +154,27 @@ export class AuthRequired extends CoreError {
     public static msgDefaut = "Please Login to Continue.";
 }
 
+export class UpgradeRequired extends CoreError {
+    public http = 402;
+    public title = "Upgrade Required";
+    public static msgDefaut = "Please Upgrade to Continue.";
+
+    public constructor( 
+        message: string, 
+        public feature: string,
+        details?: TErrorDetails
+    ) {
+        super(message, details);
+    }
+
+    public json(): TJsonError & { feature: string } {
+        return {
+            ...super.json(),
+            feature: this.feature,
+        }
+    }
+}
+
 export class Forbidden extends CoreError {
     public http = 403;
     public title = "Access Denied";
@@ -235,6 +256,8 @@ export const fromJson = ({ code, message, ...details }: TJsonError) => {
 
         case 401: return new AuthRequired( message, details );
 
+        case 402: return new UpgradeRequired( message, details.feature, details );
+
         case 403: return new Forbidden( message, details );
 
         case 404: return new NotFound( message, details );

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

@@ -255,8 +255,9 @@ export default class SQL extends Service<Config, Hooks, Application, Services> {
         }).join(' ').trim();
     }
 
-    public equalities = (data: TObjetDonnees, keys = Object.keys(data)) => 
-        keys.map(k => '' + k + ' = ' + this.esc( data[k] ))
+    public equalities = (data: TObjetDonnees, forStorage: boolean = false) => {
+        return Object.keys(data).map(k => '' + k + ' = ' + this.esc( data[k], forStorage ))
+    }
 
     /*----------------------------------
     - OPERATIONS: LOW LEVELf
@@ -380,7 +381,7 @@ export default class SQL extends Service<Config, Hooks, Application, Services> {
         }
 
         // Create equalities
-        const egalitesData = this.equalities(data).join(', ')
+        const egalitesData = this.equalities(data, true).join(', ')
         const egalitesWhere = this.equalities(where).join(' AND ')
 
         // Build query

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

@@ -71,7 +71,7 @@ export default abstract class FsDriver<
         bucketName: TBucketName, 
         filename: string, 
         options: TReadFileOptions
-    ): Promise<string>;
+    ): Promise<Buffer>;
 
     public abstract createReadStream( bucketName: TBucketName, filename: string );
 

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

@@ -76,7 +76,9 @@ export default class LocalFS<
         bucketName: TBucketName, 
         filename: string
     ) {
-        throw new Error("Method not available for local files.");
+        const bucketDir = this.config.buckets[bucketName];
+        const fullPath = path.join( this.rootDir, bucketDir, filename || '.' );
+        return fullPath;
     }
 
     public async readDir( bucketName: TBucketName, dirname?: string ) {
@@ -135,7 +137,7 @@ export default class LocalFS<
         const fullPath = path.join( this.rootDir, bucketDir, filename );
 
         this.config.debug && console.log(`readFile ${fullPath}`);
-        return fs.readFileSync( fullPath ).toString();
+        return fs.readFileSync( fullPath );
     }
 
     public createReadStream( bucketName: TBucketName, filename: string ) {

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

@@ -583,11 +583,8 @@ declare type Routes = {
     private async handleError( e: CoreError, request: ServerRequest<ServerRouter> ) {
 
         const code = 'http' in e ? e.http : 500;
-        const route = this.errors[code];
-        if (route === undefined)
-            throw new Error(`No route for error code ${code}`);
 
-        const response = new ServerResponse(request).status(code).setRoute(route);
+        const response = new ServerResponse(request).status(code)
 
         // Rapport / debug
         if (code === 500) {
@@ -605,18 +602,24 @@ declare type Routes = {
         } else {
 
             // For debugging HTTP errors
-            if (this.app.env.profile === "dev")
-                console.warn(e);
+            /*if (this.app.env.profile === "dev")
+                console.warn(e);*/
 
             await this.app.runHook('error.' + code, e, request);
         }
 
         // Return error based on the request format
         if (request.accepts("html")) {
+
+            const route = this.errors[code];
+            if (route === undefined)
+                throw new Error(`No route for error code ${code}`);
+
             const jsonError = errorToJson(e);
-            await response.runController(route, { 
+            await response.setRoute(route).runController(route, { 
                 error: jsonError
             });
+
         } else if (request.accepts("json")) {
             const jsonError = errorToJson(e);
             await response.json(jsonError);

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

@@ -146,9 +146,6 @@ export default class ServerRequest<
             'EN'
         )
 
-        console.log("locale", this.req.acceptsLanguages(), locale);
-        
-
         return locale ? locale.toUpperCase() : 'EN'
     }
 

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

@@ -310,8 +310,15 @@ export default class ServerResponse<
         }
 
         // envoi filename
-        const file = await disk.readFile('data', filename, {});
+        const file = await disk.readFile('data', filename, {
+            encoding: 'buffer'
+        });
         this.data = file;
+        
+
+        // Mimetype
+        this.headers['Content-Type'] = 'image/jpeg';
+
         return this.end();
     }