- ${headerInfo.contentType.includes('text/html') ? decodedBody : `
${decodedBody}`}
+ try {
+ const decoded = await decodeEmail(email.body);
+
+ // Format the reply/forward content with proper structure and direction
+ let formattedContent = '';
+
+ if (type === 'forward') {
+ formattedContent = `
+
+
---------- Forwarded message ---------
+
From: ${decoded.from}
+
Date: ${decoded.date.toLocaleString()}
+
Subject: ${decoded.subject}
+
To: ${decoded.to}
+
+ ${decoded.html || `
${decoded.text}`}
+
+ `;
+ } else {
+ formattedContent = `
+
+
On ${decoded.date.toLocaleString()}, ${decoded.from} wrote:
+
+ ${decoded.html || `${decoded.text}`}
+
`;
- } catch (error) {
- console.error('Error decoding email body:', error);
- content = body;
}
+
+ return cleanHtml(formattedContent);
+ } catch (error) {
+ console.error('Error generating reply body:', error);
+ return '';
}
-
- // Clean and sanitize HTML content while preserving structure
- content = cleanHtml(content);
-
- // Format the reply/forward content with proper structure and direction
- let formattedContent = '';
- if (type === 'forward') {
- formattedContent = `
-
- `;
- } else {
- formattedContent = `
-
- `;
- }
-
- return formattedContent;
}
export default function CourrierPage() {
@@ -1170,84 +970,13 @@ export default function CourrierPage() {
);
};
- const generateEmailPreview = (email: Email): string => {
- console.log('=== generateEmailPreview Debug ===');
- console.log('Email ID:', email.id);
- console.log('Subject:', email.subject);
- console.log('Body length:', email.body.length);
- console.log('First 200 chars of body:', email.body.substring(0, 200));
-
+ const generateEmailPreview = async (email: Email): Promise
=> {
try {
- // Split email into headers and body
- const [headersPart, ...bodyParts] = email.body.split('\r\n\r\n');
- const body = bodyParts.join('\r\n\r\n');
-
- // Parse headers using our MIME decoder
- const headerInfo = parseEmailHeaders(headersPart);
- const boundary = extractBoundary(headersPart);
-
- let preview = '';
-
- // If it's a multipart email
- if (boundary) {
- const parts = body.split(`--${boundary}`);
-
- for (const part of parts) {
- if (!part.trim()) continue;
-
- const [partHeaders, ...partBodyParts] = part.split('\r\n\r\n');
- const partBody = partBodyParts.join('\r\n\r\n');
- const partHeaderInfo = parseEmailHeaders(partHeaders);
-
- if (partHeaderInfo.contentType.includes('text/plain')) {
- preview = decodeQuotedPrintable(partBody, partHeaderInfo.charset);
- break;
- } else if (partHeaderInfo.contentType.includes('text/html') && !preview) {
- preview = cleanHtml(decodeQuotedPrintable(partBody, partHeaderInfo.charset));
- }
- }
- }
-
- // If no preview from multipart, try to decode the whole body
- if (!preview) {
- preview = decodeQuotedPrintable(body, headerInfo.charset);
- if (headerInfo.contentType.includes('text/html')) {
- preview = cleanHtml(preview);
- }
- }
-
- // Clean up the preview
- preview = preview
- .replace(/^>+/gm, '')
- .replace(/Content-Type:[^\n]+/g, '')
- .replace(/Content-Transfer-Encoding:[^\n]+/g, '')
- .replace(/--[a-zA-Z0-9]+(-[a-zA-Z0-9]+)?/g, '')
- .replace(/boundary=[^\n]+/g, '')
- .replace(/charset=[^\n]+/g, '')
- .replace(/[\r\n]+/g, ' ')
- .trim();
-
- // Take first 100 characters
- preview = preview.substring(0, 100);
-
- // Try to end at a complete word
- if (preview.length === 100) {
- const lastSpace = preview.lastIndexOf(' ');
- if (lastSpace > 80) {
- preview = preview.substring(0, lastSpace);
- }
- preview += '...';
- }
-
- return preview;
+ const decoded = await decodeEmail(email.body);
+ return decoded.text || cleanHtml(decoded.html || '');
} catch (error) {
console.error('Error generating email preview:', error);
- return email.body
- .replace(/<[^>]+>/g, ' ')
- .replace(/ ||»|«|>/g, ' ')
- .replace(/\s+/g, ' ')
- .substring(0, 100)
- .trim() + '...';
+ return '';
}
};
diff --git a/lib/mail-parser-wrapper.ts b/lib/mail-parser-wrapper.ts
new file mode 100644
index 00000000..85bc1a63
--- /dev/null
+++ b/lib/mail-parser-wrapper.ts
@@ -0,0 +1,71 @@
+import { simpleParser, ParsedMail, Attachment, HeaderValue, AddressObject } from 'mailparser';
+
+export interface DecodedEmail {
+ html: string | false;
+ text: string | false;
+ attachments: Attachment[];
+ headers: Map;
+ subject: string;
+ from: string;
+ to: string;
+ date: Date;
+}
+
+function getAddressText(address: AddressObject | AddressObject[] | undefined): string {
+ if (!address) return '';
+ if (Array.isArray(address)) {
+ return address.map(addr => addr.value?.[0]?.address || '').filter(Boolean).join(', ');
+ }
+ return address.value?.[0]?.address || '';
+}
+
+export async function decodeEmail(rawEmail: string): Promise {
+ try {
+ const parsed = await simpleParser(rawEmail);
+
+ return {
+ html: parsed.html || false,
+ text: parsed.text || false,
+ attachments: parsed.attachments || [],
+ headers: parsed.headers,
+ subject: parsed.subject || '',
+ from: getAddressText(parsed.from),
+ to: getAddressText(parsed.to),
+ date: parsed.date || new Date()
+ };
+ } catch (error) {
+ console.error('Error decoding email:', error);
+ throw new Error('Failed to decode email');
+ }
+}
+
+export function cleanHtml(html: string): string {
+ if (!html) return '';
+
+ // Detect text direction from the content
+ const hasRtlChars = /[\u0591-\u07FF\u200F\u202B\u202E\uFB1D-\uFDFD\uFE70-\uFEFC]/.test(html);
+ const defaultDir = hasRtlChars ? 'rtl' : 'ltr';
+
+ // Basic HTML cleaning while preserving structure
+ const cleaned = html
+ // Remove script and style tags
+ .replace(/]*>[\s\S]*?<\/script>/gi, '')
+ .replace(/]*>[\s\S]*?<\/style>/gi, '')
+ // Remove meta tags
+ .replace(/]*>/gi, '')
+ // Remove head and title
+ .replace(/]*>[\s\S]*?<\/head>/gi, '')
+ .replace(/]*>[\s\S]*?<\/title>/gi, '')
+ // Remove body tags
+ .replace(/]*>/gi, '')
+ .replace(/<\/body>/gi, '')
+ // Remove html tags
+ .replace(/]*>/gi, '')
+ .replace(/<\/html>/gi, '')
+ // Clean up whitespace
+ .replace(/\s+/g, ' ')
+ .trim();
+
+ // Wrap in a div with the detected direction
+ return `${cleaned}
`;
+}
\ No newline at end of file