[FIX] Too many request on loadHistory method

app/lib/server/functions/loadMessageHistory.js

@@ -10,7 +10,7 @@ settings.get('Hide_System_Messages', function(key, values) {
 	hiddenTypes.forEach((item) => hideMessagesOfTypeServer.add(item));
 });
 
-export const loadMessageHistory = function loadMessageHistory({ userId, rid, end, limit = 20, ls }) {
+export const loadMessageHistory = function loadMessageHistory({ userId, rid, end, limit = 20, ls, showThreadMessages = true }) {
 	const room = Rooms.findOne(rid, { fields: { sysMes: 1 } });
 
 	const hiddenMessageTypes = Array.isArray(room && room.sysMes) ? room.sysMes : Array.from(hideMessagesOfTypeServer.values()); // TODO probably remove on chained event system
@@ -27,7 +27,20 @@ export const loadMessageHistory = function loadMessageHistory({ userId, rid, end
 		};
 	}
 
-	const records = end != null ? Messages.findVisibleByRoomIdBeforeTimestampNotContainingTypes(rid, end, hiddenMessageTypes, options).fetch() : Messages.findVisibleByRoomIdNotContainingTypes(rid, hiddenMessageTypes, options).fetch();
+	const records = end != null
+		? Messages.findVisibleByRoomIdBeforeTimestampNotContainingTypes(
+			rid,
+			end,
+			hiddenMessageTypes,
+			options,
+			showThreadMessages,
+		).fetch()
+		: Messages.findVisibleByRoomIdNotContainingTypes(
+			rid,
+			hiddenMessageTypes,
+			options,
+			showThreadMessages,
+		).fetch();
 	const messages = normalizeMessagesForUser(records, userId);
 	let unreadNotLoaded = 0;
 	let firstUnread;
@@ -37,12 +50,19 @@ export const loadMessageHistory = function loadMessageHistory({ userId, rid, end
 
 		if ((firstMessage != null ? firstMessage.ts : undefined) > ls) {
 			delete options.limit;
-			const unreadMessages = Messages.findVisibleByRoomIdBetweenTimestampsNotContainingTypes(rid, ls, firstMessage.ts, hiddenMessageTypes, {
-				limit: 1,
-				sort: {
-					ts: 1,
+			const unreadMessages = Messages.findVisibleByRoomIdBetweenTimestampsNotContainingTypes(
+				rid,
+				ls,
+				firstMessage.ts,
+				hiddenMessageTypes,
+				{
+					limit: 1,
+					sort: {
+						ts: 1,
+					},
 				},
-			});
+				showThreadMessages,
+			);
 
 			firstUnread = unreadMessages.fetch()[0];
 			unreadNotLoaded = unreadMessages.count();

app/models/server/models/Messages.js

@@ -251,12 +251,19 @@ export class Messages extends Base {
 		return this.find(query, options);
 	}
 
-	findVisibleByRoomIdNotContainingTypes(roomId, types, options) {
+	findVisibleByRoomIdNotContainingTypes(roomId, types, options, showThreadMessages = true) {
 		const query = {
 			_hidden: {
 				$ne: true,
 			},
 			rid: roomId,
+			...!showThreadMessages && {
+				$or: [{
+					tmid: { $exists: false },
+				}, {
+					tshow: true,
+				}],
+			},
 		};
 
 		if (Match.test(types, [String]) && (types.length > 0)) {
@@ -360,7 +367,7 @@ export class Messages extends Base {
 		return this.find(query, options);
 	}
 
-	findVisibleByRoomIdBeforeTimestampNotContainingTypes(roomId, timestamp, types, options) {
+	findVisibleByRoomIdBeforeTimestampNotContainingTypes(roomId, timestamp, types, options, showThreadMessages = true) {
 		const query = {
 			_hidden: {
 				$ne: true,
@@ -369,6 +376,13 @@ export class Messages extends Base {
 			ts: {
 				$lt: timestamp,
 			},
+			...!showThreadMessages && {
+				$or: [{
+					tmid: { $exists: false },
+				}, {
+					tshow: true,
+				}],
+			},
 		};
 
 		if (Match.test(types, [String]) && (types.length > 0)) {
@@ -378,7 +392,7 @@ export class Messages extends Base {
 		return this.find(query, options);
 	}
 
-	findVisibleByRoomIdBetweenTimestampsNotContainingTypes(roomId, afterTimestamp, beforeTimestamp, types, options) {
+	findVisibleByRoomIdBetweenTimestampsNotContainingTypes(roomId, afterTimestamp, beforeTimestamp, types, options, showThreadMessages = true) {
 		const query = {
 			_hidden: {
 				$ne: true,
@@ -388,6 +402,13 @@ export class Messages extends Base {
 				$gt: afterTimestamp,
 				$lt: beforeTimestamp,
 			},
+			...!showThreadMessages && {
+				$or: [{
+					tmid: { $exists: false },
+				}, {
+					tshow: true,
+				}],
+			},
 		};
 
 		if (Match.test(types, [String]) && (types.length > 0)) {

app/ui-utils/client/lib/RoomHistoryManager.js

@@ -2,6 +2,9 @@ import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Blaze } from 'meteor/blaze';
+import { v4 as uuidv4 } from 'uuid';
+import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
+import { Emitter } from '@rocket.chat/emitter';
 
 import { promises } from '../../../promises/client';
 import { RoomManager } from './RoomManager';
@@ -99,9 +102,11 @@ const defaultLimit = parseInt(getConfig('roomListLimit')) || 50;
 
 const waitAfterFlush = (fn) => setTimeout(() => Tracker.afterFlush(fn), 10);
 
-export const RoomHistoryManager = new class {
+export const RoomHistoryManager = new class extends Emitter {
 	constructor() {
+		super();
 		this.histories = {};
+		this.requestsList = [];
 	}
 
 	getRoom(rid) {
@@ -119,6 +124,37 @@ export const RoomHistoryManager = new class {
 		return this.histories[rid];
 	}
 
+	async queue() {
+		return new Promise((resolve) => {
+			const requestId = uuidv4();
+			const done = () => {
+				this.lastRequest = new Date();
+				resolve();
+			};
+			if (this.requestsList.length === 0) {
+				return this.run(done);
+			}
+			this.requestsList.push(requestId);
+			this.once(requestId, done);
+		});
+	}
+
+	run(fn) {
+		const difference = differenceInMilliseconds(new Date(), this.lastRequest);
+		if (!this.lastRequest || difference > 500) {
+			return fn();
+		}
+		return setTimeout(fn, 500 - difference);
+	}
+
+	unqueue() {
+		const requestId = this.requestsList.pop();
+		if (!requestId) {
+			return;
+		}
+		this.run(() => this.emit(requestId));
+	}
+
 	async getMore(rid, limit = defaultLimit) {
 		let ts;
 		const room = this.getRoom(rid);
@@ -129,6 +165,8 @@ export const RoomHistoryManager = new class {
 
 		room.isLoading.set(true);
 
+		await this.queue();
+
 		// ScrollListener.setLoader true
 		const lastMessage = ChatMessage.findOne({ rid, _hidden: { $ne: true } }, { sort: { ts: 1 } });
 		// lastMessage ?= ChatMessage.findOne({rid: rid}, {sort: {ts: 1}})
@@ -151,8 +189,10 @@ export const RoomHistoryManager = new class {
 			typeName = (curRoomDoc ? curRoomDoc.t : undefined) + (curRoomDoc ? curRoomDoc.name : undefined);
 		}
 
-		const result = await call('loadHistory', rid, ts, limit, ls);
+		const showMessageInMainThread = getUserPreference(Meteor.userId(), 'showMessageInMainThread', false);
+		const result = await call('loadHistory', rid, ts, limit, ls, showMessageInMainThread);
 
+		this.unqueue();
 
 		let previousHeight;
 		let scroll;
@@ -176,12 +216,11 @@ export const RoomHistoryManager = new class {
 			room.loaded = 0;
 		}
 
-		const showMessageInMainThread = getUserPreference(Meteor.userId(), 'showMessageInMainThread', false);
-
 		const visibleMessages = messages.filter((msg) => !msg.tmid || showMessageInMainThread || msg.tshow);
 
 		room.loaded += visibleMessages.length;
 
+
 		if (messages.length < limit) {
 			room.hasMore.set(false);
 		}
@@ -202,12 +241,13 @@ export const RoomHistoryManager = new class {
 		});
 	}
 
-	getMoreNext(rid, limit = defaultLimit) {
+	async getMoreNext(rid, limit = defaultLimit) {
 		const room = this.getRoom(rid);
 		if (room.hasMoreNext.curValue !== true) {
 			return;
 		}
 
+		await this.queue();
 		const instance = Blaze.getView($('.messages-box .wrapper')[0]).templateInstance();
 		instance.atBottom = false;
 
@@ -229,25 +269,25 @@ export const RoomHistoryManager = new class {
 		const { ts } = lastMessage;
 
 		if (ts) {
-			return Meteor.call('loadNextMessages', rid, ts, limit, function(err, result) {
-				upsertMessageBulk({
-					msgs: Array.from(result.messages).filter((msg) => msg.t !== 'command'),
-					subscription,
-				});
+			const result = await call('loadNextMessages', rid, ts, limit);
+			upsertMessageBulk({
+				msgs: Array.from(result.messages).filter((msg) => msg.t !== 'command'),
+				subscription,
+			});
 
-				Meteor.defer(() => RoomManager.updateMentionsMarksOfRoom(typeName));
+			Meteor.defer(() => RoomManager.updateMentionsMarksOfRoom(typeName));
 
-				room.isLoading.set(false);
-				if (!room.loaded) {
-					room.loaded = 0;
-				}
+			room.isLoading.set(false);
+			if (!room.loaded) {
+				room.loaded = 0;
+			}
 
-				room.loaded += result.messages.length;
-				if (result.messages.length < limit) {
-					room.hasMoreNext.set(false);
-				}
-			});
+			room.loaded += result.messages.length;
+			if (result.messages.length < limit) {
+				room.hasMoreNext.set(false);
+			}
 		}
+		await this.unqueue();
 	}
 
 	async getSurroundingMessages(message, limit = defaultLimit) {

client/lib/RoomManager.ts

@@ -17,6 +17,8 @@ export class RoomStore extends Emitter<{
 
 	scroll?: number;
 
+	lm?: Date;
+
 	atBottom = true;
 
 	constructor(readonly rid: string) {

server/methods/loadHistory.js

@@ -4,10 +4,10 @@ import { check } from 'meteor/check';
 import { Subscriptions } from '../../app/models';
 import { hasPermission } from '../../app/authorization';
 import { settings } from '../../app/settings';
-import { loadMessageHistory } from '../../app/lib';
+import { loadMessageHistory } from '../../app/lib/server';
 
 Meteor.methods({
-	loadHistory(rid, end, limit = 20, ls) {
+	loadHistory(rid, end, limit = 20, ls, showThreadMessages = true) {
 		check(rid, String);
 
 		if (!Meteor.userId() && settings.get('Accounts_AllowAnonymousRead') === false) {
@@ -30,6 +30,6 @@ Meteor.methods({
 			return false;
 		}
 
-		return loadMessageHistory({ userId: fromId, rid, end, limit, ls });
+		return loadMessageHistory({ userId: fromId, rid, end, limit, ls, showThreadMessages });
 	},
 });