Changes for integrating [email protected]

src/app.js

@@ -1,74 +1,62 @@
-'use strict';
-require('module-alias/register');
-const express = require('express');
-const cors = require('cors');
-require('dotenv').config({ path: './.env' });
-const path = require('path');
-const packageInstaller = require('./utils/packageInstaller');
-const executeScripts = require('./scripts');
-
-
-
-(async () => {
-    try {
-
-
-        // First, install necessary packages
-        await packageInstaller(process.env.REQUIRED_PACKAGES);
-
-        // Next, execute fetchRouteConfigs and combineRoutesConfigs
-        await executeScripts();
-
-        const dependencyManager = require('@helpers/dependencyManager')
-        await dependencyManager()
-
-        // After scripts execution, continue with environment data validation
-        let environmentData = require('./envVariables')();
-        if (!environmentData.success) {
-            console.error('Server could not start. Not all environment variables are provided');
-            process.exit(1);
-        }
-
-        // Initialize the rest of the application (after the scripts are done)
-        require('./init');
-
-        // Create an Express app instance
-        const app = express();
-        app.set('trust proxy', parseInt(process.env.RATE_LIMITER_NUMBER_OF_PROXIES));
-
-        // Middleware and CORS setup
-        app.use(cors());
-
-        // Set Access-Control-Allow-Origin header
-        app.use((req, res, next) => {
-            res.setHeader('Access-Control-Allow-Origin', process.env.ALLOWED_HOST);
-            next();
-        });
-
-        // Load router packages and initialize the router
-        const routerPackages = require('@utils/packageLoader').packageLoader();
-        const validatedPackages = routerPackages; // Bypassing the validator for now
-        const { initializeRouter } = require('@router');
-        app.use(initializeRouter(validatedPackages));
-
-        // Serve API documentation
-        app.get(process.env.API_DOC_URL, (req, res) => {
-            res.sendFile(path.join(__dirname, './api-doc/index.html'));
-        });
-
-        // Start the server
-        app.listen(process.env.APPLICATION_PORT, (err) => {
-            if (err) {
-                onError(err);
-            }
-            console.log('Environment: ' + process.env.APPLICATION_ENV);
-            console.log('Application is running on port: ' + process.env.APPLICATION_PORT);    
-
-        });
-
-    } catch (error) {
-        // Handle any error from script execution or package installation
-        console.error('Error in app initialization:', error);
-        process.exit(1);
-    }
-})();
+'use strict'
+require('module-alias/register')
+const express = require('express')
+const cors = require('cors')
+require('dotenv').config({ path: './.env' })
+const path = require('path')
+const packageInstaller = require('./utils/packageInstaller')
+const executeScripts = require('./scripts')
+
+;(async () => {
+	try {
+		// First, install necessary packages
+		await packageInstaller(process.env.REQUIRED_PACKAGES)
+
+		// Next, execute fetchRouteConfigs and combineRoutesConfigs
+		await executeScripts()
+
+		const dependencyManager = require('@helpers/dependencyManager')
+		await dependencyManager()
+
+		// After scripts execution, continue with environment data validation
+		let environmentData = require('./envVariables')()
+		if (!environmentData.success) {
+			console.error('Server could not start. Not all environment variables are provided')
+			process.exit(1)
+		}
+		// Initialize the rest of the application (after the scripts are done)
+		require('./init')
+
+		// Create an Express app instance
+		const app = express()
+		app.set('trust proxy', parseInt(process.env.RATE_LIMITER_NUMBER_OF_PROXIES))
+
+		// Middleware and CORS setup
+		app.use(cors())
+
+		// Set Access-Control-Allow-Origin header
+		app.use((req, res, next) => {
+			res.setHeader('Access-Control-Allow-Origin', process.env.ALLOWED_HOST)
+			next()
+		})
+		// Load router packages and initialize the router
+		const routerPackages = require('@utils/packageLoader').packageLoader()
+		const validatedPackages = routerPackages // Bypassing the validator for now
+		const { initializeRouter } = require('@router')
+		app.use(initializeRouter(validatedPackages))
+		// Serve API documentation
+		app.get(process.env.API_DOC_URL, (req, res) => {
+			res.sendFile(path.join(__dirname, './api-doc/index.html'))
+		})
+		// Start the server
+		app.listen(process.env.APPLICATION_PORT, (err) => {
+			if (err) {
+				onError(err)
+			}
+		})
+	} catch (error) {
+		// Handle any error from script execution or package installation
+		console.error('Error in app initialization:', error)
+		process.exit(1)
+	}
+})()

src/configs/dependencyConfig.json

@@ -1,9 +1,4 @@
 {
 	"requiredDependencies": [],
-	"supportedDependencies": [
-		{
-			"name": "kafka",
-			"packageName": "elevate-kafka"
-		}
-	]
+	"supportedDependencies": []
 }

src/configs/routesConfigs.js

@@ -2,6 +2,6 @@
 const config = require('@configs/.config.json')
 
 exports.routesConfigs = {
-	services: process.env.REQUIRED_BASE_PACKAGES.split(","),
+	services: process.env.REQUIRED_BASE_PACKAGES,
 	routes: config.routes,
 }

src/configs/routesConfigs/shiksha-user.json

@@ -0,0 +1,30 @@
+{
+    "routes": [
+        {
+            "sourceRoute": "/interface/v1/account/create",
+            "type": "POST",
+            "priority": "MUST_HAVE",
+            "inSequence": false,
+            "orchestrated": false,
+            "targetPackages": [
+                {
+                    "basePackageName": "user",
+                    "packageName": "shiksha-user"
+                }
+            ]
+        },
+        {
+            "sourceRoute": "/interface/v1/account/login",
+            "type": "POST",
+            "priority": "MUST_HAVE",
+            "inSequence": false,
+            "orchestrated": false,
+            "targetPackages": [
+                {
+                    "basePackageName": "user",
+                    "packageName": "shiksha-user"
+                }
+            ]
+        }
+    ]
+}

src/generics/request.js

@@ -1,4 +1,4 @@
-const request = require('request');
+const request = require('request')
 
 /**
  * Makes a GET request to the specified URL with optional token headers.
@@ -8,50 +8,51 @@ const request = require('request');
  * @returns {Promise<object>} - A promise that resolves to the fetched result object.
  */
 var get = function (url, token = '', internal_access_token = '') {
-    return new Promise((resolve, reject) => {
-        try {
-            let headers = {
-                'content-type': 'application/json',
-            };
-            if (internal_access_token) {
-                headers['internal_access_token'] = internal_access_token;
-            }
+	return new Promise((resolve, reject) => {
+		try {
+			let headers = {
+				'content-type': 'application/json',
+			}
+			if (internal_access_token) {
+				headers['internal_access_token'] = internal_access_token
+			}
 
-            if (token) {
-                headers['x-auth-token'] = token;
-            }
+			if (token) {
+				headers['x-auth-token'] = token
+			}
 
-            const options = {
-                headers: headers,
-            };
+			const options = {
+				headers: headers,
+			}
 
-            request.get(url, options, (err, response) => {
-                let result = {
-                    success: true,
-                };
+			request.get(url, options, (err, response) => {
+				console.log('url: ', url)
+				//console.log('options: ', options)
+				let result = {
+					success: true,
+				}
+				if (err) {
+					result.success = false
+					result.error = err
+				} else {
+					let body = response.body
+					try {
+						result.data = typeof body === 'string' ? JSON.parse(body) : body // Attempt to parse the JSON string JSON.parse(body);
+					} catch (jsonError) {
+						console.log('Error parsing JSON : ', jsonError)
+						result.success = false
+						result.error = 'Error parsing JSON'
+					}
+				}
 
-                if (err) {
-                    result.success = false;
-                    result.error = err;
-                } else {
-                    let body = response.body;
-                    try {
-                        result.data = typeof body === "string" ? JSON.parse(body) : body ; // Attempt to parse the JSON string JSON.parse(body);
-                    } catch (jsonError) {
-                        console.log('Error parsing JSON : ',jsonError)
-                        result.success = false;
-                        result.error = 'Error parsing JSON';
-                    }
-                }
-
-                return resolve(result);
-            });
-        } catch (error) {
-            return reject(error);
-        }
-    });
-};
+				return resolve(result)
+			})
+		} catch (error) {
+			return reject(error)
+		}
+	})
+}
 
 module.exports = {
-	get
+	get,
 }

src/helpers/dependencyManager.js

@@ -3,68 +3,48 @@
 const dependencyConfigs = require('@configs/dependencyConfig.json')
 const requiredEnvsJSON = require('../configs/requiredEnvs.json')
 
-const packageLoader = require('@utils/packageLoader');
+const packageLoader = require('@utils/packageLoader')
 
 const dependencyManager = () => {
 	try {
-		const { supportedDependencies } = dependencyConfigs
-		const supportedDependencyMap = new Map()
-
-		supportedDependencies.map((dependency) => {
-			const dependencyPackage = require(dependency.packageName)
-			supportedDependencyMap.set(dependency.name, dependencyPackage)
-			return dependency.name
-		})
-
-		const packages = packageLoader.packageLoader()
-
-		packages.forEach(packageInfo => {
-
-			const { packageName }  = packageInfo.packageMeta;
-
-
-
-
-			const { dependencyManager, requiredEnvs } = require(packageName)
-
-			requiredEnvsJSON.requiredEnvs = {
-				...requiredEnvsJSON.requiredEnvs,
-				...requiredEnvs,
-			}
-
-			if(packageInfo.requiredDependencies){
-			let requiredDependencies  = packageInfo.requiredDependencies();
-
-				if( requiredDependencies.length > 0) {
-
-					const injectionPackageMap = new Map()
-					const unsupportedDependencies = []
-
-					requiredDependencies.forEach(dependencyArray => {
-
-					if(dependencyArray.dependencies) {
-						dependencyArray.dependencies.map((dependency) => {
-
-						if (!supportedDependencyMap.has(dependency.name)) unsupportedDependencies.push(dependency.name)
-						else injectionPackageMap.set(dependency.name, supportedDependencyMap.get(dependency.name))
-						})
-					}
-					if (unsupportedDependencies.length > 0)
-						throw `Package ${packageName} requires unsupported dependencies: [${unsupportedDependencies}]`
-
-					const packageEnvironmentVariables = {}
-					Object.keys(requiredEnvs).map((envVariable) => {
-						packageEnvironmentVariables[envVariable] = process.env[envVariable]
-					})
-
-					dependencyManager(injectionPackageMap, packageEnvironmentVariables)
-
-					});
-				}
-			}
-
-		});
-
+		// const { supportedDependencies } = dependencyConfigs
+		// const supportedDependencyMap = new Map()
+		// supportedDependencies.map((dependency) => {
+		// 	const dependencyPackage = require(dependency.packageName)
+		// 	supportedDependencyMap.set(dependency.name, dependencyPackage)
+		// 	return dependency.name
+		// })
+		// const packages = packageLoader.packageLoader()
+		// packages.forEach(packageInfo => {
+		// 	const { packageName }  = packageInfo.packageMeta;
+		// 	const { dependencyManager, requiredEnvs } = require(packageName)
+		// 	requiredEnvsJSON.requiredEnvs = {
+		// 		...requiredEnvsJSON.requiredEnvs,
+		// 		...requiredEnvs,
+		// 	}
+		// 	if(packageInfo.requiredDependencies){
+		// 	let requiredDependencies  = packageInfo.requiredDependencies();
+		// 		if( requiredDependencies.length > 0) {
+		// 			const injectionPackageMap = new Map()
+		// 			const unsupportedDependencies = []
+		// 			requiredDependencies.forEach(dependencyArray => {
+		// 			if(dependencyArray.dependencies) {
+		// 				dependencyArray.dependencies.map((dependency) => {
+		// 				if (!supportedDependencyMap.has(dependency.name)) unsupportedDependencies.push(dependency.name)
+		// 				else injectionPackageMap.set(dependency.name, supportedDependencyMap.get(dependency.name))
+		// 				})
+		// 			}
+		// 			if (unsupportedDependencies.length > 0)
+		// 				throw `Package ${packageName} requires unsupported dependencies: [${unsupportedDependencies}]`
+		// 			const packageEnvironmentVariables = {}
+		// 			Object.keys(requiredEnvs).map((envVariable) => {
+		// 				packageEnvironmentVariables[envVariable] = process.env[envVariable]
+		// 			})
+		// 			dependencyManager(injectionPackageMap, packageEnvironmentVariables)
+		// 			});
+		// 		}
+		// 	}
+		// });
 	} catch (error) {
 		console.log('Dependency Manager Error: ', error)
 		throw error