Skip to content

send origin server errors back to the frontend #50

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

Closed
wants to merge 20 commits into from
Closed
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
36 changes: 33 additions & 3 deletions api/v2/_extract-css-basic.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ function getImportUrls(css) {

export async function getCssFile(url) {
try {
var { body } = await got(url)
var { body } = await got(url, {
timeout: 8000
})
return body
} catch (error) {
console.error(`CSS not found at ${url} (HTTP ${error.response.statusCode})`)
Expand Down Expand Up @@ -81,7 +83,33 @@ export function getStyles(nodes) {
}

export async function extractCss(url) {
var { body, headers } = await got(url)
let body = ''
let headers = {}

try {
var response = await got(url, {
timeout: 8000
})
body = response.body
headers = response.headers
} catch (error) {
let statusCode = error.code

if (statusCode === 'ENOTFOUND' || error.message === 'Response code 404 (Not Found)') {
statusCode = 404
} else if (!Number.isFinite(statusCode)) {
console.error(error)
statusCode = 500
}

return {
error: {
statusCode,
message: `The origin server at "${url}" errored with statusCode ${statusCode}`,
originalMessage: error.message,
}
}
}

// Return early if our response was a CSS file already
if (headers['content-type'].includes('text/css')) {
Expand Down Expand Up @@ -117,7 +145,9 @@ export async function extractCss(url) {
// And c'mon, don't @import inside your @import.
var importUrls = getImportUrls(item.css)
if (importUrls.length > 0) {
var cssRequests = importUrls.map(importUrl => getCssFile(resolveUrl(importUrl, url)))
var cssRequests = importUrls.map(
importUrl => getCssFile(resolveUrl(importUrl, url))
)
var importedFiles = await Promise.all(cssRequests)
importedFiles.map((css, index) => {
result.push({
Expand Down
7 changes: 5 additions & 2 deletions api/v2/extract-css.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ export default async (req, res) => {
try {
const result = await extractCss(url)

res.statusCode = 200
if ('error' in result) {
return res.json({ error: result.error })
}

res.setHeader('Cache-Control', 'max-age=60')

if (req.headers.accept.includes('application/json')) {
Expand All @@ -27,6 +30,6 @@ export default async (req, res) => {
return res.end(css)
} catch (error) {
res.statusCode = 500
return res.json({ message: error.message })
return res.json({ url, message: error.message })
}
}
6 changes: 3 additions & 3 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ <h1>Extract CSS</h1>
<h2>Example request urls:</h2>
<ul>
<li>
<a href="/api/extract-css?url=https://www.google.com">https://www.google.com</a>
<a href="/api/v2/extract-css?url=https://www.google.com">https://www.google.com</a>
</li>
<li>
<a
href="/api/extract-css?url=https://www.projectwallace.com/~teamwallace/css-tricks/colors">https://www.projectwallace.com/~teamwallace/css-tricks/colors</a>
href="/api/v2/extract-css?url=https://www.projectwallace.com/~teamwallace/css-tricks/colors">https://www.projectwallace.com/~teamwallace/css-tricks/colors</a>
</li>
<li>
<a href="/api/extract-css?url=https://cdn.jsdelivr.net/npm/tailwindcss/dist/tailwind.min.css">https://cdn.jsdelivr.net/npm/tailwindcss/dist/tailwind.min.css
<a href="/api/v2/extract-css?url=https://cdn.jsdelivr.net/npm/tailwindcss/dist/tailwind.min.css">https://cdn.jsdelivr.net/npm/tailwindcss/dist/tailwind.min.css
</a>
</li>
</ul>
Expand Down