mutate execution request because we strict compare

Author: enisdenjo

packages/runtime/src/plugins/useUpstreamRetry.ts

@@ -6,7 +6,6 @@ import {
   MaybeAsyncIterable,
 } from '@graphql-tools/utils';
 import { handleMaybePromise, MaybePromise } from '@whatwg-node/promise-helpers';
-import { GraphQLResolveInfo } from 'graphql';
 import { GatewayPlugin } from '../types';
 
 export const RETRY_SYMBOL = Symbol.for('@hive-gateway/runtime/upstreamRetry');
@@ -69,14 +68,11 @@ export function useUpstreamRetry<TContext extends Record<string, any>>(
   return {
     onSubgraphExecute({
       subgraphName,
-      executionRequest: subgraphExecutionRequest,
+      executionRequest,
       executor,
       setExecutor,
     }) {
-      const optsForReq = retryOptions({
-        subgraphName,
-        executionRequest: subgraphExecutionRequest,
-      });
+      const optsForReq = retryOptions({ subgraphName, executionRequest });
       if (optsForReq) {
         const {
           maxRetries,
@@ -106,7 +102,7 @@ export function useUpstreamRetry<TContext extends Record<string, any>>(
           },
         } = optsForReq;
         if (maxRetries > 0) {
-          setExecutor(function (executorExecutionRequest: ExecutionRequest) {
+          setExecutor(function (executionRequest: ExecutionRequest) {
             let attemptsLeft = maxRetries + 1;
             let executionResult: MaybeAsyncIterable<ExecutionResult>;
             let currRetryDelay = retryDelay;
@@ -120,30 +116,21 @@ export function useUpstreamRetry<TContext extends Record<string, any>>(
                 const requestTime = Date.now();
                 attemptsLeft--;
 
-                const attemptExecutionRequest: RetryExecutionRequest = {
-                  ...executorExecutionRequest,
-                  [RETRY_SYMBOL]: {
-                    attempt: maxRetries - attemptsLeft,
-                    executionRequest: executorExecutionRequest,
-                  },
+                // @ts-expect-error we rather mutatate the executionRequest because we strict compare it
+                executionRequest[RETRY_SYMBOL] = {
+                  attempt: maxRetries - attemptsLeft,
+                  executionRequest,
                 };
-                attemptExecutionRequest.info = {
-                  ...executorExecutionRequest.info,
-                  executionRequest: attemptExecutionRequest,
-                } as GraphQLResolveInfo;
 
                 return handleMaybePromise(
-                  () => {
-                    return executor(attemptExecutionRequest);
-                  },
+                  () => executor(executionRequest),
                   (currRes) => {
                     executionResult = currRes;
                     let retryAfterSecondsFromHeader: number | undefined;
-                    const response = executionRequestResponseMap.get(
-                      attemptExecutionRequest,
-                    );
+                    const response =
+                      executionRequestResponseMap.get(executionRequest);
                     // Remove the response from the map after used so we don't see it again
-                    executionRequestResponseMap.delete(attemptExecutionRequest);
+                    executionRequestResponseMap.delete(executionRequest);
                     const retryAfterHeader =
                       response?.headers.get('Retry-After');
                     if (retryAfterHeader) {
@@ -161,7 +148,7 @@ export function useUpstreamRetry<TContext extends Record<string, any>>(
                       currRetryDelay * retryDelayFactor;
                     if (
                       shouldRetry({
-                        executionRequest: attemptExecutionRequest,
+                        executionRequest,
                         executionResult,
                         response,
                       })