0xb00b5/firegex-traffic-viewer
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated changes from main branch

Browse Source
This commit is contained in:
Domingo Dirutigliano
2023-06-05 09:22:11 +02:00
parent 0430cb3773
commit 2e65d803a2
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -21,6 +21,7 @@
/backend/modules/cppqueue /backend/modules/cppqueue
/backend/modules/proxy /backend/modules/proxy
docker-compose.yml docker-compose.yml
firegex-compose.yml
# misc # misc
**/.DS_Store **/.DS_Store

4
Dockerfile
View File

@@ -3,9 +3,9 @@ RUN mkdir /app
WORKDIR /app WORKDIR /app
ADD ./frontend/package.json . ADD ./frontend/package.json .
ADD ./frontend/yarn.lock . ADD ./frontend/yarn.lock .
RUN yarn install RUN yarn install --network-timeout 300000
COPY ./frontend/ . COPY ./frontend/ .
RUN yarn build RUN yarn build --production=true
#Building main conteiner #Building main conteiner

1
README.md
View File

@@ -1,6 +1,5 @@
# 2.2.0 VERSION NEW TO IMPLEMENT # 2.2.0 VERSION NEW TO IMPLEMENT
- TODO: Need to fix mantine form validation - TODO: Need to fix mantine form validation
- TODO: Merge edits in the main branch to this branch
1. PCRE2 ---> HyperScan Streams (VectorScan for arm64 compatibility using debian Bookworm) 1. PCRE2 ---> HyperScan Streams (VectorScan for arm64 compatibility using debian Bookworm)
2. nfregex from c++ to rust 2. nfregex from c++ to rust
- https://crates.io/crates/hyperscan - https://crates.io/crates/hyperscan

6
backend/utils/loader.py
View File

@@ -14,7 +14,7 @@ REACT_HTML_PATH: str = os.path.join(REACT_BUILD_DIR,"index.html")
async def frontend_debug_proxy(path): async def frontend_debug_proxy(path):
httpc = httpx.AsyncClient() httpc = httpx.AsyncClient()
req = httpc.build_request("GET",f"http://127.0.0.1:{os.getenv('F_PORT','3000')}/"+path) req = httpc.build_request("GET",f"http://127.0.0.1:{os.getenv('F_PORT','5173')}/"+path)
resp = await httpc.send(req, stream=True) resp = await httpc.send(req, stream=True)
return StreamingResponse(resp.aiter_bytes(),status_code=resp.status_code) return StreamingResponse(resp.aiter_bytes(),status_code=resp.status_code)
@@ -38,7 +38,7 @@ def frontend_deploy(app):
@app.websocket("/ws") @app.websocket("/ws")
async def websocket_debug_proxy(ws: WebSocket): async def websocket_debug_proxy(ws: WebSocket):
await ws.accept() await ws.accept()
async with websockets.connect(f"ws://127.0.0.1:{os.getenv('F_PORT','3000')}/ws") as ws_b_client: async with websockets.connect(f"ws://127.0.0.1:{os.getenv('F_PORT','5173')}/ws") as ws_b_client:
fwd_task = asyncio.create_task(forward_websocket(ws, ws_b_client)) fwd_task = asyncio.create_task(forward_websocket(ws, ws_b_client))
rev_task = asyncio.create_task(reverse_websocket(ws, ws_b_client)) rev_task = asyncio.create_task(reverse_websocket(ws, ws_b_client))
await asyncio.gather(fwd_task, rev_task) await asyncio.gather(fwd_task, rev_task)
@@ -49,7 +49,7 @@ def frontend_deploy(app):
try: try:
return await frontend_debug_proxy(full_path) return await frontend_debug_proxy(full_path)
except Exception: except Exception:
return {"details":"Frontend not started at "+f"http://127.0.0.1:{os.getenv('F_PORT','3000')}"} return {"details":"Frontend not started at "+f"http://127.0.0.1:{os.getenv('F_PORT','5173')}"}
else: return await react_deploy(full_path) else: return await react_deploy(full_path)
def list_routers(): def list_routers():