Issueid #232034 fix: Sometimes it take time to load icons #237
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| import { useEffect } from "react"; | ||
|
|
||
| export function useMediaCache(dbName = "MediaCacheDB", storeName = "media") { | ||
| useEffect(() => { | ||
| initializeDB(dbName, storeName); | ||
| }, [dbName, storeName]); | ||
|
|
||
| const initializeDB = (dbName, storeName) => { | ||
| const openDB = indexedDB.open(dbName, 1); | ||
|
|
||
| openDB.onupgradeneeded = () => { | ||
| const db = openDB.result; | ||
| if (!db.objectStoreNames.contains(storeName)) { | ||
| db.createObjectStore(storeName, { keyPath: "key" }); | ||
| } | ||
| }; | ||
|
|
||
| openDB.onerror = (e) => { | ||
| console.error("IndexedDB initialization error:", e.target.error); | ||
| }; | ||
| }; | ||
|
|
||
| const saveMedia = async (key, blob) => { | ||
| const db = await openDatabase(dbName); | ||
| return await putMedia(db, storeName, { key, blob }); | ||
| }; | ||
|
|
||
| const getMedia = async (key) => { | ||
| const db = await openDatabase(dbName); | ||
| return await fetchMedia(db, storeName, key); | ||
| }; | ||
|
|
||
| const cacheMedia = async (key, url) => { | ||
| try { | ||
| const cachedBlob = await getMedia(key); | ||
| if (cachedBlob) { | ||
| return URL.createObjectURL(cachedBlob); | ||
| } | ||
| return await fetchAndCacheMedia(key, url); | ||
| } catch (error) { | ||
| console.error(`Error caching media for key "${key}":`, error); | ||
| throw error; | ||
| } | ||
| }; | ||
|
Comment on lines
+33
to
+44
There was a problem hiding this comment. Prevent memory leaks and add cache management The caching implementation has potential memory leak issues and lacks important safeguards:
Apply these critical fixes: const cacheMedia = async (key, url) => {
try {
const cachedBlob = await getMedia(key);
if (cachedBlob) {
- return URL.createObjectURL(cachedBlob);
+ const objectUrl = URL.createObjectURL(cachedBlob);
+ // Store URL for cleanup
+ mediaUrls.set(key, objectUrl);
+ return objectUrl;
}
- return await fetchAndCacheMedia(key, url);
+ const controller = new AbortController();
+ const timeoutId = setTimeout(() => controller.abort(), 5000);
+
+ try {
+ return await fetchAndCacheMedia(key, url, controller.signal);
+ } finally {
+ clearTimeout(timeoutId);
+ }
} catch (error) {
+ if (error.name === 'AbortError') {
+ throw new Error(`Fetch timeout for media "${key}"`);
+ }
console.error(`Error caching media for key "${key}":`, error);
throw error;
}
};Add these utility functions for proper resource management: const mediaUrls = new Map();
const cleanupObjectUrl = (key) => {
const url = mediaUrls.get(key);
if (url) {
URL.revokeObjectURL(url);
mediaUrls.delete(key);
}
};
// Add this to the returned object
return {
cacheMedia,
cleanup: () => {
mediaUrls.forEach((url) => URL.revokeObjectURL(url));
mediaUrls.clear();
}
}; |
||
|
|
||
| const openDatabase = (dbName) => { | ||
| return new Promise((resolve, reject) => { | ||
| const openDB = indexedDB.open(dbName, 1); | ||
|
|
||
| openDB.onsuccess = () => resolve(openDB.result); | ||
| openDB.onerror = () => reject(openDB.error); | ||
| }); | ||
| }; | ||
|
|
||
| const putMedia = (db, storeName, media) => { | ||
| return new Promise((resolve, reject) => { | ||
| const tx = db.transaction(storeName, "readwrite"); | ||
| const store = tx.objectStore(storeName); | ||
| const putRequest = store.put(media); | ||
|
|
||
| putRequest.onsuccess = () => resolve(true); | ||
| putRequest.onerror = () => reject(putRequest.error); | ||
|
|
||
| tx.oncomplete = () => db.close(); | ||
| }); | ||
| }; | ||
|
|
||
| const fetchMedia = (db, storeName, key) => { | ||
| return new Promise((resolve, reject) => { | ||
| const tx = db.transaction(storeName, "readonly"); | ||
| const store = tx.objectStore(storeName); | ||
| const getRequest = store.get(key); | ||
|
|
||
| getRequest.onsuccess = () => resolve(getRequest.result?.blob || null); | ||
| getRequest.onerror = () => reject(getRequest.error); | ||
|
|
||
| tx.oncomplete = () => db.close(); | ||
| }); | ||
| }; | ||
|
|
||
| const fetchAndCacheMedia = async (key, url) => { | ||
| const response = await fetch(url); | ||
| const blob = await response.blob(); | ||
| await saveMedia(key, blob); | ||
| return URL.createObjectURL(blob); | ||
| }; | ||
|
Comment on lines
+81
to
+86
There was a problem hiding this comment. 🛠️ Refactor suggestion Improve error handling and add validation in fetchAndCacheMedia The function needs better error handling and validation:
Apply these improvements: const fetchAndCacheMedia = async (key, url) => {
- const response = await fetch(url);
- const blob = await response.blob();
- await saveMedia(key, blob);
- return URL.createObjectURL(blob);
+ const MAX_RETRIES = 3;
+ const MAX_BLOB_SIZE = 5 * 1024 * 1024; // 5MB
+
+ for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
+ try {
+ const response = await fetch(url);
+ if (!response.ok) {
+ throw new Error(`HTTP error! status: ${response.status}`);
+ }
+
+ const blob = await response.blob();
+ if (blob.size > MAX_BLOB_SIZE) {
+ throw new Error('Media file too large');
+ }
+
+ await saveMedia(key, blob);
+ const objectUrl = URL.createObjectURL(blob);
+ mediaUrls.set(key, objectUrl);
+ return objectUrl;
+ } catch (error) {
+ if (attempt === MAX_RETRIES) throw error;
+ await new Promise(resolve => setTimeout(resolve, 1000 * attempt));
+ }
+ }
};
|
||
|
|
||
| return { cacheMedia }; | ||
| } | ||
ajinkyapandetekdi marked this conversation as resolved.
Show resolved
Hide resolved
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,7 +14,6 @@ import { | |
| import axios from "axios"; | ||
| import WordsOrImage from "../../components/Mechanism/WordsOrImage"; | ||
| import { uniqueId } from "../../services/utilService"; | ||
| import LevelCompleteAudio from "../../assets/audio/levelComplete.wav"; | ||
| import { splitGraphemes } from "split-graphemes"; | ||
| import { Typography } from "@mui/material"; | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.