From a0d3dc4893de305433023a1eafdd0d573993266d Mon Sep 17 00:00:00 2001 From: Zhiquan Date: Wed, 16 Jan 2019 13:52:27 +0800 Subject: [PATCH 1/3] call the callback if it is exists when error in resizer function. Otherwise the exception might cannot be caught outside. --- src/thumbnail.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/thumbnail.js b/src/thumbnail.js index bfd4ef6..8df0e7a 100644 --- a/src/thumbnail.js +++ b/src/thumbnail.js @@ -41,6 +41,7 @@ extensions = ['.jpg', '.jpeg', '.png']; resizer = (options, callback) => jimp.read(options.srcPath, (err, file) => { if (err) { + if(done) done(null, err); throw err; } From a0c4ca98cca37247f8e6908131230eb2f829279a Mon Sep 17 00:00:00 2001 From: Zhiquan Date: Wed, 16 Jan 2019 14:06:37 +0800 Subject: [PATCH 2/3] not thow the error if we have callback called. --- src/thumbnail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/thumbnail.js b/src/thumbnail.js index 8df0e7a..10ca742 100644 --- a/src/thumbnail.js +++ b/src/thumbnail.js @@ -41,7 +41,7 @@ extensions = ['.jpg', '.jpeg', '.png']; resizer = (options, callback) => jimp.read(options.srcPath, (err, file) => { if (err) { - if(done) done(null, err); + if(done) return done(null, err); throw err; } From 2d1564c04b7f4b133b62773eb0eb5765bc351d89 Mon Sep 17 00:00:00 2001 From: Zhiquan Date: Thu, 17 Jan 2019 10:22:50 +0800 Subject: [PATCH 3/3] provide the file instance for calling callback. --- src/thumbnail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/thumbnail.js b/src/thumbnail.js index 10ca742..8456994 100644 --- a/src/thumbnail.js +++ b/src/thumbnail.js @@ -41,7 +41,7 @@ extensions = ['.jpg', '.jpeg', '.png']; resizer = (options, callback) => jimp.read(options.srcPath, (err, file) => { if (err) { - if(done) return done(null, err); + if(done) return done(file, err); throw err; }