machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bisq unfurler crash loop

Browse Source
This commit is contained in:
Mononaut 2022-09-16 00:49:07 +00:00
parent 65b677238c
commit 25cc038dd3
No known key found for this signature in database
GPG Key ID: 61B952CAF4838F94
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
unfurler/src/concurrency/ReusablePage.ts
View File

@ -89,15 +89,24 @@ export default class ReusablePage extends ConcurrencyImplementation {
const page = await (this.browser as puppeteer.Browser).newPage() as RepairablePage; const page = await (this.browser as puppeteer.Browser).newPage() as RepairablePage;
page.language = null; page.language = null;
page.createdAt = Date.now(); page.createdAt = Date.now();
const defaultUrl = mempoolHost + '/preview/block/1'; let defaultUrl
if (config.MEMPOOL.NETWORK !== 'bisq') {
// preload the preview module
defaultUrl = mempoolHost + '/preview/block/1';
} else {
// no preview module implemented yet for bisq
defaultUrl = mempoolHost;
}
page.on('pageerror', (err) => { page.on('pageerror', (err) => {
page.repairRequested = true; page.repairRequested = true;
}); });
await page.goto(defaultUrl, { waitUntil: "load" }); if (config.MEMPOOL.NETWORK !== 'bisq') {
await Promise.race([ await page.goto(defaultUrl, { waitUntil: "load" });
page.waitForSelector('meta[property="og:preview:ready"]', { timeout: config.PUPPETEER.RENDER_TIMEOUT || 3000 }).then(() => true), await Promise.race([
page.waitForSelector('meta[property="og:preview:fail"]', { timeout: config.PUPPETEER.RENDER_TIMEOUT || 3000 }).then(() => false) page.waitForSelector('meta[property="og:preview:ready"]', { timeout: config.PUPPETEER.RENDER_TIMEOUT || 3000 }).then(() => true),
]) page.waitForSelector('meta[property="og:preview:fail"]', { timeout: config.PUPPETEER.RENDER_TIMEOUT || 3000 }).then(() => false)
])
}
page.free = true; page.free = true;
return page return page
} }

2
unfurler/src/logger.ts
View File

@ -83,7 +83,7 @@ class Logger {
msg = msg.slice(0, msg.length - 1); msg = msg.slice(0, msg.length - 1);
} }
} }
const network = this.network ? ' <' + this.network + ' unfurler>' : ''; const network = this.network ? ' <' + this.network + '-unfurler>' : '';
prionum = Logger.priorities[priority] || Logger.priorities.info; prionum = Logger.priorities[priority] || Logger.priorities.info;
consolemsg = `${this.ts()} [${process.pid}] ${priority.toUpperCase()}:${network} ${msg}`; consolemsg = `${this.ts()} [${process.pid}] ${priority.toUpperCase()}:${network} ${msg}`;