Merge branch 'refactor/add-redis-url' into 'develop'

Refactor/add redis url

See merge request !21

package.json

@@ -51,7 +51,8 @@
     "rate-limit-redis": "^6.0.1",
     "swagger-ui-express": "^5.0.1",
     "turndown": "^7.2.0",
-    "zod": "^3.24.1"
+    "zod": "^3.24.1",
+    "prisma": "^5.22.0"
   },
   "devDependencies": {
     "@types/archiver": "^6.0.3",
@@ -73,7 +74,6 @@
     "eslint": "^9.17.0",
     "jest": "^30.4.2",
     "prettier": "^3.4.2",
-    "prisma": "^5.22.0",
     "swagger-autogen": "^2.23.7",
     "ts-jest": "^29.4.11",
     "ts-node": "^10.9.2",

pnpm-lock.yaml

@@ -77,6 +77,9 @@ importers:
       nodemailer:
         specifier: ^9.0.3
         version: 9.0.3
+      prisma:
+        specifier: ^5.22.0
+        version: 5.22.0
       rate-limit-redis:
         specifier: ^6.0.1
         version: 6.0.1(express-rate-limit@8.5.2(express@4.22.2))
@@ -147,9 +150,6 @@ importers:
       prettier:
         specifier: ^3.4.2
         version: 3.9.4
-      prisma:
-        specifier: ^5.22.0
-        version: 5.22.0
       swagger-autogen:
         specifier: ^2.23.7
         version: 2.23.7

render.yaml

@@ -4,7 +4,7 @@ services:
     env: node
     plan: free
     region: singapore
-    buildCommand: pnpm install --frozen-lockfile && pnpm prisma:generate && pnpm build
+    buildCommand: pnpm install --frozen-lockfile --prod=false && pnpm prisma:generate && pnpm build
     startCommand: pnpm start
     healthCheckPath: /health/liveness
     envVars:

scripts/prisma-run.js

@@ -14,12 +14,25 @@ if (!process.env.DATABASE_URL) {
   process.env.DATABASE_URL = `postgresql://${user}:${password}@${host}:${port}/${name}?schema=public${ssl}`;
 }
 
+const path = require("path");
+const fs = require("fs");
+
 const args = process.argv.slice(2);
-const cmd = process.platform === "win32" ? "npx.cmd" : "npx";
-const child = spawn(cmd, ["prisma", ...args], {
+const isWin = process.platform === "win32";
+const localBin = path.resolve(
+  __dirname,
+  `../node_modules/.bin/prisma${isWin ? ".cmd" : ""}`
+);
+
+const [cmd, cmdArgs] = fs.existsSync(localBin)
+  ? [localBin, args]
+  : [isWin ? "npx.cmd" : "npx", ["prisma", ...args]];
+
+const child = spawn(cmd, cmdArgs, {
   stdio: "inherit",
   env: process.env,
-  shell: true,
+  shell: isWin,
 });
 
 child.on("exit", (code) => process.exit(code ?? 1));
+

src/common/redis/redis-connection.ts

@@ -9,12 +9,14 @@ export function getRedisClientOptions(customOpts: RedisOptions = {}): {
   url?: string;
   options: RedisOptions;
 } {
+  const isTls = envConfig.redis.url.startsWith("rediss://");
   const commonOpts: RedisOptions = {
     maxRetriesPerRequest: 1,
     lazyConnect: true,
     connectTimeout: 5000,
     retryStrategy: () => null,
     enableOfflineQueue: false,
+    ...(isTls ? { tls: { rejectUnauthorized: false } } : {}),
     ...customOpts,
   };
 
@@ -42,8 +44,10 @@ export function getBullMQConnection(
   extraOpts: Record<string, unknown> = {},
 ): ConnectionOptions {
   if (envConfig.redis.url) {
+    const isTls = envConfig.redis.url.startsWith("rediss://");
     return {
       url: envConfig.redis.url,
+      ...(isTls ? { tls: { rejectUnauthorized: false } } : {}),
       ...extraOpts,
     };
   }

src/config/env.config.ts

+function sanitizeRedisUrl(rawUrl: string | undefined): string {
+  if (!rawUrl) return "";
+  let url = rawUrl.trim();
+  if (
+    (url.startsWith('"') && url.endsWith('"')) ||
+    (url.startsWith("'") && url.endsWith("'"))
+  ) {
+    url = url.slice(1, -1).trim();
+  }
+  const match = url.match(/rediss?:\/\/[^\s'"]+/i);
+  if (match) {
+    url = match[0];
+  }
+  if (
+    url.startsWith("redis://") &&
+    (url.includes("upstash.io") || rawUrl.includes("--tls"))
+  ) {
+    url = url.replace(/^redis:\/\//i, "rediss://");
+  }
+  return url;
+}
+
 export const envConfig = {
   nodeEnv: process.env.NODE_ENV || "development",
   port: parseInt(process.env.PORT || "9898", 10),
@@ -52,12 +74,13 @@ export const envConfig = {
     ),
   },
   redis: {
-    url: process.env.REDIS_URL || "",
+    url: sanitizeRedisUrl(process.env.REDIS_URL),
     host: process.env.REDIS_HOST || "127.0.0.1",
     port: parseInt(process.env.REDIS_PORT || "6379", 10),
     password: process.env.REDIS_PASSWORD || undefined,
     enabled:
-      process.env.REDIS_ENABLED === "true" || Boolean(process.env.REDIS_URL),
+      process.env.REDIS_ENABLED === "true" ||
+      Boolean(sanitizeRedisUrl(process.env.REDIS_URL)),
   },
   rateLimit: {
     windowMs: parseInt(process.env.RATE_LIMIT_WINDOW_MS || "900000", 10),