Skip to content
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
9 changes: 9 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"homepage": "https://github.com/octokit/request.js#readme",
"dependencies": {
"@octokit/endpoint": "^5.1.0",
"@octokit/request-error": "^1.0.1",
"deprecation": "^2.0.0",
"is-plain-object": "^3.0.0",
"node-fetch": "^2.3.0",
Expand Down
30 changes: 16 additions & 14 deletions src/fetch-wrapper.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import isPlainObject from "is-plain-object";
import nodeFetch from "node-fetch";
import { RequestError } from "@octokit/request-error";

import getBuffer from "./get-buffer-response";
import HttpError from "./http-error";
import { endpoint } from "./types";

export default function fetchWrapper(
Expand Down Expand Up @@ -52,29 +52,28 @@ export default function fetchWrapper(
return;
}

throw new HttpError(
response.statusText,
status,
throw new RequestError(response.statusText, status, {
headers,
requestOptions
);
request: requestOptions
});
}

if (status === 304) {
throw new HttpError("Not modified", status, headers, requestOptions);
throw new RequestError("Not modified", status, {
headers,
request: requestOptions
});
}

if (status >= 400) {
return response
.text()

.then(message => {
const error = new HttpError(
message,
status,
const error = new RequestError(message, status, {
headers,
requestOptions
);
request: requestOptions
});

try {
Object.assign(error, JSON.parse(error.message));
Expand Down Expand Up @@ -108,10 +107,13 @@ export default function fetchWrapper(
})

.catch(error => {
if (error instanceof HttpError) {
if (error instanceof RequestError) {
throw error;
}

throw new HttpError(error.message, 500, headers, requestOptions);
throw new RequestError(error.message, 500, {
headers,
request: requestOptions
});
});
}
61 changes: 0 additions & 61 deletions src/http-error.ts

This file was deleted.

24 changes: 0 additions & 24 deletions test/request.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -425,30 +425,6 @@ describe("request()", () => {
);
});
});

it("error.code (deprecated)", () => {
const mock = fetchMock.sandbox().get("path:/orgs/nope", 404);

const consoleWarn = console.warn;
let warnCalled = 0;
console.warn = () => warnCalled++;
return request("GET /orgs/:org", {
org: "nope",
request: {
fetch: mock
}
})
.then(() => {
throw new Error("should not resolve");
})

.catch(error => {
expect(error.code).toEqual(404);
expect(warnCalled).toEqual(1);
console.warn = consoleWarn;
});
});

it("Just URL", () => {
const mock = fetchMock.sandbox().get("path:/", 200);

Expand Down