@lvce-editor/extension-management-worker 4.90.2 → 4.90.3

package/dist/extensionManagementWorkerMain.js

@@ -1729,10 +1729,9 @@ const createResponseFromData = data => {
   return response;
 };
 
-const cacheName$1 = 'Extensions'; // TODO
-
-const getJson$1 = async cacheKey => {
-  const item = await getCacheStorageItem(cacheKey, cacheName$1);
+const defaultCacheName = 'Extensions';
+const getJson$1 = async (cacheKey, cacheName = defaultCacheName) => {
+  const item = await getCacheStorageItem(cacheKey, cacheName);
   if (!item) {
     return undefined;
   }
@@ -1740,11 +1739,11 @@ const getJson$1 = async cacheKey => {
   const json = typeof body === 'string' ? body : new TextDecoder().decode(body);
   return JSON.parse(json);
 };
-const setJson = async (cacheKey, data) => {
+const setJson = async (cacheKey, data, cacheName = defaultCacheName) => {
   try {
     const response = createResponseFromData(data);
     const headers = Object.fromEntries(response.headers.entries());
-    const result = await setCacheStorageItem(cacheKey, await response.arrayBuffer(), cacheName$1, headers);
+    const result = await setCacheStorageItem(cacheKey, await response.arrayBuffer(), cacheName, headers);
     if (!result.success) {
       throw new Error(result.errorMessage);
     }
@@ -3072,7 +3071,7 @@ const hideNotificationsFromExtension = async extensionId => {
   await notifyNotificationsChanged();
 };
 
-const cacheName = 'ExtensionSecrets';
+const cacheName$1 = 'ExtensionSecrets';
 const getRequestUrl = (extensionId, key) => {
   return `https://secret-storage.invalid/${encodeURIComponent(extensionId)}/${encodeURIComponent(key)}`;
 };
@@ -3086,7 +3085,7 @@ const deleteSecret = async (extensionId, key) => {
     await invoke$5('SecretStorage.delete', extensionId, key);
     return;
   }
-  await removeCacheStorageItem(getRequestUrl(extensionId, key), cacheName);
+  await removeCacheStorageItem(getRequestUrl(extensionId, key), cacheName$1);
 };
 const getSecret = async (extensionId, key) => {
   string(extensionId);
@@ -3094,7 +3093,7 @@ const getSecret = async (extensionId, key) => {
   if (isElectron()) {
     return invoke$5('SecretStorage.get', extensionId, key);
   }
-  const item = await getCacheStorageItem(getRequestUrl(extensionId, key), cacheName);
+  const item = await getCacheStorageItem(getRequestUrl(extensionId, key), cacheName$1);
   if (!item) {
     return undefined;
   }
@@ -3109,7 +3108,7 @@ const storeSecret = async (extensionId, key, value) => {
     await invoke$5('SecretStorage.store', extensionId, key, value);
     return;
   }
-  const result = await setCacheStorageItem(getRequestUrl(extensionId, key), value, cacheName);
+  const result = await setCacheStorageItem(getRequestUrl(extensionId, key), value, cacheName$1);
   if (!result.success) {
     throw new Error(result.errorMessage);
   }
@@ -5529,6 +5528,38 @@ const getColorThemeCssCached = async (colorThemeId, platform, getData) => {
 const readJson = url => {
   return invoke$4('FileSystem.readJson', url);
 };
+const statWithMetadata = url => {
+  return invoke$4('FileSystem.statWithMetadata', url);
+};
+
+const getColorThemeJsonCacheKey = source => {
+  return `https://color-theme.cache/${encodeURIComponent(source)}`;
+};
+
+const cacheName = 'ColorThemes';
+const getColorThemeJsonCached = async (source, validator, getJson, forceReload = false) => {
+  const cacheKey = getColorThemeJsonCacheKey(source);
+  if (!forceReload) {
+    try {
+      const cached = await getJson$1(cacheKey, cacheName);
+      if (cached?.validator === validator) {
+        return cached.json;
+      }
+    } catch {
+      // Persistent cache errors must not prevent loading the theme.
+    }
+  }
+  const json = await getJson();
+  try {
+    await setJson(cacheKey, {
+      json,
+      validator
+    }, cacheName);
+  } catch {
+    // Persistent cache errors must not prevent loading the theme.
+  }
+  return json;
+};
 
 const join = (pathSeparator, ...parts) => {
   return parts.join(pathSeparator);
@@ -5555,30 +5586,57 @@ const getColorThemeUri = (extensions, colorThemeId) => {
   return '';
 };
 
-const getColorThemeJson$2 = async (colorThemeId, assetDir, platform) => {
+const getColorThemeJson$2 = async (colorThemeId, assetDir, platform, forceReload = false) => {
   const extensions = await getAllExtensions(assetDir, platform);
   const colorThemeUri = getColorThemeUri(extensions, colorThemeId);
   if (!colorThemeUri) {
     return {};
   }
-  const json = await readJson(colorThemeUri);
-  return json;
+  try {
+    const stat = await statWithMetadata(colorThemeUri);
+    if (typeof stat?.mtimeMs !== 'number' || typeof stat?.size !== 'number') {
+      return await readJson(colorThemeUri);
+    }
+    const validator = JSON.stringify({
+      mtimeMs: stat.mtimeMs,
+      size: stat.size
+    });
+    return getColorThemeJsonCached(colorThemeUri, validator, () => readJson(colorThemeUri), forceReload);
+  } catch {
+    return readJson(colorThemeUri);
+  }
 };
 
 const getColorThemeUrlWeb = (assetDir, colorThemeId) => {
   return `${assetDir}/extensions/builtin.theme-${colorThemeId}/color-theme.json`;
 };
-const getColorThemeJson$1 = (colorThemeId, assetDir) => {
+const getColorThemeJson$1 = (colorThemeId, assetDir, forceReload = false) => {
   const url = getColorThemeUrlWeb(assetDir, colorThemeId);
-  // TODO handle error ?
-  return getJson(url);
+  return getJsonCached(url, forceReload);
+};
+const getJsonCached = async (url, forceReload) => {
+  try {
+    const response = await fetch(url, {
+      method: 'HEAD'
+    });
+    if (!response.ok) {
+      return getJson(url);
+    }
+    const etag = response.headers.get('etag');
+    if (!etag) {
+      return getJson(url);
+    }
+    return getColorThemeJsonCached(url, etag, () => getJson(url), forceReload);
+  } catch {
+    return getJson(url);
+  }
 };
 
-const getColorThemeJson = (colorThemeId, platform, assetDir) => {
+const getColorThemeJson = (colorThemeId, platform, assetDir, forceReload = false) => {
   if (platform === Web) {
-    return getColorThemeJson$1(colorThemeId, assetDir);
+    return getColorThemeJson$1(colorThemeId, assetDir, forceReload);
   }
-  return getColorThemeJson$2(colorThemeId, assetDir, platform);
+  return getColorThemeJson$2(colorThemeId, assetDir, platform, forceReload);
 };
 
 const getColorThemeCssFromJson = async (colorThemeId, colorThemeJson) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-management-worker",
-  "version": "4.90.2",
+  "version": "4.90.3",
   "description": "Webworker for the Extension Management functionality in Lvce Editor.",
   "keywords": [
     "web-worker"