Error checking 8

index.js

@@ -416,120 +416,107 @@ app.post("/auth/delete", async (req, res) => {
     }
 });
 
-app.post("/file/upload", async (req, res) => {
-    // Try to write file
-    fs.writeFileSync("uploads/test2.txt", 'TEST');
+app.post("/file/upload", upload.single("file"), async (req, res) => {
 
-    // List file in /uploads/
-    const tests = fs.readdirSync("uploads");
-    console.log(tests)
-    
+    try {
+        const tests = fs.readdirSync("uploads");
+        console.log(tests)
+        console.log(req.file)
+        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
 
-    upload.single("file")(req, res, async (err) => {
-        if(err) {
-            console.log(err)
-            return
+        if(services.length == 0) {
+            res.status(500).send("Service unavailable");
+            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,
         }
-    
-        try {
-            console.log(req.file)
-            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
+        // console.log(body)
 
-            if(services.length == 0) {
-                res.status(500).send("Service unavailable");
+        // 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),
+            });
+
+            if(!resp.ok) {
+                warn(await resp.text());
+                res.sendStatus(500);
                 return;
             }
 
-            const server = services[Math.floor(Math.random() * services.length)];
+            const json = await resp.json();
+            console.log(json)
 
-            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 } })) {
+                // File already exists and same content
+                warn("File already exists. No override: " + full_file_path);
+                res.sendStatus(200);
+                return;
             }
 
-            // 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",
+            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
                     },
-                    body: JSON.stringify(body),
-                });
 
-                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;
+                    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);
-
-            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.");
+            return;
         }
-    })
+
+        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.");
+    }
 });
 
 app.get("/file/list", async (req, res) => {