Skip to content
Open
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
5 changes: 2 additions & 3 deletions src/common/retryer.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,9 @@ const retryer = async (fetcher, variables, retries = 0) => {
} catch (err) {
// prettier-ignore
// also checking for bad credentials if any tokens gets invalidated
const isBadCredential = err.response.data && err.response.data.message === "Bad credentials";
const isBadCredential = err.response?.data?.message === "Bad credentials";
const isAccountSuspended =
err.response.data &&
err.response.data.message === "Sorry. Your account was suspended.";
err.response?.data?.message === "Sorry. Your account was suspended.";

if (isBadCredential || isAccountSuspended) {
logger.log(`PAT_${retries + 1} Failed`);
Expand Down
3 changes: 2 additions & 1 deletion src/fetchers/wakatime.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ const fetchWakatimeStats = async ({ username, api_domain }) => {

return data.data;
} catch (err) {
if (err.response.status < 200 || err.response.status > 299) {
const status = err.response?.status;
if (status && (status < 200 || status > 299)) {
throw new CustomError(
`Could not resolve to a User with the login of '${username}'`,
"WAKATIME_USER_NOT_FOUND",
Expand Down
45 changes: 45 additions & 0 deletions tests/retryer.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,49 @@ describe("Test Retryer", () => {
expect(err.message).toBe("Downtime due to GitHub API rate limiting");
}
});

it("retryer should handle network errors without err.response gracefully", async () => {
const fetcherNetworkError = jest.fn(() => {
const error = new Error("ECONNREFUSED");
// Simulate network error without response object
return Promise.reject(error);
});

const res = await retryer(fetcherNetworkError, {});

expect(fetcherNetworkError).toBeCalledTimes(1);
expect(res).toBeUndefined(); // err.response is undefined for network errors
});

it("retryer should retry on bad credentials error", async () => {
const fetcherBadCreds = jest.fn((_vars, _token, retries) => {
if (retries < 1) {
const error = new Error("Bad credentials");
error.response = { data: { message: "Bad credentials" } };
return Promise.reject(error);
}
return Promise.resolve({ data: "ok" });
});

const res = await retryer(fetcherBadCreds, {});

expect(fetcherBadCreds).toBeCalledTimes(2);
expect(res).toStrictEqual({ data: "ok" });
});

it("retryer should retry on account suspended error", async () => {
const fetcherSuspended = jest.fn((_vars, _token, retries) => {
if (retries < 1) {
const error = new Error("Account suspended");
error.response = { data: { message: "Sorry. Your account was suspended." } };
return Promise.reject(error);
}
return Promise.resolve({ data: "ok" });
});

const res = await retryer(fetcherSuspended, {});

expect(fetcherSuspended).toBeCalledTimes(2);
expect(res).toStrictEqual({ data: "ok" });
});
});