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

Strict SW catalog image checking. #2392

Merged
merged 4 commits into from
May 12, 2020
Merged

Strict SW catalog image checking. #2392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
050c6cd
Added strict filename check instead of includes in catalog cache hand…
revanth0212 May 11, 2020
de630c9
Minor change.
revanth0212 May 11, 2020
7a9f91e
Added test to replicate the issue at hand.
revanth0212 May 12, 2020
d3ec624
Update packages/venia-concept/src/ServiceWorker/Utilities/__tests__/i…
revanth0212 May 12, 2020
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
19 changes: 19 additions & 0 deletions packages/venia-concept/src/ServiceWorker/Utilities/__tests__/imageCacheHandler.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,25 @@ describe('Testing findSameOrLargerImage', () => {
expect(returnedResponse.url).toBe(expectedUrl);
});

test('Should not return response if URL for same filename is not available', async () => {
const fileName1 = 'prefixed-file-name.jpg';
const fileName2 = 'file-name.jpg';

mockMatchFn.mockReturnValue(
Promise.resolve({
url: `https://develop.pwa-venia.com/media/catalog/v/s/${fileName1}?auto=webp&format=pjpg&width=1600&height=2000`
})
);

const returnedResponse = await findSameOrLargerImage(
new URL(
`https://develop.pwa-venia.com/media/catalog/v/s/${fileName2}?auto=webp&format=pjpg&width=1600&height=2000`
)
);

expect(returnedResponse).toBeUndefined();
});

test('Should return the closest high resolution image response from cache for a given width', async () => {
const requestedUrl =
'https://develop.pwa-venia.com/media/catalog/v/s/vsk12-la_main_3.jpg?auto=webp&format=pjpg&width=800&height=1000';
Expand Down
8 changes: 5 additions & 3 deletions packages/venia-concept/src/ServiceWorker/Utilities/imageCacheHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ export const findSameOrLargerImage = async url => {

const cache = await caches.open(CATALOG_CACHE_NAME);
const cachedURLs = await cache.keys();
const cachedSources = await cachedURLs.filter(({ url }) =>
url.includes(requestedFilename)
);
const cachedSources = await cachedURLs.filter(({ url }) => {
const cachedFileName = new URL(url).pathname.split('/').reverse()[0];

return cachedFileName === requestedFilename;
});

// Find the cached version of this image that is closest to the requested
// width without going under it.
Expand Down