refactor: simplify logic & separate tests

Author: cardoso

apps/meteor/server/methods/userPresence.ts

@@ -9,7 +9,7 @@ declare module '@rocket.chat/ddp-client' {
 		'UserPresence:setDefaultStatus'(status: UserStatus): boolean | undefined;
 		'UserPresence:online'(): boolean | undefined;
 		'UserPresence:away'(): boolean | undefined;
-		'UserPresence:renew'(): void | undefined;
+		'UserPresence:ping'(): boolean | undefined;
 	}
 }
 
@@ -26,20 +26,20 @@ Meteor.methods<ServerMethods>({
 		if (!userId || !connection) {
 			return;
 		}
-		return Presence.setConnectionStatus(userId, UserStatus.ONLINE, connection.id);
+		return Presence.setConnectionStatus(userId, connection.id, UserStatus.ONLINE);
 	},
 	'UserPresence:away'() {
 		const { userId, connection } = this;
 		if (!userId || !connection) {
 			return;
 		}
-		return Presence.setConnectionStatus(userId, UserStatus.AWAY, connection.id);
+		return Presence.setConnectionStatus(userId, connection.id, UserStatus.AWAY);
 	},
-	'UserPresence:renew'() {
+	'UserPresence:ping'() {
 		const { connection, userId } = this;
 		if (!userId || !connection) {
 			return;
 		}
-		return Presence.renewConnection(userId, connection.id);
+		return Presence.setConnectionStatus(userId, connection.id);
 	},
 });

ee/apps/ddp-streamer/src/DDPStreamer.ts

@@ -221,7 +221,7 @@ export class DDPStreamer extends ServiceClass {
 			if (!userId) {
 				return;
 			}
-			Presence.renewConnection(userId, connection.id);
+			Presence.setConnectionStatus(userId, connection.id);
 		});
 	}
 

ee/apps/ddp-streamer/src/configureServer.ts

@@ -121,14 +121,21 @@ server.methods({
 		if (!userId) {
 			return;
 		}
-		return Presence.setConnectionStatus(userId, UserStatus.ONLINE, session);
+		return Presence.setConnectionStatus(userId, session, UserStatus.ONLINE);
 	},
 	'UserPresence:away'() {
 		const { userId, session } = this;
 		if (!userId) {
 			return;
 		}
-		return Presence.setConnectionStatus(userId, UserStatus.AWAY, session);
+		return Presence.setConnectionStatus(userId, session, UserStatus.AWAY);
+	},
+	'UserPresence:ping'() {
+		const { userId, session } = this;
+		if (!userId) {
+			return;
+		}
+		return Presence.setConnectionStatus(userId, session);
 	},
 	'setUserStatus'(status, statusText) {
 		const { userId } = this;

ee/packages/presence/src/Presence.ts

@@ -4,7 +4,7 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { UserStatus } from '@rocket.chat/core-typings';
 import { Settings, Users, UsersSessions } from '@rocket.chat/models';
 
-import { processPresenceAndStatus } from './lib/processConnectionStatus';
+import { processPresenceAndStatus } from './processPresenceAndStatus';
 
 const MAX_CONNECTIONS = 200;
 
@@ -128,7 +128,6 @@ export class Presence extends ServiceClass implements IPresence {
 			id: session,
 			instanceId: nodeId,
 			status: UserStatus.ONLINE,
-			expiresAt: new Date(Date.now() + 5 * 60 * 1000),
 		});
 
 		await this.updateUserPresence(uid);
@@ -181,10 +180,6 @@ export class Presence extends ServiceClass implements IPresence {
 		return affectedUsers.map(({ _id }) => _id);
 	}
 
-	async renewConnection(uid: string, connectionId: string): Promise<void> {
-		await UsersSessions.renewConnectionStatusById(uid, connectionId, new Date(Date.now() + 5 * 60 * 1000));
-	}
-
 	async setStatus(uid: string, statusDefault: UserStatus, statusText?: string): Promise<boolean> {
 		const userSessions = (await UsersSessions.findOneById(uid)) || { connections: [] };
 
@@ -208,7 +203,7 @@ export class Presence extends ServiceClass implements IPresence {
 		return !!result.modifiedCount;
 	}
 
-	async setConnectionStatus(uid: string, status: UserStatus, session: string): Promise<boolean> {
+	async setConnectionStatus(uid: string, session: string, status?: UserStatus): Promise<boolean> {
 		const result = await UsersSessions.updateConnectionStatusById(uid, session, status);
 
 		await this.updateUserPresence(uid);

ee/packages/presence/src/lib/processConnectionStatus.ts

@@ -1,4 +1,3 @@
-import type { IUserSessionConnection } from '@rocket.chat/core-typings';
 import { UserStatus } from '@rocket.chat/core-typings';
 
 /**
@@ -13,39 +12,3 @@ export const processConnectionStatus = (current: UserStatus, status: UserStatus)
 	}
 	return current;
 };
-
-/**
- * Defines user's status based on presence and connection status
- */
-export const processStatus = (statusConnection: UserStatus, statusDefault: UserStatus): UserStatus => {
-	if (statusConnection === UserStatus.OFFLINE) {
-		return statusConnection;
-	}
-
-	if (statusDefault === UserStatus.ONLINE) {
-		return statusConnection;
-	}
-
-	return statusDefault;
-};
-
-/**
- * Defines user's status and connection status based on user's connections and default status
- */
-export const processPresenceAndStatus = (
-	userSessions: IUserSessionConnection[] = [],
-	statusDefault = UserStatus.ONLINE,
-	currentDate = new Date(),
-): { status: UserStatus; statusConnection: UserStatus } => {
-	const statusConnection = userSessions
-		.filter((s) => s.expiresAt > currentDate)
-		.map((s) => s.status)
-		.reduce(processConnectionStatus, UserStatus.OFFLINE);
-
-	const status = processStatus(statusConnection, statusDefault);
-
-	return {
-		status,
-		statusConnection,
-	};
-};

ee/packages/presence/src/lib/processStatus.ts

@@ -0,0 +1,16 @@
+import { UserStatus } from '@rocket.chat/core-typings';
+
+/**
+ * Defines user's status based on presence and connection status
+ */
+export const processStatus = (statusConnection: UserStatus, statusDefault: UserStatus): UserStatus => {
+	if (statusConnection === UserStatus.OFFLINE) {
+		return statusConnection;
+	}
+
+	if (statusDefault === UserStatus.ONLINE) {
+		return statusConnection;
+	}
+
+	return statusDefault;
+};

ee/packages/presence/src/processPresenceAndStatus.ts

@@ -0,0 +1,31 @@
+import type { IUserSessionConnection } from '@rocket.chat/core-typings';
+import { UserStatus } from '@rocket.chat/core-typings';
+
+import { processConnectionStatus } from './lib/processConnectionStatus';
+import { processStatus } from './lib/processStatus';
+
+const isAtMostFiveMinutesAgo = (userSession: IUserSessionConnection): boolean => {
+	const now = Date.now();
+	const diff = now - userSession._updatedAt.getTime();
+	return diff <= 300_000; // 5 minutes in milliseconds
+};
+
+/**
+ * Defines user's status and connection status based on user's connections and default status
+ */
+export const processPresenceAndStatus = (
+	userSessions: IUserSessionConnection[] = [],
+	statusDefault = UserStatus.ONLINE,
+): { status: UserStatus; statusConnection: UserStatus } => {
+	const statusConnection = userSessions
+		.filter(isAtMostFiveMinutesAgo)
+		.map((s) => s.status)
+		.reduce(processConnectionStatus, UserStatus.OFFLINE);
+
+	const status = processStatus(statusConnection, statusDefault);
+
+	return {
+		status,
+		statusConnection,
+	};
+};