rename error (#5549)

Author: n1ru4l

packages/services/cdn-worker/src/artifact-storage-reader.ts

@@ -122,74 +122,71 @@ export class ArtifactStorageReader {
         },
       })
       .catch(err => {
-        if (this.s3Mirror) {
-          // Use two AbortSignals to avoid a situation
-          // where Response.body is consumed,
-          // but the request was aborted after being resolved.
-          // When a fetch call is resolved successfully,
-          // but a shared AbortSignal.cancel() is called for two fetches,
-          // it causes an exception (can't read a response from an aborted requests)
-          // when Response.body is consumed.
-          const primaryController = new AbortController();
-          const mirrorController = new AbortController();
-
-          function abortOtherRequest(ctrl: AbortController) {
-            return (res: Response) => {
-              // abort other pending request
-              const error = new Error('Another request won the race.');
-              // change the name so we have some metrics for this on our analytics dashboard
-              error.name = 'AbortError';
-              ctrl.abort(error);
-
-              return res;
-            };
-          }
-
-          // Wait for the first successful response
-          // or reject if both requests fail
-          return Promise.any([
-            this.s3.client
-              .fetch([this.s3.endpoint, this.s3.bucketName, args.key].join('/'), {
-                method: args.method,
-                headers: args.headers,
-                aws: {
-                  signQuery: true,
-                },
-                timeout: this.timeout,
-                signal: primaryController.signal,
-                isResponseOk: response =>
-                  response.status === 200 || response.status === 304 || response.status === 404,
-                onAttempt: args1 => {
-                  args.onAttempt({
-                    ...args1,
-                    isMirror: false,
-                  });
-                },
-              })
-              .then(abortOtherRequest(mirrorController)),
-            this.s3Mirror.client
-              .fetch([this.s3Mirror.endpoint, this.s3Mirror.bucketName, args.key].join('/'), {
-                method: args.method,
-                headers: args.headers,
-                aws: {
-                  signQuery: true,
-                },
-                timeout: this.timeout,
-                signal: mirrorController.signal,
-                isResponseOk: response =>
-                  response.status === 200 || response.status === 304 || response.status === 404,
-                onAttempt: args1 => {
-                  args.onAttempt({
-                    ...args1,
-                    isMirror: true,
-                  });
-                },
-              })
-              .then(abortOtherRequest(primaryController)),
-          ]);
+        if (!this.s3Mirror) {
+          return Promise.reject(err);
+        }
+        // Use two AbortSignals to avoid a situation
+        // where Response.body is consumed,
+        // but the request was aborted after being resolved.
+        // When a fetch call is resolved successfully,
+        // but a shared AbortSignal.cancel() is called for two fetches,
+        // it causes an exception (can't read a response from an aborted requests)
+        // when Response.body is consumed.
+        const primaryController = new AbortController();
+        const mirrorController = new AbortController();
+
+        function abortOtherRequest(ctrl: AbortController) {
+          return (res: Response) => {
+            // abort other pending request
+            const error = new PendingRequestAbortedError();
+            ctrl.abort(error);
+
+            return res;
+          };
         }
 
-        return Promise.reject(err);
+        // Wait for the first successful response
+        // or reject if both requests fail
+        return Promise.any([
+          this.s3.client
+            .fetch([this.s3.endpoint, this.s3.bucketName, args.key].join('/'), {
+              method: args.method,
+              headers: args.headers,
+              aws: {
+                signQuery: true,
+              },
+              timeout: this.timeout,
+              signal: primaryController.signal,
+              isResponseOk: response =>
+                response.status === 200 || response.status === 304 || response.status === 404,
+              onAttempt: args1 => {
+                args.onAttempt({
+                  ...args1,
+                  isMirror: false,
+                });
+              },
+            })
+            .then(abortOtherRequest(mirrorController)),
+          this.s3Mirror.client
+            .fetch([this.s3Mirror.endpoint, this.s3Mirror.bucketName, args.key].join('/'), {
+              method: args.method,
+              headers: args.headers,
+              aws: {
+                signQuery: true,
+              },
+              timeout: this.timeout,
+              signal: mirrorController.signal,
+              isResponseOk: response =>
+                response.status === 200 || response.status === 304 || response.status === 404,
+              onAttempt: args1 => {
+                args.onAttempt({
+                  ...args1,
+                  isMirror: true,
+                });
+              },
+            })
+            .then(abortOtherRequest(primaryController)),
+        ]);
       });
   }
 
@@ -380,3 +377,10 @@ export class ArtifactStorageReader {
     return response;
   }
 }
+
+class PendingRequestAbortedError extends Error {
+  constructor() {
+    super('Pending request was aborted');
+    this.name = 'PendingRequestAbortedError';
+  }
+}

packages/services/cdn-worker/src/aws.ts

@@ -180,7 +180,7 @@ export class AwsClient {
           retryCounter === maximumRetryCount
         ) {
           if (init.isResponseOk && !init.isResponseOk(response)) {
-            throw new Error(`Response not okay, status: ${response.status}`);
+            throw new ResponseNotOkayError(response);
           }
 
           return response;
@@ -556,3 +556,12 @@ function anySignal(signals: Array<AbortSignal | undefined>) {
 
   return controller.signal;
 }
+
+class ResponseNotOkayError extends Error {
+  response: Response;
+
+  constructor(response: Response) {
+    super(`Response not okay, status: ${response.status}`);
+    this.response = response;
+  }
+}