Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions ee/packages/presence/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"dependencies": {
"@rocket.chat/core-services": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/logger": "workspace:^",
"@rocket.chat/models": "workspace:^",
"mongodb": "6.16.0"
},
Expand Down
16 changes: 10 additions & 6 deletions ee/packages/presence/src/Presence.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@ import type { IPresence, IBrokerNode } from '@rocket.chat/core-services';
import { License, ServiceClass, Settings } from '@rocket.chat/core-services';
import type { IUser } from '@rocket.chat/core-typings';
import { UserStatus } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import { Users, UsersSessions } from '@rocket.chat/models';

import { PresenceReaper } from './lib/PresenceReaper';
import { normalizeStatusText } from './lib/normalizeStatusText';
import { type ClaimUpdate, processPresence } from './lib/presenceEngine';

const logger = new Logger('Presence');

const MAX_CONNECTIONS = 200;
const MAX_TIMEOUT_DELAY_MS = 2 ** 31 - 1;

Expand Down Expand Up @@ -146,7 +149,7 @@ export class Presence extends ServiceClass implements IPresence {
const delay = Math.min(Math.max(next.statusExpiresAt.getTime() - Date.now(), 0), MAX_TIMEOUT_DELAY_MS);
this.expirationTimeout = setTimeout(() => {
this.expirationTimeout = undefined;
this.handleExpirationJob().catch((err) => console.error('[Presence] Error handling status expiration:', err));
this.handleExpirationJob().catch((err) => logger.error({ msg: 'Error handling status expiration', err }));
}, delay);
}

Expand All @@ -161,14 +164,15 @@ export class Presence extends ServiceClass implements IPresence {
const rejected = results.filter((result) => result.status === 'rejected');

if (fulfilled.length > 0) {
console.debug(`[PresenceReaper] Successfully updated presence for ${fulfilled.length} users.`);
logger.debug({ msg: 'Successfully updated presence for users', count: fulfilled.length });
}

if (rejected.length > 0) {
console.error(
`[PresenceReaper] Failed to update presence for ${rejected.length} users:`,
rejected.map(({ reason }) => reason),
);
logger.error({
msg: 'Failed to update presence for users',
count: rejected.length,
reasons: rejected.map(({ reason }): unknown => reason),
});
}
}

Expand Down
5 changes: 4 additions & 1 deletion ee/packages/presence/src/lib/PresenceReaper.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import { setInterval } from 'node:timers';

import type { IUserSession } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import { UsersSessions } from '@rocket.chat/models';
import type { AnyBulkWriteOperation } from 'mongodb';

const logger = new Logger('PresenceReaper');

type ReaperPlan = {
userId: string;
removeIds: NonEmptyArray<string>;
Expand Down Expand Up @@ -48,7 +51,7 @@ export class PresenceReaper {

// Run every 1 minute
this.intervalId = setInterval(() => {
this.run().catch((err) => console.error('[PresenceReaper] Error:', err));
this.run().catch((err) => logger.error({ msg: 'Error running presence reaper', err }));
}, 60 * 1000);
}

Expand Down
Loading