Merge pull request #179 from afrinxnahar/main

move redis to api and worker container, fix worker export issue

Author: afrinxnahar

apps/api/package.json

@@ -38,6 +38,7 @@
     "@tabler/icons-react": "^3.34.1",
     "@upstash/redis": "^1.37.0",
     "bullmq": "catalog:",
+    "ioredis": "^5.8.2",
     "clsx": "^2.1.1",
     "ffmpeg-static": "^5.2.0",
     "ffprobe-static": "^3.1.0",

apps/api/src/app.module.ts

@@ -2,7 +2,7 @@ import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { BullModule } from '@nestjs/bullmq';
 import * as path from 'path';
-import { getRedisConnection } from '@repo/config';
+import { getRedisConnection } from './redis';
 import { SupabaseModule } from './supabase/supabase.module';
 
 import { AppController } from './app.controller';

packages/config/src/redis.ts apps/api/src/redis.tspackages/config/src/redis.ts renamed to apps/api/src/redis.ts

@@ -2,12 +2,9 @@ import Redis from 'ioredis';
 
 let sharedConnection: Redis | null = null;
 
-const defaultUrl = 'redis://127.0.0.1:6379';
-
 export function getRedisConnection(): Redis {
   if (sharedConnection) return sharedConnection;
-  const url = process.env.REDIS_URL ?? defaultUrl;
-  sharedConnection = new Redis(url, {
+  sharedConnection = new Redis(process.env.REDIS_URL ?? 'redis://127.0.0.1:6379', {
     maxRetriesPerRequest: null,
     enableReadyCheck: false,
     lazyConnect: true,

packages/config/package.json

@@ -8,9 +8,7 @@
     "lint": "echo 'No source JavaScript files to lint'",
     "build": "tsc -p tsconfig.json"
   },
-  "dependencies": {
-    "ioredis": "^5.8.2"
-  },
+  "dependencies": {},
   "devDependencies": {
     "@repo/typescript-config": "workspace:*",
     "eslint": "^9.0.0",

packages/config/src/index.ts

@@ -1,2 +1 @@
-export * from "./settings/types";
-export * from "./redis";
+export * from "./settings/types";

packages/train-ai-worker/package.json

@@ -8,8 +8,8 @@
   ],
   "exports": {
     ".": {
-      "import": "./dist/index.js",
-      "require": "./dist/index.js"
+      "import": "./dist/src/index.js",
+      "require": "./dist/src/index.js"
     }
   },
   "scripts": {
@@ -34,6 +34,7 @@
     "@upstash/redis": "^1.37.0",
     "axios": "catalog:",
     "bullmq": "catalog:",
+    "ioredis": "^5.8.2",
     "jsonrepair": "^3.13.0",
     "reflect-metadata": "^0.2.0",
     "rxjs": "^7.8.1"

packages/train-ai-worker/src/redis.ts

@@ -0,0 +1,13 @@
+import Redis from 'ioredis';
+
+let sharedConnection: Redis | null = null;
+
+export function getRedisConnection(): Redis {
+  if (sharedConnection) return sharedConnection;
+  sharedConnection = new Redis(process.env.REDIS_URL ?? 'redis://127.0.0.1:6379', {
+    maxRetriesPerRequest: null,
+    enableReadyCheck: false,
+    lazyConnect: true,
+  });
+  return sharedConnection;
+}

packages/train-ai-worker/src/worker.module.ts

@@ -2,7 +2,7 @@ import { Module } from '@nestjs/common';
 import { BullModule } from '@nestjs/bullmq';
 import { ConfigModule } from '@nestjs/config';
 import * as path from 'path';
-import { getRedisConnection } from '@repo/config';
+import { getRedisConnection } from './redis';
 import { HealthController } from './health.controller';
 import { TrainAiProcessor } from './processor/train-ai.processor';
 import { ThumbnailProcessor } from './processor/thumbnail.processor';