fetch-css 4.0.9 → 4.0.11

package/index.js

@@ -11,6 +11,15 @@ import fetchEnhanced from "fetch-enhanced";
 const fetch = fetchEnhanced(undiciFetch, {undici: true});
 const clone = cloner();
 
+async function doFetch(url, opts) {
+  try {
+    return await fetch(url, opts);
+  } catch (err) {
+    err.message = `${err.message} (${url})`;
+    throw err;
+  }
+}
+
 async function extract(res) {
   const styleUrls = [];
   const styleTags = [];
@@ -63,6 +72,15 @@ function isValidCSS(string) {
   return false;
 }
 
+function arrayBufferToBufferCycle(ab) {
+  const buffer = new Buffer(ab.byteLength);
+  const view = new Uint8Array(ab);
+  for (let i = 0; i < buffer.length; ++i) {
+    buffer[i] = view[i];
+  }
+  return buffer;
+}
+
 function extractCssFromJs(js) {
   let css = "";
 
@@ -97,10 +115,10 @@ async function extensionCss({crx, contentScriptsOnly, strict}) {
   url += `&x=id%3D${crx}`;
   url += `%26uc`;
 
-  const res = await fetch(url);
+  const res = await doFetch(url);
   validateStatus(res, url, strict);
 
-  const crxBuffer = await res.buffer();
+  const crxBuffer = arrayBufferToBufferCycle(await res.arrayBuffer());
   const zipBuffer = Buffer.from(crxToZip(crxBuffer));
 
   const files = {};
@@ -167,7 +185,7 @@ export default async function fetchCss(sources) { // eslint-disable-line import/
   const sourceResponses = await Promise.all(sources.map(source => {
     if (!source.url) return null;
     const {pathname} = new URL(source.url);
-    return pathname.endsWith(".css") || pathname.endsWith(".js") ? null : fetch(source.url, source.fetchOpts);
+    return pathname.endsWith(".css") || pathname.endsWith(".js") ? null : doFetch(source.url, source.fetchOpts);
   }));
 
   for (const [index, res] of Object.entries(sourceResponses)) {
@@ -184,7 +202,7 @@ export default async function fetchCss(sources) { // eslint-disable-line import/
 
   const fetchResponses = await Promise.all(sources.map(source => {
     if (!source.url) return null;
-    return Promise.all(source.urls.map(url => fetch(url).then(res => res.text())));
+    return Promise.all(source.urls.map(url => doFetch(url).then(res => res.text())));
   }));
 
   for (const [index, responses] of Object.entries(fetchResponses)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fetch-css",
-  "version": "4.0.9",
+  "version": "4.0.11",
   "description": "Extract CSS from websites and browser extensions",
   "author": "silverwind",
   "repository": "silverwind/fetch-css",