Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Clear Space media cache after unfriend

Anand Baburajanf36387b45d7c
diff --git a/web/apps/space/src/services/space.ts b/web/apps/space/src/services/space.ts
index 1d2c59ebcb..527cc2f40a 100644
--- a/web/apps/space/src/services/space.ts
+++ b/web/apps/space/src/services/space.ts
@@ -4,6 +4,7 @@ import type { SpaceAccountCtxHandle } from "ente-space-wasm";
import type { PendingSpaceInvite } from "services/spaceInvite";
import {
cachedSpaceMediaBlobURL,
+ clearSpaceMediaCache,
rememberCachedSpaceMediaBlobURL,
spacePostMediaCacheKey,
spaceProfileMediaCacheKey,
@@ -942,6 +943,7 @@ export const removeCurrentSpaceFriend = async (
const ctx = await ensureCurrentSpaceContext();
try {
await ctx.removeFriendBySpace(actorSpaceId, spaceId);
+ await clearSpaceMediaCache();
clearSpaceFriendsCache();
} finally {
releaseCurrentSpaceContext(ctx);
diff --git a/web/apps/space/src/services/spaceMediaCache.ts b/web/apps/space/src/services/spaceMediaCache.ts
index 38f8a559ea..d9792c4806 100644
--- a/web/apps/space/src/services/spaceMediaCache.ts
+++ b/web/apps/space/src/services/spaceMediaCache.ts
@@ -1,5 +1,5 @@
import { savedPartialLocalUser } from "ente-accounts-rs/services/accounts-db";
-import { blobCache } from "ente-base/blob-cache";
+import { blobCache, clearBlobCache } from "ente-base/blob-cache";
import { apiOrigin } from "ente-base/origins";
import { blobPartForBytes } from "services/spaceProfilePayload";
@@ -155,3 +155,12 @@ export const clearSpaceMediaURLCache = () => {
}
spaceMediaURLCache.clear();
};
+
+export const clearSpaceMediaCache = async () => {
+ clearSpaceMediaURLCache();
+ try {
+ await clearBlobCache("space-media");
+ } catch (error) {
+ console.warn("Failed to clear Space media cache", error);
+ }
+};
diff --git a/web/packages/base/blob-cache.ts b/web/packages/base/blob-cache.ts
index dcaa92ecb2..be5df87c9a 100644
--- a/web/packages/base/blob-cache.ts
+++ b/web/packages/base/blob-cache.ts
@@ -103,6 +103,14 @@ export const openBlobCache = async (
): Promise<BlobCache> =>
isDesktop ? openOPFSCacheWeb(name) : openWebCache(name);
+/**
+ * Delete all data in the cache corresponding to {@link name}.
+ */
+export const clearBlobCache = async (name: BlobCacheNamespace) => {
+ cachedCaches.delete(name);
+ return isDesktop ? clearOPFSCache(name) : caches.delete(name);
+};
+
/**
* [Note: ArrayBuffer vs Blob vs Uint8Array]
*
@@ -239,6 +247,19 @@ export const clearBlobCaches = async () => {
const clearWebCaches = () =>
Promise.all(blobCacheNames.map((name) => caches.delete(name)));
+const clearOPFSCache = async (name: BlobCacheNamespace) => {
+ const root = await navigator.storage.getDirectory();
+ try {
+ const caches = await root.getDirectoryHandle("cache");
+ await caches.removeEntry(name, { recursive: true });
+ return true;
+ } catch (e) {
+ if (e instanceof DOMException && e.name == "NotFoundError")
+ return false;
+ throw e;
+ }
+};
+
const clearOPFSCaches = async () => {
const root = await navigator.storage.getDirectory();
await root.removeEntry("cache", { recursive: true });