Merge pull request #109 from nebulabroadcast/ts-migration

Switch to typescript

Author: martastain

Dockerfile

@@ -1,23 +1,27 @@
 FROM node:latest AS build
 
-RUN mkdir /frontend
+WORKDIR /frontend
 
-COPY ./frontend/index.html /frontend/index.html
-COPY ./frontend/package.json /frontend/package.json
-COPY ./frontend/vite.config.js /frontend/vite.config.js
-COPY ./frontend/src /frontend/src
+COPY ./frontend/index.html .
+COPY ./frontend/package.json .
+COPY ./frontend/vite.config.ts .
+COPY ./frontend/tsconfig.json .
+COPY ./frontend/tsconfig.node.json .
 COPY ./frontend/public /frontend/public
 
-WORKDIR /frontend
-RUN yarn install && yarn build
+RUN yarn install
+COPY ./frontend/src /frontend/src
+RUN yarn build
 
 FROM python:3.12-slim
 ENV PYTHONBUFFERED=1
 
 RUN \
   apt-get update \
   && apt-get -yqq install \
+  curl \
   cifs-utils \
+  procps \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 

Makefile

@@ -11,7 +11,7 @@ check:
 		uv run ruff check --fix . && \
 		uv run mypy .
 
-build: check
+build:
 	docker build -t $(IMAGE_NAME) .
 
 dist: build

backend/api/init/init_request.py

@@ -9,7 +9,7 @@
 from nebula.settings.common import LanguageCode
 from server.context import ScopedEndpoint, server_context
 from server.dependencies import CurrentUserOptional
-from server.models import ResponseModel
+from server.models import ResponseModel, UserModel
 from server.request import APIRequest
 
 from .client_settings import ClientSettingsModel, get_client_settings
@@ -33,9 +33,9 @@ class InitResponseModel(ResponseModel):
     ] = None
 
     user: Annotated[
-        dict[str, Any] | None,
+        UserModel | None,
         Field(
-            title="User data",
+            title="Current user",
             description="User data if user is logged in",
         ),
     ] = None
@@ -85,7 +85,7 @@ class InitRequest(APIRequest):
     """
 
     name = "init"
-    title = "Login"
+    title = "Init"
     response_model = InitResponseModel
 
     async def handle(
@@ -127,10 +127,12 @@ async def handle(
         client_settings.server_url = f"{request.url.scheme}://{request.url.netloc}"
         plugins = get_frontend_plugins()
 
+        # Return response
+
         return InitResponseModel(
             installed=True,
             motd=motd,
-            user=user.meta,
+            user=UserModel.from_meta(user.meta),
             settings=client_settings,
             frontend_plugins=plugins,
             scoped_endpoints=server_context.scoped_endpoints,

backend/api/proxy.py

@@ -21,7 +21,7 @@ def get_file_size(file_name: str) -> int:
     return os.stat(file_name).st_size
 
 
-async def get_bytes_range(file_name: str, start: int, end: int) -> bytes:
+async def get_bytes_range2(file_name: str, start: int, end: int) -> bytes:
     """Get a range of bytes from a file"""
     async with aiofiles.open(file_name, mode="rb") as f:
         await f.seek(start)
@@ -30,6 +30,33 @@ async def get_bytes_range(file_name: str, start: int, end: int) -> bytes:
         return await f.read(read_size)
 
 
+async def get_bytes_range(
+    file_name: str, start: int, end: int, request: Request
+) -> bytes:
+    """Get a range of bytes from a file"""
+    async with aiofiles.open(file_name, mode="rb") as f:
+        await f.seek(start)
+        pos = start
+        read_size = end - pos + 1
+        chunk_size = 1024 * 64  # Read in chunks of 64KB
+        data = bytearray()
+
+        while read_size > 0:
+            if await request.is_disconnected():
+                raise HTTPException(
+                    status_code=status.HTTP_499_CLIENT_CLOSED_REQUEST,
+                    detail="Client disconnected",
+                )
+
+            chunk = await f.read(min(chunk_size, read_size))
+            if not chunk:
+                break
+            data.extend(chunk)
+            read_size -= len(chunk)
+
+        return bytes(data)
+
+
 def _get_range_header(range_header: str, file_size: int) -> tuple[int, int]:
     """
     Parse the Range header to determine the start and end byte positions.
@@ -114,7 +141,7 @@ async def range_requests_response(
         else:
             status_code = status.HTTP_206_PARTIAL_CONTENT
 
-    payload = await get_bytes_range(file_path, start, end)
+    payload = await get_bytes_range(file_path, start, end, request)
 
     if status_code == status.HTTP_200_OK:
         headers["cache-control"] = "private, max-age=600"

backend/api/sessions/invalidate_session_request.py

@@ -19,7 +19,7 @@ class InvalidateSessionRequest(APIRequest):
     used to log out other users.
     """
 
-    name = "invalidate_session"
+    name = "invalidate-session"
     title = "Invalidate session"
     responses = [204]
 

backend/api/sessions/list_sessions_request.py

@@ -14,7 +14,7 @@ class ListSessionsRequestModel(RequestModel):
 class ListSessionsRequest(APIRequest):
     """List user sessions."""
 
-    name = "sessions"
+    name = "list-sessions"
     title = "List sessions"
 
     async def handle(

backend/api/users/list_users_request.py

@@ -2,11 +2,9 @@
 
 import nebula
 from server.dependencies import CurrentUser
-from server.models import ResponseModel
+from server.models import ResponseModel, UserModel
 from server.request import APIRequest
 
-from .user_model import UserModel
-
 
 class ListUsersResponseModel(ResponseModel):
     """Response model for listing users"""
@@ -17,7 +15,7 @@ class ListUsersResponseModel(ResponseModel):
 class ListUsersRequest(APIRequest):
     """Get a list of users"""
 
-    name = "user_list"
+    name = "list-users"
     title = "Get user list"
     response_model = ListUsersResponseModel
 
@@ -26,22 +24,8 @@ async def handle(self, user: CurrentUser) -> ListUsersResponseModel:
             raise nebula.ForbiddenException("You are not allowed to list users")
 
         query = "SELECT meta FROM users ORDER BY login ASC"
-
         users = []
         async for row in nebula.db.iterate(query):
-            meta = {}
-            for key, value in row["meta"].items():
-                if key == "api_key_preview":
-                    continue
-                if key == "api_key":
-                    meta[key] = row["meta"].get("api_key_preview", "*****")
-                elif key == "password":
-                    continue
-                elif key.startswith("can/"):
-                    meta[key.replace("can/", "can_")] = value
-                else:
-                    meta[key] = value
-
-            users.append(UserModel(**meta))
+            users.append(UserModel.from_meta(row["meta"]))
 
         return ListUsersResponseModel(users=users)

backend/api/users/save_user_request.py

@@ -2,17 +2,16 @@
 
 import nebula
 from server.dependencies import CurrentUser
+from server.models import UserModel
 from server.request import APIRequest
 from server.session import Session
 
-from .user_model import UserModel
-
 
 class SaveUserRequest(APIRequest):
     """Save user data"""
 
-    name = "save_user"
-    title = "Save user data"
+    name = "save-user"
+    title = "Save user"
     responses = [204, 201]
 
     async def handle(self, current_user: CurrentUser, payload: UserModel) -> Response:
@@ -21,16 +20,15 @@ async def handle(self, current_user: CurrentUser, payload: UserModel) -> Respons
         if not current_user.is_admin:
             raise nebula.ForbiddenException("You are not allowed to edit users")
 
-        meta = payload.dict()
+        meta = payload.model_dump()
         meta.pop("id", None)
 
         password = meta.pop("password", None)
         api_key = meta.pop("api_key", None)
+        permissions = meta.pop("permissions", {})
 
-        for key, value in list(meta.items()):
-            if key.startswith("can_"):
-                meta[key.replace("can_", "can/")] = value
-                del meta[key]
+        for key, value in permissions.items():
+            meta[f"can/{key}"] = value
 
         if new_user:
             user = nebula.User.from_meta(meta)