spindb 0.5.2 → 0.5.4

package/config/os-dependencies.ts

@@ -5,9 +5,11 @@
  * across different operating systems and package managers.
  */
 
+import { getPostgresHomebrewPackage } from './engine-defaults'
+
 export type PackageManagerId = 'brew' | 'apt' | 'yum' | 'dnf' | 'pacman'
 
-export type Platform = 'darwin' | 'linux'
+export type Platform = 'darwin' | 'linux' | 'win32'
 
 /**
  * Package definition for a specific package manager
@@ -116,122 +118,66 @@ export const packageManagers: PackageManagerConfig[] = [
 // PostgreSQL Dependencies
 // =============================================================================
 
+/**
+ * Helper to create PostgreSQL client tool dependency
+ * Uses getPostgresHomebrewPackage() to get the current latest version
+ */
+function createPostgresDependency(
+  name: string,
+  binary: string,
+  description: string,
+): Dependency {
+  const pgPackage = getPostgresHomebrewPackage()
+  return {
+    name,
+    binary,
+    description,
+    packages: {
+      brew: {
+        package: pgPackage,
+        postInstall: [`brew link --overwrite ${pgPackage}`],
+      },
+      apt: { package: 'postgresql-client' },
+      yum: { package: 'postgresql' },
+      dnf: { package: 'postgresql' },
+      pacman: { package: 'postgresql-libs' },
+    },
+    manualInstall: {
+      darwin: [
+        'Install Homebrew: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"',
+        `Then run: brew install ${pgPackage} && brew link --overwrite ${pgPackage}`,
+        'Or install Postgres.app: https://postgresapp.com/downloads.html',
+      ],
+      linux: [
+        'Ubuntu/Debian: sudo apt install postgresql-client',
+        'CentOS/RHEL: sudo yum install postgresql',
+        'Fedora: sudo dnf install postgresql',
+        'Arch: sudo pacman -S postgresql-libs',
+      ],
+    },
+  }
+}
+
 const postgresqlDependencies: EngineDependencies = {
   engine: 'postgresql',
   displayName: 'PostgreSQL',
   dependencies: [
-    {
-      name: 'psql',
-      binary: 'psql',
-      description: 'PostgreSQL interactive terminal',
-      packages: {
-        brew: {
-          package: 'postgresql@17',
-          postInstall: ['brew link --overwrite postgresql@17'],
-        },
-        apt: { package: 'postgresql-client' },
-        yum: { package: 'postgresql' },
-        dnf: { package: 'postgresql' },
-        pacman: { package: 'postgresql-libs' },
-      },
-      manualInstall: {
-        darwin: [
-          'Install Homebrew: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"',
-          'Then run: brew install postgresql@17 && brew link --overwrite postgresql@17',
-          'Or install Postgres.app: https://postgresapp.com/downloads.html',
-        ],
-        linux: [
-          'Ubuntu/Debian: sudo apt install postgresql-client',
-          'CentOS/RHEL: sudo yum install postgresql',
-          'Fedora: sudo dnf install postgresql',
-          'Arch: sudo pacman -S postgresql-libs',
-        ],
-      },
-    },
-    {
-      name: 'pg_dump',
-      binary: 'pg_dump',
-      description: 'PostgreSQL database backup utility',
-      packages: {
-        brew: {
-          package: 'postgresql@17',
-          postInstall: ['brew link --overwrite postgresql@17'],
-        },
-        apt: { package: 'postgresql-client' },
-        yum: { package: 'postgresql' },
-        dnf: { package: 'postgresql' },
-        pacman: { package: 'postgresql-libs' },
-      },
-      manualInstall: {
-        darwin: [
-          'Install Homebrew: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"',
-          'Then run: brew install postgresql@17 && brew link --overwrite postgresql@17',
-          'Or install Postgres.app: https://postgresapp.com/downloads.html',
-        ],
-        linux: [
-          'Ubuntu/Debian: sudo apt install postgresql-client',
-          'CentOS/RHEL: sudo yum install postgresql',
-          'Fedora: sudo dnf install postgresql',
-          'Arch: sudo pacman -S postgresql-libs',
-        ],
-      },
-    },
-    {
-      name: 'pg_restore',
-      binary: 'pg_restore',
-      description: 'PostgreSQL database restore utility',
-      packages: {
-        brew: {
-          package: 'postgresql@17',
-          postInstall: ['brew link --overwrite postgresql@17'],
-        },
-        apt: { package: 'postgresql-client' },
-        yum: { package: 'postgresql' },
-        dnf: { package: 'postgresql' },
-        pacman: { package: 'postgresql-libs' },
-      },
-      manualInstall: {
-        darwin: [
-          'Install Homebrew: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"',
-          'Then run: brew install postgresql@17 && brew link --overwrite postgresql@17',
-          'Or install Postgres.app: https://postgresapp.com/downloads.html',
-        ],
-        linux: [
-          'Ubuntu/Debian: sudo apt install postgresql-client',
-          'CentOS/RHEL: sudo yum install postgresql',
-          'Fedora: sudo dnf install postgresql',
-          'Arch: sudo pacman -S postgresql-libs',
-        ],
-      },
-    },
-    {
-      name: 'pg_basebackup',
-      binary: 'pg_basebackup',
-      description: 'PostgreSQL base backup utility for physical backups',
-      packages: {
-        brew: {
-          package: 'postgresql@17',
-          postInstall: ['brew link --overwrite postgresql@17'],
-        },
-        apt: { package: 'postgresql-client' },
-        yum: { package: 'postgresql' },
-        dnf: { package: 'postgresql' },
-        pacman: { package: 'postgresql-libs' },
-      },
-      manualInstall: {
-        darwin: [
-          'Install Homebrew: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"',
-          'Then run: brew install postgresql@17 && brew link --overwrite postgresql@17',
-          'Or install Postgres.app: https://postgresapp.com/downloads.html',
-        ],
-        linux: [
-          'Ubuntu/Debian: sudo apt install postgresql-client',
-          'CentOS/RHEL: sudo yum install postgresql',
-          'Fedora: sudo dnf install postgresql',
-          'Arch: sudo pacman -S postgresql-libs',
-        ],
-      },
-    },
+    createPostgresDependency('psql', 'psql', 'PostgreSQL interactive terminal'),
+    createPostgresDependency(
+      'pg_dump',
+      'pg_dump',
+      'PostgreSQL database backup utility',
+    ),
+    createPostgresDependency(
+      'pg_restore',
+      'pg_restore',
+      'PostgreSQL database restore utility',
+    ),
+    createPostgresDependency(
+      'pg_basebackup',
+      'pg_basebackup',
+      'PostgreSQL base backup utility for physical backups',
+    ),
   ],
 }
 
@@ -343,6 +289,98 @@ const mysqlDependencies: EngineDependencies = {
   ],
 }
 
+// =============================================================================
+// Optional Tools (engine-agnostic)
+// =============================================================================
+
+/**
+ * usql - Universal SQL client
+ * Works with PostgreSQL, MySQL, SQLite, and 20+ other databases
+ * https://github.com/xo/usql
+ */
+export const usqlDependency: Dependency = {
+  name: 'usql',
+  binary: 'usql',
+  description:
+    'Universal SQL client with auto-completion, syntax highlighting, and multi-database support',
+  packages: {
+    brew: {
+      package: 'xo/xo/usql',
+      preInstall: ['brew tap xo/xo'],
+    },
+    // Note: usql is not in standard Linux package repos, must use manual install
+  },
+  manualInstall: {
+    darwin: [
+      'Install Homebrew: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"',
+      'Then run: brew tap xo/xo && brew install xo/xo/usql',
+    ],
+    linux: [
+      'Download from GitHub releases: https://github.com/xo/usql/releases',
+      'Extract and move to PATH: sudo mv usql /usr/local/bin/',
+      'Or install via Go: go install github.com/xo/usql@latest',
+    ],
+  },
+}
+
+/**
+ * pgcli - PostgreSQL CLI with auto-completion and syntax highlighting
+ * https://github.com/dbcli/pgcli
+ */
+export const pgcliDependency: Dependency = {
+  name: 'pgcli',
+  binary: 'pgcli',
+  description:
+    'PostgreSQL CLI with intelligent auto-completion and syntax highlighting',
+  packages: {
+    brew: { package: 'pgcli' },
+    apt: { package: 'pgcli' },
+    dnf: { package: 'pgcli' },
+    yum: { package: 'pgcli' },
+    pacman: { package: 'pgcli' },
+  },
+  manualInstall: {
+    darwin: [
+      'Install with Homebrew: brew install pgcli',
+      'Or with pip: pip install pgcli',
+    ],
+    linux: [
+      'Debian/Ubuntu: sudo apt install pgcli',
+      'Fedora: sudo dnf install pgcli',
+      'Or with pip: pip install pgcli',
+    ],
+  },
+}
+
+/**
+ * mycli - MySQL CLI with auto-completion and syntax highlighting
+ * https://github.com/dbcli/mycli
+ */
+export const mycliDependency: Dependency = {
+  name: 'mycli',
+  binary: 'mycli',
+  description:
+    'MySQL/MariaDB CLI with intelligent auto-completion and syntax highlighting',
+  packages: {
+    brew: { package: 'mycli' },
+    apt: { package: 'mycli' },
+    dnf: { package: 'mycli' },
+    yum: { package: 'mycli' },
+    pacman: { package: 'mycli' },
+  },
+  manualInstall: {
+    darwin: [
+      'Install with Homebrew: brew install mycli',
+      'Or with pip: pip install mycli',
+    ],
+    linux: [
+      'Debian/Ubuntu: sudo apt install mycli',
+      'Fedora: sudo dnf install mycli',
+      'Or with pip: pip install mycli',
+    ],
+  },
+}
+
 // =============================================================================
 // Registry
 // =============================================================================

package/config/paths.ts

@@ -1,46 +1,17 @@
-import { homedir } from 'os'
 import { join } from 'path'
-import { execSync } from 'child_process'
 import { getEngineDefaults } from './engine-defaults'
+import { platformService } from '../core/platform-service'
 
 /**
- * Get the real user's home directory, even when running under sudo.
- * When a user runs `sudo spindb`, we want to use their home directory,
- * not root's home directory.
+ * Get the SpinDB home directory using the platform service.
+ * This handles sudo detection and platform-specific home directories.
  */
-function getRealHomeDir(): string {
-  // Check if running under sudo
-  const sudoUser = process.env.SUDO_USER
-
-  if (sudoUser) {
-    // Get the original user's home directory
-    try {
-      // Use getent to reliably get the home directory for the sudo user
-      const result = execSync(`getent passwd ${sudoUser}`, {
-        encoding: 'utf-8',
-      })
-      const parts = result.trim().split(':')
-      if (parts.length >= 6 && parts[5]) {
-        return parts[5]
-      }
-    } catch {
-      // Fall back to constructing the path
-      // On most Linux systems, home dirs are /home/username
-      // On macOS, they're /Users/username
-      const platform = process.platform
-      if (platform === 'darwin') {
-        return `/Users/${sudoUser}`
-      } else {
-        return `/home/${sudoUser}`
-      }
-    }
-  }
-
-  // Not running under sudo, use normal homedir
-  return homedir()
+function getSpinDBHome(): string {
+  const platformInfo = platformService.getPlatformInfo()
+  return join(platformInfo.homeDir, '.spindb')
 }
 
-const SPINDB_HOME = join(getRealHomeDir(), '.spindb')
+const SPINDB_HOME = getSpinDBHome()
 
 /**
  * Options for container path functions

package/core/binary-manager.ts

@@ -56,15 +56,17 @@ export class BinaryManager {
 
   /**
    * Check if binaries for a specific version are already installed
+   * Uses full version for directory naming (e.g., postgresql-17.7.0-darwin-arm64)
    */
   async isInstalled(
     version: string,
     platform: string,
     arch: string,
   ): Promise<boolean> {
+    const fullVersion = this.getFullVersion(version)
     const binPath = paths.getBinaryPath({
       engine: 'postgresql',
-      version,
+      version: fullVersion,
       platform,
       arch,
     })
@@ -113,14 +115,15 @@ export class BinaryManager {
     arch: string,
     onProgress?: ProgressCallback,
   ): Promise<string> {
+    const fullVersion = this.getFullVersion(version)
     const url = this.getDownloadUrl(version, platform, arch)
     const binPath = paths.getBinaryPath({
       engine: 'postgresql',
-      version,
+      version: fullVersion,
       platform,
       arch,
     })
-    const tempDir = join(paths.bin, `temp-${version}-${platform}-${arch}`)
+    const tempDir = join(paths.bin, `temp-${fullVersion}-${platform}-${arch}`)
     const jarFile = join(tempDir, 'postgres.jar')
 
     // Ensure directories exist
@@ -200,9 +203,10 @@ export class BinaryManager {
     platform: string,
     arch: string,
   ): Promise<boolean> {
+    const fullVersion = this.getFullVersion(version)
     const binPath = paths.getBinaryPath({
       engine: 'postgresql',
-      version,
+      version: fullVersion,
       platform,
       arch,
     })
@@ -256,9 +260,10 @@ export class BinaryManager {
     arch: string,
     binary: string,
   ): string {
+    const fullVersion = this.getFullVersion(version)
     const binPath = paths.getBinaryPath({
       engine: 'postgresql',
-      version,
+      version: fullVersion,
       platform,
       arch,
     })
@@ -274,6 +279,7 @@ export class BinaryManager {
     arch: string,
     onProgress?: ProgressCallback,
   ): Promise<string> {
+    const fullVersion = this.getFullVersion(version)
     if (await this.isInstalled(version, platform, arch)) {
       onProgress?.({
         stage: 'cached',
@@ -281,7 +287,7 @@ export class BinaryManager {
       })
       return paths.getBinaryPath({
         engine: 'postgresql',
-        version,
+        version: fullVersion,
         platform,
         arch,
       })

package/core/config-manager.ts

@@ -4,6 +4,7 @@ import { exec } from 'child_process'
 import { promisify } from 'util'
 import { dirname } from 'path'
 import { paths } from '../config/paths'
+import { logDebug, logWarning } from './error-handler'
 import type {
   SpinDBConfig,
   BinaryConfig,
@@ -41,8 +42,12 @@ export class ConfigManager {
       const content = await readFile(configPath, 'utf8')
       this.config = JSON.parse(content) as SpinDBConfig
       return this.config
-    } catch {
+    } catch (error) {
       // If config is corrupted, reset to default
+      logWarning('Config file corrupted, resetting to default', {
+        configPath,
+        error: error instanceof Error ? error.message : String(error),
+      })
       this.config = { ...DEFAULT_CONFIG }
       await this.save()
       return this.config
@@ -110,8 +115,12 @@ export class ConfigManager {
       if (match) {
         version = match[0]
       }
-    } catch {
-      // Version detection failed, that's ok
+    } catch (error) {
+      logDebug('Version detection failed', {
+        tool,
+        path,
+        error: error instanceof Error ? error.message : String(error),
+      })
     }
 
     config.binaries[tool] = {
@@ -142,8 +151,11 @@ export class ConfigManager {
       if (path && existsSync(path)) {
         return path
       }
-    } catch {
-      // which failed, binary not found
+    } catch (error) {
+      logDebug('which command failed for binary detection', {
+        tool,
+        error: error instanceof Error ? error.message : String(error),
+      })
     }
 
     // Check common locations

package/core/dependency-manager.ts

@@ -15,7 +15,11 @@ import {
   packageManagers,
   getEngineDependencies,
   getUniqueDependencies,
+  usqlDependency,
+  pgcliDependency,
+  mycliDependency,
 } from '../config/os-dependencies'
+import { platformService } from './platform-service'
 
 const execAsync = promisify(exec)
 
@@ -46,7 +50,7 @@ export type InstallResult = {
  * Detect which package manager is available on the current system
  */
 export async function detectPackageManager(): Promise<DetectedPackageManager | null> {
-  const platform = process.platform as Platform
+  const { platform } = platformService.getPlatformInfo()
 
   // Filter to package managers available on this platform
   const candidates = packageManagers.filter((pm) =>
@@ -73,7 +77,7 @@ export async function detectPackageManager(): Promise<DetectedPackageManager | n
  * Get the current platform
  */
 export function getCurrentPlatform(): Platform {
-  return process.platform as Platform
+  return platformService.getPlatformInfo().platform as Platform
 }
 
 // =============================================================================
@@ -87,21 +91,12 @@ export async function findBinary(
   binary: string,
 ): Promise<{ path: string; version?: string } | null> {
   try {
-    const command = process.platform === 'win32' ? 'where' : 'which'
-    const { stdout } = await execAsync(`${command} ${binary}`)
-    const path = stdout.trim().split('\n')[0]
-
+    // Use platformService to find the binary path
+    const path = await platformService.findToolPath(binary)
     if (!path) return null
 
     // Try to get version
-    let version: string | undefined
-    try {
-      const { stdout: versionOutput } = await execAsync(`${binary} --version`)
-      const match = versionOutput.match(/(\d+\.\d+(\.\d+)?)/)
-      version = match ? match[1] : undefined
-    } catch {
-      // Version check failed, that's ok
-    }
+    const version = (await platformService.getToolVersion(path)) || undefined
 
     return { path, version }
   } catch {
@@ -216,7 +211,9 @@ function execWithInheritedStdio(command: string): void {
   }
 
   if (result.status !== 0) {
-    throw new Error(`Command failed with exit code ${result.status}: ${cmdToRun}`)
+    throw new Error(
+      `Command failed with exit code ${result.status}: ${cmdToRun}`,
+    )
   }
 }
 
@@ -427,3 +424,135 @@ export async function getAllDependencyReports(): Promise<
   )
   return reports
 }
+
+// =============================================================================
+// usql (Enhanced Shell) Support
+// =============================================================================
+
+/**
+ * Check if usql is installed
+ */
+export async function isUsqlInstalled(): Promise<boolean> {
+  const status = await checkDependency(usqlDependency)
+  return status.installed
+}
+
+/**
+ * Get usql dependency status
+ */
+export async function getUsqlStatus(): Promise<DependencyStatus> {
+  return checkDependency(usqlDependency)
+}
+
+/**
+ * Install usql using the detected package manager
+ */
+export async function installUsql(
+  packageManager: DetectedPackageManager,
+): Promise<InstallResult> {
+  return installDependency(usqlDependency, packageManager)
+}
+
+/**
+ * Get usql manual installation instructions
+ */
+export function getUsqlManualInstructions(
+  platform: Platform = getCurrentPlatform(),
+): string[] {
+  return getManualInstallInstructions(usqlDependency, platform)
+}
+
+/**
+ * Get the usql dependency definition
+ */
+export function getUsqlDependency(): Dependency {
+  return usqlDependency
+}
+
+// =============================================================================
+// pgcli (PostgreSQL Enhanced Shell) Support
+// =============================================================================
+
+/**
+ * Check if pgcli is installed
+ */
+export async function isPgcliInstalled(): Promise<boolean> {
+  const status = await checkDependency(pgcliDependency)
+  return status.installed
+}
+
+/**
+ * Get pgcli dependency status
+ */
+export async function getPgcliStatus(): Promise<DependencyStatus> {
+  return checkDependency(pgcliDependency)
+}
+
+/**
+ * Install pgcli using the detected package manager
+ */
+export async function installPgcli(
+  packageManager: DetectedPackageManager,
+): Promise<InstallResult> {
+  return installDependency(pgcliDependency, packageManager)
+}
+
+/**
+ * Get pgcli manual installation instructions
+ */
+export function getPgcliManualInstructions(
+  platform: Platform = getCurrentPlatform(),
+): string[] {
+  return getManualInstallInstructions(pgcliDependency, platform)
+}
+
+/**
+ * Get the pgcli dependency definition
+ */
+export function getPgcliDependency(): Dependency {
+  return pgcliDependency
+}
+
+// =============================================================================
+// mycli (MySQL Enhanced Shell) Support
+// =============================================================================
+
+/**
+ * Check if mycli is installed
+ */
+export async function isMycliInstalled(): Promise<boolean> {
+  const status = await checkDependency(mycliDependency)
+  return status.installed
+}
+
+/**
+ * Get mycli dependency status
+ */
+export async function getMycliStatus(): Promise<DependencyStatus> {
+  return checkDependency(mycliDependency)
+}
+
+/**
+ * Install mycli using the detected package manager
+ */
+export async function installMycli(
+  packageManager: DetectedPackageManager,
+): Promise<InstallResult> {
+  return installDependency(mycliDependency, packageManager)
+}
+
+/**
+ * Get mycli manual installation instructions
+ */
+export function getMycliManualInstructions(
+  platform: Platform = getCurrentPlatform(),
+): string[] {
+  return getManualInstallInstructions(mycliDependency, platform)
+}
+
+/**
+ * Get the mycli dependency definition
+ */
+export function getMycliDependency(): Dependency {
+  return mycliDependency
+}