refactor: use delay to inject repositories (#293)

Author: sampaiodiego

packages/federation-sdk/src/index.ts

@@ -23,6 +23,7 @@ import { Upload } from './repositories/upload.repository';
 import { FederationSDK } from './sdk';
 import { DatabaseConnectionService } from './services/database-connection.service';
 import { EventEmitterService } from './services/event-emitter.service';
+import { EventService } from './services/event.service';
 
 export type {
 	Pdu,
@@ -320,6 +321,12 @@ export async function init({
 
 	// this is required to initialize the listener and register the queue handler
 	container.resolve(StagingAreaListener);
+
+	// once the db is initialized we look for old staged events and try to process them
+	setTimeout(async () => {
+		const eventService = container.resolve(EventService);
+		await eventService.processOldStagedEvents();
+	}, 5000);
 }
 
 export const federationSDK = container.resolve(FederationSDK);

packages/federation-sdk/src/sdk.ts

@@ -1,6 +1,6 @@
 import type { EventStore } from '@rocket.chat/federation-core';
 import type { PduForType, PduType } from '@rocket.chat/federation-room';
-import { delay, inject, singleton } from 'tsyringe';
+import { singleton } from 'tsyringe';
 
 import { AppConfig, ConfigService } from './services/config.service';
 import { EduService } from './services/edu.service';
@@ -22,29 +22,20 @@ import { WellKnownService } from './services/well-known.service';
 @singleton()
 export class FederationSDK {
 	constructor(
-		@inject(delay(() => RoomService)) private readonly roomService: RoomService,
-		@inject(delay(() => MessageService))
+		private readonly roomService: RoomService,
 		private readonly messageService: MessageService,
-		@inject(delay(() => InviteService))
 		private readonly inviteService: InviteService,
-		@inject(delay(() => EventService))
 		private readonly eventService: EventService,
-		@inject(delay(() => EduService)) private readonly eduService: EduService,
-		@inject(delay(() => ServerService))
+		private readonly eduService: EduService,
 		private readonly serverService: ServerService,
 		private readonly configService: ConfigService,
-		@inject(delay(() => EventAuthorizationService))
 		private readonly eventAuthorizationService: EventAuthorizationService,
-		@inject(delay(() => StateService))
 		private readonly stateService: StateService,
 		private readonly mediaService: MediaService,
-		@inject(delay(() => ProfilesService))
 		private readonly profilesService: ProfilesService,
-		@inject(delay(() => SendJoinService))
 		private readonly sendJoinService: SendJoinService,
 		private readonly wellKnownService: WellKnownService,
 		private readonly federationRequestService: FederationRequestService,
-		@inject(delay(() => FederationService))
 		private readonly federationService: FederationService,
 	) {}
 

packages/federation-sdk/src/services/edu.service.ts

@@ -6,7 +6,6 @@ import {
 import { createLogger } from '@rocket.chat/federation-core';
 import { singleton } from 'tsyringe';
 import { ConfigService } from './config.service';
-import { EventEmitterService } from './event-emitter.service';
 import { FederationService } from './federation.service';
 import { StateService } from './state.service';
 
@@ -17,7 +16,6 @@ export class EduService {
 	constructor(
 		private readonly configService: ConfigService,
 		private readonly federationService: FederationService,
-		private readonly eventEmitterService: EventEmitterService,
 		private readonly stateService: StateService,
 	) {}
 

packages/federation-sdk/src/services/event-authorization.service.ts

@@ -9,7 +9,7 @@ import type {
 	Pdu,
 	PersistentEventBase,
 } from '@rocket.chat/federation-room';
-import { singleton } from 'tsyringe';
+import { delay, inject, singleton } from 'tsyringe';
 import { UploadRepository } from '../repositories/upload.repository';
 import { ConfigService } from './config.service';
 import { EventService } from './event.service';
@@ -31,8 +31,9 @@ export class EventAuthorizationService {
 		private readonly stateService: StateService,
 		private readonly eventService: EventService,
 		private readonly configService: ConfigService,
-		private readonly uploadRepository: UploadRepository,
 		private readonly serverService: ServerService,
+		@inject(delay(() => UploadRepository))
+		private readonly uploadRepository: UploadRepository,
 	) {}
 
 	async authorizeEvent(event: Pdu, authEvents: Pdu[]): Promise<boolean> {

packages/federation-sdk/src/services/event-fetcher.service.ts

@@ -2,7 +2,7 @@ import { isFederationEventWithPDUs } from '@rocket.chat/federation-core';
 import { createLogger } from '@rocket.chat/federation-core';
 import { generateId } from '@rocket.chat/federation-core';
 import { EventID, Pdu } from '@rocket.chat/federation-room';
-import { singleton } from 'tsyringe';
+import { delay, inject, singleton } from 'tsyringe';
 import { EventRepository } from '../repositories/event.repository';
 import { ConfigService } from './config.service';
 import { FederationService } from './federation.service';
@@ -17,10 +17,9 @@ export class EventFetcherService {
 	private readonly logger = createLogger('EventFetcherService');
 
 	constructor(
+		@inject(delay(() => EventRepository))
 		private readonly eventRepository: EventRepository,
-
 		private readonly federationService: FederationService,
-
 		private readonly configService: ConfigService,
 	) {}
 

packages/federation-sdk/src/services/event.service.ts

@@ -23,7 +23,7 @@ import {
 	RoomVersion,
 	getAuthChain,
 } from '@rocket.chat/federation-room';
-import { singleton } from 'tsyringe';
+import { delay, inject, singleton } from 'tsyringe';
 import type { z } from 'zod';
 import { StagingAreaQueue } from '../queues/staging-area.queue';
 import { EventStagingRepository } from '../repositories/event-staging.repository';
@@ -47,22 +47,18 @@ export class EventService {
 	private currentTransactions = new Set<string>();
 
 	constructor(
-		private readonly eventRepository: EventRepository,
-		private readonly eventStagingRepository: EventStagingRepository,
-		private readonly lockRepository: LockRepository,
 		private readonly configService: ConfigService,
-
 		private readonly stagingAreaQueue: StagingAreaQueue,
 		private readonly stateService: StateService,
 		private readonly serverService: ServerService,
-
 		private readonly eventEmitterService: EventEmitterService,
-	) {
-		// on startup we look for old staged events and try to process them
-		setTimeout(() => {
-			void this.processOldStagedEvents();
-		}, 5000);
-	}
+		@inject(delay(() => EventRepository))
+		private readonly eventRepository: EventRepository,
+		@inject(delay(() => EventStagingRepository))
+		private readonly eventStagingRepository: EventStagingRepository,
+		@inject(delay(() => LockRepository))
+		private readonly lockRepository: LockRepository,
+	) {}
 
 	async getEventById<T extends PduType, P extends EventStore<PduForType<T>>>(
 		eventId: EventID,
@@ -670,7 +666,7 @@ export class EventService {
 		return userPowerLevel >= requiredPowerLevel;
 	}
 
-	private async processOldStagedEvents() {
+	async processOldStagedEvents() {
 		this.logger.info('Processing old staged events on startup');
 
 		const rooms = await this.eventStagingRepository.getDistinctStagedRooms();

packages/federation-sdk/src/services/federation.service.ts

@@ -8,7 +8,7 @@ import {
 	PersistentEventFactory,
 	extractDomainFromId,
 } from '@rocket.chat/federation-room';
-import { delay, inject, singleton } from 'tsyringe';
+import { singleton } from 'tsyringe';
 import {
 	FederationEndpoints,
 	type MakeJoinResponse,
@@ -27,10 +27,7 @@ export class FederationService {
 
 	constructor(
 		private readonly configService: ConfigService,
-
 		private readonly requestService: FederationRequestService,
-
-		@inject(delay(() => StateService))
 		private readonly stateService: StateService,
 	) {}
 

packages/federation-sdk/src/services/invite.service.ts

@@ -11,11 +11,7 @@ import {
 } from '@rocket.chat/federation-room';
 import { singleton } from 'tsyringe';
 import { ConfigService } from './config.service';
-import {
-	AclDeniedError,
-	EventAuthorizationService,
-} from './event-authorization.service';
-import { EventService } from './event.service';
+import { EventAuthorizationService } from './event-authorization.service';
 import { FederationService } from './federation.service';
 import { StateService, UnknownRoomError } from './state.service';
 // TODO: Have better (detailed/specific) event input type
@@ -37,8 +33,6 @@ export class InviteService {
 	private readonly logger = createLogger('InviteService');
 
 	constructor(
-		private readonly eventService: EventService,
-
 		private readonly federationService: FederationService,
 		private readonly stateService: StateService,
 		private readonly configService: ConfigService,

packages/federation-sdk/src/services/message.service.ts

@@ -3,14 +3,10 @@ import { createLogger } from '@rocket.chat/federation-core';
 import {
 	type EventID,
 	type PersistentEventBase,
-	PersistentEventFactory,
 	RoomID,
-	type RoomVersion,
 	UserID,
 } from '@rocket.chat/federation-room';
 import { singleton } from 'tsyringe';
-import { EventRepository } from '../repositories/event.repository';
-import { ConfigService } from './config.service';
 import { EventService } from './event.service';
 import { FederationService } from './federation.service';
 import { RoomService } from './room.service';
@@ -58,13 +54,9 @@ export class MessageService {
 
 	constructor(
 		private readonly eventService: EventService,
-		private readonly configService: ConfigService,
-
 		private readonly federationService: FederationService,
 		private readonly roomService: RoomService,
 		private readonly stateService: StateService,
-
-		private readonly eventRepository: EventRepository,
 	) {}
 
 	private buildReplyContent(reply: Reply) {

packages/federation-sdk/src/services/profiles.service.ts

@@ -6,13 +6,11 @@ import {
 	EventID,
 	Pdu,
 	PduForType,
-	PersistentEventFactory,
 	RoomID,
 	RoomVersion,
 	UserID,
 } from '@rocket.chat/federation-room';
 import { singleton } from 'tsyringe';
-import { EventRepository } from '../repositories/event.repository';
 import { StateService } from './state.service';
 
 @singleton()
@@ -22,9 +20,6 @@ export class ProfilesService {
 	constructor(
 		private readonly configService: ConfigService,
 		private readonly eventService: EventService,
-		// private readonly roomService: RoomService,
-
-		private readonly eventRepository: EventRepository,
 		private readonly stateService: StateService,
 	) {}
 	async queryProfile(userId: string): Promise<{