refactor: streamline state ID retrieval in StateService and enhance auth chain handling in getAuthChain function for improved clarity

ggazzo · ggazzo · commit 5b6f94bc87fa · 2025-09-13T15:58:09.000-03:00
diff --git a/packages/federation-sdk/src/services/event.service.ts b/packages/federation-sdk/src/services/event.service.ts
@@ -758,6 +758,7 @@ export class EventService {
 			for (const [, event] of state.entries()) {
 				// PersistentEventBase has an event getter that contains the actual event data
 				pdus.push(event.event);
+
 				// Get the complete auth chain for this event
 				try {
 					const authChain = await getAuthChain(event, store);
diff --git a/packages/federation-sdk/src/services/state.service.ts b/packages/federation-sdk/src/services/state.service.ts
@@ -248,9 +248,7 @@ export class StateService {
 		}
 
 		// Retrieves a snapshot of a room's state at a given event, in the form of event IDs. This performs the same function as calling /state/{roomId}, however this returns just the event IDs rather than the full events.
-		const stateId = !pdu.isState()
-			? event.stateId
-			: await this.findPreviousStateId(event.stateId);
+		const { stateId } = event;
 
 		const { delta: lastStateDelta, prevStateIds = [] } =
 			(await this.stateRepository.getStateById(stateId)) ?? {};
diff --git a/packages/room/src/state_resolution/definitions/definitions.ts b/packages/room/src/state_resolution/definitions/definitions.ts
@@ -129,7 +129,7 @@ export async function getAuthChain(
 		return newAuthChainPart;
 	};
 
-	return _getAuthChain(event, new Set([event.eventId]));
+	return _getAuthChain(event, new Set([]));
 }
 
 // Auth difference
@@ -149,8 +149,11 @@ export async function getAuthChainDifference(
 				console.warn('event not found in store or remote', eventid);
 				continue;
 			}
-
-			for (const authChainEventId of await getAuthChain(event, store)) {
+			// TODO: deb check this I changed to keep the function behaving as the spec
+			for (const authChainEventId of [
+				...(await getAuthChain(event, store)),
+				event.eventId,
+			]) {
 				authChainForState.add(authChainEventId);
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -248,9 +248,7 @@ export class StateService {`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`// Retrieves a snapshot of a room's state at a given event, in the form of event IDs. This performs the same function as calling /state/{roomId}, however this returns just the event IDs rather than the full events.`
`251`		`- const stateId = !pdu.isState()`
`252`		`- ? event.stateId`
`253`		`- : await this.findPreviousStateId(event.stateId);`
	`251`	`+ const { stateId } = event;`
`254`	`252`
`255`	`253`	`const { delta: lastStateDelta, prevStateIds = [] } =`
`256`	`254`	`(await this.stateRepository.getStateById(stateId)) ?? {};`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ export async function getAuthChain(`
`129`	`129`	`return newAuthChainPart;`
`130`	`130`	`};`
`131`	`131`
`132`		`- return _getAuthChain(event, new Set([event.eventId]));`
	`132`	`+ return _getAuthChain(event, new Set([]));`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`// Auth difference`
`@@ -149,8 +149,11 @@ export async function getAuthChainDifference(`
`149`	`149`	`console.warn('event not found in store or remote', eventid);`
`150`	`150`	`continue;`
`151`	`151`	`}`
`152`		`-`
`153`		`- for (const authChainEventId of await getAuthChain(event, store)) {`
	`152`	`+ // TODO: deb check this I changed to keep the function behaving as the spec`
	`153`	`+ for (const authChainEventId of [`
	`154`	`+ ...(await getAuthChain(event, store)),`
	`155`	`+ event.eventId,`
	`156`	`+ ]) {`
`154`	`157`	`authChainForState.add(authChainEventId);`
`155`	`158`	`}`
`156`	`159`	`}`