Added broadcaster dependency

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696343447,
-        "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
+        "lastModified": 1698882062,
+        "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
+        "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1697059129,
-        "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
+        "lastModified": 1700390070,
+        "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
+        "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb",
         "type": "github"
       },
       "original": {
@@ -56,11 +56,28 @@
         "type": "github"
       }
     },
+    "nixpkgs-for-iosl": {
+      "locked": {
+        "lastModified": 1700505490,
+        "narHash": "sha256-MLF5dkExensQoByZCmsR/kdcwZoaY/j6/ctSvmQHBJc=",
+        "owner": "Luis-Hebendanz",
+        "repo": "nixpkgs",
+        "rev": "5f9d94794badee6fcb3230ccea75628a802baeab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Luis-Hebendanz",
+        "ref": "iosl",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
         "floco": "floco",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-for-iosl": "nixpkgs-for-iosl",
         "treefmt-nix": "treefmt-nix"
       }
     },
@@ -71,11 +88,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1695822946,
-        "narHash": "sha256-IQU3fYo0H+oGlqX5YrgZU3VRhbt2Oqe6KmslQKUO4II=",
+        "lastModified": 1699786194,
+        "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "720bd006d855b08e60664e4683ccddb7a9ff614a",
+        "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1",
         "type": "github"
       },
       "original": {

flake.nix

@@ -7,6 +7,7 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     floco.url = "github:aakropotkin/floco";
     floco.inputs.nixpkgs.follows = "nixpkgs";
+    nixpkgs-for-iosl.url = "github:Luis-Hebendanz/nixpkgs/iosl";
     flake-parts.url = "github:hercules-ci/flake-parts";
     flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
     treefmt-nix.url = "github:numtide/treefmt-nix";

pkgs/clan-cli/.vscode/settings.json

@@ -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"
 }

pkgs/clan-cli/clan_cli/webui/app.py

@@ -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")
 

pkgs/clan-cli/clan_cli/webui/routers/socket_manager.py

@@ -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")

pkgs/clan-cli/default.nix

@@ -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 ++ [

pkgs/clan-cli/flake-module.nix

@@ -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;

pkgs/nix-unit/default.nix

@@ -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;
-  };
-}