Skip to content

Commit

Permalink
chore: refactor init to make sure it works with paused targets (#8710)
Browse files Browse the repository at this point in the history
  • Loading branch information
OrKoN authored and jrandolf committed Aug 2, 2022
1 parent 96d9608 commit c064114
Showing 1 changed file with 34 additions and 7 deletions.
41 changes: 34 additions & 7 deletions src/common/NetworkManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ import {Frame} from './FrameManager.js';
import {HTTPRequest} from './HTTPRequest.js';
import {HTTPResponse} from './HTTPResponse.js';
import {FetchRequestId, NetworkEventManager} from './NetworkEventManager.js';
import {debugError, isString} from './util.js';
import {
debugError,
isString,
createDeferredPromiseWithTimer,
DeferredPromise,
} from './util.js';

/**
* @public
Expand Down Expand Up @@ -95,6 +100,7 @@ export class NetworkManager extends EventEmitter {
download: -1,
latency: 0,
};
#deferredInitPromise?: DeferredPromise<void>;

constructor(
client: CDPSession,
Expand Down Expand Up @@ -131,13 +137,34 @@ export class NetworkManager extends EventEmitter {
);
}

async initialize(): Promise<void> {
await this.#client.send('Network.enable');
if (this.#ignoreHTTPSErrors) {
await this.#client.send('Security.setIgnoreCertificateErrors', {
ignore: true,
});
/**
* Initialize calls should avoid async dependencies between CDP calls as those
* might not resolve until after the target is resumed causing a deadlock.
*/
initialize(): Promise<void> {
if (this.#deferredInitPromise) {
return this.#deferredInitPromise.promise;
}
this.#deferredInitPromise = createDeferredPromiseWithTimer<void>(
'NetworkManager initialization timed out',
30000
);
const init = Promise.all([
this.#ignoreHTTPSErrors
? this.#client.send('Security.setIgnoreCertificateErrors', {
ignore: true,
})
: null,
this.#client.send('Network.enable'),
]);
init
.then(() => {
this.#deferredInitPromise?.resolve();
})
.catch(err => {
return this.#deferredInitPromise?.reject(err);
});
return this.#deferredInitPromise.promise;
}

async authenticate(credentials?: Credentials): Promise<void> {
Expand Down

0 comments on commit c064114

Please sign in to comment.