add error processing and 404 page

Author: voronin-ivan

index.js

@@ -11,6 +11,7 @@ app.set('views', path.join(__dirname, 'server/views'));
 
 app.use(express.static(path.join(__dirname, 'dist')));
 app.use('/', router);
+app.use('*', (req, res) => res.status(404).render('404'));
 
 app.listen(PORT, HOSTNAME, () => {
     console.log(`Express app listening on ${HOSTNAME}:${PORT}`);

server/core/utils.js

@@ -7,11 +7,7 @@ const repoPath = path.join(__dirname, '../../repo');
 const options = { cwd: repoPath };
 
 const runExec = async (command) => {
-    const { stdout, stderr } = await exec(command, options);
-
-    if (stderr) {
-        console.error(stderr);
-    }
+    const { stdout } = await exec(command, options);
 
     return stdout;
 };

server/router.js

@@ -10,62 +10,79 @@ const {
 
 const router = new Router();
 
-router.get('/', async (req, res) => res.render('index', {
-    branches: await getBranches(),
-}));
+router.get('/', async (req, res) => {
+    try {
+        return res.render('index', {
+            branches: await getBranches(),
+        });
+    } catch (error) {
+        console.error(error);
+        return res.status(404).render('404');
+    }
+});
 
 router.get('/:branch', async (req, res) => {
     const branch = req.params.branch;
     const file = req.query.file;
     const path = req.query.path;
 
-    if (file) {
-        return res.render('preview', {
-            branch,
-            breadCrumbs: await getBreadCrumbs(branch, file),
-            fileContent: await getFileContent(file),
-        });
-    }
+    try {
+        if (file) {
+            return res.render('preview', {
+                branch,
+                breadCrumbs: await getBreadCrumbs(branch, file),
+                fileContent: await getFileContent(file),
+            });
+        }
 
-    if (path) {
-        return res.render('files', {
+        if (path) {
+            return res.render('files', {
+                branch,
+                files: await getFiles(path),
+                breadCrumbs: await getBreadCrumbs(branch, path),
+            });
+        }
+
+        return res.render('branch', {
             branch,
-            files: await getFiles(path),
-            breadCrumbs: await getBreadCrumbs(branch, path),
+            commits: await getCommits(branch),
+            files: await getFiles(branch),
         });
+    } catch (error) {
+        console.error(error);
+        return res.status(404).render('404');
     }
-
-    return res.render('branch', {
-        branch,
-        commits: await getCommits(branch),
-        files: await getFiles(branch),
-    });
 });
 
 router.get('/:branch/:commit', async (req, res) => {
     const { commit, branch } = req.params;
     const { file, path } = req.query;
 
-    if (file) {
-        return res.render('preview', {
+    try {
+        if (file) {
+            return res.render('preview', {
+                branch,
+                breadCrumbs: await getBreadCrumbs(branch, file),
+                fileContent: await getFileContent(file),
+            });
+        }
+
+        const fileHash = path || commit;
+        const breadCrumbs = path ? await getBreadCrumbs(commit, fileHash) : null;
+
+        return res.render('files', {
             branch,
-            breadCrumbs: await getBreadCrumbs(branch, file),
-            fileContent: await getFileContent(file),
+            breadCrumbs,
+            commit: {
+                name: await getCommitName(commit),
+                hash: commit,
+            },
+            files: await getFiles(fileHash),
         });
+    } catch (error) {
+        console.error(error);
+        return res.status(404).render('404');
     }
-
-    const fileHash = path || commit;
-    const breadCrumbs = path ? await getBreadCrumbs(commit, fileHash) : null;
-
-    return res.render('files', {
-        branch,
-        breadCrumbs,
-        commit: {
-            name: await getCommitName(commit),
-            hash: commit,
-        },
-        files: await getFiles(fileHash),
-    });
 });
 
 module.exports = router;

server/views/404.pug

@@ -0,0 +1,7 @@
+extends layout
+block content
+    header
+        h1.title 404 Not Found
+    main
+        h2
+            a(href="/") Back to main page