Merge pull request #1484 from hackmdio:feat/optimize-module-size

Feat/optimize module size

Author: Yukaii

lib/imageRouter/lutim.js

@@ -2,7 +2,7 @@
 const config = require('../config')
 const logger = require('../logger')
 
-const lutim = require('lib/imageRouter/lutim')
+const lutim = require('lutim')
 
 exports.uploadImage = function (imagePath, callback) {
   if (!imagePath || typeof imagePath !== 'string') {

lib/imageRouter/s3.js

@@ -6,9 +6,10 @@ const config = require('../config')
 const { getImageMimeType } = require('../utils')
 const logger = require('../logger')
 
-const AWS = require('aws-sdk')
-const awsConfig = new AWS.Config(config.s3)
-const s3 = new AWS.S3(awsConfig)
+const { S3Client } = require('@aws-sdk/client-s3-node/S3Client')
+const { PutObjectCommand } = require('@aws-sdk/client-s3-node/commands/PutObjectCommand')
+
+const s3 = new S3Client(config.s3)
 
 exports.uploadImage = function (imagePath, callback) {
   if (!imagePath || typeof imagePath !== 'string') {
@@ -32,23 +33,23 @@ exports.uploadImage = function (imagePath, callback) {
       Body: buffer,
       ACL: 'public-read'
     }
-
     const mimeType = getImageMimeType(imagePath)
     if (mimeType) { params.ContentType = mimeType }
 
-    s3.putObject(params, function (err, data) {
-      if (err) {
-        callback(new Error(err), null)
-        return
-      }
+    const command = new PutObjectCommand(params)
 
+    s3.send(command).then(data => {
       let s3Endpoint = 's3.amazonaws.com'
       if (config.s3.endpoint) {
         s3Endpoint = config.s3.endpoint
       } else if (config.s3.region && config.s3.region !== 'us-east-1') {
         s3Endpoint = `s3-${config.s3.region}.amazonaws.com`
       }
       callback(null, `https://${s3Endpoint}/${config.s3bucket}/${params.Key}`)
+    }).catch(err => {
+      if (err) {
+        callback(new Error(err), null)
+      }
     })
   })
 }