app.js

@@ -5,6 +5,9 @@
 const config = require('./application/config')
 const debug = require('debug')('48hr-email:app')
 
+// Until node 11 adds flatmap, we use this:
+require('array.prototype.flatmap').shim()
+
 const { app, io, server } = require('./infrastructure/web/web')
 const ClientNotification = require('./infrastructure/web/client-notification')
 const ImapService = require('./application/imap-service')
@@ -43,11 +46,6 @@ const mailProcessingService = new MailProcessingService(
 )
 debug('Mail processing service initialized')
 
-// Set up timer sync broadcasting after IMAP is ready
-imapService.on(ImapService.EVENT_INITIAL_LOAD_DONE, () => {
-    clientNotification.startTimerSync(imapService)
-})
-
 // Track IMAP initialization state
 let isImapReady = false
 app.set('isImapReady', false)

application/helper.js

@@ -1,4 +1,5 @@
 const config = require('./config')
+const moment = require('moment')
 const debug = require('debug')('48hr-email:helper')
 
 class Helper {
@@ -8,30 +9,10 @@ class Helper {
      * @returns {Date}
      */
     purgeTimeStamp() {
-        // Calculate cutoff time using native Date
+        const cutoff = moment()
-        const now = new Date()
+            .subtract(config.email.purgeTime.time, config.email.purgeTime.unit)
-        let cutoffMs = now.getTime()
+            .toDate()
-
+        debug(`Purge cutoff calculated: ${cutoff} (${config.email.purgeTime.time} ${config.email.purgeTime.unit} ago)`)
-        // Subtract the purge time based on unit
-        const time = config.email.purgeTime.time
-        const unit = config.email.purgeTime.unit
-
-        switch (unit) {
-            case 'minutes':
-                cutoffMs -= time * 60 * 1000
-                break
-            case 'hours':
-                cutoffMs -= time * 60 * 60 * 1000
-                break
-            case 'days':
-                cutoffMs -= time * 24 * 60 * 60 * 1000
-                break
-            default:
-                throw new Error(`Unknown time unit: ${unit}`)
-        }
-
-        const cutoff = new Date(cutoffMs)
-        debug(`Purge cutoff calculated: ${cutoff} (${time} ${unit} ago)`)
         return cutoff
     }
 

application/imap-service.js

@@ -2,8 +2,11 @@ const EventEmitter = require('events')
 const imaps = require('imap-simple')
 const { simpleParser } = require('mailparser')
 const addressparser = require('nodemailer/lib/addressparser')
+const pSeries = require('p-series')
 const retry = require('async-retry')
 const debug = require('debug')('48hr-email:imap-manager')
+const _ = require('lodash')
+const moment = require('moment')
 const Mail = require('../domain/mail')
 const Helper = require('./helper')
 const helper = new(Helper)
@@ -97,7 +100,6 @@ class ImapService extends EventEmitter {
         this.connection = null
         this.initialLoadDone = false
         this.loadingInProgress = false
-        this.lastRefreshTime = null
     }
 
     async connectAndLoadMessages() {
@@ -158,14 +160,8 @@ class ImapService extends EventEmitter {
         // for new mails on the server. This is done only after all the mails have been loaded for the
         // first time. (Note: set the refresh higher than the time it takes to download the mails).
         if (this.config.imap.refreshIntervalSeconds) {
-            // Track when refreshes happen
-            this.lastRefreshTime = Date.now()
-
             setInterval(
-                () => {
+                () => this._loadMailSummariesAndEmitAsEvents(),
-                    this.lastRefreshTime = Date.now()
-                    this._loadMailSummariesAndEmitAsEvents()
-                },
                 this.config.imap.refreshIntervalSeconds * 1000
             )
         }
@@ -194,10 +190,7 @@ class ImapService extends EventEmitter {
         const concurrency = this.config.imap.fetchConcurrency
 
         // Chunk newest-first UIDs to balance speed and first-paint
-        const uidChunks = []
+        const uidChunks = _.chunk(newUids, chunkSize)
-        for (let i = 0; i < newUids.length; i += chunkSize) {
-            uidChunks.push(newUids.slice(i, i + chunkSize))
-        }
         debug(`Chunk size: ${chunkSize}, concurrency: ${concurrency}, chunks to process: ${uidChunks.length}`)
 
         // Limited-concurrency worker
@@ -243,7 +236,7 @@ class ImapService extends EventEmitter {
         let uids;
 
         // Only do heavy IMAP date filtering if the cutoff is older than 1 day
-        const useDateFilter = helper.moreThanOneDay(new Date(), deleteMailsBefore);
+        const useDateFilter = helper.moreThanOneDay(moment(), deleteMailsBefore);
 
         const searchQuery = useDateFilter ? [
             ['!DELETED'],
@@ -313,20 +306,6 @@ class ImapService extends EventEmitter {
         }
     }
 
-    /**
-     * Get seconds remaining until next IMAP refresh
-     * @returns {number} Seconds until next refresh, or null if not started
-     */
-    getSecondsUntilNextRefresh() {
-        if (!this.lastRefreshTime || !this.config.imap.refreshIntervalSeconds) {
-            return null
-        }
-
-        const elapsed = (Date.now() - this.lastRefreshTime) / 1000
-        const remaining = Math.max(0, this.config.imap.refreshIntervalSeconds - elapsed)
-        return Math.ceil(remaining)
-    }
-
     /**
      * Helper method because ImapSimple#search also fetches each message. We just need the uids here.
      *
@@ -367,12 +346,8 @@ class ImapService extends EventEmitter {
         const rawDate = headerPart.date && headerPart.date[0] ? headerPart.date[0] : undefined
         let date
         if (rawDate) {
-            // Parse email date - native Date handles ISO dates and timezones
+            const m = moment.parseZone(rawDate)
-            date = new Date(rawDate)
+            date = m.toDate()
-                // Fallback to current date if parsing fails
-            if (isNaN(date.getTime())) {
-                date = new Date()
-            }
         } else {
             date = new Date()
         }
@@ -403,7 +378,7 @@ class ImapService extends EventEmitter {
         if (messages.length === 0) {
             return false
         } else if (!raw) {
-            const fullBody = messages[0].parts.find(part => part.which === '')
+            const fullBody = await _.find(messages[0].parts, { which: '' })
             if (!fullBody || !fullBody.body) {
                 throw new Error('Unable to find message body')
             }

application/mail-processing-service.js

@@ -169,24 +169,7 @@ class MailProcessingService extends EventEmitter {
             debug('Failed to clear email cache:', err.message)
         }
 
-        // Find which addresses have this UID before removing it
-        const affectedAddresses = []
-        this.mailRepository.mailSummaries.forEachAssociation((mails, address) => {
-            if (mails.some(mail => mail.uid === parseInt(uid))) {
-                affectedAddresses.push(address)
-            }
-        })
-
-        // Remove from repository
         this.mailRepository.removeUid(uid)
-
-        // Notify affected inboxes to reload
-        if (this.initialLoadDone) {
-            affectedAddresses.forEach(address => {
-                debug('Notifying inbox after deletion:', address)
-                this.clientNotification.emit(address)
-            })
-        }
     }
 
     async _deleteOldMails() {

domain/mail-repository.js

@@ -1,5 +1,6 @@
 const debug = require('debug')('48hr-email:mail-summary-store')
 const MultiMap = require('mnemonist/multi-map')
+const _ = require('lodash')
 const config = require('../application/config')
 
 class MailRepository {
@@ -27,22 +28,12 @@ class MailRepository {
 
         // Get fresh list after deletions
         mails = this.mailSummaries.get(address) || []
-            // Sort by date descending
+        return _.orderBy(mails, mail => Date.parse(mail.date), ['desc'])
-        return mails.sort((a, b) => {
-            const dateA = Date.parse(a.date)
-            const dateB = Date.parse(b.date)
-            return dateB - dateA // descending order (newest first)
-        })
     }
 
     getAll() {
         const mails = [...this.mailSummaries.values()]
-            // Sort by date descending
+        return _.orderBy(mails, mail => Date.parse(mail.date), ['desc'])
-        return mails.sort((a, b) => {
-            const dateA = Date.parse(a.date)
-            const dateB = Date.parse(b.date)
-            return dateB - dateA // descending order (newest first)
-        })
     }
 
     add(to, mailSummary) {

infrastructure/web/client-notification.js

@@ -9,13 +9,9 @@ class ClientNotification extends EventEmitter {
     constructor() {
         super();
         this.pendingNotifications = new Map(); // address -> count
-        this.io = null;
-        this.imapService = null;
-        this.timerSyncInterval = null;
     }
 
     use(io) {
-        this.io = io;
         io.on('connection', socket => {
             debug(`[SOCKET] New connection: id=${socket.id}`);
             socket.on('sign in', address => {
@@ -28,25 +24,6 @@ class ClientNotification extends EventEmitter {
         })
     }
 
-    startTimerSync(imapService) {
-        this.imapService = imapService;
-
-        // Broadcast timer sync every second to all connected clients
-        if (this.timerSyncInterval) {
-            clearInterval(this.timerSyncInterval);
-        }
-
-        this.timerSyncInterval = setInterval(() => {
-            const secondsRemaining = this.imapService.getSecondsUntilNextRefresh();
-            if (secondsRemaining !== null && this.io) {
-                // Broadcast to all connected clients
-                this.io.emit('refresh-timer-sync', secondsRemaining);
-            }
-        }, 1000);
-
-        debug('Started timer sync broadcasting');
-    }
-
     _signIn(socket, address) {
         debug(`socketio signed in: ${address}`)
 

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

@@ -4,8 +4,6 @@ document.addEventListener('DOMContentLoaded', () => {
     // Get expiry config from data attributes
     const expiryTime = script && script.dataset.expiryTime ? Number(script.dataset.expiryTime) : 48;
     const expiryUnit = script && script.dataset.expiryUnit ? script.dataset.expiryUnit : 'hours';
-    const refreshInterval = script && script.dataset.refreshInterval ? Number(script.dataset.refreshInterval) : null;
-
     if (address) {
         enableNewMessageNotifications(address, true);
     }
@@ -17,9 +15,4 @@ document.addEventListener('DOMContentLoaded', () => {
     if (window.utils && typeof window.utils.formatEmailDates === 'function') {
         window.utils.formatEmailDates();
     }
-
-    // Initialize refresh countdown
-    if (window.utils && typeof window.utils.initRefreshCountdown === 'function' && refreshInterval) {
-        window.utils.initRefreshCountdown(refreshInterval);
-    }
 });

infrastructure/web/public/javascripts/notifications.js

@@ -31,13 +31,6 @@ function enableNewMessageNotifications(address, reloadPage) {
     socket.on('new emails', () => {
         showNewMailsNotification(address, reloadPage)
     })
-
-    // Listen for timer sync from server
-    socket.on('refresh-timer-sync', (secondsRemaining) => {
-        if (window.updateRefreshTimer && typeof window.updateRefreshTimer === 'function') {
-            window.updateRefreshTimer(secondsRemaining)
-        }
-    })
 }
 
 function enableNotifications() {
@@ -61,4 +54,4 @@ function enableNotifications() {
 
     // Finally, if the user has denied notifications and you
     // want to be respectful there is no need to bother them any more.
-}
+}

infrastructure/web/public/javascripts/utils.js

@@ -347,23 +347,8 @@ document.addEventListener('DOMContentLoaded', () => {
         });
     }
 
-    function initRefreshCountdown(refreshInterval) {
-        const refreshTimer = document.getElementById('refreshTimer');
-        if (!refreshTimer || !refreshInterval) return;
-
-        // Function to update timer display
-        window.updateRefreshTimer = function(secondsLeft) {
-            if (refreshTimer) {
-                refreshTimer.textContent = secondsLeft;
-            }
-        };
-
-        // Initialize with the configured interval
-        refreshTimer.textContent = refreshInterval;
-    }
-
     // Expose utilities and run them
-    window.utils = { formatEmailDates, formatMailDate, initLockModals, initCopyAddress, initExpiryTimers, initQrModal, initHamburgerMenu, initThemeToggle, initRefreshCountdown };
+    window.utils = { formatEmailDates, formatMailDate, initLockModals, initCopyAddress, initExpiryTimers, initQrModal, initHamburgerMenu, initThemeToggle };
     formatEmailDates();
     formatMailDate();
     initLockModals();

infrastructure/web/public/stylesheets/custom.css

@@ -1047,36 +1047,6 @@ body.light-mode .theme-icon-light {
 }
 
 
-/* Refresh countdown timer */
-
-.refresh-countdown {
-    color: var(--color-text-dim);
-    font-size: 0.9rem;
-    padding: 6px 12px;
-    background: var(--overlay-purple-10);
-    border: 1px solid var(--overlay-purple-20);
-    border-radius: 12px;
-    display: inline-flex;
-    align-items: center;
-    gap: 4px;
-    opacity: 0.8;
-    transition: opacity 0.3s ease;
-    width: fit-content;
-    margin: 0 auto;
-}
-
-.refresh-countdown:hover {
-    opacity: 1;
-}
-
-#refreshTimer {
-    font-weight: 600;
-    color: var(--color-accent-purple-light);
-    min-width: 2ch;
-    text-align: center;
-}
-
-
 /* Responsive Styles */
 
 @media (max-width: 768px) {

infrastructure/web/routes/inbox.js

@@ -19,26 +19,7 @@ const sanitizeAddress = param('address').customSanitizer(
     }
 )
 
-// Middleware to validate domain is in allowed list
+router.get('^/:address([^@/]+@[^@/]+)', sanitizeAddress, checkLockAccess, async(req, res, next) => {
-const validateDomain = (req, res, next) => {
-    const address = req.params.address
-    const domain = address.split('@')[1]
-
-    if (!domain) {
-        req.session.errorMessage = 'Invalid email address format.'
-        return res.redirect(`/error/${address}/400`)
-    }
-
-    const allowedDomains = config.email.domains.map(d => d.toLowerCase())
-    if (!allowedDomains.includes(domain.toLowerCase())) {
-        req.session.errorMessage = `Domain '${domain}' is not supported by this service.`
-        return res.redirect(`/error/${address}/403`)
-    }
-
-    next()
-}
-
-router.get('^/:address([^@/]+@[^@/]+)', sanitizeAddress, validateDomain, checkLockAccess, async(req, res, next) => {
     try {
         const mailProcessingService = req.app.get('mailProcessingService')
         if (!mailProcessingService) {
@@ -77,8 +58,7 @@ router.get('^/:address([^@/]+@[^@/]+)', sanitizeAddress, validateDomain, checkLo
             error: lockError,
             redirectTo: req.originalUrl,
             expiryTime: config.email.purgeTime.time,
-            expiryUnit: config.email.purgeTime.unit,
+            expiryUnit: config.email.purgeTime.unit
-            refreshInterval: config.imap.refreshIntervalSeconds
         })
     } catch (error) {
         debug(`Error loading inbox for ${req.params.address}:`, error.message)
@@ -90,7 +70,6 @@ router.get('^/:address([^@/]+@[^@/]+)', sanitizeAddress, validateDomain, checkLo
 router.get(
     '^/:address/:uid([0-9]+)',
     sanitizeAddress,
-    validateDomain,
     checkLockAccess,
     async(req, res, next) => {
         try {
@@ -147,7 +126,6 @@ router.get(
 router.get(
     '^/:address/delete-all',
     sanitizeAddress,
-    validateDomain,
     checkLockAccess,
     async(req, res, next) => {
         try {
@@ -172,7 +150,6 @@ router.get(
 router.get(
     '^/:address/:uid/delete',
     sanitizeAddress,
-    validateDomain,
     checkLockAccess,
     async(req, res, next) => {
         try {
@@ -190,7 +167,6 @@ router.get(
 router.get(
     '^/:address/:uid/:checksum([a-f0-9]+)',
     sanitizeAddress,
-    validateDomain,
     checkLockAccess,
     async(req, res, next) => {
         try {
@@ -251,7 +227,6 @@ router.get(
 router.get(
     '^/:address/:uid/raw',
     sanitizeAddress,
-    validateDomain,
     checkLockAccess,
     async(req, res, next) => {
         try {
@@ -321,7 +296,6 @@ router.get(
 router.get(
     '^/:address/:uid',
     sanitizeAddress,
-    validateDomain,
     async(req, res) => {
         req.session.errorMessage = 'Invalid/Malformed UID provided.'
         res.redirect(`/error/${req.params.address}/400`)

infrastructure/web/views/inbox.twig

@@ -30,7 +30,7 @@
 
 {% block body %}
     <script src="/javascripts/qrcode.js"></script>
-    <script src="/javascripts/inbox-init.js" defer data-address="{{ address }}" data-expiry-time="{{ expiryTime }}" data-expiry-unit="{{ expiryUnit }}" data-refresh-interval="{{ refreshInterval }}"></script>
+    <script src="/javascripts/inbox-init.js" defer data-address="{{ address }}" data-expiry-time="{{ expiryTime }}" data-expiry-unit="{{ expiryUnit }}"></script>
     <div class="inbox-container">
         <div class="inbox-header">
             <h1 class="inbox-title" id="copyAddress" title="Click to copy address">{{ address }}</h1>
@@ -71,7 +71,7 @@
             There are no mails yet.
         </blockquote>
     {% endif %}
-    <div class="refresh-countdown" id="refreshCountdown">Auto-refresh in <span id="refreshTimer">--</span>s</div>
+
     {% if lockEnabled and not isLocked %}
     <!-- Lock Modal -->
     <div id="lockModal" class="modal" style="display: none;" data-lock-error="{{ error|default('') }}">

package-lock.json

@@ -1,31 +1,39 @@
 {
     "name": "48hr.email",
-    "version": "1.7.5",
+    "version": "1.6.3",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "48hr.email",
-            "version": "1.7.5",
+            "version": "1.6.3",
             "license": "GPL-3.0",
             "dependencies": {
+                "array.prototype.flatmap": "^1.3.3",
                 "async-retry": "^1.3.3",
                 "bcrypt": "^6.0.0",
                 "better-sqlite3": "^12.5.0",
                 "compression": "^1.8.1",
                 "debug": "^4.4.3",
                 "dotenv": "^17.2.3",
+                "encodings": "^1.0.0",
                 "express": "^4.22.1",
                 "express-session": "^1.18.2",
                 "express-validator": "^7.3.1",
                 "helmet": "^3.23.3",
+                "http-errors": "~1.6.2",
                 "imap-simple": "^1.6.3",
+                "lodash": "^4.17.21",
                 "mailparser": "^3.9.1",
+                "mem": "^4.3.0",
                 "mnemonist": "^0.27.2",
+                "moment": "^2.30.1",
                 "morgan": "^1.10.1",
                 "nodemailer": "^7.0.12",
+                "p-series": "^2.1.0",
                 "random-word": "^2.0.0",
                 "sanitize-html": "^2.17.0",
+                "semver": "^7.7.3",
                 "socket.io": "^4.8.3",
                 "twig": "^0.10.3"
             },
@@ -308,6 +316,15 @@
                 "url": "https://ko-fi.com/killymxi"
             }
         },
+        "node_modules/@sindresorhus/is": {
+            "version": "0.15.0",
+            "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.15.0.tgz",
+            "integrity": "sha512-lu8BpxjAtRCAo5ifytTpCPCj99LF7o/2Myn+NXyNCBqvPYn7Pjd76AMmUB5l7XF1U6t0hcWrlEM5ESufW7wAeA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
         "node_modules/@sindresorhus/merge-streams": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
@@ -1027,7 +1044,6 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
             "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.3",
@@ -1124,7 +1140,6 @@
             "version": "1.3.3",
             "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
             "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind": "^1.0.8",
@@ -1143,7 +1158,6 @@
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
             "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "array-buffer-byte-length": "^1.0.1",
@@ -1178,7 +1192,6 @@
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
             "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
-            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
@@ -1197,7 +1210,6 @@
             "version": "1.0.7",
             "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
             "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "possible-typed-array-names": "^1.0.0"
@@ -1551,7 +1563,6 @@
             "version": "1.0.8",
             "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
             "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind-apply-helpers": "^1.0.0",
@@ -1928,7 +1939,6 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
             "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.3",
@@ -1946,7 +1956,6 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
             "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.3",
@@ -1964,7 +1973,6 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
             "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.2",
@@ -2069,7 +2077,6 @@
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
             "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "es-define-property": "^1.0.0",
@@ -2100,7 +2107,6 @@
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
             "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "define-data-property": "^1.0.1",
@@ -2306,6 +2312,24 @@
                 "node": ">=8.10.0"
             }
         },
+        "node_modules/encodings": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/encodings/-/encodings-1.0.0.tgz",
+            "integrity": "sha512-40cQBXxhPyP9gg1IX6HHORWGjkOilH9NCxyWmWPbdVEPj7wI5ow66bL0gf1s4jAUxLZdDX2RNA9+WYV2+ML13Q==",
+            "license": "MIT",
+            "dependencies": {
+                "semver": "5.3.0"
+            }
+        },
+        "node_modules/encodings/node_modules/semver": {
+            "version": "5.3.0",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+            "integrity": "sha512-mfmm3/H9+67MCVix1h+IXTpDwL6710LyHuk7+cWC9T1mE0qz4iHhh6r4hU2wrIT9iTsAAC2XQRvfblL028cpLw==",
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver"
+            }
+        },
         "node_modules/end-of-stream": {
             "version": "1.4.5",
             "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
@@ -2420,7 +2444,6 @@
             "version": "1.24.1",
             "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.1.tgz",
             "integrity": "sha512-zHXBLhP+QehSSbsS9Pt23Gg964240DPd6QCf8WpkqEXxQ7fhdZzYsocOr5u7apWonsS5EjZDmTF+/slGMyasvw==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "array-buffer-byte-length": "^1.0.2",
@@ -2527,7 +2550,6 @@
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
             "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "es-errors": "^1.3.0",
@@ -2543,7 +2565,6 @@
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
             "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "hasown": "^2.0.2"
@@ -2556,7 +2577,6 @@
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
             "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "is-callable": "^1.2.7",
@@ -4043,7 +4063,6 @@
             "version": "0.3.5",
             "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
             "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "is-callable": "^1.2.7"
@@ -4105,7 +4124,6 @@
             "version": "1.1.8",
             "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
             "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind": "^1.0.8",
@@ -4126,7 +4144,6 @@
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
             "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-            "dev": true,
             "license": "MIT",
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -4136,7 +4153,6 @@
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz",
             "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==",
-            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
@@ -4236,7 +4252,6 @@
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
             "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.3",
@@ -4342,7 +4357,6 @@
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
             "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "define-properties": "^1.2.1",
@@ -4423,7 +4437,6 @@
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
             "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
-            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
@@ -4446,7 +4459,6 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
             "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "es-define-property": "^1.0.0"
@@ -4459,7 +4471,6 @@
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
             "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "dunder-proto": "^1.0.0"
@@ -4487,7 +4498,6 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
             "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "has-symbols": "^1.0.3"
@@ -4635,6 +4645,45 @@
                 "entities": "^4.4.0"
             }
         },
+        "node_modules/http-errors": {
+            "version": "1.6.3",
+            "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+            "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+            "license": "MIT",
+            "dependencies": {
+                "depd": "~1.1.2",
+                "inherits": "2.0.3",
+                "setprototypeof": "1.1.0",
+                "statuses": ">= 1.4.0 < 2"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/http-errors/node_modules/depd": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+            "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/http-errors/node_modules/setprototypeof": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+            "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+            "license": "ISC"
+        },
+        "node_modules/http-errors/node_modules/statuses": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+            "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
         "node_modules/human-signals": {
             "version": "8.0.1",
             "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-8.0.1.tgz",
@@ -4812,7 +4861,6 @@
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
             "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "es-errors": "^1.3.0",
@@ -4870,7 +4918,6 @@
             "version": "3.0.5",
             "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
             "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind": "^1.0.8",
@@ -4895,7 +4942,6 @@
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
             "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "async-function": "^1.0.0",
@@ -4915,7 +4961,6 @@
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
             "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "has-bigints": "^1.0.2"
@@ -4931,7 +4976,6 @@
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
             "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.3",
@@ -4964,7 +5008,6 @@
             "version": "1.2.7",
             "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
             "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
@@ -4993,7 +5036,6 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
             "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.2",
@@ -5011,7 +5053,6 @@
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
             "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.2",
@@ -5054,7 +5095,6 @@
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
             "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.3"
@@ -5070,7 +5110,6 @@
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz",
             "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.4",
@@ -5143,7 +5182,6 @@
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
             "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
-            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
@@ -5166,7 +5204,6 @@
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
             "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
-            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
@@ -5189,7 +5226,6 @@
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
             "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.3",
@@ -5266,7 +5302,6 @@
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
             "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.2",
@@ -5298,7 +5333,6 @@
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
             "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
-            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
@@ -5311,7 +5345,6 @@
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
             "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.3"
@@ -5340,7 +5373,6 @@
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
             "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.3",
@@ -5357,7 +5389,6 @@
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
             "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.2",
@@ -5375,7 +5406,6 @@
             "version": "1.1.15",
             "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
             "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "which-typed-array": "^1.1.16"
@@ -5417,7 +5447,6 @@
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
             "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
-            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
@@ -5430,7 +5459,6 @@
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
             "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.3"
@@ -5446,7 +5474,6 @@
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
             "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.3",
@@ -5860,6 +5887,18 @@
                 "node": ">=6.0.0"
             }
         },
+        "node_modules/map-age-cleaner": {
+            "version": "0.1.3",
+            "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+            "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+            "license": "MIT",
+            "dependencies": {
+                "p-defer": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
         "node_modules/math-intrinsics": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -5878,6 +5917,20 @@
                 "node": ">= 0.6"
             }
         },
+        "node_modules/mem": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+            "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+            "license": "MIT",
+            "dependencies": {
+                "map-age-cleaner": "^0.1.1",
+                "mimic-fn": "^2.0.0",
+                "p-is-promise": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
         "node_modules/memory-fs": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
@@ -5997,6 +6050,15 @@
                 "node": ">= 0.6"
             }
         },
+        "node_modules/mimic-fn": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+            "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
         "node_modules/mimic-response": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
@@ -6055,6 +6117,15 @@
                 "obliterator": "^1.5.0"
             }
         },
+        "node_modules/moment": {
+            "version": "2.30.1",
+            "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+            "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+            "license": "MIT",
+            "engines": {
+                "node": "*"
+            }
+        },
         "node_modules/morgan": {
             "version": "1.10.1",
             "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.1.tgz",
@@ -6328,7 +6399,6 @@
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
             "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
@@ -6338,7 +6408,6 @@
             "version": "4.1.7",
             "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
             "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind": "^1.0.8",
@@ -6504,7 +6573,6 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
             "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "get-intrinsic": "^1.2.6",
@@ -6518,6 +6586,24 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/p-defer": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+            "integrity": "sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/p-is-promise": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+            "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
         "node_modules/p-limit": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -6550,6 +6636,28 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/p-reduce": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz",
+            "integrity": "sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/p-series": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/p-series/-/p-series-2.1.0.tgz",
+            "integrity": "sha512-vEAnkG1ikRT1kPBrKwpj7AFYQkd1hjt/oHeppxtpoPxy5gEt+OWiHZJN3tMqvFa+UJfVwO3lwHoMUpMYBLKnaQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@sindresorhus/is": "^0.15.0",
+                "p-reduce": "^2.1.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/p-try": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
@@ -6760,7 +6868,6 @@
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
             "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
-            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
@@ -7226,7 +7333,6 @@
             "version": "1.0.10",
             "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
             "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind": "^1.0.8",
@@ -7259,7 +7365,6 @@
             "version": "1.5.4",
             "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
             "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind": "^1.0.8",
@@ -7425,7 +7530,6 @@
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
             "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind": "^1.0.8",
@@ -7445,7 +7549,6 @@
             "version": "2.0.5",
             "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
             "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-            "dev": true,
             "license": "MIT"
         },
         "node_modules/safe-buffer": {
@@ -7472,7 +7575,6 @@
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
             "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "es-errors": "^1.3.0",
@@ -7489,14 +7591,12 @@
             "version": "2.0.5",
             "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
             "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-            "dev": true,
             "license": "MIT"
         },
         "node_modules/safe-regex-test": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
             "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.2",
@@ -7710,7 +7810,6 @@
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
             "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "define-data-property": "^1.1.4",
@@ -7728,7 +7827,6 @@
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
             "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "define-data-property": "^1.1.4",
@@ -7744,7 +7842,6 @@
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
             "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "dunder-proto": "^1.0.1",
@@ -8049,7 +8146,6 @@
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
             "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "es-errors": "^1.3.0",
@@ -8116,7 +8212,6 @@
             "version": "1.2.10",
             "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
             "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind": "^1.0.8",
@@ -8138,7 +8233,6 @@
             "version": "1.0.9",
             "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
             "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind": "^1.0.8",
@@ -8157,7 +8251,6 @@
             "version": "1.0.8",
             "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
             "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind": "^1.0.7",
@@ -8594,7 +8687,6 @@
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
             "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.3",
@@ -8609,7 +8701,6 @@
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
             "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind": "^1.0.8",
@@ -8629,7 +8720,6 @@
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
             "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "available-typed-arrays": "^1.0.7",
@@ -8651,7 +8741,6 @@
             "version": "1.0.7",
             "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
             "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind": "^1.0.7",
@@ -8704,7 +8793,6 @@
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
             "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.3",
@@ -9057,7 +9145,6 @@
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
             "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "is-bigint": "^1.1.0",
@@ -9077,7 +9164,6 @@
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
             "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.2",
@@ -9105,14 +9191,12 @@
             "version": "2.0.5",
             "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
             "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-            "dev": true,
             "license": "MIT"
         },
         "node_modules/which-collection": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
             "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "is-map": "^2.0.3",
@@ -9131,7 +9215,6 @@
             "version": "1.1.19",
             "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
             "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "available-typed-arrays": "^1.0.7",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "48hr.email",
-    "version": "1.7.6",
+    "version": "1.7.4",
     "private": false,
     "description": "48hr.email is your favorite open-source tempmail client.",
     "keywords": [
@@ -30,23 +30,31 @@
         "test": "xo"
     },
     "dependencies": {
+        "array.prototype.flatmap": "^1.3.3",
         "async-retry": "^1.3.3",
         "bcrypt": "^6.0.0",
         "better-sqlite3": "^12.5.0",
         "compression": "^1.8.1",
         "debug": "^4.4.3",
         "dotenv": "^17.2.3",
+        "encodings": "^1.0.0",
         "express": "^4.22.1",
         "express-session": "^1.18.2",
         "express-validator": "^7.3.1",
         "helmet": "^3.23.3",
+        "http-errors": "~1.6.2",
         "imap-simple": "^1.6.3",
+        "lodash": "^4.17.21",
         "mailparser": "^3.9.1",
+        "mem": "^4.3.0",
         "mnemonist": "^0.27.2",
+        "moment": "^2.30.1",
         "morgan": "^1.10.1",
         "nodemailer": "^7.0.12",
+        "p-series": "^2.1.0",
         "random-word": "^2.0.0",
         "sanitize-html": "^2.17.0",
+        "semver": "^7.7.3",
         "socket.io": "^4.8.3",
         "twig": "^0.10.3"
     },