Skip to content
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

Jump to bottom

Multiple Rewrite Patterns and Substitutions #399

Merged
merged 1 commit into from
Jan 13, 2023
Merged

Multiple Rewrite Patterns and Substitutions #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 26 additions & 9 deletions source/image-handler/image-request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,15 +278,18 @@ export class ImageRequest {
if (requestType === RequestTypes.CUSTOM) {
const { REWRITE_MATCH_PATTERN, REWRITE_SUBSTITUTION } = process.env;

if (typeof REWRITE_MATCH_PATTERN === "string") {
const patternStrings = REWRITE_MATCH_PATTERN.split("/");
const flags = patternStrings.pop();
const parsedPatternString = REWRITE_MATCH_PATTERN.slice(1, REWRITE_MATCH_PATTERN.length - 1 - flags.length);
const regExp = new RegExp(parsedPatternString, flags);

path = path.replace(regExp, REWRITE_SUBSTITUTION);
} else {
path = path.replace(REWRITE_MATCH_PATTERN, REWRITE_SUBSTITUTION);
const REWRITE_MATCH_PATTERNS = this.parseJson(REWRITE_MATCH_PATTERN);
const REWRITE_SUBSTITUTIONS = this.parseJson(REWRITE_SUBSTITUTION);

for (let k = 0; k < REWRITE_MATCH_PATTERNS.length; k++) {
let matchPattern = REWRITE_MATCH_PATTERNS[k]
if (typeof (matchPattern) === 'string') {
let regExp = this.generateRegExp(matchPattern);
path = path.replace(regExp, REWRITE_SUBSTITUTIONS[k]);
if (this.generateRegExp(matchPattern).test(path)) break;
} else {
path = path.replace(matchPattern, REWRITE_SUBSTITUTIONS[k]);
}
}
}

Expand All @@ -303,6 +306,20 @@ export class ImageRequest {
);
}

parseJson(str) {
try {
return JSON.parse(str);
} catch (e) {
return [str];
}
}

generateRegExp(matchPattern) {
const patternStrings = matchPattern.split('/');
const flags = patternStrings.pop();
const parsedPatternString = matchPattern.slice(1, matchPattern.length - 1 - flags.length);
return new RegExp(parsedPatternString, flags);
}
/**
* Determines how to handle the request being made based on the URL path prefix to the image request.
* Categorizes a request as either "image" (uses the Sharp library), "thumbor" (uses Thumbor mapping), or "custom" (uses the rewrite function).
Expand Down
33 changes: 25 additions & 8 deletions source/image-handler/thumbor-mapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,37 @@ export class ThumborMapper {
} else {
let parsedPath = "";

if (typeof REWRITE_MATCH_PATTERN === "string") {
const patternStrings = REWRITE_MATCH_PATTERN.split("/");
const flags = patternStrings.pop();
const parsedPatternString = REWRITE_MATCH_PATTERN.slice(1, REWRITE_MATCH_PATTERN.length - 1 - flags.length);
const regExp = new RegExp(parsedPatternString, flags);
parsedPath = path.replace(regExp, REWRITE_SUBSTITUTION);
} else {
parsedPath = path.replace(REWRITE_MATCH_PATTERN, REWRITE_SUBSTITUTION);
const REWRITE_MATCH_PATTERNS = this.parseJson(REWRITE_MATCH_PATTERN);
const REWRITE_SUBSTITUTIONS = this.parseJson(REWRITE_SUBSTITUTION);

for (let k = 0; k < REWRITE_MATCH_PATTERNS.length; k++) {
let matchPattern = REWRITE_MATCH_PATTERNS[k]
if (typeof (matchPattern) === 'string') {
let regExp = this.generateRegExp(matchPattern);
parsedPath = path.replace(regExp, REWRITE_SUBSTITUTIONS[k]);
if (this.generateRegExp(matchPattern).test(path)) break;
} else {
parsedPath = path.replace(matchPattern, REWRITE_SUBSTITUTIONS[k]);
}
}

return parsedPath;
}
}
parseJson(str) {
try {
return JSON.parse(str);
} catch (e) {
return [str];
}
}

generateRegExp(matchPattern) {
const patternStrings = matchPattern.split('/');
const flags = patternStrings.pop();
const parsedPatternString = matchPattern.slice(1, matchPattern.length - 1 - flags.length);
return new RegExp(parsedPatternString, flags);
}
/**
* Maps background color the current edits object
* @param filterValue The specified color value
Expand Down