Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix: address code review feedback on email attachments

Gusf89f048a2a49
diff --git a/src/email-worker/src/imap-poller-do.ts b/src/email-worker/src/imap-poller-do.ts
index baa5e3000..80ac4ab5c 100644
--- a/src/email-worker/src/imap-poller-do.ts
+++ b/src/email-worker/src/imap-poller-do.ts
@@ -1,7 +1,7 @@
import { DurableObject } from "cloudflare:workers"
import PostalMime from "postal-mime"
import { nanoid } from "nanoid"
-import { createDb, queries, createLogger, parseIcs } from "@alook/shared"
+import { createDb, queries, createLogger, parseIcs, extractAttachmentMeta } from "@alook/shared"
import type { MeetingInfo } from "@alook/shared"
import { decrypt } from "@alook/shared/crypto"
import { ImapClient, ImapAuthError } from "./lib/imap-client"
@@ -165,14 +165,7 @@ export class ImapPollerDO extends DurableObject<EmailEnv> {
}
}
- const attachmentsMeta = (parsed.attachments || [])
- .filter(att => att.disposition === "attachment" || att.filename)
- .map((att, i) => ({
- key: `inline:${i}`,
- filename: att.filename || `attachment-${i}`,
- size: att.content instanceof ArrayBuffer ? att.content.byteLength : typeof att.content === "string" ? att.content.length : 0,
- contentType: att.mimeType || "application/octet-stream",
- }))
+ const attachmentsMeta = extractAttachmentMeta(parsed.attachments || [])
await this.notifyWeb({
agentId: account.agentId,
diff --git a/src/email-worker/src/index.ts b/src/email-worker/src/index.ts
index 457a2b5cf..209fa25a7 100644
--- a/src/email-worker/src/index.ts
+++ b/src/email-worker/src/index.ts
@@ -1,6 +1,6 @@
import { nanoid } from "nanoid"
import PostalMime from "postal-mime"
-import { createDb, queries, parseEmailHandle, DEV_WEB_URL, createLogger, buildMimeMessage } from "@alook/shared"
+import { createDb, queries, parseEmailHandle, DEV_WEB_URL, createLogger, buildMimeMessage, extractAttachmentMeta } from "@alook/shared"
import { decrypt } from "@alook/shared/crypto"
import { WorkerMailer, type AuthType } from "worker-mailer"
@@ -346,14 +346,7 @@ export default {
})
const parsed = await PostalMime.parse(rawBytes)
- const attachmentsMeta = (parsed.attachments || [])
- .filter(att => att.disposition === "attachment" || att.filename)
- .map((att, i) => ({
- key: `inline:${i}`,
- filename: att.filename || `attachment-${i}`,
- size: att.content instanceof ArrayBuffer ? att.content.byteLength : typeof att.content === "string" ? att.content.length : 0,
- contentType: att.mimeType || "application/octet-stream",
- }))
+ const attachmentsMeta = extractAttachmentMeta(parsed.attachments || [])
const subject = message.headers.get("subject") ?? ""
const messageId = message.headers.get("message-id") ?? ""
diff --git a/src/shared/src/index.ts b/src/shared/src/index.ts
index 04af009c6..67857ad50 100644
--- a/src/shared/src/index.ts
+++ b/src/shared/src/index.ts
@@ -187,8 +187,8 @@ export { isEmptyHtml } from "./lib/html";
export { extractThreadId, buildEmailMapKey } from "./lib/context-key";
export { parseIcs } from "./lib/ics-parser";
export type { MeetingInfo } from "./lib/ics-parser";
-export { buildMimeMessage } from "./lib/mime";
-export type { MimeAttachment, BuildMimeOptions } from "./lib/mime";
+export { buildMimeMessage, extractAttachmentMeta, filterDownloadableAttachments } from "./lib/mime";
+export type { MimeAttachment, BuildMimeOptions, InboundAttachmentMeta } from "./lib/mime";
export {
addRepeatInterval,
computeNextScheduledAt,
diff --git a/src/shared/src/lib/mime.ts b/src/shared/src/lib/mime.ts
index 3b0af4db5..f6bebfe5a 100644
--- a/src/shared/src/lib/mime.ts
+++ b/src/shared/src/lib/mime.ts
@@ -1,5 +1,34 @@
import { nanoid } from "nanoid";
+export interface InboundAttachmentMeta {
+ key: string;
+ filename: string;
+ size: number;
+ contentType: string;
+}
+
+interface ParsedAttachment {
+ disposition: string | null;
+ filename: string | null;
+ mimeType: string;
+ content: string | ArrayBuffer | Uint8Array;
+}
+
+export function extractAttachmentMeta(attachments: ParsedAttachment[]): InboundAttachmentMeta[] {
+ return attachments
+ .filter(att => att.disposition === "attachment" || att.filename)
+ .map((att, i) => ({
+ key: `inline:${i}`,
+ filename: att.filename || `attachment-${i}`,
+ size: att.content instanceof ArrayBuffer ? att.content.byteLength : typeof att.content === "string" ? att.content.length : 0,
+ contentType: att.mimeType || "application/octet-stream",
+ }));
+}
+
+export function filterDownloadableAttachments<T extends { disposition: string | null; filename: string | null }>(attachments: T[]): T[] {
+ return attachments.filter(att => att.disposition === "attachment" || att.filename);
+}
+
export interface MimeAttachment {
filename: string;
contentType: string;
diff --git a/src/web/src/app/(app)/w/[slug]/agents/[id]/email/page.tsx b/src/web/src/app/(app)/w/[slug]/agents/[id]/email/page.tsx
index 4ca2d5619..390606651 100644
--- a/src/web/src/app/(app)/w/[slug]/agents/[id]/email/page.tsx
+++ b/src/web/src/app/(app)/w/[slug]/agents/[id]/email/page.tsx
@@ -1,6 +1,6 @@
"use client";
-import { useEffect, useState, useCallback } from "react";
+import { useEffect, useState, useCallback, useMemo } from "react";
import { useParams } from "next/navigation";
import { useWorkspace } from "@/contexts/workspace-context";
import { useAgentContext } from "@/contexts/agent-context";
@@ -44,6 +44,7 @@ export default function AgentEmailPage() {
const [folder, setFolder] = useState<Folder>("inbox");
const [emails, setEmails] = useState<Email[]>([]);
+ const unreadCount = useMemo(() => emails.filter(e => e.status === "unread").length, [emails]);
const [loading, setLoading] = useState(true);
const [selectedId, setSelectedId] = useState<string | null>(null);
const [body, setBody] = useState<{ content: string; isHtml: boolean } | null>(null);
@@ -133,7 +134,11 @@ export default function AgentEmailPage() {
e.id === emailId ? { ...e, status: "read" } : e
));
})
- .catch(() => {});
+ .catch(() => {
+ setEmails(prev => prev.map(e =>
+ e.id === emailId ? { ...e, status: "unread" } : e
+ ));
+ });
}
} catch {
setBody({ content: "(body not available)", isHtml: false });
@@ -341,9 +346,9 @@ export default function AgentEmailPage() {
>
<Inbox className="size-4 shrink-0" />
Inbox
- {folder === "inbox" && emails.filter(e => e.status === "unread").length > 0 && (
+ {folder === "inbox" && unreadCount > 0 && (
<span className="ml-auto text-xs bg-blue-500 text-white rounded-full px-1.5 py-0.5 leading-none min-w-[1.25rem] text-center">
- {emails.filter(e => e.status === "unread").length}
+ {unreadCount}
</span>
)}
</button>
@@ -718,9 +723,9 @@ export default function AgentEmailPage() {
)}
>
{f.label}
- {f.id === "inbox" && folder === "inbox" && emails.filter(e => e.status === "unread").length > 0 && (
+ {f.id === "inbox" && folder === "inbox" && unreadCount > 0 && (
<span className="ml-0.5 text-[10px] bg-blue-500 text-white rounded-full px-1 leading-none min-w-[1rem] text-center">
- {emails.filter(e => e.status === "unread").length}
+ {unreadCount}
</span>
)}
</button>
diff --git a/src/web/src/app/api/email/[id]/attachment/[index]/route.ts b/src/web/src/app/api/email/[id]/attachment/[index]/route.ts
index eb318ff82..296b67188 100644
--- a/src/web/src/app/api/email/[id]/attachment/[index]/route.ts
+++ b/src/web/src/app/api/email/[id]/attachment/[index]/route.ts
@@ -1,6 +1,6 @@
import PostalMime from "postal-mime";
import { getCloudflareContext } from "@opennextjs/cloudflare";
-import { queries } from "@alook/shared";
+import { queries, filterDownloadableAttachments } from "@alook/shared";
import { getDb } from "@/lib/db"
import { withAuth } from "@/lib/middleware/auth";
import { withWorkspaceMember } from "@/lib/middleware/workspace";
@@ -28,8 +28,7 @@ export const GET = withAuth(async (req, ctx) => {
const raw = await object.arrayBuffer();
const parsed = await PostalMime.parse(raw);
- const attachments = (parsed.attachments || [])
- .filter(att => att.disposition === "attachment" || att.filename);
+ const attachments = filterDownloadableAttachments(parsed.attachments || []);
if (index >= attachments.length) return writeError("attachment not found", 404);
@@ -41,7 +40,7 @@ export const GET = withAuth(async (req, ctx) => {
return new Response(body as BodyInit, {
headers: {
"Content-Type": contentType,
- "Content-Disposition": `attachment; filename="${filename.replace(/"/g, '\\"')}"`,
+ "Content-Disposition": `attachment; filename="${filename.replace(/"/g, '\\"')}"; filename*=UTF-8''${encodeURIComponent(filename)}`,
"Cache-Control": "private, max-age=3600",
},
});