Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(scrapeURL/sb): enforce timeout (FIR-980) #1183

Merged
merged 4 commits into from
Feb 16, 2025
Merged

fix(scrapeURL/sb): enforce timeout (FIR-980) #1183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3cecc9a
fix(scrapeURL/scrapingbee): enforce timeout
mogery Feb 14, 2025
c690633
fix(scrapeURL/sb): types
mogery Feb 14, 2025
79b2ffe
fix the test
mogery Feb 14, 2025
76b5c88
fixup: remove nix files
mogery Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/api/src/__tests__/snips/scrape.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe("Scrape tests", () => {
expect(response.body.data.markdown).toBe(
"this is fake data coming from the mocking system!",
);
});
}, 10000);

describe("Ad blocking (f-e dependant)", () => {
it.concurrent("blocks ads by default", async () => {
Expand Down
39 changes: 21 additions & 18 deletions apps/api/src/scraper/scrapeURL/engines/scrapingbee/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Meta } from "../..";
import { EngineScrapeResult } from "..";
import { specialtyScrapeCheck } from "../utils/specialtyHandler";
import { AxiosError, type AxiosResponse } from "axios";
import { EngineError } from "../../error";
import { EngineError, TimeoutError } from "../../error";

const client = new ScrapingBeeClient(process.env.SCRAPING_BEE_API_KEY!);

Expand All @@ -17,23 +17,26 @@ export function scrapeURLWithScrapingBee(
let response: AxiosResponse<any>;
const timeout = (timeToRun ?? 300000) + meta.options.waitFor;
try {
response = await client.get({
url: meta.url,
params: {
timeout,
wait_browser: wait_browser,
wait: meta.options.waitFor,
transparent_status_code: true,
json_response: true,
screenshot: meta.options.formats.includes("screenshot"),
screenshot_full_page: meta.options.formats.includes(
"screenshot@fullPage",
),
},
headers: {
"ScrapingService-Request": "TRUE", // this is sent to the page, not to ScrapingBee - mogery
},
});
response = await Promise.race<AxiosResponse<any>>([
client.get({
url: meta.url,
params: {
timeout,
wait_browser: wait_browser,
wait: meta.options.waitFor,
transparent_status_code: true,
json_response: true,
screenshot: meta.options.formats.includes("screenshot"),
screenshot_full_page: meta.options.formats.includes(
"screenshot@fullPage",
),
},
headers: {
"ScrapingService-Request": "TRUE", // this is sent to the page, not to ScrapingBee - mogery
},
}),
new Promise((_, reject) => setTimeout(() => reject(new TimeoutError("ScrapingBee timed out")), timeout + 5000)),
]);
} catch (error) {
if (error instanceof AxiosError && error.response !== undefined) {
response = error.response;
Expand Down