@lvce-editor/main-process 6.36.1 → 6.37.0

package/dist/mainProcessMain.js

@@ -7,11 +7,10 @@ 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 as dirname$1, join as join$1, isAbsolute } from 'node:path';
+import { dirname as dirname$1, join as join$1 } from 'node:path';
 import { homedir, tmpdir } from 'node:os';
 import { readFile, mkdir, writeFile } from 'node:fs/promises';
 import { MessageChannel } from 'node:worker_threads';
-import { DatabaseSync } from 'node:sqlite';
 
 const scheme = 'lvce-oss';
 const applicationName = 'lvce-oss';
@@ -6855,6 +6854,47 @@ const disposeWebContentsView = browserViewId => {
   disposeWebContents(view.webContents);
 };
 
+const addCookiesToSession = async (session, cookies) => {
+  let added = 0;
+  let failed = 0;
+  for (const cookie of cookies) {
+    try {
+      await session.cookies.set(cookie);
+      added++;
+    } catch {
+      failed++;
+    }
+  }
+  await session.cookies.flushStore();
+  return {
+    added,
+    failed
+  };
+};
+const removeCookiesFromSession = async (session, cookies) => {
+  let failed = 0;
+  let removed = 0;
+  for (const cookie of cookies) {
+    try {
+      await session.cookies.remove(cookie.url, cookie.name);
+      removed++;
+    } catch {
+      failed++;
+    }
+  }
+  await session.cookies.flushStore();
+  return {
+    failed,
+    removed
+  };
+};
+const addCookies = cookies => {
+  return addCookiesToSession(getSession(), cookies);
+};
+const removeCookies = cookies => {
+  return removeCookiesFromSession(getSession(), cookies);
+};
+
 const webContentsViewErrorPath = join(root, 'packages', 'main-process', 'pages', 'error', 'error.html');
 
 // TODO create output channel for browser view debug logs
@@ -6941,7 +6981,7 @@ const getDomTree = async view => {
 };
 const capturePage = async view => {
   const image = await view.webContents.capturePage();
-  return image.toDataURL();
+  return image.toPNG();
 };
 const insertCss = async (view, code) => {
   const {
@@ -7256,228 +7296,6 @@ const open2 = async (options, url) => {
   }
 };
 
-const getSameSite = sameSite => {
-  switch (sameSite) {
-    case 0:
-      return 'no_restriction';
-    case 1:
-      return 'lax';
-    case 2:
-      return 'strict';
-    default:
-      return 'unspecified';
-  }
-};
-const getUrlHost = host => {
-  return host.includes(':') && !host.startsWith('[') ? `[${host}]` : host;
-};
-const convert = (row, now = Date.now() / 1000) => {
-  if (!row.host || row.originAttributes) {
-    return undefined;
-  }
-  const host = row.host.startsWith('.') ? row.host.slice(1) : row.host;
-  if (!host) {
-    return undefined;
-  }
-  const expirationDate = row.expiry;
-  if (!Number.isFinite(expirationDate) || expirationDate <= now) {
-    return undefined;
-  }
-  const secure = Boolean(row.isSecure);
-  const details = {
-    expirationDate,
-    httpOnly: Boolean(row.isHttpOnly),
-    name: row.name,
-    path: row.path || '/',
-    sameSite: getSameSite(row.sameSite),
-    secure,
-    url: `${secure ? 'https' : 'http'}://${getUrlHost(host)}/`,
-    value: row.value
-  };
-  if (row.host.startsWith('.')) {
-    details.domain = row.host;
-  }
-  return details;
-};
-
-/* eslint-disable n/no-unsupported-features/node-builtins -- Electron 43 provides the node:sqlite API used by the main process */
-const getDatabaseError = error => {
-  const message = error instanceof Error ? error.message : String(error);
-  if (message.toLowerCase().includes('locked') || message.toLowerCase().includes('busy')) {
-    return new Error('Firefox cookie database is busy. Close Firefox and try again.');
-  }
-  return new Error('Failed to read the Firefox cookie database');
-};
-const withDatabase = (path, fn) => {
-  let database;
-  try {
-    database = new DatabaseSync(path, {
-      readOnly: true
-    });
-    database.exec('PRAGMA busy_timeout = 1000');
-    return fn(database);
-  } catch (error) {
-    if (error instanceof Error && error.message.startsWith('Unsupported Firefox cookie database version')) {
-      throw error;
-    }
-    throw getDatabaseError(error);
-  } finally {
-    database?.close();
-  }
-};
-const getVersion = database => {
-  const row = database.prepare('PRAGMA user_version').get();
-  if (row.user_version < 9) {
-    throw new Error(`Unsupported Firefox cookie database version ${row.user_version}`);
-  }
-  return row.user_version;
-};
-const getCookieCount = path => {
-  return withDatabase(path, database => {
-    getVersion(database);
-    const row = database.prepare('SELECT COUNT(*) AS count FROM moz_cookies').get();
-    return row.count;
-  });
-};
-const readCookies = path => {
-  return withDatabase(path, database => {
-    const version = getVersion(database);
-    const rows = database.prepare(`
-        SELECT
-          expiry,
-          host,
-          isHttpOnly,
-          isSecure,
-          name,
-          originAttributes,
-          path,
-          sameSite,
-          value
-        FROM moz_cookies
-      `).all();
-    return {
-      rows,
-      version
-    };
-  });
-};
-
-const parseIni = content => {
-  const sections = {};
-  let section;
-  for (const line of content.split(/\r?\n/)) {
-    const trimmed = line.trim();
-    const sectionMatch = /^\[([^\]]+)\]$/.exec(trimmed);
-    if (sectionMatch) {
-      section = {};
-      sections[sectionMatch[1]] = section;
-    } else if (section && trimmed && !trimmed.startsWith(';') && !trimmed.startsWith('#')) {
-      const separatorIndex = trimmed.indexOf('=');
-      if (separatorIndex !== -1) {
-        section[trimmed.slice(0, separatorIndex)] = trimmed.slice(separatorIndex + 1);
-      }
-    }
-  }
-  return sections;
-};
-const getProfilePath = (firefoxDataDirectory, profile) => {
-  if (profile.IsRelative === '0' || isAbsolute(profile.Path)) {
-    return profile.Path;
-  }
-  return join$1(firefoxDataDirectory, profile.Path);
-};
-const getFirefoxDataDirectory = () => {
-  const homeDirectory = homedir();
-  if (process.platform === 'win32') {
-    const applicationDataDirectory = process.env.APPDATA || join$1(homeDirectory, 'AppData', 'Roaming');
-    return join$1(applicationDataDirectory, 'Mozilla', 'Firefox');
-  }
-  if (process.platform === 'darwin') {
-    return join$1(homeDirectory, 'Library', 'Application Support', 'Firefox');
-  }
-  const candidates = [join$1(homeDirectory, '.mozilla', 'firefox'), join$1(homeDirectory, 'snap', 'firefox', 'common', '.mozilla', 'firefox'), join$1(homeDirectory, '.var', 'app', 'org.mozilla.firefox', '.mozilla', 'firefox')];
-  const directory = candidates.find(candidate => existsSync(join$1(candidate, 'profiles.ini')));
-  return directory || candidates[0];
-};
-const getActiveProfile = firefoxDataDirectory => {
-  const profilesPath = join$1(firefoxDataDirectory, 'profiles.ini');
-  if (!existsSync(profilesPath)) {
-    throw new Error(`Firefox profile data was not found at ${firefoxDataDirectory}`);
-  }
-  let sections;
-  try {
-    sections = parseIni(readFileSync(profilesPath, 'utf8'));
-  } catch {
-    throw new Error('Firefox profile metadata is invalid');
-  }
-  const profiles = Object.entries(sections).filter(([sectionName, profile]) => sectionName.startsWith('Profile') && profile.Path);
-  const installs = Object.entries(sections).filter(([sectionName, install]) => sectionName.startsWith('Install') && install.Default);
-  const installDefault = (installs.find(([, install]) => install.Locked === '1') || installs[0])?.[1].Default;
-  const selected = profiles.find(([, profile]) => profile.Path === installDefault) || profiles.find(([, profile]) => profile.Default === '1') || profiles[0];
-  if (!selected) {
-    throw new Error('Firefox profile metadata does not contain a profile');
-  }
-  const [, profile] = selected;
-  const profilePath = getProfilePath(firefoxDataDirectory, profile);
-  const cookieDatabasePath = join$1(profilePath, 'cookies.sqlite');
-  if (!existsSync(cookieDatabasePath)) {
-    throw new Error(`Firefox cookie database was not found for profile ${profile.Path}`);
-  }
-  return {
-    cookieDatabasePath,
-    directory: profile.Path,
-    name: profile.Name || profile.Path
-  };
-};
-
-const getInfoFromDirectory = firefoxDataDirectory => {
-  const profile = getActiveProfile(firefoxDataDirectory);
-  const cookieCount = getCookieCount(profile.cookieDatabasePath);
-  return {
-    cookieCount,
-    profileDirectory: profile.directory,
-    profileName: profile.name
-  };
-};
-const getInfo = () => {
-  return getInfoFromDirectory(getFirefoxDataDirectory());
-};
-const importFromDirectory = async (firefoxDataDirectory, session) => {
-  const profile = getActiveProfile(firefoxDataDirectory);
-  const {
-    rows
-  } = readCookies(profile.cookieDatabasePath);
-  const cookies = [];
-  let skipped = 0;
-  for (const row of rows) {
-    const cookie = convert(row);
-    if (cookie) {
-      cookies.push(cookie);
-    } else {
-      skipped++;
-    }
-  }
-  let imported = 0;
-  let failed = 0;
-  for (const cookie of cookies) {
-    try {
-      await session.cookies.set(cookie);
-      imported++;
-    } catch {
-      failed++;
-    }
-  }
-  await session.cookies.flushStore();
-  return {
-    failed,
-    imported,
-    skipped
-  };
-};
-const importCookies = async () => {
-  return importFromDirectory(getFirefoxDataDirectory(), getSession());
-};
-
 const getWindowId = webContentsId => {
   number(webContentsId);
   const webContents = Electron.webContents.fromId(webContentsId);
@@ -7801,10 +7619,12 @@ const commandMap = {
   'ElectronWebContents.dispose': dispose$1,
   'ElectronWebContents.getStats': getStats$1,
   'ElectronWebContentsView.acceptLogin': accept,
+  'ElectronWebContentsView.addCookies': addCookies,
   'ElectronWebContentsView.attachEventListeners': attachEventListeners,
   'ElectronWebContentsView.cancelLogin': cancel,
   'ElectronWebContentsView.createWebContentsView': createWebContentsView,
   'ElectronWebContentsView.disposeWebContentsView': disposeWebContentsView,
+  'ElectronWebContentsView.removeCookies': removeCookies,
   'ElectronWebContentsViewFunctions.addToWindow': addToWindow,
   'ElectronWebContentsViewFunctions.backward': wrapBrowserViewCommand(backward),
   'ElectronWebContentsViewFunctions.cancelNavigation': wrapBrowserViewCommand(cancelNavigation),
@@ -7836,8 +7656,6 @@ const commandMap = {
   'ElectronWindowGpuInfo.open': open,
   'ElectronWindowProcessExplorer.open2': open2,
   'Exit.exit': exit,
-  'FirefoxCookieImport.getInfo': getInfo,
-  'FirefoxCookieImport.importCookies': importCookies,
   'GetWindowId.getWindowId': getWindowId,
   'HandleElectronMessagePort.handleElectronMessagePort': handleElectronMessagePort,
   'IpcParent.create': create$1,

package/package.json

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