@gv-sh/specgen-app 0.6.4 → 0.6.6

package/README.md

@@ -1,6 +1,6 @@
 # SpecGen App - Complete Platform
 
-[![Version](https://img.shields.io/badge/version-0.6.4-blue.svg)](https://github.com/gv-sh/specgen-app)
+[![Version](https://img.shields.io/badge/version-0.6.6-blue.svg)](https://github.com/gv-sh/specgen-app)
 
 A unified deployment package for the SpecGen speculative fiction generator platform. **Optimized for port 8080 deployment with low memory usage.**
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gv-sh/specgen-app",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "Complete SpecGen application with server, admin, and user interfaces",
   "main": "index.js",
   "bin": {

package/scripts/deploy.sh

@@ -11,10 +11,9 @@ if [ "$1" = "--dry-run" ] || [ "$1" = "-d" ]; then
     echo "🖥️  Platform: $(uname -s) $(uname -m)"
 else
     echo "🚀 Deploying SpecGen to production on port 8080..."
+    echo "📦 This is a complete deployment - no separate setup needed!"
 fi
 
-echo "📦 This is a complete deployment - no separate setup needed!"
-
 # Function to check if port is available
 check_port() {
     local port=$1
@@ -26,7 +25,13 @@ check_port() {
 }
 
 # Get absolute path of current working directory
-PROJECT_DIR=$(pwd)
+# In dry-run, use the actual working directory, not NPX cache
+if [ "$DRY_RUN" = true ]; then
+    PROJECT_DIR=$(pwd)
+else
+    PROJECT_DIR=$(pwd)
+fi
+
 echo "📂 Project directory: $PROJECT_DIR"
 
 # ========================================
@@ -74,6 +79,7 @@ if [ "$DRY_RUN" = false ]; then
     rm -rf logs/* 2>/dev/null || true
 else
     echo "🧪 DRY RUN: Skipping cleanup (existing processes will remain)"
+    echo "   This is a safe test that won't affect your system"
 fi
 
 # ========================================
@@ -82,18 +88,35 @@ fi
 
 echo "🔍 Checking prerequisites..."
 
-# Check Node.js version
+# Check Node.js version (more lenient for dry-run)
 NODE_VERSION=$(node --version | sed 's/v//' | cut -d. -f1)
-if [ "$NODE_VERSION" -lt 20 ]; then
-    echo "❌ Node.js 20+ required. Current version: $(node --version)"
-    if [ "$PLATFORM" = "Darwin" ]; then
-        echo "Install with: brew install node@20"
+if [ "$DRY_RUN" = true ]; then
+    # More lenient for dry-run testing
+    if [ "$NODE_VERSION" -lt 18 ]; then
+        echo "❌ Node.js 18+ required for testing. Current version: $(node --version)"
+        if [ "$PLATFORM" = "Darwin" ]; then
+            echo "Install with: brew install node"
+        fi
+        exit 1
     else
-        echo "Install with: curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash - && sudo apt-get install -y nodejs"
+        echo "✅ Node.js version: $(node --version) (sufficient for testing)"
+        if [ "$NODE_VERSION" -lt 20 ]; then
+            echo "   ⚠️  Note: Production deployment requires Node.js 20+"
+        fi
     fi
-    exit 1
 else
-    echo "✅ Node.js version: $(node --version)"
+    # Strict for production
+    if [ "$NODE_VERSION" -lt 20 ]; then
+        echo "❌ Node.js 20+ required for production. Current version: $(node --version)"
+        if [ "$PLATFORM" = "Darwin" ]; then
+            echo "Install with: brew install node@20"
+        else
+            echo "Install with: curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash - && sudo apt-get install -y nodejs"
+        fi
+        exit 1
+    else
+        echo "✅ Node.js version: $(node --version)"
+    fi
 fi
 
 # Check npm
@@ -114,13 +137,19 @@ elif [ "$PLATFORM" = "Linux" ]; then
     fi
 fi
 
+# Check if we have required tools
+echo "✅ Platform tools:"
+echo "   curl: $(which curl >/dev/null && echo "available" || echo "missing")"
+echo "   tar: $(which tar >/dev/null && echo "available" || echo "missing")"
+echo "   lsof: $(which lsof >/dev/null && echo "available" || echo "missing")"
+
 # ========================================
 # SETUP OPENAI API KEY
 # ========================================
 
 echo "🔑 Setting up OpenAI API key..."
 
-# In dry-run mode, use a test key
+# In dry-run mode, always use a test key
 if [ "$DRY_RUN" = true ]; then
     echo "🧪 DRY RUN: Using test API key"
     mkdir -p "$PROJECT_DIR/server"
@@ -136,7 +165,7 @@ elif [ ! -f "$PROJECT_DIR/server/.env" ] || grep -q "your_openai_api_key_here" "
         echo "PORT=8080" >> "$PROJECT_DIR/server/.env"
     else
         echo "⚠️ OpenAI API key required for SpecGen to work."
-        echo "Enter your OpenAI API key (or press Enter to use test key for dry-run): "
+        echo "Enter your OpenAI API key (or press Enter to use test key): "
         read -r OPENAI_KEY
         
         if [ -z "$OPENAI_KEY" ]; then
@@ -203,6 +232,170 @@ if [ ! -f "server/index.js" ]; then
     fi
     
     cd "$PROJECT_DIR"
+    
+    # Replace with unified server that serves static files
+    echo "   🔧 Installing unified server for port 8080..."
+    cat > server/index.js << 'EOF'
+// index.js - Unified server for port 8080 with proper routing
+/* global process */
+require('dotenv').config();
+const express = require('express');
+const cors = require('cors');
+const path = require('path');
+const errorHandler = require('./middleware/errorHandler');
+
+// Initialize Express app
+const app = express();
+let PORT = process.env.PORT || 8080;
+
+// Middleware
+app.use(cors());
+app.use(express.json());
+app.use(express.urlencoded({ extended: true }));
+
+// Serve static files for admin interface at /admin
+const adminBuildPath = path.join(__dirname, '../admin/build');
+const fs = require('fs');
+if (fs.existsSync(adminBuildPath)) {
+  app.use('/admin', express.static(adminBuildPath));
+  // Handle React Router for admin (catch all admin routes)
+  app.get('/admin/*', (req, res) => {
+    res.sendFile(path.join(adminBuildPath, 'index.html'));
+  });
+  console.log('✅ Admin interface available at /admin');
+} else {
+  console.log('⚠️ Admin build not found at', adminBuildPath);
+}
+
+// Serve static files for user interface at /app  
+const userBuildPath = path.join(__dirname, '../user/build');
+if (fs.existsSync(userBuildPath)) {
+  app.use('/app', express.static(userBuildPath));
+  // Handle React Router for user app (catch all app routes)
+  app.get('/app/*', (req, res) => {
+    res.sendFile(path.join(userBuildPath, 'index.html'));
+  });
+  console.log('✅ User interface available at /app');
+} else {
+  console.log('⚠️ User build not found at', userBuildPath);
+}
+
+// Serve user interface as default at root (/) as well
+if (fs.existsSync(userBuildPath)) {
+  app.use('/', express.static(userBuildPath, { index: false }));
+}
+
+// Routes
+const categoryRoutes = require('./routes/categories');
+const parameterRoutes = require('./routes/parameters');
+const generateRoutes = require('./routes/generate');
+const databaseRoutes = require('./routes/database');
+const contentRoutes = require('./routes/content');
+const settingsRoutes = require('./routes/settings');
+
+// API Routes
+app.use('/api/categories', categoryRoutes);
+app.use('/api/parameters', parameterRoutes);
+app.use('/api/generate', generateRoutes);
+app.use('/api/database', databaseRoutes);
+app.use('/api/content', contentRoutes);
+app.use('/api/settings', settingsRoutes);
+
+// Only add Swagger in non-test environment
+if (process.env.NODE_ENV !== 'test') {
+  const swaggerRoutes = require('./routes/swagger');
+  app.use('/api-docs', swaggerRoutes);
+}
+
+// Health check routes
+const healthRoutes = require('./routes/health');
+app.use('/api/health', healthRoutes);
+
+// Root route - serve user app or provide navigation
+app.get('/', (req, res) => {
+  // If user build exists, serve it
+  if (fs.existsSync(userBuildPath)) {
+    res.sendFile(path.join(userBuildPath, 'index.html'));
+  } else {
+    // Fallback navigation page
+    const html = `
+<!DOCTYPE html>
+<html>
+<head>
+    <title>SpecGen - API & Applications</title>
+    <style>
+        body { font-family: Arial, sans-serif; max-width: 800px; margin: 50px auto; padding: 20px; background: #f8f9fa; }
+        .nav-card { border: 1px solid #dee2e6; border-radius: 8px; padding: 20px; margin: 15px 0; background: white; box-shadow: 0 2px 4px rgba(0,0,0,0.1); }
+        .nav-card:hover { background-color: #f8f9fa; transform: translateY(-2px); transition: all 0.2s; }
+        a { text-decoration: none; color: #007bff; }
+        h1 { color: #343a40; text-align: center; }
+        .status { color: #28a745; font-weight: bold; text-align: center; background: #d4edda; padding: 10px; border-radius: 5px; margin: 20px 0; }
+        .footer { text-align: center; margin-top: 30px; color: #6c757d; font-size: 14px; }
+        .warning { background: #fff3cd; border: 1px solid #ffeaa7; padding: 15px; border-radius: 5px; margin: 20px 0; }
+    </style>
+</head>
+<body>
+    <h1>🚀 SpecGen Platform</h1>
+    <div class="status">✅ All services running on port ${PORT}</div>
+    
+    <div class="warning">
+        <strong>🔒 AWS Security Group Note:</strong> If you can't access this from outside, 
+        add port ${PORT} to your AWS Security Group inbound rules.
+    </div>
+    
+    <div class="nav-card">
+        <h3><a href="/app">📱 User Application</a></h3>
+        <p>Main SpecGen user interface for creating and managing specifications</p>
+    </div>
+    
+    <div class="nav-card">
+        <h3><a href="/admin">⚙️ Admin Panel</a></h3>
+        <p>Administrative interface for system management and configuration</p>
+    </div>
+    
+    <div class="nav-card">
+        <h3><a href="/api-docs">📚 API Documentation</a></h3>
+        <p>Interactive API documentation and testing interface</p>
+    </div>
+    
+    <div class="nav-card">
+        <h3><a href="/api/health">❤️ Health Check</a></h3>
+        <p>System health and status monitoring endpoint</p>
+    </div>
+    
+    <div class="footer">
+        <p><strong>API Base URL:</strong> <code>http://your-server:${PORT}/api</code></p>
+        <p><strong>Environment:</strong> ${process.env.NODE_ENV || 'development'}</p>
+        <p><strong>Server Time:</strong> ${new Date().toISOString()}</p>
+    </div>
+</body>
+</html>`;
+    res.send(html);
+  }
+});
+
+// Error handling middleware
+app.use(errorHandler);
+
+if (require.main === module) {
+  app.listen(PORT, () => {
+    console.log(`🚀 SpecGen unified server running on port ${PORT}`);
+    console.log(`📱 User App: http://localhost:${PORT}/app`);
+    console.log(`⚙️ Admin Panel: http://localhost:${PORT}/admin`);
+    console.log(`📚 API Docs: http://localhost:${PORT}/api-docs`);
+    console.log(`❤️ Health Check: http://localhost:${PORT}/api/health`);
+    console.log(`🏠 Main Page: http://localhost:${PORT}/`);
+    console.log(`🔒 AWS Note: Ensure port ${PORT} is open in Security Groups`);
+    if (process.env.NODE_ENV !== 'test') {
+      console.log(`- API Documentation: http://localhost:${PORT}/api-docs`);
+    }
+    console.log(`- API is ready for use`);
+  });
+}
+
+module.exports = app;
+EOF
+    echo "✅ Unified server installed"
 fi
 
 # Install and build admin
@@ -327,32 +520,42 @@ if [ "$DRY_RUN" = true ]; then
     # Copy environment
     cp "$PROJECT_DIR/server/.env" "$PROJECT_DIR/.env" 2>/dev/null || true
     
-    echo "   Starting test server on port 8080 for 10 seconds..."
+    # Check if port 8080 is available for testing
+    if ! check_port 8080; then
+        echo "   ⚠️  Port 8080 is in use, testing on port 8081 instead"
+        TEST_PORT=8081
+        sed -i.bak 's/PORT=8080/PORT=8081/' "$PROJECT_DIR/server/.env"
+    else
+        TEST_PORT=8080
+    fi
+    
+    echo "   Starting test server on port $TEST_PORT for 10 seconds..."
     
     # Start server in background
-    (cd server && NODE_ENV=production PORT=8080 node index.js) &
+    (cd server && NODE_ENV=production PORT=$TEST_PORT node index.js) &
     SERVER_PID=$!
     
     # Wait a bit for server to start
     sleep 3
     
     # Test the endpoints
-    echo "   Testing endpoints:"
+    echo "   Testing endpoints on port $TEST_PORT:"
     
-    if curl -s http://localhost:8080/api/health >/dev/null 2>&1; then
+    if curl -s http://localhost:$TEST_PORT/api/health >/dev/null 2>&1; then
         echo "   ✅ Health endpoint: OK"
-        echo "      Response: $(curl -s http://localhost:8080/api/health | head -c 100)..."
+        HEALTH_RESPONSE=$(curl -s http://localhost:$TEST_PORT/api/health)
+        echo "      Status: $(echo $HEALTH_RESPONSE | grep -o '"status":"[^"]*"' | cut -d'"' -f4)"
     else
         echo "   ❌ Health endpoint: FAILED"
     fi
     
-    HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:8080/ 2>/dev/null || echo "000")
+    HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:$TEST_PORT/ 2>/dev/null || echo "000")
     echo "   📄 Main page: HTTP $HTTP_CODE"
     
-    HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:8080/admin 2>/dev/null || echo "000")
+    HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:$TEST_PORT/admin/ 2>/dev/null || echo "000")
     echo "   ⚙️  Admin page: HTTP $HTTP_CODE"
     
-    HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:8080/app 2>/dev/null || echo "000")
+    HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:$TEST_PORT/app/ 2>/dev/null || echo "000")
     echo "   👤 User page: HTTP $HTTP_CODE"
     
     # Stop test server
@@ -360,6 +563,11 @@ if [ "$DRY_RUN" = true ]; then
     kill $SERVER_PID 2>/dev/null || true
     wait $SERVER_PID 2>/dev/null || true
     
+    # Restore original .env if we changed it
+    if [ -f "$PROJECT_DIR/server/.env.bak" ]; then
+        mv "$PROJECT_DIR/server/.env.bak" "$PROJECT_DIR/server/.env"
+    fi
+    
     echo ""
     echo "🎉 DRY RUN COMPLETED!"
     echo ""
@@ -367,12 +575,25 @@ if [ "$DRY_RUN" = true ]; then
     echo "   ✅ All packages downloaded and extracted"
     echo "   ✅ All dependencies installed"
     echo "   ✅ React apps built successfully"
+    echo "   ✅ Unified server installed"
     echo "   ✅ Server can start and respond"
     echo ""
+    if [ "$NODE_VERSION" -lt 20 ]; then
+        echo "⚠️  Note for AWS deployment:"
+        echo "   Your Mac has Node.js $(node --version)"
+        echo "   AWS deployment requires Node.js 20+"
+        echo "   Make sure your AWS server has the right version"
+        echo ""
+    fi
     echo "🚀 Ready for production deployment!"
-    echo "   Run without --dry-run to deploy for real"
+    echo "   Deploy to AWS with: npx @gv-sh/specgen-app deploy"
     echo ""
-    echo "🔧 To test locally:"
+    echo "🔒 AWS Deployment Notes:"
+    echo "   1. Ensure Node.js 20+ on your AWS instance"
+    echo "   2. Add port 8080 to Security Group inbound rules"
+    echo "   3. Run: npx @gv-sh/specgen-app deploy"
+    echo ""
+    echo "🔧 To test locally right now:"
     echo "   cd server && npm start"
     echo "   Open http://localhost:8080/"
     
@@ -444,10 +665,10 @@ EOF
         HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:8080/ 2>/dev/null)
         echo "📄 Main page: HTTP $HTTP_CODE"
         
-        HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:8080/admin 2>/dev/null)
+        HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:8080/admin/ 2>/dev/null)
         echo "⚙️  Admin page: HTTP $HTTP_CODE"
         
-        HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:8080/app 2>/dev/null)
+        HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:8080/app/ 2>/dev/null)
         echo "👤 User page: HTTP $HTTP_CODE"
         
         PUBLIC_IP=$(curl -s ifconfig.me 2>/dev/null || curl -s ipecho.net/plain 2>/dev/null || echo 'your-server')
@@ -457,11 +678,16 @@ EOF
         echo ""
         echo "🌐 Access your application at:"
         echo "   - Main page: http://$PUBLIC_IP:8080/"
-        echo "   - User app: http://$PUBLIC_IP:8080/app"
-        echo "   - Admin panel: http://$PUBLIC_IP:8080/admin"
+        echo "   - User app: http://$PUBLIC_IP:8080/app/"
+        echo "   - Admin panel: http://$PUBLIC_IP:8080/admin/"
         echo "   - API docs: http://$PUBLIC_IP:8080/api-docs"
         echo "   - Health check: http://$PUBLIC_IP:8080/api/health"
         echo ""
+        echo "🔒 AWS Security Group:"
+        echo "   If you can't access from outside, add port 8080 to inbound rules:"
+        echo "   EC2 Console → Security Groups → Edit Inbound Rules → Add Rule"
+        echo "   Type: Custom TCP, Port: 8080, Source: 0.0.0.0/0"
+        echo ""
         echo "📊 Management commands:"
         echo "   $PM2_CMD status           # Check status"
         echo "   $PM2_CMD logs specgen     # View logs"