Merge pull request #16 from greirson/notification-enhancements

Size and Total Storage templates for Notifications

Author: abiteman

.env.example

@@ -10,4 +10,5 @@ DUMBDROP_PIN=             # Optional PIN protection (4-10 digits, leave empty to
 
 # Notifications
 APPRISE_URL=              # Apprise URL for notifications (leave empty to disable)
-APPRISE_MESSAGE=          # Custom message for notifications (default: "File uploaded: {filename}")
+APPRISE_MESSAGE=          # Custom message for notifications (default: "New file uploaded: {filename} ({size}), Storage used: {storage}")
+APPRISE_SIZE_UNIT=        # Size unit for notifications (B, KB, MB, GB, TB). Leave empty for auto

README.md

@@ -23,14 +23,32 @@ No auth (unless you want it now!), no storage, no nothing. Just a simple file up
 
 ## Environment Variables
 
-| Variable      | Description                           | Default | Required |
-|--------------|---------------------------------------|---------|----------|
-| PORT         | Server port                           | 3000    | No       |
-| MAX_FILE_SIZE| Maximum file size in MB               | 1024    | No       |
-| DUMBDROP_PIN | PIN protection (4-10 digits)          | None    | No       |
-| DUMBDROP_TITLE| Site title displayed in header       | DumbDrop| No       |
-| APPRISE_URL  | Apprise URL for notifications         | None    | No       |
-| APPRISE_MESSAGE| Notification message template       | "File uploaded: {filename}" | No |
+| Variable          | Description                           | Default | Required |
+|------------------|---------------------------------------|---------|----------|
+| PORT             | Server port                           | 3000    | No       |
+| MAX_FILE_SIZE    | Maximum file size in MB               | 1024    | No       |
+| DUMBDROP_PIN     | PIN protection (4-10 digits)          | None    | No       |
+| DUMBDROP_TITLE   | Site title displayed in header        | DumbDrop| No       |
+| APPRISE_URL      | Apprise URL for notifications         | None    | No       |
+| APPRISE_MESSAGE  | Notification message template         | New file uploaded {filename} ({size}), Storage used {storage} | No |
+| APPRISE_SIZE_UNIT| Size unit for notifications           | Auto    | No       |
+
+## Notification Templates
+The notification message supports the following placeholders:
+- `{filename}`: Name of the uploaded file
+- `{size}`: Size of the file (formatted according to APPRISE_SIZE_UNIT)
+- `{storage}`: Total size of all files in upload directory
+
+Example message template:
+```env
+APPRISE_MESSAGE: New file uploaded {filename} ({size}), Storage used {storage}
+```
+
+Size formatting examples:
+- Auto (default): Chooses nearest unit (e.g., "1.44MB", "256KB")
+- Fixed unit: Set APPRISE_SIZE_UNIT to B, KB, MB, GB, or TB
+
+Both {size} and {storage} use the same formatting rules based on APPRISE_SIZE_UNIT.
 
 ## Security Features
 

docker-compose.yml

@@ -6,7 +6,11 @@ services:
         volumes:
             - ./local_uploads:/app/uploads
         environment:
-            - DUMBDROP_PIN=123456
-            - APPRISE_URL=          # i.e. tgram://bottoken/ChatID
-            - APPRISE_MESSAGE=      # dont add quotes here
-        image: abite3/dumbdrop:latest
+            DUMBDROP_TITLE: DumbDrop
+            MAX_FILE_SIZE: 1024
+            DUMBDROP_PIN: 123456
+            # APPRISE_URL: ntfys://
+            APPRISE_MESSAGE: New file uploaded - {filename} ({size}), Storage used {storage} 
+            APPRISE_SIZE_UNIT: auto
+        image: abite3/dumbdrop:latest
+        # build: .

server.js

@@ -15,8 +15,9 @@ const port = process.env.PORT || 3000;
 const uploadDir = './uploads';  // Local development
 const maxFileSize = parseInt(process.env.MAX_FILE_SIZE || '1024') * 1024 * 1024; // Convert MB to bytes
 const APPRISE_URL = process.env.APPRISE_URL;
-const APPRISE_MESSAGE = process.env.APPRISE_MESSAGE || 'File uploaded: {filename}';
+const APPRISE_MESSAGE = process.env.APPRISE_MESSAGE || 'New file uploaded - {filename} ({size}), Storage used: {storage}';
 const siteTitle = process.env.DUMBDROP_TITLE || 'DumbDrop';
+const APPRISE_SIZE_UNIT = process.env.APPRISE_SIZE_UNIT;
 
 // Brute force protection setup
 const loginAttempts = new Map();  // Stores IP addresses and their attempt counts
@@ -259,7 +260,7 @@ app.post('/upload/init', async (req, res) => {
 app.post('/upload/chunk/:uploadId', express.raw({ 
     limit: '10mb', 
     type: 'application/octet-stream' 
-}), (req, res) => {
+}), async (req, res) => {
     const { uploadId } = req.params;
     const upload = uploads.get(uploadId);
     const chunkSize = req.body.length;
@@ -273,7 +274,7 @@ app.post('/upload/chunk/:uploadId', express.raw({
         upload.bytesReceived += chunkSize;
 
         const progress = Math.round((upload.bytesReceived / upload.fileSize) * 100);
-        log.info(`Received chunk for ${upload.filename}: ${progress}%`);
+        log.info(`Received chunk for ${upload.safeFilename}: ${progress}%`);
 
         res.json({ 
             bytesReceived: upload.bytesReceived,
@@ -284,10 +285,10 @@ app.post('/upload/chunk/:uploadId', express.raw({
         if (upload.bytesReceived >= upload.fileSize) {
             upload.writeStream.end();
             uploads.delete(uploadId);
-            log.success(`Upload completed: ${upload.filename}`);
+            log.success(`Upload completed: ${upload.safeFilename}`);
 
-            // Add notification here
-            sendNotification(upload.filename);
+            // Update notification call to use safeFilename
+            await sendNotification(upload.safeFilename, upload.fileSize);
         }
     } catch (err) {
         log.error(`Chunk upload failed: ${err.message}`);
@@ -305,7 +306,7 @@ app.post('/upload/cancel/:uploadId', (req, res) => {
             if (err) log.error(`Failed to delete incomplete upload: ${err.message}`);
         });
         uploads.delete(uploadId);
-        log.info(`Upload cancelled: ${upload.filename}`);
+        log.info(`Upload cancelled: ${upload.safeFilename}`);
     }
 
     res.json({ message: 'Upload cancelled' });
@@ -346,16 +347,63 @@ app.listen(port, () => {
     }
 });
 
-// Add this helper function after other helper functions
-async function sendNotification(filename) {
+// Remove async from formatFileSize function
+function formatFileSize(bytes) {
+    const units = ['B', 'KB', 'MB', 'GB', 'TB'];
+    let size = bytes;
+    let unitIndex = 0;
+
+    // If a specific unit is requested
+    if (APPRISE_SIZE_UNIT) {
+        const requestedUnit = APPRISE_SIZE_UNIT.toUpperCase();
+        const unitIndex = units.indexOf(requestedUnit);
+        if (unitIndex !== -1) {
+            size = bytes / Math.pow(1024, unitIndex);
+            return size.toFixed(2) + requestedUnit;
+        }
+    }
+
+    // Auto format to nearest unit
+    while (size >= 1024 && unitIndex < units.length - 1) {
+        size /= 1024;
+        unitIndex++;
+    }
+
+    // Round to 2 decimal places
+    return size.toFixed(2) + units[unitIndex];
+}
+
+// Add this helper function
+function calculateDirectorySize(directoryPath) {
+    let totalSize = 0;
+    const files = fs.readdirSync(directoryPath);
+    
+    files.forEach(file => {
+        const filePath = path.join(directoryPath, file);
+        const stats = fs.statSync(filePath);
+        if (stats.isFile()) {
+            totalSize += stats.size;
+        }
+    });
+    
+    return totalSize;
+}
+
+// Modify the sendNotification function
+async function sendNotification(filename, fileSize) {
     if (!APPRISE_URL) return;
 
     try {
-        const message = APPRISE_MESSAGE.replace('{filename}', filename);
+        const formattedSize = formatFileSize(fileSize);
+        const totalStorage = formatFileSize(calculateDirectorySize(uploadDir));
+        const message = APPRISE_MESSAGE
+            .replace('{filename}', filename)
+            .replace('{size}', formattedSize)
+            .replace('{storage}', totalStorage);
 
         // Execute apprise command
         await execAsync(`apprise "${APPRISE_URL}" -b "${message}"`);
-        log.info(`Notification sent for: ${filename}`);
+        log.info(`Notification sent for: ${filename} (${formattedSize}, Total storage: ${totalStorage})`);
     } catch (err) {
         log.error(`Failed to send notification: ${err.message}`);
     }