Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
222943a
fix: d
cardoso Nov 18, 2025
b2818bd
fix: renew with ddp over rest
cardoso Nov 18, 2025
2c79e92
chore: improve types
cardoso Nov 18, 2025
cb85c50
refactor: take userId in renewConnection
cardoso Nov 19, 2025
818db84
fix: remove expired connections on renew
cardoso Nov 19, 2025
bcda88d
refactor: simplify logic & separate tests
cardoso Nov 21, 2025
926642b
chore: add changeset
cardoso Nov 24, 2025
d75b0cf
Merge branch 'develop' into fix/presence-dangling
cardoso Nov 27, 2025
b03787e
Merge branch 'develop' into fix/presence-dangling
cardoso Nov 28, 2025
a7f2be2
Merge branch 'develop' into fix/presence-dangling
cardoso Nov 28, 2025
6bde2cf
refactor: remove UserPresence:ping
cardoso Nov 28, 2025
d04d556
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 1, 2025
d842b11
fix: meteor types
cardoso Dec 1, 2025
992a691
chore: updateConnectionStatus throttle
cardoso Dec 1, 2025
e542ec5
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 1, 2025
7f7a552
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 1, 2025
1e7a950
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 2, 2025
62d2466
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 2, 2025
e1a7a4f
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 2, 2025
d56714a
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 2, 2025
7d3d039
chore: normalize monolith & microservice behavior
cardoso Dec 2, 2025
2e3592d
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 3, 2025
628b508
fix: clean up throttle tracking for connections
cardoso Dec 3, 2025
1688b9c
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 3, 2025
049ef81
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 3, 2025
bcf2d04
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 3, 2025
a65f79b
fix: periodically remove stale connections
cardoso Dec 3, 2025
682230a
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 4, 2025
efff1b3
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 4, 2025
60f6657
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 4, 2025
3f106f3
refactor: move throttling logic to presence service
cardoso Dec 4, 2025
8db5df2
refactor: separate cleaning logic into its own class
cardoso Dec 4, 2025
5112f8a
fix: only update connection if no packet was seen
cardoso Dec 4, 2025
e7dbb88
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 4, 2025
0ab1249
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 5, 2025
ff983de
chore: remove comments & unused properties
cardoso Dec 5, 2025
1675085
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 5, 2025
96b25ce
improve: presence reaper robustness and connection updates
cardoso Dec 5, 2025
3b0c9d0
fix(ddp-streamer): only update connection on heartbeat
cardoso Dec 5, 2025
964f024
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 5, 2025
2926cfe
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 6, 2025
c5700c1
test(presence): dangling sessions are removed
cardoso Dec 6, 2025
5633225
chore: remove test code
cardoso Dec 6, 2025
d3b27fb
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 8, 2025
181ac93
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 8, 2025
56c55a1
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 9, 2025
a9565a1
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 9, 2025
0fc67cd
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 9, 2025
d1405af
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 9, 2025
5b2b9da
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 9, 2025
0882ac2
fix(presence): reaper error handling and logic
cardoso Dec 9, 2025
94aef54
chore: update changeset
cardoso Dec 9, 2025
44ccab9
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 9, 2025
fbf7e4e
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 10, 2025
7e327d7
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 10, 2025
485ad1d
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 10, 2025
dcb7fee
chore(presence): remove shouldMarkOffline
cardoso Dec 10, 2025
5586b78
Merge branch 'fix/presence-dangling' into test/presence-dangling
cardoso Dec 10, 2025
807eaec
test: presence stale
cardoso Dec 10, 2025
bb920ea
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 11, 2025
de91ab0
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 11, 2025
90ba329
Merge branch 'fix/presence-dangling' into test/presence-dangling
cardoso Dec 11, 2025
0d2df00
chore: mark test as slow
cardoso Dec 11, 2025
b6e3ea3
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 11, 2025
aa1ec27
Merge branch 'fix/presence-dangling' into test/presence-dangling
cardoso Dec 11, 2025
93eedcc
Merge branch 'develop' into fix/presence-dangling
cardoso Dec 11, 2025
5b2a5ce
Merge branch 'fix/presence-dangling' into test/presence-dangling
cardoso Dec 11, 2025
cd9791f
Merge branch 'develop' into test/presence-dangling
cardoso Dec 17, 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
73 changes: 73 additions & 0 deletions apps/meteor/tests/e2e/presence-stale.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import { UserStatus, type IUserSession } from '@rocket.chat/core-typings';

import { Users } from './fixtures/userStates';
import { HomeChannel } from './page-objects';
import { test, expect } from './utils/test';

test.describe('Should remove stale sessions', () => {
test('user1 sees user2 offline after inactivity', async ({ browser, db }) => {
test.slow();

const [user1Context, user2Context] = await Promise.all([
browser.newContext({ storageState: Users.user1.state }),
browser.newContext({ storageState: Users.user2.state }),
]);

const [user1Page, user2Page] = await Promise.all([user1Context.newPage(), user2Context.newPage()]);

await Promise.all([user1Page.goto('/home'), user2Page.goto('/home')]);

const user1Home = new HomeChannel(user1Page);

await user1Home.sidenav.openChat('user2');

await Promise.all([
expect(user1Home.content.channelHeader).toContainText('user2'),
expect(user1Home.content.channelHeader.locator('.rcx-status-bullet--online')).toBeVisible(),
]);

await test.step('Simulate inactivity by updating user2 session and status', async () => {
await test.step('Close user2 page to simulate disconnection', async () => {
await user2Context.setOffline(true);
});
await db.users.updateStatusById(Users.user2.data._id, {
status: UserStatus.ONLINE,
statusConnection: UserStatus.ONLINE,
});

const user2Session: IUserSession = (await db.usersSessions.findOneById(Users.user2.data._id)) ?? {
_id: Users.user2.data._id,
connections: [],
};

expect(user2Session.connections.length).toBeGreaterThan(0);

await db.usersSessions.col.updateOne(
{ _id: Users.user2.data._id },
{
$set: {
connections: user2Session.connections.map((connection) => ({
...connection,
_createdAt: new Date(connection._createdAt.getTime() - 6 * 60 * 1000),
_updatedAt: new Date(connection._updatedAt.getTime() - 6 * 60 * 1000),
status: UserStatus.ONLINE,
})),
},
},
);
});

await expect(user1Home.content.channelHeader.getByRole('button', { name: 'user2', exact: true }).getByRole('img')).toContainClass(
'rcx-status-bullet--online',
{ timeout: 120_000 },
);

await expect(user1Home.content.channelHeader.getByRole('button', { name: 'user2', exact: true }).getByRole('img')).toContainClass(
'rcx-status-bullet--offline',
{ timeout: 120_000 },
);

await user1Context.close();
await user2Context.close();
});
});
26 changes: 26 additions & 0 deletions apps/meteor/tests/e2e/utils/db.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { UsersSessionsRaw, UsersRaw } from '@rocket.chat/models';
import { MongoClient } from 'mongodb';

import { URL_MONGODB } from '../config/constants';

export class DatabaseClient {
client: MongoClient;

users: UsersRaw;

usersSessions: UsersSessionsRaw;

private constructor(client: MongoClient) {
this.client = client;
this.users = new UsersRaw(client.db());
this.usersSessions = new UsersSessionsRaw(client.db());
}

static async connect(): Promise<DatabaseClient> {
return new DatabaseClient(await MongoClient.connect(URL_MONGODB));
}

async close(): Promise<void> {
await this.client.close();
}
}
13 changes: 12 additions & 1 deletion apps/meteor/tests/e2e/utils/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import type { Locator, APIResponse, APIRequestContext } from '@playwright/test';
import { test as baseTest, request as baseRequest } from '@playwright/test';
import { v4 as uuid } from 'uuid';

import { DatabaseClient } from './db';
import { BASE_API_URL, API_PREFIX, ADMIN_CREDENTIALS } from '../config/constants';
import { Users } from '../fixtures/userStates';

Expand Down Expand Up @@ -37,7 +38,17 @@ let apiContext: APIRequestContext;

const cacheFromCredentials = new Map<string, string>();

export const test = baseTest.extend<BaseTest>({
export const test = baseTest.extend<BaseTest, { db: DatabaseClient }>({
db: [
// eslint-disable-next-line no-empty-pattern
async ({}, use) => {
const db = await DatabaseClient.connect();
await use(db);
await db.close();
},
{ scope: 'worker' },
],

context: async ({ context }, use) => {
if (!process.env.E2E_COVERAGE) {
await use(context);
Expand Down
Loading