Skip to content

Commit

Permalink
Further removing of unnecessary new lines, curly brackets and white s…
Browse files Browse the repository at this point in the history
…pace, and renamed some variables
  • Loading branch information
rattletone committed Aug 3, 2019
1 parent 0a70a97 commit 5df08e1
Showing 1 changed file with 21 additions and 37 deletions.
58 changes: 21 additions & 37 deletions lib/ApiRequest.js
Expand Up @@ -2,35 +2,21 @@ const crypto = require("crypto");
const http = require("http");
const querystring = require("querystring");

function httpRequest(options, reqBody) {
function httpRequest(options, postData) {
return new Promise((resolve, reject) => {
const request = http.request(options, response => {
let resBody = "";
let data = "";

response.setEncoding("utf8");

response.on("data", data => {
resBody += data;
});

response.on("end", () => {
resolve({
statusCode: response.statusCode,
body: resBody
});
});

response.on("error", err => {
reject(err);
});
response.on("data", chunk => data += chunk);
response.on("end", () => resolve(data));
response.on("error", err => reject(err));
});

request.on("error", err => {
reject(err);
});
request.on("error", err => reject(err));

if(options.method === "POST") {
request.write(reqBody);
request.write(postData);
}

request.end();
Expand Down Expand Up @@ -127,26 +113,24 @@ class ApiRequest {
options.path += `?${query}`;
}

const request = httpRequest(options, query).then(response => {
return new Promise((resolve, reject) => {
let data;
const request = httpRequest(options, query).then(response => new Promise((resolve, reject) => {
let data;

try {
data = JSON.parse(response.body);
}
catch(err) {
reject(err);
}
try {
data = JSON.parse(response);
}
catch(err) {
reject(err);
}

if(data.error) {
reject(new Error(data.message));
if(data.error) {
reject(new Error(data.message));

return;
}
return;
}

resolve(data);
});
});
resolve(data);
}));

if(callback) {
request.then(data => callback(null, data), err => callback(err, null));
Expand Down

0 comments on commit 5df08e1

Please sign in to comment.