Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: queue message payloads #20749

Merged
merged 7 commits into from
Jan 13, 2025
Merged

feat: queue message payloads #20749

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a2feec7
feat: queue message payloads
caalador Dec 19, 2024
ca6d8e7
Add test for re-request
caalador Jan 3, 2025
b8ef0d0
fix test server response
caalador Jan 8, 2025
f50afba
Make custom service simpler
caalador Jan 10, 2025
d28282b
use the has method
caalador Jan 10, 2025
aefbb0a
Do not up clientId for message already containing clientId
caalador Jan 10, 2025
c604efb
cleanup
caalador Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use the has method 
clear queue for push messaging.
  • Loading branch information
@caalador
caalador committed Jan 13, 2025
commit d28282bf08b21160eb1219efdbdae6909b72d929
5 changes: 3 additions & 2 deletions flow-client/src/main/java/com/vaadin/client/communication/MessageSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ private JsonObject preparePayload(final JsonArray reqInvocations,
* The contents of the request to send
*/
public void send(final JsonObject payload) {
if (!messageQueue.isEmpty()) {
if (hasQueuedMessages()) {
messageQueue.add(payload);
return;
}
Expand Down Expand Up @@ -238,6 +238,7 @@ private void sendPayload(final JsonObject payload) {
}

if (push != null && push.isBidirectional()) {
messageQueue.clear();
// When using bidirectional transport, the payload is not resent
// to the server during reconnection attempts.
// Keep a copy of the message, so that it could be resent to the
Expand Down Expand Up @@ -377,7 +378,7 @@ public void setClientToServerMessageId(int nextExpectedId, boolean force) {
ApplicationConstants.CLIENT_TO_SERVER_ID) < nextExpectedId) {
pushPendingMessage = null;
}
if (!messageQueue.isEmpty()) {
if (hasQueuedMessages()) {
synchronized (messageQueue) {
mcollovati marked this conversation as resolved.
Show resolved Hide resolved
// If queued message is the expected one. remove from queue
// and sen next message if any.
Expand Down