Skip to content

Commit e992eb8

Browse files
committed
replaced request library with axios library
1 parent 4efccbd commit e992eb8

File tree

7 files changed

+232
-827
lines changed

7 files changed

+232
-827
lines changed

commands/utils/batch/batch_runner.js

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ const process = require("process");
77
const archive = require("../archive.js");
88
const WebSocket = require("ws");
99
const { type } = require("os");
10-
const request = require("request");
11-
const { del } = require("request");
1210
const { delete_archive } = require("../archive.js");
1311
const poller = require("../poller/poller.js");
1412
const builds = require("../poller/build");
1513
const batcher = require("./batcher.js");
1614
const reports = require("../../../commands/generate_reports.js");
1715
const { fail } = require("yargs");
16+
const https = require('https');
17+
const axios = require('axios');
1818

1919
var batchCounter = 0;
2020
var totalBatches = 0;
@@ -23,30 +23,18 @@ function run_test(payload, env = "prod", rejectUnauthorized) {
2323
return new Promise(function (resolve, reject) {
2424
let options = {
2525
url: constants[env].INTEGRATION_BASE_URL + constants.RUN_URL,
26-
body: payload,
26+
data: payload,
2727
};
2828
if (rejectUnauthorized == false) {
29-
options["rejectUnauthorized"] = false;
29+
options.httpsAgent = new https.Agent({ rejectUnauthorized: false });
3030
}
3131
let responseData = null;
32-
request.post(options, function (err, resp, body) {
33-
if (err) {
34-
reject(err);
35-
} else {
36-
try {
37-
responseData = JSON.parse(body);
38-
} catch (e) {
39-
console.log("Error in JSON response", body);
40-
responseData = null;
41-
}
42-
if (resp.statusCode != 200) {
43-
if (responseData && responseData["error"]) {
44-
reject(responseData["error"]);
45-
} else {
46-
reject(responseData);
47-
}
48-
} else {
49-
build_id = responseData["value"]["message"]
32+
33+
axios.post(options.url, options.data, options)
34+
.then(response => {
35+
responseData = response.data;
36+
// console.log(response);
37+
build_id = responseData["value"]["message"]
5038
.split("=")
5139
[responseData["value"]["message"].split("=").length - 1].split(
5240
"&"
@@ -79,9 +67,30 @@ function run_test(payload, env = "prod", rejectUnauthorized) {
7967
}
8068
resolve(session_id);
8169
}
70+
})
71+
.catch(error => {
72+
if (error.response) {
73+
// The request was made and the server responded with a status code
74+
// that falls out of the range of 2xx
75+
if (error.response.status != 200) {
76+
if (error.response && error.response.data) {
77+
reject(error.response.data);
78+
} else {
79+
reject(error.response);
80+
}
81+
} else {
82+
reject(error.response);
8283
}
84+
} else if (error.request) {
85+
// The request was made but no response was received
86+
// `error.request` is an instance of XMLHttpRequest in the browser and an instance of
87+
// http.ClientRequest in node.js
88+
reject(error.cause);
89+
} else {
90+
reject(error);
8391
}
84-
});
92+
})
93+
8594
});
8695
}
8796

commands/utils/poller/build.js

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const constants = require("../constants");
2-
const request = require("request");
2+
const https = require('https');
3+
const axios = require('axios');
34
//https://api.cypress-v3.dev.lambdatest.io/api/v1/test/stop/?sessionId=4a7434b9-1905-4aaf-a178-9167acb00c5d
45
function stop_cypress_session(lt_config, session_id, env) {
56
return new Promise(function (resolve, reject) {
@@ -12,25 +13,38 @@ function stop_cypress_session(lt_config, session_id, env) {
1213
method: "PUT",
1314
};
1415
if (lt_config.run_settings.reject_unauthorized == false) {
15-
options["rejectUnauthorized"] = false;
16+
options.httpsAgent = new https.Agent({ rejectUnauthorized: false });
1617
}
1718

18-
request.put(options, (err, res, body) => {
19-
if (err) {
20-
console.log("Error occured while stopping session", err);
21-
reject(err);
22-
}
23-
if (res.statusCode == "401") {
24-
console.log("Error Occured: Unauthorized access to session-stop");
25-
reject("Unauthorized");
26-
} else if (res.statusCode == "200") {
27-
console.log("Session stopped successfully");
28-
resolve(JSON.parse(body));
19+
axios(options)
20+
.then(response => {
21+
console.log("Session stopped successfully");
22+
resolve(response.data);
23+
})
24+
.catch(error => {
25+
if (error.response) {
26+
// The request was made and the server responded with a status code
27+
// that falls out of the range of 2xx
28+
if (error.response.status == 401) {
29+
console.log("Error Occured: Unauthorized access to session-stop");
30+
reject("Unauthorized");
31+
} else {
32+
console.log("Error Occured: ",error.response.data);
33+
reject("No response for session stop");
34+
}
35+
} else if (error.request) {
36+
// The request was made but no response was received
37+
// `error.request` is an instance of XMLHttpRequest in the browser and an instance of
38+
// http.ClientRequest in node.js
39+
console.log("Error occured while stopping session", error.cause);
40+
reject(error.cause);
2941
} else {
30-
console.log(body);
31-
reject("No response for session stop");
42+
console.log("Error occured while stopping session", error);
43+
reject(error);
3244
}
33-
});
45+
})
46+
47+
3448
});
3549
}
3650

0 commit comments

Comments
 (0)