diff options
6 files changed, 157 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 | ||
| 3 | import jakarta.servlet.ServletContext; | 3 | import jakarta.servlet.ServletContext; |
| 4 | import java.time.Clock; | 4 | import java.time.Clock; |
| 5 | import java.util.concurrent.atomic.AtomicLong; | ||
| 5 | import market.guess.api.AccountContext; | 6 | import market.guess.api.AccountContext; |
| 6 | import market.guess.api.CatalogContext; | 7 | import market.guess.api.CatalogContext; |
| 7 | import market.guess.api.GuessMarketContext; | 8 | import 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 @@ | |||
| 1 | package market.guess.server; | ||
| 2 | |||
| 3 | import jakarta.servlet.annotation.WebServlet; | ||
| 4 | import jakarta.servlet.http.HttpServlet; | ||
| 5 | import jakarta.servlet.http.HttpServletRequest; | ||
| 6 | import jakarta.servlet.http.HttpServletResponse; | ||
| 7 | import java.io.IOException; | ||
| 8 | import java.util.List; | ||
| 9 | import java.util.Map; | ||
| 10 | import market.guess.model.event.EventSummaryDTO; | ||
| 11 | import 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") | ||
| 20 | public 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; | |||
| 5 | import jakarta.servlet.http.HttpServletRequest; | 5 | import jakarta.servlet.http.HttpServletRequest; |
| 6 | import jakarta.servlet.http.HttpServletResponse; | 6 | import jakarta.servlet.http.HttpServletResponse; |
| 7 | import java.io.IOException; | 7 | import java.io.IOException; |
| 8 | import 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 | } |
diff --git a/server/src/test/java/market/guess/server/SyncTest.java b/server/src/test/java/market/guess/server/SyncTest.java new file mode 100644 index 0000000..23c1c5f --- /dev/null +++ b/server/src/test/java/market/guess/server/SyncTest.java | |||
| @@ -0,0 +1,83 @@ | |||
| 1 | package market.guess.server; | ||
| 2 | |||
| 3 | import static market.guess.server.EventsTest.loggedIn; | ||
| 4 | import static market.guess.server.EventsTest.upload; | ||
| 5 | import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| 6 | import static org.junit.jupiter.api.Assertions.assertFalse; | ||
| 7 | import static org.junit.jupiter.api.Assertions.assertNotEquals; | ||
| 8 | import static org.junit.jupiter.api.Assertions.assertTrue; | ||
| 9 | |||
| 10 | import com.google.gson.JsonObject; | ||
| 11 | import com.google.gson.JsonParser; | ||
| 12 | import java.net.http.HttpClient; | ||
| 13 | import java.net.http.HttpRequest; | ||
| 14 | import java.net.http.HttpResponse; | ||
| 15 | import java.nio.file.Path; | ||
| 16 | import org.junit.jupiter.api.AfterAll; | ||
| 17 | import org.junit.jupiter.api.BeforeAll; | ||
| 18 | import org.junit.jupiter.api.Test; | ||
| 19 | import org.junit.jupiter.api.io.TempDir; | ||
| 20 | |||
| 21 | class SyncTest { | ||
| 22 | @TempDir static Path base; | ||
| 23 | static TestServer server; | ||
| 24 | |||
| 25 | @BeforeAll | ||
| 26 | static void start() throws Exception { | ||
| 27 | server = new TestServer(base); | ||
| 28 | } | ||
| 29 | |||
| 30 | @AfterAll | ||
| 31 | static void stop() throws Exception { | ||
| 32 | server.close(); | ||
| 33 | } | ||
| 34 | |||
| 35 | private static JsonObject sync(HttpClient client, long since) throws Exception { | ||
| 36 | var res = server.get(client, "/sync?since=" + since); | ||
| 37 | assertEquals(200, res.statusCode(), res.body()); | ||
| 38 | return JsonParser.parseString(res.body()).getAsJsonObject(); | ||
| 39 | } | ||
| 40 | |||
| 41 | @Test | ||
| 42 | void pollsAreCheapUntilSomethingChanges() throws Exception { | ||
| 43 | var pia = loggedIn(server, "Pia"); | ||
| 44 | var first = sync(pia, -1); | ||
| 45 | assertTrue(first.get("changed").getAsBoolean()); | ||
| 46 | assertTrue(first.has("events") && first.has("users"), first.toString()); | ||
| 47 | assertEquals("Pia", first.getAsJsonObject("account").get("owner").getAsString()); | ||
| 48 | var version = first.get("version").getAsLong(); | ||
| 49 | |||
| 50 | var idle = sync(pia, version); | ||
| 51 | assertFalse(idle.get("changed").getAsBoolean()); | ||
| 52 | assertFalse(idle.has("events"), "an unchanged poll should not carry data"); | ||
| 53 | |||
| 54 | var quinn = loggedIn(server, "Quinn"); | ||
| 55 | server.post(quinn, "/user/deposit", "amount", "42"); | ||
| 56 | assertEquals(200, upload(server, quinn, "small.xml").statusCode()); | ||
| 57 | |||
| 58 | var after = sync(pia, version); | ||
| 59 | assertTrue(after.get("changed").getAsBoolean()); | ||
| 60 | assertNotEquals(version, after.get("version").getAsLong()); | ||
| 61 | assertTrue(after.toString().contains("Mujtaba is Dead"), after.toString()); | ||
| 62 | assertTrue(after.toString().contains("\"balance\":\"42.00\""), after.toString()); | ||
| 63 | } | ||
| 64 | |||
| 65 | @Test | ||
| 66 | void preflightsDoNotBumpTheVersion() throws Exception { | ||
| 67 | var client = loggedIn(server, "Ray"); | ||
| 68 | var version = sync(client, -1).get("version").getAsLong(); | ||
| 69 | client.send( | ||
| 70 | server | ||
| 71 | .request("/sync") | ||
| 72 | .method("OPTIONS", HttpRequest.BodyPublishers.noBody()) | ||
| 73 | .header("Origin", "http://localhost:5173") | ||
| 74 | .build(), | ||
| 75 | HttpResponse.BodyHandlers.discarding()); | ||
| 76 | assertFalse(sync(client, version).get("changed").getAsBoolean()); | ||
| 77 | } | ||
| 78 | |||
| 79 | @Test | ||
| 80 | void requiresLogin() throws Exception { | ||
| 81 | assertEquals(401, server.get(TestServer.client(), "/sync?since=0").statusCode()); | ||
| 82 | } | ||
| 83 | } | ||