officerdev/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

email: store emails.db per account under email_accounts/<account>/

Browse Source 
Reorganizes email storage: the DB moves from DATA_PATH/<user>/emails.db to
DATA_PATH/<user>/email_accounts/<accountEmail>/emails.db, with a shared
email_accounts/attachment_cache/ (was Gmail/emails/attachments). openEmailDb now
takes (owner, account); a new openUserEmailDb(owner, userId) resolves the user's
configured account (first enabled) for read paths. Threads the account through
email.ts, accounts, resync, queue sync, channel handlers, and the email_db MCP
tool path. Drops the dead getUserEmailDir helper.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
pastilhas
2026-07-24 13:34:29 +00:00
co-authored by Claude Opus 4.8
parent 9271e63eef
commit 33a0bb4578
13 changed files with 118 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/api/email/accounts.ts
+1 -1
View File
@@ -141,7 +141,7 @@ accountsRouter.post('/:id/sync', async (ctx) => {
// Determine if this is a first sync or resync
let isFirstSync = true;
if (account.provider === 'gmail' && account.authType === 'oauth') {
const db = openEmailDb(user.email);
const db = openEmailDb(user.email, account.email);
try {
isFirstSync = !getSyncMeta(db, 'last_sync_at');
} finally {
src/servers/api/email/email-db.ts
+18 -5
View File
@@ -1,8 +1,9 @@
import { Database } from 'bun:sqlite';
import { createHash } from 'node:crypto';
import { join } from 'node:path';
import { chmodSync } from 'node:fs';
import { DATA_PATH } from '@@/data-path';
import { join, dirname } from 'node:path';
import { chmodSync, mkdirSync } from 'node:fs';
import { getEmailDbPath } from '@@/data-path';
import { getEmailAccounts } from 'officerdb';
import type { EmailSummary } from 'types';
const SCHEMA_TABLES = `
@@ -130,8 +131,9 @@ function fallbackThreadId(row: { id: string; subject: unknown; from_address: unk
return `s:${norm}|${counterpart}`;
}
export function openEmailDb(email: string): Database {
const dbPath = join(DATA_PATH, email, 'emails.db');
export function openEmailDb(ownerEmail: string, accountEmail: string): Database {
const dbPath = getEmailDbPath(ownerEmail, accountEmail);
mkdirSync(dirname(dbPath), { recursive: true });
const db = new Database(dbPath, { create: true });
// The API and the email sidecar both open this file; wait out a concurrent writer (e.g. a resync
// or the one-time thread_id backfill) instead of failing immediately with "database is locked".
@@ -151,6 +153,17 @@ export function openEmailDb(email: string): Database {
return db;
}
/**
* Open the email DB for a user's configured account. Emails are stored per account
* (email_accounts/<account>/emails.db); for now we use the user's first account. Returns null if the
* user has no email account configured yet.
*/
export async function openUserEmailDb(ownerEmail: string, userId: number): Promise<Database | null> {
const accounts = await getEmailAccounts(userId);
const account = accounts.find((a) => a.enabled) ?? accounts[0];
return account ? openEmailDb(ownerEmail, account.email) : null;
}
function migrate(db: Database): void {
const cols = db.query('PRAGMA table_info(emails)').all() as Array<{ name: string }>;
const colNames = new Set(cols.map((c) => c.name));
src/servers/api/email/email.ts
+43 -31
View File
@@ -4,9 +4,9 @@ import nodemailer from 'nodemailer';
import type { EmailMessage } from 'types';
import { createRouter } from '../../create-router';
import * as errors from '@@/custom-errors';
import { DATA_PATH } from '@@/data-path';
import { getEmailAttachmentCacheDir } from '@@/data-path';
import { getEmailAccounts } from 'officerdb';
import { openEmailDb, rowToSummary, getSyncMeta, searchEmails } from './email-db';
import { openEmailDb, openUserEmailDb, rowToSummary, getSyncMeta, searchEmails } from './email-db';
import { accountsRouter } from './accounts';
export const emailRouter = createRouter();
@@ -69,10 +69,11 @@ emailRouter.post('/send', async (ctx) => {
});
// GET /contacts?q= — address autocomplete from people you've received mail from, ranked by frequency.
emailRouter.get('/contacts', (ctx) => {
const email = ctx.get('user').email;
emailRouter.get('/contacts', async (ctx) => {
const user = ctx.get('user');
const like = `%${(ctx.req.query('q') ?? '').trim().toLowerCase()}%`;
const db = openEmailDb(email);
const db = await openUserEmailDb(user.email, user.id);
if (!db) return ctx.json([]);
try {
const rows = db
.query(
@@ -146,14 +147,15 @@ emailRouter.get('/events', (ctx) => {
// Full-text search across all mail (subject / sender / recipients / snippet / body), newest first.
emailRouter.get('/search', async (ctx) => {
const email = ctx.get('user').email;
const user = ctx.get('user');
const q = (ctx.req.query('q') ?? '').trim();
const page = Math.max(1, Number(ctx.req.query('page') ?? '1') || 1);
const limit = Math.min(100, Math.max(1, Number(ctx.req.query('limit') ?? '50') || 50));
const offset = (page - 1) * limit;
if (!q) return ctx.json({ messages: [], total: 0 });
const db = openEmailDb(email);
const db = await openUserEmailDb(user.email, user.id);
if (!db) return ctx.json({ messages: [], total: 0 });
try {
const { rows, total } = searchEmails(db, q, limit, offset);
return ctx.json({ messages: rows.map(rowToSummary), total });
@@ -163,7 +165,7 @@ emailRouter.get('/search', async (ctx) => {
});
emailRouter.get('/messages', async (ctx) => {
const email = ctx.get('user').email;
const user = ctx.get('user');
const page = Number(ctx.req.query('page') ?? '1');
const limit = Number(ctx.req.query('limit') ?? '50');
const folder = ctx.req.query('folder') ?? 'inbox';
@@ -171,7 +173,8 @@ emailRouter.get('/messages', async (ctx) => {
const folderWhere = folder === 'all' ? 'deleted = 0' : `deleted = 0 AND labels LIKE '%${folder}%'`;
const db = openEmailDb(email);
const db = await openUserEmailDb(user.email, user.id);
if (!db) return ctx.json({ messages: [], total: 0 });
try {
// One row per conversation: the latest message in each thread within this folder, plus the
// thread's message count and how many are unread. COALESCE guards any un-backfilled rows.
@@ -225,10 +228,11 @@ function buildMessage(db: ReturnType<typeof openEmailDb>, row: Record<string, un
}
emailRouter.get('/messages/:id', async (ctx) => {
const email = ctx.get('user').email;
const user = ctx.get('user');
const id = ctx.req.param('id');
const db = openEmailDb(email);
const db = await openUserEmailDb(user.email, user.id);
if (!db) return ctx.text('Not found', 404);
try {
const row = db.query('SELECT * FROM emails WHERE id = ? AND deleted = 0').get(id) as Record<string, unknown> | null;
if (!row) return ctx.text('Not found', 404);
@@ -239,11 +243,12 @@ emailRouter.get('/messages/:id', async (ctx) => {
});
// GET /thread/:id — the full conversation containing message :id, oldest message first.
emailRouter.get('/thread/:id', (ctx) => {
const email = ctx.get('user').email;
emailRouter.get('/thread/:id', async (ctx) => {
const user = ctx.get('user');
const id = ctx.req.param('id');
const db = openEmailDb(email);
const db = await openUserEmailDb(user.email, user.id);
if (!db) return ctx.text('Not found', 404);
try {
const head = db.query('SELECT thread_id, subject FROM emails WHERE id = ? AND deleted = 0').get(id) as
| { thread_id: string | null; subject: string }
@@ -262,11 +267,12 @@ emailRouter.get('/thread/:id', (ctx) => {
});
// PATCH /thread/:id/read — mark every message in the conversation as read.
emailRouter.patch('/thread/:id/read', (ctx) => {
const email = ctx.get('user').email;
emailRouter.patch('/thread/:id/read', async (ctx) => {
const user = ctx.get('user');
const id = ctx.req.param('id');
const db = openEmailDb(email);
const db = await openUserEmailDb(user.email, user.id);
if (!db) return ctx.text('Not found', 404);
try {
const head = db.query('SELECT thread_id FROM emails WHERE id = ?').get(id) as { thread_id: string | null } | null;
if (!head) return ctx.text('Not found', 404);
@@ -279,11 +285,12 @@ emailRouter.patch('/thread/:id/read', (ctx) => {
});
emailRouter.post('/messages/:id/attachments/:index/extract', async (ctx) => {
const email = ctx.get('user').email;
const user = ctx.get('user');
const id = ctx.req.param('id');
const index = Number(ctx.req.param('index'));
const db = openEmailDb(email);
const db = await openUserEmailDb(user.email, user.id);
if (!db) return ctx.text('Attachment not found', 404);
try {
const row = db.query('SELECT filename, content FROM attachments WHERE email_id = ? AND idx = ?').get(id, index) as {
filename: string;
@@ -292,7 +299,7 @@ emailRouter.post('/messages/:id/attachments/:index/extract', async (ctx) => {
if (!row || !row.content) return ctx.text('Attachment not found', 404);
const fileName = row.filename ?? 'unknown';
const attachDir = join(DATA_PATH, email, 'Gmail', 'emails', 'attachments');
const attachDir = getEmailAttachmentCacheDir(user.email);
const destPath = join(attachDir, fileName);
const destFile = Bun.file(destPath);
@@ -302,7 +309,7 @@ emailRouter.post('/messages/:id/attachments/:index/extract', async (ctx) => {
await Bun.write(destPath, binary);
}
return ctx.json({ filePath: `Gmail/emails/attachments/${fileName}`, fileName, root: 'user-data' });
return ctx.json({ filePath: `email_accounts/attachment_cache/${fileName}`, fileName, root: 'user-data' });
} catch {
return ctx.text('Failed to extract attachment', 500);
} finally {
@@ -311,10 +318,11 @@ emailRouter.post('/messages/:id/attachments/:index/extract', async (ctx) => {
});
emailRouter.patch('/messages/:id/read', async (ctx) => {
const email = ctx.get('user').email;
const user = ctx.get('user');
const id = ctx.req.param('id');
const db = openEmailDb(email);
const db = await openUserEmailDb(user.email, user.id);
if (!db) return ctx.json({ ok: true });
try {
db.run('UPDATE emails SET read = 1 WHERE id = ? AND read = 0', [id]);
return ctx.json({ ok: true });
@@ -324,10 +332,11 @@ emailRouter.patch('/messages/:id/read', async (ctx) => {
});
emailRouter.delete('/messages/:id', async (ctx) => {
const email = ctx.get('user').email;
const user = ctx.get('user');
const id = ctx.req.param('id');
const db = openEmailDb(email);
const db = await openUserEmailDb(user.email, user.id);
if (!db) return ctx.text('Not found', 404);
try {
const result = db.run('UPDATE emails SET deleted = 1 WHERE id = ? AND deleted = 0', [id]);
if (result.changes === 0) return ctx.text('Not found', 404);
@@ -338,9 +347,10 @@ emailRouter.delete('/messages/:id', async (ctx) => {
});
emailRouter.get('/sync-status', async (ctx) => {
const email = ctx.get('user').email;
const user = ctx.get('user');
const db = openEmailDb(email);
const db = await openUserEmailDb(user.email, user.id);
if (!db) return ctx.json({ lastSyncAt: null });
try {
const lastSyncAt = getSyncMeta(db, 'last_sync_at');
return ctx.json({ lastSyncAt });
@@ -350,12 +360,13 @@ emailRouter.get('/sync-status', async (ctx) => {
});
emailRouter.get('/stats', async (ctx) => {
const email = ctx.get('user').email;
const user = ctx.get('user');
const folder = ctx.req.query('folder') ?? 'inbox';
const folderWhere = folder === 'all' ? 'deleted = 0' : `deleted = 0 AND labels LIKE '%${folder}%'`;
const db = openEmailDb(email);
const db = await openUserEmailDb(user.email, user.id);
if (!db) return ctx.json({ total: 0, byDomain: [], bySender: [] });
try {
const total = (db.query(`SELECT COUNT(*) as count FROM emails WHERE ${folderWhere}`).get() as { count: number })
.count;
@@ -377,9 +388,10 @@ emailRouter.get('/stats', async (ctx) => {
});
emailRouter.get('/labels', async (ctx) => {
const email = ctx.get('user').email;
const user = ctx.get('user');
const db = openEmailDb(email);
const db = await openUserEmailDb(user.email, user.id);
if (!db) return ctx.json({ labels: [] });
try {
const rows = db.query('SELECT labels FROM emails WHERE deleted = 0 AND labels IS NOT NULL').all() as Array<{
labels: string;
src/servers/api/email/resync.ts
+4 -4
View File
@@ -40,7 +40,7 @@ async function refreshCredentials(creds: GmailCredentials): Promise<GmailCredent
return { ...creds, accessToken: refreshed.accessToken, expiresAt: refreshed.expiresAt };
}
async function gmailResync(userEmail: string): Promise<ResyncResult> {
async function gmailResync(userEmail: string, accountEmail: string): Promise<ResyncResult> {
let creds = await loadGmailCredentials(userEmail);
if (!creds.accessToken) {
throw new Error('OAuth not configured — connect Google in Settings → Integrations for resyncs');
@@ -48,7 +48,7 @@ async function gmailResync(userEmail: string): Promise<ResyncResult> {
creds = await refreshCredentials(creds);
const db = openEmailDb(userEmail);
const db = openEmailDb(userEmail, accountEmail);
try {
const result = await gmailApiSync({ creds, db });
@@ -154,7 +154,7 @@ async function imapResync(account: ImapAccountInfo, userEmail: string): Promise<
if (!freshAccount) throw new Error(`Email account ${account.id} not found`);
const syncMeta = (freshAccount.syncMeta ?? {}) as Record<string, unknown>;
const db = openEmailDb(userEmail);
const db = openEmailDb(userEmail, account.email);
const existingIds = new Set<string>();
const rows = db.query('SELECT id FROM emails').all() as Array<{ id: string }>;
for (const row of rows) existingIds.add(row.id);
@@ -289,7 +289,7 @@ async function doResync({ accountId, userEmail, userId }: ResyncParams): Promise
// Gmail API resync needs OAuth; a gmail account authed with an app password resyncs over IMAP.
if (account.provider === 'gmail' && account.authType === 'oauth') {
return gmailResync(userEmail);
return gmailResync(userEmail, account.email);
}
return imapResync(