Fix memory leak by storing and clearing retry timer references

Author: adamsilverstein

packages/upload-media/src/store/actions.ts

@@ -218,6 +218,11 @@ export function cancelItem( id: QueueItemId, error: Error, silent = false ) {
 
 		logCancel( id, item.file.name, error );
 
+		// Clear any pending retry timer to prevent memory leaks.
+		if ( item.retryTimerId ) {
+			clearTimeout( item.retryTimerId );
+		}
+
 		item.abortController?.abort();
 
 		// Cancel any ongoing vips operations for this item.
@@ -270,6 +275,11 @@ export function retryItem( id: QueueItemId ) {
 			previousError: item.error.message,
 		} );
 
+		// Clear any pending retry timer to prevent duplicate retries.
+		if ( item.retryTimerId ) {
+			clearTimeout( item.retryTimerId );
+		}
+
 		dispatch< RetryItemAction >( {
 			type: Type.RetryItem,
 			id,
@@ -318,18 +328,19 @@ export function scheduleRetry( id: QueueItemId, error: Error ) {
 
 		logRetryScheduled( id, item.file.name, nextRetryCount, delay );
 
+		// Schedule the retry execution and capture timer ID for cleanup.
+		const retryTimerId = setTimeout( () => {
+			dispatch.executeRetry( id );
+		}, delay );
+
 		dispatch< ScheduleRetryAction >( {
 			type: Type.ScheduleRetry,
 			id,
 			error,
 			retryCount: currentRetryCount,
 			nextRetryTimestamp: Date.now() + delay,
+			retryTimerId,
 		} );
-
-		// Schedule the retry execution
-		setTimeout( () => {
-			dispatch.executeRetry( id );
-		}, delay );
 	};
 }
 

packages/upload-media/src/store/private-actions.ts

@@ -557,6 +557,11 @@ export function removeItem( id: QueueItemId ) {
 
 		logQueueRemove( id, item.file.name );
 
+		// Clear any pending retry timer to prevent memory leaks.
+		if ( item.retryTimerId ) {
+			clearTimeout( item.retryTimerId );
+		}
+
 		dispatch( {
 			type: Type.Remove,
 			id,

packages/upload-media/src/store/reducer.ts

@@ -149,6 +149,7 @@ function reducer(
 									status: ItemStatus.Processing,
 									error: undefined,
 									retryCount: ( item.retryCount ?? 0 ) + 1,
+									retryTimerId: undefined,
 							  }
 							: item
 				),
@@ -167,6 +168,7 @@ function reducer(
 									retryCount: action.retryCount,
 									nextRetryTimestamp:
 										action.nextRetryTimestamp,
+									retryTimerId: action.retryTimerId,
 							  }
 							: item
 				),

packages/upload-media/src/store/types.ts

@@ -30,6 +30,8 @@ export interface QueueItem {
 	nextRetryTimestamp?: number;
 	/** The operation that failed and needs to be retried. */
 	failedOperation?: Operation;
+	/** Timer ID for scheduled retry, used to clear the timer on cancellation. */
+	retryTimerId?: ReturnType< typeof setTimeout >;
 }
 
 export interface State {
@@ -99,6 +101,7 @@ export type ScheduleRetryAction = Action<
 		error: Error;
 		retryCount: number;
 		nextRetryTimestamp: number;
+		retryTimerId: ReturnType< typeof setTimeout >;
 	}
 >;
 export type PauseItemAction = Action< Type.PauseItem, { id: QueueItemId } >;