chore: apps-engine message converter cache by any obj

apps/meteor/app/apps/server/bridges/livechat.ts

@@ -1,7 +1,7 @@
-import type { IAppServerOrchestrator, IAppsLivechatMessage } from '@rocket.chat/apps';
+import type { IAppServerOrchestrator, IAppsLivechatMessage, IAppsMessage } from '@rocket.chat/apps';
 import type { IExtraRoomParams } from '@rocket.chat/apps-engine/definition/accessors/ILivechatCreator';
 import type { IVisitor, ILivechatRoom, ILivechatTransferData, IDepartment } from '@rocket.chat/apps-engine/definition/livechat';
-import type { IMessage as IAppsEngineMesage } from '@rocket.chat/apps-engine/definition/messages';
+import type { IMessage as IAppsEngineMessage } from '@rocket.chat/apps-engine/definition/messages';
 import type { IUser } from '@rocket.chat/apps-engine/definition/users';
 import { LivechatBridge } from '@rocket.chat/apps-engine/server/bridges/LivechatBridge';
 import type { ILivechatDepartment, IOmnichannelRoom, SelectedAgent, IMessage, ILivechatVisitor } from '@rocket.chat/core-typings';
@@ -13,6 +13,12 @@ import { deasyncPromise } from '../../../../server/deasync/deasync';
 import { type ILivechatMessage, Livechat as LivechatTyped } from '../../../livechat/server/lib/LivechatTyped';
 import { settings } from '../../../settings/server';
 
+declare module '@rocket.chat/apps/dist/converters/IAppMessagesConverter' {
+	export interface IAppMessagesConverter {
+		convertMessage(message: IMessage, cacheObj?: object): Promise<IAppsMessage>;
+	}
+}
+
 declare module '@rocket.chat/apps-engine/definition/accessors/ILivechatCreator' {
 	interface IExtraRoomParams {
 		customFields?: Record<string, unknown>;
@@ -337,7 +343,7 @@ export class AppLivechatBridge extends LivechatBridge {
 		return Promise.all((await LivechatDepartment.findEnabledWithAgents().toArray()).map(boundConverter));
 	}
 
-	protected async _fetchLivechatRoomMessages(appId: string, roomId: string): Promise<Array<IAppsEngineMesage>> {
+	protected async _fetchLivechatRoomMessages(appId: string, roomId: string): Promise<Array<IAppsEngineMessage>> {
 		this.orch.debugLog(`The App ${appId} is getting the transcript for livechat room ${roomId}.`);
 		const messageConverter = this.orch.getConverters()?.get('messages');
 
@@ -346,8 +352,7 @@ export class AppLivechatBridge extends LivechatBridge {
 		}
 
 		const livechatMessages = await LivechatTyped.getRoomMessages({ rid: roomId });
-
-		return Promise.all(livechatMessages.map((message) => messageConverter.convertMessage(message) as Promise<IAppsEngineMesage>));
+		return Promise.all(await livechatMessages.map((message) => messageConverter.convertMessage(message, livechatMessages)).toArray());
 	}
 
 	protected async setCustomFields(

apps/meteor/app/apps/server/converters/messages.js

@@ -52,19 +52,26 @@ export class AppMessagesConverter {
 		return transformMappedData(message, map);
 	}
 
-	async convertMessage(msgObj) {
+	async convertMessage(msgObj, cacheObj = msgObj) {
 		if (!msgObj) {
 			return undefined;
 		}
 
 		const cache =
-			this.mem.get(msgObj) ??
+			this.mem.get(cacheObj) ??
 			new Map([
 				['room', cachedFunction(this.orch.getConverters().get('rooms').convertById.bind(this.orch.getConverters().get('rooms')))],
-				['user', cachedFunction(this.orch.getConverters().get('users').convertById.bind(this.orch.getConverters().get('users')))],
+				[
+					'user.convertById',
+					cachedFunction(this.orch.getConverters().get('users').convertById.bind(this.orch.getConverters().get('users'))),
+				],
+				[
+					'user.convertToApp',
+					cachedFunction(this.orch.getConverters().get('users').convertToApp.bind(this.orch.getConverters().get('users'))),
+				],
 			]);
 
-		this.mem.set(msgObj, cache);
+		this.mem.set(cacheObj, cache);
 
 		const map = {
 			id: '_id',
@@ -96,7 +103,7 @@ export class AppMessagesConverter {
 					return undefined;
 				}
 
-				return cache.get('user')(editedBy._id);
+				return cache.get('user.convertById')(editedBy._id);
 			},
 			attachments: async (message) => {
 				const result = await this._convertAttachmentsToApp(message.attachments);
@@ -110,8 +117,8 @@ export class AppMessagesConverter {
 
 				// When the message contains token, means the message is from the visitor(omnichannel)
 				const user = await (isMessageFromVisitor(msgObj)
-					? this.orch.getConverters().get('users').convertToApp(message.u)
-					: cache.get('user')(message.u._id));
+					? cache.get('user.convertToApp')(message.u)
+					: cache.get('user.convertById')(message.u._id));
 
 				delete message.u;
 
@@ -120,7 +127,7 @@ export class AppMessagesConverter {
 				 * `sender` as undefined, so we need to add this fallback here.
 				 */
 
-				return user || this.orch.getConverters().get('users').convertToApp(message.u);
+				return user || cache.get('user.convertToApp')(message.u);
 			},
 		};
 

apps/meteor/app/livechat/server/lib/LivechatTyped.ts

@@ -867,7 +867,7 @@ class LivechatClass {
 
 		return Messages.findVisibleByRoomIdNotContainingTypes(rid, ignoredMessageTypes, {
 			sort: { ts: 1 },
-		}).toArray();
+		});
 	}
 
 	async archiveDepartment(_id: string) {