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.

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

fix: compatible with cache api #114

Merged
merged 1 commit into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@openim/wasm-client-sdk",
"version": "3.8.1",
"version": "3.8.2-beta.0",
"description": "open im sdk for web",
"source": "src/index.ts",
"main": "lib/index.js",
Expand Down
39 changes: 19 additions & 20 deletions src/sdk/initialize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,28 +51,27 @@ export function getGoExitPromise() {
}

async function fetchWithCache(url: string): Promise<Response> {
if (!('caches' in window)) {
return fetch(url);
}

const cache = await caches.open(CACHE_KEY);
const cachedResponse = await cache.match(url);
const isResourceUpdated = async () => {
const serverResponse = await fetch(url, { method: 'HEAD' });
const etag = serverResponse.headers.get('ETag');
const lastModified = serverResponse.headers.get('Last-Modified');
return (
serverResponse.ok &&
(etag !== cachedResponse?.headers.get('ETag') ||
lastModified !== cachedResponse?.headers.get('Last-Modified'))
);
};
try {
const cache = await caches.open(CACHE_KEY);
const cachedResponse = await cache.match(url);
const isResourceUpdated = async () => {
const serverResponse = await fetch(url, { method: 'HEAD' });
const etag = serverResponse.headers.get('ETag');
const lastModified = serverResponse.headers.get('Last-Modified');
return (
serverResponse.ok &&
(etag !== cachedResponse?.headers.get('ETag') ||
lastModified !== cachedResponse?.headers.get('Last-Modified'))
);
};
if (cachedResponse && !(await isResourceUpdated())) {
return cachedResponse;
}

if (cachedResponse && !(await isResourceUpdated())) {
return cachedResponse;
return fetchAndUpdateCache(url, cache);
} catch (error) {
return fetch(url);
}

return fetchAndUpdateCache(url, cache);
}

async function fetchAndUpdateCache(
Expand Down