@lvce-editor/update-worker 2.5.0 → 2.7.0

package/dist/updateWorkerMain.js

@@ -182,8 +182,8 @@ const getModuleNotFoundError = stderr => {
   const messageIndex = lines.findIndex(isModuleNotFoundMessage);
   const message = lines[messageIndex];
   return {
-    message,
-    code: ERR_MODULE_NOT_FOUND
+    code: ERR_MODULE_NOT_FOUND,
+    message
   };
 };
 const isModuleNotFoundError = stderr => {
@@ -206,14 +206,14 @@ const isUnhelpfulNativeModuleError = stderr => {
 const getNativeModuleErrorMessage = stderr => {
   const message = getMessageCodeBlock(stderr);
   return {
-    message: `Incompatible native node module: ${message}`,
-    code: E_INCOMPATIBLE_NATIVE_MODULE
+    code: E_INCOMPATIBLE_NATIVE_MODULE,
+    message: `Incompatible native node module: ${message}`
   };
 };
 const getModuleSyntaxError = () => {
   return {
-    message: `ES Modules are not supported in electron`,
-    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
+    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON,
+    message: `ES Modules are not supported in electron`
   };
 };
 const getHelpfulChildProcessError = (stdout, stderr) => {
@@ -232,8 +232,8 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
     rest
   } = getDetails(lines);
   return {
-    message: actualMessage,
     code: '',
+    message: actualMessage,
     stack: rest
   };
 };
@@ -243,8 +243,8 @@ class IpcError extends VError {
     if (stdout || stderr) {
       // @ts-ignore
       const {
-        message,
         code,
+        message,
         stack
       } = getHelpfulChildProcessError(stdout, stderr);
       const cause = new Error(message);
@@ -305,8 +305,8 @@ const wrap$f = global => {
 };
 const waitForFirstMessage = async port => {
   const {
-    resolve,
-    promise
+    promise,
+    resolve
   } = Promise.withResolvers();
   port.addEventListener('message', resolve, {
     once: true
@@ -326,8 +326,8 @@ const listen$6 = async () => {
   const type = firstMessage.params[0];
   if (type === 'message-port') {
     parentIpc.send({
-      jsonrpc: '2.0',
       id: firstMessage.id,
+      jsonrpc: '2.0',
       result: null
     });
     parentIpc.dispose();
@@ -369,56 +369,35 @@ const IpcChildWithModuleWorkerAndMessagePort$1 = {
   wrap: wrap$e
 };
 
-const Two = '2.0';
-const create$4 = (method, params) => {
-  return {
-    jsonrpc: Two,
-    method,
-    params
-  };
+class CommandNotFoundError extends Error {
+  constructor(command) {
+    super(`Command not found ${command}`);
+    this.name = 'CommandNotFoundError';
+  }
+}
+const commands = Object.create(null);
+const register = commandMap => {
+  Object.assign(commands, commandMap);
 };
-const callbacks = Object.create(null);
-const set$2 = (id, fn) => {
-  callbacks[id] = fn;
+const getCommand = key => {
+  return commands[key];
 };
+const execute = (command, ...args) => {
+  const fn = getCommand(command);
+  if (!fn) {
+    throw new CommandNotFoundError(command);
+  }
+  return fn(...args);
+};
+
+const Two$1 = '2.0';
+const callbacks = Object.create(null);
 const get$1 = id => {
   return callbacks[id];
 };
-const remove = id => {
+const remove$1 = id => {
   delete callbacks[id];
 };
-let id = 0;
-const create$3 = () => {
-  return ++id;
-};
-const registerPromise = () => {
-  const id = create$3();
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  set$2(id, resolve);
-  return {
-    id,
-    promise
-  };
-};
-const create$2 = (method, params) => {
-  const {
-    id,
-    promise
-  } = registerPromise();
-  const message = {
-    jsonrpc: Two,
-    method,
-    params,
-    id
-  };
-  return {
-    message,
-    promise
-  };
-};
 class JsonRpcError extends Error {
   constructor(message) {
     super(message);
@@ -435,12 +414,12 @@ const getErrorConstructor = (message, type) => {
     switch (type) {
       case DomException:
         return DOMException;
-      case TypeError$1:
-        return TypeError;
-      case SyntaxError$1:
-        return SyntaxError;
       case ReferenceError$1:
         return ReferenceError;
+      case SyntaxError$1:
+        return SyntaxError;
+      case TypeError$1:
+        return TypeError;
       default:
         return Error;
     }
@@ -569,7 +548,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove(id);
+  remove$1(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -596,27 +575,27 @@ const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
       code: MethodNotFound,
-      message: error.message,
-      data: error.stack
+      data: error.stack,
+      message: error.message
     };
   }
   return {
     code: Custom,
-    message: prettyError.message,
     data: {
-      stack: getStack(prettyError),
-      codeFrame: prettyError.codeFrame,
-      type: getErrorType(prettyError),
       code: prettyError.code,
-      name: prettyError.name
-    }
+      codeFrame: prettyError.codeFrame,
+      name: prettyError.name,
+      stack: getStack(prettyError),
+      type: getErrorType(prettyError)
+    },
+    message: prettyError.message
   };
 };
 const create$1$1 = (id, error) => {
   return {
-    jsonrpc: Two,
+    error,
     id,
-    error
+    jsonrpc: Two$1
   };
 };
 const getErrorResponse = (id, error, preparePrettyError, logError) => {
@@ -627,8 +606,8 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
 };
 const create$5 = (message, result) => {
   return {
-    jsonrpc: Two,
     id: message.id,
+    jsonrpc: Two$1,
     result: result ?? null
   };
 };
@@ -638,14 +617,14 @@ const getSuccessResponse = (message, result) => {
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two,
-    id,
     error: {
       code: Custom,
+      data: error,
       // @ts-ignore
-      message: error.message,
-      data: error
-    }
+      message: error.message
+    },
+    id,
+    jsonrpc: Two$1
   };
 };
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
@@ -675,35 +654,35 @@ const normalizeParams = args => {
   if (args.length === 1) {
     const options = args[0];
     return {
+      execute: options.execute,
       ipc: options.ipc,
+      logError: options.logError || defaultLogError,
       message: options.message,
-      execute: options.execute,
-      resolve: options.resolve || defaultResolve,
       preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
-      logError: options.logError || defaultLogError,
-      requiresSocket: options.requiresSocket || defaultRequiresSocket
+      requiresSocket: options.requiresSocket || defaultRequiresSocket,
+      resolve: options.resolve || defaultResolve
     };
   }
   return {
+    execute: args[2],
     ipc: args[0],
+    logError: args[5],
     message: args[1],
-    execute: args[2],
-    resolve: args[3],
     preparePrettyError: args[4],
-    logError: args[5],
-    requiresSocket: args[6]
+    requiresSocket: args[6],
+    resolve: args[3]
   };
 };
 const handleJsonRpcMessage = async (...args) => {
   const options = normalizeParams(args);
   const {
-    message,
-    ipc,
     execute,
-    resolve,
-    preparePrettyError,
+    ipc,
     logError,
-    requiresSocket
+    message,
+    preparePrettyError,
+    requiresSocket,
+    resolve
   } = options;
   if ('id' in message) {
     if ('method' in message) {
@@ -725,11 +704,51 @@ const handleJsonRpcMessage = async (...args) => {
   }
   throw new JsonRpcError('unexpected message');
 };
-const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
+
+const Two = '2.0';
+
+const create$4 = (method, params) => {
+  return {
+    jsonrpc: Two,
+    method,
+    params
+  };
+};
+
+const create$3 = (id, method, params) => {
+  const message = {
+    id,
+    jsonrpc: Two,
+    method,
+    params
+  };
+  return message;
+};
+
+let id = 0;
+const create$2 = () => {
+  return ++id;
+};
+
+const registerPromise = map => {
+  const id = create$2();
   const {
-    message,
+    promise,
+    resolve
+  } = Promise.withResolvers();
+  map[id] = resolve;
+  return {
+    id,
+    promise
+  };
+};
+
+const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
+  const {
+    id,
     promise
-  } = create$2(method, params);
+  } = registerPromise(callbacks);
+  const message = create$3(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -738,60 +757,40 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   const responseMessage = await promise;
   return unwrapJsonRpcResult(responseMessage);
 };
-const send = (transport, method, ...params) => {
-  const message = create$4(method, params);
-  transport.send(message);
-};
-const invoke$1 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, false);
-};
-const invokeAndTransfer = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, true);
-};
-
-class CommandNotFoundError extends Error {
-  constructor(command) {
-    super(`Command not found ${command}`);
-    this.name = 'CommandNotFoundError';
-  }
-}
-const commands = Object.create(null);
-const register = commandMap => {
-  Object.assign(commands, commandMap);
-};
-const getCommand = key => {
-  return commands[key];
-};
-const execute = (command, ...args) => {
-  const fn = getCommand(command);
-  if (!fn) {
-    throw new CommandNotFoundError(command);
-  }
-  return fn(...args);
-};
-
 const createRpc = ipc => {
+  const callbacks = Object.create(null);
+  ipc._resolve = (id, response) => {
+    const fn = callbacks[id];
+    if (!fn) {
+      console.warn(`callback ${id} may already be disposed`);
+      return;
+    }
+    fn(response);
+    delete callbacks[id];
+  };
   const rpc = {
+    async dispose() {
+      await ipc?.dispose();
+    },
+    invoke(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, false);
+    },
+    invokeAndTransfer(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, true);
+    },
     // @ts-ignore
     ipc,
     /**
      * @deprecated
      */
     send(method, ...params) {
-      send(ipc, method, ...params);
-    },
-    invoke(method, ...params) {
-      return invoke$1(ipc, method, ...params);
-    },
-    invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer(ipc, method, ...params);
-    },
-    async dispose() {
-      await ipc?.dispose();
+      const message = create$4(method, params);
+      ipc.send(message);
     }
   };
   return rpc;
 };
+
 const requiresSocket = () => {
   return false;
 };
@@ -804,8 +803,9 @@ const logError = () => {
 const handleMessage = event => {
   const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
   const actualExecute = event?.target?.execute || execute;
-  return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError, logError, actualRequiresSocket);
+  return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError, actualRequiresSocket);
 };
+
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
     ipc.addEventListener('message', handleMessage);
@@ -814,6 +814,7 @@ const handleIpc = ipc => {
     ipc.on('message', handleMessage);
   }
 };
+
 const listen$1 = async (module, options) => {
   const rawIpc = await module.listen(options);
   if (module.signal) {
@@ -822,6 +823,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
+
 const create$1 = async ({
   commandMap
 }) => {
@@ -832,17 +834,26 @@ const create$1 = async ({
   const rpc = createRpc(ipc);
   return rpc;
 };
-const WebWorkerRpcClient = {
-  __proto__: null,
-  create: create$1
-};
-
-const Electron = 2;
 
-const RendererWorker = 1;
-
-const DownloadingUpdate = 2;
-const DownloadedUpdate = 3;
+const createMockRpc = ({
+  commandMap
+}) => {
+  const invocations = [];
+  const invoke = (method, ...params) => {
+    invocations.push([method, ...params]);
+    const command = commandMap[method];
+    if (!command) {
+      throw new Error(`command ${method} not found`);
+    }
+    return command(...params);
+  };
+  const mockRpc = {
+    invocations,
+    invoke,
+    invokeAndTransfer: invoke
+  };
+  return mockRpc;
+};
 
 const rpcs = Object.create(null);
 const set$1 = (id, rpc) => {
@@ -851,9 +862,17 @@ const set$1 = (id, rpc) => {
 const get = id => {
   return rpcs[id];
 };
+const remove = id => {
+  delete rpcs[id];
+};
 
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
 const create = rpcId => {
   return {
+    async dispose() {
+      const rpc = get(rpcId);
+      await rpc.dispose();
+    },
     // @ts-ignore
     invoke(method, ...params) {
       const rpc = get(rpcId);
@@ -866,19 +885,35 @@ const create = rpcId => {
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
+    registerMockRpc(commandMap) {
+      const mockRpc = createMockRpc({
+        commandMap
+      });
+      set$1(rpcId, mockRpc);
+      // @ts-ignore
+      mockRpc[Symbol.dispose] = () => {
+        remove(rpcId);
+      };
+      // @ts-ignore
+      return mockRpc;
+    },
     set(rpc) {
       set$1(rpcId, rpc);
-    },
-    async dispose() {
-      const rpc = get(rpcId);
-      await rpc.dispose();
     }
   };
 };
 
+const Electron = 2;
+
+const RendererWorker = 1;
+
+const DownloadingUpdate = 2;
+const DownloadedUpdate = 3;
+
 const {
   invoke,
-  set} = create(RendererWorker);
+  set
+} = create(RendererWorker);
 
 const emptyObject = {};
 const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
@@ -929,8 +964,7 @@ const downloadToDisk = async (diskPath, response) => {
 
 const downloadUpdate = async updateUrl => {
   const response = await fetch(updateUrl, {
-    priority: 'low',
-    redirect: 'follow'
+    priority: 'low'
   });
   if (!response.ok) {
     throw new Error(response.statusText);
@@ -938,8 +972,24 @@ const downloadUpdate = async updateUrl => {
   return response;
 };
 
+const isLowDiskSpaceError = error => {
+  return error instanceof DOMException && error.name === 'NetworkError';
+};
 const putInCache = async (url, response, cache) => {
-  await cache.put(url, response);
+  try {
+    await cache.put(url, response);
+  } catch (error) {
+    // Gracefully handle cache errors (e.g., low disk space)
+    // Don't block the update process if caching fails
+    if (isLowDiskSpaceError(error)) {
+      // Silently ignore network errors when putting to cache
+      // This can happen when disk space is low
+      return;
+    }
+    // For other errors, also ignore to not block the update process
+    // but log them for debugging purposes
+    console.warn('Failed to put response in cache:', error);
+  }
 };
 
 const downloadUpdateToCache = async (downloadUrl, cache) => {
@@ -972,9 +1022,8 @@ const getCacheInternal = async (bucketName, cacheName) => {
   const twoWeeks = 14 * 24 * 60 * 60 * 1000;
   // @ts-ignore
   const bucket = await navigator.storageBuckets.open(bucketName, {
-    quota: 1000 * 1024 * 1024,
-    // 1 GB
-    expires: Date.now() + twoWeeks
+    expires: Date.now() + twoWeeks,
+    quota: 1000 * 1024 * 1024 // 1 GB
   });
   const cache = await bucket.caches.open(cacheName);
   return cache;
@@ -1030,7 +1079,7 @@ const getLatestReleaseVersion = async repository => {
 };
 
 const getUpdateUrl = (repository, fileNameTemplate, version) => {
-  const fileName = fileNameTemplate.replace('${version}', version);
+  const fileName = fileNameTemplate.replace('${version}', () => version);
   const url = `https://github.com/${repository}/releases/download/v${version}/${fileName}`;
   return url;
 };
@@ -1040,42 +1089,39 @@ const exec = async (path, args, options) => {
   await invoke('Exec.exec', path, args, options);
   // TODO
   return {
-    type: 0,
-    event: {}
+    event: {},
+    type: 0
   };
 };
 
 const Error$1 = 2;
 
-const getNsisUpdateArgs = () => {
+const getNSISUpdateArgs = () => {
   const args = ['--updated', '/S', '--force-run'];
   return args;
 };
 
 const installAndRestart = async downloadPath => {
   try {
-    const args = getNsisUpdateArgs();
+    const args = getNSISUpdateArgs();
     const {
-      type,
-      event
+      event,
+      type
     } = await exec(downloadPath, args, {
-      stdio: 'inherit',
-      detached: true
+      detached: true,
+      stdio: 'inherit'
     });
     if (type === Error$1) {
       throw new Error(`Child process error: ${event}`);
     }
   } catch (error) {
-    throw new VError(error, `Failed to install nsis update`);
+    throw new VError(error, `Failed to install NSIS update`);
   }
 };
 
 const isCached = async (url, cache) => {
   const match = await cache.match(url);
-  if (match) {
-    return true;
-  }
-  return false;
+  return !!match;
 };
 
 const isOnline = () => {
@@ -1095,52 +1141,52 @@ const doCheckForUpdates = async (updateSetting, repository, fileNameTemplate, bu
   try {
     if (!isOnline()) {
       return {
-        updated: false,
-        error: undefined
+        error: undefined,
+        updated: false
       };
     }
     const info = await getLatestReleaseVersion(repository);
     if (!info || !info.version) {
       return {
-        updated: false,
-        error: undefined
+        error: undefined,
+        updated: false
       };
     }
     const cache = await getCache(bucketName, cacheName);
     if (!(await shouldUpdate(updateSetting, info.version))) {
       return {
-        updated: false,
-        error: undefined
+        error: undefined,
+        updated: false
       };
     }
     const downloadUrl = getUpdateUrl(repository, fileNameTemplate, info.version);
 
     // @ts-ignore
     await invoke('Layout.setUpdateState', {
-      state: DownloadingUpdate,
-      progress: 0
+      progress: 0,
+      state: DownloadingUpdate
     });
     if (!(await isCached(downloadUrl, cache))) {
       await downloadUpdateToCache(downloadUrl, cache);
     }
     // @ts-ignore
     await invoke('Layout.setUpdateState', {
-      state: DownloadedUpdate,
-      progress: 1
+      progress: 1,
+      state: DownloadedUpdate
     });
     const messageRestart = promptRestart();
     const shouldRestart = await confirmPrompt(messageRestart);
     if (!shouldRestart) {
       return {
-        updated: false,
-        error: undefined
+        error: undefined,
+        updated: false
       };
     }
     const response = await cache.match(downloadUrl);
     if (!response) {
       return {
-        updated: false,
-        error: undefined
+        error: undefined,
+        updated: false
       };
     }
     const diskPath = await getDiskPath(downloadUrl);
@@ -1149,14 +1195,14 @@ const doCheckForUpdates = async (updateSetting, repository, fileNameTemplate, bu
     }
     await installAndRestart(diskPath);
     return {
-      updated: true,
-      error: undefined
+      error: undefined,
+      updated: true
     };
   } catch (error) {
     console.error(error);
     return {
-      updated: false,
-      error: undefined
+      error: undefined,
+      updated: false
     };
   }
 };
@@ -1176,8 +1222,8 @@ const checkForUpdates = async (updateSetting, repository) => {
   const result = await requestLock(lockName, async lock => {
     if (!lock) {
       return {
-        updated: false,
-        error: undefined
+        error: undefined,
+        updated: false
       };
     }
     const result = await doCheckForUpdates(updateSetting, repository, fileNameTemplate, bucketName, cacheName);
@@ -1187,12 +1233,12 @@ const checkForUpdates = async (updateSetting, repository) => {
 };
 
 const commandMap = {
-  'Update.downloadToCache': downloadUpdateToCache,
-  'Update.checkForUpdates': checkForUpdates
+  'Update.checkForUpdates': checkForUpdates,
+  'Update.downloadToCache': downloadUpdateToCache
 };
 
 const listen = async () => {
-  const rpc = await WebWorkerRpcClient.create({
+  const rpc = await create$1({
     commandMap: commandMap
   });
   set(rpc);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/update-worker",
-  "version": "2.5.0",
+  "version": "2.7.0",
   "description": "Update Worker",
   "repository": {
     "type": "git",