Skip to content

Support serving images under s3 subdirectories, Fix to make /fit-in/ work; Fix for VipsJpeg: Invalid SOS error plus several other critical fixes. #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed

Support serving images under s3 subdirectories, Fix to make /fit-in/ work; Fix for VipsJpeg: Invalid SOS error plus several other critical fixes. #130

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
98c94a4
Support serving images under s3 subdirectories
rpong Jul 24, 2019
fe1bf84
Handle all thumbor URLs when trying to get s3 key
rpong Jul 25, 2019
3fc4fd0
Regex adjustments to pass the Tests
rpong Jul 25, 2019
03f3a1a
Make /fit-in/ directive work again
rpong Jul 25, 2019
7c117fa
Fix VipsJpeg: Invalid SOS parameters for sequential JPEG errors, and …
rpong Jul 27, 2019
ec97cac
Fix issue wherein image is not served if no dimension is set, sorry, …
rpong Jul 27, 2019
7dbf592
Fix for proper resizing if the filename or path contains letter x wit…
rpong Jul 27, 2019
2f1bf56
Fix for proper resizing if the filename or path contains letter x wit…
rpong Jul 27, 2019
4993496
Improve getting the s3 key from various filename conventions
rpong Jul 28, 2019
aae497d
Typos and removing unneeded comments as noted by ahmetcetin39
rpong Jul 29, 2019
63a4f64
Update Runtime to Node12.x, Update Sharp to 0.23.1
rpong Dec 18, 2019
bf10401
Handle incomplete dimensions
rpong Dec 18, 2019
36381ed
Reverting sharp to 0.22.1 due to fit-in/inside behaviour in 0.23.x
rpong Dec 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/image-handler/image-handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class ImageHandler {
* @param {Object} edits - The edits to be made to the original image.
*/
async applyEdits(originalImage, edits) {
const image = sharp(originalImage);
const image = sharp(originalImage, { failOnError: false }).rotate();
const keys = Object.keys(edits);
const values = Object.values(edits);
// Apply the image edits
Expand Down
13 changes: 8 additions & 5 deletions source/image-handler/image-request.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
const ThumborMapping = require('./thumbor-mapping');

class ImageRequest {

/**
* Initializer function for creating a new image request, used by the image
* handler to perform image modifications.
Expand Down Expand Up @@ -137,8 +137,11 @@ class ImageRequest {
return decoded.key;
} else if (requestType === "Thumbor" || requestType === "Custom") {
// Parse the key from the end of the path
const key = (event["path"]).split("/");
return key[key.length - 1];
//const key = (event["path"]).split("/");
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete these two lines? or add comment?

//return key[key.length - 1];

//Arpee: Support serving images under s3 subdirectories
return decodeURIComponent(event["path"].replace(/\d+x\d+\/|filters[:-][^/;]+|\/fit-in\/+|^\/+/g,'').replace(/^\/+/,''));
} else {
// Return an error for all other conditions
throw ({
Expand All @@ -160,8 +163,8 @@ class ImageRequest {
const path = event["path"];
// ----
const matchDefault = new RegExp(/^(\/?)([0-9a-zA-Z+\/]{4})*(([0-9a-zA-Z+\/]{2}==)|([0-9a-zA-Z+\/]{3}=))?$/);
const matchThumbor = new RegExp(/^(\/?)((fit-in)?|(filters:.+\(.?\))?|(unsafe)?).*(.+jpg|.+png|.+webp|.+tiff|.+jpeg)$/);
const matchCustom = new RegExp(/(\/?)(.*)(jpg|png|webp|tiff|jpeg)/);
const matchThumbor = new RegExp(/^(\/?)((fit-in)?|(filters:.+\(.?\))?|(unsafe)?).*(.+jpg|.+png|.+webp|.+tiff|.+jpeg)$/i);
const matchCustom = new RegExp(/(\/?)(.*)(jpg|png|webp|tiff|jpeg)/i);
const definedEnvironmentVariables = (
(process.env.REWRITE_MATCH_PATTERN !== "") &&
(process.env.REWRITE_SUBSTITUTION !== "") &&
Expand Down
2 changes: 1 addition & 1 deletion source/image-handler/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"license": "ISC",
"dependencies": {
"mocha": "^6.1.4",
"sharp": "^0.21.3",
"sharp": "^0.22.1",
"sinon": "^7.3.2",
"nyc": "^14.0.0"
},
Expand Down
11 changes: 6 additions & 5 deletions source/image-handler/test/test-thumbor-mapping.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,13 @@ describe('process()', function() {
thumborMapping.process(event);
// Assert
const expectedResult = {
edits: {
edits: {
grayscale: true,
resize: {
width: 200,
height: 300
},
grayscale: true
height: 300,
fit: 'inside'
}
}
};
assert.deepEqual(thumborMapping.edits, expectedResult.edits);
Expand Down Expand Up @@ -628,7 +629,7 @@ describe('mapFilter()', function() {
thumborMapping.mapFilter(edit, filetype);
// Assert
const expectedResult = {
edits: {
edits: {
rotate: 0
}
};
Expand Down
29 changes: 20 additions & 9 deletions source/image-handler/thumbor-mapping.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,31 @@ class ThumborMapping {
this.path = event.path;
const edits = this.path.split('/');
const filetype = (this.path.split('.'))[(this.path.split('.')).length - 1];

//Process the Dimenions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dimensions?

const dimPath = this.path.match(/[^\/]\d+x\d+/g);
if (dimPath) {
const dims = dimPath[0].split('x');
// Set only if the dimensions provided are valid
if (isNaN(dims[0]) == false && isNaN(dims[1]) == false ){
this.edits.resize = {};
// Assign dimenions from the first match only to avoid parsing dimension from image file names
this.edits.resize.width = Number(dims[0]);
this.edits.resize.height = Number(dims[1]);

}
}

// Parse the image path
for (let i = 0; i < edits.length; i++) {
const edit = edits[i];
if (edit === ('fit-in')) {
this.edits.resize = {};
if (this.edits.resize === undefined) {
this.edits.resize = {};
}
this.edits.resize.fit = 'inside'
this.sizingMethod = edit;
}
else if (edit.includes('x')) {
this.edits.resize = {};
const dims = edit.split('x');
this.edits.resize.width = Number(dims[0]);
this.edits.resize.height = Number(dims[1]);
}
if (edit.includes('filters:')) {
} else if (edit.includes('filters:')) {
this.mapFilter(edit, filetype);
}
}
Expand Down