mysqlsyncr 1.0.38 → 1.0.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysqlsyncr",
-  "version": "1.0.38",
+  "version": "1.0.42",
   "description": "",
   "main": "src/index.js",
   "type": "module",

package/src/index.js

@@ -45,62 +45,64 @@ class DBStructureChecker {
 }
 
 // Export the DBStructureChecker class
-export { DBStructureChecker };
+export { DBStructureChecker, dumpAllDatabases, compareAllDatabases, startApiServer };
 
-// Start the server only if the 'ui' command is used
-(async () => {
-    const { command, config, argv } = cli();
-
-    if (command === 'ui') {
-        const PORT = argv.uiPort
-        startApiServer(PORT); // Start the Socket.IO server
-        console.log('Server started on port', PORT);
-        console.log('Open http://localhost:' + PORT + ' in your browser to use the UI');
-        if(argv.openUI){
-            await open(`http://localhost:${PORT}`);
-        }
-    } else {
-        // Handle other commands (dump, compare, update) as before
-        const checker = new DBStructureChecker(config, argv.database);
-        checker.connection.on('connect', async () => {
-            console.log('Connected to the database');
-            checker.targetDatabase = argv.database;
-            checker.command = command;
-            checker.options = argv;
-            try {
-                if (command === 'dump') {
-                    console.log('Dumping the database structure to files');
-                    await dumpAllDatabases(checker.connection, command, argv);
-                } else if (command === 'compare') {
-                    console.log('Comparing the database structure with JSON dumps (dry run)');
-                    let diffs = await compareAllDatabases(checker.connection, argv.output, false, command, argv); // Dry run
-                    let totalDiffs = Object.values(diffs).reduce((acc, arr) => acc + arr.length, 0);
-                    console.log('Total differences count:', totalDiffs);
-                    fs.writeFileSync(path.join(argv.output, 'diffs.json'), JSON.stringify(diffs, null, 4));
-                } else if (command === 'update') {
-                    console.log('Updating the database structure based on JSON dumps');
-                    let totalDiffs = Infinity; // Initialize with a large number
-                    let previousDiffs = totalDiffs; // Store previous differences
-                    let runCount = 0; // Counter for the number of runs
-                    let maxRuns = 6;
-                    while (runCount < maxRuns && totalDiffs > 0 && (totalDiffs < previousDiffs || previousDiffs === Infinity)) {
-                        console.log('Running update command. Run count:', runCount);
-                        let diffs = await compareAllDatabases(checker.connection, argv.output, true, command, argv); // Apply updates
-                        previousDiffs = totalDiffs; // Update previous differences
-                        totalDiffs = Object.values(diffs).reduce((acc, arr) => acc + arr.length, 0);
+// Only run this if this is the main module
+if (import.meta.url === `file://${process.argv[1]}`) {
+    (async () => {
+        const { command, config, argv } = cli();
+        console.log("MySQLsyncr started via command line")
+        if (command === 'ui') {
+            const PORT = argv.uiPort
+            startApiServer(PORT, argv); // Start the Socket.IO server
+            console.log('Server started on port', PORT);
+            console.log('Open http://localhost:' + PORT + ' in your browser to use the UI');
+            if(argv.openUI && argv.openUI === true || argv.openUI === 'true'){
+                await open(`http://localhost:${PORT}`);
+            }
+        } else {
+            // Handle other commands (dump, compare, update) as before
+            const checker = new DBStructureChecker(config, argv.database);
+            checker.connection.on('connect', async () => {
+                console.log('Connected to the database');
+                checker.targetDatabase = argv.database;
+                checker.command = command;
+                checker.options = argv;
+                try {
+                    if (command === 'dump') {
+                        console.log('Dumping the database structure to files');
+                        await dumpAllDatabases(checker.connection, command, argv);
+                    } else if (command === 'compare') {
+                        console.log('Comparing the database structure with JSON dumps (dry run)');
+                        let diffs = await compareAllDatabases(checker.connection, argv.output, false, command, argv); // Dry run
+                        let totalDiffs = Object.values(diffs).reduce((acc, arr) => acc + arr.length, 0);
                         console.log('Total differences count:', totalDiffs);
-                        runCount++;
-                        if(totalDiffs > 0 && runCount < maxRuns){
-                            console.log('Total differences count is still greater than 0. Waiting 1 second before next run. Run count:', runCount);
-                            await new Promise(resolve => setTimeout(resolve, 1000));
+                        fs.writeFileSync(path.join(argv.output, 'diffs.json'), JSON.stringify(diffs, null, 4));
+                    } else if (command === 'update') {
+                        console.log('Updating the database structure based on JSON dumps');
+                        let totalDiffs = Infinity; // Initialize with a large number
+                        let previousDiffs = totalDiffs; // Store previous differences
+                        let runCount = 0; // Counter for the number of runs
+                        let maxRuns = 6;
+                        while (runCount < maxRuns && totalDiffs > 0 && (totalDiffs < previousDiffs || previousDiffs === Infinity)) {
+                            console.log('Running update command. Run count:', runCount);
+                            let diffs = await compareAllDatabases(checker.connection, argv.output, true, command, argv); // Apply updates
+                            previousDiffs = totalDiffs; // Update previous differences
+                            totalDiffs = Object.values(diffs).reduce((acc, arr) => acc + arr.length, 0);
+                            console.log('Total differences count:', totalDiffs);
+                            runCount++;
+                            if(totalDiffs > 0 && runCount < maxRuns){
+                                console.log('Total differences count is still greater than 0. Waiting 1 second before next run. Run count:', runCount);
+                                await new Promise(resolve => setTimeout(resolve, 1000));
+                            }
                         }
                     }
+                } catch (err) {
+                    console.error(err.message);
+                } finally {
+                    await checker.closeConnection();
                 }
-            } catch (err) {
-                console.error(err.message);
-            } finally {
-                await checker.closeConnection();
-            }
-        });
-    }
-})();
+            });
+        }
+    })();
+}

package/src/socketServer.js

@@ -10,26 +10,47 @@ import { dirname, join } from 'path';
 import { readdir, mkdir } from 'fs/promises';
 import { resolve } from 'path';
 
-export const startApiServer = (port) => {
+const setConfig = (config, argv) => {
+    if(!config.host && argv.host){
+        config.host = argv.host;
+    }
+    if(!config.port && argv.port){
+        config.port = argv.port;
+    }
+    if(!config.user && argv.user){
+        config.user = argv.user;
+    }
+    if(!config.password && argv.password){
+        config.password = argv.password;
+    }
+    if(!config.output && argv.output !=='../db-dump'){
+        config.output = argv.output;
+    }
+    return config;
+}
+
+export const startApiServer = (port, argv) => {
     const app = express();
     app.use(cors({ origin: '*' }));
     const server = http.createServer(app);
-    app.use(express.json({ limit: '50mb' })); // Increased payload limit
-    app.use(express.urlencoded({ limit: '50mb', extended: true })); // Also handle URL-encoded data
+    app.use(express.json({ limit: '50mb' })); 
+    app.use(express.urlencoded({ limit: '50mb', extended: true })); 
 
     const __filename = fileURLToPath(import.meta.url);
     const __dirname = dirname(__filename);
     app.use(express.static(join(__dirname, '../ui/dist/spa')));
 
     app.post('/api/getDatabasesFromExistingDumps', async (req, res) => {
-        const { config } = req.body;
+        let { config } = req.body;
+        config = setConfig(config, argv);
         const databases = await getDatabasesFromExistingDumps(config);
         res.json(databases);
     });
 
     // API endpoint to dump the database
     app.post('/api/dump', async (req, res) => {
-        const { config, database } = req.body;
+        let { config, database } = req.body;
+        config = setConfig(config, argv);
         const checker = new DBStructureChecker(config, database);
 
         checker.connection.on('error', (err) => {
@@ -56,8 +77,9 @@ export const startApiServer = (port) => {
 
     // API endpoint to compare the database
     app.post('/api/compare', async (req, res) => {
-        const { config } = req.body;
-        const checker = new DBStructureChecker(config, config.database);
+        let { config, database } = req.body;
+        config = setConfig(config, argv);
+        const checker = new DBStructureChecker(config, database);
 
         checker.connection.on('error', (err) => {
             console.error('Database connection error in route compare:', err);
@@ -87,7 +109,8 @@ export const startApiServer = (port) => {
 
     // API endpoint to apply differences
     app.post('/api/apply', async (req, res) => {
-        const { config, database, diffs } = req.body;
+        let { config, database, diffs } = req.body;
+        config = setConfig(config, argv);
         console.log('Applying differences:', diffs);
         const checker = new DBStructureChecker(config, database);