@ecopex/ecopex-framework 1.0.4 → 1.0.5

package/config/database.js

@@ -0,0 +1,24 @@
+// create knex config for production and development
+const { config: configStore } = require('../stores/config');
+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'
+        }
+    },
+    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'
+        }
+    }
+}

package/config/swagger.js

@@ -0,0 +1,45 @@
+/**
+ * Swagger configuration for Admin service
+ */
+const { config } = require('../stores/config');
+module.exports = {
+    swagger: {
+        openapi: {
+        info: {
+            title: config.name + ' API',
+            description: config.name + ' API documentation for ' + config.name,
+            version: '1.0.0'
+        },
+        host: `${config.host || 'localhost'}:${config.port || 3001}`,
+        schemes: ['http', 'https'],
+        consumes: ['application/json'],
+        produces: ['application/json'],
+        components: {
+            securitySchemes: {
+            bearer: {
+                type: 'http',
+                scheme: 'bearer',
+                bearerFormat: 'JWT',
+                description: 'Enter the token with the `Bearer: ` prefix, e.g. "Bearer abcde12345".'
+            },
+            apiKey: {
+                type: 'apiKey',
+                in: 'header',
+                name: 'apiKey',
+                description: 'Enter token e.g. "abcde1-234533-333312-2222".'
+            }
+            },
+            headers: {
+            description: 'Headers',
+            scheme: {
+                type: 'object',
+                properties: {}
+            }
+            }
+        }
+        }
+    },
+    swaggerUi: {
+        routePrefix: '/docs'
+    }
+};

package/knexfile.js

@@ -1,3 +1 @@
-require('dotenv').config();
-
 module.exports = require('./config/database');

package/libraries/2fa.js

@@ -1,7 +1,8 @@
 const twofactor = require("node-2fa");
+const { config } = require('../stores/config');
 
 const generate_2fa_secret = (account = '') => {
-    const newSecret = twofactor.generateSecret({ name: process.env.NAME || 'System', account });
+    const newSecret = twofactor.generateSecret({ name: config.name || 'System', account });
     return newSecret
 }
 

package/libraries/aws.js

@@ -1,6 +1,7 @@
 const { S3Client } = require("@aws-sdk/client-s3");
 const { Upload } = require("@aws-sdk/lib-storage");
 const fs = require('fs');
+const { config } = require('../stores/config');
 
 // Config
 
@@ -8,17 +9,17 @@ const fs = require('fs');
 const uploadBase = __dirname + '../uploads/'
 
 // The name of the bucket that you have created
-const BUCKET_NAME = process.env.AWS_BUCKET_NAME;
+const BUCKET_NAME = config.aws_bucket_name;
 
 
 const uploadAws = async (filePath, contentType) => {
 
     const client = new S3Client({
         bucketEndpoint: BUCKET_NAME,
-        region: process.env.AWS_REGION,
+        region: config.aws_region,
         credentials: {
-            secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
-            accessKeyId: process.env.AWS_ACCESS_KEY_ID
+            secretAccessKey: config.aws_secret_access_key,
+            accessKeyId: config.aws_access_key_id
         }
     });
 

package/libraries/bcrypt.js

@@ -1,11 +1,12 @@
 const bcrypt = require('bcryptjs');
+const { config } = require('../stores/config');
 
 /**
  * Bcrypt Library Class
  * Provides methods for password hashing, comparison, and salt generation
  */
 class Bcrypt {
-  constructor(saltRounds = 12) {
+  constructor(saltRounds = config.bcrypt_salt_rounds || 12) {
     this.saltRounds = saltRounds;
   }
 

package/libraries/fastify.js

@@ -1,28 +1,28 @@
-require('dotenv').config(); 
-
-const fastify = require('fastify')({
-    logger: {
-        level: process.env.LOG_LEVEL || 'info'
-    }
-});
-
 const { loadRoutes } = require('../utils/routeLoader');
 const Middleware = require('../utils/middleware');
+const { setConfig } = require('../stores/config');
 
 // Register plugins
-async function registerPlugins() {
+async function registerPlugins(config) {
+
+    const fastify = require('fastify')({
+        logger: {
+            level: config.log_level || 'info'
+        }
+    });
+
     // Set error handler first, before any plugins
     fastify.setErrorHandler(Middleware.errorHandler);
     fastify.setNotFoundHandler(Middleware.errorNotFoundHandler);
     
     // CORS plugin
     await fastify.register(require('@fastify/cors'), {
-        origin: process.env.CORS_ORIGIN || '*',
+        origin: config.cors || '*',
         credentials: true
     });
 
     // Swagger documentation
-    const swaggerConfig = require('../config/swagger/admin');
+    const swaggerConfig = require('../config/swagger');
     
     await fastify.register(require('@fastify/swagger'), swaggerConfig.swagger);
 
@@ -51,20 +51,22 @@ async function registerPlugins() {
     // Health check endpoint
     fastify.get('/health', async (request, reply) => {
         return { 
-        status: 'ok', 
-        service: 'admin',
-        timestamp: new Date().toISOString(),
-        uptime: process.uptime(),
-        pid: process.pid
+            status: 'ok', 
+            service: config.name,
+            timestamp: new Date().toISOString(),
+            uptime: process.uptime(),
+            pid: process.pid
         };
     });
+
+    return fastify;
 }
 
 // Load admin routes, common routes, and auto routes
-async function loadAdminRoutes() {
+async function loadAdminRoutes(fastifyInstance, config) {
     try {
         // Load admin routes
-        await loadRoutes(fastify, __dirname + '/../routes/admin', true, 'admin');
+        await loadRoutes(fastifyInstance, __dirname + '/../routes/' + config.name, true, config.name);
     } catch (error) {
         console.error('Error loading admin routes:', error);
         process.exit(1);
@@ -72,20 +74,22 @@ async function loadAdminRoutes() {
 }
 
 // Start admin service
-async function start() {
+async function start(config) {
     try {
 
+        setConfig(config);
+
         // Register plugins
-        await registerPlugins();
+        const fastifyInstance = await registerPlugins(config);
 
         // Load admin routes
-        await loadAdminRoutes();
+        await loadAdminRoutes(fastifyInstance, config);
 
         // Start server
-        const port = process.env.PORT || 3001;
-        const host = process.env.HOST || '127.0.0.1';
+        const port = config.port || 3001;
+        const host = config.host || '127.0.0.1';
         
-        fastify.listen({ port, host });
+        fastifyInstance.listen({ port, host });
 
     } catch (error) {
         console.error('Error starting admin service:', error);

package/libraries/jwt.js

@@ -1,13 +1,14 @@
 const jwt = require('jsonwebtoken');
+const { config } = require('../stores/config');
 
 /**
  * JWT Library Class
  * Provides methods for JWT token operations including sign, verify, and decode
  */
 class JWT {
-  constructor(secretKey = process.env.JWT_SECRET || 'default-secret-key') {
+  constructor(secretKey = config.jwt_secret || 'default-secret-key') {
     this.secretKey = secretKey;
-    this.defaultExpiresIn = '1d';
+    this.defaultExpiresIn = config.jwt_expires_in || '1d';
   }
 
   /**

package/libraries/knex.js

@@ -1,7 +1,7 @@
 const knex = require('knex');
-
+const { config: configStore } = require('../stores/config');
 const config = require('../config/database');
 
-const db = knex(config[process.env.NODE_ENV || 'development']);
+const db = knex(config[configStore.development ? 'development' : 'production']);
 
 module.exports = db;

package/libraries/upload.js

@@ -6,6 +6,7 @@ const { resize: resizeImage } = require('./image')
 const sizeOf = require('image-size');
 const returnSlug = require('./slug')
 const { uploadAws } = require('./aws');
+const { config } = require('../stores/config');
 
 const uploadFile = async (fileObject = {}, prefix = '', directory = '', resizeOpts = false) => {
 
@@ -70,7 +71,7 @@ const createReturnData = async (fileName = '', directory = '', resizeOpts = fals
         }
     }
 
-    if(process.env.AWS_STATUS == 'true') {
+    if(config.aws_status == 'true') {
 
         await sleep(1000);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecopex/ecopex-framework",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Javascript Framework for API and Admin Panel",
   "main": "ecosystem.config.js",
   "scripts": {

package/routes/auto/handler.js

@@ -5,7 +5,7 @@ const i18n = require('../../utils/i18n');
 const { uploadFile } = require('../../libraries/upload');
 const { randomChars } = require('../../libraries/controls');
 const { get_all, get_by_primary_key, create_item, update_item, delete_item } = require('../../stores');
-
+const { config } = require('../../stores/config');
 /**
  * Get all records with pagination, search, and join tables
  * @param {Object} request - The request object
@@ -277,7 +277,7 @@ async function create(request, reply, routeOptions = {}) {
         data: item
       });
     } catch (error) {
-      if(process.env.NODE_ENV === 'development') {
+      if(config.development) {
         console.log(error.message);
       }
       if(error.sqlMessage) {

package/stores/config.js

@@ -0,0 +1,10 @@
+let config = {};
+
+const setConfig = (config) => {
+    config = config;
+}
+
+module.exports = {
+    setConfig,
+    config
+}

package/utils/middleware.js

@@ -1,5 +1,6 @@
 const i18n = require('./i18n');
 const db = require('../libraries/knex');
+const { config } = require('../stores/config');
 /**
  * Middleware utilities for Fastify
  */
@@ -31,7 +32,7 @@ class Middleware {
    */
   static errorHandler(error, request, reply) {
 
-      if(process.env.NODE_ENV === 'development') {
+      if(config.development) {
         console.log(error);
       }
       

package/config/swagger/admin.js

@@ -1,44 +0,0 @@
-/**
- * Swagger configuration for Admin service
- */
-module.exports = {
-  swagger: {
-    openapi: {
-      info: {
-        title: 'Ecommerce Admin API',
-        description: 'Admin API documentation for Ecommerce',
-        version: '1.0.0'
-      },
-      host: `${process.env.HOST || 'localhost'}:${process.env.ADMIN_PORT || 3001}`,
-      schemes: ['http', 'https'],
-      consumes: ['application/json'],
-      produces: ['application/json'],
-      components: {
-        securitySchemes: {
-          bearer: {
-            type: 'http',
-            scheme: 'bearer',
-            bearerFormat: 'JWT',
-            description: 'Enter the token with the `Bearer: ` prefix, e.g. "Bearer abcde12345".'
-          },
-          apiKey: {
-            type: 'apiKey',
-            in: 'header',
-            name: 'apiKey',
-            description: 'Enter token e.g. "abcde1-234533-333312-2222".'
-          }
-        },
-        headers: {
-          description: 'Headers',
-          scheme: {
-            type: 'object',
-            properties: {}
-          }
-        }
-      }
-    }
-  },
-  swaggerUi: {
-    routePrefix: '/docs'
-  }
-};

package/config/swagger/api.js

@@ -1,19 +0,0 @@
-/**
- * Swagger configuration for API service
- */
-module.exports = {
-  swagger: {
-    info: {
-      title: 'SB System API',
-      description: 'API documentation for SB System',
-      version: '1.0.0'
-    },
-    host: `${process.env.HOST || 'localhost'}:${process.env.API_PORT || 3000}`,
-    schemes: ['http', 'https'],
-    consumes: ['application/json'],
-    produces: ['application/json']
-  },
-  swaggerUi: {
-    routePrefix: '/docs'
-  }
-};