Skip to content

Commit bfa7389

Browse files
committed
refactor(RequestHandler): Move response reject
1 parent 6adfa17 commit bfa7389

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

src/structures/RequestHandler.ts

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,16 @@ export class RequestHandler {
7070
}
7171
}
7272

73+
private _rejectResponse(response: any, rejectFunc: (e: Error) => void) {
74+
if (response.data && response.data.error) {
75+
console.error('tip.cc API request failed. Response was:');
76+
console.log(response);
77+
rejectFunc(new Error(response.data.error));
78+
} else {
79+
rejectFunc(new Error(response.data.error ?? 'Unknown error'));
80+
}
81+
}
82+
7383
/**
7484
* A shortcut for a GET request.
7585
* @param route The route to request
@@ -130,15 +140,6 @@ export class RequestHandler {
130140
.then((response) => {
131141
this._parseRateLimitHeaders(route, response.headers);
132142

133-
const rejectWithError = () => {
134-
if (response.data && response.data.error) {
135-
console.error(response);
136-
reject(new Error(response.data.error));
137-
} else {
138-
reject(new Error(response.data.error ?? 'Unknown error'));
139-
}
140-
};
141-
142143
const retryRequest = () => {
143144
if (response.headers['retry-after']) {
144145
setTimeout(() => {
@@ -147,7 +148,7 @@ export class RequestHandler {
147148
.catch(reject);
148149
}, +response.headers['retry-after']);
149150
} else {
150-
// Retry immediately if no retry-after header
151+
// Retry immediately if no retry-after header
151152
this.request(method, route, payload, requestOptions)
152153
.then(resolve)
153154
.catch(reject);
@@ -159,7 +160,7 @@ export class RequestHandler {
159160
} else if (response.status === 429) {
160161
retryRequest();
161162
} else {
162-
rejectWithError();
163+
this._rejectResponse(response, reject);
163164
}
164165
});
165166
});

0 commit comments

Comments
 (0)