From 25cc038dd3bc4aee26d79a21db36c0076f501e97 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Fri, 16 Sep 2022 00:49:07 +0000 Subject: [PATCH] Fix bisq unfurler crash loop --- unfurler/src/concurrency/ReusablePage.ts | 21 +++++++++++++++------ unfurler/src/logger.ts | 2 +- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/unfurler/src/concurrency/ReusablePage.ts b/unfurler/src/concurrency/ReusablePage.ts index 43800fa2d..ae9c3d6f0 100644 --- a/unfurler/src/concurrency/ReusablePage.ts +++ b/unfurler/src/concurrency/ReusablePage.ts @@ -89,15 +89,24 @@ export default class ReusablePage extends ConcurrencyImplementation { const page = await (this.browser as puppeteer.Browser).newPage() as RepairablePage; page.language = null; 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.repairRequested = true; }); - await page.goto(defaultUrl, { waitUntil: "load" }); - await Promise.race([ - 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) - ]) + if (config.MEMPOOL.NETWORK !== 'bisq') { + await page.goto(defaultUrl, { waitUntil: "load" }); + await Promise.race([ + 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; return page } diff --git a/unfurler/src/logger.ts b/unfurler/src/logger.ts index 7393edeaa..e3b653b56 100644 --- a/unfurler/src/logger.ts +++ b/unfurler/src/logger.ts @@ -83,7 +83,7 @@ class Logger { 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; consolemsg = `${this.ts()} [${process.pid}] ${priority.toUpperCase()}:${network} ${msg}`;