IoSL/service-aware-frontend
3
0
Fork 0
generated from Luis/nextjs-python-web-template
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added broadcaster dependency

Browse Source
This commit is contained in:
Luis-Hebendanz
2023-11-20 19:45:47 +01:00
parent fe81b59e36
commit 026b1a314a
8 changed files with 125 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/clan-cli/.vscode/settings.json vendored
View File

@@ -18,5 +18,5 @@
"python.linting.mypyPath": "mypy",
"python.linting.mypyEnabled": true,
"python.linting.enabled": true,
"python.defaultInterpreterPath": "python"
"python.defaultInterpreterPath": "/nix/store/k34qdl5397mwg3k00jsl3xcynij7n0z9-python3-3.11.6-env/bin/python"
}

6
pkgs/clan-cli/clan_cli/webui/app.py
View File

@@ -8,7 +8,7 @@ from fastapi.staticfiles import StaticFiles
from ..errors import ClanError
from .assets import asset_path
from .error_handlers import clan_error_handler
from .routers import health, root
from .routers import health, root, socket_manager
origins = [
"http://localhost:3000",
@@ -29,9 +29,11 @@ def setup_app() -> FastAPI:
app.include_router(health.router)
app.include_router(socket_manager.router)
# Needs to be last in register. Because of wildcard route
app.include_router(root.router)
app.add_exception_handler(ClanError, clan_error_handler)
app.add_exception_handler(ClanError, clan_error_handler) # type: ignore
app.mount("/static", StaticFiles(directory=asset_path()), name="static")

79
pkgs/clan-cli/clan_cli/webui/routers/socket_manager.py Normal file
View File

@@ -0,0 +1,79 @@
from fastapi import FastAPI, WebSocket, WebSocketDisconnect
from fastapi.responses import HTMLResponse
from fastapi import APIRouter, Response
router = APIRouter()
html = """
<!DOCTYPE html>
<html>
<head>
<title>Chat</title>
</head>
<body>
<h1>WebSocket Chat</h1>
<h2>Your ID: <span id="ws-id"></span></h2>
<form action="" onsubmit="sendMessage(event)">
<input type="text" id="messageText" autocomplete="off"/>
<button>Send</button>
</form>
<ul id='messages'>
</ul>
<script>
var client_id = Date.now()
document.querySelector("#ws-id").textContent = client_id;
var ws = new WebSocket(`ws://localhost:2979/ws/${client_id}`);
ws.onmessage = function(event) {
var messages = document.getElementById('messages')
var message = document.createElement('li')
var content = document.createTextNode(event.data)
message.appendChild(content)
messages.appendChild(message)
};
function sendMessage(event) {
var input = document.getElementById("messageText")
ws.send(input.value)
input.value = ''
event.preventDefault()
}
</script>
</body>
</html>
"""
class ConnectionManager:
def __init__(self) -> None:
self.active_connections: list[WebSocket] = []
async def connect(self, websocket: WebSocket) -> None:
await websocket.accept()
self.active_connections.append(websocket)
def disconnect(self, websocket: WebSocket) -> None:
self.active_connections.remove(websocket)
async def send_personal_message(self, message: str, websocket: WebSocket) -> None:
await websocket.send_text(message)
async def broadcast(self, message: str) -> None:
for connection in self.active_connections:
await connection.send_text(message)
manager = ConnectionManager()
@router.get("/ws_example")
async def get() -> HTMLResponse:
return HTMLResponse(html)
@router.websocket("/ws/{client_id}")
async def websocket_endpoint(websocket: WebSocket, client_id: int) -> None:
await manager.connect(websocket)
try:
while True:
data = await websocket.receive_text()
await manager.send_personal_message(f"You wrote: {data}", websocket)
await manager.broadcast(f"Client #{client_id} says: {data}")
except WebSocketDisconnect:
manager.disconnect(websocket)
await manager.broadcast(f"Client #{client_id} left the chat")

4
pkgs/clan-cli/default.nix
View File

@@ -36,6 +36,8 @@
, mypy
, sqlalchemy
, websockets
, deal
, broadcaster
}:
let
@@ -45,6 +47,8 @@ let
uvicorn # optional dependencies: if not enabled, webui subcommand will not work
sqlalchemy
websockets
broadcaster
deal
];
pytestDependencies = runtimeDependencies ++ dependencies ++ [

4
pkgs/clan-cli/flake-module.nix
View File

@@ -1,6 +1,6 @@
{ inputs, ... }:
{
perSystem = { self', pkgs, ... }: {
perSystem = { self', pkgs, system, ... }: {
devShells.clan-cli = pkgs.callPackage ./shell.nix {
inherit (self'.packages) clan-cli ui-assets nix-unit;
};
@@ -8,6 +8,8 @@
clan-cli = pkgs.python3.pkgs.callPackage ./default.nix {
inherit (self'.packages) ui-assets;
inherit (inputs) nixpkgs;
inherit (inputs.nixpkgs-for-iosl.legacyPackages.${system}.python3Packages) deal;
inherit (inputs.nixpkgs-for-iosl.legacyPackages.${system}.python3Packages) broadcaster;
};
inherit (self'.packages.clan-cli) clan-openapi;
default = self'.packages.clan-cli;

48
pkgs/nix-unit/default.nix
View File

@@ -1,43 +1,9 @@
{ stdenv
, lib
, nixVersions
, fetchFromGitHub
, nlohmann_json
, boost
, meson
, pkg-config
, ninja
, cmake
, clang-tools
}:
stdenv.mkDerivation {
pname = "nix-unit";
version = "0.1";
src = fetchFromGitHub {
owner = "adisbladis";
repo = "nix-unit";
rev = "3ed2378bddad85257fc508a291408f9ed9673d01";
sha256 = "sha256-HvMq0TJGYSx37zHm4j2d+JUZx4/6X7xKEt/0DeCiwjQ=";
{ callPackage }:
let
nix-unit-src = builtins.fetchGit {
url = "https://github.com/adisbladis/nix-unit";
rev = "7e2ee1c70f930b9b65b9fc33c3f3eca0dfae00d1";
};
buildInputs = [
nlohmann_json
nixVersions.stable
boost
];
nativeBuildInputs = [
meson
pkg-config
ninja
# nlohmann_json can be only discovered via cmake files
cmake
] ++ (lib.optional stdenv.cc.isClang [ clang-tools ]);
in
callPackage nix-unit-src { }
meta = {
description = "Nix unit test runner";
homepage = "https://github.com/adisbladis/nix-unit";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ adisbladis ];
platforms = lib.platforms.unix;
};
}