UBERF-11423: Fix attachments in emails (#9166)

Signed-off-by: Artem Savchenko <[email protected]>

Author: ArtyomSavchenko

common/config/rush/pnpm-lock.yaml

@@ -63,6 +63,7 @@
     "kafkajs": "^2.2.4",
     "sanitize-html": "^2.15.0",
     "turndown": "^7.2.0",
-    "uuid": "^8.3.2"
+    "uuid": "^8.3.2",
+    "image-size": "^1.1.1"
   }
 }

services/mail/mail-common/package.json

@@ -44,7 +44,7 @@ import { generateMessageId } from '@hcengineering/communication-shared'
 
 import { BaseConfig, type Attachment } from './types'
 import { EmailMessage, MailRecipient, MessageData } from './types'
-import { getMdContent } from './utils'
+import { getBlobMetadata, getMdContent } from './utils'
 import { PersonCacheFactory } from './person'
 import { PersonSpacesCacheFactory } from './personSpaces'
 import { ChannelCache, ChannelCacheFactory } from './channel'
@@ -252,11 +252,11 @@ async function saveMessageToSpaces (
       }
 
       const messageId = await createMailMessage(producer, config, messageData, threadId)
+      await createFiles(ctx, producer, config, attachments, messageData, threadId, messageId)
       if (!isReply) {
         await addCollaborators(producer, config, messageData, threadId)
         await createMailThread(producer, config, messageData, messageId)
       }
-      await createFiles(producer, config, attachments, messageData, threadId, messageId)
 
       await threadLookup.setThreadId(mailId, space._id, threadId)
     })
@@ -305,6 +305,7 @@ async function createMailMessage (
 }
 
 async function createFiles (
+  ctx: MeasureContext,
   producer: Producer,
   config: BaseConfig,
   attachments: Attachment[],
@@ -313,20 +314,21 @@ async function createFiles (
   messageId: MessageID
 ): Promise<void> {
   const fileData: Buffer[] = attachments.map((a) => {
-    const creeateFileEvent: CreateFileEvent = {
+    const createFileEvent: CreateFileEvent = {
       type: MessageRequestEventType.CreateFile,
-      card: threadId,
+      card: messageData.isReply ? threadId : messageData.channel,
       message: messageId,
       messageCreated: messageData.created,
       creator: messageData.modifiedBy,
       data: {
         blobId: a.id as Ref<Blob>,
         type: a.contentType,
         filename: a.name,
-        size: a.data.length
+        size: a.data.length,
+        meta: getBlobMetadata(ctx, a)
       }
     }
-    return Buffer.from(JSON.stringify(creeateFileEvent))
+    return Buffer.from(JSON.stringify(createFileEvent))
   })
   const fileEvents = fileData.map((data) => ({
     key: Buffer.from(messageData.channel ?? messageData.spaceId),

services/mail/mail-common/src/message.ts

@@ -14,9 +14,10 @@
 //
 import TurndownService from 'turndown'
 import sanitizeHtml from 'sanitize-html'
+import { imageSize } from 'image-size'
 
-import { MeasureContext } from '@hcengineering/core'
-import { EmailContact, EmailMessage } from './types'
+import { BlobMetadata, MeasureContext } from '@hcengineering/core'
+import { Attachment, EmailContact, EmailMessage } from './types'
 
 const NAME_EMAIL_PATTERN = /^(?:"?([^"<]+)"?\s*)?<([^>]+)>$/
 const NAME_SEGMENT_REGEX = /[\s,;]+/
@@ -131,3 +132,21 @@ export function parseNameFromEmailHeader (headerValue: string | undefined): Emai
 export function normalizeEmail (email: string): string {
   return email.toLowerCase().trim()
 }
+
+export function getBlobMetadata (ctx: MeasureContext, attachment: Attachment): BlobMetadata | undefined {
+  try {
+    const dimensions = imageSize(attachment.data)
+    return dimensions != null
+      ? {
+          originalHeight: dimensions.height,
+          originalWidth: dimensions.width
+        }
+      : undefined
+  } catch (error: any) {
+    ctx.warn('Failed to get blob metadata', {
+      error: error.message,
+      attachmentId: attachment.id
+    })
+    return undefined
+  }
+}