Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-28 20:40:39 +00:00
Code Issues Projects Releases Wiki Activity

Improve error handling in shooter

Browse source
This commit is contained in:
Jordan Eldredge 2021-10-21 01:42:01 -04:00
parent 8b2a7b4372
commit 066c90688c
1 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
packages/skin-database/shooter.js
View file

@ -96,20 +96,37 @@ export default class Shooter {
await new Promise(async (resolve, reject) => {
try {
const dialogHandler = (dialog) => {
cleanup();
reject(new Error(`Dialog message: ${dialog.message()}`));
};
const errorHandler = (e) => {
cleanup();
reject(`Page Error: ${e.toString()}`);
};
const cleanup = () => {
this._page.off("dialog", dialogHandler);
this._page.off("error", errorHandler);
};
this._page.on("dialog", dialogHandler);
this._page.on("error", errorHandler);
await handle.uploadFile(skin);
this._log("Uploaded file");
await this._page.evaluate(() => {
return window.__webamp.skinIsLoaded();
});
this._log("Skin loaded");
await this._page.screenshot({
path: screenshotPath,
omitBackground: true, // Make screenshot transparent
// https://github.com/GoogleChrome/puppeteer/issues/703#issuecomment-366041479
clip: { x: 0, y: 0, width: 275, height: 116 * 3 },
});
this._log("Took screenshot");
this._page.off("dialog", dialogHandler);
cleanup();
resolve();
} catch (e) {