From ba6064c3781672475f685ff0da6678435d19b97d Mon Sep 17 00:00:00 2001 From: imnyang Date: Wed, 11 Jun 2025 22:28:47 +0900 Subject: [PATCH 1/3] HotFix Running Backend --- main.py | 30 ++++++++++++++++-------------- runner/backend/__init__.py | 2 +- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/main.py b/main.py index cd9f6bb..de4bca7 100644 --- a/main.py +++ b/main.py @@ -1,21 +1,23 @@ from runner.proxy import run_proxy -import subprocess import threading +import uvicorn +from runner.backend import app + +def run_fastapi_server(): + """FastAPI 서버를 실행하는 함수""" + uvicorn.run(app, host="localhost", port=11081, log_level="info") if __name__ == "__main__": - # Start web server in a separate thread - server_process = subprocess.Popen([ - "granian", - "--interface", "asgi", - "--host", "0.0.0.0", - "--port", "11081", - "--loop", "asyncio", - "--reload", - "runner.backend:app", - ]) - try: - # Run mitmdump proxy + # FastAPI 서버를 백그라운드 스레드에서 실행 + fastapi_thread = threading.Thread(target=run_fastapi_server, daemon=True) + fastapi_thread.start() + print("🚀 FastAPI server started on http://localhost:11081") + + # Run mitmdump proxy (메인 스레드에서 실행) + print("🛡️ Starting mitmdump proxy on port 11080...") run_proxy() + except KeyboardInterrupt: + print("🛑 Shutting down...") finally: - server_process.terminate() \ No newline at end of file + print("✅ Mitmdump proxy has been stopped.") \ No newline at end of file diff --git a/runner/backend/__init__.py b/runner/backend/__init__.py index 9af9555..4b60e63 100644 --- a/runner/backend/__init__.py +++ b/runner/backend/__init__.py @@ -20,4 +20,4 @@ async def not_found_handler(request, exc): @app.exception_handler(405) async def method_not_allowed_handler(request, exc): - return Response(status_code=405) \ No newline at end of file + return Response(status_code=405) From db514172dc6d2c0e318e0117ad328bb748670869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=95=94=EB=83=A5=20=28imnyang=29?= Date: Wed, 11 Jun 2025 22:31:16 +0900 Subject: [PATCH 2/3] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ef8184..fab57aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,10 +13,10 @@ jobs: python-version: [3.13] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Install uv - uses: astral-sh/setup-uv@v4 + uses: astral-sh/setup-uv@v6 with: enable-cache: true cache-dependency-glob: "uv.lock" From 12d0ed73ffda2fd1de2f3ad3867faa23d316b2b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=95=94=EB=83=A5=20=28imnyang=29?= Date: Wed, 11 Jun 2025 22:32:07 +0900 Subject: [PATCH 3/3] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fab57aa..32a975c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: python-version: [3.13] steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v4 - name: Install uv uses: astral-sh/setup-uv@v6