@fecommunity/reactpress-server 1.0.0-beta.6 → 1.0.0-beta.8

package/bin/reactpress-server.js

@@ -6,12 +6,86 @@ const path = require('path');
 const fs = require('fs');
 const chalk = require('chalk');
 const inquirer = require('inquirer');
+const mysql = require('mysql2/promise');
 
 program
   .name('@fecommunity/reactpress-server')
   .description('ReactPress Server CLI')
   .version('1.0.0');
 
+// Database connection testing function
+async function testDatabaseConnection(config) {
+  try {
+    console.log(chalk.cyan('🔍 Testing database connection...'));
+    
+    const connection = await mysql.createConnection({
+      host: config.dbHost,
+      port: parseInt(config.dbPort),
+      user: config.dbUser,
+      password: config.dbPassword
+    });
+    
+    // Test basic connection
+    await connection.ping();
+    console.log(chalk.green('✅ Database connection successful!'));
+    
+    // Check if database exists
+    const [databases] = await connection.execute(`SHOW DATABASES LIKE '${config.dbDatabase}'`);
+    
+    if (databases.length === 0) {
+      console.log(chalk.yellow(`⚠️  Database '${config.dbDatabase}' does not exist.`));
+      
+      const { createDb } = await inquirer.prompt([
+        {
+          type: 'confirm',
+          name: 'createDb',
+          message: `Create database '${config.dbDatabase}' now?`,
+          default: true
+        }
+      ]);
+      
+      if (createDb) {
+        try {
+          await connection.execute(`CREATE DATABASE IF NOT EXISTS \`${config.dbDatabase}\` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci`);
+          console.log(chalk.green(`✅ Database '${config.dbDatabase}' created successfully!`));
+        } catch (createError) {
+          console.log(chalk.red(`❌ Failed to create database: ${createError.message}`));
+          return false;
+        }
+      }
+    } else {
+      console.log(chalk.green(`✅ Database '${config.dbDatabase}' exists and is accessible.`));
+    }
+    
+    await connection.end();
+    return true;
+    
+  } catch (error) {
+    console.log(chalk.red('❌ Database connection failed:'));
+    
+    if (error.code === 'ECONNREFUSED') {
+      console.log(chalk.yellow('   - Make sure MySQL server is running'));
+      console.log(chalk.yellow(`   - Check if MySQL is listening on ${config.dbHost}:${config.dbPort}`));
+    } else if (error.code === 'ER_ACCESS_DENIED_ERROR') {
+      console.log(chalk.yellow('   - Check username and password'));
+      console.log(chalk.yellow('   - Make sure user has proper permissions'));
+    } else {
+      console.log(chalk.yellow(`   - Error: ${error.message}`));
+    }
+    
+    const { retry } = await inquirer.prompt([
+      {
+        type: 'confirm',
+        name: 'retry',
+        message: 'Would you like to re-enter database configuration?',
+        default: true
+      }
+    ]);
+    
+    return retry ? 'retry' : false;
+  }
+}
+
 // Init command - 初始化服务器配置
 program
   .command('init')
@@ -19,6 +93,8 @@ program
   .option('-d, --database <type>', 'Database type (mysql|postgres)', 'mysql')
   .option('-p, --port <port>', 'Server port', '3002')
   .option('--skip-db-setup', 'Skip database setup')
+  .option('-y, --yes', 'Use default values without prompts')
+  .option('--auto', 'Alias for --yes (use default values without prompts)')
   .action(async (options) => {
     console.log(chalk.blue('🚀 Initializing ReactPress Server...\n'));
     
@@ -42,32 +118,164 @@ program
       }
     }
     
-    // 使用完整的基础配置模板，包含客户端和服务端配置
-    console.log(chalk.cyan('📋 Creating configuration file with essential settings...\n'));
+    let answers;
+    let dbTestResult = false;
     
-    // 生成JWT密钥
-    const jwtSecret = require('crypto').randomBytes(32).toString('hex');
-    console.log(chalk.green('🔐 Generated JWT secret'));
+    // Configuration and database testing loop
+    while (!dbTestResult) {
+      if (options.yes || options.auto) {
+        // 使用默认值，不进行交互
+        console.log(chalk.cyan('📋 Using default configuration values...\n'));
+        answers = {
+          dbHost: '127.0.0.1',
+          dbPort: '3306',
+          dbUser: 'reactpress',
+          dbPassword: 'reactpress',
+          dbDatabase: 'reactpress',
+          clientUrl: 'http://localhost:3001',
+          serverPort: options.port || '3002',
+          skipDbSetup: options.skipDbSetup || false
+        };
+        
+        // In auto mode, skip database testing if --skip-db-setup is provided
+        if (options.skipDbSetup) {
+          console.log(chalk.yellow('⚠️  Skipping database connection test (--skip-db-setup enabled)'));
+          dbTestResult = true;
+        } else {
+          dbTestResult = await testDatabaseConnection(answers);
+          if (dbTestResult === 'retry') {
+            console.log(chalk.yellow('\n⚠️  Switching to interactive mode for database configuration...\n'));
+            options.yes = false;
+            options.auto = false;
+            continue;
+          }
+        }
+      } else {
+        // 交互式配置收集
+        console.log(chalk.cyan('📋 Please configure your ReactPress server settings:\n'));
+        
+        answers = await inquirer.prompt([
+          {
+            type: 'input',
+            name: 'dbHost',
+            message: 'Database Host:',
+            default: answers ? answers.dbHost : '127.0.0.1'
+          },
+          {
+            type: 'input',
+            name: 'dbPort',
+            message: 'Database Port:',
+            default: answers ? answers.dbPort : '3306',
+            validate: (input) => {
+              const port = parseInt(input);
+              return port > 0 && port <= 65535 ? true : 'Please enter a valid port number (1-65535)';
+            }
+          },
+          {
+            type: 'input',
+            name: 'dbUser',
+            message: 'Database Username:',
+            default: answers ? answers.dbUser : 'reactpress'
+          },
+          {
+            type: 'password',
+            name: 'dbPassword',
+            message: 'Database Password:',
+            default: answers ? answers.dbPassword : 'reactpress',
+            mask: '*'
+          },
+          {
+            type: 'input',
+            name: 'dbDatabase',
+            message: 'Database Name:',
+            default: answers ? answers.dbDatabase : 'reactpress'
+          },
+          {
+            type: 'input',
+            name: 'clientUrl',
+            message: 'Client Site URL:',
+            default: answers ? answers.clientUrl : 'http://localhost:3001',
+            validate: (input) => {
+              try {
+                new URL(input);
+                return true;
+              } catch {
+                return 'Please enter a valid URL (e.g., http://localhost:3001)';
+              }
+            }
+          },
+          {
+            type: 'input',
+            name: 'serverPort',
+            message: 'Server Port:',
+            default: answers ? answers.serverPort : (options.port || '3002'),
+            validate: (input) => {
+              const port = parseInt(input);
+              return port > 0 && port <= 65535 ? true : 'Please enter a valid port number (1-65535)';
+            }
+          },
+          {
+            type: 'confirm',
+            name: 'skipDbSetup',
+            message: 'Skip database setup instructions?',
+            default: false
+          }
+        ]);
+        
+        // Test database connection
+        if (!answers.skipDbSetup) {
+          dbTestResult = await testDatabaseConnection(answers);
+          if (dbTestResult === 'retry') {
+            console.log(chalk.yellow('\n🔄 Let\'s try the database configuration again...\n'));
+            continue;
+          } else if (!dbTestResult) {
+            const { continueAnyway } = await inquirer.prompt([
+              {
+                type: 'confirm',
+                name: 'continueAnyway',
+                message: 'Continue with configuration file creation anyway?',
+                default: false
+              }
+            ]);
+            
+            if (!continueAnyway) {
+              console.log(chalk.yellow('⚠️  Initialization cancelled.'));
+              process.exit(0);
+            }
+            dbTestResult = true; // Continue despite failed connection
+          }
+        } else {
+          console.log(chalk.yellow('⚠️  Skipping database connection test.'));
+          dbTestResult = true;
+        }
+      }
+    }
     
-    // 创建.env文件 - 包含所有基础配置
+    const serverUrl = `http://localhost:${answers.serverPort}`;
+    
+    // 创建.env文件 - 使用用户输入的配置
     const envContent = `# Database Config
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_USER=reactpress
-DB_PASSWD=reactpress
-DB_DATABASE=reactpress
+DB_HOST=${answers.dbHost}
+DB_PORT=${answers.dbPort}
+DB_USER=${answers.dbUser}
+DB_PASSWD=${answers.dbPassword}
+DB_DATABASE=${answers.dbDatabase}
 
-JWT_SECRET=${jwtSecret}
 
 # Client Config
-CLIENT_SITE_URL=http://localhost:3001
+CLIENT_SITE_URL=${answers.clientUrl}
 
 # Server Config
-SERVER_SITE_URL=http://localhost:${options.port}
+SERVER_SITE_URL=${serverUrl}
 `;
     
     fs.writeFileSync(envPath, envContent);
-    console.log(chalk.green('✅ Configuration saved to .env file'));
+    console.log(chalk.green('\n✅ Configuration saved to .env file'));
+    
+    // 更新 options 以使用用户输入的值
+    options.skipDbSetup = answers.skipDbSetup;
+    options.database = options.database || 'mysql';
+    options.port = answers.serverPort;
     
     if (!options.skipDbSetup) {
       console.log(chalk.yellow('\n🗄️  Database setup:'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecommunity/reactpress-server",
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-beta.8",
   "description": "ReactPress Server - NestJS-based backend API for ReactPress CMS",
   "author": "fecommunity",
   "license": "MIT",