clean

Author: lishine

workers/src/durable.ts

@@ -33,7 +33,7 @@ export class FlightDO extends DurableObject<Env, DOProps> {
 	private resetCache() {
 		Object.assign(this.ctx.props, {
 			cache: {},
-			debug: false
+			debug: false,
 		})
 	}
 
@@ -107,32 +107,18 @@ export class FlightDO extends DurableObject<Env, DOProps> {
 	 */
 	async alarm(): Promise<void> {
 		this.resetCache() // Reset at start of each alarm
-		const alarmId = Math.random().toString(36).substring(7)
 		const currentCount = this.getAlarmCount()
 		const newCount = currentCount + 1
-		
-		// Check if there's already an alarm scheduled (potential race condition)
-		const existingAlarm = await this.ctx.storage.getAlarm()
-		let alarmMessage = `⏰ [ALARM-${alarmId}] Alarm fired! Previous count: ${currentCount}, New count: ${newCount}\nCurrent time: ${new Date().toISOString()}`
-		
-		if (existingAlarm) {
-			alarmMessage += `\n⚠️ WARNING: Existing alarm found at ${new Date(existingAlarm).toISOString()}`
-		}
-		
-		await sendAdmin(alarmMessage, this.env, this.ctx)
 
 		runScheduledJob(this.env, this.ctx)
 
 		this.setAlarmCount(newCount)
 
 		const period = CRON_PERIOD_SECONDS * 1000
 		const nextAlarmTime = Date.now() + period
-		await sendAdmin(`⏰ [ALARM-${alarmId}] Setting next alarm for ${period}ms from now (${new Date(nextAlarmTime).toISOString()})`, this.env, this.ctx)
 		await this.ctx.storage.setAlarm(nextAlarmTime)
-		await sendAdmin(`✅ [ALARM-${alarmId}] Alarm completed`, this.env, this.ctx)
 	}
 
-
 	/**
 	 * Example method using SQLite-backed SQL API (official API)
 	 * Demonstrates proper SQL query execution

workers/src/handlers/alerts.ts

@@ -7,37 +7,26 @@ export const sendFlightAlerts = async (
 	env: Env,
 	ctx: DurableObjectState<DOProps>
 ) => {
-	const alertId = Math.random().toString(36).substring(7)
-	
-	const subsResult = ctx.storage.sql.exec(
-		'SELECT flight_id, telegram_id FROM subscriptions'
-	)
+	const subsResult = ctx.storage.sql.exec('SELECT flight_id, telegram_id FROM subscriptions')
 	const allSubs = subsResult.toArray() as { flight_id: string; telegram_id: string }[]
-	
-	// Check for duplicate subscriptions
+
 	const subscriptionMap = new Map<string, Set<string>>()
 	for (const sub of allSubs) {
 		if (!subscriptionMap.has(sub.flight_id)) {
 			subscriptionMap.set(sub.flight_id, new Set())
 		}
 		subscriptionMap.get(sub.flight_id)!.add(sub.telegram_id)
 	}
-	
+
 	let duplicateCount = 0
 	const duplicates: string[] = []
 	for (const [flightId, subscribers] of subscriptionMap) {
-		const subs = allSubs.filter(s => s.flight_id === flightId)
+		const subs = allSubs.filter((s) => s.flight_id === flightId)
 		if (subs.length !== subscribers.size) {
 			duplicateCount += subs.length - subscribers.size
 			duplicates.push(flightId)
 		}
 	}
-	
-	await sendAdmin(
-		`🚨 [ALERT-${alertId}] Starting to send flight alerts for ${Object.keys(changesByFlight).length} flights\nFound ${allSubs.length} total subscriptions${duplicateCount > 0 ? ` (${duplicateCount} duplicates for flights: ${duplicates.join(', ')})` : ''}`,
-		env,
-		ctx
-	)
 
 	const trackingMap: Record<string, string[]> = {} // flight_id -> users
 
@@ -51,31 +40,11 @@ export const sendFlightAlerts = async (
 		const subscribers = trackingMap[flightChange.flight.id]
 
 		if (subscribers && subscribers.length > 0) {
-			await sendAdmin(
-				`🚨 [ALERT-${alertId}] Flight ${flightChange.flight.flight_number} (${flightId}) changes:\n${flightChange.changes.join(', ')}\nSubscribers: ${subscribers.join(', ')}`,
-				env,
-				ctx
-			)
-
-			// Send alerts to all subscribers
 			for (const telegram_id of subscribers) {
 				await sendAlert(Number(telegram_id), flightChange.flight, flightChange.changes, env)
-				await sendAdmin(
-					`📤 [ALERT-${alertId}] Sent alert to user ${telegram_id} for flight ${flightChange.flight.flight_number}`,
-					env,
-					ctx
-				)
 			}
-		} else {
-			await sendAdmin(
-				`⚠️ [ALERT-${alertId}] No subscribers found for flight ${flightChange.flight.flight_number} (${flightId})`,
-				env,
-				ctx
-			)
 		}
 	}
-	
-	await sendAdmin(`✅ [ALERT-${alertId}] Alert sending completed`, env, ctx)
 }
 
 const sendAlert = async (userId: number, flight: Flight, changes: string[], env: Env) => {

workers/src/handlers/commands.ts

@@ -23,7 +23,6 @@ export const isTextMessage = (message: Message) => {
 	return 'text' in message
 }
 
-// Shared function to build status message - eliminates code duplication
 const buildStatusMessage = async (env: Env, ctx: DurableObjectState<DOProps>) => {
 	const version = (await env.METADATA.get('version')) || 'Unknown'
 	const lastDeployDate = (await env.METADATA.get('last_deploy_date')) || 'Unknown'
@@ -82,7 +81,6 @@ export const handleCommand = async (request: Request, env: Env, ctx: DurableObje
 	if ('callback_query' in update && update.callback_query) {
 		const callbackQuery = update.callback_query
 		if (!callbackQuery.message) {
-			// Try to answer the callback query but handle the case where the message is too old
 			try {
 				await ofetch(`${getTelegramUrl(env)}/answerCallbackQuery`, {
 					method: 'POST',
@@ -329,20 +327,10 @@ export const handleCommand = async (request: Request, env: Env, ctx: DurableObje
 				],
 			}
 		} else if (data === 'show_suggestions') {
-			// Reset pagination cursor when showing suggestions fresh
 			ctx.storage.kv.put(`pagination_cursor_${chatId}`, '0')
 
 			const eligibleFlights = getNotTrackedFlightsFromStatus(chatId, ctx)
 
-			// SEND DEBUG MESSAGE TO YOUR CHAT
-			//await sendAdmin(
-			//	`🐛 DEBUG INFO:\n` +
-			//	`Total eligible flights: ${eligibleFlights.length}\n` +
-			//`Will show Next button: ${eligibleFlights.length > 5 ? '✅ YES' : '❌ NO'}\n` +
-			//`Showing flights: 1-${Math.min(5, eligibleFlights.length)}`,
-			//env
-			//)
-
 			const { text, replyMarkup: suggestionsMarkup } = formatFlightSuggestions(
 				eligibleFlights.slice(0, 5),
 				0,

workers/src/handlers/cron.ts

@@ -16,36 +16,21 @@ import { getCurrentIdtTime } from '../utils/dateTime'
 
 export const runScheduledJob = async (env: Env, ctx: DurableObjectState<DOProps>) => {
 	const jobId = Math.random().toString(36).substring(7)
-	
+
 	try {
 		initializeSchema(ctx)
 
-		// Fetch new data from API
 		const currentFlights = await fetchLatestFlights(env, ctx)
-		await sendAdmin(`🔍 [JOB-${jobId}] Fetched ${currentFlights.length} current flights`, env, ctx)
-
 		writeStatusData(ctx, currentFlights.length)
 
 		const previousFlights = getCurrentFlightsFromStatus(ctx)
-		await sendAdmin(`🔍 [JOB-${jobId}] Retrieved ${previousFlights.length} previous flights`, env, ctx)
-
-		// 2. Store current flights as JSON (single SQLite write!)
 		storeFlightsInStatus(currentFlights, ctx)
-		await sendAdmin(`🔍 [JOB-${jobId}] Stored current flights to status`, env, ctx)
-
-		await sendAdmin(
-			`🔍 [JOB-${jobId}] Comparing ${currentFlights.length} current flights with ${previousFlights.length} previous flights`,
-			env,
-			ctx
-		)
 
-		// 3. Get subscribed flight IDs to filter change detection
 		const subscribedResult = ctx.storage.sql.exec('SELECT DISTINCT flight_id FROM subscriptions')
 		const subscribedFlightIds = new Set(
 			subscribedResult.toArray().map((row) => (row as { flight_id: string }).flight_id)
 		)
 
-		// 4. Build change maps (only for subscribed flights to reduce noise)
 		const previousFlightsMap = Object.fromEntries(
 			previousFlights.filter((f) => subscribedFlightIds.has(f.id)).map((f) => [f.id, f])
 		) as Record<string, Flight>
@@ -69,21 +54,14 @@ export const runScheduledJob = async (env: Env, ctx: DurableObjectState<DOProps>
 			}
 		}
 
-		// Send alerts if there are changes
 		if (Object.keys(changesByFlight).length > 0) {
 			let changeMessage = `🔍 [JOB-${jobId}] Changes detected for ${Object.keys(changesByFlight).length} flights:\n`
 			for (const [flightId, change] of Object.entries(changesByFlight)) {
 				changeMessage += `• Flight ${flightId}: ${change.changes.join(', ')}\n`
 			}
-			await sendAdmin(changeMessage, env, ctx)
-			
 			await sendFlightAlerts(changesByFlight, env, ctx)
-			await sendAdmin(`🔍 [JOB-${jobId}] Alerts sent for ${Object.keys(changesByFlight).length} flights`, env, ctx)
-		} else {
-			await sendAdmin(`🔍 [JOB-${jobId}] No changes detected`, env, ctx)
 		}
 
-		// Clean up completed flights every 10 minutes
 		const lastCleanupResult = ctx.storage.sql.exec("SELECT value FROM status WHERE key = 'last_cleanup_time'")
 		const lastCleanupRow = lastCleanupResult.toArray()[0] as { value: string } | undefined
 		const lastCleanupTime = lastCleanupRow ? parseInt(lastCleanupRow.value) : 0
@@ -94,17 +72,14 @@ export const runScheduledJob = async (env: Env, ctx: DurableObjectState<DOProps>
 			console.log('Running cleanup (10 minute interval)')
 			cleanupCompletedFlightsFromStatus(env, ctx)
 
-			// Update last cleanup time
 			ctx.storage.sql.exec(
 				"INSERT INTO status (key, value) VALUES ('last_cleanup_time', ?) ON CONFLICT(key) DO UPDATE SET value = EXCLUDED.value",
 				now.toString()
 			)
 		}
 
-		await sendAdmin(`✅ [JOB-${jobId}] Job completed successfully`, env, ctx)
 		return new Response('Cron job completed')
 	} catch (error) {
-		await sendAdmin(`❌ [JOB-${jobId}] Cron job failed: ${error instanceof Error ? error.message : 'Unknown error'}`, env, ctx, 'log')
 		writeErrorStatus(ctx, error instanceof Error ? error : 'Unknown error')
 		return new Response('Cron job failed', { status: 500 })
 	}