From c67d5ff663b876a15a3831f5a2b564c4002e99b6 Mon Sep 17 00:00:00 2001 From: Kostya Date: Thu, 15 Oct 2026 15:18:30 +0300 Subject: ui: add chat drawer to the desktop client ServerClient fetches new chat lines on the same one-second poll as the market and hands them over separately from market changes. The shared UI gets a chat icon in the status bar, beside the eject button, shown only against a server. It opens a drawer above the status bar with everyone's lines and a field to send one, laid over the content so the window keeps its size. While the drawer is closed the icon counts unread lines. A line the server refuses is reported in the drawer itself. --- .../src/main/java/market/guess/ui/client/App.java | 17 ++++++- .../java/market/guess/ui/client/ServerClient.java | 27 +++++++++- .../market/guess/ui/client/RemoteContextsTest.java | 24 ++++++++- .../java/market/guess/ui/desktop/AppState.java | 26 ++++++++++ .../ui/desktop/controllers/AppController.java | 43 ++++++++++++++++ .../desktop/controllers/ChatPanelController.java | 59 ++++++++++++++++++++++ .../market/guess/ui/desktop/app_view.fxml | 13 +++++ .../guess/ui/desktop/controllers/chat_panel.fxml | 36 +++++++++++++ .../resources/market/guess/ui/desktop/theme.css | 8 +++ 9 files changed, 250 insertions(+), 3 deletions(-) create mode 100644 ui-fx/src/main/java/market/guess/ui/desktop/controllers/ChatPanelController.java create mode 100644 ui-fx/src/main/resources/market/guess/ui/desktop/controllers/chat_panel.fxml 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 index 4ba9600..93ae414 100644 --- a/ui-client/src/main/java/market/guess/ui/client/App.java +++ b/ui-client/src/main/java/market/guess/ui/client/App.java @@ -2,11 +2,13 @@ package market.guess.ui.client; import java.io.IOException; import java.io.UncheckedIOException; +import java.util.concurrent.CompletableFuture; import javafx.application.Application; import javafx.application.Platform; import javafx.fxml.FXMLLoader; import javafx.scene.Scene; import javafx.stage.Stage; +import market.guess.model.chat.ChatMessageDTO; import market.guess.ui.desktop.AppView; public final class App extends Application { @@ -47,7 +49,20 @@ public final class App extends Application { new RemoteGuessMarketContext(client), new RemoteAccountContext(client), user); - client.startPolling(() -> Platform.runLater(view.getState()::refreshData)); + var state = view.getState(); + state.setChatSender( + text -> + CompletableFuture.runAsync( + () -> { + var sent = client.say(text); + if (!sent.isSuccess()) { + var note = new ChatMessageDTO(0, "", "Not sent", sent.getMessage()); + Platform.runLater(() -> state.getChat().add(note)); + } + })); + client.startPolling( + () -> Platform.runLater(state::refreshData), + said -> Platform.runLater(() -> state.getChat().addAll(said))); stage.show(); } 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 index 01962a2..00f3d68 100644 --- a/ui-client/src/main/java/market/guess/ui/client/ServerClient.java +++ b/ui-client/src/main/java/market/guess/ui/client/ServerClient.java @@ -2,6 +2,7 @@ package market.guess.ui.client; import com.google.gson.Gson; import com.google.gson.JsonObject; +import com.google.gson.reflect.TypeToken; import java.io.IOException; import java.lang.reflect.Type; import java.util.HashMap; @@ -11,7 +12,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; import market.guess.api.Result; +import market.guess.model.chat.ChatMessageDTO; import market.guess.model.event.EventDetailDTO; import market.guess.model.event.EventSummaryDTO; import market.guess.model.ledger.LedgerDTO; @@ -51,6 +54,7 @@ public final class ServerClient implements AutoCloseable { return t; }); private volatile Snapshot snapshot = new Snapshot(-1, List.of(), Map.of(), List.of(), null); + private long lastChatId; // touched only under the pullChat lock public ServerClient(String apiUrl) { this.api = HttpUrl.get(apiUrl); @@ -115,13 +119,34 @@ public final class ServerClient implements AutoCloseable { return true; } - public void startPolling(Runnable onChange) { + public synchronized List pullChat() { + var url = url("chat").newBuilder().addQueryParameter("since", "" + lastChatId).build(); + Result> res = + call( + new Request.Builder().url(url).build(), + new TypeToken>() {}.getType()); + if (!res.isSuccess() || res.getData().isEmpty()) { + return List.of(); + } + lastChatId = res.getData().getLast().id(); + return res.getData(); + } + + public Result say(String text) { + return post(ChatMessageDTO.class, new FormBody.Builder().add("text", text).build(), "chat"); + } + + public void startPolling(Runnable onChange, Consumer> onChat) { poller.scheduleWithFixedDelay( () -> { try { if (pull()) { onChange.run(); } + var said = pullChat(); + if (!said.isEmpty()) { + onChat.accept(said); + } } catch (RuntimeException e) { } }, 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 index e3b11f0..ea9d5ea 100644 --- a/ui-client/src/test/java/market/guess/ui/client/RemoteContextsTest.java +++ b/ui-client/src/test/java/market/guess/ui/client/RemoteContextsTest.java @@ -72,7 +72,7 @@ class RemoteContextsTest { maya.pull(); var heard = new CountDownLatch(1); - maya.startPolling(heard::countDown); + maya.startPolling(heard::countDown, said -> {}); var bought = tomMarket.placeOrder("Tom", event.key(), event.key() + ":0", "BUY", BigDecimal.ONE, 10); assertTrue(bought.isSuccess(), bought.getMessage()); @@ -149,6 +149,28 @@ class RemoteContextsTest { return new BigDecimal(new RemoteAccountContext(client).getAccount(name).getData().balance()); } + @Test + void chatReachesEveryoneOnceAndLeavesTheMarketAlone() { + try (var yael = new ServerClient(server.api); + var zohar = new ServerClient(server.api)) { + yael.login("Yael"); + zohar.login("Zohar"); + zohar.pullChat(); // whatever other tests said + zohar.pull(); + + var hello = "שלום, anyone trading?"; + assertTrue(yael.say(hello).isSuccess()); + assertFalse(yael.say(" ").isSuccess()); + + var heard = zohar.pullChat(); + assertEquals(1, heard.size()); + assertEquals("Yael", heard.get(0).sender()); + assertEquals(hello, heard.get(0).text()); + assertTrue(zohar.pullChat().isEmpty(), "a message is delivered once"); + assertFalse(zohar.pull(), "chat must not look like a market change"); + } + } + @Test void anUnreachableServerIsAFailedResultNotAnException() { try (var nobody = new ServerClient("http://localhost:1/api")) { diff --git a/ui-fx/src/main/java/market/guess/ui/desktop/AppState.java b/ui-fx/src/main/java/market/guess/ui/desktop/AppState.java index 5c73e1f..095a188 100644 --- a/ui-fx/src/main/java/market/guess/ui/desktop/AppState.java +++ b/ui-fx/src/main/java/market/guess/ui/desktop/AppState.java @@ -8,6 +8,7 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.function.Consumer; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleBooleanProperty; @@ -20,6 +21,7 @@ import javafx.collections.ObservableList; import market.guess.api.AccountContext; import market.guess.api.CatalogContext; import market.guess.api.GuessMarketContext; +import market.guess.model.chat.ChatMessageDTO; import market.guess.model.event.EventDetailDTO; import market.guess.model.event.EventStatus; import market.guess.model.event.EventSummaryDTO; @@ -52,6 +54,10 @@ public final class AppState { public final ObservableList events = FXCollections.observableArrayList(); public final ObservableList users = FXCollections.observableArrayList(); + private final ObservableList chat = FXCollections.observableArrayList(); + private final BooleanProperty chatOpen = new SimpleBooleanProperty(false); + private Consumer chatSender = text -> {}; + private final StringProperty selectedEventId = new SimpleStringProperty(null); private final ObjectProperty selectedEvent = new SimpleObjectProperty<>(); @@ -459,6 +465,26 @@ public final class AppState { actingUser.set(u); } + public ObservableList getChat() { + return chat; + } + + public BooleanProperty chatOpenProperty() { + return chatOpen; + } + + public void setChatSender(Consumer chatSender) { + this.chatSender = chatSender; + } + + public void sendChat(String text) { + chatSender.accept(text); + } + + public String getSessionUser() { + return sessionUser; + } + public boolean isRemote() { return sessionUser != null; } diff --git a/ui-fx/src/main/java/market/guess/ui/desktop/controllers/AppController.java b/ui-fx/src/main/java/market/guess/ui/desktop/controllers/AppController.java index e544200..97d31d6 100644 --- a/ui-fx/src/main/java/market/guess/ui/desktop/controllers/AppController.java +++ b/ui-fx/src/main/java/market/guess/ui/desktop/controllers/AppController.java @@ -25,6 +25,7 @@ import javafx.stage.FileChooser; import javafx.stage.FileChooser.ExtensionFilter; import javafx.util.Duration; import market.guess.api.Result; +import market.guess.model.chat.ChatMessageDTO; import market.guess.model.event.CreateEventRequest; import market.guess.model.event.EventStatus; import market.guess.model.event.MechanismType; @@ -47,6 +48,7 @@ public class AppController { private static final PseudoClass SKIN_CATPPUCCIN = PseudoClass.getPseudoClass("skin-catppuccin"); private static final PseudoClass SKIN_GRUVBOX = PseudoClass.getPseudoClass("skin-gruvbox"); + private static final String CHAT_GLYPH = "󰭹"; // nf-md-chat private static final Duration TOAST_DURATION = Duration.millis(2500); private static final Duration FADE_AWAY_DURATION = Duration.millis(500); private AppView appView; @@ -63,6 +65,10 @@ public class AppController { @FXML private Label loadedFilePathLabel; @FXML private ComboBox skinComboBox; @FXML private Button animationsButton; + @FXML private Button chatButton; + @FXML private Node chatPanel; + @FXML private ChatPanelController chatPanelController; + private int unreadChat; @FXML private Label balanceValueLabel; @FXML private Label actingAsLabel; @FXML private StackPane centerContainer; @@ -155,6 +161,32 @@ public class AppController { usersTabController.setOnToast(this::toast); usersTabController.setOnPlaceOrder(this::placeOrder); usersTabController.setOnDeposit(this::openDepositDialog); + + chatPanelController.init(state); + chatButton.setVisible(state.isRemote()); + chatButton.setManaged(state.isRemote()); + chatPanel.visibleProperty().bind(state.chatOpenProperty()); + chatPanel.managedProperty().bind(state.chatOpenProperty()); + state + .getChat() + .addListener( + (ListChangeListener) + c -> { + while (c.next()) { + if (!state.chatOpenProperty().get()) { + unreadChat += c.getAddedSize(); + } + } + updateChatButton(); + }); + state + .chatOpenProperty() + .addListener( + (obs, was, open) -> { + unreadChat = 0; + updateChatButton(); + }); + updateChatButton(); } private void setupStateBindings() { @@ -407,6 +439,17 @@ public class AppController { appView.getState().setAnimationsOn(!appView.getState().isAnimationsOn()); } + @FXML + private void handleChatToggled() { + var open = appView.getState().chatOpenProperty(); + open.set(!open.get()); + } + + private void updateChatButton() { + chatButton.setText(CHAT_GLYPH + " " + (unreadChat == 0 ? "" : unreadChat)); + Views.setSelected(chatButton, appView.getState().chatOpenProperty().get()); + } + @FXML private void handleLoadFile() { startLoad(); diff --git a/ui-fx/src/main/java/market/guess/ui/desktop/controllers/ChatPanelController.java b/ui-fx/src/main/java/market/guess/ui/desktop/controllers/ChatPanelController.java new file mode 100644 index 0000000..7c98692 --- /dev/null +++ b/ui-fx/src/main/java/market/guess/ui/desktop/controllers/ChatPanelController.java @@ -0,0 +1,59 @@ +package market.guess.ui.desktop.controllers; + +import javafx.application.Platform; +import javafx.collections.ListChangeListener; +import javafx.fxml.FXML; +import javafx.scene.Node; +import javafx.scene.control.Label; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; +import javafx.scene.layout.VBox; +import market.guess.model.chat.ChatMessageDTO; +import market.guess.ui.desktop.AppState; + +public class ChatPanelController { + private static final int MAX_LENGTH = 500; + + private AppState state; + + @FXML private ScrollPane scroll; + @FXML private VBox messages; + @FXML private TextField input; + + public void init(AppState state) { + this.state = state; + state + .getChat() + .addListener( + (ListChangeListener) + c -> { + while (c.next()) { + for (var message : c.getAddedSubList()) { + messages.getChildren().add(row(message)); + } + } + Platform.runLater(() -> scroll.setVvalue(1.0)); + }); + } + + private Node row(ChatMessageDTO message) { + var mine = message.sender().equalsIgnoreCase(state.getSessionUser()); + var head = new Label(message.sender() + " " + message.at()); + head.getStyleClass() + .addAll("gm-text-xs", "gm-font-semibold", mine ? "gm-text-accent" : "gm-text-ink2"); + var text = new Label(message.text()); + text.setWrapText(true); + text.getStyleClass().addAll("gm-text-base", "gm-text-ink"); + return new VBox(2, head, text); + } + + @FXML + private void handleSend() { + var text = input.getText().trim(); + if (text.isEmpty()) { + return; + } + state.sendChat(text.length() > MAX_LENGTH ? text.substring(0, MAX_LENGTH) : text); + input.clear(); + } +} diff --git a/ui-fx/src/main/resources/market/guess/ui/desktop/app_view.fxml b/ui-fx/src/main/resources/market/guess/ui/desktop/app_view.fxml index 3a34a7e..8dd7b4c 100644 --- a/ui-fx/src/main/resources/market/guess/ui/desktop/app_view.fxml +++ b/ui-fx/src/main/resources/market/guess/ui/desktop/app_view.fxml @@ -131,6 +131,11 @@