rayan/bruno
1
0
Fork 0
mirror of https://github.com/usebruno/bruno.git synced 2026-07-07 22:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: response timeline

Browse Source
This commit is contained in:
Anoop M D
2023-01-18 20:55:10 +05:30
parent 2be3e4bf69
commit dd71c9e71b
11 changed files with 120 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
packages/bruno-app/src/utils/network/browser.js
View File

@@ -1,38 +0,0 @@
const axios = require('axios');
import { saveCancelToken, deleteCancelToken } from 'utils/network/cancelTokens';
export const sendHttpRequestInBrowser = async (request, options) => {
try {
if (options && options.cancelTokenUid) {
const cancelToken = axios.CancelToken.source();
request.cancelToken = cancelToken.token;
saveCancelToken(options.cancelTokenUid, cancelToken);
}
const result = await axios(request);
if (options && options.cancelTokenUid) {
deleteCancelToken(options.cancelTokenUid);
}
return {
status: result.status,
headers: result.headers,
data: result.data
};
} catch (error) {
if (options && options.cancelTokenUid) {
deleteCancelToken(options.cancelTokenUid);
}
if (error.response) {
return {
status: error.response.status,
headers: error.response.headers,
data: error.response.data
};
}
return Promise.reject(error);
}
};

38
packages/bruno-app/src/utils/network/index.js
View File

@@ -2,15 +2,12 @@ import get from 'lodash/get';
import each from 'lodash/each';
import filter from 'lodash/filter';
import qs from 'qs';
import { sendHttpRequestInBrowser } from './browser';
import { isElectron } from 'utils/common/platform';
import cancelTokens, { deleteCancelToken } from 'utils/network/cancelTokens';
export const sendNetworkRequest = async (item, options) => {
export const sendNetworkRequest = async (item, options, onRequestSent) => {
return new Promise((resolve, reject) => {
if (['http-request', 'graphql-request'].includes(item.type)) {
const timeStart = Date.now();
sendHttpRequest(item.draft ? item.draft.request : item.request, options)
sendHttpRequest(item.draft ? item.draft.request : item.request, options, onRequestSent)
.then((response) => {
const timeEnd = Date.now();
resolve({
@@ -19,6 +16,7 @@ export const sendNetworkRequest = async (item, options) => {
headers: Object.entries(response.headers),
size: response.headers['content-length'] || 0,
status: response.status,
statusText: response.statusText,
duration: timeEnd - timeStart
});
})
@@ -27,7 +25,7 @@ export const sendNetworkRequest = async (item, options) => {
});
};
const sendHttpRequest = async (request, options) => {
const sendHttpRequest = async (request, options, onRequestSent) => {
return new Promise((resolve, reject) => {
const { ipcRenderer } = window;
@@ -91,28 +89,20 @@ const sendHttpRequest = async (request, options) => {
console.log('>>> Sending Request');
console.log(axiosRequest);
if (isElectron()) {
ipcRenderer.invoke('send-http-request', axiosRequest, options).then(resolve).catch(reject);
} else {
sendHttpRequestInBrowser(axiosRequest, options).then(resolve).catch(reject);
}
onRequestSent(axiosRequest);
ipcRenderer
.invoke('send-http-request', axiosRequest, options)
.then(resolve)
.catch(reject);
});
};
export const cancelNetworkRequest = async (cancelTokenUid) => {
if (isElectron()) {
return new Promise((resolve, reject) => {
ipcRenderer.invoke('cancel-http-request', cancelTokenUid).then(resolve).catch(reject);
});
}
return new Promise((resolve, reject) => {
if (cancelTokenUid && cancelTokens[cancelTokenUid]) {
cancelTokens[cancelTokenUid].cancel();
deleteCancelToken(cancelTokenUid);
resolve();
} else {
reject(new Error('cancel token not found'));
}
ipcRenderer
.invoke('cancel-http-request', cancelTokenUid)
.then(resolve)
.catch(reject);
});
};