aboutsummaryrefslogtreecommitdiffstats
path: root/server/src/main/java/market
diff options
context:
space:
mode:
authorKostya <mail@sartin.in>2026-10-11 17:15:39 +0300
committerKostya <mail@sartin.in>2026-10-11 17:16:05 +0300
commitdc616e0f340f28b320253bf9a70778a07b885ffd (patch)
treea0344816c99604f8d89b4eb3db31c6e98ae2db7f /server/src/main/java/market
parent241fd5f0a46aff89a3302d2753a01e217a562e79 (diff)
downloadguess-market-dc616e0f340f28b320253bf9a70778a07b885ffd.tar.gz
guess-market-dc616e0f340f28b320253bf9a70778a07b885ffd.tar.xz
guess-market-dc616e0f340f28b320253bf9a70778a07b885ffd.zip
server: add versioned sync endpoint for polling clients
The spec has clients pull updates every half second or so, by fetching everything, only changes, or something in between. Take the middle road: the engine keeps a version that moves on every change, and GET /api/sync?since={version} answers {"changed": false} when nothing has happened, which is almost every poll. Otherwise it returns a snapshot of the event summaries, the user directory and the caller's account, with the version to send next time. A client looking at one event refetches its details from /api/events/{name} only when the version moves. The lock filter bumps the version after every state-changing request, still inside the write lock, so a reader can never pick up new data under an old version. CORS preflights now take the read lock, since they change nothing. A session that times out also bumps the version, so other users see that user go offline. The user directory rows move into a helper that /api/users and the snapshot share.
Diffstat (limited to 'server/src/main/java/market')
-rw-r--r--server/src/main/java/market/guess/server/EngineBootstrap.java1
-rw-r--r--server/src/main/java/market/guess/server/EngineLockFilter.java7
-rw-r--r--server/src/main/java/market/guess/server/ServerEngine.java10
-rw-r--r--server/src/main/java/market/guess/server/SyncServlet.java50
-rw-r--r--server/src/main/java/market/guess/server/UsersServlet.java12
5 files changed, 74 insertions, 6 deletions
diff --git a/server/src/main/java/market/guess/server/EngineBootstrap.java b/server/src/main/java/market/guess/server/EngineBootstrap.java
index 9746cef..6b56abf 100644
--- a/server/src/main/java/market/guess/server/EngineBootstrap.java
+++ b/server/src/main/java/market/guess/server/EngineBootstrap.java
@@ -19,6 +19,7 @@ public final class EngineBootstrap implements ServletContextListener, HttpSessio
19 var engine = ServerEngine.from(se.getSession().getServletContext()); 19 var engine = ServerEngine.from(se.getSession().getServletContext());
20 if (engine != null) { 20 if (engine != null) {
21 engine.sessions().release(se.getSession()); 21 engine.sessions().release(se.getSession());
22 engine.changed(); // a timed-out user shows as offline to everyone else
22 } 23 }
23 } 24 }
24} 25}
diff --git a/server/src/main/java/market/guess/server/EngineLockFilter.java b/server/src/main/java/market/guess/server/EngineLockFilter.java
index 181d96b..db2b580 100644
--- a/server/src/main/java/market/guess/server/EngineLockFilter.java
+++ b/server/src/main/java/market/guess/server/EngineLockFilter.java
@@ -16,10 +16,15 @@ public final class EngineLockFilter extends HttpFilter {
16 @Override 16 @Override
17 protected void doFilter(HttpServletRequest req, HttpServletResponse res, FilterChain chain) 17 protected void doFilter(HttpServletRequest req, HttpServletResponse res, FilterChain chain)
18 throws IOException, ServletException { 18 throws IOException, ServletException {
19 var held = "GET".equals(req.getMethod()) ? lock.readLock() : lock.writeLock(); 19 var method = req.getMethod();
20 var write = !"GET".equals(method) && !"HEAD".equals(method) && !"OPTIONS".equals(method);
21 var held = write ? lock.writeLock() : lock.readLock();
20 held.lock(); 22 held.lock();
21 try { 23 try {
22 chain.doFilter(req, res); 24 chain.doFilter(req, res);
25 if (write) {
26 ServerEngine.from(getServletContext()).changed();
27 }
23 } finally { 28 } finally {
24 held.unlock(); 29 held.unlock();
25 } 30 }
diff --git a/server/src/main/java/market/guess/server/ServerEngine.java b/server/src/main/java/market/guess/server/ServerEngine.java
index 41b8786..13891a1 100644
--- a/server/src/main/java/market/guess/server/ServerEngine.java
+++ b/server/src/main/java/market/guess/server/ServerEngine.java
@@ -2,6 +2,7 @@ package market.guess.server;
2 2
3import jakarta.servlet.ServletContext; 3import jakarta.servlet.ServletContext;
4import java.time.Clock; 4import java.time.Clock;
5import java.util.concurrent.atomic.AtomicLong;
5import market.guess.api.AccountContext; 6import market.guess.api.AccountContext;
6import market.guess.api.CatalogContext; 7import market.guess.api.CatalogContext;
7import market.guess.api.GuessMarketContext; 8import market.guess.api.GuessMarketContext;
@@ -33,6 +34,7 @@ public final class ServerEngine {
33 private final AccountContext accounts; 34 private final AccountContext accounts;
34 private final GuessMarketContext market; 35 private final GuessMarketContext market;
35 private final Sessions sessions; 36 private final Sessions sessions;
37 private final AtomicLong version = new AtomicLong();
36 38
37 public ServerEngine(Clock clock) { 39 public ServerEngine(Clock clock) {
38 var marketInfra = new MarketContext(events, users); 40 var marketInfra = new MarketContext(events, users);
@@ -86,4 +88,12 @@ public final class ServerEngine {
86 public Sessions sessions() { 88 public Sessions sessions() {
87 return sessions; 89 return sessions;
88 } 90 }
91
92 public long version() {
93 return version.get();
94 }
95
96 public void changed() {
97 version.incrementAndGet();
98 }
89} 99}
diff --git a/server/src/main/java/market/guess/server/SyncServlet.java b/server/src/main/java/market/guess/server/SyncServlet.java
new file mode 100644
index 0000000..5d41481
--- /dev/null
+++ b/server/src/main/java/market/guess/server/SyncServlet.java
@@ -0,0 +1,50 @@
1package market.guess.server;
2
3import jakarta.servlet.annotation.WebServlet;
4import jakarta.servlet.http.HttpServlet;
5import jakarta.servlet.http.HttpServletRequest;
6import jakarta.servlet.http.HttpServletResponse;
7import java.io.IOException;
8import java.util.List;
9import java.util.Map;
10import market.guess.model.event.EventSummaryDTO;
11import market.guess.model.ledger.LedgerDTO;
12
13/**
14 * GET /api/sync?since={version}: what a polling client needs to refresh. If nothing changed since
15 * {@code version} it gets {@code {"changed": false}}; otherwise a snapshot of event summaries, the
16 * user directory and its own account, with the version to send next time. Details of the event a
17 * client is looking at are fetched from /api/events/{name} only when the version moves.
18 */
19@WebServlet("/api/sync")
20public final class SyncServlet extends HttpServlet {
21 record Snapshot(
22 boolean changed,
23 long version,
24 List<EventSummaryDTO> events,
25 List<UsersServlet.UserRow> users,
26 LedgerDTO account) {}
27
28 @Override
29 protected void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException {
30 var user = Sessions.requireUser(req, res);
31 if (user == null) {
32 return;
33 }
34 var engine = ServerEngine.from(getServletContext());
35 var version = engine.version();
36 if (String.valueOf(version).equals(req.getParameter("since"))) {
37 Json.send(res, HttpServletResponse.SC_OK, Map.of("changed", false, "version", version));
38 return;
39 }
40 Json.send(
41 res,
42 HttpServletResponse.SC_OK,
43 new Snapshot(
44 true,
45 version,
46 engine.catalog().getAllEvents().getData(),
47 UsersServlet.rows(engine),
48 engine.accounts().getAccount(user).getData()));
49 }
50}
diff --git a/server/src/main/java/market/guess/server/UsersServlet.java b/server/src/main/java/market/guess/server/UsersServlet.java
index 511ede2..d919892 100644
--- a/server/src/main/java/market/guess/server/UsersServlet.java
+++ b/server/src/main/java/market/guess/server/UsersServlet.java
@@ -5,6 +5,7 @@ import jakarta.servlet.http.HttpServlet;
5import jakarta.servlet.http.HttpServletRequest; 5import jakarta.servlet.http.HttpServletRequest;
6import jakarta.servlet.http.HttpServletResponse; 6import jakarta.servlet.http.HttpServletResponse;
7import java.io.IOException; 7import java.io.IOException;
8import java.util.List;
8 9
9/** 10/**
10 * GET /api/users: every account on the server with the facts the spec asks to show about other 11 * GET /api/users: every account on the server with the facts the spec asks to show about other
@@ -19,9 +20,11 @@ public final class UsersServlet extends HttpServlet {
19 if (Sessions.requireUser(req, res) == null) { 20 if (Sessions.requireUser(req, res) == null) {
20 return; 21 return;
21 } 22 }
22 var engine = ServerEngine.from(getServletContext()); 23 Json.send(res, HttpServletResponse.SC_OK, rows(ServerEngine.from(getServletContext())));
23 var rows = 24 }
24 engine.users().getAll().stream() 25
26 static List<UserRow> rows(ServerEngine engine) {
27 return engine.users().getAll().stream()
25 .map( 28 .map(
26 u -> 29 u ->
27 new UserRow( 30 new UserRow(
@@ -30,7 +33,6 @@ public final class UsersServlet extends HttpServlet {
30 engine.events().getAll().stream() 33 engine.events().getAll().stream()
31 .anyMatch(e -> u.getName().equalsIgnoreCase(e.getMarketMaker())), 34 .anyMatch(e -> u.getName().equalsIgnoreCase(e.getMarketMaker())),
32 engine.sessions().isOnline(u.getName()))) 35 engine.sessions().isOnline(u.getName())))
33 .toList(); 36 .toList();
34 Json.send(res, HttpServletResponse.SC_OK, rows);
35 } 37 }
36} 38}