hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

wait app to be ready before creating a BrowserWindow for system proxy resolver (#7443)

Browse Source 
Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen 2023-03-31 13:33:13 +03:00 committed by GitHub
parent b5e564271e
commit 7bae712703
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.injectable.ts
View File

@ -10,11 +10,12 @@ const resolveSystemProxyFromElectronInjectable = getInjectable({
id: "resolve-system-proxy-from-electron", id: "resolve-system-proxy-from-electron",
instantiate: (di) => { instantiate: (di) => {
const helperWindow = di.inject(resolveSystemProxyWindowInjectable);
const withErrorLoggingFor = di.inject(withErrorLoggingInjectable); const withErrorLoggingFor = di.inject(withErrorLoggingInjectable);
const withErrorLogging = withErrorLoggingFor(() => "Error resolving proxy"); const withErrorLogging = withErrorLoggingFor(() => "Error resolving proxy");
return withErrorLogging(async (url: string) => { return withErrorLogging(async (url: string) => {
const helperWindow = await di.inject(resolveSystemProxyWindowInjectable);
return await helperWindow.webContents.session.resolveProxy(url); return await helperWindow.webContents.session.resolveProxy(url);
}); });
}, },

4
packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts
View File

@ -32,7 +32,7 @@ describe("technical: resolve-system-proxy-from-electron", () => {
di.override( di.override(
resolveSystemProxyWindowInjectable, resolveSystemProxyWindowInjectable,
() => ({ async () => ({
webContents: { webContents: {
session: { session: {
resolveProxy: resolveSystemProxyMock, resolveProxy: resolveSystemProxyMock,
@ -73,7 +73,7 @@ describe("technical: resolve-system-proxy-from-electron", () => {
di.override( di.override(
resolveSystemProxyWindowInjectable, resolveSystemProxyWindowInjectable,
() => ({ async () => ({
webContents: { webContents: {
session: { session: {
resolveProxy: () => { resolveProxy: () => {

4
packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-window.global-override-for-injectable.ts
View File

@ -8,8 +8,8 @@ import type { BrowserWindow, Session, WebContents } from "electron";
import resolveSystemProxyWindowInjectable from "./resolve-system-proxy-window.injectable"; import resolveSystemProxyWindowInjectable from "./resolve-system-proxy-window.injectable";
export default getGlobalOverride( export default getGlobalOverride(
resolveSystemProxyWindowInjectable, resolveSystemProxyWindowInjectable,
() => ({ async () => ({
webContents: { webContents: {
session: { session: {
resolveProxy: () => "DIRECT", resolveProxy: () => "DIRECT",

14
packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-window.injectable.ts
View File

@ -4,13 +4,21 @@
*/ */
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import { BrowserWindow } from "electron"; import { BrowserWindow } from "electron";
import electronAppInjectable from "../../electron-app/electron-app.injectable";
const resolveSystemProxyWindowInjectable = getInjectable({ const resolveSystemProxyWindowInjectable = getInjectable({
id: "resolve-system-proxy-window", id: "resolve-system-proxy-window",
instantiate: () => { instantiate: async (di) => {
const window = new BrowserWindow({ show: false }); const app = di.inject(electronAppInjectable);
window.hide(); await app.whenReady();
const window = new BrowserWindow({
show: false,
paintWhenInitiallyHidden: false,
});
window.hide();
return window; return window;
}, },