spindb 0.4.1 → 0.5.2

package/cli/commands/menu.ts

@@ -28,6 +28,7 @@ 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'
 
@@ -39,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'))
@@ -57,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
 
@@ -92,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`
@@ -147,9 +148,6 @@ async function showMainMenu(): Promise<void> {
     case 'stop':
       await handleStop()
       break
-    case 'connect':
-      await handleConnect()
-      break
     case 'restore':
       await handleRestore()
       break
@@ -246,7 +244,7 @@ async function handleCreate(): Promise<void> {
   createSpinnerInstance.start()
 
   await containerManager.create(containerName, {
-    engine: dbEngine.name,
+    engine: dbEngine.name as EngineName,
     version,
     port,
     database,
@@ -362,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
   }
 
@@ -408,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')
@@ -447,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()
@@ -465,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`
@@ -504,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) {
@@ -674,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`))
@@ -701,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())
   })
 }
 
@@ -779,7 +809,7 @@ async function handleCreateForRestore(): Promise<{
   createSpinnerInstance.start()
 
   await containerManager.create(containerName, {
-    engine: dbEngine.name,
+    engine: dbEngine.name as EngineName,
     version,
     port,
     database,
@@ -836,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,
     })),
@@ -1352,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
   }
 
@@ -1360,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> {
@@ -1566,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}...`)

package/cli/commands/restore.ts

@@ -76,8 +76,12 @@ export const restoreCommand = new Command('restore')
           process.exit(1)
         }
 
+        const { engine: engineName } = config
+
         // Check if running
-        const running = await processManager.isRunning(containerName)
+        const running = await processManager.isRunning(containerName, {
+          engine: engineName,
+        })
         if (!running) {
           console.error(
             error(
@@ -88,7 +92,7 @@ export const restoreCommand = new Command('restore')
         }
 
         // Get engine
-        const engine = getEngine(config.engine)
+        const engine = getEngine(engineName)
 
         // Check for required client tools BEFORE doing anything
         const depsSpinner = createSpinner('Checking required tools...')
@@ -129,14 +133,34 @@ export const restoreCommand = new Command('restore')
 
         // Handle --from-url option
         if (options.fromUrl) {
-          // Validate connection string
-          if (
-            !options.fromUrl.startsWith('postgresql://') &&
-            !options.fromUrl.startsWith('postgres://')
-          ) {
+          // Validate connection string matches container's engine
+          const isPgUrl =
+            options.fromUrl.startsWith('postgresql://') ||
+            options.fromUrl.startsWith('postgres://')
+          const isMysqlUrl = options.fromUrl.startsWith('mysql://')
+
+          if (engineName === 'postgresql' && !isPgUrl) {
+            console.error(
+              error(
+                'Connection string must start with postgresql:// or postgres:// for PostgreSQL containers',
+              ),
+            )
+            process.exit(1)
+          }
+
+          if (engineName === 'mysql' && !isMysqlUrl) {
             console.error(
               error(
-                'Connection string must start with postgresql:// or postgres://',
+                'Connection string must start with mysql:// for MySQL containers',
+              ),
+            )
+            process.exit(1)
+          }
+
+          if (!isPgUrl && !isMysqlUrl) {
+            console.error(
+              error(
+                'Connection string must start with postgresql://, postgres://, or mysql://',
               ),
             )
             process.exit(1)
@@ -167,11 +191,15 @@ export const restoreCommand = new Command('restore')
               dumpSpinner.fail('Failed to create dump')
 
               // Check if this is a missing tool error
+              const dumpTool = engineName === 'mysql' ? 'mysqldump' : 'pg_dump'
               if (
-                e.message.includes('pg_dump not found') ||
+                e.message.includes(`${dumpTool} not found`) ||
                 e.message.includes('ENOENT')
               ) {
-                const installed = await promptInstallDependencies('pg_dump')
+                const installed = await promptInstallDependencies(
+                  dumpTool,
+                  engineName,
+                )
                 if (!installed) {
                   process.exit(1)
                 }
@@ -180,7 +208,7 @@ export const restoreCommand = new Command('restore')
               }
 
               console.log()
-              console.error(error('pg_dump error:'))
+              console.error(error(`${dumpTool} error:`))
               console.log(chalk.gray(`  ${e.message}`))
               process.exit(1)
             }
@@ -313,14 +341,23 @@ export const restoreCommand = new Command('restore')
       } catch (err) {
         const e = err as Error
 
-        // Check if this is a missing tool error
-        if (
-          e.message.includes('pg_restore not found') ||
-          e.message.includes('psql not found')
-        ) {
-          const missingTool = e.message.includes('pg_restore')
-            ? 'pg_restore'
-            : 'psql'
+        // Check if this is a missing tool error (PostgreSQL or MySQL)
+        const missingToolPatterns = [
+          // PostgreSQL
+          'pg_restore not found',
+          'psql not found',
+          'pg_dump not found',
+          // MySQL
+          'mysql not found',
+          'mysqldump not found',
+        ]
+
+        const matchingPattern = missingToolPatterns.find((p) =>
+          e.message.includes(p),
+        )
+
+        if (matchingPattern) {
+          const missingTool = matchingPattern.replace(' not found', '')
           const installed = await promptInstallDependencies(missingTool)
           if (installed) {
             console.log(

package/cli/commands/start.ts

@@ -4,6 +4,7 @@ import { containerManager } from '../../core/container-manager'
 import { portManager } from '../../core/port-manager'
 import { processManager } from '../../core/process-manager'
 import { getEngine } from '../../engines'
+import { getEngineDefaults } from '../../config/defaults'
 import { promptContainerSelect } from '../ui/prompts'
 import { createSpinner } from '../ui/spinner'
 import { error, warning } from '../ui/theme'
@@ -46,18 +47,27 @@ export const startCommand = new Command('start')
         process.exit(1)
       }
 
+      const { engine: engineName } = config
+
       // Check if already running
-      const running = await processManager.isRunning(containerName)
+      const running = await processManager.isRunning(containerName, {
+        engine: engineName,
+      })
       if (running) {
         console.log(warning(`Container "${containerName}" is already running`))
         return
       }
 
+      // Get engine defaults for port range and database name
+      const engineDefaults = getEngineDefaults(engineName)
+
       // Check port availability
       const portAvailable = await portManager.isPortAvailable(config.port)
       if (!portAvailable) {
-        // Try to find a new port
-        const { port: newPort } = await portManager.findAvailablePort()
+        // Try to find a new port (using engine-specific port range)
+        const { port: newPort } = await portManager.findAvailablePort({
+          portRange: engineDefaults.portRange,
+        })
         console.log(
           warning(
             `Port ${config.port} is in use, switching to port ${newPort}`,
@@ -68,7 +78,7 @@ export const startCommand = new Command('start')
       }
 
       // Get engine and start
-      const engine = getEngine(config.engine)
+      const engine = getEngine(engineName)
 
       const spinner = createSpinner(`Starting ${containerName}...`)
       spinner.start()
@@ -78,6 +88,22 @@ export const startCommand = new Command('start')
 
       spinner.succeed(`Container "${containerName}" started`)
 
+      // Ensure the user's database exists (if different from default)
+      const defaultDb = engineDefaults.superuser // postgres or root
+      if (config.database && config.database !== defaultDb) {
+        const dbSpinner = createSpinner(
+          `Ensuring database "${config.database}" exists...`,
+        )
+        dbSpinner.start()
+        try {
+          await engine.createDatabase(config, config.database)
+          dbSpinner.succeed(`Database "${config.database}" ready`)
+        } catch {
+          // Database might already exist, which is fine
+          dbSpinner.succeed(`Database "${config.database}" ready`)
+        }
+      }
+
       // Show connection info
       const connectionString = engine.getConnectionString(config)
       console.log()

package/cli/commands/stop.ts

@@ -67,7 +67,9 @@ export const stopCommand = new Command('stop')
       }
 
       // Check if running
-      const running = await processManager.isRunning(containerName)
+      const running = await processManager.isRunning(containerName, {
+        engine: config.engine,
+      })
       if (!running) {
         console.log(warning(`Container "${containerName}" is not running`))
         return