@ecopex/ecopex-framework 1.0.6 → 1.0.7

package/config/database.js

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

package/index.js

@@ -1,5 +1,18 @@
 const { start: fastifyStart } = require('./libraries/fastify');
+const knex = require('./libraries/knex');
+const JWT = require('./libraries/jwt');
+const BCRYPT = require('./libraries/bcrypt');
+const date = require('./libraries/date');
+const twofactor = require('./libraries/2fa');
+
+const jwt = new JWT();
+const bcrypt = new BCRYPT();
 
 module.exports = {
-    fastifyStart
+    fastifyStart,
+    db: knex,
+    date: date,
+    jwt: jwt,
+    bcrypt: bcrypt,
+    twofactor: twofactor
 }

package/libraries/fastify.js

@@ -2,21 +2,24 @@ const { loadRoutes } = require('../utils/routeLoader');
 const Middleware = require('../utils/middleware');
 const { setConfig } = require('../stores/config');
 
+let fastifyInstance = null;
+
 // Register plugins
 async function registerPlugins(config) {
 
-    const fastify = require('fastify')({
+    fastifyInstance = require('fastify')({
         logger: {
-            level: config.log_level || 'info'
+            level: config.log_level || 'info',
+            file: config.log_file || null
         }
     });
 
     // Set error handler first, before any plugins
-    fastify.setErrorHandler(Middleware.errorHandler);
-    fastify.setNotFoundHandler(Middleware.errorNotFoundHandler);
+    fastifyInstance.setErrorHandler(Middleware.errorHandler);
+    fastifyInstance.setNotFoundHandler(Middleware.errorNotFoundHandler);
     
     // CORS plugin
-    await fastify.register(require('@fastify/cors'), {
+    await fastifyInstance.register(require('@fastify/cors'), {
         origin: config.cors || '*',
         credentials: true
     });
@@ -24,13 +27,13 @@ async function registerPlugins(config) {
     // Swagger documentation
     const swaggerConfig = require('../config/swagger');
     
-    await fastify.register(require('@fastify/swagger'), swaggerConfig.swagger);
+    await fastifyInstance.register(require('@fastify/swagger'), swaggerConfig.swagger);
 
     // Swagger UI
-    await fastify.register(require('@fastify/swagger-ui'), swaggerConfig.swaggerUi);
+    await fastifyInstance.register(require('@fastify/swagger-ui'), swaggerConfig.swaggerUi);
 
     // Fastify Multipart plugin
-    fastify.register(require('@fastify/multipart'), {
+    fastifyInstance.register(require('@fastify/multipart'), {
         attachFieldsToBody: true, // Optional: attaches fields to the body object
         throwFileSizeLimit: true, // Optional: throws an error if the file size limit is exceeded
         limits: {
@@ -45,11 +48,11 @@ async function registerPlugins(config) {
     });
 
     // Register other middleware
-    fastify.addHook('preHandler', Middleware.languageDetection());
-    fastify.addHook('preHandler', Middleware.responseFormatter());
+    fastifyInstance.addHook('preHandler', Middleware.languageDetection());
+    fastifyInstance.addHook('preHandler', Middleware.responseFormatter());
 
     // Health check endpoint
-    fastify.get('/health', async (request, reply) => {
+    fastifyInstance.get('/health', async (request, reply) => {
         return { 
             status: 'ok', 
             service: config.name,
@@ -59,14 +62,16 @@ async function registerPlugins(config) {
         };
     });
 
-    return fastify;
+    return fastifyInstance;
 }
 
 // Load admin routes, common routes, and auto routes
-async function loadAdminRoutes(fastifyInstance, config) {
+async function loadAdminRoutes(config) {
     try {
         // Load admin routes
-        await loadRoutes(fastifyInstance, __dirname + '/../routes/' + config.name, true, config.name);
+        if(fastifyInstance) {
+            await loadRoutes(fastifyInstance, './routes/' + config.name, true, config.name);
+        }
     } catch (error) {
         console.error('Error loading admin routes:', error);
         process.exit(1);
@@ -75,16 +80,15 @@ async function loadAdminRoutes(fastifyInstance, config) {
 
 // Start admin service
 async function start(config) {
-    console.log('config', config);
     try {
         
         setConfig(config);
 
         // Register plugins
-        const fastifyInstance = await registerPlugins(config);
-
+        await registerPlugins(config);
+        
         // Load admin routes
-        await loadAdminRoutes(fastifyInstance, config);
+        await loadAdminRoutes(config);
 
         // Start server
         const port = config.port || 3001;
@@ -93,32 +97,11 @@ async function start(config) {
         fastifyInstance.listen({ port, host });
 
     } catch (error) {
-        console.error('Error starting admin service:', error);
+        console.error('Error starting ' + config.name + ' server:', error);
         process.exit(1);
     }
 }
 
-// Graceful shutdown
-process.on('SIGINT', async () => {
-    try {
-        await fastify.close();
-        process.exit(0);
-    } catch (error) {
-        console.error('Error during admin service shutdown:', error);
-        process.exit(1);
-    }
-});
-
-process.on('SIGTERM', async () => {
-    try {
-        await fastify.close();
-        process.exit(0);
-    } catch (error) {
-        console.error('Error during admin service shutdown:', error);
-        process.exit(1);
-    }
-});
-
 // Start the admin service
 module.exports = {
     start

package/package.json

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