mysqlsyncr 1.0.88 → 1.0.92

package/dist/index.cjs

@@ -5235,13 +5235,15 @@ var compare = /*#__PURE__*/function () {
                               type: 'success',
                               diffs: diffs
                             });
-                          case 4:
+                            _context3.next = 6;
+                            return checker.closeConnection();
+                          case 6:
                           case "end":
                             return _context3.stop();
                         }
                       }, _callee3);
                     })));
-                    _context4.next = 8;
+                    _context4.next = 10;
                     break;
                   case 5:
                     _context4.prev = 5;
@@ -5250,21 +5252,13 @@ var compare = /*#__PURE__*/function () {
                       type: 'error',
                       error: _context4.t0.message
                     });
-                  case 8:
-                    _context4.prev = 8;
-                    if (!checker) {
-                      _context4.next = 12;
-                      break;
-                    }
-                    _context4.next = 12;
+                    _context4.next = 10;
                     return checker.closeConnection();
-                  case 12:
-                    return _context4.finish(8);
-                  case 13:
+                  case 10:
                   case "end":
                     return _context4.stop();
                 }
-              }, _callee4, null, [[0, 5, 8, 13]]);
+              }, _callee4, null, [[0, 5]]);
             }));
             return function (_x3, _x4) {
               return _ref2.apply(this, arguments);
@@ -5281,24 +5275,39 @@ var compare = /*#__PURE__*/function () {
   };
 }();
 var apply = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(config, database, diffs) {
-    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-      while (1) switch (_context7.prev = _context7.next) {
+  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(config, database, diffs) {
+    return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+      while (1) switch (_context8.prev = _context8.next) {
         case 0:
-          return _context7.abrupt("return", new Promise(function (resolve, reject) {
+          return _context8.abrupt("return", new Promise(function (resolve, reject) {
             var checker;
             try {
               checker = new DBStructureChecker(config, database);
-              checker.connection.on('error', function (err) {
-                console.error('Database connection error in route apply:', err);
-                reject({
-                  type: 'error',
-                  error: err.message
-                });
-              });
-              checker.connection.on('connect', /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-                return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-                  while (1) switch (_context6.prev = _context6.next) {
+              checker.connection.on('error', /*#__PURE__*/function () {
+                var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(err) {
+                  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+                    while (1) switch (_context6.prev = _context6.next) {
+                      case 0:
+                        console.error('Database connection error in route apply:', err);
+                        reject({
+                          type: 'error',
+                          error: err.message
+                        });
+                        _context6.next = 4;
+                        return checker.closeConnection();
+                      case 4:
+                      case "end":
+                        return _context6.stop();
+                    }
+                  }, _callee6);
+                }));
+                return function (_x8) {
+                  return _ref5.apply(this, arguments);
+                };
+              }());
+              checker.connection.on('connect', /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+                return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+                  while (1) switch (_context7.prev = _context7.next) {
                     case 0:
                       console.log('Connected to the database');
                       checker.targetDatabase = database;
@@ -5308,39 +5317,34 @@ var apply = /*#__PURE__*/function () {
                         database: database,
                         diffs: diffs
                       };
-                      _context6.prev = 4;
+                      _context7.prev = 4;
                       console.log('Applying the database structure based on JSON dumps');
-                      _context6.next = 8;
+                      _context7.next = 8;
                       return applyDifferences(checker.connection, database, diffs);
                     case 8:
                       resolve({
                         type: 'success',
                         message: 'Apply completed successfully'
                       });
-                      _context6.next = 14;
-                      break;
+                      _context7.next = 11;
+                      return checker.closeConnection();
                     case 11:
-                      _context6.prev = 11;
-                      _context6.t0 = _context6["catch"](4);
+                      _context7.next = 18;
+                      break;
+                    case 13:
+                      _context7.prev = 13;
+                      _context7.t0 = _context7["catch"](4);
                       reject({
                         type: 'error',
-                        error: _context6.t0.message
+                        error: _context7.t0.message
                       });
-                    case 14:
-                      _context6.prev = 14;
-                      if (!checker) {
-                        _context6.next = 18;
-                        break;
-                      }
-                      _context6.next = 18;
+                      _context7.next = 18;
                       return checker.closeConnection();
                     case 18:
-                      return _context6.finish(14);
-                    case 19:
                     case "end":
-                      return _context6.stop();
+                      return _context7.stop();
                   }
-                }, _callee6, null, [[4, 11, 14, 19]]);
+                }, _callee7, null, [[4, 13]]);
               })));
             } catch (e) {
               reject({
@@ -5351,9 +5355,9 @@ var apply = /*#__PURE__*/function () {
           }));
         case 1:
         case "end":
-          return _context7.stop();
+          return _context8.stop();
       }
-    }, _callee7);
+    }, _callee8);
   }));
   return function apply(_x5, _x6, _x7) {
     return _ref4.apply(this, arguments);
@@ -5372,15 +5376,15 @@ var isMain = function () {
   }
 }();
 if (isMain) {
-  _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+  _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
     var _cli, command, config, argv, PORT, checker;
-    return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-      while (1) switch (_context9.prev = _context9.next) {
+    return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+      while (1) switch (_context10.prev = _context10.next) {
         case 0:
           _cli = cli(), command = _cli.command, config = _cli.config, argv = _cli.argv;
           console.log("MySQLsyncr started via command line");
           if (!(command === 'ui')) {
-            _context9.next = 12;
+            _context10.next = 12;
             break;
           }
           PORT = argv.uiPort;
@@ -5388,58 +5392,58 @@ if (isMain) {
           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')) {
-            _context9.next = 10;
+            _context10.next = 10;
             break;
           }
-          _context9.next = 10;
+          _context10.next = 10;
           return open("http://localhost:".concat(PORT));
         case 10:
-          _context9.next = 14;
+          _context10.next = 14;
           break;
         case 12:
           // Handle other commands (dump, compare, update) as before
           checker = new DBStructureChecker(config, argv.database);
-          checker.connection.on('connect', /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+          checker.connection.on('connect', /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
             var diffs, totalDiffs, _totalDiffs, previousDiffs, runCount, maxRuns, _diffs;
-            return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-              while (1) switch (_context8.prev = _context8.next) {
+            return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+              while (1) switch (_context9.prev = _context9.next) {
                 case 0:
                   console.log('Connected to the database');
                   checker.targetDatabase = argv.database;
                   checker.command = command;
                   checker.options = argv;
-                  _context8.prev = 4;
+                  _context9.prev = 4;
                   if (!(command === 'dump')) {
-                    _context8.next = 11;
+                    _context9.next = 11;
                     break;
                   }
                   console.log('Dumping the database structure to files');
-                  _context8.next = 9;
+                  _context9.next = 9;
                   return dumpAllDatabases(checker.connection, command, argv);
                 case 9:
-                  _context8.next = 42;
+                  _context9.next = 42;
                   break;
                 case 11:
                   if (!(command === 'compare')) {
-                    _context8.next = 21;
+                    _context9.next = 21;
                     break;
                   }
                   console.log('Comparing the database structure with JSON dumps (dry run)');
-                  _context8.next = 15;
+                  _context9.next = 15;
                   return compareAllDatabases(checker.connection, argv.output, false, command, argv);
                 case 15:
-                  diffs = _context8.sent;
+                  diffs = _context9.sent;
                   // Dry run
                   totalDiffs = Object.values(diffs).reduce(function (acc, arr) {
                     return acc + arr.length;
                   }, 0);
                   console.log('Total differences count:', totalDiffs);
                   fs.writeFileSync(path.join(argv.output, 'diffs.json'), JSON.stringify(diffs, null, 4));
-                  _context8.next = 42;
+                  _context9.next = 42;
                   break;
                 case 21:
                   if (!(command === 'update')) {
-                    _context8.next = 42;
+                    _context9.next = 42;
                     break;
                   }
                   console.log('Updating the database structure based on JSON dumps');
@@ -5449,14 +5453,14 @@ if (isMain) {
                   maxRuns = 6;
                 case 27:
                   if (!(runCount < maxRuns && _totalDiffs > 0 && (_totalDiffs < previousDiffs || previousDiffs === Infinity))) {
-                    _context8.next = 42;
+                    _context9.next = 42;
                     break;
                   }
                   console.log('Running update command. Run count:', runCount);
-                  _context8.next = 31;
+                  _context9.next = 31;
                   return compareAllDatabases(checker.connection, argv.output, true, command, argv);
                 case 31:
-                  _diffs = _context8.sent;
+                  _diffs = _context9.sent;
                   // Apply updates
                   previousDiffs = _totalDiffs; // Update previous differences
                   _totalDiffs = Object.values(_diffs).reduce(function (acc, arr) {
@@ -5465,41 +5469,41 @@ if (isMain) {
                   console.log('Total differences count:', _totalDiffs);
                   runCount++;
                   if (!(_totalDiffs > 0 && runCount < maxRuns)) {
-                    _context8.next = 40;
+                    _context9.next = 40;
                     break;
                   }
                   console.log('Total differences count is still greater than 0. Waiting 1 second before next run. Run count:', runCount);
-                  _context8.next = 40;
+                  _context9.next = 40;
                   return new Promise(function (resolve) {
                     return setTimeout(resolve, 1000);
                   });
                 case 40:
-                  _context8.next = 27;
+                  _context9.next = 27;
                   break;
                 case 42:
-                  _context8.next = 47;
+                  _context9.next = 47;
                   break;
                 case 44:
-                  _context8.prev = 44;
-                  _context8.t0 = _context8["catch"](4);
-                  console.error(_context8.t0.message);
+                  _context9.prev = 44;
+                  _context9.t0 = _context9["catch"](4);
+                  console.error(_context9.t0.message);
                 case 47:
-                  _context8.prev = 47;
-                  _context8.next = 50;
+                  _context9.prev = 47;
+                  _context9.next = 50;
                   return checker.closeConnection();
                 case 50:
-                  return _context8.finish(47);
+                  return _context9.finish(47);
                 case 51:
                 case "end":
-                  return _context8.stop();
+                  return _context9.stop();
               }
-            }, _callee8, null, [[4, 44, 47, 51]]);
+            }, _callee9, null, [[4, 44, 47, 51]]);
           })));
         case 14:
         case "end":
-          return _context9.stop();
+          return _context10.stop();
       }
-    }, _callee9);
+    }, _callee10);
   }))();
 }
 
@@ -5507,4 +5511,5 @@ exports.DBStructureChecker = DBStructureChecker;
 exports.apply = apply;
 exports.compare = compare;
 exports.dumpAllDatabases = dumpAllDatabases;
+exports.getDatabasesFromExistingDumps = getDatabasesFromExistingDumps;
 exports.startApiServer = startApiServer;

package/dist/index.js

@@ -5232,13 +5232,15 @@ var compare = /*#__PURE__*/function () {
                               type: 'success',
                               diffs: diffs
                             });
-                          case 4:
+                            _context3.next = 6;
+                            return checker.closeConnection();
+                          case 6:
                           case "end":
                             return _context3.stop();
                         }
                       }, _callee3);
                     })));
-                    _context4.next = 8;
+                    _context4.next = 10;
                     break;
                   case 5:
                     _context4.prev = 5;
@@ -5247,21 +5249,13 @@ var compare = /*#__PURE__*/function () {
                       type: 'error',
                       error: _context4.t0.message
                     });
-                  case 8:
-                    _context4.prev = 8;
-                    if (!checker) {
-                      _context4.next = 12;
-                      break;
-                    }
-                    _context4.next = 12;
+                    _context4.next = 10;
                     return checker.closeConnection();
-                  case 12:
-                    return _context4.finish(8);
-                  case 13:
+                  case 10:
                   case "end":
                     return _context4.stop();
                 }
-              }, _callee4, null, [[0, 5, 8, 13]]);
+              }, _callee4, null, [[0, 5]]);
             }));
             return function (_x3, _x4) {
               return _ref2.apply(this, arguments);
@@ -5278,24 +5272,39 @@ var compare = /*#__PURE__*/function () {
   };
 }();
 var apply = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(config, database, diffs) {
-    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-      while (1) switch (_context7.prev = _context7.next) {
+  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(config, database, diffs) {
+    return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+      while (1) switch (_context8.prev = _context8.next) {
         case 0:
-          return _context7.abrupt("return", new Promise(function (resolve, reject) {
+          return _context8.abrupt("return", new Promise(function (resolve, reject) {
             var checker;
             try {
               checker = new DBStructureChecker(config, database);
-              checker.connection.on('error', function (err) {
-                console.error('Database connection error in route apply:', err);
-                reject({
-                  type: 'error',
-                  error: err.message
-                });
-              });
-              checker.connection.on('connect', /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-                return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-                  while (1) switch (_context6.prev = _context6.next) {
+              checker.connection.on('error', /*#__PURE__*/function () {
+                var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(err) {
+                  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+                    while (1) switch (_context6.prev = _context6.next) {
+                      case 0:
+                        console.error('Database connection error in route apply:', err);
+                        reject({
+                          type: 'error',
+                          error: err.message
+                        });
+                        _context6.next = 4;
+                        return checker.closeConnection();
+                      case 4:
+                      case "end":
+                        return _context6.stop();
+                    }
+                  }, _callee6);
+                }));
+                return function (_x8) {
+                  return _ref5.apply(this, arguments);
+                };
+              }());
+              checker.connection.on('connect', /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+                return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+                  while (1) switch (_context7.prev = _context7.next) {
                     case 0:
                       console.log('Connected to the database');
                       checker.targetDatabase = database;
@@ -5305,39 +5314,34 @@ var apply = /*#__PURE__*/function () {
                         database: database,
                         diffs: diffs
                       };
-                      _context6.prev = 4;
+                      _context7.prev = 4;
                       console.log('Applying the database structure based on JSON dumps');
-                      _context6.next = 8;
+                      _context7.next = 8;
                       return applyDifferences(checker.connection, database, diffs);
                     case 8:
                       resolve({
                         type: 'success',
                         message: 'Apply completed successfully'
                       });
-                      _context6.next = 14;
-                      break;
+                      _context7.next = 11;
+                      return checker.closeConnection();
                     case 11:
-                      _context6.prev = 11;
-                      _context6.t0 = _context6["catch"](4);
+                      _context7.next = 18;
+                      break;
+                    case 13:
+                      _context7.prev = 13;
+                      _context7.t0 = _context7["catch"](4);
                       reject({
                         type: 'error',
-                        error: _context6.t0.message
+                        error: _context7.t0.message
                       });
-                    case 14:
-                      _context6.prev = 14;
-                      if (!checker) {
-                        _context6.next = 18;
-                        break;
-                      }
-                      _context6.next = 18;
+                      _context7.next = 18;
                       return checker.closeConnection();
                     case 18:
-                      return _context6.finish(14);
-                    case 19:
                     case "end":
-                      return _context6.stop();
+                      return _context7.stop();
                   }
-                }, _callee6, null, [[4, 11, 14, 19]]);
+                }, _callee7, null, [[4, 13]]);
               })));
             } catch (e) {
               reject({
@@ -5348,9 +5352,9 @@ var apply = /*#__PURE__*/function () {
           }));
         case 1:
         case "end":
-          return _context7.stop();
+          return _context8.stop();
       }
-    }, _callee7);
+    }, _callee8);
   }));
   return function apply(_x5, _x6, _x7) {
     return _ref4.apply(this, arguments);
@@ -5369,15 +5373,15 @@ var isMain = function () {
   }
 }();
 if (isMain) {
-  _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+  _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
     var _cli, command, config, argv, PORT, checker;
-    return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-      while (1) switch (_context9.prev = _context9.next) {
+    return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+      while (1) switch (_context10.prev = _context10.next) {
         case 0:
           _cli = cli(), command = _cli.command, config = _cli.config, argv = _cli.argv;
           console.log("MySQLsyncr started via command line");
           if (!(command === 'ui')) {
-            _context9.next = 12;
+            _context10.next = 12;
             break;
           }
           PORT = argv.uiPort;
@@ -5385,58 +5389,58 @@ if (isMain) {
           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')) {
-            _context9.next = 10;
+            _context10.next = 10;
             break;
           }
-          _context9.next = 10;
+          _context10.next = 10;
           return open("http://localhost:".concat(PORT));
         case 10:
-          _context9.next = 14;
+          _context10.next = 14;
           break;
         case 12:
           // Handle other commands (dump, compare, update) as before
           checker = new DBStructureChecker(config, argv.database);
-          checker.connection.on('connect', /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+          checker.connection.on('connect', /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
             var diffs, totalDiffs, _totalDiffs, previousDiffs, runCount, maxRuns, _diffs;
-            return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-              while (1) switch (_context8.prev = _context8.next) {
+            return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+              while (1) switch (_context9.prev = _context9.next) {
                 case 0:
                   console.log('Connected to the database');
                   checker.targetDatabase = argv.database;
                   checker.command = command;
                   checker.options = argv;
-                  _context8.prev = 4;
+                  _context9.prev = 4;
                   if (!(command === 'dump')) {
-                    _context8.next = 11;
+                    _context9.next = 11;
                     break;
                   }
                   console.log('Dumping the database structure to files');
-                  _context8.next = 9;
+                  _context9.next = 9;
                   return dumpAllDatabases(checker.connection, command, argv);
                 case 9:
-                  _context8.next = 42;
+                  _context9.next = 42;
                   break;
                 case 11:
                   if (!(command === 'compare')) {
-                    _context8.next = 21;
+                    _context9.next = 21;
                     break;
                   }
                   console.log('Comparing the database structure with JSON dumps (dry run)');
-                  _context8.next = 15;
+                  _context9.next = 15;
                   return compareAllDatabases(checker.connection, argv.output, false, command, argv);
                 case 15:
-                  diffs = _context8.sent;
+                  diffs = _context9.sent;
                   // Dry run
                   totalDiffs = Object.values(diffs).reduce(function (acc, arr) {
                     return acc + arr.length;
                   }, 0);
                   console.log('Total differences count:', totalDiffs);
                   fs$3.writeFileSync(path.join(argv.output, 'diffs.json'), JSON.stringify(diffs, null, 4));
-                  _context8.next = 42;
+                  _context9.next = 42;
                   break;
                 case 21:
                   if (!(command === 'update')) {
-                    _context8.next = 42;
+                    _context9.next = 42;
                     break;
                   }
                   console.log('Updating the database structure based on JSON dumps');
@@ -5446,14 +5450,14 @@ if (isMain) {
                   maxRuns = 6;
                 case 27:
                   if (!(runCount < maxRuns && _totalDiffs > 0 && (_totalDiffs < previousDiffs || previousDiffs === Infinity))) {
-                    _context8.next = 42;
+                    _context9.next = 42;
                     break;
                   }
                   console.log('Running update command. Run count:', runCount);
-                  _context8.next = 31;
+                  _context9.next = 31;
                   return compareAllDatabases(checker.connection, argv.output, true, command, argv);
                 case 31:
-                  _diffs = _context8.sent;
+                  _diffs = _context9.sent;
                   // Apply updates
                   previousDiffs = _totalDiffs; // Update previous differences
                   _totalDiffs = Object.values(_diffs).reduce(function (acc, arr) {
@@ -5462,42 +5466,42 @@ if (isMain) {
                   console.log('Total differences count:', _totalDiffs);
                   runCount++;
                   if (!(_totalDiffs > 0 && runCount < maxRuns)) {
-                    _context8.next = 40;
+                    _context9.next = 40;
                     break;
                   }
                   console.log('Total differences count is still greater than 0. Waiting 1 second before next run. Run count:', runCount);
-                  _context8.next = 40;
+                  _context9.next = 40;
                   return new Promise(function (resolve) {
                     return setTimeout(resolve, 1000);
                   });
                 case 40:
-                  _context8.next = 27;
+                  _context9.next = 27;
                   break;
                 case 42:
-                  _context8.next = 47;
+                  _context9.next = 47;
                   break;
                 case 44:
-                  _context8.prev = 44;
-                  _context8.t0 = _context8["catch"](4);
-                  console.error(_context8.t0.message);
+                  _context9.prev = 44;
+                  _context9.t0 = _context9["catch"](4);
+                  console.error(_context9.t0.message);
                 case 47:
-                  _context8.prev = 47;
-                  _context8.next = 50;
+                  _context9.prev = 47;
+                  _context9.next = 50;
                   return checker.closeConnection();
                 case 50:
-                  return _context8.finish(47);
+                  return _context9.finish(47);
                 case 51:
                 case "end":
-                  return _context8.stop();
+                  return _context9.stop();
               }
-            }, _callee8, null, [[4, 44, 47, 51]]);
+            }, _callee9, null, [[4, 44, 47, 51]]);
           })));
         case 14:
         case "end":
-          return _context9.stop();
+          return _context10.stop();
       }
-    }, _callee9);
+    }, _callee10);
   }))();
 }
 
-export { DBStructureChecker, apply, compare, dumpAllDatabases, startApiServer };
+export { DBStructureChecker, apply, compare, dumpAllDatabases, getDatabasesFromExistingDumps, startApiServer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysqlsyncr",
-  "version": "1.0.88",
+  "version": "1.0.92",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

package/src/index.js

@@ -5,7 +5,7 @@ import util from 'util';
 import fs from 'fs';
 import path from 'path';
 import { cli } from './cli.js';
-import { dumpAllDatabases } from './dump.js';
+import { dumpAllDatabases, getDatabasesFromExistingDumps } from './dump.js';
 import { compareAllDatabases } from './compare.js';
 import { startApiServer } from './socketServer.js'; // Import the new socket server
 import open from 'open';
@@ -53,15 +53,12 @@ const compare = async (config, output) => {
             checker.connection.on('connect', async () => {
                 const diffs = await compareAllDatabases(checker.connection, output, false, 'compare', { output: output });
                 resolve({ type: 'success', diffs });
-                
+                await checker.closeConnection();
             });
         } catch (e) {
             reject({ type: 'error', error: e.message });
-        } finally {
-            if (checker) {
-                await checker.closeConnection();
-            }
-        }
+            await checker.closeConnection();
+        } 
     });
 }
 
@@ -71,9 +68,10 @@ const apply = async (config, database, diffs) => {
         try {
             checker = new DBStructureChecker(config, database);
 
-            checker.connection.on('error', (err) => {
+            checker.connection.on('error', async (err) => {
                 console.error('Database connection error in route apply:', err);
                 reject({ type: 'error', error: err.message });
+                await checker.closeConnection();
             });
 
             checker.connection.on('connect', async () => {
@@ -85,12 +83,10 @@ const apply = async (config, database, diffs) => {
                     console.log('Applying the database structure based on JSON dumps');
                     await applyDifferences(checker.connection, database, diffs);
                     resolve({ type: 'success', message: 'Apply completed successfully' });
+                    await checker.closeConnection();
                 } catch (err) {
                     reject({ type: 'error', error: err.message });
-                } finally {
-                    if (checker) {
-                        await checker.closeConnection();
-                    }
+                    await checker.closeConnection();
                 }
             });
         } catch (e) {
@@ -99,7 +95,7 @@ const apply = async (config, database, diffs) => {
     });
 }
 
-export { DBStructureChecker, dumpAllDatabases, compare, startApiServer, apply };
+export { DBStructureChecker, dumpAllDatabases, compare, startApiServer, apply, getDatabasesFromExistingDumps };
 
 // Only run this if this is the main module
 const isMain = (() => {