chore: wip

Author: chrisbbreuer

packages/launchpad/src/services/definitions.ts

@@ -76,7 +76,7 @@ export const SERVICE_DEFINITIONS: Record<string, ServiceDefinition> = {
     description: 'MySQL database server',
     packageDomain: 'mysql.com',
     executable: 'mysqld',
-    args: ['--datadir={dataDir}', '--pid-file={pidFile}', '--port=3306', '--bind-address=127.0.0.1', '--skip-grant-tables', '--default-authentication-plugin=mysql_native_password'],
+    args: ['--datadir={dataDir}', '--pid-file={pidFile}', '--port=3306', '--bind-address=127.0.0.1'],
     env: {},
     dataDirectory: path.join(homedir(), '.local', 'share', 'launchpad', 'services', 'mysql', 'data'),
     logFile: path.join(homedir(), '.local', 'share', 'launchpad', 'logs', 'mysql.log'),
@@ -93,10 +93,10 @@ export const SERVICE_DEFINITIONS: Record<string, ServiceDefinition> = {
     initCommand: ['mysqld', '--initialize-insecure', '--datadir={dataDir}', '--user={currentUser}'],
     postStartCommands: [
       // Create application database and user for any project type
-      ['mysql', '-u', 'root', '-e', 'CREATE DATABASE IF NOT EXISTS {projectDatabase};'],
-      ['mysql', '-u', 'root', '-e', 'CREATE USER IF NOT EXISTS \'{dbUsername}\'@\'localhost\' IDENTIFIED BY \'{dbPassword}\';'],
-      ['mysql', '-u', 'root', '-e', 'GRANT ALL PRIVILEGES ON {projectDatabase}.* TO \'{dbUsername}\'@\'localhost\';'],
-      ['mysql', '-u', 'root', '-e', 'FLUSH PRIVILEGES;'],
+      ['mysql', '-h', '127.0.0.1', '-P', '3306', '-u', 'root', '-e', 'CREATE DATABASE IF NOT EXISTS {projectDatabase};'],
+      ['mysql', '-h', '127.0.0.1', '-P', '3306', '-u', 'root', '-e', 'CREATE USER IF NOT EXISTS \'{dbUsername}\'@\'localhost\' IDENTIFIED BY \'{dbPassword}\';'],
+      ['mysql', '-h', '127.0.0.1', '-P', '3306', '-u', 'root', '-e', 'GRANT ALL PRIVILEGES ON {projectDatabase}.* TO \'{dbUsername}\'@\'localhost\';'],
+      ['mysql', '-h', '127.0.0.1', '-P', '3306', '-u', 'root', '-e', 'FLUSH PRIVILEGES;'],
     ],
     supportsGracefulShutdown: true,
     config: {

packages/launchpad/src/services/manager.ts

@@ -322,24 +322,23 @@ export async function stopService(serviceName: string): Promise<boolean> {
   }
 
   try {
-    const service = manager.services.get(serviceName)
-
-    if (!service) {
-      console.warn(`⚠️  Service ${serviceName} is not registered`)
-      operation.result = 'success'
-      operation.duration = 0
-      manager.operations.push(operation)
-      return true
-    }
+    // Get or create service instance (ensures service is registered)
+    const service = await getOrCreateServiceInstance(serviceName)
 
-    if (service.status === 'stopped') {
+    // Check actual service health to determine if it's really running
+    const isActuallyRunning = await checkServiceHealth(service)
+    if (!isActuallyRunning) {
+      service.status = 'stopped'
       console.log(`✅ Service ${serviceName} is already stopped`)
       operation.result = 'success'
       operation.duration = 0
       manager.operations.push(operation)
       return true
     }
 
+    // Update status based on health check
+    service.status = 'running'
+
     console.warn(`🛑 Stopping ${service.definition?.displayName || serviceName}...`)
 
     // Update status to stopping
@@ -575,22 +574,20 @@ export async function disableService(serviceName: string): Promise<boolean> {
  * Get the status of a service
  */
 export async function getServiceStatus(serviceName: string): Promise<ServiceStatus> {
-  const manager = await getServiceManager()
-  const service = manager.services.get(serviceName)
-
-  if (!service) {
-    return 'stopped'
-  }
+  try {
+    // Get or create service instance to ensure it's registered
+    const service = await getOrCreateServiceInstance(serviceName)
 
-  // Check if the service is actually running
-  if (service.status === 'running') {
+    // Always check actual health to get real-time status
     const isActuallyRunning = await checkServiceHealth(service)
-    if (!isActuallyRunning) {
-      service.status = 'stopped'
-    }
-  }
+    service.status = isActuallyRunning ? 'running' : 'stopped'
 
-  return service.status
+    return service.status
+  }
+  catch {
+    // If service definition not found, return stopped
+    return 'stopped'
+  }
 }
 
 /**
@@ -1150,7 +1147,7 @@ async function autoInitializeDatabase(service: ServiceInstance): Promise<boolean
 
   // MySQL auto-initialization
   if (definition.name === 'mysql' || definition.name === 'mariadb') {
-    const dataDir = service.dataDir || definition.dataDirectory || path.join(homedir(), '.local', 'share', 'launchpad', 'mysql-data')
+    const dataDir = service.dataDir || definition.dataDirectory || path.join(homedir(), '.local', 'share', 'launchpad', 'services', 'mysql', 'data')
     const mysqlDir = path.join(dataDir, 'mysql')
 
     // Check if already initialized
@@ -1264,7 +1261,9 @@ async function autoInitializeDatabase(service: ServiceInstance): Promise<boolean
         console.log(`DYLD_LIBRARY_PATH: ${env.DYLD_LIBRARY_PATH}`)
       }
 
-      execSync(`mysqld --initialize-insecure --datadir="${dataDir}" --basedir="${basedir}" --user=$(whoami)`, {
+      // Use the real mysqld binary path instead of shim
+      const mysqldBin = path.join(basedir, 'bin', 'mysqld')
+      execSync(`"${mysqldBin}" --initialize-insecure --datadir="${dataDir}" --basedir="${basedir}" --user=$(whoami)`, {
         stdio: config.verbose ? 'inherit' : 'pipe',
         timeout: 120000,
         env,

packages/launchpad/src/services/platform.ts

@@ -45,7 +45,7 @@ export function generateLaunchdPlist(service: ServiceInstance): LaunchdPlist {
   })
 
   // Find the executable path
-  const executablePath = findBinaryInPath(definition.executable) || definition.executable
+  let executablePath = findBinaryInPath(definition.executable) || definition.executable
 
   // Compute runtime PATH and dynamic library search paths for packages started by launchd
   // launchd does not inherit shell env, so we must include env-specific paths here.
@@ -59,6 +59,26 @@ export function generateLaunchdPlist(service: ServiceInstance): LaunchdPlist {
           ? Boolean(config.services.shouldAutoStart)
           : Boolean(service.enabled))
 
+  // For MySQL/MariaDB: resolve real binary path from shim to get proper library paths
+  if ((definition.name === 'mysql' || definition.name === 'mariadb') && executablePath && fs.existsSync(executablePath)) {
+    try {
+      const content = fs.readFileSync(executablePath, 'utf-8')
+      if (content.startsWith('#!/bin/sh') || content.startsWith('#!/usr/bin/env bash')) {
+        // Extract real path from shim's exec line
+        const execMatch = content.match(/exec\s+"([^"]+)"/)
+        if (execMatch && execMatch[1]) {
+          executablePath = execMatch[1]
+        }
+      }
+    }
+    catch {
+      // Continue with original path if we can't read it
+    }
+  }
+
+  // Track library directories for wrapper script generation
+  let libraryDirs: string[] = []
+
   try {
     const binDir = path.dirname(executablePath)
     const versionDir = path.dirname(binDir)
@@ -76,7 +96,6 @@ export function generateLaunchdPlist(service: ServiceInstance): LaunchdPlist {
       envVars.PATH = [envBin, envSbin, basePath].filter(Boolean).join(':')
 
       // Discover all package lib directories under this env root
-      const libraryDirs: string[] = []
 
       const pushIfExists = (p: string) => {
         try {
@@ -91,19 +110,36 @@ export function generateLaunchdPlist(service: ServiceInstance): LaunchdPlist {
       pushIfExists(path.join(envRoot, 'lib64'))
 
       // Scan domain/version directories for lib folders
+      // Recursively search up to 2 levels deep for version directories
+      const scanForLibraries = (dir: string, depth: number = 0) => {
+        if (depth > 2) return
+        try {
+          const entries = fs.readdirSync(dir, { withFileTypes: true })
+          for (const entry of entries) {
+            if (!entry.isDirectory()) continue
+
+            const entryPath = path.join(dir, entry.name)
+
+            // If this is a version directory (starts with 'v'), check for lib
+            if (entry.name.startsWith('v')) {
+              pushIfExists(path.join(entryPath, 'lib'))
+              pushIfExists(path.join(entryPath, 'lib64'))
+            }
+            // Otherwise recurse into subdirectories (unless it's a common system dir)
+            else if (!['bin', 'sbin', 'share', 'include', 'etc', 'pkgs', '.tmp'].includes(entry.name)) {
+              scanForLibraries(entryPath, depth + 1)
+            }
+          }
+        }
+        catch {}
+      }
+
       try {
         const entries = fs.readdirSync(envRoot, { withFileTypes: true })
         for (const entry of entries) {
-          if (!entry.isDirectory())
-            continue
-          if (['bin', 'sbin', 'share', 'include', 'etc', 'pkgs'].includes(entry.name))
-            continue
-          const domainPath = path.join(envRoot, entry.name)
-          const versions = fs.readdirSync(domainPath, { withFileTypes: true }).filter(v => v.isDirectory() && v.name.startsWith('v'))
-          for (const ver of versions) {
-            pushIfExists(path.join(domainPath, ver.name, 'lib'))
-            pushIfExists(path.join(domainPath, ver.name, 'lib64'))
-          }
+          if (!entry.isDirectory()) continue
+          if (['bin', 'sbin', 'share', 'include', 'etc', 'pkgs'].includes(entry.name)) continue
+          scanForLibraries(path.join(envRoot, entry.name), 0)
         }
       }
       catch {}
@@ -121,9 +157,27 @@ export function generateLaunchdPlist(service: ServiceInstance): LaunchdPlist {
     // Best-effort only
   }
 
+  // For macOS: launchd strips DYLD_* variables, so we need a wrapper script for databases
+  // that explicitly sets DYLD_LIBRARY_PATH before executing the binary
+  let finalExecutablePath = executablePath
+  if ((definition.name === 'mysql' || definition.name === 'mariadb' || definition.name === 'postgres') && platform() === 'darwin') {
+    if (libraryDirs && libraryDirs.length > 0) {
+      // Generate wrapper script
+      const wrapperDir = path.join(homedir(), '.local', 'share', 'launchpad', 'wrappers')
+      fs.mkdirSync(wrapperDir, { recursive: true })
+      const wrapperPath = path.join(wrapperDir, `${definition.name}-wrapper.sh`)
+
+      const wrapperContent = `#!/bin/bash
+exec env DYLD_LIBRARY_PATH="${libraryDirs.join(':')}" "${executablePath}" "$@"
+`
+      fs.writeFileSync(wrapperPath, wrapperContent, { mode: 0o755 })
+      finalExecutablePath = wrapperPath
+    }
+  }
+
   return {
     Label: `com.launchpad.${definition.name || service.name}`,
-    ProgramArguments: [executablePath, ...resolvedArgs],
+    ProgramArguments: [finalExecutablePath, ...resolvedArgs],
     WorkingDirectory: definition.workingDirectory || dataDir || '',
     EnvironmentVariables: {
       ...Object.fromEntries(Object.entries(definition.env || {}).map(([k, v]) => {