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

Jump to bottom

fix: Skip requests in asset discovery that will never be saved #457

Merged
merged 2 commits into from
Jan 16, 2020
Merged

fix: Skip requests in asset discovery that will never be saved #457

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9c64d3
fix: Skip requests that will never be saved
Robdel12 Jan 16, 2020
710f1ac
fix: import URL
Robdel12 Jan 16, 2020
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
29 changes: 29 additions & 0 deletions src/services/asset-discovery-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import * as merge from 'deepmerge'
import * as pool from 'generic-pool'
import * as puppeteer from 'puppeteer'
import { URL } from 'url'
import { AssetDiscoveryConfiguration } from '../configuration/asset-discovery-configuration'
import { DEFAULT_CONFIGURATION } from '../configuration/configuration'
import { SnapshotOptions } from '../percy-agent-client/snapshot-options'
import domainMatch from '../utils/domain-match'
import { addLogDate, logError, profile } from '../utils/logger'
import { cacheResponse, getResponseCache } from '../utils/response-cache'
import waitForNetworkIdle from '../utils/wait-for-network-idle'
Expand Down Expand Up @@ -168,6 +170,25 @@ export class AssetDiscoveryService extends PercyClientService {
await this.closeBrowser()
}

// We shouldn't bother passing on requests that will never be saved
shouldProcessRequest(resourceUrl: string, rootResourceUrl: string): boolean {
const parsedRootResourceUrl = new URL(rootResourceUrl)
const rootUrl = `${parsedRootResourceUrl.protocol}//${parsedRootResourceUrl.host}`

// Process if the resourceUrl has a hostname in the allowedHostnames
if (this.configuration['allowed-hostnames'].some((hostname) => domainMatch(hostname, resourceUrl))) {
return true
}

// Capture if the resourceUrl is the same as the rootUrL
if (resourceUrl.startsWith(rootUrl)) {
return true
}

// We won't be capturing this asset, no need to wait for it to respond
return false
}

private async resourcesForWidth(
pool: pool.Pool<puppeteer.Page>,
width: number,
Expand Down Expand Up @@ -207,13 +228,21 @@ export class AssetDiscoveryService extends PercyClientService {
return
}

if (!this.shouldProcessRequest(requestUrl, rootResourceUrl)) {
logger.debug(addLogDate(`Aborting ${requestUrl} -- will never be saved`))
await request.abort()
return
}

if (this.configuration['cache-responses'] === true && getResponseCache(requestUrl)) {
logger.debug(addLogDate(`Asset cache hit for ${requestUrl}`))
await request.respond(getResponseCache(requestUrl))

return
}

logger.debug(addLogDate(`Starting processing for: ${requestUrl}`))

await request.continue()
} catch (error) {
logError(error)
Expand Down