panel 2 courier api
This commit is contained in:
parent
974aa7683b
commit
8fdd6057eb
@ -100,15 +100,9 @@ function getCacheKey(userId: string, folder: string, page: number, limit: number
|
||||
return `${userId}:${folder}:${page}:${limit}`;
|
||||
}
|
||||
|
||||
export async function GET(
|
||||
request: Request,
|
||||
{ params }: { params: { id: string } }
|
||||
) {
|
||||
export async function GET(request: Request) {
|
||||
try {
|
||||
// 1. Properly await params to avoid Next.js error
|
||||
const { id } = await Promise.resolve(params);
|
||||
|
||||
// 2. Authentication check
|
||||
// 1. Authentication
|
||||
const session = await getServerSession(authOptions);
|
||||
if (!session?.user?.id) {
|
||||
return NextResponse.json(
|
||||
@ -117,14 +111,24 @@ export async function GET(
|
||||
);
|
||||
}
|
||||
|
||||
// 3. Check cache first
|
||||
const cacheKey = `email:${session.user.id}:${id}`;
|
||||
const cachedEmail = emailContentCache.get(cacheKey);
|
||||
if (cachedEmail) {
|
||||
return NextResponse.json(cachedEmail);
|
||||
// 2. Parse request parameters
|
||||
const url = new URL(request.url);
|
||||
const folder = url.searchParams.get('folder') || 'INBOX';
|
||||
const page = parseInt(url.searchParams.get('page') || '1');
|
||||
const limit = parseInt(url.searchParams.get('limit') || '20');
|
||||
const preview = url.searchParams.get('preview') === 'true';
|
||||
const forceRefresh = url.searchParams.get('refresh') === 'true';
|
||||
|
||||
// 3. Check cache first (unless refresh requested)
|
||||
const cacheKey = getCacheKey(session.user.id, folder, page, limit);
|
||||
if (!forceRefresh) {
|
||||
const cachedData = emailCache.get(cacheKey);
|
||||
if (cachedData) {
|
||||
return NextResponse.json(cachedData);
|
||||
}
|
||||
}
|
||||
|
||||
// 4. Get credentials from database
|
||||
// 4. Get credentials
|
||||
const credentials = await prisma.mailCredentials.findUnique({
|
||||
where: {
|
||||
userId: session.user.id
|
||||
@ -138,81 +142,109 @@ export async function GET(
|
||||
);
|
||||
}
|
||||
|
||||
// 5. Create IMAP client
|
||||
const client = new ImapFlow({
|
||||
host: credentials.host,
|
||||
port: credentials.port,
|
||||
secure: true,
|
||||
auth: {
|
||||
user: credentials.email,
|
||||
pass: credentials.password,
|
||||
},
|
||||
logger: false,
|
||||
emitLogs: false,
|
||||
tls: {
|
||||
rejectUnauthorized: false
|
||||
},
|
||||
disableAutoIdle: true
|
||||
});
|
||||
// 5. Get IMAP client from pool (or create new)
|
||||
const client = await getImapClient(session.user.id, credentials);
|
||||
|
||||
try {
|
||||
await client.connect();
|
||||
// 6. Get mailboxes (with caching)
|
||||
let availableFolders: string[];
|
||||
const foldersCacheKey = `folders:${session.user.id}`;
|
||||
const cachedFolders = emailCache.get(foldersCacheKey);
|
||||
|
||||
// 6. Open INBOX
|
||||
await client.mailboxOpen('INBOX');
|
||||
if (cachedFolders) {
|
||||
availableFolders = cachedFolders;
|
||||
} else {
|
||||
const mailboxes = await client.list();
|
||||
availableFolders = mailboxes.map(box => box.path);
|
||||
emailCache.set(foldersCacheKey, availableFolders);
|
||||
}
|
||||
|
||||
// 7. Fetch the email with UID search
|
||||
const options = {
|
||||
uid: true, // This is crucial - we must specify uid:true to fetch by UID
|
||||
source: true,
|
||||
envelope: true,
|
||||
bodyStructure: true,
|
||||
flags: true
|
||||
};
|
||||
// 7. Open mailbox
|
||||
const mailbox = await client.mailboxOpen(folder);
|
||||
|
||||
// 7. Fetch by UID
|
||||
const message = await client.fetchOne(id, options);
|
||||
const result: Email[] = [];
|
||||
|
||||
if (!message) {
|
||||
return NextResponse.json(
|
||||
{ error: 'Email not found' },
|
||||
{ status: 404 }
|
||||
);
|
||||
// 8. Fetch emails (if any exist)
|
||||
// Define start and end variables HERE
|
||||
let start = 1;
|
||||
let end = 0;
|
||||
|
||||
if (mailbox.exists > 0) {
|
||||
// Calculate range with boundaries
|
||||
start = Math.min((page - 1) * limit + 1, mailbox.exists);
|
||||
end = Math.min(start + limit - 1, mailbox.exists);
|
||||
|
||||
// Use sequence numbers in descending order for newest first
|
||||
const range = `${mailbox.exists - end + 1}:${mailbox.exists - start + 1}`;
|
||||
|
||||
// Fetch messages with optimized options
|
||||
const options: any = {
|
||||
envelope: true,
|
||||
flags: true,
|
||||
bodyStructure: true
|
||||
};
|
||||
|
||||
// Only fetch preview if requested
|
||||
if (preview) {
|
||||
options.bodyParts = ['TEXT', 'HTML'];
|
||||
}
|
||||
|
||||
const messages = await client.fetch(range, options);
|
||||
|
||||
// Process messages
|
||||
for await (const message of messages) {
|
||||
// Extract preview content correctly
|
||||
let previewContent = null;
|
||||
if (preview && message.bodyParts) {
|
||||
// Try HTML first, then TEXT
|
||||
const htmlPart = message.bodyParts.get('HTML');
|
||||
const textPart = message.bodyParts.get('TEXT');
|
||||
previewContent = htmlPart?.toString() || textPart?.toString() || null;
|
||||
}
|
||||
|
||||
const email: Email = {
|
||||
id: message.uid.toString(),
|
||||
from: message.envelope.from?.[0]?.address || '',
|
||||
fromName: message.envelope.from?.[0]?.name ||
|
||||
message.envelope.from?.[0]?.address?.split('@')[0] || '',
|
||||
to: message.envelope.to?.map((addr: any) => addr.address).join(', ') || '',
|
||||
subject: message.envelope.subject || '(No subject)',
|
||||
date: message.envelope.date?.toISOString() || new Date().toISOString(),
|
||||
read: message.flags.has('\\Seen'),
|
||||
starred: message.flags.has('\\Flagged'),
|
||||
folder: mailbox.path,
|
||||
hasAttachments: message.bodyStructure?.type === 'multipart',
|
||||
flags: Array.from(message.flags),
|
||||
preview: previewContent
|
||||
};
|
||||
|
||||
result.push(email);
|
||||
}
|
||||
}
|
||||
|
||||
// 8. Parse the email content
|
||||
const emailContent = {
|
||||
id: message.uid,
|
||||
from: message.envelope.from?.[0]?.address || '',
|
||||
fromName: message.envelope.from?.[0]?.name ||
|
||||
message.envelope.from?.[0]?.address?.split('@')[0] || '',
|
||||
to: message.envelope.to?.map((addr: any) => addr.address).join(', ') || '',
|
||||
subject: message.envelope.subject || '(No subject)',
|
||||
date: message.envelope.date?.toISOString() || new Date().toISOString(),
|
||||
content: message.source?.toString() || '',
|
||||
read: message.flags.has('\\Seen'),
|
||||
starred: message.flags.has('\\Flagged'),
|
||||
flags: Array.from(message.flags),
|
||||
hasAttachments: message.bodyStructure?.type === 'multipart'
|
||||
// 9. Prepare response data
|
||||
const responseData = {
|
||||
emails: result,
|
||||
folders: availableFolders,
|
||||
total: mailbox.exists,
|
||||
hasMore: end < mailbox.exists,
|
||||
page,
|
||||
limit
|
||||
};
|
||||
|
||||
// 10. Cache the results
|
||||
emailCache.set(cacheKey, responseData);
|
||||
|
||||
// 9. Cache the email content
|
||||
emailContentCache.set(cacheKey, emailContent);
|
||||
|
||||
// 10. Return the email content
|
||||
return NextResponse.json(emailContent);
|
||||
} finally {
|
||||
// 11. Close the connection
|
||||
try {
|
||||
await client.logout();
|
||||
} catch (e) {
|
||||
console.error('Error during IMAP logout:', e);
|
||||
}
|
||||
return NextResponse.json(responseData);
|
||||
} catch (error) {
|
||||
// Connection error - remove from pool
|
||||
connectionPool.delete(session.user.id);
|
||||
throw error;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error fetching email:', error);
|
||||
console.error('Error in courrier route:', error);
|
||||
return NextResponse.json(
|
||||
{ error: 'Failed to fetch email content' },
|
||||
{ error: 'An unexpected error occurred' },
|
||||
{ status: 500 }
|
||||
);
|
||||
}
|
||||
|
||||
@ -622,18 +622,10 @@ export default function CourrierPage() {
|
||||
|
||||
// Update handleEmailSelect to set selectedEmail correctly
|
||||
const handleEmailSelect = async (emailId: string) => {
|
||||
const email = emails.find(e => e.id === emailId);
|
||||
if (!email) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
// Set the selected email first to show preview immediately
|
||||
setSelectedEmail(email);
|
||||
setContentLoading(true);
|
||||
// Make sure it's using this:
|
||||
const response = await fetch(`/api/courrier/${emailId}`);
|
||||
|
||||
// Fetch the full email content
|
||||
const response = await fetch(`/api/mail/${emailId}`);
|
||||
if (!response.ok) {
|
||||
throw new Error('Failed to fetch full email content');
|
||||
}
|
||||
@ -651,7 +643,6 @@ export default function CourrierPage() {
|
||||
...prev,
|
||||
content: fullEmail.content || fullEmail.body || prev.content
|
||||
} : prev);
|
||||
setContentLoading(false);
|
||||
|
||||
// Try to mark as read in the background
|
||||
try {
|
||||
@ -682,8 +673,7 @@ export default function CourrierPage() {
|
||||
console.error('Error marking email as read:', error);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error fetching email content:', error);
|
||||
setContentLoading(false);
|
||||
console.error('Error fetching email:', error);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user