Refactor 4 with bugfixes

2026-03-04 03:56:23 +01:00
parent be91b6dfe8
commit 0ed9ca93d3
51 changed files with 1552 additions and 996 deletions
--- a/server/src/routes/servers.ts
+++ b/server/src/routes/servers.ts
@@ -0,0 +1,159 @@
+import { Router } from 'express';
+import { v4 as uuidv4 } from 'uuid';
+import { ServerPayload, JoinRequestPayload } from '../cqrs/types';
+import {
+  getAllPublicServers,
+  getServerById,
+  upsertServer,
+  deleteServer,
+  createJoinRequest,
+  getPendingRequestsForServer
+} from '../cqrs';
+import { notifyServerOwner } from '../websocket/broadcast';
+
+const router = Router();
+
+router.get('/', async (req, res) => {
+  const { q, tags, limit = 20, offset = 0 } = req.query;
+
+  let results = await getAllPublicServers();
+
+  if (q) {
+    const search = String(q).toLowerCase();
+
+    results = results.filter(server =>
+      server.name.toLowerCase().includes(search) ||
+      server.description?.toLowerCase().includes(search)
+    );
+  }
+
+  if (tags) {
+    const tagList = String(tags).split(',');
+
+    results = results.filter(server => tagList.some(tag => server.tags.includes(tag)));
+  }
+
+  const total = results.length;
+
+  results = results.slice(Number(offset), Number(offset) + Number(limit));
+
+  res.json({ servers: results, total, limit: Number(limit), offset: Number(offset) });
+});
+
+router.post('/', async (req, res) => {
+  const { id: clientId, name, description, ownerId, ownerPublicKey, isPrivate, maxUsers, tags } = req.body;
+
+  if (!name || !ownerId || !ownerPublicKey)
+    return res.status(400).json({ error: 'Missing required fields' });
+
+  const server: ServerPayload = {
+    id: clientId || uuidv4(),
+    name,
+    description,
+    ownerId,
+    ownerPublicKey,
+    isPrivate: isPrivate ?? false,
+    maxUsers: maxUsers ?? 0,
+    currentUsers: 0,
+    tags: tags ?? [],
+    createdAt: Date.now(),
+    lastSeen: Date.now()
+  };
+
+  await upsertServer(server);
+  res.status(201).json(server);
+});
+
+router.put('/:id', async (req, res) => {
+  const { id } = req.params;
+  const { ownerId, ...updates } = req.body;
+  const existing = await getServerById(id);
+
+  if (!existing)
+    return res.status(404).json({ error: 'Server not found' });
+
+  if (existing.ownerId !== ownerId)
+    return res.status(403).json({ error: 'Not authorized' });
+
+  const server: ServerPayload = { ...existing, ...updates, lastSeen: Date.now() };
+
+  await upsertServer(server);
+  res.json(server);
+});
+
+router.post('/:id/heartbeat', async (req, res) => {
+  const { id } = req.params;
+  const { currentUsers } = req.body;
+  const existing = await getServerById(id);
+
+  if (!existing)
+    return res.status(404).json({ error: 'Server not found' });
+
+  const server: ServerPayload = {
+    ...existing,
+    lastSeen: Date.now(),
+    currentUsers: typeof currentUsers === 'number' ? currentUsers : existing.currentUsers
+  };
+
+  await upsertServer(server);
+  res.json({ ok: true });
+});
+
+router.delete('/:id', async (req, res) => {
+  const { id } = req.params;
+  const { ownerId } = req.body;
+  const existing = await getServerById(id);
+
+  if (!existing)
+    return res.status(404).json({ error: 'Server not found' });
+
+  if (existing.ownerId !== ownerId)
+    return res.status(403).json({ error: 'Not authorized' });
+
+  await deleteServer(id);
+  res.json({ ok: true });
+});
+
+router.post('/:id/join', async (req, res) => {
+  const { id: serverId } = req.params;
+  const { userId, userPublicKey, displayName } = req.body;
+  const server = await getServerById(serverId);
+
+  if (!server)
+    return res.status(404).json({ error: 'Server not found' });
+
+  const request: JoinRequestPayload = {
+    id: uuidv4(),
+    serverId,
+    userId,
+    userPublicKey,
+    displayName,
+    status: server.isPrivate ? 'pending' : 'approved',
+    createdAt: Date.now()
+  };
+
+  await createJoinRequest(request);
+
+  if (server.isPrivate)
+    notifyServerOwner(server.ownerId, { type: 'join_request', request });
+
+  res.status(201).json(request);
+});
+
+router.get('/:id/requests', async (req, res) => {
+  const { id: serverId } = req.params;
+  const { ownerId } = req.query;
+  const server = await getServerById(serverId);
+
+  if (!server)
+    return res.status(404).json({ error: 'Server not found' });
+
+  if (server.ownerId !== ownerId)
+    return res.status(403).json({ error: 'Not authorized' });
+
+  const requests = await getPendingRequestsForServer(serverId);
+
+  res.json({ requests });
+});
+
+export default router;