@fecommunity/reactpress-server 1.0.0-beta.13 → 1.0.0-beta.14

package/bin/reactpress-server.js

@@ -1,626 +1,203 @@
 #!/usr/bin/env node
 
-const express = require('express');
-const mysql = require('mysql2/promise');
-const chalk = require('chalk');
-const open = require('open');
-const fs = require('fs');
+/**
+ * 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 { spawn } = require('child_process');
+const fs = require('fs');
+const { spawn, spawnSync } = require('child_process');
 
-const PORT = 3003;
-const SERVER_PORT = 3002;
+// 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();
 
-// Main entry point with auto-detection
-async function main() {
-  const args = process.argv.slice(2);
-  
-  // Check if .env exists in current directory
-  const envPath = path.join(process.cwd(), '.env');
-  const hasEnv = fs.existsSync(envPath);
-  
-  console.log(chalk.blue('🚀 ReactPress Server'));
-  
-  if (!hasEnv) {
-    console.log(chalk.yellow('⚠️  No configuration found. Starting installation wizard...'));
-    await runInstallationWizard();
-  } else {
-    console.log(chalk.green('✅ Configuration found. Starting server...'));
-    startServer();
+// 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 {
+      spawnSync('pm2', ['--version'], { stdio: 'ignore' });
+      return true;
+    } catch (e) {
+      return false;
+    }
   }
 }
 
-// Installation wizard
-async function runInstallationWizard() {
-  console.log(chalk.cyan('🌍 Starting installation wizard...'));
+// Function to install PM2
+function installPM2() {
+  console.log('[ReactPress Server] Installing PM2...');
+  const installResult = spawnSync('npm', ['install', 'pm2', '--no-save'], {
+    stdio: 'inherit',
+    cwd: serverDir
+  });
   
-  const app = express();
-  app.use(express.json());
-  app.use(express.urlencoded({ extended: true }));
-  app.get('/', (req, res) => res.send(getWordPressHTML()));
+  if (installResult.status !== 0) {
+    console.error('[ReactPress Server] Failed to install PM2');
+    return false;
+  }
   
-  // Test database connection
-  app.post('/test-db', async (req, res) => {
-    const { host, port, user, password, database } = req.body;
-    
-    if (!host || !port || !user || !database) {
-      return res.json({ 
-        success: false, 
-        message: 'All database fields are required.' 
-      });
+  return true;
+}
+
+// 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 {
-      console.log(chalk.cyan(`Testing connection to ${user}@${host}:${port}/${database}...`));
-      
-      const conn = await mysql.createConnection({
-        host: host.trim(),
-        port: parseInt(port),
-        user: user.trim(),
-        password: password,
-        connectTimeout: 5000,
-        acquireTimeout: 5000,
-        timeout: 5000
-      });
-      
-      try {
-        await conn.query(`USE \`${database.trim()}\``);
-        console.log(chalk.green(`Database '${database}' exists and accessible`));
-      } catch (dbError) {
-        if (dbError.code === 'ER_BAD_DB_ERROR') {
-          await conn.query(`CREATE DATABASE \`${database.trim()}\` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci`);
-          console.log(chalk.green(`Database '${database}' created successfully`));
-        } else {
-          throw dbError;
-        }
-      }
-      
-      await conn.end();
-      console.log(chalk.green('✅ Database connection test passed'));
-      
-      res.json({ 
-        success: true, 
-        message: `Successfully connected to database '${database}' on ${host}:${port}` 
-      });
-      
-    } catch (error) {
-      console.log(chalk.red('❌ Database connection failed:'), error.message);
-      
-      let errorMessage = 'Database connection failed: ';
-      
-      switch (error.code) {
-        case 'ECONNREFUSED':
-          errorMessage += `Cannot connect to MySQL server at ${host}:${port}. Please ensure MySQL is running.`;
-          break;
-        case 'ER_ACCESS_DENIED_ERROR':
-          errorMessage += `Access denied for user '${user}'. Please check your username and password.`;
-          break;
-        case 'ENOTFOUND':
-          errorMessage += `Host '${host}' not found. Please check the hostname.`;
-          break;
-        case 'ETIMEDOUT':
-          errorMessage += `Connection timeout to ${host}:${port}. Please check your network and firewall settings.`;
-          break;
-        case 'ER_BAD_DB_ERROR':
-          errorMessage += `Database '${database}' does not exist and cannot be created. Please check your permissions.`;
-          break;
-        default:
-          errorMessage += error.message;
-      }
-      
-      res.json({ success: false, message: errorMessage });
+    // 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);
     }
-  });
+  }
   
-  // Install and start server
-  app.post('/install', async (req, res) => {
-    const { db, site } = req.body;
-    
-    // Final validation
-    try {
-      const testConn = await mysql.createConnection({
-        host: db.host.trim(),
-        port: parseInt(db.port),
-        user: db.user.trim(),
-        password: db.password,
-        database: db.database.trim()
-      });
-      await testConn.end();
-    } catch (error) {
-      return res.json({ 
-        success: false, 
-        message: 'Final database validation failed. Please test your connection again.' 
-      });
+  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 env = `# ReactPress Configuration
-# Generated on ${new Date().toISOString()}
-
-DB_HOST=${db.host}
-DB_PORT=${db.port}
-DB_USER=${db.user}
-DB_PASSWD=${db.password}
-DB_DATABASE=${db.database}
-CLIENT_SITE_URL=${site.clientUrl}
-SERVER_SITE_URL=${site.serverUrl}
-`;
+    pm2.on('close', (code) => {
+      console.log(`[ReactPress Server] PM2 process exited with code ${code}`);
+      process.exit(code);
+    });
     
-    const envPath = path.join(process.cwd(), '.env');
-    fs.writeFileSync(envPath, env);
-    console.log(chalk.green('✅ Configuration saved to .env file'));
+    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',
+      cwd: serverDir
+    });
     
-    res.json({ 
-      success: true, 
-      message: 'ReactPress installed successfully! Starting server...',
-      serverUrl: site.serverUrl
+    pm2.on('close', (code) => {
+      console.log(`[ReactPress Server] PM2 process exited with code ${code}`);
+      process.exit(code);
     });
     
-    // Close installation server and start ReactPress server
-    setTimeout(() => {
-      console.log(chalk.green('\n🎉 Installation completed!'));
-      console.log(chalk.cyan('🚀 Starting ReactPress Server...'));
-      server.close();
-      startServer();
-    }, 2000);
-  });
-  
-  const server = app.listen(PORT, () => {
-    const url = `http://localhost:${PORT}`;
-    console.log(chalk.green(`✅ Installation wizard: ${url}`));
-    open(url);
-    console.log(chalk.gray('Press Ctrl+C to cancel\n'));
-  });
-  
-  process.on('SIGINT', () => {
-    console.log(chalk.yellow('\n⚠️ Installation cancelled'));
-    server.close();
-    process.exit(0);
-  });
-}
-
-// Start ReactPress server
-function startServer() {
-  const envPath = path.join(process.cwd(), '.env');
-  
-  if (!fs.existsSync(envPath)) {
-    console.log(chalk.red('❌ No configuration found!'));
-    console.log(chalk.yellow('Please run the installation first.'));
-    return;
+    pm2.on('error', (error) => {
+      console.error('[ReactPress Server] Failed to start with PM2:', error);
+      process.exit(1);
+    });
   }
-  
-  console.log(chalk.blue('🚀 Starting ReactPress Server...'));
-  console.log(chalk.cyan(`🌍 Server will be available at: http://localhost:${SERVER_PORT}/api`));
-  
-  // Start the NestJS server
-  const serverDir = path.dirname(__dirname); // server directory
-  const server = spawn('npm', ['run', 'dev'], { 
-    cwd: serverDir, 
-    stdio: 'inherit',
-    env: { ...process.env, NODE_ENV: 'development' }
-  });
-  
-  server.on('error', (error) => {
-    console.log(chalk.red('❌ Failed to start server:'), error.message);
-  });
-  
-  // Open browser after server starts
-  setTimeout(() => {
-    open(`http://localhost:${SERVER_PORT}/api`);
-  }, 5000);
 }
 
-// WordPress-style HTML
-function getWordPressHTML() {
-  return `<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>ReactPress › Installation</title>
-    <style>
-        * { margin: 0; padding: 0; box-sizing: border-box; }
-        body {
-            font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
-            background: #f1f1f1;
-            color: #444;
-            line-height: 1.4;
-        }
-        .wp-container {
-            max-width: 600px;
-            margin: 40px auto;
-            background: #fff;
-            border: 1px solid #ccd0d4;
-            box-shadow: 0 1px 3px rgba(0,0,0,0.04);
-        }
-        .wp-header {
-            background: #0073aa;
-            color: #fff;
-            padding: 24px;
-            text-align: center;
-            border-bottom: 1px solid #005a87;
-        }
-        .wp-header h1 { font-size: 24px; font-weight: 400; margin-bottom: 8px; }
-        .wp-header p { font-size: 16px; opacity: 0.9; }
-        .wp-content { padding: 24px; }
-        .wp-step { display: none; }
-        .wp-step.active { display: block; }
-        .wp-step h2 { font-size: 22px; font-weight: 600; margin-bottom: 20px; color: #1d2327; }
-        .wp-description {
-            background: #f0f6fc;
-            border: 1px solid #c3e4f0;
-            border-left: 4px solid #0073aa;
-            padding: 12px 16px;
-            margin-bottom: 20px;
-            font-size: 14px;
-            color: #0c4a6e;
-        }
-        .wp-form-table { width: 100%; margin-bottom: 20px; }
-        .wp-form-table th {
-            text-align: left;
-            padding: 10px 0;
-            width: 140px;
-            vertical-align: top;
-            font-weight: 600;
-            color: #1d2327;
-        }
-        .wp-form-table td { padding: 10px 0; }
-        .wp-form-table input[type="text"],
-        .wp-form-table input[type="password"],
-        .wp-form-table input[type="number"],
-        .wp-form-table input[type="url"] {
-            width: 100%;
-            max-width: 320px;
-            padding: 8px 12px;
-            border: 1px solid #8c8f94;
-            border-radius: 4px;
-            font-size: 14px;
-            line-height: 1.4;
-            transition: border-color 0.15s ease-in-out;
-        }
-        .wp-form-table input:focus {
-            border-color: #0073aa;
-            outline: 0;
-            box-shadow: 0 0 0 1px #0073aa;
-        }
-        .wp-form-table .description {
-            font-size: 13px;
-            color: #646970;
-            margin-top: 4px;
-        }
-        .wp-button {
-            background: #0073aa;
-            color: #fff;
-            border: 1px solid #0073aa;
-            padding: 8px 16px;
-            font-size: 14px;
-            font-weight: 600;
-            border-radius: 3px;
-            cursor: pointer;
-            transition: all 0.15s ease-in-out;
-            text-decoration: none;
-            display: inline-block;
-        }
-        .wp-button:hover { background: #005a87; border-color: #005a87; }
-        .wp-button:disabled {
-            background: #f0f0f1;
-            border-color: #dcdcde;
-            color: #a7aaad;
-            cursor: not-allowed;
-        }
-        .wp-button.button-large { padding: 12px 24px; font-size: 16px; }
-        .wp-notice {
-            border: 1px solid #c3c4c7;
-            border-left-width: 4px;
-            padding: 12px;
-            margin: 16px 0;
-            background: #fff;
-        }
-        .wp-notice.notice-success { border-left-color: #00a32a; background: #f7fcf7; }
-        .wp-notice.notice-error { border-left-color: #d63638; background: #fcf2f2; }
-        .wp-notice p { margin: 0; font-size: 14px; }
-        .wp-progress { background: #f0f0f1; height: 4px; margin-bottom: 20px; }
-        .wp-progress-bar { background: #0073aa; height: 100%; transition: width 0.3s ease; }
-        .wp-loader {
-            display: inline-block;
-            width: 16px;
-            height: 16px;
-            border: 2px solid #f3f3f3;
-            border-top: 2px solid #0073aa;
-            border-radius: 50%;
-            animation: wp-spin 1s linear infinite;
-            margin-right: 8px;
-        }
-        @keyframes wp-spin {
-            0% { transform: rotate(0deg); }
-            100% { transform: rotate(360deg); }
-        }
-        .wp-footer {
-            background: #f6f7f7;
-            border-top: 1px solid #c3c4c7;
-            padding: 16px 24px;
-            text-align: center;
-            font-size: 13px;
-            color: #646970;
-        }
-        .text-center { text-align: center; }
-    </style>
-</head>
-<body>
-    <div class="wp-container">
-        <div class="wp-header">
-            <h1>ReactPress</h1>
-            <p>5-Minute Installation</p>
-        </div>
-        
-        <div class="wp-progress">
-            <div class="wp-progress-bar" id="progressBar" style="width: 33%;"></div>
-        </div>
-        
-        <div class="wp-content">
-            <!-- Step 1: Database Configuration -->
-            <div class="wp-step active" id="step1">
-                <h2>Database Connection Information</h2>
-                
-                <div class="wp-description">
-                    You should have this information available from your web hosting provider. If you don't have it, contact them before continuing.
-                </div>
-                
-                <table class="wp-form-table">
-                    <tr>
-                        <th><label for="dbHost">Database Host</label></th>
-                        <td>
-                            <input type="text" id="dbHost" value="127.0.0.1" />
-                            <p class="description">Usually "localhost" or "127.0.0.1"</p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th><label for="dbPort">Database Port</label></th>
-                        <td>
-                            <input type="number" id="dbPort" value="3306" />
-                            <p class="description">Default MySQL port is 3306</p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th><label for="dbUser">Username</label></th>
-                        <td>
-                            <input type="text" id="dbUser" value="" placeholder="Database username" />
-                            <p class="description">Your MySQL username</p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th><label for="dbPassword">Password</label></th>
-                        <td>
-                            <input type="password" id="dbPassword" value="" placeholder="Database password" />
-                            <p class="description">Your MySQL password</p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th><label for="dbName">Database Name</label></th>
-                        <td>
-                            <input type="text" id="dbName" value="reactpress" />
-                            <p class="description">The name of the database you want to use with ReactPress</p>
-                        </td>
-                    </tr>
-                </table>
-                
-                <div id="dbResult"></div>
-                
-                <p class="text-center">
-                    <button class="wp-button button-large" onclick="testDatabase()" id="testBtn">
-                        Test Database Connection
-                    </button>
-                </p>
-            </div>
-            
-            <!-- Step 2: Site Configuration -->
-            <div class="wp-step" id="step2">
-                <h2>Site Information</h2>
-                
-                <div class="wp-description">
-                    Please provide the following information. Don't worry, you can always change these settings later.
-                </div>
-                
-                <table class="wp-form-table">
-                    <tr>
-                        <th><label for="clientUrl">Client Site URL</label></th>
-                        <td>
-                            <input type="url" id="clientUrl" value="http://localhost:3001" />
-                            <p class="description">The URL where your ReactPress frontend will be accessible</p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th><label for="serverUrl">API Server URL</label></th>
-                        <td>
-                            <input type="url" id="serverUrl" value="http://localhost:3002" />
-                            <p class="description">The URL where your ReactPress API server will run</p>
-                        </td>
-                    </tr>
-                </table>
-                
-                <div id="installResult"></div>
-                
-                <p class="text-center">
-                    <button class="wp-button button-large" onclick="installReactPress()" id="installBtn">
-                        Install & Start ReactPress
-                    </button>
-                </p>
-            </div>
-            
-            <!-- Step 3: Success -->
-            <div class="wp-step" id="step3">
-                <h2>🎉 Installation Complete!</h2>
-                
-                <div class="wp-notice notice-success">
-                    <p><strong>ReactPress has been installed and is starting...</strong></p>
-                </div>
-                
-                <p>Your ReactPress server is now starting up. You can:</p>
-                
-                <ul style="margin: 16px 0 16px 20px;">
-                    <li>Close this browser window</li>
-                    <li>The server API will open automatically at <strong>http://localhost:3002/api</strong></li>
-                    <li>Access your admin panel at <strong>http://localhost:3001/admin</strong> (when client is running)</li>
-                </ul>
-                
-                <div class="wp-description">
-                    <strong>Note:</strong> To restart the server in the future, simply run <code>npx @fecommunity/reactpress-server</code> again.
-                </div>
-            </div>
-        </div>
-        
-        <div class="wp-footer">
-            <p>Need help? <a href="https://github.com/fecommunity/reactpress/issues" target="_blank">ReactPress Documentation</a></p>
-        </div>
-    </div>
+// 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...');
     
-    <script>
-        let currentStep = 1;
-        const totalSteps = 3;
-        let isTestingConnection = false;
-        
-        function updateProgress() {
-            const progress = (currentStep / totalSteps) * 100;
-            document.getElementById('progressBar').style.width = progress + '%';
-        }
-        
-        function showStep(step) {
-            document.querySelectorAll('.wp-step').forEach(s => s.classList.remove('active'));
-            document.getElementById('step' + step).classList.add('active');
-            currentStep = step;
-            updateProgress();
-        }
-        
-        function showNotice(message, type = 'error', containerId = 'dbResult') {
-            const container = document.getElementById(containerId);
-            container.innerHTML = \`
-                <div class="wp-notice notice-\${type}">
-                    <p>\${message}</p>
-                </div>
-            \`;
-        }
-        
-        function validateDatabaseInputs() {
-            const host = document.getElementById('dbHost').value.trim();
-            const port = document.getElementById('dbPort').value.trim();
-            const user = document.getElementById('dbUser').value.trim();
-            const password = document.getElementById('dbPassword').value;
-            const database = document.getElementById('dbName').value.trim();
-            
-            if (!host || !port || !user || !database) {
-                showNotice('Please fill in all required fields.', 'error');
-                return false;
-            }
-            
-            if (isNaN(port) || port < 1 || port > 65535) {
-                showNotice('Please enter a valid port number (1-65535).', 'error');
-                return false;
-            }
-            
-            return { host, port, user, password, database };
-        }
-        
-        async function testDatabase() {
-            if (isTestingConnection) return;
-            
-            const dbData = validateDatabaseInputs();
-            if (!dbData) return;
-            
-            isTestingConnection = true;
-            const testBtn = document.getElementById('testBtn');
-            const originalText = testBtn.innerHTML;
-            
-            testBtn.disabled = true;
-            testBtn.innerHTML = '<span class="wp-loader"></span>Testing connection...';
-            
-            try {
-                const response = await fetch('/test-db', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify(dbData)
-                });
-                
-                const result = await response.json();
-                
-                if (result.success) {
-                    showNotice(result.message, 'success');
-                    setTimeout(() => {
-                        showStep(2);
-                    }, 1500);
-                } else {
-                    showNotice(result.message, 'error');
-                }
-            } catch (error) {
-                showNotice('Failed to connect to server. Please try again.', 'error');
-            } finally {
-                isTestingConnection = false;
-                testBtn.disabled = false;
-                testBtn.innerHTML = originalText;
-            }
-        }
-        
-        async function installReactPress() {
-            const dbData = validateDatabaseInputs();
-            if (!dbData) {
-                showStep(1);
-                return;
-            }
-            
-            const clientUrl = document.getElementById('clientUrl').value.trim();
-            const serverUrl = document.getElementById('serverUrl').value.trim();
-            
-            if (!clientUrl || !serverUrl) {
-                showNotice('Please fill in all site URLs.', 'error', 'installResult');
-                return;
-            }
-            
-            const installBtn = document.getElementById('installBtn');
-            const originalText = installBtn.innerHTML;
-            
-            installBtn.disabled = true;
-            installBtn.innerHTML = '<span class="wp-loader"></span>Installing & Starting...';
-            
-            try {
-                const response = await fetch('/install', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({
-                        db: dbData,
-                        site: { clientUrl, serverUrl }
-                    })
-                });
-                
-                const result = await response.json();
-                
-                if (result.success) {
-                    showStep(3);
-                    // Auto-close and redirect to server after a delay
-                    setTimeout(() => {
-                        if (result.serverUrl) {
-                            window.open(result.serverUrl + '/api', '_blank');
-                        }
-                    }, 3000);
-                } else {
-                    showNotice(result.message, 'error', 'installResult');
-                }
-            } catch (error) {
-                showNotice('Installation failed. Please try again.', 'error', 'installResult');
-            } finally {
-                installBtn.disabled = false;
-                installBtn.innerHTML = originalText;
-            }
-        }
-        
-        // Initialize
-        updateProgress();
-        document.getElementById('dbHost').focus();
-    </script>
-</body>
-</html>`;
-}
+    // 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}`);
+  }
 
-// Run the main function
-if (require.main === module) {
-  main().catch(console.error);
+  // 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);
+  }
 }
 
-module.exports = { main, startServer };
+// Main execution
+if (usePM2) {
+  startWithPM2();
+} else {
+  startWithNode();
+}