Error handleing

index.js

@@ -9,7 +9,8 @@ const statusMonitor = require("express-status-monitor")({
     title: "Bee3Hive API Status",
 });
 const cors = require("cors");
-const { withAccelerate } = require("@prisma/extension-accelerate")
+const { withAccelerate } = require("@prisma/extension-accelerate");
+const { error } = require("console");
 const prisma = new PrismaClient().$extends(withAccelerate())
 const app = express();
 
@@ -141,10 +142,6 @@ const storage = multer.diskStorage({
     },
 });
 
-if (!fs.existsSync("uploads")) {
-    fs.mkdirSync("uploads");
-}
-
 // Set file size limit to 10GB
 const upload = multer({
     storage: storage,
@@ -419,104 +416,110 @@ app.post("/auth/delete", async (req, res) => {
     }
 });
 
-app.post("/file/upload", upload.single("file"), async (req, res) => {
-    
-    try {
-        const upload_path = req.file.path;
-        const file_path = req.body.filePath;
-        const full_file_path = req.user.username + (file_path ? "/" + file_path : "");
-
-        // Upload the file to another backend
-
-        if(services.length == 0) {
-            res.status(500).send("Service unavailable");
-            return;
+app.post("/file/upload", async (req, res) => {
+    upload.single("file")(req, res, async (err) => {
+        if(err) {
+            console.log(err)
+            return
         }
-
-        const server = services[Math.floor(Math.random() * services.length)];
-
-        const body = {
-            filename: file_path,
-            directory: full_file_path,
-            username: req.user.username,
-            fileURI: req.file.filename,
-        }
-
-        // console.log(body)
-
-        // Upload the file
+    
         try {
-            info("Uploading file to " + server);
-            const resp = await fetch(server + "/fetch", {
-                method: "POST",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                body: JSON.stringify(body),
-            });
+            const upload_path = req.file.path;
+            const file_path = req.body.filePath;
+            const full_file_path = req.user.username + (file_path ? "/" + file_path : "");
 
-            if(!resp.ok) {
-                warn(await resp.text());
-                res.sendStatus(500);
+            // Upload the file to another backend
+
+            if(services.length == 0) {
+                res.status(500).send("Service unavailable");
                 return;
             }
 
-            const json = await resp.json();
-            console.log(json)
+            const server = services[Math.floor(Math.random() * services.length)];
 
-            if(await prisma.storage.findUnique({ where: { dir: full_file_path } })) {
-                // File already exists and same content
-                warn("File already exists. No override: " + full_file_path);
-                res.sendStatus(200);
-                return;
+            const body = {
+                filename: file_path,
+                directory: full_file_path,
+                username: req.user.username,
+                fileURI: req.file.filename,
             }
 
-            if(await prisma.storage.findUnique({ where: { dir: full_file_path } })) {
-                warn("File already exists. Override: " + full_file_path);
-                await prisma.storage.update({
-                    where:{
-                        dir: full_file_path
+            // console.log(body)
+
+            // Upload the file
+            try {
+                info("Uploading file to " + server);
+                const resp = await fetch(server + "/fetch", {
+                    method: "POST",
+                    headers: {
+                        "Content-Type": "application/json",
                     },
+                    body: JSON.stringify(body),
+                });
 
-                    data: {
-                        handle: server,
-                        username: req.user.username,
-                        CID: json[0].Hash,
-                        size: +json[0].Size,
-                        dir: full_file_path,
-                    }
-                })
-            } else {
-                info("Adding record: " + full_file_path);
-                //* Add record
-                await prisma.storage.create({
-                    data: {
-                        handle: server,
-                        username: req.user.username,
-                        CID: json[0].Hash,
-                        size: +json[0].Size,
-                        dir: full_file_path,
-                    }
-                })
+                if(!resp.ok) {
+                    warn(await resp.text());
+                    res.sendStatus(500);
+                    return;
+                }
+
+                const json = await resp.json();
+                console.log(json)
+
+                if(await prisma.storage.findUnique({ where: { dir: full_file_path } })) {
+                    // File already exists and same content
+                    warn("File already exists. No override: " + full_file_path);
+                    res.sendStatus(200);
+                    return;
+                }
+
+                if(await prisma.storage.findUnique({ where: { dir: full_file_path } })) {
+                    warn("File already exists. Override: " + full_file_path);
+                    await prisma.storage.update({
+                        where:{
+                            dir: full_file_path
+                        },
+
+                        data: {
+                            handle: server,
+                            username: req.user.username,
+                            CID: json[0].Hash,
+                            size: +json[0].Size,
+                            dir: full_file_path,
+                        }
+                    })
+                } else {
+                    info("Adding record: " + full_file_path);
+                    //* Add record
+                    await prisma.storage.create({
+                        data: {
+                            handle: server,
+                            username: req.user.username,
+                            CID: json[0].Hash,
+                            size: +json[0].Size,
+                            dir: full_file_path,
+                        }
+                    })
+                }
+            } catch (e) {
+                warn("Error on uploading file");
+                console.log(e);
+                res.sendStatus(500);
+                fs.unlinkSync(upload_path);
+                return;
             }
-        } catch (e) {
-            warn("Error on uploading file");
-            console.log(e);
-            res.sendStatus(500);
-            fs.unlinkSync(upload_path);
-            return;
-        }
 
-        fs.unlinkSync(upload_path);
+            fs.unlinkSync(upload_path);
 
-        info("File uploaded successfully: " + full_file_path);
-        res.send("File uploaded successfully.");
-    } catch (error) {
-        // Fail to upload
-        warn("File upload failed");
-        console.log(error);
-        res.status(500).send("File upload failed.");
-    }
+            info("File uploaded successfully: " + full_file_path);
+            res.send("File uploaded successfully.");
+        } catch (error) {
+            // Fail to upload
+            warn("File upload failed");
+            console.log(error);
+            res.status(500).send("File upload failed.");
+        }
+    })
 });
 
 app.get("/file/list", async (req, res) => {