bugfix

Author: CodeJawn

server.py

@@ -7,7 +7,7 @@
 from http.server import HTTPServer, SimpleHTTPRequestHandler
 import json
 import os
-from urllib.parse import urlparse
+from urllib.parse import urlparse, parse_qs
 import urllib.request
 import urllib.error
 
@@ -45,15 +45,15 @@ def ensure_config_exists():
 class KaraKeepHandler(SimpleHTTPRequestHandler):
     def do_GET(self):
         """Handle GET requests"""
+        # Check for API proxy requests first
+        if self.path.startswith('/api/karakeep/'):
+            self.proxy_to_karakeep('GET')
+            return
+        
         # Redirect config.json requests to config/config.json
         if self.path == '/config.json':
             self.path = '/config/config.json'
 
-        # Proxy API requests to KaraKeep
-        elif self.path.startswith('/api/karakeep/'):
-            self.proxy_to_karakeep('GET')
-            return
-        
         # Serve files normally
         return super().do_GET()
 
@@ -62,24 +62,31 @@ def proxy_to_karakeep(self, method):
         try:
             # Load config to get KaraKeep URL and API key
             config_path = 'config/config.json'
+            if not os.path.exists(config_path):
+                raise Exception("Config file not found")
+                
             with open(config_path, 'r') as f:
                 config = json.load(f)
 
             karakeep_url = config.get('karakeepUrl', 'http://localhost:3000')
             api_key = config.get('apiKey', '')
 
+            if not api_key or api_key == 'YOUR_KARAKEEP_API_KEY_HERE':
+                raise Exception("API key not configured")
+            
             # Remove /api/karakeep prefix and construct the actual API path
             api_path = self.path.replace('/api/karakeep', '/api', 1)
             full_url = f"{karakeep_url}{api_path}"
 
+            print(f"Proxying {method} request to: {full_url}")
+            
             # Create request with auth header
-            req = urllib.request.Request(full_url)
+            req = urllib.request.Request(full_url, method=method)
             req.add_header('Authorization', f'Bearer {api_key}')
             req.add_header('Content-Type', 'application/json')
+            req.add_header('Accept', 'application/json')
 
             # Create SSL context that handles self-signed certificates
-            # Note: This accepts any certificate, including self-signed ones
-            # In production with proper certificates, you may want to remove these lines
             ssl_context = None
             if SSL_AVAILABLE and full_url.startswith('https://'):
                 ssl_context = ssl.create_default_context()
@@ -91,23 +98,30 @@ def proxy_to_karakeep(self, method):
                 response = urllib.request.urlopen(req, context=ssl_context)
             else:
                 response = urllib.request.urlopen(req)
+                
             data = response.read()
 
             # Send response back to client
             self.send_response(response.getcode())
             self.send_header('Content-Type', 'application/json')
+            self.send_header('Cache-Control', 'no-cache')
             self.end_headers()
             self.wfile.write(data)
 
         except urllib.error.HTTPError as e:
+            print(f"HTTP Error: {e.code} - {e.reason}")
             # Forward HTTP errors
             self.send_response(e.code)
             self.send_header('Content-Type', 'application/json')
             self.end_headers()
-            error_data = e.read()
-            self.wfile.write(error_data if error_data else json.dumps({"error": str(e)}).encode())
+            try:
+                error_data = e.read()
+                self.wfile.write(error_data if error_data else json.dumps({"error": str(e)}).encode())
+            except:
+                self.wfile.write(json.dumps({"error": f"HTTP {e.code}: {e.reason}"}).encode())
 
         except Exception as e:
+            print(f"Proxy error: {str(e)}")
             # Handle other errors
             self.send_response(500)
             self.send_header('Content-Type', 'application/json')
@@ -159,13 +173,17 @@ def end_headers(self):
         """Add CORS headers"""
         self.send_header('Access-Control-Allow-Origin', '*')
         self.send_header('Access-Control-Allow-Methods', 'GET, POST, OPTIONS')
-        self.send_header('Access-Control-Allow-Headers', 'Content-Type')
+        self.send_header('Access-Control-Allow-Headers', 'Content-Type, Authorization')
         super().end_headers()
 
     def do_OPTIONS(self):
         """Handle OPTIONS requests for CORS"""
         self.send_response(200)
         self.end_headers()
+    
+    def log_message(self, format, *args):
+        """Override to add more detailed logging"""
+        print(f"{self.address_string()} - - [{self.log_date_time_string()}] {format % args}")
 
 if __name__ == '__main__':
     # Ensure config exists before starting server