Upload to s3 for public image working.

This commit is contained in:
charles-gauthereau
2024-11-23 16:49:16 +01:00
parent e3fe6d1c80
commit 1871389a5e
6 changed files with 191 additions and 46 deletions
+39 -26
View File
@@ -2,10 +2,13 @@
import {userAction} from "@/safe-actions";
import {z} from "zod";
import {v4 as uuidv4} from 'uuid';
import { writeFile, access, mkdir } from "fs/promises";
import {mkdir, writeFile} from "fs/promises";
import path from "path";
import {env} from "@/env.mjs";
import {checkMinioAlive} from "@/utils/s3-file-management";
import {checkMinioAlive, createPublicBucket, saveFileInBucket} from "@/utils/s3-file-management";
import {prisma} from "@/prisma";
import {UploadedObjectInfo} from "minio/src/internal/type";
import {Settings} from "@prisma/client";
export const uploadImageAction = userAction
@@ -14,17 +17,28 @@ export const uploadImageAction = userAction
const file = formData.get("file") as File
const uuid = uuidv4()
const fileFormat = file.name.split(".").slice(-1)[0]
const fileName = uuid + "." + fileFormat
const arrayBuffer = await file.arrayBuffer()
const buffer = Buffer.from(arrayBuffer)
const settings = await prisma.settings.findUnique({
where:{
name: "system"
}
})
// await uploadS3Compatible()
let result: void | UploadedObjectInfo;
const bucketName = 'public-image-bucket';
const result = await uploadLocal(fileName,buffer)
const url = getUrl(fileName)
if(settings.storage === "local") {
result = await uploadLocal(fileName,buffer)
}else if (settings.storage === "s3"){
result = await uploadS3Compatible(bucketName,fileName, buffer)
}
const url = getUrl(fileName, settings, bucketName)
console.log(url)
return {
data: {result: result, url: url},
}
@@ -32,35 +46,29 @@ export const uploadImageAction = userAction
});
function getUrl(fileName:string):string {
let url: string = "";
function getUrl(fileName:string, settings: Settings, bucketName: string):string {
if (env.NODE_ENV === "production") {
// url = `https://${env.S3_ENDPOINT}/${bucketName}/${fileName}`
return url
return "url"
} else {
url = `http://localhost:8887/uploads/${fileName}`
return url
if(settings.storage === "s3"){
return `http://localhost:${env.S3_PORT}/${bucketName}/${fileName}`
}else if(settings.storage === "local"){
return `http://localhost:8887/uploads/${fileName}`
}
}
}
async function uploadLocal(fileName: string, buffer: any): Promise<{ data: { result: void; url: string } }> {
async function uploadLocal(fileName: string, buffer: any) {
const localDir = "public/uploads/"
try {
await mkdir(path.join(process.cwd(), localDir), { recursive: true });
const result = await writeFile(
return await writeFile(
path.join(process.cwd(), localDir + fileName),
buffer
);
let url: string = "";
if (env.NODE_ENV === "production") {
// url = `https://${env.S3_ENDPOINT}/${bucketName}/${fileName}`
} else {
url = `http://localhost:8887/uploads/${fileName}`
}
return {
data: {result: result, url: url},
}
)
} catch (error) {
console.log("Error occured ", error);
throw new Error('An error occured while importing image');
@@ -68,8 +76,13 @@ async function uploadLocal(fileName: string, buffer: any): Promise<{ data: { res
}
}
async function uploadS3Compatible() {
await checkMinioAlive()
async function uploadS3Compatible(bucketName: string, fileName: string, buffer: any){
await createPublicBucket({bucketName});
return await saveFileInBucket({
bucketName,
fileName,
file: buffer,
})
}
export async function checkConnexionToS3(){