Add automated test suite with WebSocket client, CI/CD workflow, restructure source code, and fix server initialization bugs

.github/workflows/README.md

@@ -0,0 +1,24 @@
+# GitHub Actions Workflows
+
+## test.yml - Automated Testing
+
+This workflow runs the pytest test suite automatically when:
+- Code is pushed to any branch
+- A pull request is opened or updated
+
+### What it does:
+1. Sets up a Python environment (tests on Python 3.13 and 3.14)
+2. Installs project dependencies and test requirements
+3. Creates necessary directories for the server
+4. Runs the full test suite with pytest
+5. Uploads test results and logs as artifacts (retained for 7 days)
+
+### Configuration:
+- **Timeout**: 10 minutes per test run
+- **Matrix testing**: Tests across Python 3.13 and 3.14
+- **Artifacts**: Test cache and server logs are uploaded for debugging
+
+### Viewing Results:
+- Check the "Actions" tab in the GitHub repository
+- Test results will show pass/fail status for each Python version
+- Download artifacts to review detailed logs if tests fail

.github/workflows/test.yml

@@ -0,0 +1,52 @@
+name: Run Tests
+
+on:
+  push:
+    branches: [ "**" ]
+  pull_request:
+    branches: [ "**" ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        python-version: ["3.13", "3.14"]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Set up uv
+      run: |
+        python -m pip install --upgrade pip
+        pip install uv
+
+    - name: Install dependencies
+      run: |
+        uv sync --dev
+
+    - name: Create necessary directories
+      run: |
+        mkdir -p src/content/ssl
+        mkdir -p src/content/logs
+
+    - name: Run tests with pytest
+      run: |
+        uv run pytest tests/ -v --tb=short
+      timeout-minutes: 10
+
+    - name: Upload test results
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: test-results-py${{ matrix.python-version }}
+        path: |
+          .pytest_cache/
+          src/content/logs/
+        retention-days: 7

.gitignore

@@ -46,8 +46,9 @@ app*.db
 admin_password.txt
 config.toml
 
-content/ssl/
-content/files/
-content/logs/*
+src/content/ssl/
+src/content/files/
+src/content/logs/*
 
-.idea
+.idea
+uv.lock

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "certtools"]
-	path = certtools
+[submodule "src/certtools"]
+	path = src/certtools
 	url = https://github.com/creeper19472/cfms_certtools

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    // 使用 IntelliSense 了解相关属性。 
+    // 悬停以查看现有属性的描述。
+    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+
+        {
+            "name": "Python 调试程序: 当前文件",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal",
+            "cwd": "${workspaceFolder}/src"
+        }
+    ]
+}

README.md

@@ -17,6 +17,23 @@ comments as the primary reference.
 
 [doc-url]: https://cfms-server-doc.readthedocs.io/zh_CN/latest
 
+## Testing
+
+This repository includes an automated test suite built with pytest. To run the tests:
+
+```bash
+# Install dependencies
+uv sync --dev
+
+# Run all tests
+uv run pytest
+
+# Run specific test files
+uv run pytest tests/test_basic.py
+```
+
+For more information about the test suite, see [tests/README.md](tests/README.md).
+
 ## Alpha Test
 
 This is a project that is under active development and we are looking 

pyproject.toml

@@ -0,0 +1,22 @@
+[project]
+name = "cfms-on-websocket"
+version = "0.1.0"
+description = "The server-side program for CFMS on WebSocket, a WebSocket-based implementation of the CFMS protocol."
+readme = "README.md"
+requires-python = ">=3.14"
+dependencies = [
+    "cryptography>=46.0.3",
+    "filetype>=1.2.0",
+    "jsonschema>=4.25.1",
+    "pycryptodome>=3.23.0",
+    "pyjwt>=2.10.1",
+    "sqlalchemy>=2.0.44",
+    "tomlkit>=0.13.3",
+    "websockets>=15.0.1",
+]
+
+[dependency-groups]
+dev = [
+    "pytest>=8.0.0",
+    "pytest-asyncio>=0.21.0",
+]

pytest.ini

@@ -0,0 +1,27 @@
+[tool:pytest]
+# Pytest configuration
+testpaths = tests
+python_files = test_*.py
+python_classes = Test*
+python_functions = test_*
+
+# Output settings
+addopts = 
+    -v
+    --tb=short
+    --strict-markers
+    --disable-warnings
+
+# Markers
+markers =
+    slow: marks tests as slow (deselect with '-m "not slow"')
+    integration: marks tests as integration tests
+    unit: marks tests as unit tests
+
+# Timeout for tests (in seconds)
+timeout = 300
+
+# Coverage settings (if pytest-cov is installed)
+# --cov=include
+# --cov-report=html
+# --cov-report=term-missing

include/handlers/directory.py → src/include/handlers/directory.py

@@ -34,18 +34,17 @@ class RequestListDirectoryHandler(RequestHandler):
         "additionalProperties": False,
     }
 
+    require_auth = True
+
     def handle(self, handler: ConnectionHandler):
 
         # Parse the directory listing request
         folder_id: Optional[str] = handler.data.get("folder_id")
 
         with Session() as session:
             this_user = session.get(User, handler.username)
-            if not this_user or not this_user.is_token_valid(handler.token):
-                handler.conclude_request(
-                    **{"code": 401, "message": "Invalid user or token", "data": {}}
-                )
-                return 401, folder_id
+            assert this_user is not None
+
             if not folder_id:
                 parent = None
                 children = (
@@ -277,6 +276,8 @@ class RequestCreateDirectoryHandler(RequestHandler):
         "required": ["name"],
     }
 
+    require_auth = True
+
     def handle(self, handler: ConnectionHandler):
 
         # Parse the directory creation request
@@ -289,11 +290,8 @@ def handle(self, handler: ConnectionHandler):
 
         with Session() as session:
             this_user = session.get(User, handler.username)
-            if not this_user or not this_user.is_token_valid(handler.token):
-                handler.conclude_request(
-                    **{"code": 403, "message": "Invalid user or token", "data": {}}
-                )
-                return 401, parent_id, handler.username
+            assert this_user is not None  # require_auth ensures this
+
             if parent_id:
                 parent = session.get(Folder, parent_id)
                 if not parent:

include/handlers/document.py → src/include/handlers/document.py

@@ -54,7 +54,6 @@ def create_file_task(file: File, transfer_mode: int = 0):
         if not file:
             return None
 
-
         now = time.time()
         task = FileTask(
             file_id=file.id,
@@ -84,6 +83,8 @@ class RequestGetDocumentInfoHandler(RequestHandler):
         "required": ["document_id"],
     }
 
+    require_auth = True
+
     def handle(self, handler: ConnectionHandler):
 
         document_id = handler.data.get("document_id")
@@ -92,23 +93,23 @@ def handle(self, handler: ConnectionHandler):
             handler.conclude_request(400, {}, "Document ID is required")
             return
 
-        if not handler.username:
-            handler.conclude_request(
-                **{"code": 403, "message": "Authentication is required", "data": {}}
-            )
-            return 401, document_id
-
         with Session() as session:
             user = session.get(User, handler.username)
-            document = session.get(Document, document_id)
+            assert user is not None
 
-            if user is None or not user.is_token_valid(handler.token):
-                handler.conclude_request(403, {}, "Invalid user or token")
-                return 401, document_id
+            document = session.get(Document, document_id)
 
             if not document:
                 handler.conclude_request(404, {}, "Document not found")
                 return 404, document_id, handler.username
+
+            try:
+                document.get_latest_revision()
+            except NoActiveRevisionsError:
+                handler.conclude_request(
+                    404, {}, "No active revisions found for this document"
+                )
+                return 404, document_id, handler.username
 
             if not document.check_access_requirements(user, access_type="read"):
                 handler.conclude_request(403, {}, "Permission denied")
@@ -202,16 +203,15 @@ class RequestGetDocumentHandler(RequestHandler):
         "additionalProperties": False,
     }
 
+    require_auth = True
+
     def handle(self, handler: ConnectionHandler):
         document_id: str = handler.data["document_id"]
 
         with Session() as session:
             user = session.get(User, handler.username)
             document = session.get(Document, document_id)
-
-            if user is None or not user.is_token_valid(handler.token):
-                handler.conclude_request(403, {}, "Invalid user or token")
-                return 401, document_id
+            assert user is not None
 
             if not document:
                 handler.conclude_request(404, {}, "Document not found")
@@ -255,6 +255,8 @@ class RequestCreateDocumentHandler(RequestHandler):
         "additionalProperties": False,
     }
 
+    require_auth = True
+
     def handle(self, handler: ConnectionHandler):
 
         folder_id: str = handler.data.get("folder_id", "")
@@ -266,15 +268,12 @@ def handle(self, handler: ConnectionHandler):
 
         with Session() as session:
             user = session.get(User, handler.username)
+            assert user is not None
 
             if not document_title:
                 handler.conclude_request(400, {}, "Document title is required")
                 return
 
-            if not user or not user.is_token_valid(handler.token):
-                handler.conclude_request(403, {}, "Invalid user or token")
-                return 401, folder_id
-
             # 由于之后的逻辑可能提前结束，必须在实质性操作发生前鉴权
             if not "create_document" in user.all_permissions:
                 handler.conclude_request(403, {}, "Permission denied")
@@ -363,7 +362,9 @@ def handle(self, handler: ConnectionHandler):
                     new_document_revision.file, transfer_mode=1
                 )
                 handler.conclude_request(
-                    200, {"task_data": task_data}, "Task successfully created"
+                    200,
+                    {"document_id": new_document.id, "task_data": task_data},
+                    "Task successfully created",
                 )
                 return 0, folder_id, {"title": document_title}, handler.username
             else: