Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.
TypeScript automationchromechromiume2e-testingelectronend-to-end-testingfirefoxjavascriptplaywrighttesttest-automationtestingtesting-toolswebwebkit
chore: replace more cleanupWhenAborted calls with try/catch (#36833)
Dmitry Gozman3318fa9371d9
diff --git a/packages/playwright-core/src/server/chromium/crDragDrop.ts b/packages/playwright-core/src/server/chromium/crDragDrop.tsindex b54fe50f3f..893968917a 100644--- a/packages/playwright-core/src/server/chromium/crDragDrop.ts+++ b/packages/playwright-core/src/server/chromium/crDragDrop.ts@@ -91,26 +91,26 @@ export class DragManager {};}- await this._crPage._page.safeNonStallingEvaluateInAllFrames(`(${setupDragListeners.toString()})()`, 'utility');- progress.cleanupWhenAborted(() => this._crPage._page.safeNonStallingEvaluateInAllFrames('window.__cleanupDrag && window.__cleanupDrag()', 'utility'));-- client.on('Input.dragIntercepted', onDragIntercepted!);try {+ let expectingDrag = false;+ await progress.race(this._crPage._page.safeNonStallingEvaluateInAllFrames(`(${setupDragListeners.toString()})()`, 'utility'));+ client.on('Input.dragIntercepted', onDragIntercepted!);await client.send('Input.setInterceptDrags', { enabled: true });- } catch {- // If Input.setInterceptDrags is not supported, just do a regular move.- // This can be removed once we stop supporting old Electron.- client.off('Input.dragIntercepted', onDragIntercepted!);- return moveCallback();+ try {+ await progress.race(moveCallback());+ expectingDrag = (await Promise.all(this._crPage._page.frames().map(async frame => {+ return frame.nonStallingEvaluateInExistingContext('window.__cleanupDrag?.()', 'utility').catch(() => false);+ }))).some(x => x);+ } finally {+ client.off('Input.dragIntercepted', onDragIntercepted!);+ await client.send('Input.setInterceptDrags', { enabled: false });+ }+ this._dragState = expectingDrag ? (await dragInterceptedPromise).data : null;+ } catch (error) {+ // Cleanup without blocking, it will be done before the next playwright action.+ this._crPage._page.safeNonStallingEvaluateInAllFrames('window.__cleanupDrag?.()', 'utility').catch(() => {});+ throw error;}- await moveCallback();-- const expectingDrag = (await Promise.all(this._crPage._page.frames().map(async frame => {- return frame.nonStallingEvaluateInExistingContext('window.__cleanupDrag && window.__cleanupDrag()', 'utility').catch(() => false);- }))).some(x => x);- this._dragState = expectingDrag ? (await dragInterceptedPromise).data : null;- client.off('Input.dragIntercepted', onDragIntercepted!);- await progress.race(client.send('Input.setInterceptDrags', { enabled: false }));if (this._dragState) {await progress.race(this._crPage._mainFrameSession._client.send('Input.dispatchDragEvent', {diff --git a/packages/playwright-core/src/server/electron/electron.ts b/packages/playwright-core/src/server/electron/electron.tsindex d88d61645c..efe830935c 100644--- a/packages/playwright-core/src/server/electron/electron.ts+++ b/packages/playwright-core/src/server/electron/electron.ts@@ -19,7 +19,7 @@ import os from 'os';import path from 'path';import * as readline from 'readline';-import { ManualPromise, removeFolders } from '../../utils';+import { ManualPromise } from '../../utils';import { wrapInASCIIBox } from '../utils/ascii';import { RecentLogsCollector } from '../utils/debugLogger';import { eventsHelper } from '../utils/eventsHelper';@@ -166,8 +166,6 @@ export class Electron extends SdkObject {}const artifactsDir = await progress.race(fs.promises.mkdtemp(ARTIFACTS_FOLDER));- progress.cleanupWhenAborted(() => removeFolders([artifactsDir]));-const browserLogsCollector = new RecentLogsCollector();const env = options.env ? envArrayToObject(options.env) : process.env;@@ -243,76 +241,76 @@ export class Electron extends SdkObject {const chromeMatchPromise = waitForLine(progress, launchedProcess, /^DevTools listening on (ws:\/\/.*)$/);const debuggerDisconnectPromise = waitForLine(progress, launchedProcess, /Waiting for the debugger to disconnect\.\.\./);- const nodeMatch = await nodeMatchPromise;- const nodeTransport = await WebSocketTransport.connect(progress, nodeMatch[1]);- progress.cleanupWhenAborted(() => nodeTransport.close());- const nodeConnection = new CRConnection(this, nodeTransport, helper.debugProtocolLogger(), browserLogsCollector);+ try {+ const nodeMatch = await nodeMatchPromise;+ const nodeTransport = await WebSocketTransport.connect(progress, nodeMatch[1]);+ const nodeConnection = new CRConnection(this, nodeTransport, helper.debugProtocolLogger(), browserLogsCollector);+ // Immediately release exiting process under debug.+ debuggerDisconnectPromise.then(() => {+ nodeTransport.close();+ }).catch(() => {});- // Immediately release exiting process under debug.- debuggerDisconnectPromise.then(() => {- nodeTransport.close();- }).catch(() => {});- const chromeMatch = await Promise.race([- chromeMatchPromise,- waitForXserverError,- ]) as RegExpMatchArray;- const chromeTransport = await WebSocketTransport.connect(progress, chromeMatch[1]);- progress.cleanupWhenAborted(() => chromeTransport.close());- const browserProcess: BrowserProcess = {- onclose: undefined,- process: launchedProcess,- close: gracefullyClose,- kill- };- const contextOptions: types.BrowserContextOptions = {- ...options,- noDefaultViewport: true,- };- const browserOptions: BrowserOptions = {- name: 'electron',- isChromium: true,- headful: true,- persistent: contextOptions,- browserProcess,- protocolLogger: helper.debugProtocolLogger(),- browserLogsCollector,- artifactsDir,- downloadsPath: artifactsDir,- tracesDir: options.tracesDir || artifactsDir,- originalLaunchOptions: {},- };- validateBrowserContextOptions(contextOptions, browserOptions);- const browser = await progress.race(CRBrowser.connect(this.attribution.playwright, chromeTransport, browserOptions));- app = new ElectronApplication(this, browser, nodeConnection, launchedProcess);- await progress.race(app.initialize());- return app;+ const chromeMatch = await Promise.race([+ chromeMatchPromise,+ waitForXserverError,+ ]);+ const chromeTransport = await WebSocketTransport.connect(progress, chromeMatch[1]);+ const browserProcess: BrowserProcess = {+ onclose: undefined,+ process: launchedProcess,+ close: gracefullyClose,+ kill+ };+ const contextOptions: types.BrowserContextOptions = {+ ...options,+ noDefaultViewport: true,+ };+ const browserOptions: BrowserOptions = {+ name: 'electron',+ isChromium: true,+ headful: true,+ persistent: contextOptions,+ browserProcess,+ protocolLogger: helper.debugProtocolLogger(),+ browserLogsCollector,+ artifactsDir,+ downloadsPath: artifactsDir,+ tracesDir: options.tracesDir || artifactsDir,+ originalLaunchOptions: {},+ };+ validateBrowserContextOptions(contextOptions, browserOptions);+ const browser = await progress.race(CRBrowser.connect(this.attribution.playwright, chromeTransport, browserOptions));+ app = new ElectronApplication(this, browser, nodeConnection, launchedProcess);+ await progress.race(app.initialize());+ return app;+ } catch (error) {+ await kill();+ throw error;+ }}}-function waitForLine(progress: Progress, process: childProcess.ChildProcess, regex: RegExp): Promise<RegExpMatchArray> {- return progress.race(new Promise((resolve, reject) => {- const rl = readline.createInterface({ input: process.stderr! });- const failError = new Error('Process failed to launch!');- const listeners = [- eventsHelper.addEventListener(rl, 'line', onLine),- eventsHelper.addEventListener(rl, 'close', reject.bind(null, failError)),- eventsHelper.addEventListener(process, 'exit', reject.bind(null, failError)),- // It is Ok to remove error handler because we did not create process and there is another listener.- eventsHelper.addEventListener(process, 'error', reject.bind(null, failError))- ];+async function waitForLine(progress: Progress, process: childProcess.ChildProcess, regex: RegExp) {+ const promise = new ManualPromise<RegExpMatchArray>();+ const rl = readline.createInterface({ input: process.stderr! });+ const failError = new Error('Process failed to launch!');+ const listeners = [+ eventsHelper.addEventListener(rl, 'line', onLine),+ eventsHelper.addEventListener(rl, 'close', () => promise.reject(failError)),+ eventsHelper.addEventListener(process, 'exit', () => promise.reject(failError)),+ // It is Ok to remove error handler because we did not create process and there is another listener.+ eventsHelper.addEventListener(process, 'error', () => promise.reject(failError)),+ ];- progress.cleanupWhenAborted(cleanup);-- function onLine(line: string) {- const match = line.match(regex);- if (!match)- return;- cleanup();- resolve(match);- }+ function onLine(line: string) {+ const match = line.match(regex);+ if (match)+ promise.resolve(match);+ }- function cleanup() {- eventsHelper.removeEventListeners(listeners);- }- }));+ try {+ return await progress.race(promise);+ } finally {+ eventsHelper.removeEventListeners(listeners);+ }}diff --git a/packages/playwright-core/src/server/fetch.ts b/packages/playwright-core/src/server/fetch.tsindex af6f4db0db..b1ff775a1f 100644--- a/packages/playwright-core/src/server/fetch.ts+++ b/packages/playwright-core/src/server/fetch.ts@@ -298,6 +298,7 @@ export abstract class APIRequestContext extends SdkObject {};this.emit(APIRequestContext.Events.Request, requestEvent);+ let destroyRequest: (() => void) | undefined;const resultPromise = new Promise<SendRequestResult>((fulfill, reject) => {const requestConstructor: ((url: URL, options: http.RequestOptions, callback?: (res: http.IncomingMessage) => void) => http.ClientRequest)= (url.protocol === 'https:' ? https : http).request;@@ -483,7 +484,7 @@ export abstract class APIRequestContext extends SdkObject {body.on('end', notifyBodyFinished);});request.on('error', reject);- progress.cleanupWhenAborted(() => request.destroy());+ destroyRequest = () => request.destroy();listeners.push(eventsHelper.addEventListener(this, APIRequestContext.Events.Dispose, () => {@@ -539,7 +540,11 @@ export abstract class APIRequestContext extends SdkObject {request.write(postData);request.end();});- return progress.race(resultPromise);++ return progress.race(resultPromise).catch(error => {+ destroyRequest?.();+ throw error;+ });}private _getHttpCredentials(url: URL) {diff --git a/packages/playwright-core/src/server/helper.ts b/packages/playwright-core/src/server/helper.tsindex fb6622846c..e1e9e14681 100644--- a/packages/playwright-core/src/server/helper.ts+++ b/packages/playwright-core/src/server/helper.ts@@ -57,22 +57,19 @@ class Helper {static waitForEvent(progress: Progress, emitter: EventEmitter, event: string | symbol, predicate?: Function): { promise: Promise<any>, dispose: () => void } {const listeners: RegisteredListener[] = [];- const promise = new Promise((resolve, reject) => {+ const dispose = () => eventsHelper.removeEventListeners(listeners);+ const promise = progress.race(new Promise((resolve, reject) => {listeners.push(eventsHelper.addEventListener(emitter, event, eventArg => {try {if (predicate && !predicate(eventArg))return;- eventsHelper.removeEventListeners(listeners);resolve(eventArg);} catch (e) {- eventsHelper.removeEventListeners(listeners);reject(e);}}));- });- const dispose = () => eventsHelper.removeEventListeners(listeners);- progress.cleanupWhenAborted(dispose);- return { promise: progress.race(promise), dispose };+ })).finally(() => dispose());+ return { promise, dispose };}static secondsToRoundishMillis(value: number): number {diff --git a/packages/playwright-core/src/server/localUtils.ts b/packages/playwright-core/src/server/localUtils.tsindex 47c93362b6..5fb9b57d41 100644--- a/packages/playwright-core/src/server/localUtils.ts+++ b/packages/playwright-core/src/server/localUtils.ts@@ -179,16 +179,18 @@ export function harClose(harBackends: Map<string, HarBackend>, params: channels.export async function harUnzip(progress: Progress, params: channels.LocalUtilsHarUnzipParams): Promise<void> {const dir = path.dirname(params.zipFile);const zipFile = new ZipFile(params.zipFile);- progress.cleanupWhenAborted(() => zipFile.close());- for (const entry of await progress.race(zipFile.entries())) {- const buffer = await progress.race(zipFile.read(entry));- if (entry === 'har.har')- await progress.race(fs.promises.writeFile(params.harFile, buffer));- else- await progress.race(fs.promises.writeFile(path.join(dir, entry), buffer));+ try {+ for (const entry of await progress.race(zipFile.entries())) {+ const buffer = await progress.race(zipFile.read(entry));+ if (entry === 'har.har')+ await progress.race(fs.promises.writeFile(params.harFile, buffer));+ else+ await progress.race(fs.promises.writeFile(path.join(dir, entry), buffer));+ }+ await progress.race(fs.promises.unlink(params.zipFile));+ } finally {+ zipFile.close();}- await progress.race(fs.promises.unlink(params.zipFile));- zipFile.close();}export async function tracingStarted(progress: Progress, stackSessions: Map<string, StackSession>, params: channels.LocalUtilsTracingStartedParams): Promise<channels.LocalUtilsTracingStartedResult> {diff --git a/packages/playwright-core/src/server/screenshotter.ts b/packages/playwright-core/src/server/screenshotter.tsindex ea8b09e486..93765cc337 100644--- a/packages/playwright-core/src/server/screenshotter.ts+++ b/packages/playwright-core/src/server/screenshotter.ts@@ -206,22 +206,20 @@ export class Screenshotter {progress.log('taking page screenshot');const viewportSize = await this._originalViewportSize(progress);await this._preparePageForScreenshot(progress, this._page.mainFrame(), options.style, options.caret !== 'initial', options.animations === 'disabled');-- if (options.fullPage) {- const fullPageSize = await this._fullPageSize(progress);- let documentRect = { x: 0, y: 0, width: fullPageSize.width, height: fullPageSize.height };- const fitsViewport = fullPageSize.width <= viewportSize.width && fullPageSize.height <= viewportSize.height;- if (options.clip)- documentRect = trimClipToSize(options.clip, documentRect);- const buffer = await this._screenshot(progress, format, documentRect, undefined, fitsViewport, options);+ try {+ if (options.fullPage) {+ const fullPageSize = await this._fullPageSize(progress);+ let documentRect = { x: 0, y: 0, width: fullPageSize.width, height: fullPageSize.height };+ const fitsViewport = fullPageSize.width <= viewportSize.width && fullPageSize.height <= viewportSize.height;+ if (options.clip)+ documentRect = trimClipToSize(options.clip, documentRect);+ return await this._screenshot(progress, format, documentRect, undefined, fitsViewport, options);+ }+ const viewportRect = options.clip ? trimClipToSize(options.clip, viewportSize) : { x: 0, y: 0, ...viewportSize };+ return await this._screenshot(progress, format, undefined, viewportRect, true, options);+ } finally {await this._restorePageAfterScreenshot();- return buffer;}-- const viewportRect = options.clip ? trimClipToSize(options.clip, viewportSize) : { x: 0, y: 0, ...viewportSize };- const buffer = await this._screenshot(progress, format, undefined, viewportRect, true, options);- await this._restorePageAfterScreenshot();- return buffer;});}@@ -232,21 +230,23 @@ export class Screenshotter {const viewportSize = await this._originalViewportSize(progress);await this._preparePageForScreenshot(progress, handle._frame, options.style, options.caret !== 'initial', options.animations === 'disabled');- await handle._waitAndScrollIntoViewIfNeeded(progress, true /* waitForVisible */);-- const boundingBox = await progress.race(handle.boundingBox());- assert(boundingBox, 'Node is either not visible or not an HTMLElement');- assert(boundingBox.width !== 0, 'Node has 0 width.');- assert(boundingBox.height !== 0, 'Node has 0 height.');-- const fitsViewport = boundingBox.width <= viewportSize.width && boundingBox.height <= viewportSize.height;- const scrollOffset = await this._page.mainFrame().waitForFunctionValueInUtility(progress, () => ({ x: window.scrollX, y: window.scrollY }));- const documentRect = { ...boundingBox };- documentRect.x += scrollOffset.x;- documentRect.y += scrollOffset.y;- const buffer = await this._screenshot(progress, format, helper.enclosingIntRect(documentRect), undefined, fitsViewport, options);- await this._restorePageAfterScreenshot();- return buffer;+ try {+ await handle._waitAndScrollIntoViewIfNeeded(progress, true /* waitForVisible */);++ const boundingBox = await progress.race(handle.boundingBox());+ assert(boundingBox, 'Node is either not visible or not an HTMLElement');+ assert(boundingBox.width !== 0, 'Node has 0 width.');+ assert(boundingBox.height !== 0, 'Node has 0 height.');++ const fitsViewport = boundingBox.width <= viewportSize.width && boundingBox.height <= viewportSize.height;+ const scrollOffset = await this._page.mainFrame().waitForFunctionValueInUtility(progress, () => ({ x: window.scrollX, y: window.scrollY }));+ const documentRect = { ...boundingBox };+ documentRect.x += scrollOffset.x;+ documentRect.y += scrollOffset.y;+ return await this._screenshot(progress, format, helper.enclosingIntRect(documentRect), undefined, fitsViewport, options);+ } finally {+ await this._restorePageAfterScreenshot();+ }});}@@ -254,12 +254,16 @@ export class Screenshotter {if (disableAnimations)progress.log(' disabled all CSS animations');const syncAnimations = this._page.delegate.shouldToggleStyleSheetToSyncAnimations();- progress.cleanupWhenAborted(() => this._restorePageAfterScreenshot());await progress.race(this._page.safeNonStallingEvaluateInAllFrames('(' + inPagePrepareForScreenshots.toString() + `)(${JSON.stringify(screenshotStyle)}, ${hideCaret}, ${disableAnimations}, ${syncAnimations})`, 'utility'));- if (!process.env.PW_TEST_SCREENSHOT_NO_FONTS_READY) {- progress.log('waiting for fonts to load...');- await progress.race(frame.nonStallingEvaluateInExistingContext('document.fonts.ready', 'utility').catch(() => {}));- progress.log('fonts loaded');+ try {+ if (!process.env.PW_TEST_SCREENSHOT_NO_FONTS_READY) {+ progress.log('waiting for fonts to load...');+ await progress.race(frame.nonStallingEvaluateInExistingContext('document.fonts.ready', 'utility').catch(() => {}));+ progress.log('fonts loaded');+ }+ } catch (error) {+ await this._restorePageAfterScreenshot();+ throw error;}}@@ -272,45 +276,52 @@ export class Screenshotter {return () => Promise.resolve();const framesToParsedSelectors: MultiMap<Frame, ParsedSelector> = new MultiMap();-- const cleanup = async () => {- await Promise.all([...framesToParsedSelectors.keys()].map(async frame => {- await frame.hideHighlight();- }));- };- progress.cleanupWhenAborted(cleanup);-await progress.race(Promise.all((options.mask || []).map(async ({ frame, selector }) => {const pair = await frame.selectors.resolveFrameForSelector(selector);if (pair)framesToParsedSelectors.set(pair.frame, pair.info.parsed);})));- await progress.race(Promise.all([...framesToParsedSelectors.keys()].map(async frame => {- await frame.maskSelectors(framesToParsedSelectors.get(frame), options.maskColor || '#F0F');- })));- return cleanup;+ const frames = [...framesToParsedSelectors.keys()];+ const cleanup = async () => {+ await Promise.all(frames.map(frame => frame.hideHighlight()));+ };++ try {+ const promises = frames.map(frame => frame.maskSelectors(framesToParsedSelectors.get(frame), options.maskColor || '#F0F'));+ await progress.race(Promise.all(promises));+ return cleanup;+ } catch (error) {+ cleanup().catch(() => {});+ throw error;+ }}private async _screenshot(progress: Progress, format: 'png' | 'jpeg', documentRect: types.Rect | undefined, viewportRect: types.Rect | undefined, fitsViewport: boolean, options: ScreenshotOptions): Promise<Buffer> {if ((options as any).__testHookBeforeScreenshot)await progress.race((options as any).__testHookBeforeScreenshot());+const shouldSetDefaultBackground = options.omitBackground && format === 'png';- if (shouldSetDefaultBackground) {- progress.cleanupWhenAborted(() => this._page.delegate.setBackgroundColor());+ if (shouldSetDefaultBackground)await progress.race(this._page.delegate.setBackgroundColor({ r: 0, g: 0, b: 0, a: 0 }));- }-const cleanupHighlight = await this._maskElements(progress, options);- const quality = format === 'jpeg' ? options.quality ?? 80 : undefined;- const buffer = await this._page.delegate.takeScreenshot(progress, format, documentRect, viewportRect, quality, fitsViewport, options.scale || 'device');- await cleanupHighlight();- if (shouldSetDefaultBackground)- await progress.race(this._page.delegate.setBackgroundColor());- if ((options as any).__testHookAfterScreenshot)- await progress.race((options as any).__testHookAfterScreenshot());- return buffer;+ try {+ const quality = format === 'jpeg' ? options.quality ?? 80 : undefined;+ const buffer = await this._page.delegate.takeScreenshot(progress, format, documentRect, viewportRect, quality, fitsViewport, options.scale || 'device');+ await cleanupHighlight();+ if (shouldSetDefaultBackground)+ await this._page.delegate.setBackgroundColor();+ if ((options as any).__testHookAfterScreenshot)+ await progress.race((options as any).__testHookAfterScreenshot());+ return buffer;+ } catch (error) {+ // Cleanup without blocking, it will be done before the next playwright action.+ cleanupHighlight().catch(() => {});+ if (shouldSetDefaultBackground)+ this._page.delegate.setBackgroundColor().catch(() => {});+ throw error;+ }}}diff --git a/packages/playwright-core/src/server/transport.ts b/packages/playwright-core/src/server/transport.tsindex c2fefad6d2..c8b63fe7ac 100644--- a/packages/playwright-core/src/server/transport.ts+++ b/packages/playwright-core/src/server/transport.ts@@ -84,11 +84,10 @@ export class WebSocketTransport implements ConnectionTransport {const logUrl = stripQueryParams(url);progress?.log(`<ws connecting> ${logUrl}`);const transport = new WebSocketTransport(progress, url, logUrl, { ...options, followRedirects: !!options.followRedirects && hadRedirects });- progress?.cleanupWhenAborted(() => transport.closeAndWait());- const resultPromise = new Promise<{ transport?: WebSocketTransport, redirect?: IncomingMessage }>((fulfill, reject) => {+ const resultPromise = new Promise<{ redirect?: IncomingMessage }>((fulfill, reject) => {transport._ws.on('open', async () => {progress?.log(`<ws connected> ${logUrl}`);- fulfill({ transport });+ fulfill({});});transport._ws.on('error', event => {progress?.log(`<ws connect error> ${logUrl} ${event.message}`);@@ -116,16 +115,20 @@ export class WebSocketTransport implements ConnectionTransport {});});});- const result = progress ? await progress.race(resultPromise) : await resultPromise;-- if (result.redirect) {- // Strip authorization headers from the redirected request.- const newHeaders = Object.fromEntries(Object.entries(options.headers || {}).filter(([name]) => {- return !name.includes('access-key') && name.toLowerCase() !== 'authorization';- }));- return WebSocketTransport._connect(progress, result.redirect.headers.location!, { ...options, headers: newHeaders }, true /* hadRedirects */);+ try {+ const result = progress ? await progress.race(resultPromise) : await resultPromise;+ if (result.redirect) {+ // Strip authorization headers from the redirected request.+ const newHeaders = Object.fromEntries(Object.entries(options.headers || {}).filter(([name]) => {+ return !name.includes('access-key') && name.toLowerCase() !== 'authorization';+ }));+ return WebSocketTransport._connect(progress, result.redirect.headers.location!, { ...options, headers: newHeaders }, true /* hadRedirects */);+ }+ return transport;+ } catch (error) {+ await transport.closeAndWait();+ throw error;}- return transport;}constructor(progress: Progress|undefined, url: string, logUrl: string, options: WebSocketTransportOptions) {diff --git a/packages/playwright-core/src/server/utils/network.ts b/packages/playwright-core/src/server/utils/network.tsindex d12b72a1c3..157a6f7086 100644--- a/packages/playwright-core/src/server/utils/network.ts+++ b/packages/playwright-core/src/server/utils/network.ts@@ -22,6 +22,7 @@ import url from 'url';import { HttpsProxyAgent, SocksProxyAgent, getProxyForUrl } from '../../utilsBundle';import { httpHappyEyeballsAgent, httpsHappyEyeballsAgent } from './happyEyeballs';+import { ManualPromise } from '../../utils/isomorphic/manualPromise';import type net from 'net';import type { ProxySettings } from '../types';@@ -90,27 +91,37 @@ export function httpRequest(params: HTTPRequestParams, onResponse: (r: http.Incorequest.abort();});}- cancelRequest = e => request.destroy(e);+ cancelRequest = e => {+ try {+ request.destroy(e);+ } catch {+ }+ };request.end(params.data);return { cancel: e => cancelRequest(e) };}-export function fetchData(progress: Progress | undefined, params: HTTPRequestParams, onError?: (params: HTTPRequestParams, response: http.IncomingMessage) => Promise<Error>): Promise<string> {- const promise = new Promise<string>((resolve, reject) => {- const { cancel } = httpRequest(params, async response => {- if (response.statusCode !== 200) {- const error = onError ? await onError(params, response) : new Error(`fetch failed: server returned code ${response.statusCode}. URL: ${params.url}`);- reject(error);- return;- }- let body = '';- response.on('data', (chunk: string) => body += chunk);- response.on('error', (error: any) => reject(error));- response.on('end', () => resolve(body));- }, reject);- progress?.cleanupWhenAborted(cancel);- });- return progress ? progress.race(promise) : promise;+export async function fetchData(progress: Progress | undefined, params: HTTPRequestParams, onError?: (params: HTTPRequestParams, response: http.IncomingMessage) => Promise<Error>): Promise<string> {+ const promise = new ManualPromise<string>();+ const { cancel } = httpRequest(params, async response => {+ if (response.statusCode !== 200) {+ const error = onError ? await onError(params, response) : new Error(`fetch failed: server returned code ${response.statusCode}. URL: ${params.url}`);+ promise.reject(error);+ return;+ }+ let body = '';+ response.on('data', (chunk: string) => body += chunk);+ response.on('error', (error: any) => promise.reject(error));+ response.on('end', () => promise.resolve(body));+ }, error => promise.reject(error));+ if (!progress)+ return promise;+ try {+ return await progress.race(promise);+ } catch (error) {+ cancel(error);+ throw error;+ }}function shouldBypassProxy(url: URL, bypass?: string): boolean {