merged-dev

.gitignore

@@ -128,9 +128,6 @@ dmypy.json
 .idea
 temp.*
 
-# Debug
-DEBUG.log
-
 discours.key
 discours.crt
 discours.pem
@@ -165,6 +162,5 @@ views.json
 *.crt
 *cache.json
 .cursor
-.devcontainer/
 
 node_modules/

main.py

@@ -18,6 +18,7 @@ from auth.middleware import AuthMiddleware, auth_middleware
 from auth.oauth import oauth_callback, oauth_login
 from cache.precache import precache_data
 from cache.revalidator import revalidation_manager
+from services.exception import ExceptionHandlerMiddleware
 from services.redis import redis
 from services.schema import create_all_tables, resolvers
 from services.search import check_search_service, initialize_search_index_background, search_service
@@ -223,6 +224,19 @@ async def lifespan(app: Starlette):
         print("[lifespan] Shutdown complete")
 
 
+middleware = [
+    # Начинаем с обработки ошибок
+    Middleware(ExceptionHandlerMiddleware),
+    # CORS должен быть перед другими middleware для корректной обработки preflight-запросов
+    Middleware(
+        CORSMiddleware,
+        allow_origins=["https://localhost:3000", "https://testing.discours.io", "https://testing3.discours.io"],
+        allow_methods=["GET", "POST", "OPTIONS"],  # Явно указываем OPTIONS
+        allow_headers=["*"],
+        allow_credentials=True,
+    ),
+]
+
 # Обновляем маршрут в Starlette
 app = Starlette(
     routes=[
@@ -232,8 +246,8 @@ app = Starlette(
         Route("/oauth/{provider}/callback", oauth_callback, methods=["GET"]),
         Mount("/", app=StaticFiles(directory=str(DIST_DIR), html=True)),
     ],
+    middleware=middleware,
     lifespan=lifespan,
-    middleware=middleware,  # Явно указываем список middleware
     debug=True,
 )
 

nginx.conf.sigil

@@ -1,3 +1,7 @@
+log_format custom '$remote_addr - $remote_user [$time_local] "$request" '
+                  'origin=$http_origin status=$status '
+                  '"$http_referer" "$http_user_agent"';
+
 {{ $proxy_settings := "proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $http_connection; proxy_set_header Host $http_host; proxy_set_header X-Request-Start $msec;" }}
 {{ $gzip_settings := "gzip on; gzip_min_length  1100; gzip_buffers  4 32k; gzip_types text/css text/javascript text/xml text/plain text/x-component application/javascript application/x-javascript application/json application/xml application/rss+xml font/truetype application/x-font-ttf font/opentype application/vnd.ms-fontobject image/svg+xml; gzip_vary on; gzip_comp_level  6;" }}
 
@@ -17,17 +21,19 @@ server {
         listen [::]:{{ $listen_port }};
         listen {{ $listen_port }};
         server_name {{ $.NOSSL_SERVER_NAME }};
-
-        # Redirect HTTP to HTTPS
-        return 301 https://$server_name$request_uri;
+        access_log  /var/log/nginx/{{ $.APP }}-access.log custom;
+        error_log   /var/log/nginx/{{ $.APP }}-error.log;
+        client_max_body_size 100M;
 
     {{ else if eq $scheme "https" }}
         listen [::]:{{ $listen_port }} ssl http2;
         listen {{ $listen_port }} ssl http2;
         server_name {{ $.NOSSL_SERVER_NAME }};
+        access_log  /var/log/nginx/{{ $.APP }}-access.log custom;
+        error_log   /var/log/nginx/{{ $.APP }}-error.log;
         ssl_certificate {{ $.APP_SSL_PATH }}/server.crt;
         ssl_certificate_key {{ $.APP_SSL_PATH }}/server.key;
-        ssl_protocols TLSv1.2 TLSv1.3;
+        ssl_protocols             TLSv1.2 TLSv1.3;
         ssl_prefer_server_ciphers off;
 
         keepalive_timeout   70;
@@ -60,6 +66,35 @@ server {
         add_header Cache-Control "public, no-transform";
     }
 
+    location ~* \.(mp3|wav|ogg|flac|aac|aif|webm)$ {
+        proxy_pass  http://{{ $.APP }}-{{ $upstream_port }};
+    }
+
+
+    error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /400-error.html;
+  location /400-error.html {
+    root /var/lib/dokku/data/nginx-vhosts/dokku-errors;
+    internal;
+  }
+
+  error_page 404 /404-error.html;
+  location /404-error.html {
+    root /var/lib/dokku/data/nginx-vhosts/dokku-errors;
+    internal;
+  }
+
+  error_page 500 501 503 504 505 506 507 508 509 510 511 /500-error.html;
+  location /500-error.html {
+    root /var/lib/dokku/data/nginx-vhosts/dokku-errors;
+    internal;
+  }
+
+  error_page 502 /502-error.html;
+  location /502-error.html {
+    root /var/lib/dokku/data/nginx-vhosts/dokku-errors;
+    internal;
+  }
+
   include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf;
 }
 {{ end }}