spindb 0.4.0 → 0.5.2

package/cli/commands/menu.ts

@@ -5,6 +5,7 @@ import { processManager } from '../../core/process-manager'
 import { getEngine } from '../../engines'
 import {
   promptContainerSelect,
+  promptContainerName,
   promptDatabaseName,
   promptCreateOptions,
   promptConfirm,
@@ -27,7 +28,9 @@ import { join } from 'path'
 import { paths } from '../../config/paths'
 import { portManager } from '../../core/port-manager'
 import { defaults } from '../../config/defaults'
+import type { EngineName } from '../../types'
 import inquirer from 'inquirer'
+import { getMissingDependencies } from '../../core/dependency-manager'
 
 type MenuChoice =
   | {
@@ -37,6 +40,14 @@ type MenuChoice =
     }
   | inquirer.Separator
 
+/**
+ * Engine icons for display
+ */
+const engineIcons: Record<string, string> = {
+  postgresql: '🐘',
+  mysql: '🐬',
+}
+
 async function showMainMenu(): Promise<void> {
   console.clear()
   console.log(header('SpinDB - Local Database Manager'))
@@ -55,7 +66,6 @@ async function showMainMenu(): Promise<void> {
 
   const canStart = stopped > 0
   const canStop = running > 0
-  const canConnect = running > 0
   const canRestore = running > 0
   const canClone = containers.length > 0
 
@@ -90,13 +100,6 @@ async function showMainMenu(): Promise<void> {
       value: 'stop',
       disabled: canStop ? false : 'No running containers',
     },
-    {
-      name: canConnect
-        ? `${chalk.blue('⌘')} Open psql shell`
-        : chalk.gray('⌘ Open psql shell'),
-      value: 'connect',
-      disabled: canConnect ? false : 'No running containers',
-    },
     {
       name: canRestore
         ? `${chalk.magenta('↓')} Restore backup`
@@ -145,9 +148,6 @@ async function showMainMenu(): Promise<void> {
     case 'stop':
       await handleStop()
       break
-    case 'connect':
-      await handleConnect()
-      break
     case 'restore':
       await handleRestore()
       break
@@ -169,7 +169,8 @@ async function showMainMenu(): Promise<void> {
 async function handleCreate(): Promise<void> {
   console.log()
   const answers = await promptCreateOptions()
-  const { name: containerName, engine, version, port, database } = answers
+  let { name: containerName } = answers
+  const { engine, version, port, database } = answers
 
   console.log()
   console.log(header('Creating Database Container'))
@@ -177,6 +178,41 @@ async function handleCreate(): Promise<void> {
 
   const dbEngine = getEngine(engine)
 
+  // Check for required client tools BEFORE creating anything
+  const depsSpinner = createSpinner('Checking required tools...')
+  depsSpinner.start()
+
+  let missingDeps = await getMissingDependencies(engine)
+  if (missingDeps.length > 0) {
+    depsSpinner.warn(
+      `Missing tools: ${missingDeps.map((d) => d.name).join(', ')}`,
+    )
+
+    // Offer to install
+    const installed = await promptInstallDependencies(
+      missingDeps[0].binary,
+      engine,
+    )
+
+    if (!installed) {
+      return
+    }
+
+    // Verify installation worked
+    missingDeps = await getMissingDependencies(engine)
+    if (missingDeps.length > 0) {
+      console.log(
+        error(`Still missing tools: ${missingDeps.map((d) => d.name).join(', ')}`),
+      )
+      return
+    }
+
+    console.log(chalk.green('  ✓ All required tools are now available'))
+    console.log()
+  } else {
+    depsSpinner.succeed('Required tools available')
+  }
+
   // Check if port is currently in use
   const portAvailable = await portManager.isPortAvailable(port)
 
@@ -197,12 +233,18 @@ async function handleCreate(): Promise<void> {
     binarySpinner.succeed(`PostgreSQL ${version} binaries downloaded`)
   }
 
+  // Check if container name already exists and prompt for new name if needed
+  while (await containerManager.exists(containerName)) {
+    console.log(chalk.yellow(`  Container "${containerName}" already exists.`))
+    containerName = await promptContainerName()
+  }
+
   // Create container
   const createSpinnerInstance = createSpinner('Creating container...')
   createSpinnerInstance.start()
 
   await containerManager.create(containerName, {
-    engine: dbEngine.name,
+    engine: dbEngine.name as EngineName,
     version,
     port,
     database,
@@ -318,6 +360,15 @@ async function handleList(): Promise<void> {
     console.log(
       info('No containers found. Create one with the "Create" option.'),
     )
+    console.log()
+
+    await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'continue',
+        message: chalk.gray('Press Enter to return to the main menu...'),
+      },
+    ])
     return
   }
 
@@ -364,7 +415,7 @@ async function handleList(): Promise<void> {
   console.log()
   const containerChoices = [
     ...containers.map((c) => ({
-      name: `${c.name} ${chalk.gray(`(${c.engine} ${c.version}, port ${c.port})`)} ${
+      name: `${c.name} ${chalk.gray(`(${engineIcons[c.engine] || '🗄️'} ${c.engine} ${c.version}, port ${c.port})`)} ${
         c.status === 'running'
           ? chalk.green('● running')
           : chalk.gray('○ stopped')
@@ -403,7 +454,9 @@ async function showContainerSubmenu(containerName: string): Promise<void> {
   }
 
   // Check actual running state
-  const isRunning = await processManager.isRunning(containerName)
+  const isRunning = await processManager.isRunning(containerName, {
+    engine: config.engine,
+  })
   const status = isRunning ? 'running' : 'stopped'
 
   console.clear()
@@ -421,6 +474,13 @@ async function showContainerSubmenu(containerName: string): Promise<void> {
     !isRunning
       ? { name: `${chalk.green('▶')} Start container`, value: 'start' }
       : { name: `${chalk.yellow('■')} Stop container`, value: 'stop' },
+    {
+      name: isRunning
+        ? `${chalk.blue('⌘')} Open shell`
+        : chalk.gray('⌘ Open shell'),
+      value: 'shell',
+      disabled: isRunning ? false : 'Start container first',
+    },
     {
       name: !isRunning
         ? `${chalk.white('⚙')} Edit container`
@@ -460,6 +520,10 @@ async function showContainerSubmenu(containerName: string): Promise<void> {
       await handleStopContainer(containerName)
       await showContainerSubmenu(containerName)
       return
+    case 'shell':
+      await handleOpenShell(containerName)
+      await showContainerSubmenu(containerName)
+      return
     case 'edit': {
       const newName = await handleEditContainer(containerName)
       if (newName === null) {
@@ -630,21 +694,7 @@ async function handleCopyConnectionString(
   }
 }
 
-async function handleConnect(): Promise<void> {
-  const containers = await containerManager.list()
-  const running = containers.filter((c) => c.status === 'running')
-
-  if (running.length === 0) {
-    console.log(warning('No running containers'))
-    return
-  }
-
-  const containerName = await promptContainerSelect(
-    running,
-    'Select container to connect to:',
-  )
-  if (!containerName) return
-
+async function handleOpenShell(containerName: string): Promise<void> {
   const config = await containerManager.getConfig(containerName)
   if (!config) {
     console.error(error(`Container "${containerName}" not found`))
@@ -657,25 +707,49 @@ async function handleConnect(): Promise<void> {
   console.log(info(`Connecting to ${containerName}...`))
   console.log()
 
-  // Spawn psql
-  const psqlProcess = spawn('psql', [connectionString], {
+  // Determine shell command based on engine
+  let shellCmd: string
+  let shellArgs: string[]
+  let installHint: string
+
+  if (config.engine === 'mysql') {
+    shellCmd = 'mysql'
+    // MySQL connection: mysql -u root -h 127.0.0.1 -P port database
+    shellArgs = [
+      '-u',
+      'root',
+      '-h',
+      '127.0.0.1',
+      '-P',
+      String(config.port),
+      config.database,
+    ]
+    installHint = 'brew install mysql-client'
+  } else {
+    // PostgreSQL (default)
+    shellCmd = 'psql'
+    shellArgs = [connectionString]
+    installHint = 'brew install libpq && brew link --force libpq'
+  }
+
+  const shellProcess = spawn(shellCmd, shellArgs, {
     stdio: 'inherit',
   })
 
-  psqlProcess.on('error', (err: NodeJS.ErrnoException) => {
+  shellProcess.on('error', (err: NodeJS.ErrnoException) => {
     if (err.code === 'ENOENT') {
-      console.log(warning('psql not found on your system.'))
+      console.log(warning(`${shellCmd} not found on your system.`))
       console.log()
       console.log(chalk.gray('  Connect manually with:'))
       console.log(chalk.cyan(`  ${connectionString}`))
       console.log()
-      console.log(chalk.gray('  Install PostgreSQL client:'))
-      console.log(chalk.cyan('  brew install libpq && brew link --force libpq'))
+      console.log(chalk.gray(`  Install ${config.engine} client:`))
+      console.log(chalk.cyan(`  ${installHint}`))
     }
   })
 
   await new Promise<void>((resolve) => {
-    psqlProcess.on('close', () => resolve())
+    shellProcess.on('close', () => resolve())
   })
 }
 
@@ -689,7 +763,8 @@ async function handleCreateForRestore(): Promise<{
 } | null> {
   console.log()
   const answers = await promptCreateOptions()
-  const { name: containerName, engine, version, port, database } = answers
+  let { name: containerName } = answers
+  const { engine, version, port, database } = answers
 
   console.log()
   console.log(header('Creating Database Container'))
@@ -723,12 +798,18 @@ async function handleCreateForRestore(): Promise<{
     binarySpinner.succeed(`PostgreSQL ${version} binaries downloaded`)
   }
 
+  // Check if container name already exists and prompt for new name if needed
+  while (await containerManager.exists(containerName)) {
+    console.log(chalk.yellow(`  Container "${containerName}" already exists.`))
+    containerName = await promptContainerName()
+  }
+
   // Create container
   const createSpinnerInstance = createSpinner('Creating container...')
   createSpinnerInstance.start()
 
   await containerManager.create(containerName, {
-    engine: dbEngine.name,
+    engine: dbEngine.name as EngineName,
     version,
     port,
     database,
@@ -785,7 +866,7 @@ async function handleRestore(): Promise<void> {
   // Build choices: running containers + create new option
   const choices = [
     ...running.map((c) => ({
-      name: `${c.name} ${chalk.gray(`(${c.engine} ${c.version}, port ${c.port})`)} ${chalk.green('● running')}`,
+      name: `${c.name} ${chalk.gray(`(${engineIcons[c.engine] || '🗄️'} ${c.engine} ${c.version}, port ${c.port})`)} ${chalk.green('● running')}`,
       value: c.name,
       short: c.name,
     })),
@@ -826,6 +907,41 @@ async function handleRestore(): Promise<void> {
     }
   }
 
+  // Check for required client tools BEFORE doing anything
+  const depsSpinner = createSpinner('Checking required tools...')
+  depsSpinner.start()
+
+  let missingDeps = await getMissingDependencies(config.engine)
+  if (missingDeps.length > 0) {
+    depsSpinner.warn(
+      `Missing tools: ${missingDeps.map((d) => d.name).join(', ')}`,
+    )
+
+    // Offer to install
+    const installed = await promptInstallDependencies(
+      missingDeps[0].binary,
+      config.engine,
+    )
+
+    if (!installed) {
+      return
+    }
+
+    // Verify installation worked
+    missingDeps = await getMissingDependencies(config.engine)
+    if (missingDeps.length > 0) {
+      console.log(
+        error(`Still missing tools: ${missingDeps.map((d) => d.name).join(', ')}`),
+      )
+      return
+    }
+
+    console.log(chalk.green('  ✓ All required tools are now available'))
+    console.log()
+  } else {
+    depsSpinner.succeed('Required tools available')
+  }
+
   // Ask for restore source
   const { restoreSource } = await inquirer.prompt<{
     restoreSource: 'file' | 'connection'
@@ -847,7 +963,7 @@ async function handleRestore(): Promise<void> {
     },
   ])
 
-  let backupPath: string
+  let backupPath = ''
   let isTempFile = false
 
   if (restoreSource === 'connection') {
@@ -878,46 +994,64 @@ async function handleRestore(): Promise<void> {
     const timestamp = Date.now()
     const tempDumpPath = join(tmpdir(), `spindb-dump-${timestamp}.dump`)
 
-    const dumpSpinner = createSpinner('Creating dump from remote database...')
-    dumpSpinner.start()
+    let dumpSuccess = false
+    let attempts = 0
+    const maxAttempts = 2 // Allow one retry after installing deps
 
-    try {
-      await engine.dumpFromConnectionString(connectionString, tempDumpPath)
-      dumpSpinner.succeed('Dump created from remote database')
-      backupPath = tempDumpPath
-      isTempFile = true
-    } catch (err) {
-      const e = err as Error
-      dumpSpinner.fail('Failed to create dump')
+    while (!dumpSuccess && attempts < maxAttempts) {
+      attempts++
+      const dumpSpinner = createSpinner('Creating dump from remote database...')
+      dumpSpinner.start()
 
-      // Clean up temp file if it was created
       try {
-        await rm(tempDumpPath, { force: true })
-      } catch {
-        // Ignore cleanup errors
-      }
+        await engine.dumpFromConnectionString(connectionString, tempDumpPath)
+        dumpSpinner.succeed('Dump created from remote database')
+        backupPath = tempDumpPath
+        isTempFile = true
+        dumpSuccess = true
+      } catch (err) {
+        const e = err as Error
+        dumpSpinner.fail('Failed to create dump')
+
+        // Check if this is a missing tool error
+        if (
+          e.message.includes('pg_dump not found') ||
+          e.message.includes('ENOENT')
+        ) {
+          const installed = await promptInstallDependencies('pg_dump')
+          if (installed) {
+            // Loop will retry
+            continue
+          }
+        } else {
+          console.log()
+          console.log(error('pg_dump error:'))
+          console.log(chalk.gray(`  ${e.message}`))
+          console.log()
+        }
 
-      // Check if this is a missing tool error
-      if (
-        e.message.includes('pg_dump not found') ||
-        e.message.includes('ENOENT')
-      ) {
-        await promptInstallDependencies('pg_dump')
-      } else {
-        console.log()
-        console.log(error('pg_dump error:'))
-        console.log(chalk.gray(`  ${e.message}`))
-        console.log()
+        // Clean up temp file if it was created
+        try {
+          await rm(tempDumpPath, { force: true })
+        } catch {
+          // Ignore cleanup errors
+        }
+
+        // Wait for user to see the error
+        await inquirer.prompt([
+          {
+            type: 'input',
+            name: 'continue',
+            message: chalk.gray('Press Enter to continue...'),
+          },
+        ])
+        return
       }
+    }
 
-      // Wait for user to see the error
-      await inquirer.prompt([
-        {
-          type: 'input',
-          name: 'continue',
-          message: chalk.gray('Press Enter to continue...'),
-        },
-      ])
+    // Safety check - should never reach here without backupPath set
+    if (!dumpSuccess) {
+      console.log(error('Failed to create dump after retries'))
       return
     }
   } else {
@@ -1248,6 +1382,15 @@ async function handleStartContainer(containerName: string): Promise<void> {
         `Port ${config.port} is in use. Stop the process using it or change this container's port.`,
       ),
     )
+    console.log()
+    console.log(
+      info(
+        'Tip: If you installed MariaDB via apt, it may have started a system service.',
+      ),
+    )
+    console.log(
+      info('Run: sudo systemctl stop mariadb && sudo systemctl disable mariadb'),
+    )
     return
   }
 
@@ -1256,15 +1399,31 @@ async function handleStartContainer(containerName: string): Promise<void> {
   const spinner = createSpinner(`Starting ${containerName}...`)
   spinner.start()
 
-  await engine.start(config)
-  await containerManager.updateConfig(containerName, { status: 'running' })
+  try {
+    await engine.start(config)
+    await containerManager.updateConfig(containerName, { status: 'running' })
 
-  spinner.succeed(`Container "${containerName}" started`)
+    spinner.succeed(`Container "${containerName}" started`)
 
-  const connectionString = engine.getConnectionString(config)
-  console.log()
-  console.log(chalk.gray('  Connection string:'))
-  console.log(chalk.cyan(`  ${connectionString}`))
+    const connectionString = engine.getConnectionString(config)
+    console.log()
+    console.log(chalk.gray('  Connection string:'))
+    console.log(chalk.cyan(`  ${connectionString}`))
+  } catch (err) {
+    spinner.fail(`Failed to start "${containerName}"`)
+    const e = err as Error
+    console.log()
+    console.log(error(e.message))
+
+    // Check if there's a log file with more details
+    const logPath = paths.getContainerLogPath(containerName, {
+      engine: config.engine,
+    })
+    if (existsSync(logPath)) {
+      console.log()
+      console.log(info(`Check the log file for details: ${logPath}`))
+    }
+  }
 }
 
 async function handleStopContainer(containerName: string): Promise<void> {
@@ -1462,7 +1621,9 @@ async function handleDelete(containerName: string): Promise<void> {
     return
   }
 
-  const isRunning = await processManager.isRunning(containerName)
+  const isRunning = await processManager.isRunning(containerName, {
+    engine: config.engine,
+  })
 
   if (isRunning) {
     const stopSpinner = createSpinner(`Stopping ${containerName}...`)
@@ -1727,7 +1888,12 @@ export const menuCommand = new Command('menu')
           : e.message.includes('pg_dump')
             ? 'pg_dump'
             : 'psql'
-        await promptInstallDependencies(missingTool)
+        const installed = await promptInstallDependencies(missingTool)
+        if (installed) {
+          console.log(
+            chalk.yellow('  Please re-run spindb to continue.'),
+          )
+        }
         process.exit(1)
       }