mwalajs 1.1.2 → 1.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mwalajs",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "MwalaJS Framework CLI Tool and Web Framework for Backend and Frontend Development.",
   "type": "module",
   "main": "app.mjs",

package/utils/dbUtils.mjs

@@ -55,6 +55,31 @@ const suggestDbSetup = () => {
   console.log('   DB_PASSWORD=               ← can be empty (just leave blank)\n');
 };
 
+// === WINDOWS MYSQL TOOLS AUTO-DETECTION ===
+let mysqlTools = null;
+if (process.platform === 'win32') {
+  const commonPaths = [
+    'C:\\Program Files\\MySQL\\MySQL Server 8.0\\bin',
+    'C:\\Program Files\\MySQL\\MySQL Server 8.4\\bin',
+    'C:\\Program Files (x86)\\MySQL\\MySQL Server 8.0\\bin',
+    'C:\\xampp\\mysql\\bin',
+    'C:\\wamp64\\bin\\mysql\\mysql8.0.31\\bin',
+    'C:\\laragon\\bin\\mysql\\mysql-8.0.30-winx64\\bin',
+    'C:\\Program Files\\MariaDB 10.6\\bin',
+  ];
+
+  for (const basePath of commonPaths) {
+    if (fs.existsSync(basePath)) {
+      const mysqldump = path.join(basePath, 'mysqldump.exe');
+      const mysqlCmd = path.join(basePath, 'mysql.exe');
+      if (fs.existsSync(mysqldump) && fs.existsSync(mysqlCmd)) {
+        mysqlTools = { mysqldump, mysql: mysqlCmd };
+        break;
+      }
+    }
+  }
+}
+
 // Global connection cache
 let connection = null;
 
@@ -71,7 +96,7 @@ const getConnection = async () => {
       connection = await mysql.createConnection({
         host: DB_HOST,
         user: DB_USER,
-        password: DB_PASSWORD, // Now safely allows empty string
+        password: DB_PASSWORD,
         database: DB_NAME,
         port: DB_PORT || 3306
       });
@@ -298,19 +323,43 @@ export const backupDatabase = () => {
 
   try {
     if (DB_TYPE === 'mysql') {
-      execSync(`mysqldump -h ${DB_HOST} -u ${DB_USER} -p${DB_PASSWORD} ${DB_NAME} > "${file}"`);
+      let cmd;
+      if (process.platform === 'win32' && mysqlTools) {
+        // Use full path on Windows
+        cmd = `"${mysqlTools.mysqldump}" -h ${DB_HOST} -u ${DB_USER} ${DB_PASSWORD ? '-p' + DB_PASSWORD : ''} ${DB_NAME} > "${file}"`;
+      } else {
+        // Linux/macOS or if in PATH
+        cmd = `mysqldump -h ${DB_HOST} -u ${DB_USER} ${DB_PASSWORD ? '-p' + DB_PASSWORD : ''} ${DB_NAME} > "${file}"`;
+      }
+      execSync(cmd, { stdio: 'inherit' });
     } 
     else if (DB_TYPE === 'postgresql') {
       process.env.PGPASSWORD = DB_PASSWORD;
-      execSync(`pg_dump -h ${DB_HOST} -U ${DB_USER} ${DB_NAME} > "${file}"`);
+      execSync(`pg_dump -h ${DB_HOST} -U ${DB_USER} ${DB_NAME} > "${file}"`, { stdio: 'inherit' });
     } 
     else if (DB_TYPE === 'sqlite') {
-      fs.copyFileSync(path.join(process.cwd(), `${DB_NAME}.sqlite`), file.replace('.sql', '.sqlite'));
+      const source = path.join(process.cwd(), `${DB_NAME}.sqlite`);
+      const backupFile = file.replace('.sql', '.sqlite');
+      if (fs.existsSync(source)) {
+        fs.copyFileSync(source, backupFile);
+        console.log(` Backup saved: ${backupFile}`);
+        return;
+      } else {
+        console.log(' No SQLite database file found to backup.');
+        return;
+      }
     }
 
     console.log(` Backup saved: ${file}`);
   } catch (err) {
-    console.error(' Backup failed:', err.message);
+    console.error(' Backup failed.');
+    if (process.platform === 'win32' && !mysqlTools) {
+      console.log('\n❌ mysqldump.exe not found.');
+      console.log('   Install MySQL or use XAMPP/WAMP/Laragon.');
+      console.log('   Or add MySQL bin folder to your system PATH.');
+    } else {
+      console.error(' Error:', err.message);
+    }
   }
 };
 
@@ -322,17 +371,26 @@ export const restoreDatabase = (file) => {
 
   try {
     if (DB_TYPE === 'mysql') {
-      execSync(`mysql -h ${DB_HOST} -u ${DB_USER} -p${DB_PASSWORD} ${DB_NAME} < "${file}"`);
+      let cmd;
+      if (process.platform === 'win32' && mysqlTools) {
+        cmd = `"${mysqlTools.mysql}" -h ${DB_HOST} -u ${DB_USER} ${DB_PASSWORD ? '-p' + DB_PASSWORD : ''} ${DB_NAME} < "${file}"`;
+      } else {
+        cmd = `mysql -h ${DB_HOST} -u ${DB_USER} ${DB_PASSWORD ? '-p' + DB_PASSWORD : ''} ${DB_NAME} < "${file}"`;
+      }
+      execSync(cmd, { stdio: 'inherit' });
     } 
     else if (DB_TYPE === 'postgresql') {
       process.env.PGPASSWORD = DB_PASSWORD;
-      execSync(`psql -h ${DB_HOST} -U ${DB_USER} -d ${DB_NAME} -f "${file}"`);
+      execSync(`psql -h ${DB_HOST} -U ${DB_USER} -d ${DB_NAME} -f "${file}"`, { stdio: 'inherit' });
     } 
     else if (DB_TYPE === 'sqlite') {
-      fs.copyFileSync(file, path.join(process.cwd(), `${DB_NAME}.sqlite`));
+      const target = path.join(process.cwd(), `${DB_NAME}.sqlite`);
+      fs.copyFileSync(file, target);
+      console.log(` Restored SQLite database to: ${target}`);
+      return;
     }
 
-    console.log(' Database restored from:', file);
+    console.log(` Database restored from: ${file}`);
   } catch (err) {
     console.error(' Restore failed:', err.message);
   }