✨ Feature: support buffer image upload

Author: Molunerfinn

src/plugins/transformer/path.ts

@@ -5,17 +5,18 @@ import {
   getURLFile
 } from '../../utils/common'
 import { IPicGo, IPathTransformedImgInfo, IImgInfo, IImgSize } from '../../types'
+import dayjs from 'dayjs'
 
 const handle = async (ctx: IPicGo): Promise<IPicGo> => {
   const results: IImgInfo[] = ctx.output
-  await Promise.all(ctx.input.map(async (item: string, index: number) => {
+  await Promise.all(ctx.input.map(async (item: string | Buffer, index: number) => {
     let info: IPathTransformedImgInfo
     if (Buffer.isBuffer(item)) {
       info = {
         success: true,
         buffer: item,
-        fileName: 'temporary.png',
-        extname: '.png'
+        fileName: '', // will use getImageSize result
+        extname: '' // will use getImageSize result
       }
     } else if (isUrl(item)) {
       info = await getURLFile(item, ctx)
@@ -24,26 +25,31 @@ const handle = async (ctx: IPicGo): Promise<IPicGo> => {
     }
     if (info.success && info.buffer) {
       const imgSize = getImgSize(ctx, info.buffer, item)
+      const extname = info.extname || imgSize.extname || '.png'
       results[index] = {
         buffer: info.buffer,
-        fileName: info.fileName,
+        fileName: info.fileName || `${dayjs().format('YYYYMMDDHHmmss')}${extname}}`,
         width: imgSize.width,
         height: imgSize.height,
-        extname: info.extname
+        extname
       }
     } else {
-      throw new Error(info.reason)
+      ctx.log.error(info.reason)
     }
   }))
   // remove empty item
   ctx.output = results.filter(item => item)
   return ctx
 }
 
-const getImgSize = (ctx: IPicGo, file: Buffer, path: string): IImgSize => {
+const getImgSize = (ctx: IPicGo, file: Buffer, path: string | Buffer): IImgSize => {
   const imageSize = getImageSize(file)
   if (!imageSize.real) {
-    ctx.log.warn(`can't get ${path}'s image size`)
+    if (typeof path === 'string') {
+      ctx.log.warn(`can't get ${path}'s image size`)
+    } else {
+      ctx.log.warn('can\'t get image size')
+    }
     ctx.log.warn('fallback to 200 * 200')
   }
   return imageSize

src/plugins/uploader/tcyun.ts

@@ -277,7 +277,7 @@ const config = (ctx: IPicGo): IPluginConfig[] => {
       required: false,
       get confirmText () { return ctx.i18n.translate<ILocalesKey>('PICBED_TENCENTCLOUD_SLIM_CONFIRM') },
       get cancelText () { return ctx.i18n.translate<ILocalesKey>('PICBED_TENCENTCLOUD_SLIM_CANCEL') },
-      get tips () { return ctx.i18n.translate<ILocalesKey>('PICBED_TENCENTCLOUD_SLIM_TIP') },
+      get tips () { return ctx.i18n.translate<ILocalesKey>('PICBED_TENCENTCLOUD_SLIM_TIP') }
     }
   ]
   return config

src/types/index.ts

@@ -511,6 +511,7 @@ export interface IImgSize {
   width: number
   height: number
   real?: boolean
+  extname?: string
 }
 
 /**

src/utils/common.ts

@@ -30,18 +30,21 @@ export const handleUrlEncode = (url: string): string => {
 
 export const getImageSize = (file: Buffer): IImgSize => {
   try {
-    const { width = 0, height = 0 } = imageSize(file)
+    const { width = 0, height = 0, type } = imageSize(file)
+    const extname = type ? `.${type}` : '.png'
     return {
       real: true,
       width,
-      height
+      height,
+      extname
     }
   } catch (e) {
     // fallback to 200 * 200
     return {
       real: false,
       width: 200,
-      height: 200
+      height: 200,
+      extname: '.png'
     }
   }
 }