Skip to content

Commit 7135650

Browse files
committed
Add cancellation error handlings
1 parent 45949e1 commit 7135650

File tree

9 files changed

+23
-29
lines changed

9 files changed

+23
-29
lines changed

dist/index.js

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.mjs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { shouldUseGlobalFetchAndWebSocket } from "@discordjs/util";
88

99
// src/customNodeFetch.ts
1010
import axios from "axios";
11-
import { AbortError } from "@vladfrangu/async_event_emitter";
1211
var normalizeHeaders = /* @__PURE__ */ __name((headers) => {
1312
if (!headers) return new Headers();
1413
const result = [];
@@ -80,9 +79,9 @@ var customFetch = /* @__PURE__ */ __name(async (input, options = {}) => {
8079
}
8180
if (error.response?.data) error.response.data = tryParse(error.response.data);
8281
if (error.code === "ERR_CANCELED" || error.config?.signal?.aborted) {
83-
throw new AbortError(error.message, {
84-
...error
85-
});
82+
error.code = "ECONNRESET";
83+
error.name = "AbortError";
84+
throw error;
8685
}
8786
if (error.response) {
8887
const { status, statusText, headers, data } = error.response;

dist/index.mjs.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/web.js

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/web.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/web.mjs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
33

44
// src/customNodeFetch.ts
55
import axios from "axios";
6-
import { AbortError } from "@vladfrangu/async_event_emitter";
76
var normalizeHeaders = /* @__PURE__ */ __name((headers) => {
87
if (!headers) return new Headers();
98
const result = [];
@@ -75,9 +74,9 @@ var customFetch = /* @__PURE__ */ __name(async (input, options = {}) => {
7574
}
7675
if (error.response?.data) error.response.data = tryParse(error.response.data);
7776
if (error.code === "ERR_CANCELED" || error.config?.signal?.aborted) {
78-
throw new AbortError(error.message, {
79-
...error
80-
});
77+
error.code = "ECONNRESET";
78+
error.name = "AbortError";
79+
throw error;
8180
}
8281
if (error.response) {
8382
const { status, statusText, headers, data } = error.response;

dist/web.mjs.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/customNodeFetch.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import axios, { AxiosRequestConfig } from "axios";
22
import { HeadersInit, RequestInfo, RequestInit } from "undici";
33

4-
import { AbortError } from "@vladfrangu/async_event_emitter";
5-
64
import { ResponseLike } from "./shared";
75

86
const normalizeHeaders = (headers: Record<string, any>): HeadersInit => {
@@ -91,9 +89,9 @@ export const customFetch = async (input: RequestInfo | URL, options: RequestInit
9189
if(error.response?.data) error.response.data = tryParse(error.response.data);
9290

9391
if(error.code === "ERR_CANCELED" || error.config?.signal?.aborted) {
94-
throw new AbortError(error.message, {
95-
...error,
96-
})
92+
error.code = "ECONNRESET";
93+
error.name = "AbortError";
94+
throw error;
9795
}
9896

9997
if(error.response) {

0 commit comments

Comments
 (0)