Update start.sh

start.sh

@@ -1,41 +1,118 @@
 #!/bin/bash
 
 echo "============================================"
-echo "  Starting Web Terminal with Resource Limits"
+echo "  Web Terminal - Resource Limited Mode"
 echo "============================================"
 
+# Limits: 95% of resources
+MAX_MEM_PERCENT=95
+MAX_CPU_PERCENT=95
+
+# Calculate limits
+# HuggingFace provides 16GB RAM, 2 vCPU
+TOTAL_MEM_KB=$(awk '/MemTotal/{print $2}' /proc/meminfo)
+MAX_MEM_KB=$((TOTAL_MEM_KB * MAX_MEM_PERCENT / 100))
+MAX_MEM_BYTES=$((MAX_MEM_KB * 1024))
+
+echo "Memory Limit: ${MAX_MEM_KB}KB (${MAX_MEM_PERCENT}% of ${TOTAL_MEM_KB}KB)"
+echo "CPU Limit: ${MAX_CPU_PERCENT}% of 2 vCPUs"
+
+# Node.js memory limit (give it 4GB max for the server itself)
 export NODE_OPTIONS="--max-old-space-size=4096"
-ulimit -u 500 2>/dev/null || true
+
+# Set shell resource limits
+ulimit -v $((MAX_MEM_KB)) 2>/dev/null || true  # Virtual memory
+ulimit -m $((MAX_MEM_KB)) 2>/dev/null || true  # Resident memory
+ulimit -u 256 2>/dev/null || true               # Max processes
 
 # Try cgroup limits
-echo "15461882265" > /sys/fs/cgroup/memory.max 2>/dev/null || true
-echo "180000 100000" > /sys/fs/cgroup/cpu.max 2>/dev/null || true
-echo "15461882265" > /sys/fs/cgroup/memory/memory.limit_in_bytes 2>/dev/null || true
-echo 180000 > /sys/fs/cgroup/cpu/cpu.cfs_quota_us 2>/dev/null || true
-echo 100000 > /sys/fs/cgroup/cpu/cpu.cfs_period_us 2>/dev/null || true
+setup_cgroups() {
+    # cgroups v2
+    if [ -f "/sys/fs/cgroup/cgroup.controllers" ]; then
+        echo "Setting cgroups v2 limits..."
+        echo "$MAX_MEM_BYTES" > /sys/fs/cgroup/memory.max 2>/dev/null || true
+        echo "$((MAX_MEM_BYTES * 110 / 100))" > /sys/fs/cgroup/memory.high 2>/dev/null || true
+        # CPU: 190000 per 100000 = 1.9 CPUs (95% of 2)
+        echo "190000 100000" > /sys/fs/cgroup/cpu.max 2>/dev/null || true
+    fi
+    
+    # cgroups v1
+    if [ -d "/sys/fs/cgroup/memory" ]; then
+        echo "Setting cgroups v1 memory limit..."
+        echo "$MAX_MEM_BYTES" > /sys/fs/cgroup/memory/memory.limit_in_bytes 2>/dev/null || true
+        echo "$((MAX_MEM_BYTES * 110 / 100))" > /sys/fs/cgroup/memory/memory.soft_limit_in_bytes 2>/dev/null || true
+    fi
+    
+    if [ -d "/sys/fs/cgroup/cpu" ]; then
+        echo "Setting cgroups v1 CPU limit..."
+        echo 190000 > /sys/fs/cgroup/cpu/cpu.cfs_quota_us 2>/dev/null || true
+        echo 100000 > /sys/fs/cgroup/cpu/cpu.cfs_period_us 2>/dev/null || true
+    fi
+}
+
+setup_cgroups
 
-# Background resource monitor
+# Background resource enforcer
 (
-while true; do
-    sleep 10
-    TOTAL_MEM=$(awk '/MemTotal/{print $2}' /proc/meminfo)
-    AVAIL_MEM=$(awk '/MemAvailable/{print $2}' /proc/meminfo)
-    USED_MEM=$((TOTAL_MEM - AVAIL_MEM))
-    MAX_MEM=$((TOTAL_MEM * 90 / 100))
-    if [ "$USED_MEM" -gt "$MAX_MEM" ] 2>/dev/null; then
-        echo "[Monitor] Memory high: ${USED_MEM}KB / ${TOTAL_MEM}KB"
-        ps aux --sort=-%mem | awk 'NR>1{print $2, $4, $11}' | while read PID MEM CMD; do
-            case "$CMD" in *node*|*bash*|*start*) continue ;; esac
-            MEM_INT=${MEM%.*}
-            if [ "${MEM_INT:-0}" -gt 15 ]; then
-                kill -15 "$PID" 2>/dev/null
-                sleep 2
-                kill -9 "$PID" 2>/dev/null
+    echo "[Monitor] Started resource enforcer"
+    
+    while true; do
+        sleep 3
+        
+        # Get current memory usage
+        MEM_USED_KB=$(awk '/MemTotal/{t=$2} /MemAvailable/{a=$2} END{print t-a}' /proc/meminfo)
+        MEM_PERCENT=$((MEM_USED_KB * 100 / TOTAL_MEM_KB))
+        
+        # If memory > 90%, start killing heavy processes
+        if [ "$MEM_PERCENT" -gt 90 ]; then
+            echo "[Monitor] Memory at ${MEM_PERCENT}% - enforcing limits"
+            
+            # Get processes sorted by memory, skip essential ones
+            ps aux --sort=-%mem 2>/dev/null | awk 'NR>1 {print $2, $4, $11}' | while read PID MEM CMD; do
+                # Skip node server and bash
+                case "$CMD" in
+                    *node*server*|*bash*|*ps*|*awk*|*monitor*) continue ;;
+                esac
+                
+                MEM_INT=${MEM%.*}
+                MEM_INT=${MEM_INT:-0}
+                
+                # Kill processes using > 10% memory
+                if [ "$MEM_INT" -gt 10 ]; then
+                    echo "[Monitor] Killing PID $PID ($CMD) using ${MEM}% memory"
+                    kill -9 "$PID" 2>/dev/null
+                    break
+                fi
+            done
+        fi
+        
+        # CPU throttling - use SIGSTOP/SIGCONT for heavy processes
+        ps aux --sort=-%cpu 2>/dev/null | awk 'NR>1 {print $2, $3, $11}' | head -5 | while read PID CPU CMD; do
+            case "$CMD" in
+                *node*server*|*bash*|*ps*|*awk*|*monitor*) continue ;;
+            esac
+            
+            CPU_INT=${CPU%.*}
+            CPU_INT=${CPU_INT:-0}
+            
+            # Throttle processes using > 150% CPU (1.5 cores)
+            if [ "$CPU_INT" -gt 150 ]; then
+                echo "[Monitor] Throttling PID $PID ($CMD) using ${CPU}% CPU"
+                kill -STOP "$PID" 2>/dev/null
+                sleep 0.3
+                kill -CONT "$PID" 2>/dev/null
             fi
         done
-    fi
-done
+        
+    done
 ) &
 
-echo "Starting server on port ${PORT:-7860}..."
+MONITOR_PID=$!
+echo "[Monitor] PID: $MONITOR_PID"
+
+echo ""
+echo "Starting Node.js server..."
+echo "============================================"
+
+# Run server
 exec node /app/server.js