spindb 0.9.0 → 0.9.2

package/cli/commands/list.ts

@@ -2,7 +2,7 @@ import { Command } from 'commander'
 import chalk from 'chalk'
 import { containerManager } from '../../core/container-manager'
 import { getEngine } from '../../engines'
-import { info, error, formatBytes } from '../ui/theme'
+import { uiInfo, uiError, formatBytes } from '../ui/theme'
 import { getEngineIcon } from '../constants'
 import { Engine } from '../../types'
 import { basename } from 'path'
@@ -12,8 +12,8 @@ import type { ContainerConfig } from '../../types'
  * Pad string to width, accounting for emoji taking 2 display columns
  */
 function padWithEmoji(str: string, width: number): string {
-  // Count emojis (they take 2 display columns but count as 1-2 chars)
-  const emojiCount = (str.match(/[\u{1F300}-\u{1F9FF}]/gu) || []).length
+  // Count emojis using Extended_Pictographic (excludes digits/symbols that \p{Emoji} matches)
+  const emojiCount = (str.match(/\p{Extended_Pictographic}/gu) || []).length
   return str.padEnd(width + emojiCount)
 }
 
@@ -62,7 +62,9 @@ export const listCommand = new Command('list')
       }
 
       if (containers.length === 0) {
-        console.log(info('No containers found. Create one with: spindb create'))
+        console.log(
+          uiInfo('No containers found. Create one with: spindb create'),
+        )
         return
       }
 
@@ -107,8 +109,9 @@ export const listCommand = new Command('list')
         let portOrPath: string
         if (container.engine === Engine.SQLite) {
           const fileName = basename(container.database)
-          // Truncate if longer than 7 chars to fit in 8-char column
-          portOrPath = fileName.length > 7 ? fileName.slice(0, 6) + '…' : fileName
+          // Truncate if longer than 8 chars to fit in 8-char column
+          portOrPath =
+            fileName.length > 8 ? fileName.slice(0, 7) + '…' : fileName
         } else {
           portOrPath = String(container.port)
         }
@@ -126,31 +129,43 @@ export const listCommand = new Command('list')
 
       console.log()
 
-      const serverContainers = containers.filter((c) => c.engine !== Engine.SQLite)
-      const sqliteContainers = containers.filter((c) => c.engine === Engine.SQLite)
+      const serverContainers = containers.filter(
+        (c) => c.engine !== Engine.SQLite,
+      )
+      const sqliteContainers = containers.filter(
+        (c) => c.engine === Engine.SQLite,
+      )
 
-      const running = serverContainers.filter((c) => c.status === 'running').length
-      const stopped = serverContainers.filter((c) => c.status !== 'running').length
-      const available = sqliteContainers.filter((c) => c.status === 'running').length
-      const missing = sqliteContainers.filter((c) => c.status !== 'running').length
+      const running = serverContainers.filter(
+        (c) => c.status === 'running',
+      ).length
+      const stopped = serverContainers.filter(
+        (c) => c.status !== 'running',
+      ).length
+      const available = sqliteContainers.filter(
+        (c) => c.status === 'running',
+      ).length
+      const missing = sqliteContainers.filter(
+        (c) => c.status !== 'running',
+      ).length
 
       const parts: string[] = []
       if (serverContainers.length > 0) {
         parts.push(`${running} running, ${stopped} stopped`)
       }
       if (sqliteContainers.length > 0) {
-        parts.push(`${available} SQLite available${missing > 0 ? `, ${missing} missing` : ''}`)
+        parts.push(
+          `${available} SQLite available${missing > 0 ? `, ${missing} missing` : ''}`,
+        )
       }
 
       console.log(
-        chalk.gray(
-          `  ${containers.length} container(s): ${parts.join('; ')}`,
-        ),
+        chalk.gray(`  ${containers.length} container(s): ${parts.join('; ')}`),
       )
       console.log()
-    } catch (err) {
-      const e = err as Error
-      console.error(error(e.message))
+    } catch (error) {
+      const e = error as Error
+      console.error(uiError(e.message))
       process.exit(1)
     }
   })

package/cli/commands/logs.ts

@@ -5,7 +5,7 @@ import { readFile } from 'fs/promises'
 import { containerManager } from '../../core/container-manager'
 import { paths } from '../../config/paths'
 import { promptContainerSelect } from '../ui/prompts'
-import { error, warning, info } from '../ui/theme'
+import { uiError, uiWarning, uiInfo } from '../ui/theme'
 
 function getLastNLines(content: string, n: number): string {
   const lines = content.split('\n')
@@ -32,7 +32,7 @@ export const logsCommand = new Command('logs')
           const containers = await containerManager.list()
 
           if (containers.length === 0) {
-            console.log(warning('No containers found'))
+            console.log(uiWarning('No containers found'))
             return
           }
 
@@ -46,7 +46,7 @@ export const logsCommand = new Command('logs')
 
         const config = await containerManager.getConfig(containerName)
         if (!config) {
-          console.error(error(`Container "${containerName}" not found`))
+          console.error(uiError(`Container "${containerName}" not found`))
           process.exit(1)
         }
 
@@ -56,7 +56,7 @@ export const logsCommand = new Command('logs')
 
         if (!existsSync(logPath)) {
           console.log(
-            info(
+            uiInfo(
               `No log file found for "${containerName}". The container may not have been started yet.`,
             ),
           )
@@ -84,17 +84,27 @@ export const logsCommand = new Command('logs')
 
         if (options.follow) {
           const lineCount = parseInt(options.lines || '50', 10)
-          const child = spawn('tail', ['-n', String(lineCount), '-f', logPath], {
-            stdio: 'inherit',
-          })
+          const child = spawn(
+            'tail',
+            ['-n', String(lineCount), '-f', logPath],
+            {
+              stdio: 'inherit',
+            },
+          )
 
-          process.on('SIGINT', () => {
+          // Use named handler so we can remove it to prevent listener leaks
+          const sigintHandler = () => {
+            process.removeListener('SIGINT', sigintHandler)
             child.kill('SIGTERM')
             process.exit(0)
-          })
+          }
+          process.on('SIGINT', sigintHandler)
 
           await new Promise<void>((resolve) => {
-            child.on('close', () => resolve())
+            child.on('close', () => {
+              process.removeListener('SIGINT', sigintHandler)
+              resolve()
+            })
           })
           return
         }
@@ -103,15 +113,15 @@ export const logsCommand = new Command('logs')
         const content = await readFile(logPath, 'utf-8')
 
         if (content.trim() === '') {
-          console.log(info('Log file is empty'))
+          console.log(uiInfo('Log file is empty'))
           return
         }
 
         const output = getLastNLines(content, lineCount)
         console.log(output)
-      } catch (err) {
-        const e = err as Error
-        console.error(error(e.message))
+      } catch (error) {
+        const e = error as Error
+        console.error(uiError(e.message))
         process.exit(1)
       }
     },

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

@@ -25,14 +25,15 @@ import {
 import { createSpinner } from '../../ui/spinner'
 import {
   header,
-  success,
-  error,
-  warning,
+  uiSuccess,
+  uiError,
+  uiWarning,
   connectionBox,
   formatBytes,
 } from '../../ui/theme'
 import { getEngineIcon } from '../../constants'
 import { type Engine } from '../../../types'
+import { pressEnterToContinue } from './shared'
 
 function generateBackupTimestamp(): string {
   const now = new Date()
@@ -65,7 +66,7 @@ export async function handleCreateForRestore(): Promise<{
   const portAvailable = await portManager.isPortAvailable(port)
   if (!portAvailable) {
     console.log(
-      error(`Port ${port} is in use. Please choose a different port.`),
+      uiError(`Port ${port} is in use. Please choose a different port.`),
     )
     return null
   }
@@ -77,13 +78,17 @@ export async function handleCreateForRestore(): Promise<{
 
   const isInstalled = await dbEngine.isBinaryInstalled(version)
   if (isInstalled) {
-    binarySpinner.succeed(`${dbEngine.displayName} ${version} binaries ready (cached)`)
+    binarySpinner.succeed(
+      `${dbEngine.displayName} ${version} binaries ready (cached)`,
+    )
   } else {
     binarySpinner.text = `Downloading ${dbEngine.displayName} ${version} binaries...`
     await dbEngine.ensureBinaries(version, ({ message }) => {
       binarySpinner.text = message
     })
-    binarySpinner.succeed(`${dbEngine.displayName} ${version} binaries downloaded`)
+    binarySpinner.succeed(
+      `${dbEngine.displayName} ${version} binaries downloaded`,
+    )
   }
 
   while (await containerManager.exists(containerName)) {
@@ -136,7 +141,7 @@ export async function handleCreateForRestore(): Promise<{
   }
 
   console.log()
-  console.log(success('Container ready for restore'))
+  console.log(uiSuccess('Container ready for restore'))
   console.log()
 
   return { name: containerName, config }
@@ -184,7 +189,7 @@ export async function handleRestore(): Promise<void> {
     containerName = selectedContainer
     config = await containerManager.getConfig(containerName)
     if (!config) {
-      console.error(error(`Container "${containerName}" not found`))
+      console.error(uiError(`Container "${containerName}" not found`))
       return
     }
   }
@@ -210,7 +215,7 @@ export async function handleRestore(): Promise<void> {
     missingDeps = await getMissingDependencies(config.engine)
     if (missingDeps.length > 0) {
       console.log(
-        error(
+        uiError(
           `Still missing tools: ${missingDeps.map((d) => d.name).join(', ')}`,
         ),
       )
@@ -301,8 +306,8 @@ export async function handleRestore(): Promise<void> {
         backupPath = tempDumpPath
         isTempFile = true
         dumpSuccess = true
-      } catch (err) {
-        const e = err as Error
+      } catch (error) {
+        const e = error as Error
         dumpSpinner.fail('Failed to create dump')
 
         if (
@@ -313,15 +318,19 @@ export async function handleRestore(): Promise<void> {
           const missingTool = e.message.includes('mysqldump')
             ? 'mysqldump'
             : 'pg_dump'
-          const toolEngine = missingTool === 'mysqldump' ? 'mysql' : 'postgresql'
-          const installed = await promptInstallDependencies(missingTool, toolEngine as Engine)
+          const toolEngine =
+            missingTool === 'mysqldump' ? 'mysql' : 'postgresql'
+          const installed = await promptInstallDependencies(
+            missingTool,
+            toolEngine as Engine,
+          )
           if (installed) {
             continue
           }
         } else {
           const dumpTool = config.engine === 'mysql' ? 'mysqldump' : 'pg_dump'
           console.log()
-          console.log(error(`${dumpTool} error:`))
+          console.log(uiError(`${dumpTool} error:`))
           console.log(chalk.gray(`  ${e.message}`))
           console.log()
         }
@@ -344,7 +353,7 @@ export async function handleRestore(): Promise<void> {
     }
 
     if (!dumpSuccess) {
-      console.log(error('Failed to create dump after retries'))
+      console.log(uiError('Failed to create dump after retries'))
       return
     }
   } else {
@@ -403,7 +412,7 @@ export async function handleRestore(): Promise<void> {
     createDatabase: false,
   })
 
-  if (result.code === 0 || !result.stderr) {
+  if (result.code === 0) {
     restoreSpinner.succeed('Backup restored successfully')
   } else {
     const stderr = result.stderr || ''
@@ -415,9 +424,9 @@ export async function handleRestore(): Promise<void> {
     ) {
       restoreSpinner.fail('Version compatibility detected')
       console.log()
-      console.log(error('PostgreSQL version incompatibility detected:'))
+      console.log(uiError('PostgreSQL version incompatibility detected:'))
       console.log(
-        warning('Your pg_restore version is too old for this backup file.'),
+        uiWarning('Your pg_restore version is too old for this backup file.'),
       )
 
       console.log(chalk.yellow('Cleaning up failed database...'))
@@ -467,23 +476,20 @@ export async function handleRestore(): Promise<void> {
             upgradeSpinner.succeed('PostgreSQL client tools upgraded')
             console.log()
             console.log(
-              success('Please try the restore again with the updated tools.'),
+              uiSuccess('Please try the restore again with the updated tools.'),
             )
-            await new Promise((resolve) => {
-              console.log(chalk.gray('Press Enter to continue...'))
-              process.stdin.once('data', resolve)
-            })
+            await pressEnterToContinue()
             return
           } else {
             upgradeSpinner.fail('Upgrade failed')
             console.log()
             console.log(
-              error('Automatic upgrade failed. Please upgrade manually:'),
+              uiError('Automatic upgrade failed. Please upgrade manually:'),
             )
             const pgPackage = getPostgresHomebrewPackage()
             const latestMajor = pgPackage.split('@')[1]
             console.log(
-              warning(
+              uiWarning(
                 `  macOS: brew install ${pgPackage} && brew link --force ${pgPackage}`,
               ),
             )
@@ -493,7 +499,7 @@ export async function handleRestore(): Promise<void> {
               ),
             )
             console.log(
-              warning(
+              uiWarning(
                 `  Ubuntu/Debian: sudo apt update && sudo apt install postgresql-client-${latestMajor}`,
               ),
             )
@@ -502,15 +508,12 @@ export async function handleRestore(): Promise<void> {
                 `    This installs PostgreSQL ${latestMajor} client tools: pg_restore, pg_dump, psql, and libpq`,
               ),
             )
-            await new Promise((resolve) => {
-              console.log(chalk.gray('Press Enter to continue...'))
-              process.stdin.once('data', resolve)
-            })
+            await pressEnterToContinue()
             return
           }
         } catch {
           upgradeSpinner.fail('Upgrade failed')
-          console.log(error('Failed to upgrade PostgreSQL client tools'))
+          console.log(uiError('Failed to upgrade PostgreSQL client tools'))
           console.log(
             chalk.gray(
               'Manual upgrade may be required for pg_restore, pg_dump, and psql',
@@ -525,7 +528,7 @@ export async function handleRestore(): Promise<void> {
       } else {
         console.log()
         console.log(
-          warning(
+          uiWarning(
             'Restore cancelled. Please upgrade PostgreSQL client tools manually and try again.',
           ),
         )
@@ -552,10 +555,10 @@ export async function handleRestore(): Promise<void> {
     }
   }
 
-  if (result.code === 0 || !result.stderr) {
+  if (result.code === 0) {
     const connectionString = engine.getConnectionString(config, databaseName)
     console.log()
-    console.log(success(`Database "${databaseName}" restored`))
+    console.log(uiSuccess(`Database "${databaseName}" restored`))
     console.log(chalk.gray('  Connection string:'))
     console.log(chalk.cyan(`  ${connectionString}`))
 
@@ -591,7 +594,7 @@ export async function handleBackup(): Promise<void> {
   const running = containers.filter((c) => c.status === 'running')
 
   if (running.length === 0) {
-    console.log(warning('No running containers. Start a container first.'))
+    console.log(uiWarning('No running containers. Start a container first.'))
     await inquirer.prompt([
       {
         type: 'input',
@@ -611,7 +614,7 @@ export async function handleBackup(): Promise<void> {
 
   const config = await containerManager.getConfig(containerName)
   if (!config) {
-    console.log(error(`Container "${containerName}" not found`))
+    console.log(uiError(`Container "${containerName}" not found`))
     return
   }
 
@@ -638,7 +641,7 @@ export async function handleBackup(): Promise<void> {
     missingDeps = await getMissingDependencies(config.engine)
     if (missingDeps.length > 0) {
       console.log(
-        error(
+        uiError(
           `Still missing tools: ${missingDeps.map((d) => d.name).join(', ')}`,
         ),
       )
@@ -685,17 +688,17 @@ export async function handleBackup(): Promise<void> {
     backupSpinner.succeed('Backup created successfully')
 
     console.log()
-    console.log(success('Backup complete'))
+    console.log(uiSuccess('Backup complete'))
     console.log()
     console.log(chalk.gray('  File:'), chalk.cyan(result.path))
     console.log(chalk.gray('  Size:'), chalk.white(formatBytes(result.size)))
     console.log(chalk.gray('  Format:'), chalk.white(result.format))
     console.log()
-  } catch (err) {
-    const e = err as Error
+  } catch (error) {
+    const e = error as Error
     backupSpinner.fail('Backup failed')
     console.log()
-    console.log(error(e.message))
+    console.log(uiError(e.message))
     console.log()
   }
 
@@ -713,13 +716,13 @@ export async function handleClone(): Promise<void> {
   const stopped = containers.filter((c) => c.status !== 'running')
 
   if (containers.length === 0) {
-    console.log(warning('No containers found'))
+    console.log(uiWarning('No containers found'))
     return
   }
 
   if (stopped.length === 0) {
     console.log(
-      warning(
+      uiWarning(
         'All containers are running. Stop a container first to clone it.',
       ),
     )
@@ -733,6 +736,12 @@ export async function handleClone(): Promise<void> {
   )
   if (!sourceName) return
 
+  const sourceConfig = await containerManager.getConfig(sourceName)
+  if (!sourceConfig) {
+    console.log(uiError(`Container "${sourceName}" not found`))
+    return
+  }
+
   const { targetName } = await inquirer.prompt<{ targetName: string }>([
     {
       type: 'input',
@@ -749,16 +758,30 @@ export async function handleClone(): Promise<void> {
     },
   ])
 
+  // Check if target container already exists
+  if (
+    await containerManager.exists(targetName, { engine: sourceConfig.engine })
+  ) {
+    console.log(uiError(`Container "${targetName}" already exists`))
+    return
+  }
+
   const spinner = createSpinner(`Cloning ${sourceName} to ${targetName}...`)
   spinner.start()
 
-  const newConfig = await containerManager.clone(sourceName, targetName)
+  try {
+    const newConfig = await containerManager.clone(sourceName, targetName)
 
-  spinner.succeed(`Cloned "${sourceName}" to "${targetName}"`)
+    spinner.succeed(`Cloned "${sourceName}" to "${targetName}"`)
 
-  const engine = getEngine(newConfig.engine)
-  const connectionString = engine.getConnectionString(newConfig)
+    const engine = getEngine(newConfig.engine)
+    const connectionString = engine.getConnectionString(newConfig)
 
-  console.log()
-  console.log(connectionBox(targetName, connectionString, newConfig.port))
+    console.log()
+    console.log(connectionBox(targetName, connectionString, newConfig.port))
+  } catch (error) {
+    const e = error as Error
+    spinner.fail(`Failed to clone "${sourceName}"`)
+    console.log(uiError(e.message))
+  }
 }