register xmpp appservice

Author: sampaiodiego

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

@@ -115,7 +115,7 @@ export const startFederationService = async (): Promise<void> => {
 				return;
 			}
 
-			const joined = await FederationMatrixService.joinXMPPChatRoom(channel, user);
+			const joined = await FederationMatrixService.joinAppServiceRoom(`_xmpp_${channel}`, user);
 
 			const lng = settings.get<string>('Language') || 'en';
 			if (joined) {

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

@@ -1043,19 +1043,17 @@ export class FederationMatrix extends ServiceClass implements IFederationMatrixS
 		);
 	}
 
-	async joinXMPPChatRoom(roomAlias: string, user: IUser): Promise<boolean> {
+	async joinAppServiceRoom(roomAlias: string, user: IUser): Promise<boolean> {
 		try {
 			if (isUserNativeFederated(user)) {
-				throw new Error('Federated users cannot join XMPP chat rooms');
+				throw new Error('Federated users cannot join App Service rooms');
 			}
 
-			await federationSDK.joinXMPPChatRoom(roomAlias, userIdSchema.parse(`@${user.username}:${this.serverName}`));
-
-			this.logger.info({ msg: 'User joined XMPP chat room successfully', username: user.username, roomAlias });
+			await federationSDK.joinAppServiceRoom(roomAlias, userIdSchema.parse(`@${user.username}:${this.serverName}`));
 
 			return true;
 		} catch (err) {
-			this.logger.error({ msg: 'Failed to join XMPP chat room', err, username: user.username, roomAlias });
+			this.logger.error({ msg: 'Failed to join App Service room', err, username: user.username, roomAlias });
 
 			return false;
 		}

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

@@ -69,7 +69,7 @@ export async function configureFederationMatrixSettings(settings: {
 		throw new Error('Invalid Federation domain');
 	}
 
-	await federationSDK.setConfig({
+	federationSDK.setConfig({
 		instanceId,
 		serverName,
 		keyRefreshInterval: Number.parseInt(process.env.MATRIX_KEY_REFRESH_INTERVAL || '60', 10),
@@ -106,14 +106,27 @@ export async function configureFederationMatrixSettings(settings: {
 			processPresence: processEDUPresence,
 			processReceipt: processEDUReceipt,
 		},
-		...(xmppEnabled && {
-			xmpp: {
-				bridgeURL: xmppBridgeURL,
-				hsToken: xmppBridgeHSToken,
-				asToken: xmppBridgeASToken,
-			},
-		}),
 	});
+
+	if (xmppEnabled) {
+		await federationSDK.registerAppService({
+			_id: 'xmpp',
+			url: xmppBridgeURL,
+			asToken: xmppBridgeASToken,
+			hsToken: xmppBridgeHSToken,
+			senderLocalpart: 'xmpp',
+			namespaces: {
+				users: [{ regex: '@_xmpp_.*', exclusive: true }],
+				aliases: [{ regex: '#_xmpp_.*', exclusive: true }],
+				rooms: [],
+			},
+			protocols: ['xmpp'],
+			rateLimited: false,
+			receiveEphemeral: true,
+		});
+	} else {
+		await federationSDK.unregisterAppService('xmpp');
+	}
 }
 
 export async function setupFederationMatrix() {

packages/core-services/src/types/IFederationMatrixService.ts

@@ -34,6 +34,6 @@ export interface IFederationMatrixService {
 	canUserAccessFederation(user: IUser): Promise<boolean>;
 	notifyRoomRead(params: { room: IRoomNativeFederated; userId: string; threadId?: string }): Promise<void>;
 	updateUserName(user: IUser): Promise<void>;
-	joinXMPPChatRoom(roomAlias: string, user: IUser): Promise<boolean>;
+	joinAppServiceRoom(roomAlias: string, user: IUser): Promise<boolean>;
 	saveFederationMessage(event: { event: PduForType<'m.room.message'>; event_id: EventID }): Promise<void>;
 }