Skip to content

Commit

Permalink
killing pages
Browse files Browse the repository at this point in the history
  • Loading branch information
BatMiles committed Jul 23, 2024
1 parent 7d25469 commit 87af529
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/collector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { dedupLinks, getLinks, getSocialLinks } from './pptr-utils/get-links';
import { autoScroll, fillForms } from './pptr-utils/interaction-utils';
import { setupSessionRecordingInspector } from './session-recording';
import { setUpThirdPartyTrackersInspector } from './third-party-trackers';
import { clearDir } from './utils';
import { clearDir, closeBrowser } from './utils';

export type CollectorOptions = Partial<typeof DEFAULT_OPTIONS>;

Expand Down Expand Up @@ -222,7 +222,7 @@ export const collect = async (inUrl: string, args: CollectorOptions) => {
// Return if the page doesnt load
if (loadError) {
console.log("browser close 1");
await browser.close();
await closeBrowser(browser);
if (typeof userDataDir !== 'undefined') {
clearDir(userDataDir, false);
}
Expand Down Expand Up @@ -306,7 +306,7 @@ export const collect = async (inUrl: string, args: CollectorOptions) => {

console.log('closing browser 1');
console.log(browser);
await browser.close();
await closeBrowser(browser);
console.log('... done closing browser 1');
if (typeof userDataDir !== 'undefined') {
clearDir(userDataDir, false);
Expand Down
11 changes: 11 additions & 0 deletions src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,17 @@ const deleteFolderRecursive = path => {
}
};

export const closeBrowser = async (browser) => {
const childProcess = browser.process();
if (childProcess) {
console.log("killing child process, ", childProcess);
childProcess.kill(9);
}
console.log("closing browser");
await browser.close();
console.log("done closing browser");
};

export const clearDir = (outDir, mkNewDir = true) => {
if (fs.existsSync(outDir)) {
deleteFolderRecursive(outDir);
Expand Down

0 comments on commit 87af529

Please sign in to comment.