Skip to content

Check page URLs for extension before direct fetch attempt #830

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.

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 18 additions & 1 deletion src/crawler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import {
ExitCodes,
InterruptReason,
BxFunctionBindings,
DIRECT_FETCH_EXT,
} from "./util/constants.js";

import { AdBlockRules, BlockRuleDecl, BlockRules } from "./util/blockrules.js";
Expand Down Expand Up @@ -1012,6 +1013,22 @@ self.__bx_behaviors.selectMainBehavior();
return "";
}

shouldDirectFetchByExt(url: string) {
const urlFull = new URL(url);
const extParts = urlFull.pathname.split(".");
if (extParts.length <= 1) {
return false;
}
const ext = extParts[1];

// known files that should be direct fetched
if (DIRECT_FETCH_EXT.includes(ext)) {
return true;
}

return false;
}

async crawlPage(opts: WorkerState): Promise<void> {
await this.writeStats();

Expand All @@ -1033,7 +1050,7 @@ self.__bx_behaviors.selectMainBehavior();
data.logDetails = logDetails;
data.workerid = workerid;

if (recorder) {
if (recorder && this.shouldDirectFetchByExt(url)) {
try {
const headers = auth
? { Authorization: auth, ...this.headers }
Expand Down
10 changes: 10 additions & 0 deletions src/util/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ export const DETECT_SITEMAP = "<detect>";

export const EXTRACT_TEXT_TYPES = ["to-pages", "to-warc", "final-to-warc"];

export const DIRECT_FETCH_EXT = [
"pdf",
"xml",
"jpg",
"webm",
"docx",
"mp4",
"zip",
];

export enum BxFunctionBindings {
BehaviorLogFunc = "__bx_log",
AddLinkFunc = "__bx_addLink",
Expand Down
12 changes: 10 additions & 2 deletions src/util/recorder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1361,7 +1361,11 @@ export class Recorder extends EventEmitter {
url &&
method === "GET" &&
!isRedirectStatus(status) &&
!(await this.crawlState.addIfNoDupe(WRITE_DUPE_KEY, url, status))
!(await this.crawlState.addIfNoDupe(
WRITE_DUPE_KEY,
url,
status === 206 || !status ? 200 : status,
))
) {
logNetwork("Skipping dupe", { url, status, ...this.logDetails });
return;
Expand Down Expand Up @@ -1515,7 +1519,11 @@ class AsyncFetcher {
if (
reqresp.method === "GET" &&
url &&
!(await crawlState.addIfNoDupe(ASYNC_FETCH_DUPE_KEY, url, status))
!(await crawlState.addIfNoDupe(
ASYNC_FETCH_DUPE_KEY,
url,
status === 206 || !status ? 200 : status,
))
) {
if (!this.ignoreDupe) {
this.reqresp.asyncLoading = false;
Expand Down
Loading