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

package/bin/reactpress-server.js

@@ -11,6 +11,31 @@ const { spawn } = require('child_process');
 const PORT = 3003;
 const SERVER_PORT = 3002;
 
+// Load and set environment variables from .env file
+function loadEnvVariables(envPath) {
+  try {
+    const envContent = fs.readFileSync(envPath, 'utf8');
+    const envLines = envContent.split('\n');
+    
+    envLines.forEach(line => {
+      const trimmedLine = line.trim();
+      if (trimmedLine && !trimmedLine.startsWith('#')) {
+        const [key, ...valueParts] = trimmedLine.split('=');
+        if (key && valueParts.length > 0) {
+          const value = valueParts.join('=').trim();
+          process.env[key.trim()] = value;
+        }
+      }
+    });
+    
+    console.log(chalk.cyan(`📝 Environment variables loaded from .env`));
+    return true;
+  } catch (error) {
+    console.log(chalk.yellow('⚠️  Could not load .env file:', error.message));
+    return false;
+  }
+}
+
 // Main entry point with auto-detection
 async function main() {
   const args = process.argv.slice(2);
@@ -26,6 +51,8 @@ async function main() {
     await runInstallationWizard();
   } else {
     console.log(chalk.green('✅ Configuration found. Starting server...'));
+    // Load environment variables from .env file
+    loadEnvVariables(envPath);
     startServer();
   }
 }
@@ -58,9 +85,7 @@ async function runInstallationWizard() {
         port: parseInt(port),
         user: user.trim(),
         password: password,
-        connectTimeout: 5000,
-        acquireTimeout: 5000,
-        timeout: 5000
+        connectTimeout: 5000
       });
       
       try {
@@ -149,6 +174,9 @@ SERVER_SITE_URL=${site.serverUrl}
     fs.writeFileSync(envPath, env);
     console.log(chalk.green('✅ Configuration saved to .env file'));
     
+    // Load the environment variables immediately
+    loadEnvVariables(envPath);
+    
     res.json({ 
       success: true, 
       message: 'ReactPress installed successfully! Starting server...',
@@ -193,11 +221,54 @@ function startServer() {
   
   // 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' }
-  });
+  
+  // Check if we're in development or installed package
+  const isDevMode = fs.existsSync(path.join(serverDir, 'src'));
+  
+  let server;
+  if (isDevMode) {
+    // Development mode - try different nest commands
+    const nestCommands = [
+      ['npx', ['nest', 'start', '--watch']],
+      ['npm', ['run', 'dev']],
+      ['node', ['node_modules/.bin/nest', 'start', '--watch']]
+    ];
+    
+    let commandFound = false;
+    for (const [cmd, args] of nestCommands) {
+      try {
+        server = spawn(cmd, args, { 
+          cwd: serverDir, 
+          stdio: 'inherit',
+          env: { ...process.env, NODE_ENV: 'development' }
+        });
+        commandFound = true;
+        break;
+      } catch (error) {
+        console.log(chalk.yellow(`⚠️  ${cmd} not available, trying next option...`));
+        continue;
+      }
+    }
+    
+    if (!commandFound) {
+      console.log(chalk.red('❌ Could not start development server. Please install @nestjs/cli globally:'));
+      console.log(chalk.cyan('npm install -g @nestjs/cli'));
+      return;
+    }
+  } else {
+    // Production mode - use built files
+    const mainPath = path.join(serverDir, 'dist', 'main.js');
+    if (fs.existsSync(mainPath)) {
+      server = spawn('node', [mainPath], {
+        cwd: serverDir,
+        stdio: 'inherit',
+        env: { ...process.env, NODE_ENV: 'production' }
+      });
+    } else {
+      console.log(chalk.red('❌ Server files not found. Please ensure the package is properly installed.'));
+      return;
+    }
+  }
   
   server.on('error', (error) => {
     console.log(chalk.red('❌ Failed to start server:'), error.message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecommunity/reactpress-server",
-  "version": "1.0.0-beta.13",
+  "version": "1.0.0-beta.17",
   "description": "ReactPress Server - NestJS-based backend API for ReactPress CMS",
   "author": "fecommunity",
   "license": "MIT",
@@ -98,10 +98,10 @@
     "typeorm": "^0.2.22",
     "ua-parser-js": "^0.7.28",
     "open": "^8.2.1",
-    "express": "^4.18.2"
+    "express": "^4.18.2",
+    "@nestjs/cli": "^6.9.0"
   },
   "devDependencies": {
-    "@nestjs/cli": "^6.9.0",
     "@nestjs/schematics": "^6.7.0",
     "@nestjs/testing": "^6.7.1",
     "@types/express": "4.17.18",