🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Simplify
Edward Cui02c2bae5c9fa
diff --git a/server/src/api/sites/deleteSiteImport.ts b/server/src/api/sites/deleteSiteImport.tsindex 0be8e921f..12229e20f 100644--- a/server/src/api/sites/deleteSiteImport.ts+++ b/server/src/api/sites/deleteSiteImport.ts@@ -82,9 +82,10 @@ export async function deleteSiteImport(request: FastifyRequest<DeleteImportReque// Delete the import file if it exists// This is best-effort - we don't fail the entire operation if the file is already goneconst storage = getImportStorageLocation(importId, importRecord.fileName);- const deleteResult = await deleteImportFile(storage.location, storage.isR2);- if (!deleteResult.success) {- console.warn(`Failed to delete import file for ${importId}: ${deleteResult.error}`);+ try {+ await deleteImportFile(storage.location, storage.isR2);+ } catch (deleteError) {+ console.warn(`Failed to delete import file for ${importId}:`, deleteError);}return reply.send({diff --git a/server/src/services/import/utils.ts b/server/src/services/import/utils.tsindex 62bec0a42..01892bd2d 100644--- a/server/src/services/import/utils.ts+++ b/server/src/services/import/utils.ts@@ -5,11 +5,6 @@ import { createServiceLogger } from "../../lib/logger/logger.js";const logger = createServiceLogger("import:utils");-export interface DeleteFileResult {- success: boolean;- error?: string;-}-export interface StorageLocationInfo {location: string;isR2: boolean;@@ -29,25 +24,12 @@ export function getImportStorageLocation(importId: string, filename: string): St};}-/**- * Delete an import file from storage.- * Returns result instead of throwing to prevent worker crashes.- */-export const deleteImportFile = async (storageLocation: string, isR2Storage: boolean): Promise<DeleteFileResult> => {- try {- if (isR2Storage) {- await r2Storage.deleteImportFile(storageLocation);- logger.debug({ storageLocation }, "Deleted R2 file");- } else {- await unlink(storageLocation);- logger.debug({ storageLocation }, "Deleted local file");- }- return { success: true };- } catch (error) {- const errorMsg = error instanceof Error ? error.message : "Unknown error";- logger.error({ storageLocation, error: errorMsg }, "Failed to delete file");-- // DON'T throw - return error info instead to prevent worker crashes- return { success: false, error: errorMsg };+export const deleteImportFile = async (storageLocation: string, isR2Storage: boolean): Promise<void> => {+ if (isR2Storage) {+ await r2Storage.deleteImportFile(storageLocation);+ logger.debug({ storageLocation }, "Deleted R2 file");+ } else {+ await unlink(storageLocation);+ logger.debug({ storageLocation }, "Deleted local file");}};diff --git a/server/src/services/import/workers/csvParseWorker.ts b/server/src/services/import/workers/csvParseWorker.tsindex d0e8fcfad..c16c6eaa3 100644--- a/server/src/services/import/workers/csvParseWorker.ts+++ b/server/src/services/import/workers/csvParseWorker.ts@@ -181,10 +181,7 @@ export async function createCsvParseWorker(jobQueue: IJobQueue) {`${quotaSummary.monthsAtCapacity} of ${quotaSummary.totalMonthsInWindow} months are at full capacity. ` +`Try importing newer data or upgrade your plan for higher monthly quotas.`;await updateImportStatus(importId, "failed", errorMessage);- const deleteResult = await deleteImportFile(storageLocation, isR2Storage);- if (!deleteResult.success) {- logger.warn({ importId, error: deleteResult.error }, "File cleanup failed");- }+ await deleteImportFile(storageLocation, isR2Storage);return;}@@ -213,16 +210,12 @@ export async function createCsvParseWorker(jobQueue: IJobQueue) {}}- // Clean up file - log errors but don't throw to prevent worker crashestry {- const deleteResult = await deleteImportFile(storageLocation, isR2Storage);- if (!deleteResult.success) {- logger.warn({ importId, error: deleteResult.error }, "File cleanup failed, will remain in storage");- // File will be orphaned but import status is already recorded- // importCleanupService.ts handles orphans- }+ await deleteImportFile(storageLocation, isR2Storage);} catch (deleteError) {- logger.error({ importId, error: deleteError }, "Critical error during file cleanup");+ logger.warn({ importId, error: deleteError }, "File cleanup failed, will remain in storage");+ // File will be orphaned but import status is already recorded+ // importCleanupService.ts handles orphans}}});