feat: enhance event emission with detailed event data

ggazzo · ggazzo · commit d57694f5fddf · 2025-10-01T23:03:51.000-03:00
diff --git a/packages/federation-sdk/src/index.ts b/packages/federation-sdk/src/index.ts
@@ -1,5 +1,5 @@
 import type { Membership, MessageType } from '@rocket.chat/federation-core';
-import type { EventID } from '@rocket.chat/federation-room';
+import type { EventID, PduForType } from '@rocket.chat/federation-room';
 import { container } from 'tsyringe';
 import { ConfigService } from './services/config.service';
 import { EduService } from './services/edu.service';
@@ -125,6 +125,8 @@ export type HomeserverEventSignatures = {
 	};
 	'homeserver.matrix.message': {
 		event_id: EventID;
+		event: PduForType<'m.room.message'>;
+
 		room_id: string;
 		sender: string;
 		origin_server_ts: number;
@@ -199,19 +201,10 @@ export type HomeserverEventSignatures = {
 			};
 		};
 	};
-	'homeserver.matrix.accept-invite': {
-		event_id: EventID;
-		room_id: string;
-		sender: string;
-		origin_server_ts: number;
-		content: {
-			avatar_url: string | null;
-			displayname: string;
-			membership: Membership;
-		};
-	};
 	'homeserver.matrix.reaction': {
 		event_id: EventID;
+		event: PduForType<'m.reaction'>;
+
 		room_id: string;
 		sender: string;
 		origin_server_ts: number;
@@ -225,6 +218,8 @@ export type HomeserverEventSignatures = {
 	};
 	'homeserver.matrix.redaction': {
 		event_id: EventID;
+		event: PduForType<'m.room.redaction'>;
+
 		room_id: string;
 		sender: string;
 		origin_server_ts: number;
@@ -235,6 +230,8 @@ export type HomeserverEventSignatures = {
 	};
 	'homeserver.matrix.membership': {
 		event_id: EventID;
+		event: PduForType<'m.room.member'>;
+
 		room_id: string;
 		sender: string;
 		state_key: string;
@@ -247,15 +244,24 @@ export type HomeserverEventSignatures = {
 		};
 	};
 	'homeserver.matrix.room.name': {
+		event_id: EventID;
+		event: PduForType<'m.room.name'>;
 		room_id: string; // name of the room being changed
 		user_id: string; // user who changed the name
 		name: string; // new name of the room
 	};
 	'homeserver.matrix.room.topic': {
+		event_id: EventID;
+		event: PduForType<'m.room.topic'>;
+
 		room_id: string; // topic of the room being changed
 		user_id: string; // user who changed the topic
 		topic: string; // new topic of the room
 	};
+	'homeserver.matrix.room.power_levels': {
+		event_id: EventID;
+		event: PduForType<'m.room.power_levels'>;
+	};
 	'homeserver.matrix.room.role': {
 		sender_id: string; // who changed
 		user_id: string; // whose changed
diff --git a/packages/federation-sdk/src/services/room.service.ts b/packages/federation-sdk/src/services/room.service.ts
@@ -820,11 +820,12 @@ export class RoomService {
 			await stateService.persistStateEvent(membershipEvent);
 
 			this.eventEmitterService.emit('homeserver.matrix.membership', {
+				event_id: membershipEvent.eventId,
+				event: membershipEvent.event,
 				room_id: roomId,
 				state_key: userId,
 				content: { membership: 'join' },
 				sender: userId,
-				event_id: membershipEvent.eventId,
 				origin_server_ts: Date.now(),
 			});
 
diff --git a/packages/federation-sdk/src/services/send-join.service.ts b/packages/federation-sdk/src/services/send-join.service.ts
@@ -73,6 +73,7 @@ export class SendJoinService {
 
 		this.emitterService.emit('homeserver.matrix.membership', {
 			event_id: eventId,
+			event: signedJoinEvent.event,
 			room_id: roomId,
 			sender: signedJoinEvent.sender,
 			state_key: signedJoinEvent.event.state_key,
diff --git a/packages/federation-sdk/src/services/staging-area.service.ts b/packages/federation-sdk/src/services/staging-area.service.ts
@@ -177,6 +177,7 @@ export class StagingAreaService {
 			case event.event.type === 'm.room.message':
 				this.eventEmitterService.emit('homeserver.matrix.message', {
 					event_id: eventId,
+					event: event.event,
 					room_id: roomId,
 					sender: event.event.sender,
 					origin_server_ts: event.event.origin_server_ts,
@@ -210,6 +211,7 @@ export class StagingAreaService {
 			case event.event.type === 'm.reaction': {
 				this.eventEmitterService.emit('homeserver.matrix.reaction', {
 					event_id: eventId,
+					event: event.event,
 					room_id: roomId,
 					sender: event.event.sender,
 					origin_server_ts: event.event.origin_server_ts,
@@ -226,6 +228,7 @@ export class StagingAreaService {
 			case isRedactedEvent(event.event): {
 				this.eventEmitterService.emit('homeserver.matrix.redaction', {
 					event_id: eventId,
+					event: event.event,
 					room_id: roomId,
 					sender: event.event.sender,
 					origin_server_ts: event.event.origin_server_ts,
@@ -239,6 +242,7 @@ export class StagingAreaService {
 			case event.event.type === 'm.room.member': {
 				this.eventEmitterService.emit('homeserver.matrix.membership', {
 					event_id: eventId,
+					event: event.event,
 					room_id: roomId,
 					sender: event.event.sender,
 					state_key: event.event.state_key as string,
@@ -254,6 +258,8 @@ export class StagingAreaService {
 			}
 			case event.event.type === 'm.room.name': {
 				this.eventEmitterService.emit('homeserver.matrix.room.name', {
+					event_id: eventId,
+					event: event.event,
 					room_id: roomId,
 					user_id: event.event.sender,
 					name: event.event.content?.name as string,
@@ -262,13 +268,19 @@ export class StagingAreaService {
 			}
 			case event.event.type === 'm.room.topic': {
 				this.eventEmitterService.emit('homeserver.matrix.room.topic', {
+					event_id: eventId,
+					event: event.event,
 					room_id: roomId,
 					user_id: event.event.sender,
 					topic: event.event.content?.topic as string,
 				});
 				break;
 			}
 			case event.event.type === 'm.room.power_levels': {
+				this.eventEmitterService.emit('homeserver.matrix.room.power_levels', {
+					event_id: eventId,
+					event: event.event,
+				});
 				const getRole = (powerLevel: number) => {
 					if (powerLevel === 100) {
 						return 'owner';
