Handle upload redirect transparently

Using HTTP 100 Continue

Author: inukshuk

src/plugin.js

@@ -104,47 +104,36 @@ export default class ArtimiPlugin {
 
     // TODO use PNG if image uses alpha
     let type = 'jpeg'
-    let image = await sharp.toBuffer('jpeg', buffer, { raw })
+    let body = await sharp.toBuffer('jpeg', buffer, { raw })
 
-    let checksum = md5(image)
+    let checksum = md5(body)
     let contentMd5 = Buffer.from(checksum, 'hex').toString('base64')
     let contentType = `image/${type}`
 
     let res = await fetch(`${host}/uploads/${checksum}.${type}`, {
       method: 'PUT',
-      redirect: 'manual',
+      redirect: 'follow',
+      body,
       headers: {
         'Authorization': `Bearer ${token}`,
-        'X-Content-Length': image.length,
         'Content-MD5': contentMd5,
-        'Content-Type': contentType
+        'Content-Type': contentType,
+        'Expect': '100-continue'
       }
     })
 
     switch (res.status) {
       case 204:
         logger.info('Image already cached...')
         return `${checksum}.${type}`
-      case 202:
-      case 307:
-        logger.info({
-          location: res.headers.get('location')
-        }, 'Upload image to cache...')
-        res = await fetch(res.headers.get('location'), {
-          method: 'PUT',
-          body: image,
-          headers: {
-            'Content-MD5': contentMd5,
-            'Content-Type': contentType
-          }
-        })
-        if (!res.ok) {
-          throw new Error(await res.text())
-        }
+      case 200:
+        assert(res.redirected, 'Image upload was not redirected')
+        logger.info('Uploaded image to cache...')
         return `${checksum}.${type}`
       default:
         throw new Error(
-          `Image upload failed with status "${res.status}": ${await res.text()}`)
+          `Image upload failed with status "${res.status}": ${await res.text()}`
+        )
     }
   }