github/plivo-node
2
0
Fork 0
mirror of https://github.com/donl/plivo-node.git synced 2026-06-30 06:12:08 -06:00
Code Issues Projects Packages Wiki Activity Actions

Axios integration is done

Browse source
This commit is contained in:
kalyan-plivo 2020-12-17 20:56:05 +05:30 • committed by Koushik-Ayila
parent 2c60673984
commit 8ac52d04a6
2 changed files with 59 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

92
lib/rest/axios.js
View file

@ -69,45 +69,49 @@ export function Axios(config) {
}
return new Promise((resolve, reject) => {
axios(options, (error, response, body) => {
if (error) {
reject(error);
return;
}
// axios(options, (error, response, body) => {
axios(options).then(response => {
// if (error) {
// reject(error);
// return;
// }
if(isVoiceReq === true){
if (response.statusCode >= 500){
if (response.status >= 500){
options.url = apiVoiceUris[1] + config.authId + '/' + action;
if (method === 'GET' && options.formData !== '') {
let query = '?' + queryString.stringify(params);
options.url += query;
}
axios(options,(error, response) => {
if(error){
reject(error);
return;
}
if(response.statusCode>=500){
// axios(options,(error, response) => {
axios(options).then(response => {
// if(error){
// reject(error);
// return;
// }
if(response.status>=500){
options.url = apiVoiceUris[2] + config.authId + '/' + action;
if (method === 'GET' && options.formData !== '') {
let query = '?' + queryString.stringify(params);
options.url += query;
}
axios(options, (error, response) => {
if(error){
reject(error);
return;
}
// axios(options, (error, response) => {
axios(options).then(response => {
// if(error){
// reject(error);
// return;
// }
const exceptionClass = {
400: Exceptions.InvalidRequestError,
401: Exceptions.AuthenticationError,
404: Exceptions.ResourceNotFoundError,
405: Exceptions.InvalidRequestError,
500: Exceptions.ServerError,
} [response.statusCode] || Error;
} [response.status] || Error;
if (!_.inRange(response.statusCode, 200, 300)) {
body = body || response.body;
if (!_.inRange(response.status, 200, 300)) {
// body = body || response.body;
let body = response.data;
if (typeof body === 'object') {
reject(new exceptionClass(JSON.stringify(body)));
} else {
@ -115,10 +119,11 @@ export function Axios(config) {
}
}
// else {
let body = response.body;
// let body = response.body;
let body = response.data;
let isObj = typeof _body === 'object' && _body !== null && !(_body instanceof Array) && !(_body instanceof Date)
if (isObj) {
_body['statusCode'] = response.statusCode;
_body['statusCode'] = response.status;
}
resolve({
response: response,
@ -134,10 +139,11 @@ export function Axios(config) {
404: Exceptions.ResourceNotFoundError,
405: Exceptions.InvalidRequestError,
500: Exceptions.ServerError,
} [response.statusCode] || Error;
} [response.status] || Error;
if (!_.inRange(response.statusCode, 200, 300)) {
body = body || response.body;
if (!_.inRange(response.status, 200, 300)) {
// body = body || response.body;
let body = response.data;
if (typeof body === 'object') {
reject(new exceptionClass(JSON.stringify(body)));
} else {
@ -145,10 +151,11 @@ export function Axios(config) {
}
}
// else {
let body = response.body;
// let body = response.body;
let body = response.data;
let isObj = typeof _body === 'object' && _body !== null && !(_body instanceof Array) && !(_body instanceof Date)
if (isObj) {
_body['statusCode'] = response.statusCode;
_body['statusCode'] = response.status;
}
resolve({
response: response,
@ -164,10 +171,11 @@ export function Axios(config) {
404: Exceptions.ResourceNotFoundError,
405: Exceptions.InvalidRequestError,
500: Exceptions.ServerError,
} [response.statusCode] || Error;
} [response.status] || Error;
if (!_.inRange(response.statusCode, 200, 300)) {
body = body || response.body;
if (!_.inRange(response.status, 200, 300)) {
// body = body || response.body;
let body = response.data;
if (typeof body === 'object') {
reject(new exceptionClass(JSON.stringify(body)));
} else {
@ -175,10 +183,11 @@ export function Axios(config) {
}
}
// else {
let body = response.body;
// let body = response.body;
let body = response.data;
let isObj = typeof _body === 'object' && _body !== null && !(_body instanceof Array) && !(_body instanceof Date)
if (isObj) {
_body['statusCode'] = response.statusCode;
_body['statusCode'] = response.status;
}
resolve({
response: response,
@ -194,10 +203,11 @@ export function Axios(config) {
404: Exceptions.ResourceNotFoundError,
405: Exceptions.InvalidRequestError,
500: Exceptions.ServerError,
} [response.statusCode] || Error;
} [response.status] || Error;
if (!_.inRange(response.statusCode, 200, 300)) {
body = body || response.body;
if (!_.inRange(response.status, 200, 300)) {
// body = body || response.body;
let body = response.data;
if (typeof body === 'object') {
reject(new exceptionClass(JSON.stringify(body)));
} else {
@ -205,10 +215,11 @@ export function Axios(config) {
}
}
else {
let body = response.body;
// let body = response.body;
let body = response.data;
let isObj = typeof _body === 'object' && _body !== null && !(_body instanceof Array) && !(_body instanceof Date)
if (isObj) {
_body['statusCode'] = response.statusCode;
_body['statusCode'] = response.status;
}
resolve({
response: response,
@ -216,7 +227,12 @@ export function Axios(config) {
});
}
}
});
})
.catch(function (error) {
// handle error
// console.log(error);
reject(error);
})
});
};
}

10
lib/rest/client.js
View file

@ -1,6 +1,5 @@
// import { Request } from "./request.js";
// import { Axios } from "./axios.js";
import { Got } from "./got.js";
import { Axios } from "./axios.js";
import { camelCaseRequestWrapper } from "./utils";
import { name, version } from "../../package.json";
import { Phlo, PhloInterface } from "../resources/phlo";
@ -68,8 +67,8 @@ export class Client {
},
options
);
console.log(options,"12311122222222222")
let client = camelCaseRequestWrapper(Got(options));
let client = camelCaseRequestWrapper(Axios(options));
// let client = camelCaseRequestWrapper(Request(options));
this.calls = new CallInterface(client);
this.accounts = new AccountInterface(client);
@ -127,7 +126,8 @@ export class PhloClient {
options
);
let client = camelCaseRequestWrapper(Got(options));
let client = camelCaseRequestWrapper(Axios(options));
// let client = camelCaseRequestWrapper(Request(options));
this.phlo = function(phloId) {
let dd = new Phlo(client, { phloId: phloId, authId: authId });