Skip to content

chore: replace all instances of q with native promise #711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
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
248 changes: 123 additions & 125 deletions lib/api_client/execute_request.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
const config = require("../config");
const https = /^http:/.test(config().upload_prefix) ? require('http') : require('https');
const querystring = require("querystring");
const Q = require('q');
const url = require('url');
const utils = require("../utils");
const ensureOption = require('../utils/ensureOption').defaults(config());
Expand All @@ -13,157 +12,156 @@ const agent = config.api_proxy ? new https.Agent(config.api_proxy) : null;

function execute_request(method, params, auth, api_url, callback, options = {}) {
method = method.toUpperCase();
const deferred = Q.defer();

let query_params, handle_response; // declare to user later
let key = auth.key;
let secret = auth.secret;
let oauth_token = auth.oauth_token;
let content_type = 'application/x-www-form-urlencoded';

if (options.content_type === 'json') {
query_params = JSON.stringify(params);
content_type = 'application/json';
} else {
query_params = querystring.stringify(params);
}

if (method === "GET") {
api_url += "?" + query_params;
}

let request_options = url.parse(api_url);
return new Promise((resolve, reject) => {
let query_params, handle_response; // declare to user later
let key = auth.key;
let secret = auth.secret;
let oauth_token = auth.oauth_token;
let content_type = 'application/x-www-form-urlencoded';

if (options.content_type === 'json') {
query_params = JSON.stringify(params);
content_type = 'application/json';
} else {
query_params = querystring.stringify(params);
}

request_options = extend(request_options, {
method: method,
headers: {
'Content-Type': content_type,
'User-Agent': utils.getUserAgent()
if (method === "GET") {
api_url += "?" + query_params;
}
});

if (oauth_token) {
request_options.headers.Authorization = `Bearer ${oauth_token}`;
} else {
request_options.auth = key + ":" + secret
}
let request_options = url.parse(api_url);

if (options.agent != null) {
request_options.agent = options.agent;
}
request_options = extend(request_options, {
method: method,
headers: {
'Content-Type': content_type,
'User-Agent': utils.getUserAgent()
}
});

let proxy = options.api_proxy || config().api_proxy;
if (!isEmpty(proxy)) {
if (!request_options.agent && agent) {
request_options.agent = agent;
} else if (!request_options.agent) {
request_options.agent = new https.Agent(proxy);
if (oauth_token) {
request_options.headers.Authorization = `Bearer ${oauth_token}`;
} else {
console.warn("Proxy is set, but request uses a custom agent, proxy is ignored.");
request_options.auth = key + ":" + secret
}
}
if (method !== "GET") {
request_options.headers['Content-Length'] = Buffer.byteLength(query_params);
}
handle_response = function (res) {
const {hide_sensitive = false} = config();
const sanitizedOptions = {...request_options};

if (hide_sensitive === true){
if ("auth" in sanitizedOptions) { delete sanitizedOptions.auth; }
if ("Authorization" in sanitizedOptions.headers) { delete sanitizedOptions.headers.Authorization; }
if (options.agent != null) {
request_options.agent = options.agent;
}

if (includes([200, 400, 401, 403, 404, 409, 420, 500], res.statusCode)) {
let buffer = "";
let error = false;
res.on("data", function (d) {
buffer += d;
return buffer;
});
res.on("end", function () {
let result;
if (error) {
return;
}
try {
result = JSON.parse(buffer);
} catch (e) {
result = {
error: {
message: "Server return invalid JSON response. Status Code " + res.statusCode
}
};
}
let proxy = options.api_proxy || config().api_proxy;
if (!isEmpty(proxy)) {
if (!request_options.agent && agent) {
request_options.agent = agent;
} else if (!request_options.agent) {
request_options.agent = new https.Agent(proxy);
} else {
console.warn("Proxy is set, but request uses a custom agent, proxy is ignored.");
}
}
if (method !== "GET") {
request_options.headers['Content-Length'] = Buffer.byteLength(query_params);
}
handle_response = function (res) {
const {hide_sensitive = false} = config();
const sanitizedOptions = {...request_options};

if (result.error) {
result.error.http_code = res.statusCode;
} else {
if (res.headers["x-featureratelimit-limit"]) {
result.rate_limit_allowed = parseInt(res.headers["x-featureratelimit-limit"]);
if (hide_sensitive === true){
if ("auth" in sanitizedOptions) { delete sanitizedOptions.auth; }
if ("Authorization" in sanitizedOptions.headers) { delete sanitizedOptions.headers.Authorization; }
}

if (includes([200, 400, 401, 403, 404, 409, 420, 500], res.statusCode)) {
let buffer = "";
let error = false;
res.on("data", function (d) {
buffer += d;
return buffer;
});
res.on("end", function () {
let result;
if (error) {
return;
}
if (res.headers["x-featureratelimit-reset"]) {
result.rate_limit_reset_at = new Date(res.headers["x-featureratelimit-reset"]);
try {
result = JSON.parse(buffer);
} catch (e) {
result = {
error: {
message: "Server return invalid JSON response. Status Code " + res.statusCode
}
};
}
if (res.headers["x-featureratelimit-remaining"]) {
result.rate_limit_remaining = parseInt(res.headers["x-featureratelimit-remaining"]);

if (result.error) {
result.error.http_code = res.statusCode;
} else {
if (res.headers["x-featureratelimit-limit"]) {
result.rate_limit_allowed = parseInt(res.headers["x-featureratelimit-limit"]);
}
if (res.headers["x-featureratelimit-reset"]) {
result.rate_limit_reset_at = new Date(res.headers["x-featureratelimit-reset"]);
}
if (res.headers["x-featureratelimit-remaining"]) {
result.rate_limit_remaining = parseInt(res.headers["x-featureratelimit-remaining"]);
}
}
}

if (result.error) {
deferred.reject(Object.assign({
request_options: sanitizedOptions,
query_params
}, result));
} else {
deferred.resolve(result);
}
if (typeof callback === "function") {
callback(result);
}
});
res.on("error", function (e) {
error = true;
if (result.error) {
reject(Object.assign({
request_options: sanitizedOptions,
query_params
}, result));
} else {
resolve(result);
}
if (typeof callback === "function") {
callback(result);
}
});
res.on("error", function (e) {
error = true;
let err_obj = {
error: {
message: e,
http_code: res.statusCode,
request_options: sanitizedOptions,
query_params
}
};
reject(err_obj.error);
if (typeof callback === "function") {
callback(err_obj);
}
});
} else {
let err_obj = {
error: {
message: e,
message: "Server returned unexpected status code - " + res.statusCode,
http_code: res.statusCode,
request_options: sanitizedOptions,
query_params
}
};
deferred.reject(err_obj.error);
reject(err_obj.error);
if (typeof callback === "function") {
callback(err_obj);
}
});
} else {
let err_obj = {
error: {
message: "Server returned unexpected status code - " + res.statusCode,
http_code: res.statusCode,
request_options: sanitizedOptions,
query_params
}
};
deferred.reject(err_obj.error);
if (typeof callback === "function") {
callback(err_obj);
}
};

const request = https.request(request_options, handle_response);
request.on("error", function (e) {
reject(e);
return typeof callback === "function" ? callback({ error: e }) : void 0;
});
request.setTimeout(ensureOption(options, "timeout", 60000));
if (method !== "GET") {
request.write(query_params);
}
};

const request = https.request(request_options, handle_response);
request.on("error", function (e) {
deferred.reject(e);
return typeof callback === "function" ? callback({ error: e }) : void 0;
});
request.setTimeout(ensureOption(options, "timeout", 60000));
if (method !== "GET") {
request.write(query_params);
}
request.end();
return deferred.promise;
request.end();
})
}

module.exports = execute_request;
Loading