@lvce-editor/extension-management-worker 4.84.0 → 4.86.0

package/dist/extensionManagementWorkerMain.js

@@ -79,7 +79,7 @@ const get$7 = applicationId => {
   }
   return state$4.extensionsState;
 };
-const set$d = newState => {
+const set$e = newState => {
   if (newState.applicationId !== undefined) {
     const currentState = get$7(newState.applicationId);
     if (newState.applicationGeneration !== currentState.applicationGeneration) {
@@ -97,7 +97,7 @@ const update = (newState, applicationId) => {
     throw new Error('Cannot change extension application identity');
   }
   const current = get$7(applicationId);
-  set$d({
+  set$e({
     ...current,
     ...newState
   });
@@ -921,6 +921,9 @@ const restoreExistingError = (error, currentStack) => {
 };
 const restoreMethodNotFoundError = (error, currentStack) => {
   const restoredError = new JsonRpcError(error.message);
+  Object.assign(restoredError, {
+    code: error.code
+  });
   const parentStack = getParentStack(error);
   setStack(restoredError, `${parentStack}${NewLine$1}${currentStack}`);
   return restoredError;
@@ -940,9 +943,13 @@ const applyDataProperties = (restoredError, error) => {
     // @ts-ignore
     restoredError.codeFrame = error.data.codeFrame;
   }
-  if (error.data.code) {
+  if (typeof error.data.code === 'string' || typeof error.data.code === 'number') {
     // @ts-ignore
-    restoredError.code = error.data.code;
+    Object.defineProperty(restoredError, 'code', {
+      configurable: true,
+      value: error.data.code,
+      writable: true
+    });
   }
   if (error.data.type) {
     // @ts-ignore
@@ -963,7 +970,14 @@ const applyDirectProperties = (restoredError, error) => {
   }
 };
 const restoreMessageError = (error, _currentStack) => {
-  const restoredError = constructError(error.message, error.type, error.name);
+  const restoredError = constructError(error.message, error.type || error.data?.type, error.name);
+  if (typeof error.code === 'string' || typeof error.code === 'number') {
+    Object.defineProperty(restoredError, 'code', {
+      configurable: true,
+      value: error.code,
+      writable: true
+    });
+  }
   if (error.data) {
     applyDataProperties(restoredError, error);
   } else {
@@ -971,6 +985,23 @@ const restoreMessageError = (error, _currentStack) => {
   }
   return restoredError;
 };
+const getFallbackMessage = error => {
+  if (error && typeof error.message === 'string' && error.message) {
+    return error.message;
+  }
+  if (error && error.data) {
+    return getFallbackMessage(error.data);
+  }
+  const stringified = String(error);
+  if (stringified !== '[object Object]') {
+    return stringified;
+  }
+  try {
+    return JSON.stringify(error);
+  } catch {
+    return stringified;
+  }
+};
 const restoreJsonRpcError = error => {
   const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
@@ -979,13 +1010,13 @@ const restoreJsonRpcError = error => {
   if (error && error.code && error.code === MethodNotFound) {
     return restoreMethodNotFoundError(error, currentStack);
   }
+  if (error && error.error) {
+    return restoreJsonRpcError(error.error);
+  }
   if (error && error.message) {
     return restoreMessageError(error);
   }
-  if (typeof error === 'string') {
-    return new Error(`JsonRpc Error: ${error}`);
-  }
-  return new Error(`JsonRpc Error: ${error}`);
+  return new Error(`JsonRpc Error: ${getFallbackMessage(error)}`);
 };
 const unwrapJsonRpcResult = responseMessage => {
   if ('error' in responseMessage) {
@@ -1042,9 +1073,9 @@ const getErrorProperty = (error, prettyError) => {
   return {
     code: Custom,
     data: {
-      code: prettyError.code,
+      code: prettyError.code ?? error?.code,
       codeFrame: prettyError.codeFrame,
-      name: prettyError.name,
+      name: prettyError.name ?? error?.name,
       stack: getStack(prettyError),
       type: getErrorType(prettyError)
     },
@@ -1079,7 +1110,12 @@ const getErrorResponseSimple = (id, error) => {
   return {
     error: {
       code: Custom,
-      data: error,
+      data: error instanceof Error ? {
+        ...error,
+        code: 'code' in error ? error.code : undefined,
+        stack: error.stack,
+        type: error.name
+      } : error,
       // @ts-ignore
       message: error.message
     },
@@ -1518,7 +1554,7 @@ const RendererWorker = 1;
 const SharedProcess = 1492;
 
 const rpcs$2 = Object.create(null);
-const set$c = (id, rpc) => {
+const set$d = (id, rpc) => {
   rpcs$2[id] = rpc;
 };
 const get$5 = id => {
@@ -1551,7 +1587,7 @@ const create = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$c(rpcId, mockRpc);
+      set$d(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove$2(rpcId);
@@ -1560,15 +1596,29 @@ const create = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$c(rpcId, rpc);
+      set$d(rpcId, rpc);
     }
   };
 };
 
+const {
+  invoke: invoke$9,
+  set: set$c
+} = create(6010);
+
 const {
   invoke: invoke$8,
   set: set$b
-} = create(6010);
+} = create(19_001);
+const getCacheStorageItem = async (request, cacheName, bucketName, bucketOptions) => {
+  return invoke$8('Cache.getCacheStorageItem', request, cacheName, bucketName, bucketOptions);
+};
+const removeCacheStorageItem = async (request, cacheName, bucketName, bucketOptions) => {
+  return invoke$8('Cache.removeCacheStorageItem', request, cacheName, bucketName, bucketOptions);
+};
+const setCacheStorageItem = async (request, value, cacheName, headers, bucketName, bucketOptions) => {
+  return invoke$8('Cache.setCacheStorageItem', request, value, cacheName, headers, bucketName, bucketOptions);
+};
 
 const {
   invoke: invoke$7,
@@ -1668,20 +1718,22 @@ const createResponseFromData = data => {
 const cacheName$1 = 'Extensions'; // TODO
 
 const getJson$1 = async cacheKey => {
-  const response = await caches.match(cacheKey, {
-    cacheName: cacheName$1
-  });
-  if (!response) {
+  const item = await getCacheStorageItem(cacheKey, cacheName$1);
+  if (!item) {
     return undefined;
   }
-  const json = await response.json();
-  return json;
+  const body = item.body;
+  const json = typeof body === 'string' ? body : new TextDecoder().decode(body);
+  return JSON.parse(json);
 };
 const setJson = async (cacheKey, data) => {
   try {
-    const cache = await caches.open(cacheName$1);
     const response = createResponseFromData(data);
-    await cache.put(cacheKey, response);
+    const headers = Object.fromEntries(response.headers.entries());
+    const result = await setCacheStorageItem(cacheKey, await response.arrayBuffer(), cacheName$1, headers);
+    if (!result.success) {
+      throw new Error(result.errorMessage);
+    }
   } catch (error) {
     throw new VError(error, `Failed to add to cache`);
   }
@@ -2780,6 +2832,12 @@ const reset = applicationId => {
   }
 };
 
+const getCacheFileHandle = async (extensionId, name) => {
+  const digest = await crypto.subtle.digest('SHA-256', new TextEncoder().encode(extensionId));
+  const hash = Array.from(new Uint8Array(digest), byte => byte.toString(16).padStart(2, '0')).join('');
+  return invoke$8('Opfs.getCacheFileHandle', `extension-${hash}`, name);
+};
+
 const prefix = '[Extension] Uncaught Error: ';
 const handleUncaughtExtensionError = async error => {
   const prettyError = await invoke$7('Errors.prepare', error);
@@ -2918,8 +2976,7 @@ const deleteSecret = async (extensionId, key) => {
     await invoke$5('SecretStorage.delete', extensionId, key);
     return;
   }
-  const cache = await caches.open(cacheName);
-  await cache.delete(getRequestUrl(extensionId, key));
+  await removeCacheStorageItem(getRequestUrl(extensionId, key), cacheName);
 };
 const getSecret = async (extensionId, key) => {
   string(extensionId);
@@ -2927,9 +2984,12 @@ const getSecret = async (extensionId, key) => {
   if (isElectron()) {
     return invoke$5('SecretStorage.get', extensionId, key);
   }
-  const cache = await caches.open(cacheName);
-  const response = await cache.match(getRequestUrl(extensionId, key));
-  return response?.text();
+  const item = await getCacheStorageItem(getRequestUrl(extensionId, key), cacheName);
+  if (!item) {
+    return undefined;
+  }
+  const body = item.body;
+  return typeof body === 'string' ? body : new TextDecoder().decode(body);
 };
 const storeSecret = async (extensionId, key, value) => {
   string(extensionId);
@@ -2939,8 +2999,10 @@ const storeSecret = async (extensionId, key, value) => {
     await invoke$5('SecretStorage.store', extensionId, key, value);
     return;
   }
-  const cache = await caches.open(cacheName);
-  await cache.put(getRequestUrl(extensionId, key), new Response(value));
+  const result = await setCacheStorageItem(getRequestUrl(extensionId, key), value, cacheName);
+  if (!result.success) {
+    throw new Error(result.errorMessage);
+  }
 };
 
 class CommandNotFoundError extends Error {
@@ -2988,6 +3050,7 @@ const createExtensionCommandMap = (extensionId, invokeCommand = invokeGlobalComm
     return {
       ...inheritedCommands,
       'Extensions.executeCommand': (id, ...args) => executeCommand$1(invokeCommand, id, ...args),
+      'Extensions.getCacheFileHandle': name => invokeCommand('Extensions.getCacheFileHandle', name),
       'Extensions.registerFileChangeHandler': () => invokeCommand('Extensions.registerFileChangeHandler'),
       'Extensions.unregisterFileChangeHandler': () => invokeCommand('Extensions.unregisterFileChangeHandler')
     };
@@ -3006,6 +3069,9 @@ const createExtensionCommandMap = (extensionId, invokeCommand = invokeGlobalComm
     'Extensions.executeCommand'(id, ...args) {
       return executeCommand$1(invokeCommand, id, ...args);
     },
+    'Extensions.getCacheFileHandle'(name) {
+      return getCacheFileHandle(extensionId, name);
+    },
     'Extensions.getSecret'(key) {
       return getSecret(extensionId, key);
     },
@@ -3061,6 +3127,9 @@ const createIsolatedExtensionHostWorker = async (extensionId, absolutePath, work
   const runtimeId = getRuntimeId(extensionId, application);
   const invokeCommand = application === undefined ? undefined : (method, ...args) => {
     assertCurrentApplication(application);
+    if (method === 'Extensions.getCacheFileHandle') {
+      return getCacheFileHandle(extensionId, args[0]);
+    }
     if (method === 'Extensions.registerFileChangeHandler') {
       return register(extensionId, application.applicationId);
     }
@@ -3491,7 +3560,7 @@ const disableExtension2$1 = async (id, platform) => {
       ...oldState,
       disabledIds: [...oldState.disabledIds, id]
     };
-    set$d(newState);
+    set$e(newState);
   } else if (isWeb) {
     const cached = await getJson$1(disabledExtensionsCacheKey);
     const oldDisabled = getStringArray(cached?.disabledExtensions);
@@ -3516,7 +3585,7 @@ const enableExtension2$1 = async (id, platform) => {
       ...oldState,
       disabledIds: oldState.disabledIds.filter(existing => existing !== id)
     };
-    set$d(newState);
+    set$e(newState);
   } else if (isWeb) {
     const cached = await getJson$1(disabledExtensionsCacheKey);
     const oldDisabled = getStringArray(cached?.disabledExtensions);
@@ -5161,7 +5230,7 @@ const saveViewInstanceState = async (viewId, uid, assetDir, platform) => {
 };
 
 const getAccessToken = (options = {}) => {
-  return invoke$8('Auth.getAccessToken', options);
+  return invoke$9('Auth.getAccessToken', options);
 };
 
 const transparent = (color, factor) => {
@@ -6476,6 +6545,16 @@ const initializeAuthWorker = async () => {
       await sendMessagePortToAuthWorker(port, 0);
     }
   });
+  set$c(rpc);
+};
+
+const initializeCacheWorker = async () => {
+  const rpc = await create$5({
+    commandMap: commandMapRef,
+    async send(port) {
+      await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToCacheWorker', port);
+    }
+  });
   set$b(rpc);
 };
 
@@ -6518,7 +6597,7 @@ const initializeRendererWorker = async () => {
 
 const listen = async () => {
   Object.assign(commandMapRef, commandMap);
-  await Promise.all([initializeRendererWorker(), initializeAuthWorker(), initializeErrorWorker(), initializeFileSystemWorker(), initializeIframeWorker()]);
+  await Promise.all([initializeRendererWorker(), initializeAuthWorker(), initializeCacheWorker(), initializeErrorWorker(), initializeFileSystemWorker(), initializeIframeWorker()]);
 };
 
 const main = async () => {

package/package.json

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