ep_media_upload 0.2.2 → 0.2.4

package/index.js

@@ -17,9 +17,9 @@ try {
 }
 
 // AWS SDK v3 for presigned URLs
-let S3Client, PutObjectCommand, GetObjectCommand, getSignedUrl;
+let S3Client, PutObjectCommand, GetObjectCommand, HeadObjectCommand, getSignedUrl;
 try {
-  ({ S3Client, PutObjectCommand, GetObjectCommand } = require('@aws-sdk/client-s3'));
+  ({ S3Client, PutObjectCommand, GetObjectCommand, HeadObjectCommand } = require('@aws-sdk/client-s3'));
   ({ getSignedUrl } = require('@aws-sdk/s3-request-presigner'));
 } catch (e) {
   console.warn('[ep_media_upload] AWS SDK not installed; s3_presigned storage will not work.');
@@ -477,21 +477,63 @@ exports.expressCreateServer = (hookName, context) => {
         Array.isArray(inlineExtensions) && 
         inlineExtensions.map(e => e.toLowerCase()).includes(fileExtension.toLowerCase());
 
+      // Try to retrieve original filename from S3 object metadata
+      // The original filename was stored in Content-Disposition during upload
+      const s3Client = new S3Client({ region });
+      let filename = fileId.replace(/[^\w\-_.]/g, '_'); // Default fallback to UUID-based name
+
+      try {
+        const headCommand = new HeadObjectCommand({ Bucket: bucket, Key: key });
+        const headResponse = await s3Client.send(headCommand);
+        
+        // Parse original filename from stored Content-Disposition header
+        // Format: attachment; filename="original-name.pdf"
+        if (headResponse.ContentDisposition) {
+          const match = headResponse.ContentDisposition.match(/filename="([^"]+)"/);
+          if (match && match[1]) {
+            // Use the original filename, sanitize it for safety
+            filename = match[1].replace(/[^\w\-_.]/g, '_');
+          }
+        }
+      } catch (headErr) {
+        // If HeadObject fails (e.g., file doesn't exist), we'll catch it later
+        // or use the fallback filename. Log for debugging but don't fail yet.
+        if (headErr.name !== 'NotFound' && headErr.Code !== 'NoSuchKey') {
+          logger.warn(`[ep_media_upload] HeadObject warning for key="${key}": ${headErr.message}`);
+        }
+      }
+
       // 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 to override the stored header
-      const s3Client = new S3Client({ region });
-      const getCommand = new GetObjectCommand({
+      // Use ResponseContentDisposition and ResponseContentType to override stored headers
+      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;

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.2",
+  "version": "0.2.4",
   "author": {
     "name": "DCastelone",
     "url": "https://github.com/dcastelone"