@lvce-editor/main-process 6.29.2 → 6.30.1

package/dist/mainProcessMain.js

@@ -754,19 +754,6 @@ function unhandled(inputOptions) {
   }
 }
 
-const setUserDataPath = value => {
-  app.setPath('userData', value);
-};
-const setSessionDataPath = value => {
-  app.setPath('sessionData', value);
-};
-const setCrashDumpsPath = value => {
-  app.setPath('crashDumps', value);
-};
-const setLogsPath = value => {
-  app.setPath('logs', value);
-};
-
 const Success = 0;
 const Error$3 = 1;
 
@@ -800,13 +787,16 @@ const homeDirectory = homedir();
 
 const xdgCache = env.XDG_CACHE_HOME || (homeDirectory ? join(homeDirectory, '.cache') : undefined);
 const xdgConfig = env.XDG_CONFIG_HOME || (homeDirectory ? join(homeDirectory, '.config') : undefined);
+const configDir = join(xdgConfig || tmpdir(), applicationName);
 const xdgData = env.XDG_DATA_HOME || (homeDirectory ? join(homeDirectory, '.local', 'share') : undefined);
 join(xdgData || tmpdir(), applicationName);
 const xdgState = env.XDG_STATE_HOME || (homeDirectory ? join(homeDirectory, '.local', 'state') : undefined);
 const logsDir = join(xdgState || tmpdir(), applicationName, 'logs');
-const chromeUserDataPath = xdgCache ? join(xdgCache, applicationName, 'userdata') : '';
+const electronUserDataPath = join(configDir, 'electron');
+const crashDumpsPath = join(electronUserDataPath, 'Crashpad');
+const electronSessionDataPath = join(xdgCache || tmpdir(), applicationName, 'userdata');
 const getArgvConfigPath = () => {
-  return join(xdgConfig || tmpdir(), applicationName, 'argv.json');
+  return join(configDir, 'argv.json');
 };
 
 const useIpcForResponse = true;
@@ -4230,7 +4220,7 @@ const requestSingleInstanceLock = argv => {
 // currently launching shared process takes 170ms
 // which means first paint is delayed by a lot
 
-const hydrate = async (isLinux, chromeUserDataPath, argv) => {
+const hydrate = async argv => {
   setMenu(null); // performance
   unhandled({
     logger() {},
@@ -4254,12 +4244,6 @@ const hydrate = async (isLinux, chromeUserDataPath, argv) => {
     await handleFastCliArgs(moduleId, parsedCliArgs);
     return;
   }
-  if (isLinux && chromeUserDataPath) {
-    setUserDataPath(chromeUserDataPath);
-    setSessionDataPath(chromeUserDataPath);
-    setCrashDumpsPath(chromeUserDataPath);
-    setLogsPath(chromeUserDataPath);
-  }
   if (!isPromptMode$1) {
     const hasLock = requestSingleInstanceLock(argv);
     if (!hasLock) {
@@ -4293,6 +4277,23 @@ const hydrate = async (isLinux, chromeUserDataPath, argv) => {
   await handleReady(parsedCliArgs, cwd());
 };
 
+const configure = ({
+  crashDumpsPath,
+  logsPath,
+  sessionDataPath,
+  userDataPath
+}) => {
+  for (const path of [crashDumpsPath, logsPath, sessionDataPath, userDataPath]) {
+    mkdirSync(path, {
+      recursive: true
+    });
+  }
+  app.setPath('userData', userDataPath);
+  app.setPath('sessionData', sessionDataPath);
+  app.setPath('crashDumps', crashDumpsPath);
+  app.setPath('logs', logsPath);
+};
+
 const {
   argv
 } = process;
@@ -4954,7 +4955,8 @@ class WindowLoadError extends VError {
 }
 
 const getLogFileName = (windowId, now = Date.now()) => {
-  return `${windowId}/${now}.txt`;
+  const timestamp = new Date(now).toISOString().replaceAll(':', '-');
+  return `${windowId}/${timestamp}.txt`;
 };
 const formatMessage = ({
   level,
@@ -7599,6 +7601,14 @@ const setStackTraceLimit = value => {
 // @ts-ignore
 performance.mark('code/start');
 const main = async () => {
+  if (isLinux) {
+    configure({
+      crashDumpsPath: crashDumpsPath,
+      logsPath: logsDir,
+      sessionDataPath: electronSessionDataPath,
+      userDataPath: electronUserDataPath
+    });
+  }
   const configArguments = await load(getArgvConfigPath());
   prepend(configArguments);
   Object.assign(commandMapRef, commandMap);
@@ -7606,7 +7616,7 @@ const main = async () => {
   on$1('uncaughtExceptionMonitor', handleUncaughtExceptionMonitor);
   // workaround for https://github.com/electron/electron/issues/36526
   on$1('unhandledRejection', handleUnhandledRejection);
-  await hydrate(isLinux, chromeUserDataPath, argv);
+  await hydrate(argv);
 };
 
 main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-process",
-  "version": "6.29.2",
+  "version": "6.30.1",
   "keywords": [
     "lvce-editor",
     "electron"