From a8bc9dce528abb6340315f7daa61ad76be4a8739 Mon Sep 17 00:00:00 2001 From: Kostya Date: Tue, 13 Oct 2026 10:42:15 +0300 Subject: ui-client: add desktop client that talks to the server New module for the Ex3 desktop app. It reuses the ui-fx views and depends on the api only, never on the engine. ServerClient owns the OkHttp session and the last snapshot pulled from /api/sync. RemoteCatalogContext, RemoteGuessMarketContext and RemoteAccountContext implement the api interfaces on top of it: reads are answered from the snapshot, so AppState never waits on the network, and writes go over HTTP and pull a fresh snapshot before returning. A daemon thread polls once a second with blocking calls and refreshes AppState through Platform.runLater only when the server's version moved. AppState reselects the event and user by id, so a refresh keeps the selection. Server and user name come from --server= and --user= until the login screen exists. --- tools/_util.sh | 8 +- .../src/main/java/market/guess/ui/client/App.java | 41 +++++ .../main/java/market/guess/ui/client/Launcher.java | 9 ++ .../guess/ui/client/RemoteAccountContext.java | 54 +++++++ .../guess/ui/client/RemoteCatalogContext.java | 74 +++++++++ .../guess/ui/client/RemoteGuessMarketContext.java | 55 +++++++ .../java/market/guess/ui/client/ServerClient.java | 173 +++++++++++++++++++++ .../market/guess/ui/client/RemoteContextsTest.java | 93 +++++++++++ 8 files changed, 504 insertions(+), 3 deletions(-) create mode 100644 ui-client/src/main/java/market/guess/ui/client/App.java create mode 100644 ui-client/src/main/java/market/guess/ui/client/Launcher.java create mode 100644 ui-client/src/main/java/market/guess/ui/client/RemoteAccountContext.java create mode 100644 ui-client/src/main/java/market/guess/ui/client/RemoteCatalogContext.java create mode 100644 ui-client/src/main/java/market/guess/ui/client/RemoteGuessMarketContext.java create mode 100644 ui-client/src/main/java/market/guess/ui/client/ServerClient.java create mode 100644 ui-client/src/test/java/market/guess/ui/client/RemoteContextsTest.java diff --git a/tools/_util.sh b/tools/_util.sh index 7351e62..65cba8c 100644 --- a/tools/_util.sh +++ b/tools/_util.sh @@ -5,7 +5,7 @@ case "$(uname -s)" in *) SEP=":" ;; esac -MODULES="api service server ui-fx ui-console ui-desktop" +MODULES="api service server ui-fx ui-console ui-desktop ui-client" DEPS_api="" DEPS_service="api" @@ -13,12 +13,14 @@ DEPS_server="api service" DEPS_ui_console="api service" DEPS_ui_fx="api" DEPS_ui_desktop="api service ui-fx" +DEPS_ui_client="api ui-fx" -RUNTIME_LIB_DIRS="pico jaxb gson openjfx" +RUNTIME_LIB_DIRS="pico jaxb gson openjfx okhttp" -EXECUTABLES="ui-console ui-desktop" +EXECUTABLES="ui-console ui-desktop ui-client" MAINCLASS_ui_console="market.guess.ui.console.App" MAINCLASS_ui_desktop="market.guess.ui.desktop.Launcher" +MAINCLASS_ui_client="market.guess.ui.client.Launcher" JAVA_HOME_DIR=$(java -XshowSettings:properties -version 2>&1 | tr -d '\r' | sed -n 's/^ *java\.home = //p') case "$(uname -s)" in diff --git a/ui-client/src/main/java/market/guess/ui/client/App.java b/ui-client/src/main/java/market/guess/ui/client/App.java new file mode 100644 index 0000000..d24eda1 --- /dev/null +++ b/ui-client/src/main/java/market/guess/ui/client/App.java @@ -0,0 +1,41 @@ +package market.guess.ui.client; + +import javafx.application.Application; +import javafx.application.Platform; +import javafx.stage.Stage; +import market.guess.ui.desktop.AppView; + +public final class App extends Application { + private ServerClient client; + + @Override + public void start(Stage stage) { + var args = getParameters().getNamed(); + client = + new ServerClient( + args.getOrDefault("server", "http://localhost:8080/guess-market") + "/api"); + var login = client.login(args.getOrDefault("user", System.getProperty("user.name"))); + if (!login.isSuccess()) { + System.err.println(login.getMessage()); + Platform.exit(); + return; + } + client.pull(); + + var view = + new AppView( + stage, + new RemoteCatalogContext(client), + new RemoteGuessMarketContext(client), + new RemoteAccountContext(client)); + // refreshData reselects the event and user by id, so a refresh keeps the selection + client.startPolling(() -> Platform.runLater(view.getState()::refreshData)); + stage.show(); + } + + @Override + public void stop() { + client.logout(); + client.close(); + } +} diff --git a/ui-client/src/main/java/market/guess/ui/client/Launcher.java b/ui-client/src/main/java/market/guess/ui/client/Launcher.java new file mode 100644 index 0000000..78709d0 --- /dev/null +++ b/ui-client/src/main/java/market/guess/ui/client/Launcher.java @@ -0,0 +1,9 @@ +package market.guess.ui.client; + +import javafx.application.Application; + +public final class Launcher { + public static void main(String[] args) { + Application.launch(App.class, args); + } +} diff --git a/ui-client/src/main/java/market/guess/ui/client/RemoteAccountContext.java b/ui-client/src/main/java/market/guess/ui/client/RemoteAccountContext.java new file mode 100644 index 0000000..fc90bc0 --- /dev/null +++ b/ui-client/src/main/java/market/guess/ui/client/RemoteAccountContext.java @@ -0,0 +1,54 @@ +package market.guess.ui.client; + +import java.util.ArrayList; +import java.util.List; +import market.guess.api.AccountContext; +import market.guess.api.Result; +import market.guess.model.ledger.LedgerDTO; +import okhttp3.FormBody; + +/** + * Accounts over HTTP. Only our own ledger is ours to read; the server shows other users as name + * and balance, so they appear here as accounts without entries, after our own. + */ +public final class RemoteAccountContext implements AccountContext { + private final ServerClient client; + + public RemoteAccountContext(ServerClient client) { + this.client = client; + } + + @Override + public Result> getAllAccounts() { + var snapshot = client.snapshot(); + var own = snapshot.account(); + var all = new ArrayList(); + if (own != null) { + all.add(own); + } + for (var u : snapshot.users()) { + if (own == null || !u.username().equalsIgnoreCase(own.owner())) { + all.add(new LedgerDTO(u.username(), u.balance(), false, List.of())); + } + } + return Result.ok(all); + } + + @Override + public Result getAccount(String owner) { + return getAllAccounts().getData().stream() + .filter(a -> a.owner().equalsIgnoreCase(owner)) + .findFirst() + .map(Result::ok) + .orElseGet(() -> Result.error("Account not found")); + } + + @Override + public Result deposit(String owner, String amount) { + Result res = + client.post( + LedgerDTO.class, new FormBody.Builder().add("amount", amount).build(), "user", "deposit"); + client.pull(); + return res; + } +} diff --git a/ui-client/src/main/java/market/guess/ui/client/RemoteCatalogContext.java b/ui-client/src/main/java/market/guess/ui/client/RemoteCatalogContext.java new file mode 100644 index 0000000..cc0b03e --- /dev/null +++ b/ui-client/src/main/java/market/guess/ui/client/RemoteCatalogContext.java @@ -0,0 +1,74 @@ +package market.guess.ui.client; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; +import market.guess.api.CatalogContext; +import market.guess.api.LoadResult; +import market.guess.api.Result; +import market.guess.model.event.EventDetailDTO; +import market.guess.model.event.EventSummaryDTO; +import okhttp3.FormBody; +import okhttp3.MultipartBody; +import okhttp3.RequestBody; + +public final class RemoteCatalogContext implements CatalogContext { + private final ServerClient client; + + public RemoteCatalogContext(ServerClient client) { + this.client = client; + } + + @Override + public Result loadEvents(Path path) { + byte[] bytes; + try { + bytes = Files.readAllBytes(path); + } catch (IOException e) { + var message = "Cannot read " + path + "."; + return Result.error(message, message); + } + var body = + new MultipartBody.Builder() + .setType(MultipartBody.FORM) + .addFormDataPart("file", path.getFileName().toString(), RequestBody.create(bytes)) + .build(); + Result res = client.post(LoadResult.class, body, "upload"); + client.pull(); + return res; + } + + @Override + public Result> getAllEvents() { + return Result.ok(client.snapshot().events()); + } + + @Override + public Result getEvent(String eventKey) { + var detail = client.snapshot().details().get(eventKey); + return detail != null ? Result.ok(detail) : Result.error("Event not found"); + } + + @Override + public Result saveState(Path path) { + return Result.error("The server keeps the market; there is nothing to save here."); + } + + @Override + public Result restoreState(Path path) { + return Result.error("The server keeps the market; there is nothing to restore here."); + } + + @Override + public Result openEvent(String eventKey) { + var name = client.eventName(eventKey); + if (name == null) { + return Result.error("Event not found"); + } + Result res = + client.post(EventDetailDTO.class, new FormBody.Builder().build(), "events", name, "open"); + client.pull(); + return res; + } +} diff --git a/ui-client/src/main/java/market/guess/ui/client/RemoteGuessMarketContext.java b/ui-client/src/main/java/market/guess/ui/client/RemoteGuessMarketContext.java new file mode 100644 index 0000000..6bc704b --- /dev/null +++ b/ui-client/src/main/java/market/guess/ui/client/RemoteGuessMarketContext.java @@ -0,0 +1,55 @@ +package market.guess.ui.client; + +import java.math.BigDecimal; +import market.guess.api.GuessMarketContext; +import market.guess.api.Result; +import market.guess.model.event.EventDetailDTO; +import market.guess.model.market.PurchaseReceiptDTO; +import okhttp3.FormBody; + +public final class RemoteGuessMarketContext implements GuessMarketContext { + private final ServerClient client; + + public RemoteGuessMarketContext(ServerClient client) { + this.client = client; + } + + @Override + public Result placeOrder( + String userName, + String eventKey, + String optionKey, + String side, + BigDecimal price, + long quantity) { + var name = client.eventName(eventKey); + if (name == null) { + return Result.error("Event not found"); + } + var form = + new FormBody.Builder() + .add("event", name) + .add("option", optionKey) + .add("side", side) + .add("price", price.toPlainString()) + .add("quantity", Long.toString(quantity)) + .build(); + Result res = client.post(PurchaseReceiptDTO.class, form, "orders"); + client.pull(); + return res; + } + + @Override + public Result settleEvent( + String userName, String eventKey, String winningOptionKey) { + var name = client.eventName(eventKey); + if (name == null) { + return Result.error("Event not found"); + } + var form = new FormBody.Builder().add("option", winningOptionKey).build(); + Result res = + client.post(EventDetailDTO.class, form, "events", name, "resolve"); + client.pull(); + return res; + } +} diff --git a/ui-client/src/main/java/market/guess/ui/client/ServerClient.java b/ui-client/src/main/java/market/guess/ui/client/ServerClient.java new file mode 100644 index 0000000..01962a2 --- /dev/null +++ b/ui-client/src/main/java/market/guess/ui/client/ServerClient.java @@ -0,0 +1,173 @@ +package market.guess.ui.client; + +import com.google.gson.Gson; +import com.google.gson.JsonObject; +import java.io.IOException; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import market.guess.api.Result; +import market.guess.model.event.EventDetailDTO; +import market.guess.model.event.EventSummaryDTO; +import market.guess.model.ledger.LedgerDTO; +import market.guess.model.ledger.UserSummaryDTO; +import okhttp3.Cookie; +import okhttp3.CookieJar; +import okhttp3.FormBody; +import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.RequestBody; + +public final class ServerClient implements AutoCloseable { + private static final Gson GSON = new Gson(); + + record Snapshot( + long version, + List events, + Map details, + List users, + LedgerDTO account) {} + + private record SyncReply( + boolean changed, + long version, + List events, + List users, + LedgerDTO account) {} + + private final HttpUrl api; + private final OkHttpClient http; + private final ScheduledExecutorService poller = + Executors.newSingleThreadScheduledExecutor( + r -> { + var t = new Thread(r, "gm-poller"); + t.setDaemon(true); + return t; + }); + private volatile Snapshot snapshot = new Snapshot(-1, List.of(), Map.of(), List.of(), null); + + public ServerClient(String apiUrl) { + this.api = HttpUrl.get(apiUrl); + var cookies = new ConcurrentHashMap>(); + this.http = + new OkHttpClient.Builder() + .cookieJar( + new CookieJar() { + @Override + public void saveFromResponse(HttpUrl url, List list) { + cookies.put(url.host(), list); + } + + @Override + public List loadForRequest(HttpUrl url) { + return cookies.getOrDefault(url.host(), List.of()); + } + }) + .build(); + } + + public Result login(String username) { + Result res = + post(JsonObject.class, new FormBody.Builder().add("username", username).build(), "login"); + return res.isSuccess() + ? Result.ok(res.getData().get("username").getAsString()) + : Result.error(res.getMessage(), res.getDetails()); + } + + public void logout() { + post(JsonObject.class, new FormBody.Builder().build(), "logout"); + } + + Snapshot snapshot() { + return snapshot; + } + + String eventName(String eventKey) { + return snapshot.events().stream() + .filter(e -> e.key().equals(eventKey)) + .map(EventSummaryDTO::name) + .findFirst() + .orElse(null); + } + + public synchronized boolean pull() { + var url = url("sync").newBuilder().addQueryParameter("since", "" + snapshot.version()).build(); + Result res = call(new Request.Builder().url(url).build(), SyncReply.class); + if (!res.isSuccess() || !res.getData().changed()) { + return false; + } + var reply = res.getData(); + var details = new HashMap(); + for (var e : reply.events()) { + Result detail = get(EventDetailDTO.class, "events", e.name()); + if (detail.isSuccess()) { + details.put(e.key(), detail.getData()); + } + } + snapshot = + new Snapshot(reply.version(), reply.events(), details, reply.users(), reply.account()); + return true; + } + + public void startPolling(Runnable onChange) { + poller.scheduleWithFixedDelay( + () -> { + try { + if (pull()) { + onChange.run(); + } + } catch (RuntimeException e) { + } + }, + 1, + 1, + TimeUnit.SECONDS); + } + + Result get(Type type, String... path) { + return call(new Request.Builder().url(url(path)).build(), type); + } + + Result post(Type type, RequestBody body, String... path) { + return call(new Request.Builder().url(url(path)).post(body).build(), type); + } + + private HttpUrl url(String... path) { + var b = api.newBuilder(); + for (var segment : path) { + b.addPathSegment(segment); // percent-encodes, so event names may hold spaces and '?' + } + return b.build(); + } + + private Result call(Request request, Type type) { + try (var res = http.newCall(request).execute()) { + var body = res.body().string(); + if (res.isSuccessful()) { + return Result.ok(GSON.fromJson(body, type)); + } + var message = "The server answered " + res.code() + "."; + try { + message = GSON.fromJson(body, JsonObject.class).get("message").getAsString(); + } catch (RuntimeException notOurJson) { + } + return Result.error(message, message); + } catch (IOException | RuntimeException e) { + var message = "Cannot reach the server: " + e.getMessage(); + return Result.error(message, message); + } + } + + @Override + public void close() { + poller.shutdownNow(); + http.dispatcher().executorService().shutdown(); + http.connectionPool().evictAll(); + } +} diff --git a/ui-client/src/test/java/market/guess/ui/client/RemoteContextsTest.java b/ui-client/src/test/java/market/guess/ui/client/RemoteContextsTest.java new file mode 100644 index 0000000..5c1057f --- /dev/null +++ b/ui-client/src/test/java/market/guess/ui/client/RemoteContextsTest.java @@ -0,0 +1,93 @@ +package market.guess.ui.client; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.math.BigDecimal; +import java.nio.file.Path; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import market.guess.model.event.EventStatus; +import market.guess.server.TestServer; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +class RemoteContextsTest { + @TempDir static Path base; + static TestServer server; + + @BeforeAll + static void start() throws Exception { + server = new TestServer(base); + } + + @AfterAll + static void stop() throws Exception { + server.close(); + } + + @Test + void twoClientsShareOneMarket() throws Exception { + try (var maya = new ServerClient(server.api); + var tom = new ServerClient(server.api); + var impostor = new ServerClient(server.api)) { + assertEquals("Maya", maya.login("Maya").getData()); + assertEquals("Tom", tom.login("Tom").getData()); + var taken = impostor.login("maya"); + assertFalse(taken.isSuccess()); + assertTrue(taken.getMessage().contains("already in use"), taken.getMessage()); + + var catalog = new RemoteCatalogContext(maya); + var accounts = new RemoteAccountContext(maya); + + var loaded = catalog.loadEvents(Path.of("test-data/ex-3/small.xml")); + assertTrue(loaded.isSuccess(), loaded.getMessage()); + assertEquals(1, loaded.getData().eventsLoaded()); + var event = catalog.getAllEvents().getData().get(0); + assertEquals("Mujtaba is Dead", event.name()); + assertEquals("Maya", event.marketMaker()); + assertTrue(catalog.getEvent(event.key()).isSuccess()); + + var broke = catalog.openEvent(event.key()); + assertFalse(broke.isSuccess()); + assertFalse(catalog.loadEvents(Path.of("test-data/ex-3/small.xml")).isSuccess()); + + assertTrue(accounts.deposit("Maya", "1000").isSuccess()); + assertEquals("Maya", accounts.getAllAccounts().getData().get(0).owner()); + var opened = catalog.openEvent(event.key()); + assertTrue(opened.isSuccess(), opened.getMessage()); + assertEquals(EventStatus.ACTIVE, catalog.getEvent(event.key()).getData().summary().status()); + + assertTrue(tom.pull()); + assertFalse(tom.pull()); + var tomMarket = new RemoteGuessMarketContext(tom); + assertTrue(new RemoteAccountContext(tom).deposit("Tom", "500").isSuccess()); + + maya.pull(); + var heard = new CountDownLatch(1); + maya.startPolling(heard::countDown); + var bought = + tomMarket.placeOrder("Tom", event.key(), event.key() + ":0", "BUY", BigDecimal.ONE, 10); + assertTrue(bought.isSuccess(), bought.getMessage()); + assertTrue(heard.await(5, TimeUnit.SECONDS), "the poller should report the change"); + assertFalse(catalog.getEvent(event.key()).getData().history().isEmpty()); + + var tomAsMayaSeesHim = accounts.getAccount("Tom").getData(); + assertTrue(tomAsMayaSeesHim.entries().isEmpty()); + + maya.logout(); + assertTrue(impostor.login("maya").isSuccess()); + } + } + + @Test + void anUnreachableServerIsAFailedResultNotAnException() { + try (var nobody = new ServerClient("http://localhost:1/api")) { + assertFalse(nobody.login("Zed").isSuccess()); + assertFalse(nobody.pull()); + } + } +} -- cgit v1.2.3