Skip to content

regression: fix presence connections not being updated in DDPStreamer #37855

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

Merged
kodiakhq merged 5 commits into from
Dec 18, 2025
Merged

regression: fix presence connections not being updated in DDPStreamer #37855

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
811cee7
regression: fix connections not being updated
cardoso Dec 17, 2025
86bf4ff
refactor: replace heartbeat mechanism with throttle
cardoso Dec 17, 2025
b54cc2b
Merge branch 'develop' into regression/presence-dangling
kodiakhq[bot] Dec 18, 2025
b5a7d54
Merge branch 'develop' into regression/presence-dangling
cardoso Dec 18, 2025
6ce47e6
Merge branch 'develop' into regression/presence-dangling
kodiakhq[bot] Dec 18, 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
30 changes: 13 additions & 17 deletions ee/apps/ddp-streamer/src/Client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type { IncomingMessage } from 'http';

import { Presence } from '@rocket.chat/core-services';
import type { ISocketConnection } from '@rocket.chat/core-typings';
import { throttle } from 'underscore';
import { v1 as uuidv1 } from 'uuid';
import type WebSocket from 'ws';

Expand Down Expand Up @@ -74,7 +75,17 @@ export class Client extends EventEmitter {

public userToken?: string;

private _seenPacket = true;
private updatePresence = throttle(
() => {
if (this.userId) {
void Presence.updateConnection(this.userId, this.connection.id).catch((err) => {
console.error('Error updating connection presence:', err);
});
}
},
TIMEOUT,
{ leading: true, trailing: false },
);

constructor(
public ws: WebSocket,
Expand Down Expand Up @@ -182,18 +193,6 @@ export class Client extends EventEmitter {
this.ws.close(WS_ERRORS.TIMEOUT, WS_ERRORS_MESSAGES.TIMEOUT);
};

private messageReceived = (): void => {
if (this._seenPacket || !this.userId) {
this._seenPacket = true;
return;
}

this._seenPacket = true;
void Presence.updateConnection(this.userId, this.connection.id).catch((err) => {
console.error('Error updating connection presence after heartbeat:', err);
});
};

ping(id?: string): void {
this.send(server.serialize({ [DDP_EVENTS.MSG]: DDP_EVENTS.PING, ...(id && { [DDP_EVENTS.ID]: id }) }));
}
Expand All @@ -203,9 +202,6 @@ export class Client extends EventEmitter {
}

handleIdle = (): void => {
if (this.userId) {
this._seenPacket = false;
}
this.ping();
this.timeout = setTimeout(this.closeTimeout, TIMEOUT);
};
Expand All @@ -218,7 +214,7 @@ export class Client extends EventEmitter {
handler = async (payload: WebSocket.Data, isBinary: boolean): Promise<void> => {
try {
const packet = server.parse(payload, isBinary);
this.messageReceived();
this.updatePresence();
this.emit('message', packet);
if (this.wait) {
return new Promise((resolve) => this.once(DDP_EVENTS.LOGGED, () => resolve(this.process(packet.msg, packet))));
Expand Down
Loading