fix(omnichannel): stop calling an object through proxy (#33719)

RocketChat · Oct 23, 2024 · 63ccadc · 63ccadc
1 parent 82767d8
commit 63ccadc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 24 deletions.
diff --git a/.changeset/smart-radios-reflect.md b/.changeset/smart-radios-reflect.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/core-services": patch
+---
+
+stops calling an object through proxy calling getQueueWorker
diff --git a/apps/meteor/app/livechat/server/lib/RoutingManager.ts b/apps/meteor/app/livechat/server/lib/RoutingManager.ts
@@ -1,5 +1,5 @@
 import { Apps, AppEvents } from '@rocket.chat/apps';
-import { Message, Omnichannel } from '@rocket.chat/core-services';
+import { Message } from '@rocket.chat/core-services';
 import type {
 	ILivechatInquiryRecord,
 	ILivechatVisitor,
@@ -12,7 +12,6 @@ import type {
 	TransferData,
 } from '@rocket.chat/core-typings';
 import { LivechatInquiryStatus } from '@rocket.chat/core-typings';
-import { License } from '@rocket.chat/license';
 import { Logger } from '@rocket.chat/logger';
 import { LivechatInquiry, LivechatRooms, Subscriptions, Rooms, Users } from '@rocket.chat/models';
 import { Match, check } from 'meteor/check';
@@ -36,7 +35,6 @@ const logger = new Logger('RoutingManager');
 
 type Routing = {
 	methods: Record<string, IRoutingMethod>;
-	startQueue(): Promise<void>;
 	isMethodSet(): boolean;
 	registerMethod(name: string, Method: IRoutingMethodConstructor): void;
 	getMethod(): IRoutingMethod;
@@ -68,16 +66,6 @@ type Routing = {
 export const RoutingManager: Routing = {
 	methods: {},
 
-	async startQueue() {
-		const shouldPreventQueueStart = await License.shouldPreventAction('monthlyActiveContacts');
-
-		if (shouldPreventQueueStart) {
-			logger.error('Monthly Active Contacts limit reached. Queue will not start');
-			return;
-		}
-		void (await Omnichannel.getQueueWorker()).shouldStart();
-	},
-
 	isMethodSet() {
 		return settings.get<string>('Livechat_Routing_Method') !== '';
 	},

diff --git a/apps/meteor/app/livechat/server/startup.ts b/apps/meteor/app/livechat/server/startup.ts
@@ -15,7 +15,6 @@ import { settings } from '../../settings/server';
 import { businessHourManager } from './business-hour';
 import { createDefaultBusinessHourIfNotExists } from './business-hour/Helper';
 import { Livechat as LivechatTyped } from './lib/LivechatTyped';
-import { RoutingManager } from './lib/RoutingManager';
 import { LivechatAgentActivityMonitor } from './statistics/LivechatAgentActivityMonitor';
 import './roomAccessValidator.internalService';
 
@@ -82,10 +81,6 @@ Meteor.startup(async () => {
 			: undefined,
 	);
 
-	settings.watch<string>('Livechat_Routing_Method', () => {
-		void RoutingManager.startQueue();
-	});
-
 	// Remove when accounts.onLogout is async
 	Accounts.onLogout(({ user }: { user?: IUser }) => {
 		if (!user?.roles?.includes('livechat-agent') || user?.roles?.includes('bot')) {

diff --git a/apps/meteor/server/services/omnichannel/service.ts b/apps/meteor/server/services/omnichannel/service.ts
@@ -37,6 +37,10 @@ export class OmnichannelService extends ServiceClassInternal implements IOmnicha
 			void (enabled && RoutingManager.isMethodSet() ? this.queueWorker.shouldStart() : this.queueWorker.stop());
 		});
 
+		settings.watch<string>('Livechat_Routing_Method', async () => {
+			this.queueWorker.shouldStart();
+		});
+
 		License.onLimitReached('monthlyActiveContacts', async (): Promise<void> => {
 			this.queueWorker.isRunning() && (await this.queueWorker.stop());
 		});
@@ -52,10 +56,6 @@ export class OmnichannelService extends ServiceClassInternal implements IOmnicha
 		});
 	}
 
-	getQueueWorker(): IOmnichannelQueue {
-		return this.queueWorker;
-	}
-
 	async isWithinMACLimit(room: AtLeast<IOmnichannelRoom, 'v'>): Promise<boolean> {
 		const currentMonth = moment.utc().format('YYYY-MM');
 		return room.v?.activity?.includes(currentMonth) || !(await License.shouldPreventAction('monthlyActiveContacts'));

diff --git a/packages/core-services/src/types/IOmnichannelService.ts b/packages/core-services/src/types/IOmnichannelService.ts
@@ -1,8 +1,7 @@
-import type { AtLeast, IOmnichannelQueue, IOmnichannelRoom } from '@rocket.chat/core-typings';
+import type { AtLeast, IOmnichannelRoom } from '@rocket.chat/core-typings';
 
 import type { IServiceClass } from './ServiceClass';
 
 export interface IOmnichannelService extends IServiceClass {
-	getQueueWorker(): IOmnichannelQueue;
 	isWithinMACLimit(_room: AtLeast<IOmnichannelRoom, 'v'>): Promise<boolean>;
 }