@ecopex/ecopex-framework 1.0.7 → 1.0.8

package/index.js

@@ -1,5 +1,5 @@
 const { start: fastifyStart } = require('./libraries/fastify');
-const knex = require('./libraries/knex');
+const knex = require('./libraries/knex')
 const JWT = require('./libraries/jwt');
 const BCRYPT = require('./libraries/bcrypt');
 const date = require('./libraries/date');
@@ -8,9 +8,14 @@ const twofactor = require('./libraries/2fa');
 const jwt = new JWT();
 const bcrypt = new BCRYPT();
 
+const start = async (config) => {
+    await knex.initialize(config);
+    await fastifyStart(config);
+}
+
 module.exports = {
-    fastifyStart,
-    db: knex,
+    start,
+    db: knex.instance,
     date: date,
     jwt: jwt,
     bcrypt: bcrypt,

package/libraries/knex.js

@@ -1,7 +1,39 @@
 const knex = require('knex');
-const { config: configStore } = require('../stores/config');
-const config = require('../config/database');
 
-const db = knex(config[configStore.development ? 'development' : 'production']);
+let instance = null;
 
-module.exports = db;
+const initialize = async (config) => {
+    const { config: configStore } = require('../stores/config');
+    const databaseConfig = configStore?.database || {};
+
+    const db_config = {
+        development: {
+            client: 'mysql2',
+            connection: {
+                host: databaseConfig.host || 'localhost',
+                port: databaseConfig?.port || 3306,
+                user: databaseConfig.user || 'root',
+                password: databaseConfig?.password || '',
+                database: databaseConfig?.database || 'ecopex'
+            }
+        },
+        production: {
+            client: 'mysql2',
+            connection: {
+                host: databaseConfig?.host || 'localhost',
+                port: databaseConfig?.port || 3306,
+                user: databaseConfig?.user || 'root',
+                password: databaseConfig?.password || '',
+                database: databaseConfig?.database || 'ecopex'
+            }
+        }
+    }
+
+    const db = knex(db_config[configStore.development ? 'development' : 'production']);
+    instance = db;
+}
+
+module.exports = {
+    initialize,
+    instance
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecopex/ecopex-framework",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Javascript Framework for API and Admin Panel",
   "main": "index.js",
   "scripts": {

package/config/database.js

@@ -1,26 +0,0 @@
-// create knex config for production and development
-const { config: configStore } = require('../stores/config');
-const databaseConfig = configStore?.database || {};
-
-module.exports = {
-    development: {
-        client: 'mysql2',
-        connection: {
-            host: databaseConfig?.host || 'localhost',
-            port: databaseConfig?.port || 3306,
-            user: databaseConfig?.user || 'root',
-            password: databaseConfig?.password || '',
-            database: databaseConfig?.database || 'ecopex'
-        }
-    },
-    production: {
-        client: 'mysql2',
-        connection: {
-            host: databaseConfig?.host || 'localhost',
-            port: databaseConfig?.port || 3306,
-            user: databaseConfig?.user || 'root',
-            password: databaseConfig?.password || '',
-            database: databaseConfig?.database || 'ecopex'
-        }
-    }
-}