|
|
@ -68,14 +68,15 @@ class PuppeteerBrowser extends Browser {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
async visit(url) {
|
|
|
|
async visit(url) {
|
|
|
|
return new Promise(async (resolve, reject) => {
|
|
|
|
|
|
|
|
let done = false;
|
|
|
|
let done = false;
|
|
|
|
let browser;
|
|
|
|
let browser;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
await new Promise(async (resolve, reject) => {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
browser = await this.browser();
|
|
|
|
browser = await this.browser();
|
|
|
|
} catch (error) {
|
|
|
|
} catch (error) {
|
|
|
|
reject(new Error(error.message || error.toString()));
|
|
|
|
return reject(error);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
browser.on('disconnected', () => {
|
|
|
|
browser.on('disconnected', () => {
|
|
|
@ -155,13 +156,18 @@ class PuppeteerBrowser extends Browser {
|
|
|
|
|
|
|
|
|
|
|
|
this.html = await page.content();
|
|
|
|
this.html = await page.content();
|
|
|
|
} catch (error) {
|
|
|
|
} catch (error) {
|
|
|
|
reject(error.message || error.toString());
|
|
|
|
return reject(error);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return resolve();
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
} catch (error) {
|
|
|
|
|
|
|
|
throw new Error(error.message || error.toString());
|
|
|
|
} finally {
|
|
|
|
} finally {
|
|
|
|
done = true;
|
|
|
|
done = true;
|
|
|
|
|
|
|
|
|
|
|
|
await browser.close();
|
|
|
|
await browser.close();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|