From 62b944d26004b62addb3c7dc32300800e3648ccf Mon Sep 17 00:00:00 2001 From: smfahim25 Date: Thu, 20 Mar 2025 13:42:39 +0600 Subject: [PATCH] try to solve --- src/api/index.ts | 35 +++++++++++++++++++-------------- src/config/env.ts | 41 ++++++++++++++++++++------------------- src/config/minioClient.ts | 11 +++++------ 3 files changed, 46 insertions(+), 41 deletions(-) diff --git a/src/api/index.ts b/src/api/index.ts index 856196b..a9b6ccc 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -7,18 +7,23 @@ import { photoLibraryRoutes } from "./photoLibrary/photo.library.route"; import { categoryRoutes } from "./category/category.route"; import { designRoutes } from "./design/design.route"; -export const api = new Elysia({ - prefix: "", -}); - -api.get("/", () => { - return "Hello from PlanPostAI Canvas API"; -}); - -api.use(authRoute); -api.use(projectRoutes); -api.use(uploadRoutes); -api.use(photoLibraryRoutes); -api.use(uploadShapesRoutes); -api.use(categoryRoutes); -api.use(designRoutes); +export const api = new Elysia({ prefix: "" }) + .get("/", () => { + console.log("Root endpoint accessed"); + return "Hello from PlanPostAI Canvas API"; + }) + .use(authRoute) + .use(projectRoutes) + .use(uploadRoutes) + .use(photoLibraryRoutes) + .use(designRoutes) + .use(uploadShapesRoutes) + .use(categoryRoutes) + .onError(({ code, error, set }) => { + console.error(`API Error: ${code}`, error); + if (code === "NOT_FOUND") { + set.status = 404; + return "API Endpoint Not Found"; + } + return "API Error Occurred"; + }); diff --git a/src/config/env.ts b/src/config/env.ts index 1f41a62..27da37d 100644 --- a/src/config/env.ts +++ b/src/config/env.ts @@ -1,22 +1,23 @@ -import 'dotenv/config' +import "dotenv/config"; export const ENV = { - SERVER_URL: process.env.SERVER_URL, - SERVER_PORT: process.env.SERVER_PORT || 5000, - DATABASE_URL: process.env.DATABASE_URL, - MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY, - MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY, - MINIO_ENDPOINT: process.env.MINIO_ENDPOINT, - MINIO_PORT: process.env.MINIO_PORT, - JWT_ACCESS_TOKEN_SECRET: process.env.JWT_ACCESS_TOKEN_SECRET, - JWT_REFRESH_TOKEN_SECRET: process.env.JWT_REFRESH_TOKEN_SECRET, - JWT_EMAIL_TOKEN_SECRET: process.env.JWT_EMAIL_TOKEN_SECRET, - JWT_EMAIL_RESET_PASSWORD_SECRET: process.env.JWT_EMAIL_RESET_PASSWORD_SECRET, - USER_CANVAS_JWT_ACCESS_TOKEN_SECRET: process.env.USER_CANVAS_JWT_ACCESS_TOKEN_SECRET, - MAIL_HOST: process.env.MAIL_HOST, - MAIL_PORT: process.env.MAIL_PORT, - MAIL_USER: process.env.MAIL_USER, - MAIL_PASS: process.env.MAIL_PASS, - PEXELS_URL: process.env.PEXELS_URL, - PEXELS_ACCESS_KEY: process.env.PEXELS_ACCESS_KEY, -} \ No newline at end of file + SERVER_URL: process.env.SERVER_URL, + SERVER_PORT: process.env.SERVER_PORT || 5000, + DATABASE_URL: process.env.DATABASE_URL, + MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY, + MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY, + MINIO_ENDPOINT: process.env.MINIO_URL, + MINIO_PORT: process.env.MINIO_PORT, + JWT_ACCESS_TOKEN_SECRET: process.env.JWT_ACCESS_TOKEN_SECRET, + JWT_REFRESH_TOKEN_SECRET: process.env.JWT_REFRESH_TOKEN_SECRET, + JWT_EMAIL_TOKEN_SECRET: process.env.JWT_EMAIL_TOKEN_SECRET, + JWT_EMAIL_RESET_PASSWORD_SECRET: process.env.JWT_EMAIL_RESET_PASSWORD_SECRET, + USER_CANVAS_JWT_ACCESS_TOKEN_SECRET: + process.env.USER_CANVAS_JWT_ACCESS_TOKEN_SECRET, + MAIL_HOST: process.env.MAIL_HOST, + MAIL_PORT: process.env.MAIL_PORT, + MAIL_USER: process.env.MAIL_USER, + MAIL_PASS: process.env.MAIL_PASS, + PEXELS_URL: process.env.PEXELS_URL, + PEXELS_ACCESS_KEY: process.env.PEXELS_ACCESS_KEY, +}; diff --git a/src/config/minioClient.ts b/src/config/minioClient.ts index 798b1a1..3d5e237 100644 --- a/src/config/minioClient.ts +++ b/src/config/minioClient.ts @@ -2,9 +2,8 @@ import { Client } from "minio"; import { ENV } from "../config/env"; export const minioClient = new Client({ - endPoint: ENV.MINIO_ENDPOINT!, - port: ENV.MINIO_PORT, - useSSL: false, - accessKey: ENV.MINIO_ACCESS_KEY, - secretKey: ENV.MINIO_SECRET_KEY, -}) \ No newline at end of file + endPoint: ENV.MINIO_ENDPOINT!.replace("http://", "").replace("https://", ""), + useSSL: ENV.MINIO_ENDPOINT!.startsWith("https"), + accessKey: ENV.MINIO_ACCESS_KEY, + secretKey: ENV.MINIO_SECRET_KEY, +});