diff --git a/packages/insomnia/src/network/cancellation.ts b/packages/insomnia/src/network/cancellation.ts index dc84db9cdf..3b36c2fd23 100644 --- a/packages/insomnia/src/network/cancellation.ts +++ b/packages/insomnia/src/network/cancellation.ts @@ -1,6 +1,6 @@ import type { CurlRequestOptions } from '../main/network/libcurl-promise'; -export const cancelRequestFunctionMap = new Map void>(); +const cancelRequestFunctionMap = new Map void>(); export async function cancelRequestById(requestId: string) { window.main.completeExecutionStep({ requestId }); diff --git a/packages/insomnia/src/network/network.ts b/packages/insomnia/src/network/network.ts index 1b27130335..a1944460de 100644 --- a/packages/insomnia/src/network/network.ts +++ b/packages/insomnia/src/network/network.ts @@ -61,7 +61,6 @@ import { addSetCookiesToToughCookieJar } from './set-cookie-util'; const { isRequest } = models.request; const { isRequestGroup } = models.requestGroup; - export interface SendActionRuntime { appendTimeline: (timelinePath: string, logs: string[]) => Promise; } @@ -521,7 +520,7 @@ const tryToExecuteScript = async (context: RequestAndContextAndOptionalResponse) const fn = process.type === 'renderer' ? runScriptConcurrently - : (require(/* @vite-ignore */ './run-script') as typeof import('./run-script')).cancellableRunScript; + : (require(/* @vite-ignore */ '../script-executor') as typeof import('../script-executor')).runScript; const output = await fn({ script, context: { diff --git a/packages/insomnia/src/network/run-script.ts b/packages/insomnia/src/network/run-script.ts deleted file mode 100644 index 12da3c92a6..0000000000 --- a/packages/insomnia/src/network/run-script.ts +++ /dev/null @@ -1,33 +0,0 @@ -// Node/CLI-only module. Loaded via require(/* @vite-ignore */ './run-script') in -// network.ts so the renderer Vite build never bundles this file. -import type { RequestContext } from '../../../insomnia-scripting-environment/src/objects'; -import { runScript as nodejsRunScript } from '../script-executor'; - -import { cancelRequestFunctionMap, cancellablePromise } from './cancellation'; - -export const cancellableRunScript = async (options: { script: string; context: RequestContext }) => { - const request = options.context.request; - const requestId = request._id; - const controller = new AbortController(); - const cancelRequest = () => { - // TODO: implement cancelPreRequestScript on hiddenBrowserWindow side? - controller.abort(); - }; - cancelRequestFunctionMap.set(requestId, cancelRequest); - try { - const result = await cancellablePromise({ - signal: controller.signal, - fn: nodejsRunScript(options), - }); - - return result; - } catch (err) { - if ((err as Error).name === 'AbortError') { - throw new Error('Request was cancelled'); - } - console.log('[network] Error', err); - throw err; - } finally { - cancelRequestFunctionMap.delete(requestId); - } -};