@fecommunity/reactpress-server 1.0.0-beta.4 → 1.0.0-beta.41

package/bin/reactpress-server.js

@@ -1,246 +1,203 @@
 #!/usr/bin/env node
 
-const { program } = require('commander');
-const { execSync } = require('child_process');
+/**
+ * ReactPress Server CLI Entry Point
+ * This script allows starting the ReactPress server via npx
+ * Supports both regular and PM2 startup modes
+ */
+
 const path = require('path');
 const fs = require('fs');
-const chalk = require('chalk');
-const inquirer = require('inquirer');
-
-program
-  .name('@fecommunity/reactpress-server')
-  .description('ReactPress Server CLI')
-  .version('1.0.0');
-
-// Init command - 初始化服务器配置
-program
-  .command('init')
-  .description('Initialize ReactPress server configuration')
-  .option('-d, --database <type>', 'Database type (mysql|postgres)', 'mysql')
-  .option('-p, --port <port>', 'Server port', '3002')
-  .option('--skip-db-setup', 'Skip database setup')
-  .action(async (options) => {
-    console.log(chalk.blue('🚀 Initializing ReactPress Server...\n'));
-    
-    const cwd = process.cwd();
-    const envPath = path.join(cwd, '.env');
-    
-    // 检查.env文件是否已存在
-    if (fs.existsSync(envPath)) {
-      const { overwrite } = await inquirer.prompt([
-        {
-          type: 'confirm',
-          name: 'overwrite',
-          message: 'Configuration file (.env) already exists. Overwrite?',
-          default: false
-        }
-      ]);
-      
-      if (!overwrite) {
-        console.log(chalk.yellow('⚠️  Initialization cancelled.'));
-        process.exit(0);
-      }
-    }
-    
-    // 使用基础配置模板，基于根目录的.env文件
-    console.log(chalk.cyan('📋 Creating configuration file based on default template...\n'));
-    
-    // 生成JWT密钥
-    const jwtSecret = require('crypto').randomBytes(32).toString('hex');
-    console.log(chalk.green('🔐 Generated JWT secret'));
-    
-    // 创建.env文件 - 基于根目录模板
-    const envContent = `# Database Config
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_USER=reactpress
-DB_PASSWD=reactpress
-DB_DATABASE=reactpress
-
-# JWT Secret
-JWT_SECRET=${jwtSecret}
-
-# Client Config
-CLIENT_SITE_URL=http://localhost:3001
-
-# Server Config
-SERVER_SITE_URL=http://localhost:${options.port}
-SERVER_PORT=${options.port}
-SERVER_API_PREFIX=/api
-
-# Admin Config
-ADMIN_USER=admin
-ADMIN_PASSWD=admin
-
-# Environment
-NODE_ENV=development
-`;
-    
-    fs.writeFileSync(envPath, envContent);
-    console.log(chalk.green('✅ Configuration saved to .env file'));
-    
-    if (!options.skipDbSetup) {
-      console.log(chalk.yellow('\n🗄️  Database setup:'));
-      console.log(chalk.gray(`Please ensure your ${options.database} server is running and create the database:`));
-      console.log(chalk.cyan(`CREATE DATABASE reactpress;`));
-      console.log(chalk.gray(`CREATE USER 'reactpress'@'localhost' IDENTIFIED BY 'reactpress';`));
-      console.log(chalk.gray(`GRANT ALL PRIVILEGES ON reactpress.* TO 'reactpress'@'localhost';`));
-      console.log(chalk.gray(`FLUSH PRIVILEGES;`));
-    }
-    
-    console.log(chalk.green('\n🎉 ReactPress Server initialized successfully!'));
-    console.log(chalk.cyan('\nNext steps:'));
-    console.log(chalk.gray('1. Start the server: npx @fecommunity/reactpress-server start'));
-    console.log(chalk.gray('2. Visit API: http://localhost:' + options.port + '/api'));
-    console.log(chalk.gray('3. API docs: http://localhost:' + options.port + '/api (Swagger UI)'));
-  });
+const { spawn, spawnSync } = require('child_process');
 
-// Start command - 启动服务器
-program
-  .command('start')
-  .description('Start ReactPress server')
-  .option('-p, --port <port>', 'Server port')
-  .option('-d, --dev', 'Start in development mode')
-  .option('--watch', 'Watch for file changes (dev mode)')
-  .action(async (options) => {
-    console.log(chalk.blue('🚀 Starting ReactPress Server...\n'));
-    
-    const cwd = process.cwd();
-    const envPath = path.join(cwd, '.env');
-    
-    // 检查.env文件是否存在
-    if (!fs.existsSync(envPath)) {
-      console.log(chalk.red('❌ Configuration file (.env) not found!'));
-      console.log(chalk.yellow('Please run: npx @fecommunity/reactpress-server init'));
-      process.exit(1);
-    }
-    
-    // 检查是否在项目根目录（有server目录）
-    const serverPath = path.join(cwd, 'server');
-    const hasServerDir = fs.existsSync(serverPath);
-    
-    let serverMainPath;
-    if (hasServerDir) {
-      // 在项目根目录，使用相对路径
-      serverMainPath = path.join(serverPath, 'dist', 'main.js');
-      const packageDir = serverPath;
-      
-      // 检查构建文件是否存在
-      if (!fs.existsSync(serverMainPath)) {
-        console.log(chalk.yellow('⚠️  Built server not found, building...'));
-        try {
-          execSync('pnpm run build:server', { cwd: cwd, stdio: 'inherit' });
-        } catch (error) {
-          console.log(chalk.red('❌ Build failed'));
-          process.exit(1);
-        }
-      }
-    } else {
-      // 可能在独立安装的@reactpress/server包中
-      try {
-        const serverPackagePath = require.resolve('@fecommunity/reactpress-server/package.json');
-        const serverPackageDir = path.dirname(serverPackagePath);
-        serverMainPath = path.join(serverPackageDir, 'dist', 'main.js');
-      } catch (error) {
-        console.log(chalk.red('❌ ReactPress server package not found!'));
-        console.log(chalk.yellow('Please install: npm install @fecommunity/reactpress-server'));
-        process.exit(1);
-      }
-    }
-    
-    // 设置环境变量
-    const env = {
-      ...process.env,
-      NODE_ENV: options.dev ? 'development' : 'production'
-    };
-    
-    if (options.port) {
-      env.SERVER_PORT = options.port;
-    }
-    
+// Capture the original working directory where npx was executed
+// BUT prioritize the REACTPRESS_ORIGINAL_CWD environment variable if it exists
+// This ensures consistency when running via pnpm dev from root directory
+const originalCwd = process.env.REACTPRESS_ORIGINAL_CWD || process.cwd();
+
+// Get command line arguments
+const args = process.argv.slice(2);
+const usePM2 = args.includes('--pm2');
+const showHelp = args.includes('--help') || args.includes('-h');
+
+// Show help if requested
+if (showHelp) {
+  console.log(`
+ReactPress Server - NestJS-based backend API for ReactPress CMS
+
+Usage:
+  npx @fecommunity/reactpress-server [options]
+
+Options:
+  --pm2        Start server with PM2 process manager
+  --help, -h   Show this help message
+
+Examples:
+  npx @fecommunity/reactpress-server          # Start server normally
+  npx @fecommunity/reactpress-server --pm2    # Start server with PM2
+  npx @fecommunity/reactpress-server --help   # Show this help message
+  `);
+  process.exit(0);
+}
+
+// Get the directory where this script is located
+const binDir = __dirname;
+const serverDir = path.join(binDir, '..');
+const distPath = path.join(serverDir, 'dist', 'main.js');
+const ecosystemPath = path.join(serverDir, 'ecosystem.config.js');
+
+// Function to check if PM2 is installed
+function isPM2Installed() {
+  try {
+    require.resolve('pm2');
+    return true;
+  } catch (e) {
+    // Check if PM2 is installed globally
     try {
-      if (options.dev || options.watch) {
-        console.log(chalk.yellow('🔄 Starting in development mode...'));
-        if (hasServerDir) {
-          execSync('pnpm run dev:server', { 
-            cwd: cwd, 
-            stdio: 'inherit',
-            env
-          });
-        } else {
-          console.log(chalk.yellow('⚠️  Development mode using built server (source code not available)'));
-          console.log(chalk.cyan('Starting server with NODE_ENV=development...'));
-          execSync(`node ${serverMainPath}`, { 
-            cwd: process.cwd(),
-            stdio: 'inherit',
-            env
-          });
-        }
-      } else {
-        console.log(chalk.green('🌟 Starting in production mode...'));
-        execSync(`node ${serverMainPath}`, { 
-          cwd: process.cwd(),
-          stdio: 'inherit',
-          env
-        });
-      }
-    } catch (error) {
-      console.log(chalk.red('❌ Failed to start server'));
-      process.exit(1);
+      spawnSync('pm2', ['--version'], { stdio: 'ignore' });
+      return true;
+    } catch (e) {
+      return false;
     }
+  }
+}
+
+// Function to install PM2
+function installPM2() {
+  console.log('[ReactPress Server] Installing PM2...');
+  const installResult = spawnSync('npm', ['install', 'pm2', '--no-save'], {
+    stdio: 'inherit',
+    cwd: serverDir
   });
+  
+  if (installResult.status !== 0) {
+    console.error('[ReactPress Server] Failed to install PM2');
+    return false;
+  }
+  
+  return true;
+}
 
-// Build command - 构建服务器
-program
-  .command('build')
-  .description('Build ReactPress server')
-  .action(() => {
-    console.log(chalk.blue('🔨 Building ReactPress Server...\n'));
-    
-    const cwd = process.cwd();
-    const serverPath = path.join(cwd, 'server');
-    
-    if (!fs.existsSync(serverPath)) {
-      console.log(chalk.red('❌ Server directory not found!'));
-      console.log(chalk.yellow('This command should be run from the project root directory.'));
+// Function to start with PM2
+function startWithPM2() {
+  // Check if PM2 is installed
+  if (!isPM2Installed()) {
+    // Try to install PM2
+    if (!installPM2()) {
+      console.error('[ReactPress Server] Cannot start with PM2');
       process.exit(1);
     }
+  }
+  
+  // Check if the server is built
+  if (!fs.existsSync(distPath)) {
+    console.log('[ReactPress Server] Server not built yet. Building...');
+    
+    // Try to build the server
+    const buildResult = spawnSync('npm', ['run', 'build'], {
+      stdio: 'inherit',
+      cwd: serverDir
+    });
     
-    try {
-      execSync('pnpm run build:server', { 
-        cwd: cwd, 
-        stdio: 'inherit' 
-      });
-      console.log(chalk.green('✅ Build completed successfully!'));
-    } catch (error) {
-      console.log(chalk.red('❌ Build failed'));
+    if (buildResult.status !== 0) {
+      console.error('[ReactPress Server] Failed to build server');
       process.exit(1);
     }
-  });
-
-// Dev command - 开发模式启动
-program
-  .command('dev')
-  .description('Start server in development mode')
-  .option('-p, --port <port>', 'Server port')
-  .action((options) => {
-    console.log(chalk.blue('🔄 Starting ReactPress Server in development mode...\n'));
-    
-    // 调用start命令的dev模式
-    const args = ['start', '--dev'];
-    if (options.port) {
-      args.push('--port', options.port);
+  }
+  
+  console.log('[ReactPress Server] Starting with PM2...');
+  
+  // Use ecosystem.config.js if it exists, otherwise use direct command
+  let pm2Command = 'pm2';
+  try {
+    // Try to resolve PM2 path
+    pm2Command = path.join(serverDir, 'node_modules', '.bin', 'pm2');
+    if (!fs.existsSync(pm2Command)) {
+      pm2Command = 'pm2';
     }
+  } catch (e) {
+    pm2Command = 'pm2';
+  }
+  
+  // Check if ecosystem.config.js exists
+  if (fs.existsSync(ecosystemPath)) {
+    const pm2 = spawn(pm2Command, ['start', ecosystemPath], {
+      stdio: 'inherit',
+      cwd: serverDir
+    });
     
-    // 重新调用当前脚本
-    const child = require('child_process').spawn('node', [__filename, ...args], {
+    pm2.on('close', (code) => {
+      console.log(`[ReactPress Server] PM2 process exited with code ${code}`);
+      process.exit(code);
+    });
+    
+    pm2.on('error', (error) => {
+      console.error('[ReactPress Server] Failed to start with PM2:', error);
+      process.exit(1);
+    });
+  } else {
+    // Fallback to direct start
+    const pm2 = spawn(pm2Command, ['start', distPath, '--name', 'reactpress-server'], {
       stdio: 'inherit',
-      env: process.env
+      cwd: serverDir
     });
     
-    child.on('exit', (code) => {
+    pm2.on('close', (code) => {
+      console.log(`[ReactPress Server] PM2 process exited with code ${code}`);
       process.exit(code);
     });
-  });
+    
+    pm2.on('error', (error) => {
+      console.error('[ReactPress Server] Failed to start with PM2:', error);
+      process.exit(1);
+    });
+  }
+}
+
+// Function to start with regular Node.js
+function startWithNode() {
+  // Check if the server is built
+  if (!fs.existsSync(distPath)) {
+    console.log('[ReactPress Server] Server not built yet. Building...');
+    
+    // Try to build the server
+    const buildResult = spawnSync('npm', ['run', 'build'], {
+      stdio: 'inherit',
+      cwd: serverDir
+    });
+    
+    if (buildResult.status !== 0) {
+      console.error('[ReactPress Server] Failed to build server');
+      process.exit(1);
+    }
+  }
+
+  // ONLY set the environment variable if it's not already set
+  // This preserves the value set by set-env.js when running pnpm dev from root
+  if (!process.env.REACTPRESS_ORIGINAL_CWD) {
+    process.env.REACTPRESS_ORIGINAL_CWD = originalCwd;
+  } else {
+    console.log(`[ReactPress Server] Using existing REACTPRESS_ORIGINAL_CWD: ${process.env.REACTPRESS_ORIGINAL_CWD}`);
+  }
+
+  // Change to the server directory
+  process.chdir(serverDir);
+
+  // Set environment variables
+  process.env.NODE_ENV = process.env.NODE_ENV || 'production';
+
+  // Import and run the server
+  try {
+    require(distPath);
+  } catch (error) {
+    console.error('[ReactPress Server] Failed to start server:', error);
+    process.exit(1);
+  }
+}
 
-program.parse();
+// Main execution
+if (usePM2) {
+  startWithPM2();
+} else {
+  startWithNode();
+}

package/dist/main.d.ts

@@ -1 +1,6 @@
+declare global {
+    var installationServer: any;
+    var installationPort: number;
+    var isInstalling: boolean;
+}
 export {};