regression: timed status sometimes never reverts after expiring (#41047)

Author: ricardogarim

ee/packages/presence/src/Presence.ts

@@ -48,6 +48,8 @@ export class Presence extends ServiceClass implements IPresence {
 
 	private expirationTimeout?: NodeJS.Timeout;
 
+	private expirationScheduleToken?: symbol;
+
 	constructor() {
 		super();
 
@@ -131,10 +133,19 @@ export class Presence extends ServiceClass implements IPresence {
 	}
 
 	private async setupNextExpiration(): Promise<void> {
+		const token = Symbol();
+		this.expirationScheduleToken = token;
+
+		const next = await Users.findNextStatusExpiration();
+
+		// A newer reschedule replaced our token while we awaited the lookup; let it arm the timer.
+		if (this.expirationScheduleToken !== token) {
+			return;
+		}
+
 		clearTimeout(this.expirationTimeout);
 		this.expirationTimeout = undefined;
 
-		const next = await Users.findNextStatusExpiration();
 		if (!next?.statusExpiresAt) {
 			return;
 		}
@@ -174,7 +185,9 @@ export class Presence extends ServiceClass implements IPresence {
 
 	override async stopped(): Promise<void> {
 		this.reaper.stop();
+		this.expirationScheduleToken = undefined;
 		clearTimeout(this.expirationTimeout);
+		this.expirationTimeout = undefined;
 		clearTimeout(this.lostConTimeout);
 	}
 

packages/models/src/models/Users.ts

@@ -1133,7 +1133,7 @@ export class UsersRaw extends BaseRaw<IUser, DefaultFields<IUser>> implements IU
 
 	findNextStatusExpiration() {
 		return this.findOne<Pick<IUser, '_id' | 'statusExpiresAt'>>(
-			{ statusExpiresAt: { $gte: new Date() } },
+			{ statusExpiresAt: { $exists: true } },
 			{ projection: { _id: 1, statusExpiresAt: 1 }, sort: { statusExpiresAt: 1 } },
 		);
 	}