Elaborate on vague env variable

.env.example

@@ -5,6 +5,7 @@ EMAIL_DOMAINS=["example.com","example.net"]                     # List of domain
 EMAIL_PURGE_TIME=48                                             # Time value for when to purge
 EMAIL_PURGE_UNIT="hours"                                        # minutes, hours, days
 EMAIL_PURGE_CONVERT=true                                        # Convert to highest sensible unit (and round)
+                                                                # /\ Example: 120 minutes = 2 hours, 121 minutes = ~2 hours with added tooltip
 
 # --- Example emails to keep clean ---
 EMAIL_EXAMPLE_ACCOUNT="example@48hr.email"                      # example email to preserve

.gitignore

@@ -4,3 +4,5 @@
 .DS_Store
 copilot-instructions.md
 node_modules
+db/*
+package-lock.json

domain/mail-repository.js

@@ -12,12 +12,22 @@ class MailRepository {
 
     getForRecipient(address) {
         let mails = this.mailSummaries.get(address) || []
+        const mailsToDelete = []
+
         mails.forEach(mail => {
             if (mail.to == this.config.email.examples.account && !this.config.email.examples.uids.includes(parseInt(mail.uid))) {
-                mails = mails.filter(m => m.uid != mail.uid)
-                debug('Prevented non-example email from being shown in example inbox', mail.uid)
+                mailsToDelete.push(mail.uid)
+                debug('Marking non-example email for deletion from example inbox', mail.uid)
             }
         })
+
+        // Delete the non-example mails
+        mailsToDelete.forEach(uid => {
+            this.removeUid(uid, address)
+        })
+
+        // Get fresh list after deletions
+        mails = this.mailSummaries.get(address) || []
         return _.orderBy(mails, mail => Date.parse(mail.date), ['desc'])
     }
 
@@ -57,4 +67,4 @@ class MailRepository {
     }
 }
 
-module.exports = MailRepository
+module.exports = MailRepository

infrastructure/web/public/javascripts/inbox-init.js

@@ -0,0 +1,7 @@
+document.addEventListener('DOMContentLoaded', () => {
+    const script = document.currentScript;
+    const address = script ? script.dataset.address : '';
+    if (address) {
+        enableNewMessageNotifications(address, true);
+    }
+});

infrastructure/web/public/javascripts/notifications.js

@@ -2,56 +2,56 @@
 /* eslint no-undef: 0 */
 
 function showNewMailsNotification(address, reloadPage) {
-	// We want the page to be reloaded. But then when clicking the notification, it can not find the tab and will open a new one.
+    // We want the page to be reloaded. But then when clicking the notification, it can not find the tab and will open a new one.
 
-	const notification = new Notification(address, {
-		body: 'You have new messages',
-		icon: '/images/logo.png',
-		tag: '48hr-email-replace-notification',
-		renotify: true
-	})
-	notification.addEventListener('click', event => {
-		// TODO: does not work after reloading the page, see #1
-		event.preventDefault()
-	})
+    const notification = new Notification(address, {
+        body: 'You have new messages',
+        icon: '/images/logo.png',
+        tag: '48hr-email-replace-notification',
+        renotify: true
+    })
+    notification.addEventListener('click', event => {
+        event.preventDefault()
+        window.focus()
+    })
 
-	if (reloadPage) {
-		location.reload()
-	}
+    if (reloadPage) {
+        location.reload()
+    }
 }
 
 function enableNewMessageNotifications(address, reloadPage) {
-	enableNotifications()
-	const socket = io()
-	socket.emit('sign in', address)
+    enableNotifications()
+    const socket = io()
+    socket.emit('sign in', address)
 
-	socket.on('reconnect', () => {
-		socket.emit('sign in', address)
-	})
-	socket.on('new emails', () => {
-		showNewMailsNotification(address, reloadPage)
-	})
+    socket.on('reconnect', () => {
+        socket.emit('sign in', address)
+    })
+    socket.on('new emails', () => {
+        showNewMailsNotification(address, reloadPage)
+    })
 }
 
 function enableNotifications() {
-	// Let's check if the browser supports notifications
-	if (!('Notification' in window)) {
-		return false
-	}
+    // Let's check if the browser supports notifications
+    if (!('Notification' in window)) {
+        return false
+    }
 
-	// Let's check whether notification permissions have already been granted
-	if (Notification.permission === 'granted') {
-		return true
-	}
+    // Let's check whether notification permissions have already been granted
+    if (Notification.permission === 'granted') {
+        return true
+    }
 
-	// Otherwise, we need to ask the user for permission
-	if (Notification.permission !== 'denied') {
-		Notification.requestPermission(permission => {
-			// If the user accepts, let's create a notification
-			return permission === 'granted'
-		})
-	}
+    // Otherwise, we need to ask the user for permission
+    if (Notification.permission !== 'denied') {
+        Notification.requestPermission(permission => {
+            // If the user accepts, let's create a notification
+            return permission === 'granted'
+        })
+    }
 
-	// Finally, if the user has denied notifications and you
-	// want to be respectful there is no need to bother them any more.
+    // Finally, if the user has denied notifications and you
+    // want to be respectful there is no need to bother them any more.
 }

infrastructure/web/routes/error.js

@@ -0,0 +1,29 @@
+const express = require('express')
+
+const router = new express.Router()
+const config = require('../../../application/config')
+const Helper = require('../../../application/helper')
+const helper = new(Helper)
+
+const purgeTime = helper.purgeTimeElemetBuilder()
+
+router.get('/:address/:errorCode', async(req, res) => {
+    const mailProcessingService = req.app.get('mailProcessingService')
+    const count = await mailProcessingService.getCount()
+
+    const errorCode = parseInt(req.params.errorCode) || 404
+    const message = req.query.message || (req.session && req.session.errorMessage) || 'An error occurred'
+
+    res.status(errorCode)
+    res.render('error', {
+        title: `${config.http.branding[0]} | ${errorCode}`,
+        purgeTime: purgeTime,
+        address: req.params.address,
+        count: count,
+        message: message,
+        status: errorCode,
+        branding: config.http.branding
+    })
+})
+
+module.exports = router

infrastructure/web/routes/inbox.js

@@ -58,16 +58,8 @@ router.get(
                     branding: config.http.branding,
                 })
             } else {
-                res.render(
-                    'error', {
-                        purgeTime: purgeTime,
-                        address: req.params.address,
-                        count: count,
-                        message: 'This mail could not be found. It either does not exist or has been deleted from our servers!',
-                        branding: config.http.branding
-
-                    }
-                )
+                req.session.errorMessage = 'This mail could not be found. It either does not exist or has been deleted from our servers!'
+                res.redirect(`/error/${req.params.address}/404`)
             }
         } catch (error) {
             console.error('Error while fetching email', error)
@@ -76,6 +68,16 @@ router.get(
     }
 )
 
+// Catch-all for invalid UIDs (non-numeric)
+router.get(
+    '^/:address/:uid',
+    sanitizeAddress,
+    async(req, res) => {
+        req.session.errorMessage = 'Invalid/Malformed UID provided.'
+        res.redirect(`/error/${req.params.address}/400`)
+    }
+)
+
 router.get(
     '^/:address/delete-all',
     sanitizeAddress,
@@ -121,15 +123,8 @@ router.get(
 
             // Validate UID is a valid integer
             if (isNaN(uid) || uid <= 0) {
-                return res.render(
-                    'error', {
-                        purgeTime: purgeTime,
-                        address: req.params.address,
-                        count: count,
-                        message: 'Invalid/Malformed UID provided.',
-                        branding: config.http.branding,
-                    }
-                )
+                req.session.errorMessage = 'Invalid/Malformed UID provided.'
+                return res.redirect(`/error/${req.params.address}/400`)
             }
 
             const mail = await mailProcessingService.getOneFullMail(
@@ -138,15 +133,8 @@ router.get(
             )
 
             if (!mail || !mail.attachments) {
-                return res.render(
-                    'error', {
-                        purgeTime: purgeTime,
-                        address: req.params.address,
-                        count: count,
-                        message: 'This email could not be found. It either does not exist or has been deleted from our servers!',
-                        branding: config.http.branding,
-                    }
-                )
+                req.session.errorMessage = 'This email could not be found. It either does not exist or has been deleted from our servers!'
+                return res.redirect(`/error/${req.params.address}/404`)
             }
 
             var index = mail.attachments.findIndex(attachment => attachment.checksum === req.params.checksum);
@@ -164,15 +152,8 @@ router.get(
                     return;
                 }
             } else {
-                return res.render(
-                    'error', {
-                        purgeTime: purgeTime,
-                        address: req.params.address,
-                        count: count,
-                        message: 'This attachment could not be found. It either does not exist or has been deleted from our servers!',
-                        branding: config.http.branding,
-                    }
-                )
+                req.session.errorMessage = 'This attachment could not be found. It either does not exist or has been deleted from our servers!'
+                return res.redirect(`/error/${req.params.address}/404`)
             }
         } catch (error) {
             console.error('Error while fetching attachment', error)
@@ -194,15 +175,8 @@ router.get(
 
             // Validate UID is a valid integer
             if (isNaN(uid) || uid <= 0) {
-                return res.render(
-                    'error', {
-                        purgeTime: purgeTime,
-                        address: req.params.address,
-                        count: count,
-                        message: 'Invalid/Malformed UID provided.',
-                        branding: config.http.branding,
-                    }
-                )
+                req.session.errorMessage = 'Invalid/Malformed UID provided.'
+                return res.redirect(`/error/${req.params.address}/400`)
             }
 
             mail = await mailProcessingService.getOneFullMail(
@@ -219,15 +193,8 @@ router.get(
                     mail
                 })
             } else {
-                res.render(
-                    'error', {
-                        purgeTime: purgeTime,
-                        address: req.params.address,
-                        count: count,
-                        message: 'This mail could not be found. It either does not exist or has been deleted from our servers!',
-                        branding: config.http.branding,
-                    }
-                )
+                req.session.errorMessage = 'This mail could not be found. It either does not exist or has been deleted from our servers!'
+                res.redirect(`/error/${req.params.address}/404`)
             }
         } catch (error) {
             console.error('Error while fetching raw email', error)
@@ -237,4 +204,4 @@ router.get(
 )
 
 
-module.exports = router
+module.exports = router

infrastructure/web/views/inbox.twig

@@ -1,11 +1,7 @@
 {% extends 'layout.twig' %}
 
 {% block body %}
-    <script>
-        document.addEventListener("DOMContentLoaded", function () {
-            enableNewMessageNotifications('{{ address }}', true)
-        });
-    </script>
+    <script src="/javascripts/inbox-init.js" defer data-address="{{ address }}"></script>
 
     <div class="action-links">
         <a href="/inbox/{{ address }}/delete-all">Wipe Inbox</a>

infrastructure/web/web.js

@@ -2,6 +2,7 @@ const path = require('path')
 const http = require('http')
 const debug = require('debug')('48hr-email:server')
 const express = require('express')
+const session = require('express-session')
 const logger = require('morgan')
 const Twig = require('twig')
 const compression = require('compression')
@@ -11,6 +12,7 @@ const socketio = require('socket.io')
 const config = require('../../application/config')
 const inboxRouter = require('./routes/inbox')
 const loginRouter = require('./routes/login')
+const errorRouter = require('./routes/error')
 const { sanitizeHtmlTwigFilter } = require('./views/twig-filters')
 
 const Helper = require('../../application/helper')
@@ -30,6 +32,14 @@ app.use(logger('dev'))
 app.use(express.json())
 app.use(express.urlencoded({ extended: false }))
 
+// Session middleware
+app.use(session({
+    secret: '1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ', // They will hate me for this
+    resave: false,
+    saveUninitialized: true,
+    cookie: { maxAge: 1000 * 60 * 60 * 24 } // 24 hours
+}))
+
 // Remove trailing slash middleware (except for root)
 app.use((req, res, next) => {
     if (req.path.length > 1 && req.path.endsWith('/')) {
@@ -63,6 +73,7 @@ app.get('/', (req, res, _next) => {
 
 app.use('/', loginRouter)
 app.use('/inbox', inboxRouter)
+app.use('/error', errorRouter)
 
 // Catch 404 and forward to error handler
 app.use((req, res, next) => {
@@ -105,4 +116,4 @@ server.on('listening', () => {
     debug('Listening on ' + bind)
 })
 
-module.exports = { app, io, server }
+module.exports = { app, io, server }