Use new error type

chaiNNer-org · Jun 30, 2024 · d4db92e · d4db92e
1 parent d617791
commit d4db92e
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/src/common/Backend.ts b/src/common/Backend.ts
@@ -1,4 +1,4 @@
-import axios, { AxiosRequestConfig } from 'axios';
+import axios, { AxiosRequestConfig, Cancel } from 'axios';
 import {
     BackendJsonNode,
     Category,
@@ -133,6 +133,31 @@ export class ServerError extends Error {
         return new ServerError(json.message, json.description, json.status);
     }
 }
+export class CancelError extends Error {
+    type = 'cancel';
+
+    message: string;
+
+    config: AxiosRequestConfig | undefined;
+
+    constructor(message: string | undefined, config?: AxiosRequestConfig) {
+        super();
+        this.message = message ?? 'The request was cancelled';
+        this.config = config;
+    }
+
+    static isCancel(cancel: unknown): cancel is CancelError {
+        if (typeof cancel !== 'object' || cancel === null) {
+            return false;
+        }
+        const obj = cancel as Record<string, unknown>;
+        return typeof obj.message === 'string' && obj.type === 'cancel';
+    }
+
+    static fromCancel(cancelData: Cancel, config?: AxiosRequestConfig): CancelError {
+        return new CancelError(cancelData.message, config);
+    }
+}
 
 /**
  * A wrapper to communicate with the backend.
@@ -183,7 +208,7 @@ export class Backend {
                     return error.response.data as T;
                 }
                 if (axios.isCancel(error)) {
-                    return { type: 'success' } as T;
+                    throw CancelError.fromCancel(error, error.config);
                 }
             }
             if (ServerError.isJson(error)) {

diff --git a/src/renderer/contexts/ExecutionContext.tsx b/src/renderer/contexts/ExecutionContext.tsx
@@ -8,6 +8,7 @@ import {
     BackendEventMap,
     BackendStatusResponse,
     BackendWorkerStatusResponse,
+    CancelError,
 } from '../../common/Backend';
 import { EdgeData, NodeData, OutputId } from '../../common/common-types';
 import { formatExecutionErrorMessage } from '../../common/formatExecutionErrorMessage';
@@ -478,7 +479,10 @@ export const ExecutionProvider = memo(({ children }: React.PropsWithChildren<{}>
                 });
             }
         } catch (err: unknown) {
-            if (!(err instanceof DOMException && err.name === 'AbortError')) {
+            if (
+                !(err instanceof DOMException && err.name === 'AbortError') &&
+                !CancelError.isCancel(err)
+            ) {
                 sendAlert({
                     type: AlertType.ERROR,
                     message: `An unexpected error occurred: ${String(err)}`,