@launchframe/cli 1.0.0-beta.9 → 1.0.0

package/src/utils/env-generator.js

@@ -25,28 +25,31 @@ async function generateEnvFile(projectRoot, answers) {
 
   // Generate secure secrets
   const secrets = {
-    JWT_SECRET: generateSecret(32),
+    BETTER_AUTH_SECRET: generateSecret(32),
     DB_PASSWORD: generateSecret(24),
     BULL_ADMIN_TOKEN: generateSecret(24)
   };
 
   // Create variable mappings
+  // Note: PRIMARY_DOMAIN and ADMIN_EMAIL are NOT replaced here - they stay as placeholders
+  // until deploy:configure and deploy:set-env are run
   const variables = {
     '{{PROJECT_NAME}}': answers.projectName,
     '{{PROJECT_NAME_UPPER}}': answers.projectNameUpper,
-    '{{PRIMARY_DOMAIN}}': answers.primaryDomain,
-    '{{ADMIN_EMAIL}}': answers.adminEmail,
+    '{{PROJECT_DISPLAY_NAME}}': answers.projectDisplayName,
 
     // Replace placeholder passwords with generated secrets
     'your_secure_postgres_password': secrets.DB_PASSWORD,
-    'your_jwt_secret_key_change_this_in_production': secrets.JWT_SECRET,
+    'your_better_auth_secret_minimum_32_chars': secrets.BETTER_AUTH_SECRET,
     'your_bull_admin_token': secrets.BULL_ADMIN_TOKEN
   };
 
-  // Replace variables in template
+  // Replace variables in template (only those with defined values)
   let envContent = envTemplate;
   for (const [placeholder, value] of Object.entries(variables)) {
-    envContent = envContent.split(placeholder).join(value);
+    if (value !== undefined && value !== null) {
+      envContent = envContent.split(placeholder).join(value);
+    }
   }
 
   // Write .env file

package/src/utils/env-validator.js

@@ -59,13 +59,15 @@ async function validateEnvProd(envProdPath) {
 }
 
 /**
- * Generate a secure random string for secrets
+ * Generate a secure random string for secrets (URL-safe)
  * @param {number} length - Length of string to generate
  * @returns {string}
  */
 function generateSecret(length = 32) {
   const crypto = require('crypto');
-  return crypto.randomBytes(length).toString('base64').slice(0, length);
+  // Use hex encoding to avoid URL-unsafe characters (+, /, =)
+  // Hex produces 2 chars per byte, so divide by 2
+  return crypto.randomBytes(Math.ceil(length / 2)).toString('hex').slice(0, length);
 }
 
 module.exports = {

package/src/utils/github-access.js

@@ -38,26 +38,28 @@ async function checkGitHubAccess() {
 
 /**
  * Display message when user doesn't have access to services repository
- * Guides them to either purchase or setup SSH keys
+ * Guides them to either get beta access or setup SSH keys
  */
 function showAccessDeniedMessage() {
-  const purchaseUrl = 'https://buy.polar.sh/polar_cl_Zy4YqEwhoIEdUrAH8vHaWuZtwZuv306sYMnq118MbKi';
+  const betaUrl = 'https://launchframe.dev/';
   const docsUrl = 'https://docs.launchframe.dev/guide/quick-start#add-ssh-key-to-repo';
-  
+
   console.log(chalk.red('\n❌ Cannot access LaunchFrame services repository\n'));
-  
+
   console.log(chalk.white('This could mean:\n'));
-  console.log(chalk.gray('  1. You haven\'t purchased LaunchFrame yet'));
-  console.log(chalk.gray('  2. You purchased but haven\'t added your SSH key to the repo\n'));
-  
-  console.log(chalk.cyan('→ New customers:'));
-  console.log('  ' + chalk.blue.bold.underline(makeClickable('Purchase LaunchFrame', purchaseUrl)));
-  console.log('  ' + chalk.cyan(purchaseUrl + '\n'));
-  
-  console.log(chalk.cyan('→ Existing customers:'));
+  console.log(chalk.gray('  1. You don\'t have beta access yet'));
+  console.log(chalk.gray('  2. You have access but haven\'t added your SSH key to the repo\n'));
+
+  console.log(chalk.cyan('→ Get beta access:'));
+  console.log(chalk.white('  LaunchFrame is in open beta for 100 users.'));
+  console.log(chalk.white('  Get free lifetime access at:'));
+  console.log('  ' + chalk.blue.bold.underline(makeClickable('launchframe.dev', betaUrl)));
+  console.log('  ' + chalk.cyan(betaUrl + '\n'));
+
+  console.log(chalk.cyan('→ Already have access?'));
   console.log('  ' + chalk.blue.bold.underline(makeClickable('Setup SSH key (docs)', docsUrl)));
   console.log('  ' + chalk.cyan(docsUrl + '\n'));
-  
+
   console.log(chalk.gray('After setup, run: launchframe init\n'));
 }
 

package/src/utils/logger.js

@@ -0,0 +1,93 @@
+const chalk = require('chalk');
+
+/**
+ * Simple logger with verbose mode support
+ *
+ * Usage:
+ *   logger.setVerbose(true);
+ *   logger.info('Main message');    // Always shown
+ *   logger.detail('Nested detail'); // Only shown in verbose mode
+ */
+
+let verboseMode = false;
+
+/**
+ * Enable or disable verbose mode
+ * @param {boolean} enabled
+ */
+function setVerbose(enabled) {
+  verboseMode = enabled;
+}
+
+/**
+ * Check if verbose mode is enabled
+ * @returns {boolean}
+ */
+function isVerbose() {
+  return verboseMode;
+}
+
+/**
+ * Log a main info message (always shown)
+ * @param {string} message
+ */
+function info(message) {
+  console.log(message);
+}
+
+/**
+ * Log a success message (always shown)
+ * @param {string} message
+ */
+function success(message) {
+  console.log(chalk.green(message));
+}
+
+/**
+ * Log an error message (always shown)
+ * @param {string} message
+ */
+function error(message) {
+  console.error(chalk.red(message));
+}
+
+/**
+ * Log a warning message (always shown)
+ * @param {string} message
+ */
+function warn(message) {
+  console.warn(chalk.yellow(message));
+}
+
+/**
+ * Log a detail/nested message (only in verbose mode)
+ * @param {string} message
+ * @param {number} indent - Indentation level (default 1)
+ */
+function detail(message, indent = 1) {
+  if (verboseMode) {
+    const prefix = '  '.repeat(indent);
+    console.log(chalk.gray(`${prefix}${message}`));
+  }
+}
+
+/**
+ * Log a step within an operation (only in verbose mode)
+ * @param {string} message
+ */
+function step(message) {
+  if (verboseMode) {
+    console.log(chalk.gray(`  - ${message}`));
+  }
+}
+
+module.exports = {
+  setVerbose,
+  isVerbose,
+  info,
+  success,
+  error,
+  warn,
+  detail,
+  step
+};

package/src/utils/module-installer.js

@@ -0,0 +1,58 @@
+const fs = require('fs-extra');
+const path = require('path');
+const { execSync } = require('child_process');
+const { replaceSection } = require('./section-replacer');
+
+/**
+ * Install a module into a project
+ * @param {string} moduleName - Name of the module to install
+ * @param {Object} moduleConfig - Config object from MODULE_CONFIG[moduleName]
+ */
+async function installModule(moduleName, moduleConfig) {
+  const templateRoot = path.resolve(__dirname, '../../../services');
+  const cwd = process.cwd();
+
+  for (const [serviceName, config] of Object.entries(moduleConfig)) {
+    const moduleFilesDir = path.join(templateRoot, 'modules', moduleName, serviceName, 'files');
+    const moduleSectionsDir = path.join(templateRoot, 'modules', moduleName, serviceName, 'sections');
+    const serviceDir = path.join(cwd, serviceName);
+
+    // Copy files
+    for (const filePath of config.files) {
+      const src = path.join(moduleFilesDir, filePath);
+      const dest = path.join(serviceDir, filePath);
+      console.log(`  Adding ${filePath}`);
+      await fs.copy(src, dest, { overwrite: true });
+    }
+
+    // Inject sections
+    for (const [targetFile, markerNames] of Object.entries(config.sections)) {
+      const targetFilePath = path.join(serviceDir, targetFile);
+      const targetBasename = path.basename(targetFile);
+
+      for (const markerName of markerNames) {
+        const sectionFile = path.join(moduleSectionsDir, `${targetBasename}.${markerName}`);
+        console.log(`  Injecting ${markerName} into ${targetFile}`);
+        const sectionContent = await fs.readFile(sectionFile, 'utf8');
+        await replaceSection(targetFilePath, markerName, sectionContent);
+      }
+    }
+
+    // Merge dependencies into package.json and sync lockfile
+    if (config.dependencies && Object.keys(config.dependencies).length > 0) {
+      const packageJsonPath = path.join(serviceDir, 'package.json');
+      const packageJson = await fs.readJson(packageJsonPath);
+      packageJson.dependencies = {
+        ...packageJson.dependencies,
+        ...config.dependencies,
+      };
+      await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
+
+      // Run npm install to sync package-lock.json, otherwise `npm ci` will fail on rebuild
+      console.log(`\nRunning npm install in ${serviceName}...`);
+      execSync('npm install', { cwd: serviceDir, stdio: 'inherit' });
+    }
+  }
+}
+
+module.exports = { installModule };

package/src/utils/project-helpers.js

@@ -95,6 +95,36 @@ function isWaitlistInstalled(config = null) {
   return (config.installedServices || []).includes('waitlist');
 }
 
+/**
+ * Get list of installed modules
+ */
+function getInstalledModules() {
+  const config = getProjectConfig();
+  return config.installedModules || [];
+}
+
+/**
+ * Check if a module is installed
+ */
+function isModuleInstalled(moduleName) {
+  const installedModules = getInstalledModules();
+  return installedModules.includes(moduleName);
+}
+
+/**
+ * Add a module to the installed modules list
+ */
+function addInstalledModule(moduleName) {
+  const config = getProjectConfig();
+  if (!config.installedModules) {
+    config.installedModules = [];
+  }
+  if (!config.installedModules.includes(moduleName)) {
+    config.installedModules.push(moduleName);
+    updateProjectConfig(config);
+  }
+}
+
 module.exports = {
   isLaunchFrameProject,
   requireProject,
@@ -104,5 +134,8 @@ module.exports = {
   isComponentInstalled,
   addInstalledComponent,
   getPrimaryDomain,
-  isWaitlistInstalled
+  isWaitlistInstalled,
+  getInstalledModules,
+  isModuleInstalled,
+  addInstalledModule
 };

package/src/utils/service-cache.js

@@ -3,6 +3,7 @@ const fs = require('fs-extra');
 const os = require('os');
 const { execSync } = require('child_process');
 const chalk = require('chalk');
+const logger = require('./logger');
 
 const SERVICES_REPO = 'git@github.com:launchframe-dev/services.git';
 const BRANCH = 'main';
@@ -38,30 +39,26 @@ async function cacheExists() {
 async function initializeCache() {
   const cacheDir = getCacheDir();
 
-  console.log(chalk.blue('🔄 Initializing services cache...'));
+  logger.detail('Initializing services cache...');
 
   try {
-    // Ensure parent directory exists
     await fs.ensureDir(path.dirname(cacheDir));
 
-    // Sparse clone (only root files, no services)
     execSync(
       `git clone --sparse --depth 1 --branch ${BRANCH} ${SERVICES_REPO} "${cacheDir}"`,
       {
-        stdio: 'pipe', // Hide output
-        timeout: 60000 // 1 minute timeout
+        stdio: 'pipe',
+        timeout: 60000
       }
     );
 
-    // Configure sparse checkout (starts with empty set)
     execSync('git sparse-checkout init --cone', {
       cwd: cacheDir,
       stdio: 'pipe'
     });
 
-    console.log(chalk.green('✓ Cache initialized'));
+    logger.detail('Cache initialized');
   } catch (error) {
-    // Clean up partial clone on failure
     await fs.remove(cacheDir);
     throw new Error(`Failed to initialize cache: ${error.message}`);
   }
@@ -75,16 +72,16 @@ async function initializeCache() {
 async function updateCache() {
   const cacheDir = getCacheDir();
 
-  console.log(chalk.blue('🔄 Updating service cache...'));
+  logger.detail('Updating service cache...');
 
   try {
     execSync('git pull origin main', {
       cwd: cacheDir,
       stdio: 'pipe',
-      timeout: 30000 // 30 seconds
+      timeout: 30000
     });
 
-    console.log(chalk.green('✓ Cache updated'));
+    logger.detail('Cache updated');
   } catch (error) {
     throw new Error(`Failed to update cache: ${error.message}`);
   }
@@ -98,10 +95,9 @@ async function updateCache() {
 async function expandServices(serviceNames) {
   const cacheDir = getCacheDir();
 
-  console.log(chalk.blue(`📦 Loading services: ${serviceNames.join(', ')}...`));
+  logger.detail(`Loading services: ${serviceNames.join(', ')}...`);
 
   try {
-    // Get current sparse checkout list
     let currentServices = [];
     try {
       const output = execSync('git sparse-checkout list', {
@@ -114,17 +110,15 @@ async function expandServices(serviceNames) {
       // No services yet, that's fine
     }
 
-    // Add new services to the list
     const allServices = [...new Set([...currentServices, ...serviceNames])];
 
-    // Set sparse checkout to include all services
     execSync(`git sparse-checkout set ${allServices.join(' ')}`, {
       cwd: cacheDir,
       stdio: 'pipe',
-      timeout: 60000 // 1 minute (may need to download files)
+      timeout: 60000
     });
 
-    console.log(chalk.green('✓ Services loaded'));
+    logger.detail('Services loaded');
   } catch (error) {
     throw new Error(`Failed to expand services: ${error.message}`);
   }
@@ -158,7 +152,7 @@ async function clearCache() {
 
   if (await fs.pathExists(cacheDir)) {
     await fs.remove(cacheDir);
-    console.log(chalk.green('✓ Cache cleared'));
+    console.log(chalk.green('Cache cleared'));
   } else {
     console.log(chalk.gray('Cache is already empty'));
   }

package/src/utils/ssh-helper.js

@@ -209,6 +209,54 @@ function showDeployKeyInstructions(vpsUser, vpsHost, githubOrg, projectName) {
   console.log(chalk.gray('   launchframe deploy:init\n'));
 }
 
+/**
+ * Pull Docker images on VPS
+ * @param {string} vpsUser - SSH username
+ * @param {string} vpsHost - VPS hostname or IP
+ * @param {string} vpsAppFolder - App folder path on VPS
+ * @returns {Promise<void>}
+ */
+async function pullImagesOnVPS(vpsUser, vpsHost, vpsAppFolder) {
+  const ora = require('ora');
+
+  const spinner = ora('Pulling images on VPS...').start();
+
+  try {
+    await execAsync(
+      `ssh ${vpsUser}@${vpsHost} "cd ${vpsAppFolder}/infrastructure && docker-compose -f docker-compose.yml -f docker-compose.prod.yml pull"`,
+      { timeout: 600000 } // 10 minutes
+    );
+    spinner.succeed('Images pulled on VPS');
+  } catch (error) {
+    spinner.fail('Failed to pull images on VPS');
+    throw new Error(`Failed to pull images: ${error.message}`);
+  }
+}
+
+/**
+ * Restart services on VPS
+ * @param {string} vpsUser - SSH username
+ * @param {string} vpsHost - VPS hostname or IP
+ * @param {string} vpsAppFolder - App folder path on VPS
+ * @returns {Promise<void>}
+ */
+async function restartServicesOnVPS(vpsUser, vpsHost, vpsAppFolder) {
+  const ora = require('ora');
+
+  const spinner = ora('Restarting services...').start();
+
+  try {
+    await execAsync(
+      `ssh ${vpsUser}@${vpsHost} "cd ${vpsAppFolder}/infrastructure && docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d"`,
+      { timeout: 300000 } // 5 minutes
+    );
+    spinner.succeed('Services restarted');
+  } catch (error) {
+    spinner.fail('Failed to restart services');
+    throw new Error(`Failed to restart services: ${error.message}`);
+  }
+}
+
 module.exports = {
   testSSHConnection,
   checkSSHKeys,
@@ -216,5 +264,7 @@ module.exports = {
   copyFileToVPS,
   copyDirectoryToVPS,
   checkRepoPrivacy,
-  showDeployKeyInstructions
+  showDeployKeyInstructions,
+  pullImagesOnVPS,
+  restartServicesOnVPS
 };