fix img upload from url, revert webp

server/helpers.js

@@ -7,7 +7,6 @@ const dayjs = require('dayjs')
 const config = require('./config')
 const log = require('./log')
 const pkg = require('../package.json')
-const fs = require('fs')
 const path = require('path')
 const sharp = require('sharp')
 const axios = require('axios')
@@ -122,41 +121,41 @@ module.exports = {
     if(!/^https?:\/\//.test(url)) {
       throw Error('Hacking attempt?')
     }
-    const filename = crypto.randomBytes(16).toString('hex') + '.jpg'
-    const finalPath = path.resolve(config.upload_path, filename)
-    const thumbPath = path.resolve(config.upload_path, 'thumb', filename)
-    const outStream = fs.createWriteStream(finalPath)
-    const thumbStream = fs.createWriteStream(thumbPath)
 
-    const resizer = sharp().resize(1200).jpeg({ quality: 95 })
-    const thumbnailer = sharp().resize(400).jpeg({ quality: 90 })
+    const filename = crypto.randomBytes(16).toString('hex')
+    const sharpStream = sharp({ failOnError: true })
+    const promises = [
+      sharpStream.clone().resize(500, null, { withoutEnlargement: true }).jpeg({ effort: 6, mozjpeg: true }).toFile(path.resolve(config.upload_path, 'thumb', filename + '.jpg')),
+      sharpStream.clone().resize(1200, null, { withoutEnlargement: true } ).jpeg({effort: 6, mozjpeg: true}).toFile(path.resolve(config.upload_path, filename + '.jpg')),
+      sharpStream.clone()
+        .resize(5)
+        .png({ quality: 10, palette: true, effort: 6})
+        .toBuffer()
+        .then(buffer => buffer.toString('base64'))
+    ]
 
-    const response = await axios({ method: 'GET', url, responseType: 'stream' })
+    const response = await axios({ method: 'GET', url: encodeURI(url), responseType: 'stream' })
 
-    return new Promise((resolve, reject) => {
-      let onError = false
-      const err = e => {
-        if (onError) {
-          return
+    response.data.pipe(sharpStream)
+    return Promise.all(promises)
+      .then(res => {
+        const info = res[1]
+        const preview = res[2]
+        return {
+          destination: config.upload_path,
+          filename: filename + '.jpg',
+          path: path.resolve(config.upload_path, filename + '.jpg'),
+          height: info.height,
+          width: info.width,
+          size: info.size,
+          preview
         }
-        onError = true
-        reject(e)
-      }
-
-      response.data
-        .pipe(thumbnailer)
-        .on('error', err)
-        .pipe(thumbStream)
-        .on('error', err)
-
-      response.data
-        .pipe(resizer)
-        .on('error', err)
-        .pipe(outStream)
-        .on('error', err)
-
-      outStream.on('finish', () => resolve(filename))
-    })
+      })
+      .catch(err => {
+        log.error(err)
+        req.err = err
+        cb(null)
+      })
   },
 
   /**