rayan/bruno
1
0
Fork 0
mirror of https://github.com/usebruno/bruno.git synced 2026-06-27 06:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: bru.runRequest in collection run context

Browse Source
This commit is contained in:
lohxt1
2025-01-01 17:50:57 +05:30
parent cd722a2bd9
commit f34711c6e0
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/bruno-electron/src/ipc/network/index.js
View File

@@ -534,8 +534,12 @@ const registerNetworkIpc = (mainWindow) => {
const cancelTokenUid = uuid();
const requestUid = uuid();
const runRequestByItemPathname = async ({ itemPathname }) => {
const runRequestByItemPathname = async (relativeItemPathname) => {
return new Promise(async (resolve, reject) => {
let itemPathname = path.join(collection?.pathname, relativeItemPathname);
if (itemPathname && !itemPathname?.endsWith('.bru')) {
itemPathname = `${itemPathname}.bru`;
}
const _item = findItemInCollectionByPathname(collection, itemPathname);
if(_item) {
const res = await runRequest({ item: _item, collection, environment, runtimeVariables, runInBackground: true });
@@ -938,6 +942,21 @@ const registerNetworkIpc = (mainWindow) => {
const abortController = new AbortController();
saveCancelToken(cancelTokenUid, abortController);
const runRequestByItemPathname = async (relativeItemPathname) => {
return new Promise(async (resolve, reject) => {
let itemPathname = path.join(collection?.pathname, relativeItemPathname);
if (itemPathname && !itemPathname?.endsWith('.bru')) {
itemPathname = `${itemPathname}.bru`;
}
const _item = findItemInCollectionByPathname(collection, itemPathname);
if(_item) {
const res = await runRequest({ item: _item, collection, environment, runtimeVariables, runInBackground: true });
resolve(res);
}
reject(`bru.runRequest: invalid request path - ${itemPathname}`);
});
}
if (!folder) {
folder = collection;
}
@@ -1015,7 +1034,8 @@ const registerNetworkIpc = (mainWindow) => {
collectionUid,
runtimeVariables,
processEnvVars,
scriptingConfig
scriptingConfig,
runRequestByItemPathname
);
if (preRequestScriptResult?.nextRequestName !== undefined) {
@@ -1152,7 +1172,8 @@ const registerNetworkIpc = (mainWindow) => {
collectionUid,
runtimeVariables,
processEnvVars,
scriptingConfig
scriptingConfig,
runRequestByItemPathname
);
if (postRequestScriptResult?.nextRequestName !== undefined) {
@@ -1210,7 +1231,8 @@ const registerNetworkIpc = (mainWindow) => {
collectionPath,
onConsoleLog,
processEnvVars,
scriptingConfig
scriptingConfig,
runRequestByItemPathname
);
if (testResults?.nextRequestName !== undefined) {

2
packages/bruno-electron/src/utils/collection.js
View File

@@ -208,7 +208,7 @@ const slash = (path) => {
if (isExtendedLengthPath) {
return path;
}
return path.replace(/\\/g, '/');
return path?.replace?.(/\\/g, '/');
};
const findItemByPathname = (items = [], pathname) => {