Refactor to use fetchWithNetworkError

packages/@uppy/companion-client/src/RequestClient.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const AuthError = require('./AuthError')
-const NetworkError = require('@uppy/utils/lib/NetworkError')
+const fetchWithNetworkError = require('@uppy/utils/lib/fetchWithNetworkError')
 
 // Remove the trailing slash so we can always safely append /xyz.
 function stripSlash (url) {
@@ -134,18 +134,11 @@ module.exports = class RequestClient {
   get (path, skipPostResponse) {
     return new Promise((resolve, reject) => {
       this.preflightAndHeaders(path).then((headers) => {
-        fetch(this._getUrl(path), {
+        fetchWithNetworkError(this._getUrl(path), {
           method: 'get',
           headers: headers,
           credentials: 'same-origin'
         })
-          .catch((err) => {
-            if (err.name === 'AbortError') {
-              throw err
-            } else {
-              throw new NetworkError(err)
-            }
-          })
           .then(this._getPostResponseFunc(skipPostResponse))
           .then((res) => this._json(res).then(resolve))
           .catch((err) => {
@@ -159,19 +152,12 @@ module.exports = class RequestClient {
   post (path, data, skipPostResponse) {
     return new Promise((resolve, reject) => {
       this.preflightAndHeaders(path).then((headers) => {
-        fetch(this._getUrl(path), {
+        fetchWithNetworkError(this._getUrl(path), {
           method: 'post',
           headers: headers,
           credentials: 'same-origin',
           body: JSON.stringify(data)
         })
-          .catch((err) => {
-            if (err.name === 'AbortError') {
-              throw err
-            } else {
-              throw new NetworkError(err)
-            }
-          })
           .then(this._getPostResponseFunc(skipPostResponse))
           .then((res) => this._json(res).then(resolve))
           .catch((err) => {
@@ -185,19 +171,12 @@ module.exports = class RequestClient {
   delete (path, data, skipPostResponse) {
     return new Promise((resolve, reject) => {
       this.preflightAndHeaders(path).then((headers) => {
-        fetch(`${this.hostname}/${path}`, {
+        fetchWithNetworkError(`${this.hostname}/${path}`, {
           method: 'delete',
           headers: headers,
           credentials: 'same-origin',
           body: data ? JSON.stringify(data) : null
         })
-          .catch((err) => {
-            if (err.name === 'AbortError') {
-              throw err
-            } else {
-              throw new NetworkError(err)
-            }
-          })
           .then(this._getPostResponseFunc(skipPostResponse))
           .then((res) => this._json(res).then(resolve))
           .catch((err) => {

packages/@uppy/transloadit/src/Assembly.js

@@ -3,6 +3,7 @@ const Emitter = require('component-emitter')
 const has = require('@uppy/utils/lib/hasProperty')
 const parseUrl = require('./parseUrl')
 const NetworkError = require('@uppy/utils/lib/NetworkError')
+const fetchWithNetworkError = require('@uppy/utils/lib/fetchWithNetworkError')
 
 // Lazy load socket.io to avoid a console error
 // in IE 10 when the Transloadit plugin is not used.
@@ -150,14 +151,7 @@ class TransloaditAssembly extends Emitter {
    * 'status'.
    */
   _fetchStatus ({ diff = true } = {}) {
-    return fetch(this.status.assembly_ssl_url)
-      .catch((err) => {
-        if (err.name === 'AbortError') {
-          throw err
-        } else {
-          throw new NetworkError(err)
-        }
-      })
+    return fetchWithNetworkError(this.status.assembly_ssl_url)
       .then((response) => response.json())
       .then((status) => {
         // Avoid updating if we closed during this request's lifetime.

packages/@uppy/transloadit/src/Client.js

@@ -1,4 +1,4 @@
-const NetworkError = require('@uppy/utils/lib/NetworkError')
+const fetchWithNetworkError = require('@uppy/utils/lib/fetchWithNetworkError')
 
 /**
  * A Barebones HTTP API client for Transloadit.
@@ -40,18 +40,11 @@ module.exports = class Client {
     data.append('num_expected_upload_files', expectedFiles)
 
     const url = `${this.opts.service}/assemblies`
-    return fetch(url, {
+    return fetchWithNetworkError(url, {
       method: 'post',
       headers: this._headers,
       body: data
     })
-      .catch((err) => {
-        if (err.name === 'AbortError') {
-          throw err
-        } else {
-          throw new NetworkError(err)
-        }
-      })
       .then((response) => response.json()).then((assembly) => {
         if (assembly.error) {
           const error = new Error(assembly.error)
@@ -77,14 +70,7 @@ module.exports = class Client {
   reserveFile (assembly, file) {
     const size = encodeURIComponent(file.size)
     const url = `${assembly.assembly_ssl_url}/reserve_file?size=${size}`
-    return fetch(url, { method: 'post', headers: this._headers })
-      .catch((err) => {
-        if (err.name === 'AbortError') {
-          throw err
-        } else {
-          throw new NetworkError(err)
-        }
-      })
+    return fetchWithNetworkError(url, { method: 'post', headers: this._headers })
       .then((response) => response.json())
       .catch((err) => this._reportError(err, { assembly, file, url, type: 'API_ERROR' }))
   }
@@ -106,14 +92,7 @@ module.exports = class Client {
 
     const qs = `size=${size}&filename=${filename}&fieldname=${fieldname}&s3Url=${uploadUrl}`
     const url = `${assembly.assembly_ssl_url}/add_file?${qs}`
-    return fetch(url, { method: 'post', headers: this._headers })
-      .catch((err) => {
-        if (err.name === 'AbortError') {
-          throw err
-        } else {
-          throw new NetworkError(err)
-        }
-      })
+    return fetchWithNetworkError(url, { method: 'post', headers: this._headers })
       .then((response) => response.json())
       .catch((err) => this._reportError(err, { assembly, file, url, type: 'API_ERROR' }))
   }
@@ -125,14 +104,7 @@ module.exports = class Client {
    */
   cancelAssembly (assembly) {
     const url = assembly.assembly_ssl_url
-    return fetch(url, { method: 'delete', headers: this._headers })
-      .catch((err) => {
-        if (err.name === 'AbortError') {
-          throw err
-        } else {
-          throw new NetworkError(err)
-        }
-      })
+    return fetchWithNetworkError(url, { method: 'delete', headers: this._headers })
       .then((response) => response.json())
       .catch((err) => this._reportError(err, { url, type: 'API_ERROR' }))
   }
@@ -143,14 +115,7 @@ module.exports = class Client {
    * @param {string} url The status endpoint of the assembly.
    */
   getAssemblyStatus (url) {
-    return fetch(url, { headers: this._headers })
-      .catch((err) => {
-        if (err.name === 'AbortError') {
-          throw err
-        } else {
-          throw new NetworkError(err)
-        }
-      })
+    return fetchWithNetworkError(url, { headers: this._headers })
       .then((response) => response.json())
       .catch((err) => this._reportError(err, { url, type: 'STATUS_ERROR' }))
   }
@@ -160,7 +125,7 @@ module.exports = class Client {
       ? `${err.message} (${err.details})`
       : err.message
 
-    return fetch('https://status.transloadit.com/client_error', {
+    return fetchWithNetworkError('https://status.transloadit.com/client_error', {
       method: 'post',
       body: JSON.stringify({
         endpoint,
@@ -171,13 +136,6 @@ module.exports = class Client {
         error: message
       })
     })
-      .catch((err) => {
-        if (err.name === 'AbortError') {
-          throw err
-        } else {
-          throw new NetworkError(err)
-        }
-      })
       .then((response) => response.json())
   }
 

packages/@uppy/utils/src/fetchWithNetworkError.js

@@ -0,0 +1,15 @@
+const NetworkError = require('@uppy/utils/lib/NetworkError')
+
+/**
+ * Wrapper around window.fetch that throws a NetworkError when appropriate
+ */
+module.exports = function fetchWithNetworkError (...options) {
+  return fetch(...options)
+    .catch((err) => {
+      if (err.name === 'AbortError') {
+        throw err
+      } else {
+        throw new NetworkError(err)
+      }
+    })
+}