ep_media_upload 0.2.1 → 0.2.3

package/README.md

@@ -27,8 +27,9 @@ Etherpad plugin for secure file uploads via S3 presigned URLs.
     "expires": 900,
     "downloadExpires": 300
   },
-  "fileTypes": ["pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt", "zip"],
-  "maxFileSize": 52428800
+  "fileTypes": ["pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt", "zip", "mp3", "mp4", "wav", "mov"],
+  "maxFileSize": 52428800,
+  "inlineExtensions": ["mp3", "mp4", "wav", "mov", "webm", "ogg"]
 }
 ```
 
@@ -49,6 +50,7 @@ Etherpad plugin for secure file uploads via S3 presigned URLs.
 |--------|----------|---------|-------------|
 | `fileTypes` | No | all | Array of allowed extensions (without dots) |
 | `maxFileSize` | No | unlimited | Max file size in bytes |
+| `inlineExtensions` | No | `[]` | Extensions to open inline in browser (streaming). Files not in this list will download. |
 
 ### Environment Variables
 

package/index.js

@@ -133,7 +133,7 @@ const EXTENSION_MIME_MAP = {
   
   // Audio
   mp3: ['audio/mpeg', 'audio/mp3'],
-  wav: ['audio/wav', 'audio/wave', 'audio/x-wav'],
+  wav: ['audio/wav', 'audio/wave', 'audio/x-wav', 'audio/vnd.wave'],
   ogg: ['audio/ogg'],
   m4a: ['audio/mp4', 'audio/x-m4a'],
   flac: ['audio/flac'],
@@ -467,12 +467,50 @@ exports.expressCreateServer = (hookName, context) => {
       const prefix = keyPrefix || '';
       const key = `${prefix}${padId}/${fileId}`;
 
+      // Extract file extension to determine inline vs attachment disposition
+      const fileExtension = getValidExtension(fileId);
+      
+      // Get inlineExtensions from config (extensions that should open in browser)
+      // Default behavior is download (attachment) for all files
+      const inlineExtensions = settings.ep_media_upload?.inlineExtensions || [];
+      const shouldOpenInline = fileExtension && 
+        Array.isArray(inlineExtensions) && 
+        inlineExtensions.map(e => e.toLowerCase()).includes(fileExtension.toLowerCase());
+
+      // Determine Content-Disposition based on extension config
+      // Extract filename for Content-Disposition header (UUID.ext -> use as filename)
+      const filename = fileId.replace(/[^\w\-_.]/g, '_'); // Sanitize for header
+      const disposition = shouldOpenInline 
+        ? `inline; filename="${filename}"` 
+        : `attachment; filename="${filename}"`;
+
+      // Map extensions to canonical MIME types for consistent browser playback
+      const EXTENSION_CONTENT_TYPE = {
+        mp3: 'audio/mpeg',
+        wav: 'audio/wav',
+        mp4: 'video/mp4',
+        mov: 'video/quicktime',
+        webm: 'video/webm',
+        ogg: 'audio/ogg',
+        m4a: 'audio/mp4',
+        pdf: 'application/pdf',
+      };
+
       // Generate presigned GET URL with short expiry
+      // Use ResponseContentDisposition and ResponseContentType to override stored headers
       const s3Client = new S3Client({ region });
-      const getCommand = new GetObjectCommand({
+      const commandParams = {
         Bucket: bucket,
         Key: key,
-      });
+        ResponseContentDisposition: disposition,
+      };
+
+      // Set canonical Content-Type for inline extensions to ensure browser compatibility
+      if (shouldOpenInline && fileExtension && EXTENSION_CONTENT_TYPE[fileExtension.toLowerCase()]) {
+        commandParams.ResponseContentType = EXTENSION_CONTENT_TYPE[fileExtension.toLowerCase()];
+      }
+
+      const getCommand = new GetObjectCommand(commandParams);
 
       // Use downloadExpires from config, default to 300 seconds (5 minutes)
       const expiresIn = downloadExpires || 300;
@@ -480,7 +518,8 @@ exports.expressCreateServer = (hookName, context) => {
 
       // Log download request for audit trail
       const username = req.session?.user?.username || 'anonymous';
-      logger.info(`[ep_media_upload] DOWNLOAD: author="${authorId}" user="${username}" ip="${clientIp}" pad="${padId}" file="${fileId}"`);
+      const dispositionType = shouldOpenInline ? 'inline' : 'attachment';
+      logger.info(`[ep_media_upload] DOWNLOAD: author="${authorId}" user="${username}" ip="${clientIp}" pad="${padId}" file="${fileId}" disposition="${dispositionType}"`);
 
       // Redirect to the presigned URL
       return res.redirect(302, presignedGetUrl);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ep_media_upload",
   "description": "beta - Upload files to S3 and insert hyperlinks into the pad. Requires ep_hyperlinked_text.",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "author": {
     "name": "DCastelone",
     "url": "https://github.com/dcastelone"