@lvce-editor/main-process 6.37.14 → 6.37.16

package/dist/mainProcessMain.js

@@ -1,5 +1,5 @@
 import * as Electron from 'electron';
-import Electron__default, { dialog, app, clipboard, BrowserWindow, MessageChannelMain, Menu, shell, desktopCapturer, contentTracing, net, netLog, powerSaveBlocker, safeStorage, screen, webContents, WebContentsView } from 'electron';
+import Electron__default, { dialog, app, clipboard, BrowserWindow, MessageChannelMain, Menu, safeStorage, shell, desktopCapturer, contentTracing, net, netLog, powerSaveBlocker, screen, webContents, WebContentsView } from 'electron';
 import process$1 from 'node:process';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { inspect } from 'node:util';
@@ -1657,7 +1657,7 @@ const setExitCode = code => {
   number(code);
   process.exitCode = code;
 };
-const exit$1 = code => {
+const exit$2 = code => {
   number(code);
   process.exit(code);
 };
@@ -1722,7 +1722,7 @@ const handleUncaughtExceptionMonitor = (error$1, origin) => {
   error(prettyError.codeFrame);
   error(prettyError.stack);
   if (BrowserWindow.getAllWindows().length === 0) {
-    exit$1(Error$3);
+    exit$2(Error$3);
   }
 };
 
@@ -1733,11 +1733,11 @@ const handleUnhandledRejection = (reason, promise) => {
   // @ts-ignore
   `[main process] unhandled rejection: ${prettyError.type}: ${prettyError.message}\n\n${prettyError.codeFrame}\n\n${prettyError.stack}\n`);
   if (BrowserWindow.getAllWindows().length === 0) {
-    exit$1(Error$3);
+    exit$2(Error$3);
   }
 };
 
-const exit = code => {
+const exit$1 = code => {
   if (code === undefined) {
     app.quit();
     return;
@@ -3552,11 +3552,11 @@ const requiresSocket = () => {
 };
 
 const handleChildError = error => {
-  exit$1(Error$3);
+  exit$2(Error$3);
 };
 const handleChildExit = code => {
   info(`[main process] shared process exited with code ${code}`);
-  exit$1(code);
+  exit$2(code);
 };
 const handleChildDisconnect = () => {
   info('[main process] shared process disconnected');
@@ -3659,7 +3659,7 @@ const handleCliArgs = async parsedArgs => {
       handleError(error);
     }
   } finally {
-    exit();
+    exit$1();
   }
 };
 
@@ -3680,6 +3680,12 @@ const whenReady = () => {
 const appendCommandLineSwitch = (commandLineSwitch, value) => {
   app.commandLine.appendSwitch(commandLineSwitch, value);
 };
+const relaunch = options => {
+  app.relaunch(options);
+};
+const exit = code => {
+  app.exit(code);
+};
 const isPackagedDeb = () => {
   return app.isPackaged && process.platform === 'linux' && !process.env.APPIMAGE;
 };
@@ -3810,6 +3816,46 @@ const handleBeforeQuit = () => {
   setShutDown();
 };
 
+const Base64 = 'base64';
+
+const getSelectedStorageBackend = () => {
+  return safeStorage.getSelectedStorageBackend();
+};
+const isEncryptionAvailable = () => {
+  return safeStorage.isEncryptionAvailable();
+};
+const setUsePlainTextEncryption = usePlainText => {
+  safeStorage.setUsePlainTextEncryption(usePlainText);
+};
+const encrypt = plainText => {
+  return safeStorage.encryptString(plainText).toString(Base64);
+};
+const decrypt = encrypted => {
+  const buffer = Buffer.from(encrypted, Base64);
+  return safeStorage.decryptString(buffer);
+};
+
+const hasPasswordStoreArgument = argv => {
+  return argv.some(argument => argument === '--password-store' || argument.startsWith('--password-store='));
+};
+const ensurePersistentSecretStorage = argv => {
+  if (!isLinux || isEncryptionAvailable()) {
+    return true;
+  }
+  if (getSelectedStorageBackend() === 'basic_text') {
+    setUsePlainTextEncryption(true);
+    return true;
+  }
+  if (hasPasswordStoreArgument(argv)) {
+    throw new Error('Persistent secret storage is unavailable');
+  }
+  relaunch({
+    args: ['--password-store=basic', ...argv.slice(1)]
+  });
+  exit(Success);
+  return false;
+};
+
 const handleReady = async (parsedArgs, workingDirectory) => {
   await invoke('HandleElectronReady.handleElectronReady', parsedArgs, workingDirectory);
 };
@@ -4235,7 +4281,7 @@ const schedule = parsedCliArgs => {
   if (!parsedCliArgs[Wait10Seconds]) {
     return false;
   }
-  setTimeout(exit, exitDelay);
+  setTimeout(exit$1, exitDelay);
   return true;
 };
 
@@ -4271,7 +4317,7 @@ const hydrate = async argv => {
   if (!isPromptMode$1) {
     const hasLock = requestSingleInstanceLock(argv);
     if (!hasLock) {
-      exit();
+      exit$1();
       return;
     }
   }
@@ -4283,7 +4329,7 @@ const hydrate = async argv => {
       detached: true,
       stdio: 'ignore'
     });
-    exit$1(Success);
+    exit$2(Success);
   }
 
   // command line switches
@@ -4298,6 +4344,9 @@ const hydrate = async argv => {
   on(WebContentsCreated, handleWebContentsCreated);
   on(SecondInstance, handleSecondInstance);
   await whenReady();
+  if (!ensurePersistentSecretStorage(argv)) {
+    return;
+  }
   mark(AppReady);
   await handleReady(parsedCliArgs, cwd());
 };
@@ -5835,26 +5884,6 @@ const stop = id => {
   powerSaveBlocker.stop(id);
 };
 
-const Base64 = 'base64';
-
-const ensureEncryptionAvailable = () => {
-  if (!safeStorage.isEncryptionAvailable() && isLinux) {
-    safeStorage.setUsePlainTextEncryption(true);
-  }
-};
-const isEncryptionAvailable = () => {
-  return safeStorage.isEncryptionAvailable();
-};
-const encrypt = plainText => {
-  ensureEncryptionAvailable();
-  return safeStorage.encryptString(plainText).toString(Base64);
-};
-const decrypt = encrypted => {
-  ensureEncryptionAvailable();
-  const buffer = Buffer.from(encrypted, Base64);
-  return safeStorage.decryptString(buffer);
-};
-
 const getWidth = () => {
   const primaryDisplay = screen.getPrimaryDisplay();
   return primaryDisplay.bounds.width;
@@ -7854,7 +7883,7 @@ const commandMap = {
   'ElectronWindow.getZoom': getZoom,
   'ElectronWindowGpuInfo.open': open,
   'ElectronWindowProcessExplorer.open2': open2,
-  'Exit.exit': exit,
+  'Exit.exit': exit$1,
   'GetWindowId.getWindowId': getWindowId,
   'HandleElectronMessagePort.handleElectronMessagePort': handleElectronMessagePort,
   'IpcParent.create': create$1,

package/package.json

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