fixes

proxy/__init__.py

@@ -1,7 +1,14 @@
 from flask import Flask
 from .config import Config
 
-app = Flask(__name__)
+def proxy_app():
-app.config.from_object(Config)
+    app = Flask(__name__)
+    app.config.from_object(Config)
+
+    # Подключаем маршруты
+    from proxy import rss_proxy, healthcheck
+    rss_proxy.init_proxy(app)
+    healthcheck.init_healthcheck(app)
+    return app
+
 
-from proxy import rss_proxy, healthcheck

proxy/healthcheck.py

@@ -1,10 +1,11 @@
 from flask import Response
-from proxy import app
 
-@app.route("/health")
+
-def healthcheck():
+def init_healthcheck(app):
-    """Health check route to monitor service status"""
+    @app.route("/health")
-    try:
+    def healthcheck():
-        return Response("OK", status=200)
+        """Health check route to monitor service status"""
-    except Exception as e:
+        try:
-        return f"Error: {e}", 500
+            return Response("healthy", status=200)
+        except Exception as e:
+            return f"Error: {e}", 500

proxy/rss_proxy.py

@@ -2,26 +2,29 @@ import urllib.parse
 from flask import request, Response
 import requests
 import os
-from proxy import app
 
 PROXY_URL = os.getenv("PROXY_URL")
 
-@app.route("/proxy")
-def proxy():
-    """Proxy RSS feed with forced re-encoding to UTF-8"""
-    raw_query = request.query_string.decode()
-    if raw_query.startswith("url="):
-        url = urllib.parse.unquote(raw_query[4:])
-    else:
-        return "Missing URL", 400
 
-    try:
+def init_proxy(app):
-        proxies = {"http": PROXY_URL, "https": PROXY_URL} if PROXY_URL else None
+    @app.route("/proxy")
-        r = requests.get(url, timeout=10, proxies=proxies)
+    def proxy():
+        """Proxy RSS feed with forced re-encoding to UTF-8"""
+        raw_query = request.query_string.decode()
+        if raw_query.startswith("url="):
+            url = urllib.parse.unquote(raw_query[4:])
+        else:
+            return "Missing URL", 400
 
-        r.encoding = "windows-1251" if "windows-1251" in r.headers.get("content-type", "").lower() else r.apparent_encoding
+        try:
-        response_text = r.text.replace('<?xml version="1.0" encoding="windows-1251"?>', '<?xml version="1.0" encoding="UTF-8"?>')
+            proxies = {"http": PROXY_URL, "https": PROXY_URL} if PROXY_URL else None
+            r = requests.get(url, timeout=10, proxies=proxies)
 
-        return Response(response_text, content_type="application/xml; charset=utf-8")
+            r.encoding = "windows-1251" if "windows-1251" in r.headers.get("content-type",
-    except Exception as e:
+                                                                           "").lower() else r.apparent_encoding
-        return f"Error: {e}", 500
+            response_text = r.text.replace('<?xml version="1.0" encoding="windows-1251"?>',
+                                           '<?xml version="1.0" encoding="UTF-8"?>')
+
+            return Response(response_text, content_type="application/xml; charset=utf-8")
+        except Exception as e:
+            return f"Error: {e}", 500

proxy/test.py

@@ -1,18 +1,20 @@
 import requests
 import sys
 
+
 def check_health(url="http://localhost:5050/health"):
     try:
         response = requests.get(url, timeout=10)
         if response.status_code == 200:
             print("Health check passed")
-            sys.exit(0)  # Успешная проверка
+            sys.exit(0)
         else:
             print(f"Health check failed: {response.status_code}")
-            sys.exit(1)  # Ошибка
+            sys.exit(1)
     except requests.exceptions.RequestException as e:
         print(f"Health check failed: {e}")
-        sys.exit(1)  # Ошибка
+        sys.exit(1)
+
 
 if __name__ == "__main__":
     check_health()

tests/test_app.py

@@ -1,11 +1,12 @@
 import unittest
-from proxy import app
+from unittest.mock import patch, MagicMock
-
+from proxy import proxy_app
 
 class FlaskTestCase(unittest.TestCase):
 
     def setUp(self):
         """Set up for tests: create a test client."""
+        app = proxy_app()
         self.app = app.test_client()
         self.app.testing = True
 
@@ -13,12 +14,37 @@ class FlaskTestCase(unittest.TestCase):
         """Check health endpoint."""
         response = self.app.get('/health')
         self.assertEqual(response.status_code, 200)
-        self.assertIn(b'healthy', response.data)
+        self.assertEqual(response.data, b'healthy')
 
-    def test_proxy(self):
+    @patch("proxy.rss_proxy.requests.get")
-        """Test RSS proxying."""
+    def test_proxy_success(self, mock_get):
-        # Sample URL for proxying
+        """Test successful RSS proxying."""
-        url = 'http://example.com/rss'
+        mock_response = MagicMock()
-        response = self.app.get(f'/proxy?url={url}')
+        mock_response.status_code = 200
+        mock_response.headers = {"content-type": "text/xml; charset=windows-1251"}
+        mock_response.text = '<?xml version="1.0" encoding="windows-1251"?><rss></rss>'
+        mock_response.apparent_encoding = "windows-1251"
+        mock_get.return_value = mock_response
+
+        response = self.app.get('/proxy?url=https://example.com/rss.xml')
         self.assertEqual(response.status_code, 200)
-        self.assertIn(b'<?xml', response.data)  # Check for XML response
+        self.assertIn(b'<?xml version="1.0" encoding="UTF-8"?>', response.data)  # Проверка перекодировки
+
+    @patch("proxy.rss_proxy.requests.get")
+    def test_proxy_missing_url(self, mock_get):
+        """Test proxy request without URL parameter."""
+        response = self.app.get('/proxy')
+        self.assertEqual(response.status_code, 400)
+        self.assertIn(b'Missing URL', response.data)
+
+    @patch("proxy.rss_proxy.requests.get")
+    def test_proxy_request_failure(self, mock_get):
+        """Test RSS proxy failure when request fails."""
+        mock_get.side_effect = Exception("Request failed")
+
+        response = self.app.get('/proxy?url=https://example.com/rss.xml')
+        self.assertEqual(response.status_code, 500)
+        self.assertIn(b'Error: Request failed', response.data)
+
+if __name__ == '__main__':
+    unittest.main()