@lvce-editor/main-process 6.46.1 → 6.47.0

package/dist/mainProcessMain.js

@@ -5689,7 +5689,7 @@ const openContextMenu = async (menuItems, x, y, browserViewId) => {
 };
 
 const profileDuration = 10_000;
-const getFileName$1 = targetName => {
+const getFileName$2 = targetName => {
   const safeTargetName = targetName.replaceAll(/[^a-zA-Z0-9._-]+/g, '-').replace(/^-/, '').replace(/-$/, '') || 'extension-host';
   return `${safeTargetName}-${Date.now()}.cpuprofile`;
 };
@@ -5744,7 +5744,7 @@ const takeCpuProfile = async (windowId, workerName) => {
       recursive: true
     });
     const targetName = workerName || `Extension Host Window ${windowId}`;
-    filePath = join$1(downloadsPath, getFileName$1(targetName));
+    filePath = join$1(downloadsPath, getFileName$2(targetName));
     writeFileSync(filePath, JSON.stringify(profile), {
       flag: 'wx'
     });
@@ -5788,7 +5788,7 @@ const takeWorkerCpuProfile = async (windowId, workerName) => {
   return takeCpuProfile(windowId, workerName);
 };
 
-const getFileName = workerName => {
+const getFileName$1 = workerName => {
   const safeWorkerName = workerName.replaceAll(/[^a-zA-Z0-9._-]+/g, '-').replace(/^-/, '').replace(/-$/, '') || 'worker';
   return `${safeWorkerName}-${Date.now()}.heapsnapshot`;
 };
@@ -5828,7 +5828,7 @@ const takeWorkerHeapSnapshot = async (windowId, workerName) => {
     mkdirSync(downloadsPath, {
       recursive: true
     });
-    filePath = join$1(downloadsPath, getFileName(workerName));
+    filePath = join$1(downloadsPath, getFileName$1(workerName));
     fileDescriptor = openSync(filePath, 'wx');
     const currentFileDescriptor = fileDescriptor;
     let writeError;
@@ -5882,6 +5882,96 @@ const takeWorkerHeapSnapshot = async (windowId, workerName) => {
   }
 };
 
+const getFileName = pid => {
+  return `renderer-${pid}-${Date.now()}.heapsnapshot`;
+};
+const getRendererWebContents = pid => {
+  for (const browserWindow of Electron.BrowserWindow.getAllWindows()) {
+    const {
+      webContents
+    } = browserWindow;
+    if (webContents.getOSProcessId() === pid) {
+      return webContents;
+    }
+  }
+  for (const value of getAll()) {
+    const {
+      webContents
+    } = value.view;
+    if (webContents.getOSProcessId() === pid) {
+      return webContents;
+    }
+  }
+  return undefined;
+};
+const takeRendererHeapSnapshot = async pid => {
+  number(pid);
+  const webContents = getRendererWebContents(pid);
+  if (!webContents) {
+    throw new Error(`Renderer process not found: ${pid}`);
+  }
+  if (webContents.isDestroyed()) {
+    throw new Error(`Renderer process was destroyed: ${pid}`);
+  }
+  const electronDebugger = webContents.debugger;
+  const wasAttached = electronDebugger.isAttached();
+  let fileDescriptor;
+  let filePath = '';
+  let writeError;
+  let success = false;
+  if (!wasAttached) {
+    electronDebugger.attach();
+  }
+  try {
+    const downloadsPath = Electron.app.getPath('downloads');
+    mkdirSync(downloadsPath, {
+      recursive: true
+    });
+    filePath = join$1(downloadsPath, getFileName(pid));
+    fileDescriptor = openSync(filePath, 'wx');
+    const currentFileDescriptor = fileDescriptor;
+    const handleMessage = (_event, method, parameters, sessionId) => {
+      if (method !== 'HeapProfiler.addHeapSnapshotChunk' || sessionId || writeError) {
+        return;
+      }
+      try {
+        writeSync(currentFileDescriptor, parameters.chunk);
+      } catch (error) {
+        writeError = error;
+      }
+    };
+    electronDebugger.on('message', handleMessage);
+    try {
+      await electronDebugger.sendCommand('HeapProfiler.enable');
+      await electronDebugger.sendCommand('HeapProfiler.takeHeapSnapshot', {
+        reportProgress: false
+      });
+      if (writeError) {
+        throw writeError;
+      }
+    } finally {
+      electronDebugger.off('message', handleMessage);
+    }
+    success = true;
+    return pathToFileURL(filePath).href;
+  } finally {
+    try {
+      if (fileDescriptor !== undefined) {
+        closeSync(fileDescriptor);
+      }
+      if (!success && filePath) {
+        rmSync(filePath, {
+          force: true
+        });
+      }
+    } finally {
+      if (!wasAttached && electronDebugger.isAttached()) {
+        electronDebugger.detach();
+      }
+    }
+  }
+};
+
 const getPerformanceEntries = () => {
   const entries = getEntries();
   const {
@@ -6741,40 +6831,44 @@ const attach$9 = (webContents, listener) => {
 const detach$6 = (webContents, listener) => {
   webContents.off(PageFaviconUpdated, listener);
 };
-const getFaviconDataUrl = async (fetcher, favicon, signal) => {
+const getFaviconData = async (fetcher, favicon, signal) => {
   try {
     const response = await fetcher(favicon, {
       signal
     });
     if (!response.ok) {
-      return '';
+      return undefined;
     }
     const contentLength = Number(response.headers.get('content-length'));
     if (contentLength > maxFaviconBytes) {
-      return '';
+      return undefined;
     }
-    const bytes = Buffer.from(await response.arrayBuffer());
+    const bytes = new Uint8Array(await response.arrayBuffer());
     if (bytes.byteLength > maxFaviconBytes) {
-      return '';
+      return undefined;
     }
     const contentType = response.headers.get('content-type') || 'image/x-icon';
     const mimeType = contentType.split(';', 1)[0].trim();
     if (!mimeType.startsWith('image/') && mimeType !== 'application/octet-stream') {
-      return '';
+      return undefined;
     }
-    return `data:${mimeType};base64,${bytes.toString('base64')}`;
+    return {
+      bytes,
+      mimeType,
+      url: favicon
+    };
   } catch {
-    return '';
+    return undefined;
   }
 };
 const resolveWithFetcher = async (fetcher, favicons, signal) => {
   for (const favicon of favicons) {
-    const dataUrl = await getFaviconDataUrl(fetcher, favicon, signal);
-    if (dataUrl) {
-      return dataUrl;
+    const data = await getFaviconData(fetcher, favicon, signal);
+    if (data) {
+      return data;
     }
   }
-  return '';
+  return undefined;
 };
 const resolveWithTimeout = async (fetcher, favicons) => {
   const controller = new AbortController();
@@ -6782,7 +6876,7 @@ const resolveWithTimeout = async (fetcher, favicons) => {
   const timeoutPromise = new Promise(resolve => {
     timeout = setTimeout(() => {
       controller.abort();
-      resolve('');
+      resolve(undefined);
     }, faviconFetchTimeout);
   });
   try {
@@ -6794,7 +6888,8 @@ const resolveWithTimeout = async (fetcher, favicons) => {
 const resolveFavicon = async (webContents, favicons) => {
   const dataUrl = favicons.find(favicon => favicon.startsWith('data:'));
   if (dataUrl) {
-    return [dataUrl];
+    const data = await resolveWithTimeout((url, options) => fetch(url, options), [dataUrl]);
+    return data ? [data] : [dataUrl];
   }
   const sessionFavicon = await resolveWithTimeout((url, options) => webContents.session.fetch(url, options), favicons);
   if (sessionFavicon) {
@@ -6806,7 +6901,8 @@ const resolveFavicon = async (webContents, favicons) => {
 const resolveNetworkFavicon = async favicons => {
   const dataUrl = favicons.find(favicon => favicon.startsWith('data:'));
   if (dataUrl) {
-    return [dataUrl];
+    const data = await resolveWithTimeout((url, options) => fetch(url, options), [dataUrl]);
+    return data ? [data] : [dataUrl];
   }
   const networkFavicon = await resolveWithTimeout((url, options) => fetch(url, options), favicons);
   return networkFavicon ? [networkFavicon] : [];
@@ -8180,6 +8276,7 @@ const commandMap = {
   'ElectronContextMenu.openContextMenu': openContextMenu,
   'ElectronDeveloper.crashMainProcess': crashMainProcess,
   'ElectronDeveloper.getPerformanceEntries': getPerformanceEntries,
+  'ElectronDeveloper.takeRendererHeapSnapshot': takeRendererHeapSnapshot,
   'ElectronDeveloper.takeWindowCpuProfile': takeWindowCpuProfile,
   'ElectronDeveloper.takeWorkerCpuProfile': takeWorkerCpuProfile,
   'ElectronDeveloper.takeWorkerHeapSnapshot': takeWorkerHeapSnapshot,

package/package.json

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