From 0d801776915c45364641458a8468d974138e80b2 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Fri, 24 Nov 2017 22:30:39 +0300
Subject: [PATCH] accept xhr options in download(url, options)

also fixup d1964bbc: an error should reject with a code, not XHR's ProgressEvent
---
 js/messaging.js | 58 ++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/js/messaging.js b/js/messaging.js
index 3ac431be..6382a8bf 100644
--- a/js/messaging.js
+++ b/js/messaging.js
@@ -408,49 +408,47 @@ function deleteStyleSafe({id, notify = true} = {}) {
 }
 
 
-function download(url) {
+function download(url, {
+  method = url.includes('?') ? 'POST' : 'GET',
+  body = url.includes('?') ? url.slice(url.indexOf('?')) : null,
+  requiredStatusCode = 200,
+  timeout = 10e3,
+  headers = {
+    'Content-type': 'application/x-www-form-urlencoded',
+  },
+} = {}) {
   return new Promise((resolve, reject) => {
     url = new URL(url);
-    const TIMEOUT = 10000;
-    const options = {
-      method: url.search ? 'POST' : 'GET',
-      body: url.search ? url.search.slice(1) : null,
-      headers: {
-        'Content-type': 'application/x-www-form-urlencoded'
-      }
-    };
     if (url.protocol === 'file:' && FIREFOX) {
       // https://stackoverflow.com/questions/42108782/firefox-webextensions-get-local-files-content-by-path
-      options.mode = 'same-origin';
       // FIXME: add FetchController when it is available.
-      // https://developer.mozilla.org/en-US/docs/Web/API/FetchController/abort
-      let timer;
+      const timer = setTimeout(reject, timeout, new Error('Timeout fetching ' + url.href));
       fetch(url.href, {mode: 'same-origin'})
         .then(r => {
           clearTimeout(timer);
-          if (r.status !== 200) {
-            throw r.status;
-          }
-          return r.text();
+          return r.status === 200 ? r.text() : Promise.reject(r.status);
         })
-        .then(resolve, reject);
-      timer = setTimeout(
-        () => reject(new Error(`Fetch URL timeout: ${url.href}`)),
-        TIMEOUT
-      );
+        .catch(reject)
+        .then(resolve);
       return;
     }
     const xhr = new XMLHttpRequest();
-    xhr.timeout = TIMEOUT;
-    xhr.onload = () => (xhr.status === 200 || url.protocol === 'file:'
-      ? resolve(xhr.responseText)
-      : reject(xhr.status));
-    xhr.onerror = reject;
-    xhr.open(options.method, url.href, true);
-    for (const key of Object.keys(options.headers)) {
-      xhr.setRequestHeader(key, options.headers[key]);
+    xhr.timeout = timeout;
+    xhr.onloadend = event => {
+      if (event.type !== 'error' && (
+          xhr.status === requiredStatusCode || !requiredStatusCode ||
+          url.protocol === 'file:')) {
+        resolve(xhr.responseText);
+      } else {
+        reject(xhr.status);
+      }
+    };
+    xhr.onerror = xhr.onloadend;
+    xhr.open(method, url.href, true);
+    for (const key in headers) {
+      xhr.setRequestHeader(key, headers[key]);
     }
-    xhr.send(options.body);
+    xhr.send(body);
   });
 }