5htp-core 0.0.6 → 0.0.7

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "5-HTP, scientifically called 5-Hydroxytryptophan, is the precursor of happiness neurotransmitter.",
-	"version": "0.0.6",
+	"version": "0.0.7",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",
@@ -37,6 +37,7 @@
 		"fast-safe-stringify": "^2.1.1",
 		"fs-extra": "^10.1.0",
 		"google-auth-library": "^7.11.0",
+		"got": "^11.8.3",
 		"handlebars": "^4.7.7",
 		"helmet": "^4.6.0",
 		"history": "^5.0.1",
@@ -73,7 +74,7 @@
 		"validator": "^13.7.0",
 		"ws": "^8.2.2",
 		"yaml": "^1.10.2"
-	},  
+	},
 	"devDependencies": {
 		"@types/cookie": "^0.4.1",
 		"@types/express": "^4.17.13",

package/src/server/app/config.ts

@@ -35,23 +35,9 @@ export type TEnvConfig = {
     profile: 'dev' | 'prod',
     level: 'silly' | 'info' | 'warn' | 'error',
 
+    localIP: string,
     domain: string,
-    protocol: 'http' | 'https',
-    url: string, // protocol + domain
-    localIP?: string
-
-    http: {
-        port: number,
-        ssl: boolean
-    },
-
-    database: {
-        host: string,
-        port: number,
-        login: string,
-        password: string,
-        list: string[]
-    },
+    url: string,
 }
 
 type AppIdentityConfig = {
@@ -101,9 +87,27 @@ export default class ConfigParser {
         return yaml.parse(rawConfig);
     }
 
-    public env() {
-        const envFile = this.appDir + '/env' + (this.envName === undefined ? '' : '.' + this.envName) + '.yaml';
-        return this.loadYaml( envFile );
+    public env(): TEnvConfig {
+        // We assume that when we run 5htp dev, we're in local
+        // Otherwise, we're in production environment (docker)
+        console.log("Using environment:", process.env.NODE_ENV);
+        return process.env.NODE_ENV === 'development' ? {
+            name: 'local',
+            profile: 'dev',
+            level: 'silly',
+        
+            localIP: '86.76.176.80',
+            domain: 'localhost:3010',
+            url: 'http://localhost:3010',
+        } : {
+            name: 'server',
+            profile: 'prod',
+            level: 'silly',
+        
+            localIP: '86.76.176.80',
+            domain: 'megacharger.io',
+            url: 'https://megacharger.io',
+        }
     }
 
     public identity() {

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

@@ -62,13 +62,15 @@ export default class FastDatabase {
 
         console.info(`Connecting to databases ...`);
 
+        const creds = this.config[ app.env.profile ];
+
         return await mysql.createPool({
 
             // Identification
-            host: this.config.host,
-            port: this.config.port,
-            user: this.config.login,
-            password: this.config.password,
+            host: creds.host,
+            port: creds.port,
+            user: creds.login,
+            password: creds.password,
             database: this.config.list[0],
 
             // Pool
@@ -106,7 +108,7 @@ export default class FastDatabase {
         let type = field.type;
         if (field.db) {
 
-            // A revoir, car les infos passées peuvent être des alias
+            // TODO: A revoir, car les infos passées peuvent être des alias
 
             const db = this.tables[ field.db ];
             if (db === undefined) {

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

@@ -41,11 +41,19 @@ export type TInsertQueryOptions<TData extends TObjetDonnees = TObjetDonnees> = T
 ----------------------------------*/
 
 export type DatabaseServiceConfig = {
-    host: string,
     list: string[],
-    login: string,
-    password: string,
-    port: number
+    dev: {
+        host: string,
+        port: number,
+        login: string,
+        password: string,
+    },
+    prod: {
+        host: string,
+        port: number,
+        login: string,
+        password: string,
+    }
 }
 
 declare global {

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

@@ -89,7 +89,7 @@ export default class HttpServer {
 
             this.http = http.createServer(this.express);
 
-        } else if ('ssh' in app.env) {
+        } /*else if ('ssh' in app.env) {
 
             const ssh = app.env.ssh;
 
@@ -102,7 +102,7 @@ export default class HttpServer {
                 rejectUnauthorized: false
             }, this.express);
             
-        } else
+        }*/ else
             throw new Error(`SSL was enabled, but no ssh config was specified in app.env (required to load ssl certificate files)`);
 
         // Start HTTP Server

package/tsconfig.common.json

@@ -34,9 +34,9 @@
             "@errors": ["./common/errors"],
             "@models": ["./common/models"],
 
-            "react": ["../node_modules/preact/compat"],
-            "react-dom": ["../node_modules/preact/compat"],
-            "react/jsx-runtime": ["../node_modules/preact/jsx-runtime"]
+            "react": ["preact/compat"],
+            "react-dom": ["preact/compat"],
+            "react/jsx-runtime": ["preact/jsx-runtime"]
         },
     },
     "include": ["src"]