avoid missing container errors

Author: sampaiodiego

apps/meteor/ee/server/startup/federation.ts

@@ -9,21 +9,26 @@ import { registerFederationRoutes } from '../api/federation';
 const logger = new Logger('Federation');
 
 export const startFederationService = async (): Promise<void> => {
-	await setupFederationMatrix(InstanceStatus.id());
+	try {
+		const isEnabled = await setupFederationMatrix(InstanceStatus.id());
+
+		api.registerService(new FederationMatrix());
 
-	api.registerService(new FederationMatrix());
+		await registerFederationRoutes();
 
-	// TODO move to service/setup?
-	StreamerCentral.on('broadcast', (name, eventName, args) => {
-		if (name === 'notify-room' && eventName.endsWith('user-activity')) {
-			const [rid] = eventName.split('/');
-			const [user, activity] = args;
-			void FederationMatrixService.notifyUserTyping(rid, user, activity.includes('user-typing'));
+		// only registers the typing listener if the service is enabled
+		if (!isEnabled) {
+			return;
 		}
-	});
 
-	try {
-		await registerFederationRoutes();
+		// TODO move to service/setup?
+		StreamerCentral.on('broadcast', (name, eventName, args) => {
+			if (name === 'notify-room' && eventName.endsWith('user-activity')) {
+				const [rid] = eventName.split('/');
+				const [user, activity] = args;
+				void FederationMatrixService.notifyUserTyping(rid, user, activity.includes('user-typing'));
+			}
+		});
 	} catch (error) {
 		logger.error('Failed to start federation-matrix service:', error);
 	}

ee/packages/federation-matrix/src/setup.ts

@@ -2,20 +2,23 @@ import { License } from '@rocket.chat/core-services';
 import { Emitter } from '@rocket.chat/emitter';
 import type { HomeserverEventSignatures } from '@rocket.chat/federation-sdk';
 import { ConfigService, createFederationContainer } from '@rocket.chat/federation-sdk';
+import { Logger } from '@rocket.chat/logger';
 import { Settings } from '@rocket.chat/models';
 
 import { registerEvents } from './events';
 
+const logger = new Logger('FederationSetup');
+
 function validateDomain(domain: string): boolean {
 	const value = domain.trim();
 
 	if (!value) {
-		console.error('The Federation domain is not set');
+		logger.error('The Federation domain is not set');
 		return false;
 	}
 
 	if (value.toLowerCase() !== value) {
-		console.error(`The Federation domain "${value}" cannot have uppercase letters`);
+		logger.error(`The Federation domain "${value}" cannot have uppercase letters`);
 		return false;
 	}
 
@@ -26,23 +29,17 @@ function validateDomain(domain: string): boolean {
 			throw new Error();
 		}
 	} catch {
-		console.error(`The configured Federation domain "${value}" is not valid`);
+		logger.error(`The configured Federation domain "${value}" is not valid`);
 		return false;
 	}
 
 	return true;
 }
 
-export async function setupFederationMatrix(instanceId: string): Promise<void> {
+export async function setupFederationMatrix(instanceId: string): Promise<boolean> {
 	const settingEnabled = (await Settings.getValueById<boolean>('Federation_Service_Enabled')) || false;
 	const serverName = (await Settings.getValueById<string>('Federation_Service_Domain')) || '';
 
-	const serviceEnabled = (await License.hasModule('federation')) && settingEnabled && validateDomain(serverName);
-	if (!serviceEnabled) {
-		console.log('Federation service is disabled');
-		return;
-	}
-
 	const processEDUTyping = (await Settings.getValueById<boolean>('Federation_Service_EDU_Process_Typing')) || false;
 	const processEDUPresence = (await Settings.getValueById<boolean>('Federation_Service_EDU_Process_Presence')) || false;
 	const signingKey = (await Settings.getValueById<string>('Federation_Service_Matrix_Signing_Key')) || '';
@@ -97,8 +94,15 @@ export async function setupFederationMatrix(instanceId: string): Promise<void> {
 		config,
 	);
 
+	const serviceEnabled = (await License.hasModule('federation')) && settingEnabled && validateDomain(serverName);
+	if (!serviceEnabled) {
+		return false;
+	}
+
 	registerEvents(eventHandler, serverName, {
 		typing: processEDUTyping,
 		presence: processEDUPresence,
 	});
+
+	return true;
 }