From d925b3c155fe75531496318f1d2266e52fb3ff51 Mon Sep 17 00:00:00 2001 From: Arunavo Ray Date: Sat, 24 May 2025 18:41:55 +0530 Subject: [PATCH] refactor: Remove unnecessary console logs from event polling and retrieval --- src/lib/events.ts | 46 ++++++++++++++------------------------ src/pages/api/sse/index.ts | 5 ----- 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/src/lib/events.ts b/src/lib/events.ts index c739955..7c5c5b0 100644 --- a/src/lib/events.ts +++ b/src/lib/events.ts @@ -87,36 +87,27 @@ export async function getNewEvents({ lastEventTime?: Date; }): Promise { try { - console.log(`Getting new events for user ${userId} in channel ${channel}`); - if (lastEventTime) { - console.log(`Looking for events after ${lastEventTime.toISOString()}`); - } - - // Build the query - let query = db - .select() - .from(events) - .where( - and( - eq(events.userId, userId), - eq(events.channel, channel), - eq(events.read, false) - ) - ) - .orderBy(events.createdAt); + // Build the query conditions + const conditions = [ + eq(events.userId, userId), + eq(events.channel, channel), + eq(events.read, false) + ]; // Add time filter if provided if (lastEventTime) { - query = query.where(gt(events.createdAt, lastEventTime)); + conditions.push(gt(events.createdAt, lastEventTime)); } // Execute the query - const newEvents = await query; - console.log(`Found ${newEvents.length} new events`); + const newEvents = await db + .select() + .from(events) + .where(and(...conditions)) + .orderBy(events.createdAt); // Mark events as read if (newEvents.length > 0) { - console.log(`Marking ${newEvents.length} events as read`); await db .update(events) .set({ read: true }) @@ -149,14 +140,11 @@ export async function removeDuplicateEvents(userId?: string): Promise<{ duplicat console.log("Removing duplicate events..."); // Build the base query - let query = db.select().from(events); - if (userId) { - query = query.where(eq(events.userId, userId)); - } + const allEvents = userId + ? await db.select().from(events).where(eq(events.userId, userId)) + : await db.select().from(events); - const allEvents = await query; const duplicateIds: string[] = []; - const seenKeys = new Set(); // Group events by user and channel, then check for duplicates const eventsByUserChannel = new Map(); @@ -241,7 +229,7 @@ export async function cleanupOldEvents( ) ); - const readEventsDeleted = readResult.changes || 0; + const readEventsDeleted = (readResult as any).changes || 0; console.log(`Deleted ${readEventsDeleted} read events`); // Calculate the cutoff date for unread events (default to 2x the retention period) @@ -259,7 +247,7 @@ export async function cleanupOldEvents( ) ); - const unreadEventsDeleted = unreadResult.changes || 0; + const unreadEventsDeleted = (unreadResult as any).changes || 0; console.log(`Deleted ${unreadEventsDeleted} unread events`); return { readEventsDeleted, unreadEventsDeleted }; diff --git a/src/pages/api/sse/index.ts b/src/pages/api/sse/index.ts index c029e5f..55e06a5 100644 --- a/src/pages/api/sse/index.ts +++ b/src/pages/api/sse/index.ts @@ -34,8 +34,6 @@ export const GET: APIRoute = async ({ request }) => { if (isClosed) return; try { - console.log(`Polling for events for user ${userId} in channel ${channel}`); - // Get new events from SQLite const events = await getNewEvents({ userId, @@ -43,8 +41,6 @@ export const GET: APIRoute = async ({ request }) => { lastEventTime, }); - console.log(`Found ${events.length} new events`); - // Send events to client if (events.length > 0) { // Update last event time @@ -52,7 +48,6 @@ export const GET: APIRoute = async ({ request }) => { // Send each event to the client for (const event of events) { - console.log(`Sending event: ${JSON.stringify(event.payload)}`); sendMessage(`data: ${JSON.stringify(event.payload)}\n\n`); } }