spindb 0.7.0 → 0.7.5

package/cli/commands/edit.ts

@@ -8,16 +8,10 @@ import { promptContainerSelect } from '../ui/prompts'
 import { createSpinner } from '../ui/spinner'
 import { error, warning, success } from '../ui/theme'
 
-/**
- * Validate container name format
- */
 function isValidName(name: string): boolean {
   return /^[a-zA-Z][a-zA-Z0-9_-]*$/.test(name)
 }
 
-/**
- * Prompt for what to edit when no options provided
- */
 async function promptEditAction(): Promise<'name' | 'port' | null> {
   const { action } = await inquirer.prompt<{ action: string }>([
     {
@@ -36,9 +30,6 @@ async function promptEditAction(): Promise<'name' | 'port' | null> {
   return action as 'name' | 'port'
 }
 
-/**
- * Prompt for new container name
- */
 async function promptNewName(currentName: string): Promise<string | null> {
   const { newName } = await inquirer.prompt<{ newName: string }>([
     {
@@ -64,9 +55,6 @@ async function promptNewName(currentName: string): Promise<string | null> {
   return newName
 }
 
-/**
- * Prompt for new port
- */
 async function promptNewPort(currentPort: number): Promise<number | null> {
   const { newPort } = await inquirer.prompt<{ newPort: number }>([
     {
@@ -90,6 +78,15 @@ async function promptNewPort(currentPort: number): Promise<number | null> {
     return null
   }
 
+  const portAvailable = await portManager.isPortAvailable(newPort)
+  if (!portAvailable) {
+    console.log(
+      warning(
+        `Note: Port ${newPort} is currently in use. It will be used when the container starts.`,
+      ),
+    )
+  }
+
   return newPort
 }
 
@@ -106,7 +103,6 @@ export const editCommand = new Command('edit')
       try {
         let containerName = name
 
-        // Interactive selection if no name provided
         if (!containerName) {
           const containers = await containerManager.list()
 
@@ -123,14 +119,12 @@ export const editCommand = new Command('edit')
           containerName = selected
         }
 
-        // Get container config
         const config = await containerManager.getConfig(containerName)
         if (!config) {
           console.error(error(`Container "${containerName}" not found`))
           process.exit(1)
         }
 
-        // If no options provided, prompt for what to edit
         if (options.name === undefined && options.port === undefined) {
           const action = await promptEditAction()
           if (!action) return
@@ -152,9 +146,7 @@ export const editCommand = new Command('edit')
           }
         }
 
-        // Handle rename
         if (options.name) {
-          // Validate new name
           if (!isValidName(options.name)) {
             console.error(
               error(
@@ -164,7 +156,6 @@ export const editCommand = new Command('edit')
             process.exit(1)
           }
 
-          // Check if new name already exists
           const exists = await containerManager.exists(options.name, {
             engine: config.engine,
           })
@@ -173,7 +164,6 @@ export const editCommand = new Command('edit')
             process.exit(1)
           }
 
-          // Check if container is running
           const running = await processManager.isRunning(containerName, {
             engine: config.engine,
           })
@@ -186,7 +176,6 @@ export const editCommand = new Command('edit')
             process.exit(1)
           }
 
-          // Rename the container
           const spinner = createSpinner(
             `Renaming "${containerName}" to "${options.name}"...`,
           )
@@ -196,19 +185,15 @@ export const editCommand = new Command('edit')
 
           spinner.succeed(`Renamed "${containerName}" to "${options.name}"`)
 
-          // Update containerName for subsequent operations
           containerName = options.name
         }
 
-        // Handle port change
         if (options.port !== undefined) {
-          // Validate port
           if (options.port < 1 || options.port > 65535) {
             console.error(error('Port must be between 1 and 65535'))
             process.exit(1)
           }
 
-          // Check port availability (warning only)
           const portAvailable = await portManager.isPortAvailable(options.port)
           if (!portAvailable) {
             console.log(
@@ -218,7 +203,6 @@ export const editCommand = new Command('edit')
             )
           }
 
-          // Update the config
           const spinner = createSpinner(`Changing port to ${options.port}...`)
           spinner.start()
 

package/cli/commands/engines.ts

@@ -1,197 +1,19 @@
 import { Command } from 'commander'
 import chalk from 'chalk'
-import { readdir, lstat, rm } from 'fs/promises'
-import { existsSync } from 'fs'
-import { join } from 'path'
-import { exec } from 'child_process'
-import { promisify } from 'util'
+import { rm } from 'fs/promises'
 import inquirer from 'inquirer'
-import { paths } from '../../config/paths'
 import { containerManager } from '../../core/container-manager'
 import { promptConfirm } from '../ui/prompts'
 import { createSpinner } from '../ui/spinner'
 import { error, warning, info, formatBytes } from '../ui/theme'
+import { getEngineIcon, ENGINE_ICONS } from '../constants'
 import {
-  getMysqldPath,
-  getMysqlVersion,
-  isMariaDB,
-} from '../../engines/mysql/binary-detection'
+  getInstalledEngines,
+  getInstalledPostgresEngines,
+  type InstalledPostgresEngine,
+  type InstalledMysqlEngine,
+} from '../helpers'
 
-const execAsync = promisify(exec)
-
-/**
- * Installed engine info for PostgreSQL (downloaded binaries)
- */
-type InstalledPostgresEngine = {
-  engine: 'postgresql'
-  version: string
-  platform: string
-  arch: string
-  path: string
-  sizeBytes: number
-  source: 'downloaded'
-}
-
-/**
- * Installed engine info for MySQL (system-installed)
- */
-type InstalledMysqlEngine = {
-  engine: 'mysql'
-  version: string
-  path: string
-  source: 'system'
-  isMariaDB: boolean
-}
-
-type InstalledEngine = InstalledPostgresEngine | InstalledMysqlEngine
-
-/**
- * Get the actual PostgreSQL version from the binary
- */
-async function getPostgresVersion(binPath: string): Promise<string | null> {
-  const postgresPath = join(binPath, 'bin', 'postgres')
-  if (!existsSync(postgresPath)) {
-    return null
-  }
-
-  try {
-    const { stdout } = await execAsync(`"${postgresPath}" --version`)
-    // Output: postgres (PostgreSQL) 17.7
-    const match = stdout.match(/\(PostgreSQL\)\s+([\d.]+)/)
-    return match ? match[1] : null
-  } catch {
-    return null
-  }
-}
-
-/**
- * Get installed PostgreSQL engines from ~/.spindb/bin/
- */
-async function getInstalledPostgresEngines(): Promise<
-  InstalledPostgresEngine[]
-> {
-  const binDir = paths.bin
-
-  if (!existsSync(binDir)) {
-    return []
-  }
-
-  const entries = await readdir(binDir, { withFileTypes: true })
-  const engines: InstalledPostgresEngine[] = []
-
-  for (const entry of entries) {
-    if (entry.isDirectory()) {
-      // Parse directory name: postgresql-17-darwin-arm64
-      const match = entry.name.match(/^(\w+)-(.+)-(\w+)-(\w+)$/)
-      if (match && match[1] === 'postgresql') {
-        const [, , majorVersion, platform, arch] = match
-        const dirPath = join(binDir, entry.name)
-
-        // Get actual version from the binary
-        const actualVersion =
-          (await getPostgresVersion(dirPath)) || majorVersion
-
-        // Get directory size
-        let sizeBytes = 0
-        try {
-          const files = await readdir(dirPath, { recursive: true })
-          for (const file of files) {
-            try {
-              const filePath = join(dirPath, file.toString())
-              const fileStat = await lstat(filePath)
-              if (fileStat.isFile()) {
-                sizeBytes += fileStat.size
-              }
-            } catch {
-              // Skip files we can't stat
-            }
-          }
-        } catch {
-          // Skip directories we can't read
-        }
-
-        engines.push({
-          engine: 'postgresql',
-          version: actualVersion,
-          platform,
-          arch,
-          path: dirPath,
-          sizeBytes,
-          source: 'downloaded',
-        })
-      }
-    }
-  }
-
-  // Sort by version descending
-  engines.sort((a, b) => compareVersions(b.version, a.version))
-
-  return engines
-}
-
-/**
- * Detect system-installed MySQL
- */
-async function getInstalledMysqlEngine(): Promise<InstalledMysqlEngine | null> {
-  const mysqldPath = await getMysqldPath()
-  if (!mysqldPath) {
-    return null
-  }
-
-  const version = await getMysqlVersion(mysqldPath)
-  if (!version) {
-    return null
-  }
-
-  const mariadb = await isMariaDB()
-
-  return {
-    engine: 'mysql',
-    version,
-    path: mysqldPath,
-    source: 'system',
-    isMariaDB: mariadb,
-  }
-}
-
-/**
- * Get all installed engines (PostgreSQL + MySQL)
- */
-async function getInstalledEngines(): Promise<InstalledEngine[]> {
-  const engines: InstalledEngine[] = []
-
-  // Get PostgreSQL engines
-  const pgEngines = await getInstalledPostgresEngines()
-  engines.push(...pgEngines)
-
-  // Get MySQL engine
-  const mysqlEngine = await getInstalledMysqlEngine()
-  if (mysqlEngine) {
-    engines.push(mysqlEngine)
-  }
-
-  return engines
-}
-
-function compareVersions(a: string, b: string): number {
-  const partsA = a.split('.').map((p) => parseInt(p, 10) || 0)
-  const partsB = b.split('.').map((p) => parseInt(p, 10) || 0)
-
-  for (let i = 0; i < Math.max(partsA.length, partsB.length); i++) {
-    const numA = partsA[i] || 0
-    const numB = partsB[i] || 0
-    if (numA !== numB) return numA - numB
-  }
-  return 0
-}
-
-/**
- * Engine icons
- */
-const engineIcons: Record<string, string> = {
-  postgresql: '🐘',
-  mysql: '🐬',
-}
 
 /**
  * List subcommand action
@@ -243,7 +65,7 @@ async function listEngines(options: { json?: boolean }): Promise<void> {
 
   // PostgreSQL rows
   for (const engine of pgEngines) {
-    const icon = engineIcons[engine.engine] || '▣'
+    const icon = getEngineIcon(engine.engine)
     const platformInfo = `${engine.platform}-${engine.arch}`
 
     console.log(
@@ -257,7 +79,7 @@ async function listEngines(options: { json?: boolean }): Promise<void> {
 
   // MySQL row
   if (mysqlEngine) {
-    const icon = engineIcons.mysql
+    const icon = ENGINE_ICONS.mysql
     const displayName = mysqlEngine.isMariaDB ? 'mariadb' : 'mysql'
 
     console.log(
@@ -313,7 +135,7 @@ async function deleteEngine(
   // Interactive selection if not provided
   if (!engineName || !engineVersion) {
     const choices = pgEngines.map((e) => ({
-      name: `${engineIcons[e.engine]} ${e.engine} ${e.version} ${chalk.gray(`(${formatBytes(e.sizeBytes)})`)}`,
+      name: `${getEngineIcon(e.engine)} ${e.engine} ${e.version} ${chalk.gray(`(${formatBytes(e.sizeBytes)})`)}`,
       value: `${e.engine}:${e.version}:${e.path}`,
     }))
 

package/cli/commands/info.ts

@@ -1,31 +1,19 @@
 import { Command } from 'commander'
 import chalk from 'chalk'
+import inquirer from 'inquirer'
 import { containerManager } from '../../core/container-manager'
 import { processManager } from '../../core/process-manager'
 import { paths } from '../../config/paths'
 import { getEngine } from '../../engines'
 import { error, info, header } from '../ui/theme'
+import { getEngineIcon } from '../constants'
 import type { ContainerConfig } from '../../types'
 
-/**
- * Engine icons
- */
-const engineIcons: Record<string, string> = {
-  postgresql: '🐘',
-  mysql: '🐬',
-}
-
-/**
- * Format a date for display
- */
 function formatDate(dateString: string): string {
   const date = new Date(dateString)
   return date.toLocaleString()
 }
 
-/**
- * Get actual running status (not just config status)
- */
 async function getActualStatus(
   config: ContainerConfig,
 ): Promise<'running' | 'stopped'> {
@@ -35,9 +23,6 @@ async function getActualStatus(
   return running ? 'running' : 'stopped'
 }
 
-/**
- * Display info for a single container
- */
 async function displayContainerInfo(
   config: ContainerConfig,
   options: { json?: boolean },
@@ -65,7 +50,7 @@ async function displayContainerInfo(
     return
   }
 
-  const icon = engineIcons[config.engine] || '▣'
+  const icon = getEngineIcon(config.engine)
   const statusDisplay =
     actualStatus === 'running'
       ? chalk.green('● running')
@@ -115,15 +100,11 @@ async function displayContainerInfo(
   console.log()
 }
 
-/**
- * Display summary info for all containers
- */
 async function displayAllContainersInfo(
   containers: ContainerConfig[],
   options: { json?: boolean },
 ): Promise<void> {
   if (options.json) {
-    // Get actual status for all containers
     const containersWithStatus = await Promise.all(
       containers.map(async (config) => {
         const actualStatus = await getActualStatus(config)
@@ -148,7 +129,6 @@ async function displayAllContainersInfo(
   console.log(header('All Containers'))
   console.log()
 
-  // Table header
   console.log(
     chalk.gray('  ') +
       chalk.bold.white('NAME'.padEnd(18)) +
@@ -160,7 +140,6 @@ async function displayAllContainersInfo(
   )
   console.log(chalk.gray('  ' + '─'.repeat(78)))
 
-  // Table rows
   for (const container of containers) {
     const actualStatus = await getActualStatus(container)
     const statusDisplay =
@@ -168,7 +147,7 @@ async function displayAllContainersInfo(
         ? chalk.green('● running')
         : chalk.gray('○ stopped')
 
-    const icon = engineIcons[container.engine] || '▣'
+    const icon = getEngineIcon(container.engine)
     const engineDisplay = `${icon} ${container.engine}`
 
     console.log(
@@ -184,7 +163,6 @@ async function displayAllContainersInfo(
 
   console.log()
 
-  // Summary
   const statusChecks = await Promise.all(
     containers.map((c) => getActualStatus(c)),
   )
@@ -198,7 +176,6 @@ async function displayAllContainersInfo(
   )
   console.log()
 
-  // Connection strings
   console.log(chalk.bold.white('  Connection Strings:'))
   console.log(chalk.gray('  ' + '─'.repeat(78)))
   for (const container of containers) {
@@ -214,6 +191,7 @@ async function displayAllContainersInfo(
 }
 
 export const infoCommand = new Command('info')
+  .alias('status')
   .description('Show container details')
   .argument('[name]', 'Container name (omit to show all)')
   .option('--json', 'Output as JSON')
@@ -226,7 +204,6 @@ export const infoCommand = new Command('info')
         return
       }
 
-      // If name provided, show single container
       if (name) {
         const config = await containerManager.getConfig(name)
         if (!config) {
@@ -237,11 +214,8 @@ export const infoCommand = new Command('info')
         return
       }
 
-      // If running interactively without name, ask if they want all or specific
       if (!options.json && process.stdout.isTTY && containers.length > 1) {
-        const { choice } = await (
-          await import('inquirer')
-        ).default.prompt<{
+        const { choice } = await inquirer.prompt<{
           choice: string
         }>([
           {
@@ -251,7 +225,7 @@ export const infoCommand = new Command('info')
             choices: [
               { name: 'All containers', value: 'all' },
               ...containers.map((c) => ({
-                name: `${c.name} ${chalk.gray(`(${engineIcons[c.engine] || '▣'} ${c.engine})`)}`,
+                name: `${c.name} ${chalk.gray(`(${getEngineIcon(c.engine)} ${c.engine})`)}`,
                 value: c.name,
               })),
             ],
@@ -269,7 +243,6 @@ export const infoCommand = new Command('info')
         return
       }
 
-      // Non-interactive or only one container: show all
       await displayAllContainersInfo(containers, options)
     } catch (err) {
       const e = err as Error

package/cli/commands/list.ts

@@ -3,19 +3,9 @@ import chalk from 'chalk'
 import { containerManager } from '../../core/container-manager'
 import { getEngine } from '../../engines'
 import { info, error, formatBytes } from '../ui/theme'
+import { getEngineIcon } from '../constants'
 import type { ContainerConfig } from '../../types'
 
-/**
- * Engine icons for display
- */
-const engineIcons: Record<string, string> = {
-  postgresql: '🐘',
-  mysql: '🐬',
-}
-
-/**
- * Get database size for a container (only if running)
- */
 async function getContainerSize(
   container: ContainerConfig,
 ): Promise<number | null> {
@@ -39,7 +29,6 @@ export const listCommand = new Command('list')
       const containers = await containerManager.list()
 
       if (options.json) {
-        // Include sizes in JSON output
         const containersWithSize = await Promise.all(
           containers.map(async (container) => ({
             ...container,
@@ -55,10 +44,8 @@ export const listCommand = new Command('list')
         return
       }
 
-      // Fetch sizes for running containers in parallel
       const sizes = await Promise.all(containers.map(getContainerSize))
 
-      // Table header
       console.log()
       console.log(
         chalk.gray('  ') +
@@ -71,7 +58,6 @@ export const listCommand = new Command('list')
       )
       console.log(chalk.gray('  ' + '─'.repeat(73)))
 
-      // Table rows
       for (let i = 0; i < containers.length; i++) {
         const container = containers[i]
         const size = sizes[i]
@@ -81,10 +67,9 @@ export const listCommand = new Command('list')
             ? chalk.green('● running')
             : chalk.gray('○ stopped')
 
-        const engineIcon = engineIcons[container.engine] || '▣'
+        const engineIcon = getEngineIcon(container.engine)
         const engineDisplay = `${engineIcon} ${container.engine}`
 
-        // Format size: show value if running, dash if stopped
         const sizeDisplay = size !== null ? formatBytes(size) : chalk.gray('—')
 
         console.log(
@@ -100,7 +85,6 @@ export const listCommand = new Command('list')
 
       console.log()
 
-      // Summary
       const running = containers.filter((c) => c.status === 'running').length
       const stopped = containers.filter((c) => c.status !== 'running').length
       console.log(

package/cli/commands/logs.ts

@@ -0,0 +1,118 @@
+import { Command } from 'commander'
+import { spawn } from 'child_process'
+import { existsSync } from 'fs'
+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'
+
+function getLastNLines(content: string, n: number): string {
+  const lines = content.split('\n')
+  const nonEmptyLines =
+    lines[lines.length - 1] === '' ? lines.slice(0, -1) : lines
+  return nonEmptyLines.slice(-n).join('\n')
+}
+
+export const logsCommand = new Command('logs')
+  .description('View container logs')
+  .argument('[name]', 'Container name')
+  .option('-f, --follow', 'Follow log output (like tail -f)')
+  .option('-n, --lines <number>', 'Number of lines to show', '50')
+  .option('--editor', 'Open logs in $EDITOR')
+  .action(
+    async (
+      name: string | undefined,
+      options: { follow?: boolean; lines?: string; editor?: boolean },
+    ) => {
+      try {
+        let containerName = name
+
+        if (!containerName) {
+          const containers = await containerManager.list()
+
+          if (containers.length === 0) {
+            console.log(warning('No containers found'))
+            return
+          }
+
+          const selected = await promptContainerSelect(
+            containers,
+            'Select container:',
+          )
+          if (!selected) return
+          containerName = selected
+        }
+
+        const config = await containerManager.getConfig(containerName)
+        if (!config) {
+          console.error(error(`Container "${containerName}" not found`))
+          process.exit(1)
+        }
+
+        const logPath = paths.getContainerLogPath(config.name, {
+          engine: config.engine,
+        })
+
+        if (!existsSync(logPath)) {
+          console.log(
+            info(
+              `No log file found for "${containerName}". The container may not have been started yet.`,
+            ),
+          )
+          return
+        }
+
+        if (options.editor) {
+          const editorCmd = process.env.EDITOR || 'vi'
+          const child = spawn(editorCmd, [logPath], {
+            stdio: 'inherit',
+          })
+
+          await new Promise<void>((resolve, reject) => {
+            child.on('close', (code) => {
+              if (code === 0) {
+                resolve()
+              } else {
+                reject(new Error(`Editor exited with code ${code}`))
+              }
+            })
+            child.on('error', reject)
+          })
+          return
+        }
+
+        if (options.follow) {
+          const lineCount = parseInt(options.lines || '50', 10)
+          const child = spawn('tail', ['-n', String(lineCount), '-f', logPath], {
+            stdio: 'inherit',
+          })
+
+          process.on('SIGINT', () => {
+            child.kill('SIGTERM')
+            process.exit(0)
+          })
+
+          await new Promise<void>((resolve) => {
+            child.on('close', () => resolve())
+          })
+          return
+        }
+
+        const lineCount = parseInt(options.lines || '50', 10)
+        const content = await readFile(logPath, 'utf-8')
+
+        if (content.trim() === '') {
+          console.log(info('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))
+        process.exit(1)
+      }
+    },
+  )