@lvce-editor/main-process 6.30.0 → 6.31.0

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;
@@ -3453,7 +3443,7 @@ const remove$1 = pid => {
   number(pid);
   delete state$5.all[pid];
 };
-const getAll = () => {
+const getAll$1 = () => {
   return Object.entries(state$5.all);
 };
 const getByName = name => {
@@ -4127,6 +4117,9 @@ const hasWebContents = id => {
 const get$3 = id => {
   return state$2.views[id];
 };
+const getAll = () => {
+  return Object.values(state$2.views);
+};
 const remove = id => {
   delete state$2.views[id];
 };
@@ -4230,7 +4223,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 +4247,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 +4280,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;
@@ -5153,9 +5157,21 @@ const createMessagePort = async (ipcId, port, webContentsId) => {
   return webContentsId;
 };
 
+const getWebContentsViewName = url => {
+  if (URL.canParse(url)) {
+    const {
+      hostname
+    } = new URL(url);
+    if (hostname) {
+      return `renderer (webcontentsview, ${hostname})`;
+    }
+  }
+  return 'renderer (webcontentsview)';
+};
 const createPidMap = () => {
   const browserWindows = BrowserWindow.getAllWindows();
-  const utilityProcesses = getAll();
+  const webContentsViews = getAll();
+  const utilityProcesses = getAll$1();
   const pidWindowMap = Object.create(null);
   for (const browserWindow of browserWindows) {
     const {
@@ -5170,13 +5186,13 @@ const createPidMap = () => {
       const pid = devToolsWebContents.getOSProcessId();
       pidWindowMap[pid] = 'chrome-devtools';
     }
-    const views = browserWindow.getBrowserViews(); // TODO use webcontents views
-    for (const view of views) {
-      const viewWebContents = view.webContents;
-      const pid = viewWebContents.getOSProcessId();
-      const displayName = `browser-view-${viewWebContents.id}`;
-      pidWindowMap[pid] = displayName;
-    }
+  }
+  for (const value of webContentsViews) {
+    const {
+      webContents
+    } = value.view;
+    const pid = webContents.getOSProcessId();
+    pidWindowMap[pid] = getWebContentsViewName(webContents.getURL());
   }
   for (const [pid, value] of utilityProcesses) {
     // @ts-ignore
@@ -7600,6 +7616,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);
@@ -7607,7 +7631,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.30.0",
+  "version": "6.31.0",
   "keywords": [
     "lvce-editor",
     "electron"