diff --git a/src/serverCon/crud_http.js b/src/serverCon/crud_http.js index 0c1f4e6..de75afa 100644 --- a/src/serverCon/crud_http.js +++ b/src/serverCon/crud_http.js @@ -1,66 +1,56 @@ import ec from './config'; function getGraph(serverID) { - return new Promise((resolve, reject) => { - fetch(`${ec.baseURL + ec.getGraph(serverID)}`).then((x) => { - resolve(x.text()); - }).catch((e) => reject(e)); - }); + return fetch(`${ec.baseURL + ec.getGraph(serverID)}`).then((x) => x.text()); } function getGraphWithHashCheck(serverID, latestHash) { - return new Promise((resolve, reject) => { - fetch(`${ec.baseURL + ec.getGraph(serverID)}`, { - headers: { - 'X-Latest-Hash': latestHash, - }, - }).then((x) => { - if (x.status === 200) resolve(x.text()); - else reject(x.text()); - }).catch((e) => reject(e)); + return fetch(`${ec.baseURL + ec.getGraph(serverID)}`, { + headers: { + 'X-Latest-Hash': latestHash, + }, + }).then((x) => { + if (x.status === 200) return x.text(); + return Promise.reject(x.text()); }); } function postGraph(graphml) { - return new Promise((resolve, reject) => { - fetch(`${ec.baseURL + ec.postGraph}/`, { - headers: { - 'Content-Type': 'application/xml', - }, - method: 'POST', - body: graphml, - - }).then((x) => { - resolve(x.text()); - }).catch((e) => reject(e)); + return fetch(`${ec.baseURL + ec.postGraph}/`, { + headers: { + 'Content-Type': 'application/xml', + }, + method: 'POST', + body: graphml, + }).then((x) => { + if (!x.ok) return Promise.reject(x.text()); + return x.text(); }); } function updateGraph(serverID, graphml) { - return new Promise((resolve, reject) => { - fetch(ec.baseURL + ec.updateGraph(serverID), { - method: 'POST', - headers: { - 'Content-Type': 'application/xml', - }, - body: graphml, - }).then((x) => { - resolve(x.text()); - }).catch((e) => reject(e)); + return fetch(ec.baseURL + ec.updateGraph(serverID), { + method: 'POST', + headers: { + 'Content-Type': 'application/xml', + }, + body: graphml, + }).then((x) => { + if (!x.ok) return Promise.reject(x.text()); + return x.text(); }); } function forceUpdateGraph(serverID, graphml) { - return new Promise((resolve, reject) => { - fetch(ec.baseURL + ec.forceUpdateGraph(serverID), { - method: 'POST', - headers: { - 'Content-Type': 'application/xml', - }, - body: graphml, - }).then((x) => { - resolve(x.text()); - }).catch((e) => reject(e)); + return fetch(ec.baseURL + ec.forceUpdateGraph(serverID), { + method: 'POST', + headers: { + 'Content-Type': 'application/xml', + }, + body: graphml, + }).then((x) => { + if (!x.ok) return Promise.reject(x.text()); + return x.text(); }); }