@lvce-editor/main-process 6.33.5 → 6.35.0

package/dist/mainProcessMain.js

@@ -9,7 +9,7 @@ import { mkdirSync, createWriteStream, readFileSync, openAsBlob, existsSync, wri
 import * as NodePath 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 { readFile, mkdir, writeFile } from 'node:fs/promises';
 import { MessageChannel } from 'node:worker_threads';
 import { DatabaseSync } from 'node:sqlite';
 
@@ -2823,7 +2823,7 @@ const callbacks = Object.create(null);
 const set$2 = (id, fn) => {
   callbacks[id] = fn;
 };
-const get$4 = id => {
+const get$5 = id => {
   return callbacks[id];
 };
 const remove$2 = id => {
@@ -3047,7 +3047,7 @@ const warn = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$4(id);
+  const fn = get$5(id);
   if (!fn) {
     console.log(response);
     warn(`callback ${id} may already be disposed`);
@@ -4118,7 +4118,7 @@ const hasWebContents = id => {
  * @param {number} id
  * @returns {{browserWindow: Electron.BrowserWindow, view: Electron.WebContentsView}}
  */
-const get$3 = id => {
+const get$4 = id => {
   return state$2.views[id];
 };
 const getAll = () => {
@@ -4906,7 +4906,7 @@ const state$1 = {
 const has = () => {
   return Boolean(state$1.session);
 };
-const get$2 = () => {
+const get$3 = () => {
   if (!state$1.session) {
     throw new Error('session is not defined');
   }
@@ -4931,11 +4931,11 @@ const create$2 = rpc => {
   return handleRequest;
 };
 
-const get$1 = () => {
+const get$2 = () => {
   if (!has()) {
     set$1(createElectronSession());
   }
-  return get$2();
+  return get$3();
 };
 const registerWebviewProtocol = async port => {
   object(port);
@@ -4944,7 +4944,7 @@ const registerWebviewProtocol = async port => {
     messagePort: port,
     requiresSocket: requiresSocket
   });
-  const session = get$1();
+  const session = get$2();
   const handleRequest = create$2(rpc);
   handle(session.protocol, WebView, handleRequest);
 };
@@ -5032,7 +5032,7 @@ const addDevDiagnostics = window => {
 
 // TODO avoid mixing BrowserWindow, childprocess and various lifecycle methods in one file -> separate concerns
 const createAppWindow = async (windowOptions, parsedArgs, workingDirectory, titleBarItems, url) => {
-  const session = get$1();
+  const session = get$2();
   mark(WillCreateCodeWindow);
   const window = new BrowserWindow({
     ...windowOptions,
@@ -5219,7 +5219,7 @@ const rpcs = Object.create(null);
 const set = (id, rpc) => {
   rpcs[id] = rpc;
 };
-const get = id => {
+const get$1 = id => {
   return rpcs[id];
 };
 
@@ -6240,7 +6240,7 @@ const handleWebContentsViewZoomKeyBinding = (webContentsId, input) => {
   if (delta === 0) {
     return false;
   }
-  const state = get$3(webContentsId);
+  const state = get$4(webContentsId);
   if (!state) {
     return false;
   }
@@ -6505,13 +6505,12 @@ const detach = (webContents, listener) => {
   webContents.setWindowOpenHandler(null);
 };
 const handler = ({
+  disposition,
   url
 }) => {
-  if (shouldOpenExternal(url)) {
-    void openExternal(url);
-  }
+  const messages = shouldOpenExternal(url) ? [['handleWindowOpen', url, disposition]] : [];
   return {
-    messages: [],
+    messages,
     result: {
       action: Deny
     }
@@ -6742,7 +6741,7 @@ const attach = webContents => {
 };
 
 const send = (method, ...params) => {
-  const rpc = get(EmbedsProcess);
+  const rpc = get$1(EmbedsProcess);
   if (!rpc) {
     return;
   }
@@ -6804,7 +6803,7 @@ const createWebContentsView = async () => {
 const attachEventListeners = webContentsId => {
   number(webContentsId);
   const webContents = Electron.webContents.fromId(webContentsId);
-  const state = get$3(webContentsId);
+  const state = get$4(webContentsId);
   if (!webContents || !state) {
     return;
   }
@@ -6813,7 +6812,7 @@ const attachEventListeners = webContentsId => {
 const disposeWebContentsView = browserViewId => {
   console.log('[main process] dispose browser view', browserViewId);
   cancelForWebContents(browserViewId);
-  const instance = get$3(browserViewId);
+  const instance = get$4(browserViewId);
   if (!instance) {
     return;
   }
@@ -6832,7 +6831,7 @@ const webContentsViewErrorPath = join(root, 'packages', 'main-process', 'pages',
 
 const wrapBrowserViewCommand = fn => {
   const wrappedCommand = (id, ...args) => {
-    const state = get$3(id);
+    const state = get$4(id);
     if (!state) {
       console.log(`[main process] no browser view with id ${id}`);
       return;
@@ -6988,7 +6987,7 @@ const cancelNavigation = view => {
 };
 const show = id => {
   // console.log('[main-process] show browser view', id)
-  const state = get$3(id);
+  const state = get$4(id);
   if (!state) {
     return;
   }
@@ -6999,7 +6998,7 @@ const show = id => {
   browserWindow.contentView.addChildView(view);
 };
 const addToWindow = (browserWindowId, browserViewId) => {
-  const state = get$3(browserViewId);
+  const state = get$4(browserViewId);
   const {
     view
   } = state;
@@ -7010,7 +7009,7 @@ const addToWindow = (browserWindowId, browserViewId) => {
   browserWindow.contentView.addChildView(view);
 };
 const hide = id => {
-  const state = get$3(id);
+  const state = get$4(id);
   if (!state) {
     return;
   }
@@ -7185,7 +7184,7 @@ const open2 = async (options, url) => {
     ...options,
     webPreferences: {
       ...options.webPreferences,
-      session: get$1()
+      session: get$2()
     }
   };
   const processExplorerWindow = new BrowserWindow(allOptions);
@@ -7516,6 +7515,133 @@ const getMainProcessId = () => {
   return process.pid;
 };
 
+const storagePath = join(configDir, 'secrets.json');
+const pendingOperations = [];
+let isRunning = false;
+const runPendingOperations = async () => {
+  if (isRunning) {
+    return;
+  }
+  isRunning = true;
+  let operation;
+  while (operation = pendingOperations.shift()) {
+    await operation();
+  }
+  isRunning = false;
+};
+const runExclusive = operation => {
+  return new Promise((resolve, reject) => {
+    pendingOperations.push(async () => {
+      try {
+        resolve(await operation());
+      } catch (error) {
+        reject(error instanceof Error ? error : new Error(String(error)));
+      }
+    });
+    void runPendingOperations();
+  });
+};
+const isRecord = value => {
+  return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+};
+const normalizeStoredSecrets = value => {
+  if (!isRecord(value)) {
+    return {};
+  }
+  const storedSecrets = {};
+  for (const [extensionId, extensionValue] of Object.entries(value)) {
+    if (!isRecord(extensionValue)) {
+      continue;
+    }
+    const extensionSecrets = {};
+    for (const [key, encrypted] of Object.entries(extensionValue)) {
+      if (typeof encrypted === 'string') {
+        extensionSecrets[key] = encrypted;
+      }
+    }
+    if (Object.keys(extensionSecrets).length > 0) {
+      storedSecrets[extensionId] = extensionSecrets;
+    }
+  }
+  return storedSecrets;
+};
+const readStoredSecrets = async () => {
+  try {
+    const content = await readFile(storagePath, 'utf8');
+    return normalizeStoredSecrets(JSON.parse(content));
+  } catch (error) {
+    if (error && typeof error === 'object' && 'code' in error && error.code === 'ENOENT') {
+      return {};
+    }
+    throw error;
+  }
+};
+const writeStoredSecrets = async storedSecrets => {
+  await mkdir(dirname(storagePath), {
+    recursive: true
+  });
+  await writeFile(storagePath, `${JSON.stringify(storedSecrets, undefined, 2)}\n`, {
+    encoding: 'utf8',
+    mode: 0o600
+  });
+};
+const deleteSecret = (extensionId, key) => {
+  string(extensionId);
+  string(key);
+  return runExclusive(async () => {
+    const storedSecrets = await readStoredSecrets();
+    const extensionSecrets = storedSecrets[extensionId];
+    if (!extensionSecrets || typeof extensionSecrets[key] !== 'string') {
+      return;
+    }
+    const nextExtensionSecrets = {
+      ...extensionSecrets
+    };
+    delete nextExtensionSecrets[key];
+    if (Object.keys(nextExtensionSecrets).length === 0) {
+      delete storedSecrets[extensionId];
+    } else {
+      storedSecrets[extensionId] = nextExtensionSecrets;
+    }
+    await writeStoredSecrets(storedSecrets);
+  });
+};
+const get = (extensionId, key) => {
+  string(extensionId);
+  string(key);
+  return runExclusive(async () => {
+    const storedSecrets = await readStoredSecrets();
+    const encrypted = storedSecrets[extensionId]?.[key];
+    if (typeof encrypted !== 'string') {
+      return undefined;
+    }
+    return decrypt(encrypted);
+  });
+};
+const list = () => {
+  return runExclusive(async () => {
+    const storedSecrets = await readStoredSecrets();
+    return Object.entries(storedSecrets).flatMap(([extensionId, extensionSecrets]) => Object.keys(extensionSecrets).map(key => ({
+      extensionId,
+      key
+    })));
+  });
+};
+const store = (extensionId, key, value) => {
+  string(extensionId);
+  string(key);
+  string(value);
+  return runExclusive(async () => {
+    const encrypted = encrypt(value);
+    const storedSecrets = await readStoredSecrets();
+    storedSecrets[extensionId] = {
+      ...storedSecrets[extensionId],
+      [key]: encrypted
+    };
+    await writeStoredSecrets(storedSecrets);
+  });
+};
+
 const {
   create
 } = IpcParentWithElectronUtilityProcess$1$1;
@@ -7574,7 +7700,7 @@ const sendTo = async (port, name, ipcId) => {
 // TODO use rpc id, and then use rpc.invokeAndtransfer
 const sendTo2 = async (port, targetRpcId, sourceRpcId) => {
   object(port);
-  const rpc = get(targetRpcId);
+  const rpc = get$1(targetRpcId);
   if (!rpc) {
     throw new Error(`rpc ${targetRpcId} not found`);
   }
@@ -7688,6 +7814,10 @@ const commandMap = {
   'Process.writeStderr': writeStderr,
   'Process.writeStdout': writeStdout,
   'ProcessId.getMainProcessId': getMainProcessId,
+  'SecretStorage.delete': deleteSecret,
+  'SecretStorage.get': get,
+  'SecretStorage.list': list,
+  'SecretStorage.store': store,
   'TemporaryMessagePort.createPortTuple': createPortTuple,
   'TemporaryMessagePort.dispose': dispose,
   'TemporaryMessagePort.sendTo': sendTo,

package/package.json

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