BC-8403 Code improvements

.env.test

@@ -10,6 +10,7 @@ S3_SECRET_KEY=miniouser
 S3_SSL=false
 
 FEATURE_TLDRAW_ENABLED=true
-TLDRAW_WEBSOCKET_URL=ws://localhost:3345
+TLDRAW_WEBSOCKET_URL=ws://localhost:3399
+TLDRAW_WEBSOCKET_PORT=3399
 
 X_API_ALLOWED_KEYS=randomString

src/apps/tldraw-worker.app.ts

@@ -1,9 +1,19 @@
 import { NestFactory } from '@nestjs/core';
 import { WorkerModule } from '../modules/worker/worker.module.js';
+import { WorkerService } from '../modules/worker/worker.service.js';
 
 async function bootstrap(): Promise<void> {
 	const nestApp = await NestFactory.createApplicationContext(WorkerModule);
 
 	await nestApp.init();
+	const workerService = await nestApp.resolve(WorkerService);
+
+	try {
+		workerService.start();
+	} catch (error) {
+		console.error(error);
+		workerService.stop();
+		process.exit(1);
+	}
 }
 bootstrap();

src/infra/authorization/authorization.service.ts

@@ -94,7 +94,6 @@ export class AuthorizationService {
 
 	private createErrorResponsePayload(code: number, reason: string): ResponsePayload {
 		const response = ResponsePayloadBuilder.buildWithError(code, reason);
-		this.logger.log(`Error: ${code} - ${reason}`);
 
 		return response;
 	}

src/infra/logger/logger.spec.ts

@@ -55,7 +55,7 @@ describe('Logger', () => {
 	describe('WHEN warn logging', () => {
 		it('should call winstonLogger.warning', () => {
 			const error = new Error('custom error');
-			service.warn(error.message, error.stack);
+			service.warning(error.message, error.stack);
 			expect(winstonLogger.warning).toHaveBeenCalled();
 		});
 	});

src/infra/logger/logger.ts

@@ -20,7 +20,7 @@ export class Logger {
 		this.logger.info(this.createMessage(message, context));
 	}
 
-	public warn(message: unknown, context?: string): void {
+	public warning(message: unknown, context?: string): void {
 		this.logger.warning(this.createMessage(message, context));
 	}
 

src/infra/metrics/index.ts

@@ -1,2 +1,2 @@
-export * from './metrics.module.js';
-export * from './metrics.service.js';
+export { MetricsModule } from './metrics.module.js';
+export { MetricsService } from './metrics.service.js';

src/infra/redis/interfaces/redis-adapter.ts

@@ -11,8 +11,8 @@ export interface RedisAdapter {
 	exists(stream: string): Promise<number>;
 	createGroup(): Promise<void>;
 	quit(): Promise<void>;
-	readStreams(streams: StreamNameClockPair[]): Promise<StreamMessagesReply>;
-	readMessagesFromStream(streamName: string): Promise<StreamMessagesReply>;
+	readStreams(streams: StreamNameClockPair[]): Promise<StreamMessagesReply[]>;
+	readMessagesFromStream(streamName: string): Promise<StreamMessagesReply[]>;
 	reclaimTasks(consumerName: string, redisTaskDebounce: number, tryClaimCount: number): Promise<XAutoClaimResponse>;
 	getDeletedDocEntries(): Promise<StreamMessageReply[]>;
 	deleteDeleteDocEntry(id: string): Promise<number>;

src/infra/redis/interfaces/stream-message-reply.ts

@@ -12,12 +12,7 @@ export interface StreamMessageReply {
 	message: Record<keyof Message, RedisKey>;
 }
 
-export interface StreamMessagesSingleReply {
+export interface StreamMessagesReply {
 	name: string;
 	messages: StreamMessageReply[] | null;
 }
-
-export type StreamMessagesReply = {
-	name: string;
-	messages: StreamMessageReply[] | null;
-}[];

src/infra/redis/ioredis.adapter.ts

@@ -88,7 +88,7 @@ export class IoRedisAdapter implements RedisAdapter {
 		await this.redis.quit();
 	}
 
-	public async readStreams(streams: StreamNameClockPair[]): Promise<StreamMessagesReply> {
+	public async readStreams(streams: StreamNameClockPair[]): Promise<StreamMessagesReply[]> {
 		const reads = await this.redis.xreadBuffer(
 			'COUNT',
 			1000,
@@ -104,7 +104,7 @@ export class IoRedisAdapter implements RedisAdapter {
 		return streamReplyRes;
 	}
 
-	public async readMessagesFromStream(streamName: string): Promise<StreamMessagesReply> {
+	public async readMessagesFromStream(streamName: string): Promise<StreamMessagesReply[]> {
 		const reads = await this.redis.xreadBuffer('STREAMS', streamName, '0');
 
 		const streamReplyRes = mapToStreamMessagesReply(reads);

src/infra/redis/mapper.ts

@@ -42,7 +42,7 @@ export function mapToStreamMessagesReplies(messages: XItems | unknown): StreamMe
 	return result;
 }
 
-export function mapToStreamMessagesReply(streamReply: XReadBufferReply | unknown): StreamMessagesReply {
+export function mapToStreamMessagesReply(streamReply: XReadBufferReply | unknown): StreamMessagesReply[] {
 	if (streamReply === null) {
 		return [];
 	}

src/infra/redis/redis.module.ts

@@ -1,12 +1,30 @@
-import { Module } from '@nestjs/common';
+import { DynamicModule, Module } from '@nestjs/common';
 import { ConfigurationModule } from '../configuration/configuration.module.js';
+import { Logger } from '../logger/logger.js';
 import { LoggerModule } from '../logger/logger.module.js';
+import { RedisAdapter } from './interfaces/redis-adapter.js';
 import { RedisConfig } from './redis.config.js';
-import { RedisService } from './redis.service.js';
+import { RedisFactory } from './redis.service.js';
 
-@Module({
-	imports: [LoggerModule, ConfigurationModule.register(RedisConfig)],
-	providers: [RedisService],
-	exports: [RedisService],
-})
-export class RedisModule {}
+@Module({})
+export class RedisModule {
+	public static registerFor(token: string): DynamicModule {
+		return {
+			module: RedisModule,
+			imports: [LoggerModule, ConfigurationModule.register(RedisConfig)],
+			providers: [
+				{
+					provide: token,
+					useFactory: async (config: RedisConfig, logger: Logger): Promise<RedisAdapter> => {
+						const redisFactory = new RedisFactory(config, logger);
+						const redisAdapter = await redisFactory.createRedisInstance();
+
+						return redisAdapter;
+					},
+					inject: [RedisConfig, Logger],
+				},
+			],
+			exports: [token],
+		};
+	}
+}

src/infra/redis/redis.service.spec.ts

@@ -4,7 +4,7 @@ import * as util from 'util';
 import { Logger } from '../logger/index.js';
 import { IoRedisAdapter } from './ioredis.adapter.js';
 import { RedisConfig } from './redis.config.js';
-import { RedisService } from './redis.service.js';
+import { RedisFactory } from './redis.service.js';
 
 jest.mock('ioredis', () => {
 	return {
@@ -50,7 +50,7 @@ describe('Redis Service', () => {
 				const constructorSpy = jest.spyOn(Redis.prototype, 'constructor');
 
 				const logger = createMock<Logger>();
-				const service = new RedisService(config, logger);
+				const service = new RedisFactory(config, logger);
 
 				const expectedProps = {
 					sentinels: [
@@ -105,7 +105,7 @@ describe('Redis Service', () => {
 				const constructorSpy = jest.spyOn(Redis.prototype, 'constructor');
 
 				const logger = createMock<Logger>();
-				const service = new RedisService(config, logger);
+				const service = new RedisFactory(config, logger);
 
 				const expectedProps = redisUrl;
 

src/infra/redis/redis.service.ts

@@ -1,4 +1,3 @@
-import { Injectable } from '@nestjs/common';
 import * as dns from 'dns';
 import { Redis } from 'ioredis';
 import * as util from 'util';
@@ -7,13 +6,12 @@ import { RedisAdapter } from './interfaces/index.js';
 import { IoRedisAdapter } from './ioredis.adapter.js';
 import { RedisConfig } from './redis.config.js';
 
-@Injectable()
-export class RedisService {
+export class RedisFactory {
 	public constructor(
 		private readonly config: RedisConfig,
 		private readonly logger: Logger,
 	) {
-		this.logger.setContext(RedisService.name);
+		this.logger.setContext(RedisFactory.name);
 	}
 
 	public async createRedisInstance(): Promise<RedisAdapter> {

src/infra/storage/storage.service.ts

@@ -1,6 +1,6 @@
 import { Injectable, OnModuleInit } from '@nestjs/common';
-import { Client } from 'minio';
 import { randomUUID } from 'crypto';
+import { Client } from 'minio';
 import { Stream } from 'stream';
 import * as Y from 'yjs';
 import { Logger } from '../logger/index.js';