Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix(email-worker): improve reliability and security (#98)

Gener439cc60ba099
diff --git a/src/email-worker/src/imap-poller-do.test.ts b/src/email-worker/src/imap-poller-do.test.ts
index 3b6323449..d295fa752 100644
--- a/src/email-worker/src/imap-poller-do.test.ts
+++ b/src/email-worker/src/imap-poller-do.test.ts
@@ -123,6 +123,7 @@ function createMockCtx() {
delete: vi.fn(async (key: string) => { storage.delete(key) }),
deleteAll: vi.fn(async () => { storage.clear() }),
setAlarm: vi.fn(async (time: number) => { alarm = time }),
+ getAlarm: vi.fn(async () => alarm),
deleteAlarm: vi.fn(async () => { alarm = null }),
},
getWebSockets: vi.fn().mockReturnValue([]),
@@ -439,3 +440,41 @@ describe("lifecycle", () => {
expect(mockConnect).not.toHaveBeenCalled()
})
})
+
+// ─── Alarm resilience ───
+
+describe("alarm — resilience", () => {
+ it("reschedules alarm even when poll times out", async () => {
+ vi.useFakeTimers()
+ try {
+ const { durable, ctx } = createDO()
+ await ctx.storage.put("accountId", "aea_test1")
+ mockGetEmailAccount.mockResolvedValue({ ...ACCOUNT })
+ // Simulate a poll that never resolves (hangs forever)
+ mockConnect.mockImplementation(() => new Promise(() => {}))
+
+ const alarmPromise = durable.alarm()
+ await vi.advanceTimersByTimeAsync(30_000)
+ await alarmPromise
+
+ // Despite poll hanging, alarm must be rescheduled
+ expect(ctx.storage.getAlarm).toHaveBeenCalled()
+ expect(ctx.storage.setAlarm).toHaveBeenCalled()
+ } finally {
+ vi.useRealTimers()
+ }
+ })
+
+ it("reschedules alarm when DB query throws in pollImap", async () => {
+ const { durable, ctx } = createDO()
+ await ctx.storage.put("accountId", "aea_test1")
+ // First call in alarm() succeeds, second call in pollImap() throws
+ mockGetEmailAccount
+ .mockResolvedValueOnce({ ...ACCOUNT })
+ .mockRejectedValueOnce(new Error("D1 unavailable"))
+
+ await durable.alarm()
+
+ expect(ctx.storage.setAlarm).toHaveBeenCalled()
+ })
+})
diff --git a/src/email-worker/src/imap-poller-do.ts b/src/email-worker/src/imap-poller-do.ts
index 90a9c284f..f709e2c55 100644
--- a/src/email-worker/src/imap-poller-do.ts
+++ b/src/email-worker/src/imap-poller-do.ts
@@ -10,8 +10,10 @@ import type { EmailEnv } from "./types"
const log = createLogger({ service: "imap-poller" })
const MAX_BACKOFF_MS = 15 * 60 * 1000
+const DEFAULT_POLL_MS = 60_000
const MAX_EMAILS_PER_POLL = 50
const FIRST_SYNC_DAYS = 7
+const POLL_TIMEOUT_MS = 25_000
export class ImapPollerDO extends DurableObject<EmailEnv> {
private accountId: string | null = null
@@ -61,12 +63,38 @@ export class ImapPollerDO extends DurableObject<EmailEnv> {
}
async alarm(): Promise<void> {
- await Promise.race([
- this.pollImap(),
- new Promise<void>((_, reject) => setTimeout(() => reject(new Error("poll timeout")), 25000)),
- ]).catch((e) => {
+ const accountId = this.accountId ?? await this.ctx.storage.get<string>("accountId")
+ if (!accountId) return
+
+ let pollIntervalMs = DEFAULT_POLL_MS
+ try {
+ const db = this.db
+ const account = await queries.emailAccount.getEmailAccountById(db, accountId)
+ if (!account) {
+ await this.ctx.storage.deleteAlarm()
+ await this.ctx.storage.deleteAll()
+ return
+ }
+ pollIntervalMs = account.pollIntervalSeconds * 1000
+ } catch {
+ // DB read failed — use default interval, will retry next alarm
+ }
+
+ try {
+ await Promise.race([
+ this.pollImap(),
+ new Promise<void>((_, reject) => setTimeout(() => reject(new Error("poll timeout")), POLL_TIMEOUT_MS)),
+ ])
+ } catch (e) {
log.warn("alarm: poll aborted", { err: String(e) })
- })
+ } finally {
+ // Always ensure next alarm is scheduled so the chain never breaks
+ const existing = await this.ctx.storage.getAlarm()
+ if (!existing) {
+ const backoff = (await this.ctx.storage.get<number>("backoffMs")) ?? 0
+ await this.scheduleNext(backoff || pollIntervalMs)
+ }
+ }
}
private async pollImap(): Promise<void> {
@@ -238,10 +266,10 @@ export class ImapPollerDO extends DurableObject<EmailEnv> {
const literalMatch = response.match(/\{(\d+)\}\r\n/)
if (!literalMatch) return null
+ const literalLen = parseInt(literalMatch[1]!, 10)
const contentStart = response.indexOf(literalMatch[0]) + literalMatch[0].length
- const closingIdx = response.lastIndexOf("\r\n)")
- if (closingIdx > contentStart) {
- return response.substring(contentStart, closingIdx)
+ if (contentStart + literalLen <= response.length) {
+ return response.substring(contentStart, contentStart + literalLen)
}
return null
}
diff --git a/src/email-worker/wrangler.toml b/src/email-worker/wrangler.toml
index 0966711ac..7697fab3e 100644
--- a/src/email-worker/wrangler.toml
+++ b/src/email-worker/wrangler.toml
@@ -2,6 +2,7 @@ name = "alook-email-worker"
main = "src/index.ts"
compatibility_date = "2025-04-01"
compatibility_flags = ["nodejs_compat"]
+workers_dev = false
[observability]
enabled = true