@lvce-editor/main-process 6.27.1 → 6.28.0

package/dist/mainProcessMain.js

@@ -7,7 +7,7 @@ import { spawn } from 'node:child_process';
 import { Console } from 'node:console';
 import { mkdirSync, createWriteStream, readFileSync, openAsBlob, existsSync, writeFileSync, rmSync, openSync, writeSync, closeSync } from 'node:fs';
 import * as NodePath from 'node:path';
-import { dirname, join as join$1, isAbsolute } from 'node:path';
+import { dirname as dirname$1, join as join$1, isAbsolute } from 'node:path';
 import { homedir, tmpdir } from 'node:os';
 import { readFile } from 'node:fs/promises';
 import { pbkdf2Sync, createDecipheriv, createHash } from 'node:crypto';
@@ -784,8 +784,11 @@ const getNewLineIndex$2 = (string, startIndex = undefined) => {
 const join = (...paths) => {
   return NodePath.join(...paths);
 };
+const dirname = path => {
+  return NodePath.dirname(path);
+};
 
-const __dirname$1 = dirname(fileURLToPath(import.meta.url));
+const __dirname$1 = dirname$1(fileURLToPath(import.meta.url));
 const root = process.env.LVCE_ROOT || join(__dirname$1, '../../../../..');
 
 const {
@@ -819,58 +822,62 @@ const getSharedProcessPath = () => {
 };
 
 const createFileLogger = fileName => {
-  mkdirSync(logsDir, {
+  const logFile = join(logsDir, fileName);
+  mkdirSync(dirname(logFile), {
     recursive: true
   });
-  const logFile = join(logsDir, fileName);
   const writeStream = createWriteStream(logFile);
-  return new Console(writeStream);
+  const logger = new Console(writeStream);
+  logger.dispose = () => {
+    writeStream.end();
+  };
+  return logger;
 };
 
 // TODO disable logging via environment variable, don't enable logging during tests
 
-const state$7 = {
+const state$6 = {
   console: undefined
 };
 const createConsole = () => {
   return createFileLogger('log-main-process.txt');
 };
-const getOrCreateLogger$1 = () => {
-  state$7.console ||= createConsole();
-  return state$7.console;
+const getOrCreateLogger = () => {
+  state$6.console ||= createConsole();
+  return state$6.console;
 };
 const info = (...args) => {
-  const logger = getOrCreateLogger$1();
+  const logger = getOrCreateLogger();
   logger.info(...args);
   console.info(...args);
 };
 const error = (...args) => {
-  const logger = getOrCreateLogger$1();
+  const logger = getOrCreateLogger();
   logger.error(...args);
   console.error(...args);
 };
 process.stdout.on('close', () => {
-  const logger = getOrCreateLogger$1();
+  const logger = getOrCreateLogger();
   logger.info('stdout closed');
 });
 process.stdout.on('exit', () => {
-  const logger = getOrCreateLogger$1();
+  const logger = getOrCreateLogger();
   logger.info('stdout exited');
 });
 process.stderr.on('close', () => {
-  const logger = getOrCreateLogger$1();
+  const logger = getOrCreateLogger();
   logger.info('stderr closed');
 });
 process.stderr.on('exit', () => {
-  const logger = getOrCreateLogger$1();
+  const logger = getOrCreateLogger();
   logger.info('stderr exited');
 });
 process.stdout.on('error', error => {
-  const logger = getOrCreateLogger$1();
+  const logger = getOrCreateLogger();
   logger.error(`[main-process] stdout error: ${error.stack}`);
 });
 process.stderr.on('error', error => {
-  const logger = getOrCreateLogger$1();
+  const logger = getOrCreateLogger();
   logger.error(`[main-process] stderr error: ${error.stack}`);
 });
 
@@ -3428,27 +3435,27 @@ const formatUtilityProcessName = name => {
   return camelCase(name);
 };
 
-const state$6 = {
+const state$5 = {
   all: Object.create(null)
 };
 const add$2 = (pid, process, name) => {
   number(pid);
   object(process);
   string(name);
-  state$6.all[pid] = {
+  state$5.all[pid] = {
     name,
     process
   };
 };
 const remove$1 = pid => {
   number(pid);
-  delete state$6.all[pid];
+  delete state$5.all[pid];
 };
 const getAll = () => {
-  return Object.entries(state$6.all);
+  return Object.entries(state$5.all);
 };
 const getByName = name => {
-  for (const value of Object.values(state$6.all)) {
+  for (const value of Object.values(state$5.all)) {
     // @ts-ignore
     if (value.name === name) {
       // @ts-ignore
@@ -3605,7 +3612,7 @@ const launchSharedProcess = async ({
   return sharedProcessRpc;
 };
 
-const state$5 = {
+const state$4 = {
   /**
    * @type {any}
    */
@@ -3616,14 +3623,14 @@ const getOrCreate = async ({
   env = {},
   method
 }) => {
-  if (!state$5.promise) {
+  if (!state$4.promise) {
     // @ts-ignore
-    state$5.promise = launchSharedProcess({
+    state$4.promise = launchSharedProcess({
       env,
       method
     });
   }
-  return state$5.promise;
+  return state$4.promise;
 };
 const send$1 = async (method, ...params) => {
   const rpc = await getOrCreate({
@@ -3788,14 +3795,14 @@ const createTitleBar = items => {
 
 const PHASE_DEFAULT = 0;
 const PHASE_SHUTDOWN = -1;
-const state$4 = {
+const state$3 = {
   phase: PHASE_DEFAULT
 };
 const isShutDown = () => {
-  return state$4.phase === PHASE_SHUTDOWN;
+  return state$3.phase === PHASE_SHUTDOWN;
 };
 const setShutDown = () => {
-  state$4.phase = PHASE_SHUTDOWN;
+  state$3.phase = PHASE_SHUTDOWN;
 };
 
 // TODO move this function to shared process
@@ -4094,21 +4101,21 @@ const openExternal = async url => {
   await shell.openExternal(url);
 };
 
-const state$3 = {
+const state$2 = {
   canceled: Object.create(null),
   fallThroughKeyBindings: [],
   views: Object.create(null)
 };
 const add$1 = (id, browserWindow, view) => {
   // state
-  state$3.views[id] = {
+  state$2.views[id] = {
     browserWindow,
     view
   };
 };
 const hasWebContents = id => {
   number(id);
-  return id in state$3.views;
+  return id in state$2.views;
 };
 /**
  *
@@ -4116,19 +4123,19 @@ const hasWebContents = id => {
  * @returns {{browserWindow: Electron.BrowserWindow, view: Electron.WebContentsView}}
  */
 const get$3 = id => {
-  return state$3.views[id];
+  return state$2.views[id];
 };
 const remove = id => {
-  delete state$3.views[id];
+  delete state$2.views[id];
 };
 const setFallthroughKeyBindings = fallthroughKeyBindings => {
-  state$3.fallThroughKeyBindings = fallthroughKeyBindings;
+  state$2.fallThroughKeyBindings = fallthroughKeyBindings;
 };
 const getFallthroughKeyBindings = () => {
-  return state$3.fallThroughKeyBindings;
+  return state$2.fallThroughKeyBindings;
 };
 const setCanceled = id => {
-  state$3.canceled[id] = true;
+  state$2.canceled[id] = true;
 };
 
 const shouldAllowNavigation = webContentsId => {
@@ -4660,6 +4667,33 @@ const load = async (path, env = process.env) => {
   }
 };
 
+const createWindowCloseHandler = (window, rpc, onError, dispose = () => {}) => {
+  let closePending = false;
+  const handleWindowClose = event => {
+    event.preventDefault();
+    if (closePending) {
+      return;
+    }
+    closePending = true;
+    void (async () => {
+      try {
+        await rpc.invoke('Window.prepareClose');
+      } catch (error) {
+        onError(error);
+      } finally {
+        try {
+          dispose();
+        } catch (error) {
+          onError(error);
+        }
+        window.off('close', handleWindowClose);
+        window.close();
+      }
+    })();
+  };
+  return handleWindowClose;
+};
+
 const accessControlAllowOrigin = 'access-control-allow-origin';
 const getCorsResponseHeaders = (responseHeaders = {}) => {
   const hasAccessControlAllowOrigin = Object.keys(responseHeaders).some(key => key.toLowerCase() === accessControlAllowOrigin);
@@ -4831,20 +4865,20 @@ const createElectronSession = () => {
   return session;
 };
 
-const state$2 = {
+const state$1 = {
   session: undefined
 };
 const has = () => {
-  return Boolean(state$2.session);
+  return Boolean(state$1.session);
 };
 const get$2 = () => {
-  if (!state$2.session) {
+  if (!state$1.session) {
     throw new Error('session is not defined');
   }
-  return state$2.session;
+  return state$1.session;
 };
 const set$1 = value => {
-  state$2.session = value;
+  state$1.session = value;
 };
 
 const create$2 = rpc => {
@@ -4902,12 +4936,8 @@ class WindowLoadError extends VError {
   }
 }
 
-const state$1 = {
-  console: undefined
-};
-const getOrCreateLogger = () => {
-  state$1.console ||= createFileLogger('log-window.txt');
-  return state$1.console;
+const getLogFileName = (windowId, now = Date.now()) => {
+  return `${windowId}/${now}.txt`;
 };
 const formatMessage = ({
   level,
@@ -4924,10 +4954,13 @@ const formatMessage = ({
     timestamp: new Date().toISOString()
   });
 };
-const addListener = (webContents, logger = getOrCreateLogger()) => {
+const addListener = (windowId, webContents, logger = createFileLogger(getLogFileName(windowId))) => {
   webContents.on('console-message', event => {
     logger.log(formatMessage(event));
   });
+  webContents.on('destroyed', () => {
+    logger.dispose?.();
+  });
 };
 
 // TODO impossible to test these methods
@@ -4973,7 +5006,7 @@ const createAppWindow = async (windowOptions, parsedArgs, workingDirectory, titl
     }
   });
   mark(DidCreateCodeWindow);
-  addListener(window.webContents);
+  addListener(window.id, window.webContents);
   addDevDiagnostics(window);
   const handleReadyToShow = () => {
     // due to electron bug, zoom level needs to be set here,
@@ -4996,14 +5029,7 @@ const createAppWindow = async (windowOptions, parsedArgs, workingDirectory, titl
     webContents: window.webContents
   });
   const disposeFullScreenListener = listen$1(window, rpc);
-  const handleWindowClose = () => {
-    try {
-      disposeFullScreenListener();
-      window.off('close', handleWindowClose);
-    } catch (error) {
-      handleError(new VError(error, `Failed to run window close listener`));
-    }
-  };
+  const handleWindowClose = createWindowCloseHandler(window, rpc, error => handleError(new VError(error, `Failed to prepare window close`)), disposeFullScreenListener);
   window.on('close', handleWindowClose);
   await loadUrl(window, url);
 };

package/package.json

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