Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix canceling regression #2967

Merged
merged 8 commits into from
Jun 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion src/common/Backend.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import axios, { AxiosRequestConfig } from 'axios';
import axios, { AxiosRequestConfig, Cancel } from 'axios';
import {
BackendJsonNode,
Category,
Expand All @@ -17,6 +17,7 @@ import {
SchemaId,
Version,
} from './common-types';
import { assertNever } from './util';

export interface BackendSuccessResponse {
type: 'success';
Expand Down Expand Up @@ -133,6 +134,21 @@ export class ServerError extends Error {
return new ServerError(json.message, json.description, json.status);
}
}
export class CancelError extends Error {
message: string;

config: AxiosRequestConfig | undefined;

constructor(message: string | undefined, config?: AxiosRequestConfig) {
super();
this.message = message ?? 'The request was cancelled';
this.config = config;
}

static fromCancel(cancelData: Cancel, config?: AxiosRequestConfig): CancelError {
return new CancelError(cancelData.message, config);
}
}

/**
* A wrapper to communicate with the backend.
Expand Down Expand Up @@ -182,6 +198,10 @@ export class Backend {
if (error.response?.data) {
return error.response.data as T;
}
if (axios.isCancel(error)) {
throw CancelError.fromCancel(error, error.config);
}
assertNever(error);
}
if (ServerError.isJson(error)) {
throw ServerError.fromJson(error);
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/contexts/ExecutionContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -478,7 +479,7 @@ export const ExecutionProvider = memo(({ children }: React.PropsWithChildren<{}>
});
}
} catch (err: unknown) {
if (!(err instanceof DOMException && err.name === 'AbortError')) {
if (!(err instanceof CancelError)) {
sendAlert({
type: AlertType.ERROR,
message: `An unexpected error occurred: ${String(err)}`,
Expand Down
Loading