Update Dockerfile

Dockerfile

@@ -156,7 +156,7 @@ document.addEventListener('DOMContentLoaded', () => {
 });
 EOF
 
-# ===== Combined Server =====
+# ===== Fixed Combined Server =====
 COPY <<"EOF" /app/combined_server.py
 from flask import Flask, request, jsonify, render_template, make_response
 from werkzeug.middleware.proxy_fix import ProxyFix
@@ -167,6 +167,8 @@ from pathlib import Path
 import subprocess
 import requests
 from waitress import serve
+import threading
+import time
 
 app = Flask(__name__, 
            template_folder='/app/admin/templates',
@@ -184,7 +186,7 @@ def get_db():
                  (username TEXT PRIMARY KEY, password TEXT, role TEXT)''')
     return db
 
-# Admin routes
+# ===== Admin Routes =====
 @app.route('/sudo')
 def admin_home():
     return render_template('login.html')
@@ -192,7 +194,7 @@ def admin_home():
 @app.route('/sudo/login', methods=['POST'])
 def login():
     if request.json.get('sudo_secret') == os.getenv("SUDO_SECRET"):
-        return jsonify({"status": "success"})
+        return jsonify({"status": "success", "token": os.getenv("SUDO_SECRET")})
     return jsonify({"error": "Invalid secret"}), 403
 
 @app.route('/sudo/dashboard')
@@ -236,34 +238,55 @@ def remove_user():
     db.commit()
     return jsonify({"status": "User removed"})
 
-# LibreChat proxy
+# ===== LibreChat Proxy =====
+def is_librechat_ready():
+    try:
+        return requests.get('http://localhost:3080', timeout=1).status_code < 500
+    except:
+        return False
+
 @app.route('/', defaults={'path': ''})
-@app.route('/<path:path>', methods=['GET', 'POST', 'PUT', 'DELETE'])
+@app.route('/<path:path>', methods=['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS'])
 def proxy(path):
+    # Don't proxy admin routes
     if path.startswith('sudo/') or path == 'sudo':
         return make_response("Not Found", 404)
     
+    # Wait for LibreChat to be ready
+    for _ in range(30):  # 30 second timeout
+        if is_librechat_ready():
+            break
+        time.sleep(1)
+    else:
+        return make_response("LibreChat backend not ready", 503)
+    
+    # Forward request to LibreChat
     resp = requests.request(
         method=request.method,
         url=f"http://localhost:3080/{path}",
-        headers={key: value for (key, value) in request.headers if key != 'Host'},
+        headers={key: value for (key, value) in request.headers if key.lower() != 'host'},
         data=request.get_data(),
         cookies=request.cookies,
-        allow_redirects=False
+        allow_redirects=False,
+        timeout=30
     )
     
+    # Create response
     response = make_response(resp.content, resp.status_code)
     for key, value in resp.headers.items():
         if key.lower() not in ['content-encoding', 'content-length', 'transfer-encoding']:
             response.headers[key] = value
     return response
 
+def start_librechat():
+    subprocess.run(["npm", "run", "backend"], cwd="/app")
+
 if __name__ == "__main__":
-    # Start LibreChat backend
-    subprocess.Popen(["npm", "run", "backend"], cwd="/app")
+    # Start LibreChat in background
+    threading.Thread(target=start_librechat, daemon=True).start()
     
     # Start combined server
-    serve(app, host='0.0.0.0', port=7860, threads=4)
+    serve(app, host='0.0.0.0', port=7860, threads=4, ident="LibreChat Proxy")
 EOF
 
 # Startup script