From 69b87078a5a3a89ac5dd9d9b96fd7624fc351f37 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Mon, 13 Feb 2023 22:10:56 +0800 Subject: [PATCH] Fix not timeout if scroll more than 5 seconds --- packages/puppeteer-parse/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/puppeteer-parse/index.js b/packages/puppeteer-parse/index.js index eb61cac93..a9da97977 100644 --- a/packages/puppeteer-parse/index.js +++ b/packages/puppeteer-parse/index.js @@ -7,7 +7,6 @@ const { encode } = require("urlsafe-base64"); const crypto = require("crypto"); const Url = require('url'); -// const puppeteer = require('puppeteer-extra'); const axios = require('axios'); const jwt = require('jsonwebtoken'); const { promisify } = require('util'); @@ -26,9 +25,10 @@ puppeteer.use(StealthPlugin()); // Add adblocker plugin to block all ads and trackers (saves bandwidth) const AdblockerPlugin = require('puppeteer-extra-plugin-adblocker'); -const createDOMPurify = require("dompurify"); puppeteer.use(AdblockerPlugin({ blockTrackers: true })); +const createDOMPurify = require("dompurify"); + const storage = new Storage(); const ALLOWED_ORIGINS = process.env.ALLOWED_ORIGINS ? process.env.ALLOWED_ORIGINS.split(',') : []; const previewBucket = process.env.PREVIEW_IMAGE_BUCKET ? storage.bucket(process.env.PREVIEW_IMAGE_BUCKET) : undefined; @@ -296,7 +296,7 @@ async function fetchContent(req, res) { if (contentType === 'application/pdf') { const uploadedFileId = await uploadPdf(finalUrl, userId, articleSavingRequestId); - const l = await saveUploadedPdf(userId, finalUrl, uploadedFileId, articleSavingRequestId); + await saveUploadedPdf(userId, finalUrl, uploadedFileId, articleSavingRequestId); } else { if (!content || !title) { const result = await retrieveHtml(page, logRecord); @@ -557,7 +557,7 @@ async function retrieveHtml(page, logRecord) { } })(); }), - await page.waitForTimeout(5000), + page.waitForTimeout(5000), ]); logRecord.timing = { ...logRecord.timing, pageScrolled: Date.now() - pageScrollingStart };