mysqlsyncr 1.0.46 → 1.0.50

package/__tests__/import.js

@@ -0,0 +1,20 @@
+import { compare } from '../src/index.js';
+const dotenv = await import('dotenv');
+dotenv.config( { path: '../.env' } );
+console.log(`DB_STRUCTURE_PATH: ${process.env.DB_STRUCTURE_PATH}`);
+console.log(`DB_PASSWORD: ${process.env.DB_PASSWORD}`);
+const config ={
+    host: "127.0.0.1",
+    user: 'root',
+    password: process.env.DB_PASSWORD,
+    port: 3306
+};
+const testDbConnection = async () => {
+        
+        const diffs = await compare(config, process.env.DB_STRUCTURE_PATH);
+    console.log(diffs);
+}
+
+testDbConnection();
+
+

package/__tests__/import.test.js

@@ -0,0 +1,27 @@
+const { DBStructureChecker, compareAllDatabases } = import('../src/index.js');
+const dotenv = require('dotenv');
+dotenv.config();
+const config ={
+    host: "127.0.0.1",
+    user: 'root',
+    password: process.env.DB_PASSWORD,
+    port: 3306
+};
+
+describe('Connect to database', () => {
+
+    test('should run a comparison of the DB structure', async () => {
+        const checker = new DBStructureChecker(config);
+        
+        const diffs = await compareAllDatabases(
+            checker.connection, 
+            process.env.DB_STRUCTURE_PATH, 
+            false, 
+            'compare'
+        );
+        
+        expect(Array.isArray(diffs)).toBe(true);
+    });
+
+
+}); 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysqlsyncr",
-  "version": "1.0.46",
+  "version": "1.0.50",
   "description": "",
   "main": "src/index.js",
   "type": "module",
@@ -28,7 +28,8 @@
   "devDependencies": {
     "@babel/preset-env": "^7.26.0",
     "babel-jest": "^29.7.0",
-    "jest": "^29.0.0"
+    "jest": "^29.0.0",
+    "dotenv": "^16.4.5"
   },
   "babel": {
     "presets": [

package/src/compare.js

@@ -13,6 +13,8 @@ export const compareAllDatabases = async (connection, inputDir, update = false,
     let expectedDatabases = await fs.readdir(inputDir);
     //filter out diffs.json
     expectedDatabases = expectedDatabases.filter(file => file !== 'diffs.json');
+    //filter out dumpInfo.json
+    expectedDatabases = expectedDatabases.filter(file => file !== 'dumpInfo.json');
     // console.log('Expected databases from input directory:', expectedDatabases);
 
     // Check existing databases
@@ -24,7 +26,7 @@ export const compareAllDatabases = async (connection, inputDir, update = false,
 
     // Note missing databases and prepare to create them
     for (const database of expectedDatabases) {
-        if(options.database && options.database !== database){
+        if(options && options.database && options.database !== database){
             continue;
         }
 
@@ -56,7 +58,7 @@ export const compareAllDatabases = async (connection, inputDir, update = false,
     }
 
     for (const database of expectedDatabases) {
-        if(options.database && options.database !== database){
+        if(options && options.database && options.database !== database){
             continue;
         }
         if(missingDatabases.includes(database)){

package/src/dump.js

@@ -3,8 +3,8 @@ import fs from 'fs/promises';
 import path from 'path';
 import { getDatabases, getDatabaseStructure } from './getters.js';
 
-const require = createRequire(import.meta.url);
-const { version } = require('../package.json');
+// const require = createRequire(import.meta.url);
+// const { version } = require('../package.json');
 
 export const dumpAllDatabases = async (connection, command, options) => {
     let response = {}
@@ -21,7 +21,7 @@ export const dumpAllDatabases = async (connection, command, options) => {
         response[database] = dbStructure;
     }
 
-    await fs.writeFile(path.join(options.output, 'dumpInfo.json'), JSON.stringify({timestamp: new Date().toISOString(), version: version}, null, 4), 'utf-8');
+    await fs.writeFile(path.join(options.output, 'dumpInfo.json'), JSON.stringify({timestamp: new Date().toISOString()}, null, 4), 'utf-8');
     return response;
 }
 

package/src/index.js

@@ -45,16 +45,34 @@ class DBStructureChecker {
 
 }
 
+const compare = async (config, output) => {
+    return new Promise((resolve, reject) => {   
+        try {   
+            const checker = new DBStructureChecker(config);
+            checker.connection.on('connect', async () => {
+                const diffs = await compareAllDatabases(checker.connection, output, false, 'compare', {output: output});
+                resolve(diffs);
+            });
+        } catch (e) {
+            reject(e);
+        }
+    });
+}
+
 // Export the DBStructureChecker class
-export { DBStructureChecker, dumpAllDatabases, compareAllDatabases, startApiServer };
+export { DBStructureChecker, dumpAllDatabases, compare, startApiServer };
 
 // Only run this if this is the main module
-const isMain = fileURLToPath(import.meta.url) === path.resolve(process.argv[1]);
+const isMain = (() => {
+    try {
+        return require.main === module;
+    } catch (e) {
+        return false;
+    }
+})();
 
 if (isMain) {
     (async () => {
-        console.log(`meta: ${import.meta.url}`)
-        console.log(`argv: ${process.argv[1]}`)
         const { command, config, argv } = cli();
         console.log("MySQLsyncr started via command line")
         if (command === 'ui') {

package/src/socketServer.js

@@ -36,8 +36,10 @@ export const startApiServer = (port, argv) => {
     app.use(express.json({ limit: '50mb' })); 
     app.use(express.urlencoded({ limit: '50mb', extended: true })); 
 
-    const __filename = fileURLToPath(import.meta.url);
-    const __dirname = dirname(__filename);
+    const __dirname = process.platform === "win32" 
+        ? process.cwd().replace(/\\/g, '/') 
+        : process.cwd();
+
     app.use(express.static(join(__dirname, '../ui/dist/spa')));
 
     app.post('/api/getDatabasesFromExistingDumps', async (req, res) => {