spindb 0.7.3 → 0.7.5

package/cli/commands/menu/backup-handlers.ts

@@ -12,7 +12,6 @@ import { getEngine } from '../../../engines'
 import { defaults } from '../../../config/defaults'
 import { getPostgresHomebrewPackage } from '../../../config/engine-defaults'
 import { updatePostgresClientTools } from '../../../engines/postgresql/binary-manager'
-import { type Engine } from '../../../types'
 import {
   promptCreateOptions,
   promptContainerName,
@@ -33,29 +32,21 @@ import {
   formatBytes,
 } from '../../ui/theme'
 import { getEngineIcon } from '../../constants'
+import { type Engine } from '../../../types'
 
-/**
- * Generate a timestamp string for backup filenames
- */
 function generateBackupTimestamp(): string {
   const now = new Date()
   return now.toISOString().replace(/:/g, '').split('.')[0]
 }
 
-/**
- * Get file extension for backup format
- */
 function getBackupExtension(format: 'sql' | 'dump', engine: string): string {
   if (format === 'sql') {
     return '.sql'
   }
+  // MySQL dump is gzipped SQL, PostgreSQL dump is custom format
   return engine === 'mysql' ? '.sql.gz' : '.dump'
 }
 
-/**
- * Create a new container for the restore flow
- * Returns the container name and config if successful, null if cancelled/error
- */
 export async function handleCreateForRestore(): Promise<{
   name: string
   config: NonNullable<Awaited<ReturnType<typeof containerManager.getConfig>>>
@@ -71,7 +62,6 @@ export async function handleCreateForRestore(): Promise<{
 
   const dbEngine = getEngine(engine)
 
-  // Check if port is currently in use
   const portAvailable = await portManager.isPortAvailable(port)
   if (!portAvailable) {
     console.log(
@@ -80,7 +70,6 @@ export async function handleCreateForRestore(): Promise<{
     return null
   }
 
-  // Ensure binaries
   const binarySpinner = createSpinner(
     `Checking PostgreSQL ${version} binaries...`,
   )
@@ -97,13 +86,11 @@ export 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()
 
@@ -116,7 +103,6 @@ export async function handleCreateForRestore(): Promise<{
 
   createSpinnerInstance.succeed('Container created')
 
-  // Initialize database cluster
   const initSpinner = createSpinner('Initializing database cluster...')
   initSpinner.start()
 
@@ -126,7 +112,6 @@ export async function handleCreateForRestore(): Promise<{
 
   initSpinner.succeed('Database cluster initialized')
 
-  // Start container
   const startSpinner = createSpinner('Starting PostgreSQL...')
   startSpinner.start()
 
@@ -141,7 +126,6 @@ export async function handleCreateForRestore(): Promise<{
 
   startSpinner.succeed('PostgreSQL started')
 
-  // Create the user's database (if different from 'postgres')
   if (database !== 'postgres') {
     const dbSpinner = createSpinner(`Creating database "${database}"...`)
     dbSpinner.start()
@@ -162,7 +146,6 @@ export async function handleRestore(): Promise<void> {
   const containers = await containerManager.list()
   const running = containers.filter((c) => c.status === 'running')
 
-  // Build choices: running containers + create new option
   const choices = [
     ...running.map((c) => ({
       name: `${c.name} ${chalk.gray(`(${getEngineIcon(c.engine)} ${c.engine} ${c.version}, port ${c.port})`)} ${chalk.green('● running')}`,
@@ -193,9 +176,8 @@ export async function handleRestore(): Promise<void> {
   let config: Awaited<ReturnType<typeof containerManager.getConfig>>
 
   if (selectedContainer === '__create_new__') {
-    // Run the create flow first
     const createResult = await handleCreateForRestore()
-    if (!createResult) return // User cancelled or error
+    if (!createResult) return
     containerName = createResult.name
     config = createResult.config
   } else {
@@ -207,7 +189,6 @@ export async function handleRestore(): Promise<void> {
     }
   }
 
-  // Check for required client tools BEFORE doing anything
   const depsSpinner = createSpinner('Checking required tools...')
   depsSpinner.start()
 
@@ -217,7 +198,6 @@ export async function handleRestore(): Promise<void> {
       `Missing tools: ${missingDeps.map((d) => d.name).join(', ')}`,
     )
 
-    // Offer to install
     const installed = await promptInstallDependencies(
       missingDeps[0].binary,
       config.engine,
@@ -227,7 +207,6 @@ export async function handleRestore(): Promise<void> {
       return
     }
 
-    // Verify installation worked
     missingDeps = await getMissingDependencies(config.engine)
     if (missingDeps.length > 0) {
       console.log(
@@ -244,7 +223,6 @@ export async function handleRestore(): Promise<void> {
     depsSpinner.succeed('Required tools available')
   }
 
-  // Ask for restore source
   const { restoreSource } = await inquirer.prompt<{
     restoreSource: 'file' | 'connection'
   }>([
@@ -269,8 +247,9 @@ export async function handleRestore(): Promise<void> {
   let isTempFile = false
 
   if (restoreSource === 'connection') {
-    // Get connection string and create dump
-    console.log(chalk.gray('  Enter connection string, or press Enter to go back'))
+    console.log(
+      chalk.gray('  Enter connection string, or press Enter to go back'),
+    )
     const { connectionString } = await inquirer.prompt<{
       connectionString: string
     }>([
@@ -279,7 +258,7 @@ export async function handleRestore(): Promise<void> {
         name: 'connectionString',
         message: 'Connection string:',
         validate: (input: string) => {
-          if (!input) return true // Empty = go back
+          if (!input) return true
           if (
             !input.startsWith('postgresql://') &&
             !input.startsWith('postgres://')
@@ -291,20 +270,18 @@ export async function handleRestore(): Promise<void> {
       },
     ])
 
-    // Empty input = go back
     if (!connectionString.trim()) {
       return
     }
 
     const engine = getEngine(config.engine)
 
-    // Create temp file for the dump
     const timestamp = Date.now()
     const tempDumpPath = join(tmpdir(), `spindb-dump-${timestamp}.dump`)
 
     let dumpSuccess = false
     let attempts = 0
-    const maxAttempts = 2 // Allow one retry after installing deps
+    const maxAttempts = 2
 
     while (!dumpSuccess && attempts < maxAttempts) {
       attempts++
@@ -321,14 +298,12 @@ export async function handleRestore(): Promise<void> {
         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 {
@@ -338,14 +313,12 @@ export async function handleRestore(): Promise<void> {
           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',
@@ -357,18 +330,19 @@ export async function handleRestore(): Promise<void> {
       }
     }
 
-    // Safety check - should never reach here without backupPath set
     if (!dumpSuccess) {
       console.log(error('Failed to create dump after retries'))
       return
     }
   } else {
-    // Get backup file path
-    // Strip quotes that terminals add when drag-and-dropping files
     const stripQuotes = (path: string) =>
       path.replace(/^['"]|['"]$/g, '').trim()
 
-    console.log(chalk.gray('  Drag & drop, enter path (abs or rel), or press Enter to go back'))
+    console.log(
+      chalk.gray(
+        '  Drag & drop, enter path (abs or rel), or press Enter to go back',
+      ),
+    )
     const { backupPath: rawBackupPath } = await inquirer.prompt<{
       backupPath: string
     }>([
@@ -377,7 +351,7 @@ export async function handleRestore(): Promise<void> {
         name: 'backupPath',
         message: 'Backup file path:',
         validate: (input: string) => {
-          if (!input) return true // Empty = go back
+          if (!input) return true
           const cleanPath = stripQuotes(input)
           if (!existsSync(cleanPath)) return 'File not found'
           return true
@@ -385,7 +359,6 @@ export async function handleRestore(): Promise<void> {
       },
     ])
 
-    // Empty input = go back
     if (!rawBackupPath.trim()) {
       return
     }
@@ -397,21 +370,18 @@ export async function handleRestore(): Promise<void> {
 
   const engine = getEngine(config.engine)
 
-  // Detect format
   const detectSpinner = createSpinner('Detecting backup format...')
   detectSpinner.start()
 
   const format = await engine.detectBackupFormat(backupPath)
   detectSpinner.succeed(`Detected: ${format.description}`)
 
-  // Create database
   const dbSpinner = createSpinner(`Creating database "${databaseName}"...`)
   dbSpinner.start()
 
   await engine.createDatabase(config, databaseName)
   dbSpinner.succeed(`Database "${databaseName}" ready`)
 
-  // Restore
   const restoreSpinner = createSpinner('Restoring backup...')
   restoreSpinner.start()
 
@@ -425,7 +395,6 @@ export async function handleRestore(): Promise<void> {
   } else {
     const stderr = result.stderr || ''
 
-    // Check for version compatibility errors
     if (
       stderr.includes('unsupported version') ||
       stderr.includes('Archive version') ||
@@ -438,7 +407,6 @@ export async function handleRestore(): Promise<void> {
         warning('Your pg_restore version is too old for this backup file.'),
       )
 
-      // Clean up the failed database since restore didn't actually work
       console.log(chalk.yellow('Cleaning up failed database...'))
       try {
         await engine.dropDatabase(config, databaseName)
@@ -451,7 +419,6 @@ export async function handleRestore(): Promise<void> {
 
       console.log()
 
-      // Extract version info from error message
       const versionMatch = stderr.match(/PostgreSQL (\d+)/)
       const requiredVersion = versionMatch ? versionMatch[1] : '17'
 
@@ -462,7 +429,6 @@ export async function handleRestore(): Promise<void> {
       )
       console.log()
 
-      // Ask user if they want to upgrade
       const { shouldUpgrade } = await inquirer.prompt({
         type: 'list',
         name: 'shouldUpgrade',
@@ -557,13 +523,10 @@ export async function handleRestore(): Promise<void> {
         return
       }
     } else {
-      // Regular warnings/errors - show as before
       restoreSpinner.warn('Restore completed with warnings')
-      // Show stderr output so user can see what went wrong
       if (result.stderr) {
         console.log()
         console.log(chalk.yellow('  Warnings/Errors:'))
-        // Show first 20 lines of stderr to avoid overwhelming output
         const lines = result.stderr.split('\n').filter((l) => l.trim())
         const displayLines = lines.slice(0, 20)
         for (const line of displayLines) {
@@ -576,7 +539,6 @@ export async function handleRestore(): Promise<void> {
     }
   }
 
-  // Only show success message if restore actually succeeded
   if (result.code === 0 || !result.stderr) {
     const connectionString = engine.getConnectionString(config, databaseName)
     console.log()
@@ -584,7 +546,6 @@ export async function handleRestore(): Promise<void> {
     console.log(chalk.gray('  Connection string:'))
     console.log(chalk.cyan(`  ${connectionString}`))
 
-    // Copy connection string to clipboard using platform service
     const copied = await platformService.copyToClipboard(connectionString)
     if (copied) {
       console.log(chalk.gray('  ✓ Connection string copied to clipboard'))
@@ -595,7 +556,6 @@ export async function handleRestore(): Promise<void> {
     console.log()
   }
 
-  // Clean up temp file if we created one
   if (isTempFile) {
     try {
       await rm(backupPath, { force: true })
@@ -604,7 +564,6 @@ export async function handleRestore(): Promise<void> {
     }
   }
 
-  // Wait for user to see the result before returning to menu
   await inquirer.prompt([
     {
       type: 'input',
@@ -630,7 +589,6 @@ export async function handleBackup(): Promise<void> {
     return
   }
 
-  // Select container
   const containerName = await promptContainerSelect(
     running,
     'Select container to backup:',
@@ -645,7 +603,6 @@ export async function handleBackup(): Promise<void> {
 
   const engine = getEngine(config.engine)
 
-  // Check for required tools
   const depsSpinner = createSpinner('Checking required tools...')
   depsSpinner.start()
 
@@ -680,7 +637,6 @@ export async function handleBackup(): Promise<void> {
     depsSpinner.succeed('Required tools available')
   }
 
-  // Select database
   const databases = config.databases || [config.database]
   let databaseName: string
 
@@ -693,18 +649,14 @@ export async function handleBackup(): Promise<void> {
     databaseName = databases[0]
   }
 
-  // Select format
   const format = await promptBackupFormat(config.engine)
 
-  // Get filename
   const defaultFilename = `${containerName}-${databaseName}-backup-${generateBackupTimestamp()}`
   const filename = await promptBackupFilename(defaultFilename)
 
-  // Build output path
   const extension = getBackupExtension(format, config.engine)
   const outputPath = join(process.cwd(), `${filename}${extension}`)
 
-  // Create backup
   const backupSpinner = createSpinner(
     `Creating ${format === 'sql' ? 'SQL' : 'dump'} backup of "${databaseName}"...`,
   )
@@ -733,7 +685,6 @@ export async function handleBackup(): Promise<void> {
     console.log()
   }
 
-  // Wait for user to see the result
   await inquirer.prompt([
     {
       type: 'input',

package/cli/commands/menu/container-handlers.ts

@@ -9,7 +9,6 @@ import { processManager } from '../../../core/process-manager'
 import { getEngine } from '../../../engines'
 import { defaults } from '../../../config/defaults'
 import { paths } from '../../../config/paths'
-import { type Engine } from '../../../types'
 import {
   promptCreateOptions,
   promptContainerName,
@@ -28,9 +27,10 @@ import {
   formatBytes,
 } from '../../ui/theme'
 import { getEngineIcon } from '../../constants'
-import { type MenuChoice } from './shared'
 import { handleOpenShell, handleCopyConnectionString } from './shell-handlers'
 import { handleRunSql, handleViewLogs } from './sql-handlers'
+import { type Engine } from '../../../types'
+import { type MenuChoice } from './shared'
 
 export async function handleCreate(): Promise<void> {
   console.log()
@@ -44,7 +44,6 @@ export 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()
 
@@ -54,7 +53,6 @@ export async function handleCreate(): Promise<void> {
       `Missing tools: ${missingDeps.map((d) => d.name).join(', ')}`,
     )
 
-    // Offer to install
     const installed = await promptInstallDependencies(
       missingDeps[0].binary,
       engine,
@@ -64,7 +62,6 @@ export async function handleCreate(): Promise<void> {
       return
     }
 
-    // Verify installation worked
     missingDeps = await getMissingDependencies(engine)
     if (missingDeps.length > 0) {
       console.log(
@@ -81,10 +78,8 @@ export async function handleCreate(): Promise<void> {
     depsSpinner.succeed('Required tools available')
   }
 
-  // Check if port is currently in use
   const portAvailable = await portManager.isPortAvailable(port)
 
-  // Ensure binaries
   const binarySpinner = createSpinner(
     `Checking PostgreSQL ${version} binaries...`,
   )
@@ -101,13 +96,11 @@ export 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()
 
@@ -120,7 +113,6 @@ export async function handleCreate(): Promise<void> {
 
   createSpinnerInstance.succeed('Container created')
 
-  // Initialize database cluster
   const initSpinner = createSpinner('Initializing database cluster...')
   initSpinner.start()
 
@@ -130,7 +122,6 @@ export async function handleCreate(): Promise<void> {
 
   initSpinner.succeed('Database cluster initialized')
 
-  // Start container (only if port is available)
   if (portAvailable) {
     const startSpinner = createSpinner('Starting PostgreSQL...')
     startSpinner.start()
@@ -143,7 +134,6 @@ export async function handleCreate(): Promise<void> {
 
     startSpinner.succeed('PostgreSQL started')
 
-    // Create the user's database (if different from 'postgres')
     if (config && database !== 'postgres') {
       const dbSpinner = createSpinner(`Creating database "${database}"...`)
       dbSpinner.start()
@@ -153,7 +143,6 @@ export async function handleCreate(): Promise<void> {
       dbSpinner.succeed(`Database "${database}" created`)
     }
 
-    // Show success
     if (config) {
       const connectionString = dbEngine.getConnectionString(config)
       console.log()
@@ -169,7 +158,6 @@ export async function handleCreate(): Promise<void> {
       console.log(chalk.gray('  Connection string:'))
       console.log(chalk.cyan(`  ${connectionString}`))
 
-      // Copy connection string to clipboard using platform service
       try {
         const copied = await platformService.copyToClipboard(connectionString)
         if (copied) {
@@ -183,7 +171,6 @@ export async function handleCreate(): Promise<void> {
 
       console.log()
 
-      // Wait for user to see the result before returning to menu
       await inquirer.prompt([
         {
           type: 'input',
@@ -231,7 +218,6 @@ export async function handleList(
     return
   }
 
-  // Fetch sizes for running containers in parallel
   const sizes = await Promise.all(
     containers.map(async (container) => {
       if (container.status !== 'running') return null
@@ -244,7 +230,6 @@ export async function handleList(
     }),
   )
 
-  // Table header
   console.log()
   console.log(
     chalk.gray('  ') +
@@ -257,7 +242,6 @@ export async function handleList(
   )
   console.log(chalk.gray('  ' + '─'.repeat(70)))
 
-  // Table rows
   for (let i = 0; i < containers.length; i++) {
     const container = containers[i]
     const size = sizes[i]
@@ -290,7 +274,6 @@ export async function handleList(
     ),
   )
 
-  // Container selection with submenu
   console.log()
   const containerChoices = [
     ...containers.map((c, i) => {
@@ -340,7 +323,6 @@ export async function showContainerSubmenu(
     return
   }
 
-  // Check actual running state
   const isRunning = await processManager.isRunning(containerName, {
     engine: config.engine,
   })
@@ -357,10 +339,15 @@ export async function showContainerSubmenu(
   console.log()
 
   const actionChoices: MenuChoice[] = [
-    // Start or Stop depending on current state
     !isRunning
-      ? { name: `${chalk.green('▶')} Start container`, value: 'start' }
-      : { name: `${chalk.red('■')} Stop container`, value: 'stop' },
+      ? {
+          name: `${chalk.green('▶')} Start container`,
+          value: 'start',
+        }
+      : {
+          name: `${chalk.red('■')} Stop container`,
+          value: 'stop',
+        },
     {
       name: isRunning
         ? `${chalk.blue('⌘')} Open shell`
@@ -375,10 +362,6 @@ export async function showContainerSubmenu(
       value: 'run-sql',
       disabled: isRunning ? false : 'Start container first',
     },
-    {
-      name: `${chalk.gray('📋')} View logs`,
-      value: 'logs',
-    },
     {
       name: !isRunning
         ? `${chalk.white('⚙')} Edit container`
@@ -394,6 +377,10 @@ export async function showContainerSubmenu(
       disabled: !isRunning ? false : 'Stop container first',
     },
     { name: `${chalk.magenta('⎘')} Copy connection string`, value: 'copy' },
+    {
+      name: `${chalk.gray('☰')} View logs`,
+      value: 'logs',
+    },
     {
       name: !isRunning
         ? `${chalk.red('✕')} Delete container`
@@ -402,8 +389,14 @@ export async function showContainerSubmenu(
       disabled: !isRunning ? false : 'Stop container first',
     },
     new inquirer.Separator(),
-    { name: `${chalk.blue('←')} Back to containers`, value: 'back' },
-    { name: `${chalk.blue('⌂')} Back to main menu`, value: 'main' },
+    {
+      name: `${chalk.blue('←')} Back to containers`,
+      value: 'back',
+    },
+    {
+      name: `${chalk.blue('⌂')} Back to main menu`,
+      value: 'main',
+    },
   ]
 
   const { action } = await inquirer.prompt<{ action: string }>([
@@ -490,7 +483,6 @@ export async function handleStart(): Promise<void> {
     return
   }
 
-  // Check port availability
   const portAvailable = await portManager.isPortAvailable(config.port)
   if (!portAvailable) {
     const { port: newPort } = await portManager.findAvailablePort()
@@ -556,7 +548,6 @@ async function handleStartContainer(containerName: string): Promise<void> {
     return
   }
 
-  // Check port availability
   const portAvailable = await portManager.isPortAvailable(config.port)
   if (!portAvailable) {
     console.log(
@@ -599,7 +590,6 @@ async function handleStartContainer(containerName: string): Promise<void> {
     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,
     })
@@ -651,8 +641,14 @@ async function handleEditContainer(
       value: 'port',
     },
     new inquirer.Separator(),
-    { name: `${chalk.blue('←')} Back to container`, value: 'back' },
-    { name: `${chalk.blue('⌂')} Back to main menu`, value: 'main' },
+    {
+      name: `${chalk.blue('←')} Back to container`,
+      value: 'back',
+    },
+    {
+      name: `${chalk.blue('⌂')} Back to main menu`,
+      value: 'main',
+    },
   ]
 
   const { field } = await inquirer.prompt<{ field: string }>([
@@ -695,7 +691,6 @@ async function handleEditContainer(
       return await handleEditContainer(containerName)
     }
 
-    // Check if new name already exists
     if (await containerManager.exists(newName)) {
       console.log(error(`Container "${newName}" already exists`))
       return await handleEditContainer(containerName)
@@ -735,7 +730,6 @@ async function handleEditContainer(
       return await handleEditContainer(containerName)
     }
 
-    // Check if port is in use
     const portAvailable = await portManager.isPortAvailable(newPort)
     if (!portAvailable) {
       console.log(
@@ -788,7 +782,6 @@ async function handleCloneFromSubmenu(
   console.log()
   console.log(connectionBox(targetName, connectionString, newConfig.port))
 
-  // Go to the new container's submenu
   await showContainerSubmenu(targetName, showMainMenu)
 }