fix: enhance error handling

Author: vwh

src/database/d1.ts

@@ -5,21 +5,27 @@ import type { Email, EmailSummary } from "@/schemas/emails/schema";
  * Insert an email into the database
  */
 export async function insertEmail(db: D1Database, emailData: Email) {
-	return await db
-		.prepare(
-			`INSERT INTO emails (id, from_address, to_address, subject, received_at, html_content, text_content)
+	try {
+		const { success, error, meta } = await db
+			.prepare(
+				`INSERT INTO emails (id, from_address, to_address, subject, received_at, html_content, text_content)
          VALUES (?, ?, ?, ?, ?, ?, ?)`,
-		)
-		.bind(
-			emailData.id,
-			emailData.from_address,
-			emailData.to_address,
-			emailData.subject,
-			emailData.received_at,
-			emailData.html_content,
-			emailData.text_content,
-		)
-		.run();
+			)
+			.bind(
+				emailData.id,
+				emailData.from_address,
+				emailData.to_address,
+				emailData.subject,
+				emailData.received_at,
+				emailData.html_content,
+				emailData.text_content,
+			)
+			.run();
+		return { success, error, meta };
+	} catch (e: unknown) {
+		const error = e instanceof Error ? e : new Error(String(e));
+		return { success: false, error: error, meta: undefined };
+	}
 }
 
 /**
@@ -31,67 +37,97 @@ export async function getEmailsByRecipient(
 	limit: number,
 	offset: number,
 ) {
-	const { results } = await db
-		.prepare(
-			`SELECT id, from_address, to_address, subject, received_at
+	try {
+		const { results } = await db
+			.prepare(
+				`SELECT id, from_address, to_address, subject, received_at
          FROM emails
          WHERE to_address = ?
          ORDER BY received_at DESC
          LIMIT ? OFFSET ?`,
-		)
-		.bind(emailAddress, limit, offset)
-		.all();
-	return results as EmailSummary[];
+			)
+			.bind(emailAddress, limit, offset)
+			.all();
+		return { results: results as EmailSummary[], error: undefined };
+	} catch (e: unknown) {
+		const error = e instanceof Error ? e : new Error(String(e));
+		return { results: [], error: error };
+	}
 }
 
 /**
  * Get an email by ID
  */
 export async function getEmailById(db: D1Database, emailId: string) {
-	const emailResult = await db.prepare("SELECT * FROM emails WHERE id = ?").bind(emailId).first();
-	return emailResult as Email | null;
+	try {
+		const emailResult = await db.prepare("SELECT * FROM emails WHERE id = ?").bind(emailId).first();
+		return { result: emailResult as Email | null, error: undefined };
+	} catch (e: unknown) {
+		const error = e instanceof Error ? e : new Error(String(e));
+		return { result: null, error: error };
+	}
 }
 
 /**
  * Delete emails older than a specific timestamp
  */
 export async function deleteOldEmails(db: D1Database, timestamp: number) {
-	const { success, error, meta } = await db
-		.prepare("DELETE FROM emails WHERE received_at < ?")
-		.bind(timestamp)
-		.run();
-	return { success, error, meta };
+	try {
+		const { success, error, meta } = await db
+			.prepare("DELETE FROM emails WHERE received_at < ?")
+			.bind(timestamp)
+			.run();
+		return { success, error, meta };
+	} catch (e: unknown) {
+		const error = e instanceof Error ? e : new Error(String(e));
+		return { success: false, error: error, meta: undefined };
+	}
 }
 
 /**
  * Delete emails by recipient email address
  */
 export async function deleteEmailsByRecipient(db: D1Database, emailAddress: string) {
-	const { success, error, meta } = await db
-		.prepare("DELETE FROM emails WHERE to_address = ?")
-		.bind(emailAddress)
-		.run();
-	return { success, error, meta };
+	try {
+		const { success, error, meta } = await db
+			.prepare("DELETE FROM emails WHERE to_address = ?")
+			.bind(emailAddress)
+			.run();
+		return { success, error, meta };
+	} catch (e: unknown) {
+		const error = e instanceof Error ? e : new Error(String(e));
+		return { success: false, error: error, meta: undefined };
+	}
 }
 
 /**
  * Delete an email by ID
  */
 export async function deleteEmailById(db: D1Database, emailId: string) {
-	const { success, error, meta } = await db
-		.prepare("DELETE FROM emails WHERE id = ?")
-		.bind(emailId)
-		.run();
-	return { success, error, meta };
+	try {
+		const { success, error, meta } = await db
+			.prepare("DELETE FROM emails WHERE id = ?")
+			.bind(emailId)
+			.run();
+		return { success, error, meta };
+	} catch (e: unknown) {
+		const error = e instanceof Error ? e : new Error(String(e));
+		return { success: false, error: error, meta: undefined };
+	}
 }
 
 /**
  * Count emails by recipient email address
  */
 export async function countEmailsByRecipient(db: D1Database, emailAddress: string) {
-	const result = await db
-		.prepare("SELECT count(*) as count FROM emails WHERE to_address = ?")
-		.bind(emailAddress)
-		.first<{ count: number }>();
-	return result?.count || 0;
+	try {
+		const result = await db
+			.prepare("SELECT count(*) as count FROM emails WHERE to_address = ?")
+			.bind(emailAddress)
+			.first<{ count: number }>();
+		return { count: result?.count || 0, error: undefined };
+	} catch (e: unknown) {
+		const error = e instanceof Error ? e : new Error(String(e));
+		return { count: 0, error: error };
+	}
 }

src/handlers/emailHandler.ts

@@ -34,5 +34,9 @@ export async function handleEmail(
 	ctx.waitUntil(updateSenderStats(env.KV, message.from));
 
 	// Insert email
-	await db.insertEmail(env.D1, emailData);
+	const { success, error } = await db.insertEmail(env.D1, emailData);
+
+	if (!success) {
+		throw new Error(`Failed to insert email: ${error}`);
+	}
 }

src/routes/emailRoutes.ts

@@ -23,10 +23,11 @@ emailRoutes.use("/emails/count/:emailAddress", validateDomain);
 // @ts-ignore - Ignoring OpenAPI type mismatch for utility functions
 emailRoutes.openapi(getEmailsRoute, async (c) => {
 	const { emailAddress } = c.req.valid("param");
-
 	const { limit, offset } = c.req.valid("query");
-	const results = await db.getEmailsByRecipient(c.env.D1, emailAddress, limit, offset);
 
+	const { results, error } = await db.getEmailsByRecipient(c.env.D1, emailAddress, limit, offset);
+
+	if (error) return c.json(ERR(error.message, "D1Error"), 500);
 	return c.json(OK(results));
 });
 
@@ -35,8 +36,9 @@ emailRoutes.openapi(getEmailsRoute, async (c) => {
 emailRoutes.openapi(getEmailsCountRoute, async (c) => {
 	const { emailAddress } = c.req.valid("param");
 
-	const count = await db.countEmailsByRecipient(c.env.D1, emailAddress);
+	const { count, error } = await db.countEmailsByRecipient(c.env.D1, emailAddress);
 
+	if (error) return c.json(ERR(error.message, "D1Error"), 500);
 	return c.json(OK({ count }));
 });
 
@@ -45,16 +47,21 @@ emailRoutes.openapi(getEmailsCountRoute, async (c) => {
 emailRoutes.openapi(deleteEmailsRoute, async (c) => {
 	const { emailAddress } = c.req.valid("param");
 
-	const { meta } = await db.deleteEmailsByRecipient(c.env.D1, emailAddress);
-	return c.json(OK({ message: "Emails deleted successfully", deleted_count: meta.changes }));
+	const { meta, error } = await db.deleteEmailsByRecipient(c.env.D1, emailAddress);
+
+	if (error) return c.json(ERR(error.message, "D1Error"), 500);
+	if (meta && meta.changes === 0)
+		return c.json(ERR("No emails found for deletion", "NotFound"), 404);
+	return c.json(OK({ message: "Emails deleted successfully", deleted_count: meta?.changes }));
 });
 
 // GET /inbox/{emailId}
 // @ts-ignore - Ignoring OpenAPI type mismatch for utility functions
 emailRoutes.openapi(getEmailRoute, async (c) => {
 	const { emailId } = c.req.valid("param");
-	const result = await db.getEmailById(c.env.D1, emailId);
+	const { result, error } = await db.getEmailById(c.env.D1, emailId);
 
+	if (error) return c.json(ERR(error.message, "D1Error"), 500);
 	if (!result) return c.json(ERR("Email not found", "NotFound"), 404);
 	return c.json(OK(result));
 });
@@ -63,9 +70,10 @@ emailRoutes.openapi(getEmailRoute, async (c) => {
 // @ts-ignore - Ignoring OpenAPI type mismatch for utility functions
 emailRoutes.openapi(deleteEmailRoute, async (c) => {
 	const { emailId } = c.req.valid("param");
-	const { meta } = await db.deleteEmailById(c.env.D1, emailId);
+	const { meta, error } = await db.deleteEmailById(c.env.D1, emailId);
 
-	if (meta.changes === 0) return c.json(ERR("Email not found", "NotFound"), 404);
+	if (error) return c.json(ERR(error.message, "D1Error"), 500);
+	if (meta && meta.changes === 0) return c.json(ERR("Email not found", "NotFound"), 404);
 	return c.json(OK({ message: "Email deleted successfully" }));
 });
 

src/routes/healthRoutes.ts

@@ -1,5 +1,6 @@
 import { OpenAPIHono } from "@hono/zod-openapi";
-import { ERR, OK } from "@/utils/http";
+import type { ContentfulStatusCode } from "hono/utils/http-status";
+import { OK } from "@/utils/http";
 import { logError } from "@/utils/logger";
 
 const healthRoutes = new OpenAPIHono<{ Bindings: CloudflareBindings }>();
@@ -8,21 +9,34 @@ const healthRoutes = new OpenAPIHono<{ Bindings: CloudflareBindings }>();
 // TODO: add it to the openapi docs
 // GET /health
 healthRoutes.get("/health", async (c) => {
+	let d1Status = "disconnected";
+	let kvStatus = "disconnected";
+	let overallStatus: ContentfulStatusCode = 200;
+
 	try {
 		await c.env.D1.prepare("SELECT 1").run();
-		await c.env.KV.list({ limit: 1 });
+		d1Status = "connected";
+	} catch (error) {
+		logError("Health check D1 failed", error as Error);
+		overallStatus = 503;
+	}
 
-		return c.json(
-			OK({
-				worker: "connected",
-				database: "connected",
-				kv: "connected",
-			}),
-		);
+	try {
+		await c.env.KV.list({ limit: 1 });
+		kvStatus = "connected";
 	} catch (error) {
-		logError("Health check failed", error as Error);
-		return c.json(ERR((error as Error).message), 503);
+		logError("Health check KV failed", error as Error);
+		overallStatus = 503;
 	}
+
+	return c.json(
+		OK({
+			worker: "connected",
+			database: d1Status,
+			kv: kvStatus,
+		}),
+		overallStatus,
+	);
 });
 
 export default healthRoutes;

src/utils/telegram.ts

@@ -1,24 +1,29 @@
-import { logInfo } from "@/utils/logger";
+import { logError, logInfo } from "@/utils/logger";
 
 /**
  * Send message to Telegram
  */
 export async function sendMessage(text: string, env: CloudflareBindings) {
 	if (!env.TELEGRAM_LOG_ENABLE || !env.TELEGRAM_BOT_TOKEN || !env.TELEGRAM_CHAT_ID) {
 		logInfo("Telegram logging is disabled.");
+		return;
 	}
 
 	const url = `https://api.telegram.org/bot${env.TELEGRAM_BOT_TOKEN}/sendMessage`;
 
-	await fetch(url, {
-		method: "POST",
-		headers: {
-			"Content-Type": "application/json",
-		},
-		body: JSON.stringify({
-			chat_id: Number(env.TELEGRAM_CHAT_ID),
-			text,
-			parse_mode: "Markdown",
-		}),
-	});
+	try {
+		await fetch(url, {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+			},
+			body: JSON.stringify({
+				chat_id: Number(env.TELEGRAM_CHAT_ID),
+				text,
+				parse_mode: "Markdown",
+			}),
+		});
+	} catch (error) {
+		logError("Failed to send Telegram message", error as Error);
+	}
 }