Merge pull request #28 from xiyu714/master

juzisang · web-flow · commit c557cb07d54f · 2021-03-11T08:54:47.000+08:00
添加对webp格式的压缩与转换
diff --git a/README.md b/README.md
@@ -22,6 +22,8 @@
 
   - [imagemin](https://github.com/imagemin/imagemin) +luban 算法，最大程度节省流量，默认选项
   - [imagemin](https://github.com/imagemin/imagemin) 压缩过程不需要经过网络，但是图片会有损耗
+  - imagemin_webp 本地有损压缩，支持GIF格式有损压缩
+    注意：有些图床（比如sm.ms）不支持webp图片格式，会上传失败
   - [tinypng](https://tinypng.com/) 无损压缩，需要上传到 tinypng
   - lubanforgitee  将所有图片压缩到1M以下,解决gitee的1M外链不能访问的问题. 
 
@@ -43,8 +45,8 @@ key 可选
 
 ## 压缩效果对比
 
-| 类型   | tinypng                                                                                        | luban                                                                                        | imagemin                                                                                        |
-| ------ | ---------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- |
-| 原大小 | 1.5 MB                                                                                         | 1.5 MB                                                                                       | 1.5 MB                                                                                          |
-| 压缩后 | 315 KB                                                                                         | 276 KB                                                                                       | 411 KB                                                                                          |
-| 效果图 | ![](https://raw.githubusercontent.com/JuZiSang/picgo-plugin-compress/master/tests/tinypng.png) | ![](https://raw.githubusercontent.com/JuZiSang/picgo-plugin-compress/master/tests/luban.png) | ![](https://raw.githubusercontent.com/JuZiSang/picgo-plugin-compress/master/tests/imagemin.png) |
+| 类型   | tinypng                                                      | luban                                                        | imagemin                                                     | imagemin_webp                                                |
+| ------ | ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ |
+| 原大小 | 1.5 MB                                                       | 1.5 MB                                                       | 1.5 MB                                                       | 1.5 MB                                                       |
+| 压缩后 | 315 KB                                                       | 276 KB                                                       | 411 KB                                                       | 216 KB                                                       |
+| 效果图 | ![](https://raw.githubusercontent.com/JuZiSang/picgo-plugin-compress/master/tests/tinypng.png) | ![](https://raw.githubusercontent.com/JuZiSang/picgo-plugin-compress/master/tests/luban.png) | ![](https://raw.githubusercontent.com/JuZiSang/picgo-plugin-compress/master/tests/imagemin.png) | ![](https://raw.githubusercontent.com/JuZiSang/picgo-plugin-compress/master/tests/imagemin_webp.webp) |
diff --git a/package.json b/package.json
@@ -59,10 +59,12 @@
     "fs-extra": "^9.0.0",
     "image-size": "^0.8.3",
     "imagemin": "^7.0.1",
+    "imagemin-gif2webp": "^3.0.0",
     "imagemin-gifsicle": "^7.0.0",
     "imagemin-jpegtran": "^7.0.0",
     "imagemin-mozjpeg": "^8.0.0",
     "imagemin-upng": "^2.0.2",
+    "imagemin-webp": "^6.0.0",
     "images": "^3.2.3",
     "is-gif": "^3.0.0",
     "request": "^2.88.2"
diff --git a/src/compress/imagemin_webp.ts b/src/compress/imagemin_webp.ts
@@ -0,0 +1,31 @@
+import imagemin from 'imagemin'
+import imageminWebp from 'imagemin-webp'
+import imageminGif2webp from 'imagemin-gif2webp'
+import { CompressOptions, ImgInfo } from '../utils/interfaces'
+import { getImageBuffer } from '../utils/getImage'
+
+export function imageminWebPCompress({ ctx, info }: CompressOptions): Promise<ImgInfo> {
+  ctx.log.info('imagemin_webp 压缩开始')
+  return getImageBuffer(ctx, info.url)
+    .then((buffer) => {
+      return imagemin.buffer(buffer, {
+        plugins: [imageminWebp({ quality: 75 }), imageminGif2webp({ quality: 75, lossy: true })],
+      })
+    })
+    .then((buffer) => {
+      ctx.log.info('imagemin_webp 压缩完成')
+      info.extname = 'webp'
+      info.fileName = changeExt(info.fileName, 'webp')
+      return {
+        ...info,
+        buffer,
+      }
+    })
+}
+
+// https://stackoverflow.com/questions/5953239/how-do-i-change-file-extension-with-javascript
+function changeExt(fileName: String, newExt: String) {
+  var pos = fileName.includes('.') ? fileName.lastIndexOf('.') : fileName.length
+  var fileRoot = fileName.substr(0, pos)
+  return `${fileRoot}.${newExt}`
+}
diff --git a/src/config.ts b/src/config.ts
@@ -10,6 +10,7 @@ export enum NameType {
 export enum CompressType {
   tinypng = 'tinypng',
   imagemin = 'imagemin',
+  imagemin_webp = 'imagemin_webp',
   luban = 'luban',
   lubangitee = 'lubangitee',
 }
diff --git a/src/index.ts b/src/index.ts
@@ -5,6 +5,7 @@ import { PluginConfig } from 'picgo/dist/src/utils/interfaces'
 import { tinypngCompress } from './compress/tinypngweb'
 import { tinypngKeyCompress } from './compress/tinypng/index'
 import { imageminCompress } from './compress/imagemin'
+import { imageminWebPCompress } from './compress/imagemin_webp'
 import { NameType, CompressType } from './config'
 import { reName } from './utils/reName'
 import { lubanCompress } from './compress/luban'
@@ -39,6 +40,8 @@ function handle(ctx: PicGo) {
               return lubanCompress(options)
             case CompressType.lubangitee:
               return lubanforgiteeCompress(options)
+            case CompressType.imagemin_webp:
+              return imageminWebPCompress(options)
             default:
               return lubanCompress(options)
           }
diff --git a/tests/imagemin_webp.webp b/tests/imagemin_webp.webp
diff --git a/types/lib.d.ts b/types/lib.d.ts
@@ -1,3 +1,11 @@
 declare module 'imagemin-upng' {
   export default function upng(): any
 }
+
+declare module 'imagemin-webp' {
+  export default imageminWebp
+}
+
+declare module 'imagemin-gif2webp' {
+  export default imageminGif2webp
+}
diff --git a/yarn.lock b/yarn.lock
@@ -511,7 +511,7 @@ bin-version@^3.0.0:
     execa "^1.0.0"
     find-versions "^3.0.0"
 
-bin-wrapper@^4.0.0:
+bin-wrapper@^4.0.0, bin-wrapper@^4.0.1:
   version "4.1.0"
   resolved "https://registry.npm.taobao.org/bin-wrapper/download/bin-wrapper-4.1.0.tgz#99348f2cf85031e3ef7efce7e5300aeaae960605"
   integrity sha1-mTSPLPhQMePvfvzn5TAK6q6WBgU=
@@ -971,6 +971,15 @@ currently-unhandled@^0.4.1:
   dependencies:
     array-find-index "^1.0.1"
 
+cwebp-bin@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.npm.taobao.org/cwebp-bin/download/cwebp-bin-5.1.0.tgz#d5bea87c127358558e7bf7a90a6d440d42dcb074"
+  integrity sha1-1b6ofBJzWFWOe/epCm1EDULcsHQ=
+  dependencies:
+    bin-build "^3.0.0"
+    bin-wrapper "^4.0.1"
+    logalot "^2.1.0"
+
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -1697,7 +1706,7 @@ file-type@5.2.0, file-type@^5.2.0:
   resolved "https://registry.npm.taobao.org/file-type/download/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"
   integrity sha1-LdvqfHP/42No365J3DOMBYwritY=
 
-file-type@^10.4.0:
+file-type@^10.4.0, file-type@^10.5.0:
   version "10.11.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-10.11.0.tgz#2961d09e4675b9fb9a3ee6b69e9cd23f43fd1890"
   integrity sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==
@@ -1967,6 +1976,15 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+gif2webp-bin@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.npm.taobao.org/gif2webp-bin/download/gif2webp-bin-3.0.2.tgz#8620540fc07b8cdcc262a91d55d7c99d873a1d4f"
+  integrity sha1-hiBUD8B7jNzCYqkdVdfJnYc6HU8=
+  dependencies:
+    bin-build "^3.0.0"
+    bin-wrapper "^4.0.0"
+    logalot "^2.0.0"
+
 gifsicle@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/gifsicle/-/gifsicle-5.1.0.tgz#08f878e9048c70adf046185115a6350516a1fdc0"
@@ -2304,6 +2322,15 @@ image-size@^0.8.3:
   dependencies:
     queue "6.0.1"
 
+imagemin-gif2webp@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/imagemin-gif2webp/download/imagemin-gif2webp-3.0.0.tgz#7685e45727f667594cc81705211dddc62ae7fdbd"
+  integrity sha1-doXkVyf2Z1lMyBcFIR3dxirn/b0=
+  dependencies:
+    exec-buffer "^3.0.0"
+    gif2webp-bin "^3.0.0"
+    is-gif "^3.0.0"
+
 imagemin-gifsicle@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/imagemin-gifsicle/-/imagemin-gifsicle-7.0.0.tgz#1a7ab136a144c4678657ba3b6c412f80805d26b0"
@@ -2339,6 +2366,15 @@ imagemin-upng@^2.0.2:
     is-png "2.0.0"
     lib-upng "1.0.1"
 
+imagemin-webp@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npm.taobao.org/imagemin-webp/download/imagemin-webp-6.0.0.tgz#bb2d77bab818fd6133df9675326497b877e7be4d"
+  integrity sha1-uy13urgY/WEz35Z1MmSXuHfnvk0=
+  dependencies:
+    cwebp-bin "^5.0.0"
+    exec-buffer "^3.0.0"
+    is-cwebp-readable "^3.0.0"
+
 imagemin@^7.0.1:
   version "7.0.1"
   resolved "https://registry.npm.taobao.org/imagemin/download/imagemin-7.0.1.tgz?cache=0&sync_timestamp=1573808716935&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimagemin%2Fdownload%2Fimagemin-7.0.1.tgz#f6441ca647197632e23db7d971fffbd530c87dbf"
@@ -2480,6 +2516,13 @@ is-buffer@^1.1.5, is-buffer@~1.1.1:
   resolved "https://registry.npm.taobao.org/is-buffer/download/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha1-76ouqdqg16suoTqXsritUf776L4=
 
+is-cwebp-readable@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/is-cwebp-readable/download/is-cwebp-readable-3.0.0.tgz#0554aaa400977a2fc4de366d8c0244f13cde58cb"
+  integrity sha1-BVSqpACXei/E3jZtjAJE8TzeWMs=
+  dependencies:
+    file-type "^10.5.0"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ export enum NameType {`
`10`	`10`	`export enum CompressType {`
`11`	`11`	`tinypng = 'tinypng',`
`12`	`12`	`imagemin = 'imagemin',`
	`13`	`+ imagemin_webp = 'imagemin_webp',`
`13`	`14`	`luban = 'luban',`
`14`	`15`	`lubangitee = 'lubangitee',`
`15`	`16`	`}`