feat: add Valkey integration for task queue (closes #98)
- Add ioredis package dependency for Redis-compatible operations - Create ValkeyModule as global NestJS module - Implement ValkeyService with task queue operations: - enqueue(task): Add tasks to FIFO queue - dequeue(): Get next task and update to PROCESSING status - getStatus(taskId): Retrieve task metadata and status - updateStatus(taskId, status): Update task state (COMPLETED/FAILED) - getQueueLength(): Monitor queue depth - clearQueue(): Queue management utility - healthCheck(): Verify Valkey connectivity - Add TaskDto, EnqueueTaskDto, UpdateTaskStatusDto interfaces - Implement TaskStatus enum (PENDING/PROCESSING/COMPLETED/FAILED) - Add comprehensive test suite with in-memory Redis mock (20 tests) - Integrate ValkeyModule into app.module.ts - Valkey Docker Compose service already configured in docker-compose.yml - VALKEY_URL environment variable already in .env.example - Add detailed README with usage examples and API documentation Technical Details: - Uses FIFO queue (RPUSH/LPOP for strict ordering) - Task metadata stored with 24-hour TTL - Lifecycle hooks for connection management (onModuleInit/onModuleDestroy) - Automatic retry with exponential backoff on connection errors - Global module - no explicit imports needed Tests verify: - Connection initialization and health checks - FIFO enqueue/dequeue behavior - Status lifecycle transitions - Concurrent task handling - Queue management operations - Complete task processing workflows
This commit is contained in:
@@ -59,6 +59,7 @@
|
|||||||
"@swc/core": "^1.10.18",
|
"@swc/core": "^1.10.18",
|
||||||
"@types/express": "^5.0.1",
|
"@types/express": "^5.0.1",
|
||||||
"@types/highlight.js": "^10.1.0",
|
"@types/highlight.js": "^10.1.0",
|
||||||
|
"@types/ioredis": "^5.0.0",
|
||||||
"@types/node": "^22.13.4",
|
"@types/node": "^22.13.4",
|
||||||
"@types/sanitize-html": "^2.16.0",
|
"@types/sanitize-html": "^2.16.0",
|
||||||
"@vitest/coverage-v8": "^4.0.18",
|
"@vitest/coverage-v8": "^4.0.18",
|
||||||
|
|||||||
@@ -18,11 +18,13 @@ import { WebSocketModule } from "./websocket/websocket.module";
|
|||||||
import { LlmModule } from "./llm/llm.module";
|
import { LlmModule } from "./llm/llm.module";
|
||||||
import { BrainModule } from "./brain/brain.module";
|
import { BrainModule } from "./brain/brain.module";
|
||||||
import { CronModule } from "./cron/cron.module";
|
import { CronModule } from "./cron/cron.module";
|
||||||
|
import { ValkeyModule } from "./valkey/valkey.module";
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
PrismaModule,
|
PrismaModule,
|
||||||
DatabaseModule,
|
DatabaseModule,
|
||||||
|
ValkeyModule,
|
||||||
AuthModule,
|
AuthModule,
|
||||||
ActivityModule,
|
ActivityModule,
|
||||||
TasksModule,
|
TasksModule,
|
||||||
|
|||||||
369
apps/api/src/valkey/README.md
Normal file
369
apps/api/src/valkey/README.md
Normal file
@@ -0,0 +1,369 @@
|
|||||||
|
# Valkey Task Queue Module
|
||||||
|
|
||||||
|
This module provides Redis-compatible task queue functionality using Valkey (Redis fork) for the Mosaic Stack application.
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
The `ValkeyModule` is a global NestJS module that provides task queue operations with a simple FIFO (First-In-First-Out) queue implementation. It uses ioredis for Redis compatibility and is automatically available throughout the application.
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
- ✅ **FIFO Queue**: Tasks are processed in the order they are enqueued
|
||||||
|
- ✅ **Task Status Tracking**: Monitor task lifecycle (PENDING → PROCESSING → COMPLETED/FAILED)
|
||||||
|
- ✅ **Metadata Storage**: Store and retrieve task data with 24-hour TTL
|
||||||
|
- ✅ **Health Monitoring**: Built-in health check for Valkey connectivity
|
||||||
|
- ✅ **Type Safety**: Fully typed DTOs with validation
|
||||||
|
- ✅ **Global Module**: No need to import in every module
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
### Components
|
||||||
|
|
||||||
|
1. **ValkeyModule** (`valkey.module.ts`)
|
||||||
|
- Global module that provides `ValkeyService`
|
||||||
|
- Auto-registered in `app.module.ts`
|
||||||
|
|
||||||
|
2. **ValkeyService** (`valkey.service.ts`)
|
||||||
|
- Core service with queue operations
|
||||||
|
- Lifecycle hooks for connection management
|
||||||
|
- Methods: `enqueue()`, `dequeue()`, `getStatus()`, `updateStatus()`
|
||||||
|
|
||||||
|
3. **DTOs** (`dto/task.dto.ts`)
|
||||||
|
- `TaskDto`: Complete task representation
|
||||||
|
- `EnqueueTaskDto`: Input for creating tasks
|
||||||
|
- `UpdateTaskStatusDto`: Input for status updates
|
||||||
|
- `TaskStatus`: Enum of task states
|
||||||
|
|
||||||
|
## Configuration
|
||||||
|
|
||||||
|
### Environment Variables
|
||||||
|
|
||||||
|
Add to `.env`:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
VALKEY_URL=redis://localhost:6379
|
||||||
|
```
|
||||||
|
|
||||||
|
### Docker Compose
|
||||||
|
|
||||||
|
Valkey service is already configured in `docker-compose.yml`:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
valkey:
|
||||||
|
image: valkey/valkey:8-alpine
|
||||||
|
container_name: mosaic-valkey
|
||||||
|
ports:
|
||||||
|
- "6379:6379"
|
||||||
|
volumes:
|
||||||
|
- valkey_data:/data
|
||||||
|
```
|
||||||
|
|
||||||
|
Start Valkey:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose up -d valkey
|
||||||
|
```
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
### 1. Inject the Service
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
import { ValkeyService } from './valkey/valkey.service';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class MyService {
|
||||||
|
constructor(private readonly valkeyService: ValkeyService) {}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. Enqueue a Task
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
const task = await this.valkeyService.enqueue({
|
||||||
|
type: 'send-email',
|
||||||
|
data: {
|
||||||
|
to: 'user@example.com',
|
||||||
|
subject: 'Welcome!',
|
||||||
|
body: 'Hello, welcome to Mosaic Stack',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log(task.id); // UUID
|
||||||
|
console.log(task.status); // 'pending'
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. Dequeue and Process
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
// Worker picks up next task
|
||||||
|
const task = await this.valkeyService.dequeue();
|
||||||
|
|
||||||
|
if (task) {
|
||||||
|
console.log(task.status); // 'processing'
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Do work...
|
||||||
|
await sendEmail(task.data);
|
||||||
|
|
||||||
|
// Mark as completed
|
||||||
|
await this.valkeyService.updateStatus(task.id, {
|
||||||
|
status: TaskStatus.COMPLETED,
|
||||||
|
result: { sentAt: new Date().toISOString() },
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
// Mark as failed
|
||||||
|
await this.valkeyService.updateStatus(task.id, {
|
||||||
|
status: TaskStatus.FAILED,
|
||||||
|
error: error.message,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4. Check Task Status
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
const status = await this.valkeyService.getStatus(taskId);
|
||||||
|
|
||||||
|
if (status) {
|
||||||
|
console.log(status.status); // 'completed' | 'failed' | 'processing' | 'pending'
|
||||||
|
console.log(status.data); // Task metadata
|
||||||
|
console.log(status.error); // Error message if failed
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 5. Queue Management
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
// Get queue length
|
||||||
|
const length = await this.valkeyService.getQueueLength();
|
||||||
|
console.log(`${length} tasks in queue`);
|
||||||
|
|
||||||
|
// Health check
|
||||||
|
const healthy = await this.valkeyService.healthCheck();
|
||||||
|
console.log(`Valkey is ${healthy ? 'healthy' : 'down'}`);
|
||||||
|
|
||||||
|
// Clear queue (use with caution!)
|
||||||
|
await this.valkeyService.clearQueue();
|
||||||
|
```
|
||||||
|
|
||||||
|
## Task Lifecycle
|
||||||
|
|
||||||
|
```
|
||||||
|
PENDING → PROCESSING → COMPLETED
|
||||||
|
↘ FAILED
|
||||||
|
```
|
||||||
|
|
||||||
|
1. **PENDING**: Task is enqueued and waiting to be processed
|
||||||
|
2. **PROCESSING**: Task has been dequeued and is being worked on
|
||||||
|
3. **COMPLETED**: Task finished successfully
|
||||||
|
4. **FAILED**: Task encountered an error
|
||||||
|
|
||||||
|
## Data Storage
|
||||||
|
|
||||||
|
- **Queue**: Redis list at key `mosaic:task:queue`
|
||||||
|
- **Task Metadata**: Redis strings at `mosaic:task:{taskId}`
|
||||||
|
- **TTL**: Tasks expire after 24 hours (configurable via `TASK_TTL`)
|
||||||
|
|
||||||
|
## Examples
|
||||||
|
|
||||||
|
### Background Job Processing
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
@Injectable()
|
||||||
|
export class EmailWorker {
|
||||||
|
constructor(private readonly valkeyService: ValkeyService) {
|
||||||
|
this.startWorker();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async startWorker() {
|
||||||
|
while (true) {
|
||||||
|
const task = await this.valkeyService.dequeue();
|
||||||
|
|
||||||
|
if (task) {
|
||||||
|
await this.processTask(task);
|
||||||
|
} else {
|
||||||
|
// No tasks, wait 5 seconds
|
||||||
|
await new Promise(resolve => setTimeout(resolve, 5000));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async processTask(task: TaskDto) {
|
||||||
|
try {
|
||||||
|
switch (task.type) {
|
||||||
|
case 'send-email':
|
||||||
|
await this.sendEmail(task.data);
|
||||||
|
break;
|
||||||
|
case 'generate-report':
|
||||||
|
await this.generateReport(task.data);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.valkeyService.updateStatus(task.id, {
|
||||||
|
status: TaskStatus.COMPLETED,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
await this.valkeyService.updateStatus(task.id, {
|
||||||
|
status: TaskStatus.FAILED,
|
||||||
|
error: error.message,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Scheduled Tasks with Cron
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
@Injectable()
|
||||||
|
export class ScheduledTasks {
|
||||||
|
constructor(private readonly valkeyService: ValkeyService) {}
|
||||||
|
|
||||||
|
@Cron('0 0 * * *') // Daily at midnight
|
||||||
|
async dailyReport() {
|
||||||
|
await this.valkeyService.enqueue({
|
||||||
|
type: 'daily-report',
|
||||||
|
data: { date: new Date().toISOString() },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
|
||||||
|
The module includes comprehensive tests with an in-memory Redis mock:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
pnpm test valkey.service.spec.ts
|
||||||
|
```
|
||||||
|
|
||||||
|
Tests cover:
|
||||||
|
- ✅ Connection and initialization
|
||||||
|
- ✅ Enqueue operations
|
||||||
|
- ✅ Dequeue FIFO behavior
|
||||||
|
- ✅ Status tracking and updates
|
||||||
|
- ✅ Queue management
|
||||||
|
- ✅ Complete task lifecycle
|
||||||
|
- ✅ Concurrent task handling
|
||||||
|
|
||||||
|
## API Reference
|
||||||
|
|
||||||
|
### ValkeyService Methods
|
||||||
|
|
||||||
|
#### `enqueue(task: EnqueueTaskDto): Promise<TaskDto>`
|
||||||
|
Add a task to the queue.
|
||||||
|
|
||||||
|
**Parameters:**
|
||||||
|
- `task.type` (string): Task type identifier
|
||||||
|
- `task.data` (object): Task metadata
|
||||||
|
|
||||||
|
**Returns:** Created task with ID and status
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `dequeue(): Promise<TaskDto | null>`
|
||||||
|
Get the next task from the queue (FIFO).
|
||||||
|
|
||||||
|
**Returns:** Next task with status updated to PROCESSING, or null if queue is empty
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `getStatus(taskId: string): Promise<TaskDto | null>`
|
||||||
|
Retrieve task status and metadata.
|
||||||
|
|
||||||
|
**Parameters:**
|
||||||
|
- `taskId` (string): Task UUID
|
||||||
|
|
||||||
|
**Returns:** Task data or null if not found
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `updateStatus(taskId: string, update: UpdateTaskStatusDto): Promise<TaskDto | null>`
|
||||||
|
Update task status and optionally add results or errors.
|
||||||
|
|
||||||
|
**Parameters:**
|
||||||
|
- `taskId` (string): Task UUID
|
||||||
|
- `update.status` (TaskStatus): New status
|
||||||
|
- `update.error` (string, optional): Error message for failed tasks
|
||||||
|
- `update.result` (object, optional): Result data to merge
|
||||||
|
|
||||||
|
**Returns:** Updated task or null if not found
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `getQueueLength(): Promise<number>`
|
||||||
|
Get the number of tasks in queue.
|
||||||
|
|
||||||
|
**Returns:** Queue length
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `clearQueue(): Promise<void>`
|
||||||
|
Remove all tasks from queue (metadata remains until TTL).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
#### `healthCheck(): Promise<boolean>`
|
||||||
|
Verify Valkey connectivity.
|
||||||
|
|
||||||
|
**Returns:** true if connected, false otherwise
|
||||||
|
|
||||||
|
## Migration Notes
|
||||||
|
|
||||||
|
If upgrading from BullMQ or another queue system:
|
||||||
|
1. Task IDs are UUIDs (not incremental)
|
||||||
|
2. No built-in retry mechanism (implement in worker)
|
||||||
|
3. No job priorities (strict FIFO)
|
||||||
|
4. Tasks expire after 24 hours
|
||||||
|
|
||||||
|
For advanced features like retries, priorities, or scheduled jobs, consider wrapping this service or using BullMQ alongside it.
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
|
||||||
|
### Connection Issues
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
// Check Valkey connectivity
|
||||||
|
const healthy = await this.valkeyService.healthCheck();
|
||||||
|
if (!healthy) {
|
||||||
|
console.error('Valkey is not responding');
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Queue Stuck
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Check queue length
|
||||||
|
docker exec -it mosaic-valkey valkey-cli LLEN mosaic:task:queue
|
||||||
|
|
||||||
|
# Inspect tasks
|
||||||
|
docker exec -it mosaic-valkey valkey-cli KEYS "mosaic:task:*"
|
||||||
|
|
||||||
|
# Clear stuck queue
|
||||||
|
docker exec -it mosaic-valkey valkey-cli DEL mosaic:task:queue
|
||||||
|
```
|
||||||
|
|
||||||
|
### Debug Logging
|
||||||
|
|
||||||
|
The service logs all operations at `info` level. Check application logs for:
|
||||||
|
- Task enqueue/dequeue operations
|
||||||
|
- Status updates
|
||||||
|
- Connection events
|
||||||
|
|
||||||
|
## Future Enhancements
|
||||||
|
|
||||||
|
Potential improvements for consideration:
|
||||||
|
- [ ] Task priorities (weighted queues)
|
||||||
|
- [ ] Retry mechanism with exponential backoff
|
||||||
|
- [ ] Delayed/scheduled tasks
|
||||||
|
- [ ] Task progress tracking
|
||||||
|
- [ ] Queue metrics and monitoring
|
||||||
|
- [ ] Multi-queue support
|
||||||
|
- [ ] Dead letter queue for failed tasks
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
Part of the Mosaic Stack project.
|
||||||
47
apps/api/src/valkey/dto/task.dto.ts
Normal file
47
apps/api/src/valkey/dto/task.dto.ts
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
/**
|
||||||
|
* Task status enum
|
||||||
|
*/
|
||||||
|
export enum TaskStatus {
|
||||||
|
PENDING = 'pending',
|
||||||
|
PROCESSING = 'processing',
|
||||||
|
COMPLETED = 'completed',
|
||||||
|
FAILED = 'failed',
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Task metadata interface
|
||||||
|
*/
|
||||||
|
export interface TaskMetadata {
|
||||||
|
[key: string]: unknown;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Task DTO for queue operations
|
||||||
|
*/
|
||||||
|
export interface TaskDto {
|
||||||
|
id: string;
|
||||||
|
type: string;
|
||||||
|
data: TaskMetadata;
|
||||||
|
status: TaskStatus;
|
||||||
|
error?: string;
|
||||||
|
createdAt?: Date;
|
||||||
|
updatedAt?: Date;
|
||||||
|
completedAt?: Date;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enqueue task request DTO
|
||||||
|
*/
|
||||||
|
export interface EnqueueTaskDto {
|
||||||
|
type: string;
|
||||||
|
data: TaskMetadata;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update task status DTO
|
||||||
|
*/
|
||||||
|
export interface UpdateTaskStatusDto {
|
||||||
|
status: TaskStatus;
|
||||||
|
error?: string;
|
||||||
|
result?: TaskMetadata;
|
||||||
|
}
|
||||||
3
apps/api/src/valkey/index.ts
Normal file
3
apps/api/src/valkey/index.ts
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
export * from './valkey.module';
|
||||||
|
export * from './valkey.service';
|
||||||
|
export * from './dto/task.dto';
|
||||||
16
apps/api/src/valkey/valkey.module.ts
Normal file
16
apps/api/src/valkey/valkey.module.ts
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
import { Module, Global } from '@nestjs/common';
|
||||||
|
import { ValkeyService } from './valkey.service';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ValkeyModule - Redis-compatible task queue module
|
||||||
|
*
|
||||||
|
* This module provides task queue functionality using Valkey (Redis-compatible).
|
||||||
|
* It is marked as @Global to allow injection across the application without
|
||||||
|
* explicit imports.
|
||||||
|
*/
|
||||||
|
@Global()
|
||||||
|
@Module({
|
||||||
|
providers: [ValkeyService],
|
||||||
|
exports: [ValkeyService],
|
||||||
|
})
|
||||||
|
export class ValkeyModule {}
|
||||||
373
apps/api/src/valkey/valkey.service.spec.ts
Normal file
373
apps/api/src/valkey/valkey.service.spec.ts
Normal file
@@ -0,0 +1,373 @@
|
|||||||
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
|
import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
|
||||||
|
import { ValkeyService } from './valkey.service';
|
||||||
|
import { TaskStatus } from './dto/task.dto';
|
||||||
|
|
||||||
|
// Mock ioredis module
|
||||||
|
vi.mock('ioredis', () => {
|
||||||
|
// In-memory store for mocked Redis
|
||||||
|
const store = new Map<string, string>();
|
||||||
|
const lists = new Map<string, string[]>();
|
||||||
|
|
||||||
|
// Mock Redis client class
|
||||||
|
class MockRedisClient {
|
||||||
|
// Connection methods
|
||||||
|
async ping() {
|
||||||
|
return 'PONG';
|
||||||
|
}
|
||||||
|
|
||||||
|
async quit() {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
on() {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
// String operations
|
||||||
|
async setex(key: string, ttl: number, value: string) {
|
||||||
|
store.set(key, value);
|
||||||
|
return 'OK';
|
||||||
|
}
|
||||||
|
|
||||||
|
async get(key: string) {
|
||||||
|
return store.get(key) || null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// List operations
|
||||||
|
async rpush(key: string, ...values: string[]) {
|
||||||
|
if (!lists.has(key)) {
|
||||||
|
lists.set(key, []);
|
||||||
|
}
|
||||||
|
const list = lists.get(key)!;
|
||||||
|
list.push(...values);
|
||||||
|
return list.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
async lpop(key: string) {
|
||||||
|
const list = lists.get(key);
|
||||||
|
if (!list || list.length === 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return list.shift()!;
|
||||||
|
}
|
||||||
|
|
||||||
|
async llen(key: string) {
|
||||||
|
const list = lists.get(key);
|
||||||
|
return list ? list.length : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
async del(...keys: string[]) {
|
||||||
|
let deleted = 0;
|
||||||
|
keys.forEach(key => {
|
||||||
|
if (store.delete(key)) deleted++;
|
||||||
|
if (lists.delete(key)) deleted++;
|
||||||
|
});
|
||||||
|
return deleted;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Expose helper to clear store
|
||||||
|
(MockRedisClient as any).__clearStore = () => {
|
||||||
|
store.clear();
|
||||||
|
lists.clear();
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
default: MockRedisClient,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('ValkeyService', () => {
|
||||||
|
let service: ValkeyService;
|
||||||
|
let module: TestingModule;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
// Clear environment
|
||||||
|
process.env.VALKEY_URL = 'redis://localhost:6379';
|
||||||
|
|
||||||
|
// Clear the mock store before each test
|
||||||
|
const Redis = await import('ioredis');
|
||||||
|
(Redis.default as any).__clearStore();
|
||||||
|
|
||||||
|
module = await Test.createTestingModule({
|
||||||
|
providers: [ValkeyService],
|
||||||
|
}).compile();
|
||||||
|
|
||||||
|
service = module.get<ValkeyService>(ValkeyService);
|
||||||
|
|
||||||
|
// Initialize the service
|
||||||
|
await service.onModuleInit();
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(async () => {
|
||||||
|
await service.onModuleDestroy();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('initialization', () => {
|
||||||
|
it('should be defined', () => {
|
||||||
|
expect(service).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should connect to Valkey on module init', async () => {
|
||||||
|
expect(service).toBeDefined();
|
||||||
|
const healthCheck = await service.healthCheck();
|
||||||
|
expect(healthCheck).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('enqueue', () => {
|
||||||
|
it('should enqueue a task successfully', async () => {
|
||||||
|
const taskDto = {
|
||||||
|
type: 'test-task',
|
||||||
|
data: { message: 'Hello World' },
|
||||||
|
};
|
||||||
|
|
||||||
|
const result = await service.enqueue(taskDto);
|
||||||
|
|
||||||
|
expect(result).toBeDefined();
|
||||||
|
expect(result.id).toBeDefined();
|
||||||
|
expect(result.type).toBe('test-task');
|
||||||
|
expect(result.data).toEqual({ message: 'Hello World' });
|
||||||
|
expect(result.status).toBe(TaskStatus.PENDING);
|
||||||
|
expect(result.createdAt).toBeDefined();
|
||||||
|
expect(result.updatedAt).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should increment queue length when enqueueing', async () => {
|
||||||
|
const initialLength = await service.getQueueLength();
|
||||||
|
|
||||||
|
await service.enqueue({
|
||||||
|
type: 'task-1',
|
||||||
|
data: {},
|
||||||
|
});
|
||||||
|
|
||||||
|
const newLength = await service.getQueueLength();
|
||||||
|
expect(newLength).toBe(initialLength + 1);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('dequeue', () => {
|
||||||
|
it('should return null when queue is empty', async () => {
|
||||||
|
const result = await service.dequeue();
|
||||||
|
expect(result).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should dequeue tasks in FIFO order', async () => {
|
||||||
|
const task1 = await service.enqueue({
|
||||||
|
type: 'task-1',
|
||||||
|
data: { order: 1 },
|
||||||
|
});
|
||||||
|
|
||||||
|
const task2 = await service.enqueue({
|
||||||
|
type: 'task-2',
|
||||||
|
data: { order: 2 },
|
||||||
|
});
|
||||||
|
|
||||||
|
const dequeued1 = await service.dequeue();
|
||||||
|
expect(dequeued1?.id).toBe(task1.id);
|
||||||
|
expect(dequeued1?.status).toBe(TaskStatus.PROCESSING);
|
||||||
|
|
||||||
|
const dequeued2 = await service.dequeue();
|
||||||
|
expect(dequeued2?.id).toBe(task2.id);
|
||||||
|
expect(dequeued2?.status).toBe(TaskStatus.PROCESSING);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should update task status to PROCESSING when dequeued', async () => {
|
||||||
|
const task = await service.enqueue({
|
||||||
|
type: 'test-task',
|
||||||
|
data: {},
|
||||||
|
});
|
||||||
|
|
||||||
|
const dequeued = await service.dequeue();
|
||||||
|
expect(dequeued?.status).toBe(TaskStatus.PROCESSING);
|
||||||
|
|
||||||
|
const status = await service.getStatus(task.id);
|
||||||
|
expect(status?.status).toBe(TaskStatus.PROCESSING);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('getStatus', () => {
|
||||||
|
it('should return null for non-existent task', async () => {
|
||||||
|
const status = await service.getStatus('non-existent-id');
|
||||||
|
expect(status).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return task status for existing task', async () => {
|
||||||
|
const task = await service.enqueue({
|
||||||
|
type: 'test-task',
|
||||||
|
data: { key: 'value' },
|
||||||
|
});
|
||||||
|
|
||||||
|
const status = await service.getStatus(task.id);
|
||||||
|
expect(status).toBeDefined();
|
||||||
|
expect(status?.id).toBe(task.id);
|
||||||
|
expect(status?.type).toBe('test-task');
|
||||||
|
expect(status?.data).toEqual({ key: 'value' });
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('updateStatus', () => {
|
||||||
|
it('should update task status to COMPLETED', async () => {
|
||||||
|
const task = await service.enqueue({
|
||||||
|
type: 'test-task',
|
||||||
|
data: {},
|
||||||
|
});
|
||||||
|
|
||||||
|
const updated = await service.updateStatus(task.id, {
|
||||||
|
status: TaskStatus.COMPLETED,
|
||||||
|
result: { output: 'success' },
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(updated).toBeDefined();
|
||||||
|
expect(updated?.status).toBe(TaskStatus.COMPLETED);
|
||||||
|
expect(updated?.completedAt).toBeDefined();
|
||||||
|
expect(updated?.data).toEqual({ output: 'success' });
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should update task status to FAILED with error', async () => {
|
||||||
|
const task = await service.enqueue({
|
||||||
|
type: 'test-task',
|
||||||
|
data: {},
|
||||||
|
});
|
||||||
|
|
||||||
|
const updated = await service.updateStatus(task.id, {
|
||||||
|
status: TaskStatus.FAILED,
|
||||||
|
error: 'Task failed due to error',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(updated).toBeDefined();
|
||||||
|
expect(updated?.status).toBe(TaskStatus.FAILED);
|
||||||
|
expect(updated?.error).toBe('Task failed due to error');
|
||||||
|
expect(updated?.completedAt).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return null when updating non-existent task', async () => {
|
||||||
|
const updated = await service.updateStatus('non-existent-id', {
|
||||||
|
status: TaskStatus.COMPLETED,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(updated).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should preserve existing data when updating status', async () => {
|
||||||
|
const task = await service.enqueue({
|
||||||
|
type: 'test-task',
|
||||||
|
data: { original: 'data' },
|
||||||
|
});
|
||||||
|
|
||||||
|
await service.updateStatus(task.id, {
|
||||||
|
status: TaskStatus.PROCESSING,
|
||||||
|
});
|
||||||
|
|
||||||
|
const status = await service.getStatus(task.id);
|
||||||
|
expect(status?.data).toEqual({ original: 'data' });
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('getQueueLength', () => {
|
||||||
|
it('should return 0 for empty queue', async () => {
|
||||||
|
const length = await service.getQueueLength();
|
||||||
|
expect(length).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return correct queue length', async () => {
|
||||||
|
await service.enqueue({ type: 'task-1', data: {} });
|
||||||
|
await service.enqueue({ type: 'task-2', data: {} });
|
||||||
|
await service.enqueue({ type: 'task-3', data: {} });
|
||||||
|
|
||||||
|
const length = await service.getQueueLength();
|
||||||
|
expect(length).toBe(3);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should decrease when tasks are dequeued', async () => {
|
||||||
|
await service.enqueue({ type: 'task-1', data: {} });
|
||||||
|
await service.enqueue({ type: 'task-2', data: {} });
|
||||||
|
|
||||||
|
expect(await service.getQueueLength()).toBe(2);
|
||||||
|
|
||||||
|
await service.dequeue();
|
||||||
|
expect(await service.getQueueLength()).toBe(1);
|
||||||
|
|
||||||
|
await service.dequeue();
|
||||||
|
expect(await service.getQueueLength()).toBe(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('clearQueue', () => {
|
||||||
|
it('should clear all tasks from queue', async () => {
|
||||||
|
await service.enqueue({ type: 'task-1', data: {} });
|
||||||
|
await service.enqueue({ type: 'task-2', data: {} });
|
||||||
|
|
||||||
|
expect(await service.getQueueLength()).toBe(2);
|
||||||
|
|
||||||
|
await service.clearQueue();
|
||||||
|
expect(await service.getQueueLength()).toBe(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('healthCheck', () => {
|
||||||
|
it('should return true when Valkey is healthy', async () => {
|
||||||
|
const healthy = await service.healthCheck();
|
||||||
|
expect(healthy).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('integration flow', () => {
|
||||||
|
it('should handle complete task lifecycle', async () => {
|
||||||
|
// 1. Enqueue task
|
||||||
|
const task = await service.enqueue({
|
||||||
|
type: 'email-notification',
|
||||||
|
data: {
|
||||||
|
to: 'user@example.com',
|
||||||
|
subject: 'Test Email',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(task.status).toBe(TaskStatus.PENDING);
|
||||||
|
|
||||||
|
// 2. Dequeue task (worker picks it up)
|
||||||
|
const dequeuedTask = await service.dequeue();
|
||||||
|
expect(dequeuedTask?.id).toBe(task.id);
|
||||||
|
expect(dequeuedTask?.status).toBe(TaskStatus.PROCESSING);
|
||||||
|
|
||||||
|
// 3. Update to completed
|
||||||
|
const completedTask = await service.updateStatus(task.id, {
|
||||||
|
status: TaskStatus.COMPLETED,
|
||||||
|
result: {
|
||||||
|
to: 'user@example.com',
|
||||||
|
subject: 'Test Email',
|
||||||
|
sentAt: new Date().toISOString(),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(completedTask?.status).toBe(TaskStatus.COMPLETED);
|
||||||
|
expect(completedTask?.completedAt).toBeDefined();
|
||||||
|
|
||||||
|
// 4. Verify final state
|
||||||
|
const finalStatus = await service.getStatus(task.id);
|
||||||
|
expect(finalStatus?.status).toBe(TaskStatus.COMPLETED);
|
||||||
|
expect(finalStatus?.data.sentAt).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should handle multiple concurrent tasks', async () => {
|
||||||
|
const tasks = await Promise.all([
|
||||||
|
service.enqueue({ type: 'task-1', data: { id: 1 } }),
|
||||||
|
service.enqueue({ type: 'task-2', data: { id: 2 } }),
|
||||||
|
service.enqueue({ type: 'task-3', data: { id: 3 } }),
|
||||||
|
]);
|
||||||
|
|
||||||
|
expect(await service.getQueueLength()).toBe(3);
|
||||||
|
|
||||||
|
const dequeued1 = await service.dequeue();
|
||||||
|
const dequeued2 = await service.dequeue();
|
||||||
|
const dequeued3 = await service.dequeue();
|
||||||
|
|
||||||
|
expect(dequeued1?.id).toBe(tasks[0].id);
|
||||||
|
expect(dequeued2?.id).toBe(tasks[1].id);
|
||||||
|
expect(dequeued3?.id).toBe(tasks[2].id);
|
||||||
|
|
||||||
|
expect(await service.getQueueLength()).toBe(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
229
apps/api/src/valkey/valkey.service.ts
Normal file
229
apps/api/src/valkey/valkey.service.ts
Normal file
@@ -0,0 +1,229 @@
|
|||||||
|
import { Injectable, Logger, OnModuleInit, OnModuleDestroy } from '@nestjs/common';
|
||||||
|
import Redis from 'ioredis';
|
||||||
|
import { TaskDto, TaskStatus, EnqueueTaskDto, UpdateTaskStatusDto, TaskMetadata } from './dto/task.dto';
|
||||||
|
import { randomUUID } from 'crypto';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ValkeyService - Task queue service using Valkey (Redis-compatible)
|
||||||
|
*
|
||||||
|
* Provides task queue operations:
|
||||||
|
* - enqueue(task): Add task to queue
|
||||||
|
* - dequeue(): Get next task from queue
|
||||||
|
* - getStatus(taskId): Get task status and metadata
|
||||||
|
* - updateStatus(taskId, status): Update task status
|
||||||
|
*/
|
||||||
|
@Injectable()
|
||||||
|
export class ValkeyService implements OnModuleInit, OnModuleDestroy {
|
||||||
|
private readonly logger = new Logger(ValkeyService.name);
|
||||||
|
private client: Redis;
|
||||||
|
private readonly QUEUE_KEY = 'mosaic:task:queue';
|
||||||
|
private readonly TASK_PREFIX = 'mosaic:task:';
|
||||||
|
private readonly TASK_TTL = 86400; // 24 hours in seconds
|
||||||
|
|
||||||
|
async onModuleInit() {
|
||||||
|
const valkeyUrl = process.env.VALKEY_URL || 'redis://localhost:6379';
|
||||||
|
|
||||||
|
this.logger.log(`Connecting to Valkey at ${valkeyUrl}`);
|
||||||
|
|
||||||
|
this.client = new Redis(valkeyUrl, {
|
||||||
|
maxRetriesPerRequest: 3,
|
||||||
|
retryStrategy: (times) => {
|
||||||
|
const delay = Math.min(times * 50, 2000);
|
||||||
|
this.logger.warn(`Valkey connection retry attempt ${times}, waiting ${delay}ms`);
|
||||||
|
return delay;
|
||||||
|
},
|
||||||
|
reconnectOnError: (err) => {
|
||||||
|
this.logger.error('Valkey connection error:', err.message);
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
this.client.on('connect', () => {
|
||||||
|
this.logger.log('Valkey connected successfully');
|
||||||
|
});
|
||||||
|
|
||||||
|
this.client.on('error', (err) => {
|
||||||
|
this.logger.error('Valkey client error:', err.message);
|
||||||
|
});
|
||||||
|
|
||||||
|
this.client.on('close', () => {
|
||||||
|
this.logger.warn('Valkey connection closed');
|
||||||
|
});
|
||||||
|
|
||||||
|
// Wait for connection
|
||||||
|
try {
|
||||||
|
await this.client.ping();
|
||||||
|
this.logger.log('Valkey health check passed');
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error('Valkey health check failed:', error.message);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async onModuleDestroy() {
|
||||||
|
this.logger.log('Disconnecting from Valkey');
|
||||||
|
await this.client.quit();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add a task to the queue
|
||||||
|
* @param task - Task to enqueue
|
||||||
|
* @returns The created task with ID and metadata
|
||||||
|
*/
|
||||||
|
async enqueue(task: EnqueueTaskDto): Promise<TaskDto> {
|
||||||
|
const taskId = randomUUID();
|
||||||
|
const now = new Date();
|
||||||
|
|
||||||
|
const taskData: TaskDto = {
|
||||||
|
id: taskId,
|
||||||
|
type: task.type,
|
||||||
|
data: task.data,
|
||||||
|
status: TaskStatus.PENDING,
|
||||||
|
createdAt: now,
|
||||||
|
updatedAt: now,
|
||||||
|
};
|
||||||
|
|
||||||
|
// Store task metadata
|
||||||
|
const taskKey = this.getTaskKey(taskId);
|
||||||
|
await this.client.setex(
|
||||||
|
taskKey,
|
||||||
|
this.TASK_TTL,
|
||||||
|
JSON.stringify(taskData)
|
||||||
|
);
|
||||||
|
|
||||||
|
// Add to queue (RPUSH = add to tail, LPOP = remove from head => FIFO)
|
||||||
|
await this.client.rpush(this.QUEUE_KEY, taskId);
|
||||||
|
|
||||||
|
this.logger.log(`Task enqueued: ${taskId} (type: ${task.type})`);
|
||||||
|
return taskData;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the next task from the queue
|
||||||
|
* @returns The next task or null if queue is empty
|
||||||
|
*/
|
||||||
|
async dequeue(): Promise<TaskDto | null> {
|
||||||
|
// LPOP = remove from head (FIFO)
|
||||||
|
const taskId = await this.client.lpop(this.QUEUE_KEY);
|
||||||
|
|
||||||
|
if (!taskId) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const task = await this.getStatus(taskId);
|
||||||
|
|
||||||
|
if (!task) {
|
||||||
|
this.logger.warn(`Task ${taskId} not found in metadata store`);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update status to processing and return the updated task
|
||||||
|
const updatedTask = await this.updateStatus(taskId, {
|
||||||
|
status: TaskStatus.PROCESSING,
|
||||||
|
});
|
||||||
|
|
||||||
|
this.logger.log(`Task dequeued: ${taskId} (type: ${task.type})`);
|
||||||
|
return updatedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get task status and metadata
|
||||||
|
* @param taskId - Task ID
|
||||||
|
* @returns Task data or null if not found
|
||||||
|
*/
|
||||||
|
async getStatus(taskId: string): Promise<TaskDto | null> {
|
||||||
|
const taskKey = this.getTaskKey(taskId);
|
||||||
|
const taskData = await this.client.get(taskKey);
|
||||||
|
|
||||||
|
if (!taskData) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
return JSON.parse(taskData) as TaskDto;
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error(`Failed to parse task data for ${taskId}:`, error.message);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update task status and metadata
|
||||||
|
* @param taskId - Task ID
|
||||||
|
* @param update - Status update data
|
||||||
|
* @returns Updated task or null if not found
|
||||||
|
*/
|
||||||
|
async updateStatus(taskId: string, update: UpdateTaskStatusDto): Promise<TaskDto | null> {
|
||||||
|
const task = await this.getStatus(taskId);
|
||||||
|
|
||||||
|
if (!task) {
|
||||||
|
this.logger.warn(`Cannot update status for non-existent task: ${taskId}`);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const now = new Date();
|
||||||
|
const updatedTask: TaskDto = {
|
||||||
|
...task,
|
||||||
|
status: update.status,
|
||||||
|
updatedAt: now,
|
||||||
|
};
|
||||||
|
|
||||||
|
if (update.error) {
|
||||||
|
updatedTask.error = update.error;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (update.status === TaskStatus.COMPLETED || update.status === TaskStatus.FAILED) {
|
||||||
|
updatedTask.completedAt = now;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (update.result) {
|
||||||
|
updatedTask.data = { ...task.data, ...update.result };
|
||||||
|
}
|
||||||
|
|
||||||
|
const taskKey = this.getTaskKey(taskId);
|
||||||
|
await this.client.setex(
|
||||||
|
taskKey,
|
||||||
|
this.TASK_TTL,
|
||||||
|
JSON.stringify(updatedTask)
|
||||||
|
);
|
||||||
|
|
||||||
|
this.logger.log(`Task status updated: ${taskId} => ${update.status}`);
|
||||||
|
return updatedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get queue length
|
||||||
|
* @returns Number of tasks in queue
|
||||||
|
*/
|
||||||
|
async getQueueLength(): Promise<number> {
|
||||||
|
return await this.client.llen(this.QUEUE_KEY);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clear all tasks from queue (use with caution!)
|
||||||
|
*/
|
||||||
|
async clearQueue(): Promise<void> {
|
||||||
|
await this.client.del(this.QUEUE_KEY);
|
||||||
|
this.logger.warn('Queue cleared');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get task key for Redis storage
|
||||||
|
*/
|
||||||
|
private getTaskKey(taskId: string): string {
|
||||||
|
return `${this.TASK_PREFIX}${taskId}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Health check - ping Valkey
|
||||||
|
*/
|
||||||
|
async healthCheck(): Promise<boolean> {
|
||||||
|
try {
|
||||||
|
const result = await this.client.ping();
|
||||||
|
return result === 'PONG';
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error('Valkey health check failed:', error.message);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
1416
pnpm-lock.yaml
generated
1416
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user