Chore: Replace promises helper

app/lib/client/methods/sendMessage.js

@@ -5,9 +5,9 @@ import s from 'underscore.string';
 import { ChatMessage } from '../../../models';
 import { settings } from '../../../settings';
 import { callbacks } from '../../../callbacks';
-import { promises } from '../../../promises/client';
 import { t } from '../../../utils/client';
 import { dispatchToastMessage } from '../../../../client/lib/toast';
+import { onClientMessageReceived } from '../../../../client/lib/onClientMessageReceived';
 
 Meteor.methods({
 	sendMessage(message) {
@@ -32,7 +32,7 @@ Meteor.methods({
 			message.unread = true;
 		}
 		message = callbacks.run('beforeSaveMessage', message);
-		promises.run('onClientMessageReceived', message).then(function(message) {
+		onClientMessageReceived(message).then(function(message) {
 			ChatMessage.insert(message);
 			return callbacks.run('afterSaveMessage', message);
 		});

app/otr/client/rocketchat.otr.js

@@ -3,9 +3,10 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 
 import { Subscriptions } from '../../models';
-import { promises } from '../../promises/client';
 import { Notifications } from '../../notifications';
 import { t } from '../../utils';
+import { onClientMessageReceived } from '../../../client/lib/onClientMessageReceived';
+import { onClientBeforeSendMessage } from '../../../client/lib/onClientBeforeSendMessage';
 
 class OTRClass {
 	constructor() {
@@ -54,7 +55,7 @@ Meteor.startup(function() {
 		}
 	});
 
-	promises.add('onClientBeforeSendMessage', function(message) {
+	onClientBeforeSendMessage.use(function(message) {
 		if (message.rid && OTR.getInstanceByRoomId(message.rid) && OTR.getInstanceByRoomId(message.rid).established.get()) {
 			return OTR.getInstanceByRoomId(message.rid).encrypt(message)
 				.then((msg) => {
@@ -64,9 +65,9 @@ Meteor.startup(function() {
 				});
 		}
 		return Promise.resolve(message);
-	}, promises.priority.HIGH);
+	});
 
-	promises.add('onClientMessageReceived', function(message) {
+	onClientMessageReceived.use(function(message) {
 		if (message.rid && OTR.getInstanceByRoomId(message.rid) && OTR.getInstanceByRoomId(message.rid).established.get()) {
 			if (message.notification) {
 				message.msg = t('Encrypted_message');
@@ -105,5 +106,5 @@ Meteor.startup(function() {
 			message.msg = '';
 		}
 		return Promise.resolve(message);
-	}, promises.priority.HIGH);
+	});
 });

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

@@ -7,7 +7,6 @@ import differenceInMilliseconds from 'date-fns/differenceInMilliseconds';
 import { Emitter } from '@rocket.chat/emitter';
 import { escapeHTML } from '@rocket.chat/string-helpers';
 
-import { promises } from '../../../promises/client';
 import { RoomManager } from './RoomManager';
 import { readMessage } from './readMessages';
 import { renderMessageBody } from '../../../../client/lib/utils/renderMessageBody';
@@ -16,6 +15,7 @@ import { ChatMessage, ChatSubscription, ChatRoom } from '../../../models';
 import { callWithErrorHandling } from '../../../../client/lib/utils/callWithErrorHandling';
 import { filterMarkdown } from '../../../markdown/lib/markdown';
 import { getUserPreference } from '../../../utils/client';
+import { onClientMessageReceived } from '../../../../client/lib/onClientMessageReceived';
 
 export const normalizeThreadMessage = ({ ...message }) => {
 	if (message.msg) {
@@ -69,7 +69,7 @@ export const upsertMessage = async ({ msg, subscription, uid = Tracker.nonreacti
 	if (msg.t === 'e2e' && !msg.file) {
 		msg.e2e = 'pending';
 	}
-	msg = await promises.run('onClientMessageReceived', msg) || msg;
+	msg = await onClientMessageReceived(msg) || msg;
 
 	const { _id, ...messageToUpsert } = msg;
 

app/ui/client/lib/chatMessages.js

@@ -18,7 +18,6 @@ import {
 } from '../../../ui-utils/client';
 import { settings } from '../../../settings/client';
 import { callbacks } from '../../../callbacks/client';
-import { promises } from '../../../promises/client';
 import { hasAtLeastOnePermission } from '../../../authorization/client';
 import { Messages, Rooms, ChatMessage, ChatSubscription } from '../../../models/client';
 import { emoji } from '../../../emoji/client';
@@ -30,6 +29,7 @@ import { prependReplies } from '../../../../client/lib/utils/prependReplies';
 import { callWithErrorHandling } from '../../../../client/lib/utils/callWithErrorHandling';
 import { handleError } from '../../../../client/lib/utils/handleError';
 import { dispatchToastMessage } from '../../../../client/lib/toast';
+import { onClientBeforeSendMessage } from '../../../../client/lib/onClientBeforeSendMessage';
 
 
 const messageBoxState = {
@@ -284,7 +284,7 @@ export class ChatMessages {
 			readMessage.readNow(rid);
 			readMessage.refreshUnreadMark(rid);
 
-			const message = await promises.run('onClientBeforeSendMessage', {
+			const message = await onClientBeforeSendMessage({
 				_id: Random.id(),
 				rid,
 				tshow,

app/ui/client/lib/notification.js

@@ -12,9 +12,9 @@ import { e2e } from '../../../e2e/client';
 import { Users, ChatSubscription } from '../../../models';
 import { getUserPreference } from '../../../utils';
 import { getUserAvatarURL } from '../../../utils/lib/getUserAvatarURL';
-import { promises } from '../../../promises/client';
 import { CustomSounds } from '../../../custom-sounds/client/lib/CustomSounds';
 import { getAvatarAsPng } from '../../../../client/lib/utils/getAvatarAsPng';
+import { onClientMessageReceived } from '../../../../client/lib/onClientMessageReceived';
 
 export const KonchatNotification = {
 	notificationStatus: new ReactiveVar(),
@@ -34,7 +34,7 @@ export const KonchatNotification = {
 	notify(notification) {
 		if (window.Notification && Notification.permission === 'granted') {
 			const message = { rid: notification.payload != null ? notification.payload.rid : undefined, msg: notification.text, notification: true };
-			return promises.run('onClientMessageReceived', message).then(function(message) {
+			return onClientMessageReceived(message).then(function(message) {
 				const requireInteraction = getUserPreference(Meteor.userId(), 'desktopNotificationRequireInteraction');
 				const n = new Notification(notification.title, {
 					icon: notification.icon || getUserAvatarURL(notification.payload.sender.username),

app/ui/client/views/app/lib/getCommonRoomEvents.js

@@ -11,7 +11,6 @@ import {
 	addMessageToList,
 } from '../../../../../ui-utils/client/lib/MessageAction';
 import { callWithErrorHandling } from '../../../../../../client/lib/utils/callWithErrorHandling';
-import { promises } from '../../../../../promises/client';
 import { isURL } from '../../../../../utils/lib/isURL';
 import { openUserCard } from '../../../lib/UserCard';
 import { messageArgs } from '../../../../../ui-utils/client/lib/messageArgs';
@@ -22,6 +21,7 @@ import { EmojiEvents } from '../../../../../reactions/client/init';
 import { goToRoomById } from '../../../../../../client/lib/utils/goToRoomById';
 import { fireGlobalEvent } from '../../../../../../client/lib/utils/fireGlobalEvent';
 import { isLayoutEmbedded } from '../../../../../../client/lib/utils/isLayoutEmbedded';
+import { onClientBeforeSendMessage } from '../../../../../../client/lib/onClientBeforeSendMessage';
 
 const mountPopover = (e, i, outerContext) => {
 	let context = $(e.target).parents('.message').data('context');
@@ -252,7 +252,7 @@ export const getCommonRoomEvents = () => ({
 			return;
 		}
 
-		msgObject = await promises.run('onClientBeforeSendMessage', msgObject);
+		msgObject = await onClientBeforeSendMessage(msgObject);
 
 		const _chatMessages = chatMessages[rid];
 		if (_chatMessages && await _chatMessages.processSlashCommand(msgObject)) {

client/importPackages.ts

@@ -83,7 +83,6 @@ import '../app/settings/client';
 import '../app/models/client';
 import '../app/callbacks/client';
 import '../app/notifications/client';
-import '../app/promises/client';
 import '../app/ui-utils/client';
 import '../app/ui-cached-collection/client';
 import '../app/action-links/client';

client/lib/onClientBeforeSendMessage.ts

@@ -0,0 +1,4 @@
+import type { IMessage } from '../../definition/IMessage';
+import { createAsyncTransformChain } from '../../lib/transforms';
+
+export const onClientBeforeSendMessage = createAsyncTransformChain<IMessage>();

client/lib/onClientMessageReceived.ts

@@ -0,0 +1,4 @@
+import type { IMessage } from '../../definition/IMessage';
+import { createAsyncTransformChain } from '../../lib/transforms';
+
+export const onClientMessageReceived = createAsyncTransformChain<IMessage>();

client/startup/e2e.ts

@@ -5,11 +5,12 @@ import { Tracker } from 'meteor/tracker';
 import { e2e } from '../../app/e2e/client/rocketchat.e2e';
 import { Subscriptions, Rooms } from '../../app/models/client';
 import { Notifications } from '../../app/notifications/client';
-import { promises } from '../../app/promises/client';
 import { settings } from '../../app/settings/client';
 import { IMessage } from '../../definition/IMessage';
 import { IRoom } from '../../definition/IRoom';
 import { ISubscription } from '../../definition/ISubscription';
+import { onClientBeforeSendMessage } from '../lib/onClientBeforeSendMessage';
+import { onClientMessageReceived } from '../lib/onClientMessageReceived';
 import { isLayoutEmbedded } from '../lib/utils/isLayoutEmbedded';
 import { waitUntilFind } from '../lib/utils/waitUntilFind';
 
@@ -40,12 +41,15 @@ Meteor.startup(() => {
 	});
 
 	let observable: Meteor.LiveQueryHandle | null = null;
+	let offClientMessageReceived: undefined | (() => void);
+	let offClientBeforeSendMessage: undefined | (() => void);
 	Tracker.autorun(() => {
 		if (!e2e.isReady()) {
-			promises.remove('onClientMessageReceived', 'e2e-decript-message');
+			offClientMessageReceived?.();
 			Notifications.unUser('e2ekeyRequest', handle);
 			observable?.stop();
-			return promises.remove('onClientBeforeSendMessage', 'e2e');
+			offClientBeforeSendMessage?.();
+			return;
 		}
 
 		Notifications.onUser('e2ekeyRequest', handle);
@@ -92,47 +96,37 @@ Meteor.startup(() => {
 			},
 		});
 
-		promises.add(
-			'onClientMessageReceived',
-			async (msg: IMessage) => {
-				const e2eRoom = await e2e.getInstanceByRoomId(msg.rid);
-				if (!e2eRoom || !e2eRoom.shouldConvertReceivedMessages()) {
-					return msg;
-				}
-				return e2e.decryptMessage(msg);
-			},
-			promises.priority.HIGH,
-			'e2e-decript-message',
-		);
+		offClientMessageReceived = onClientMessageReceived.use(async (msg: IMessage) => {
+			const e2eRoom = await e2e.getInstanceByRoomId(msg.rid);
+			if (!e2eRoom || !e2eRoom.shouldConvertReceivedMessages()) {
+				return msg;
+			}
+			return e2e.decryptMessage(msg);
+		});
 
 		// Encrypt messages before sending
-		promises.add(
-			'onClientBeforeSendMessage',
-			async (message: IMessage) => {
-				const e2eRoom = await e2e.getInstanceByRoomId(message.rid);
+		offClientBeforeSendMessage = onClientBeforeSendMessage.use(async (message: IMessage) => {
+			const e2eRoom = await e2e.getInstanceByRoomId(message.rid);
 
-				if (!e2eRoom) {
-					return message;
-				}
+			if (!e2eRoom) {
+				return message;
+			}
 
-				const subscription = await waitUntilFind(() => Rooms.findOne({ _id: message.rid }));
+			const subscription = await waitUntilFind(() => Rooms.findOne({ _id: message.rid }));
 
-				subscription.encrypted ? e2eRoom.resume() : e2eRoom.pause();
+			subscription.encrypted ? e2eRoom.resume() : e2eRoom.pause();
 
-				if (!(await e2eRoom.shouldConvertSentMessages())) {
-					return message;
-				}
+			if (!(await e2eRoom.shouldConvertSentMessages())) {
+				return message;
+			}
 
-				// Should encrypt this message.
-				const msg = await e2eRoom.encrypt(message);
+			// Should encrypt this message.
+			const msg = await e2eRoom.encrypt(message);
 
-				message.msg = msg;
-				message.t = 'e2e';
-				message.e2e = 'pending';
-				return message;
-			},
-			promises.priority.HIGH,
-			'e2e',
-		);
+			message.msg = msg;
+			message.t = 'e2e';
+			message.e2e = 'pending';
+			return message;
+		});
 	});
 });