Skip to content

Commit

Permalink
refactor: error handling logic
Browse files Browse the repository at this point in the history
- Introduce `UnError` class to unify error handling
- Replace existing error handling methods with `UnError` to encapsulate error information
- Optimize code structure to improve consistency and readability of error handling
  • Loading branch information
peerless-hero committed Dec 1, 2024
1 parent 1146aa3 commit 6cddc6a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 19 deletions.
7 changes: 2 additions & 5 deletions packages/core/src/adapters/download.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import statuses from "statuses-es";
import type { UnCancelTokenListener } from "../core/UnCancelToken";
import { UnCanceledError } from "../core/UnCanceledError";
import { UnError } from "../core/UnError";
import { settle } from "../core/settle";
import type { UnConfig, UnData, UnResponse } from "../types";
import { buildDownloadConfig } from "../utils";
Expand Down Expand Up @@ -63,11 +64,7 @@ export const downloadAdapter = <T = UnData, D = UnData>(
};
},
fail: (err) => {
response = {
...response,
errMsg: err?.errMsg ?? err?.errmsg ?? err?.msg ?? err?.message,
errno: err?.errno,
};
reject(new UnError(err.errMsg, UnError.ERR_NETWORK, config, task));
},
complete: () => {
if (onHeadersReceived) {
Expand Down
9 changes: 2 additions & 7 deletions packages/core/src/adapters/request.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import statuses from "statuses-es";
import type { UnCancelTokenListener } from "../core/UnCancelToken";
import { UnCanceledError } from "../core/UnCanceledError";
import { UnError } from "../core/UnError";
import { settle } from "../core/settle";
import type { UnConfig, UnData, UnResponse } from "../types";
import { buildRequestConfig } from "../utils";
Expand Down Expand Up @@ -52,13 +53,7 @@ export const requestAdapter = <T = UnData, D = UnData>(
};
},
fail: (err) => {
response = {
...response,
// @ts-expect-error no types
errMsg: err?.errMsg ?? err?.errmsg ?? err?.msg ?? err?.message,
// @ts-expect-error no types
errno: err?.errno,
};
reject(new UnError(err.errMsg, UnError.ERR_NETWORK, config, task));
},
complete: () => {
if (onHeadersReceived) {
Expand Down
9 changes: 2 additions & 7 deletions packages/core/src/adapters/upload.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import statuses from "statuses-es";
import type { UnCancelTokenListener } from "../core/UnCancelToken";
import { UnCanceledError } from "../core/UnCanceledError";
import { UnError } from "../core/UnError";
import { settle } from "../core/settle";
import type { UnConfig, UnData, UnResponse } from "../types";
import { buildUploadConfig } from "../utils";
Expand Down Expand Up @@ -55,13 +56,7 @@ export const uploadAdapter = <T = UnData, D = UnData>(config: UnConfig<T, D>) =>
};
},
fail: (err) => {
response = {
...response,
// @ts-expect-error no types
errMsg: err?.errMsg ?? err?.errmsg ?? err?.msg ?? err?.message,
// @ts-expect-error no types
errno: err?.errno,
};
reject(new UnError(err.errMsg, UnError.ERR_NETWORK, config, task));
},
complete: () => {
if (onHeadersReceived) {
Expand Down

0 comments on commit 6cddc6a

Please sign in to comment.