5htp-core 0.2.9-1 → 0.2.9-3

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.2.9-1",
+	"version": "0.2.9-3",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",
@@ -13,7 +13,7 @@
 		"framework"
 	],
 	"dependencies": {
-		"@wojtekmaj/react-daterange-picker": "^4.2.0",
+		"@wojtekmaj/react-daterange-picker": "^5.0.2",
 		"accepts": "^1.3.7",
 		"activity-detector": "^3.0.0",
 		"ansi-to-html": "^0.7.1",
@@ -64,6 +64,7 @@
 		"picomatch": "^2.3.1",
 		"preact": "^10.5.15",
 		"preact-render-to-string": "^5.1.19",
+		"react-datetime-picker": "^5.0.3",
 		"react-scrollbars-custom": "^4.0.27",
 		"react-slider": "^2.0.1",
 		"react-textarea-autosize": "^8.3.3",

package/src/server/app/index.ts

@@ -12,6 +12,9 @@ import ConfigParser, { TEnvConfig } from './config';
 import { default as Service, AnyService } from './service';
 import CommandsManager from './commands';
 
+// Crore servoces
+import type DisksManager from '@server/services/disks';
+
 // Built-in
 import type { default as Router, Request as ServerRequest } from '@server/services/router';
 
@@ -85,6 +88,12 @@ export default abstract class Application extends Service<Config, Hooks, /* TODO
 
     private servicesList: AnyService[] = []
 
+     /*----------------------------------
+    - MANDATORY SERVICES
+    ----------------------------------*/
+
+    public abstract disk: DisksManager;
+
     /*----------------------------------
     - INIT
     ----------------------------------*/

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

@@ -38,7 +38,8 @@ type ConnectionConfig = {
 
 export type DatabaseServiceConfig = {
     debug: boolean,
-    connections: ConnectionConfig[]
+    connections: ConnectionConfig[],
+    connectionsLimit: number
 }
 
 export type THooks = {
@@ -136,7 +137,7 @@ export default class DatabaseManager extends Service<DatabaseServiceConfig, THoo
 
             // Pool
             waitForConnections: true,
-            connectionLimit: 100,
+            connectionLimit: this.config.connectionsLimit, 
             queueLimit: 0,
 
             // Dates & timezone

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

@@ -73,7 +73,12 @@ export default abstract class FsDriver<
 
     public abstract move( bucketName: TBucketName, source: string, destination: string, options: { overwrite?: boolean }): Promise<void>;
 
-    public abstract outputFile( bucketName: TBucketName, filename: string, content: string, encoding: TOutputFileOptions ): Promise<{
+    public abstract outputFile( 
+        bucketName: TBucketName, 
+        filename: string, 
+        content: string | Buffer, 
+        options?: TOutputFileOptions 
+    ): Promise<{
         path: string
     }>;
 

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

@@ -15,6 +15,7 @@ import type Driver from './driver';
 type TMountpointList = { [name: string]: Driver }
 
 type Config<MountpointList extends TMountpointList> = {
+    debug: boolean,
     default: keyof MountpointList,
 }
 
@@ -36,7 +37,7 @@ export default class DisksManager<
     public constructor( 
         public app: TApplication, 
         public config: TConfig,
-        public mounted:  MountpointList
+        public mounted: MountpointList
     ) {
 
         super(app, config);

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

@@ -12,6 +12,7 @@ import request from 'request';
 // Core: general
 import type Application from '@server/app';
 import Service from '@server/app/service';
+import type FsDriver from '../disks/driver';
 
 /*----------------------------------
 - SERVICE TYPES
@@ -74,7 +75,9 @@ export default class FetchService extends Service<Config, Hooks, Application> {
     public async image( 
         imageFileUrl: string, 
         { width, height, fit, quality }: TImageConfig, 
-        saveToPath?: string
+        saveToBucket: string,
+        saveToPath?: string,
+        disk?: FsDriver
     ): Promise<Buffer | null> {
 
         // Download
@@ -97,10 +100,14 @@ export default class FetchService extends Service<Config, Hooks, Application> {
             return null;
         })
 
+        // Define target disk
+        if (disk === undefined)
+            disk = this.app.disk.default;
+
         // Save file
         if (saveToPath !== undefined && processedBuffer !== null) {
             console.log(LogPrefix, `Saving ${imageFileUrl} logo to ${saveToPath}`);
-            fs.outputFileSync(saveToPath, processedBuffer);
+            await disk.outputFile(saveToBucket, saveToPath, processedBuffer);
         }
 
         // We return the original, because Vibrant.js doesn't support webp

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

@@ -262,7 +262,7 @@ export default class ServerResponse<
         }
 
         // envoi fichier
-        this.data = await disk.readFile('data', fichier);
+        this.data = await disk.readFile('data', fichier, {});
         return this.end();
     }