Release 6.4.12 (#7446)

* wait app to be ready before creating a BrowserWindow for system proxy resolver (#7443) Signed-off-by: Jari Kolehmainen <[email protected]> * Release 6.4.12 Signed-off-by: Iku-turso <[email protected]> --------- Signed-off-by: Jari Kolehmainen <[email protected]> Signed-off-by: Iku-turso <[email protected]> Co-authored-by: Jari Kolehmainen <[email protected]>
lensapp · Mar 31, 2023 · 578d3d8 · 578d3d8
1 parent cef524a
commit 578d3d8
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 13 deletions.
diff --git a/lerna.json b/lerna.json
@@ -4,7 +4,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "6.4.11",
+  "version": "6.4.12",
   "npmClient": "yarn",
   "npmClientArgs": [
     "--network-timeout=100000"

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -3,7 +3,7 @@
   "productName": "",
   "description": "Lens Desktop Core",
   "homepage": "https://github.com/lensapp/lens",
-  "version": "6.4.11",
+  "version": "6.4.12",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lensapp/lens.git"

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

diff --git a/packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts b/packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-from-electron.test.ts
@@ -32,7 +32,7 @@ describe("technical: resolve-system-proxy-from-electron", () => {
 
       di.override(
         resolveSystemProxyWindowInjectable,
-        () => ({
+        async () => ({
           webContents: {
             session: {
               resolveProxy: resolveSystemProxyMock,
@@ -73,7 +73,7 @@ describe("technical: resolve-system-proxy-from-electron", () => {
 
       di.override(
         resolveSystemProxyWindowInjectable,
-        () => ({
+        async () => ({
           webContents: {
             session: {
               resolveProxy: () => {

diff --git a/.../utils/resolve-system-proxy/resolve-system-proxy-window.global-override-for-injectable.ts b/.../utils/resolve-system-proxy/resolve-system-proxy-window.global-override-for-injectable.ts
@@ -9,7 +9,7 @@ import resolveSystemProxyWindowInjectable from "./resolve-system-proxy-window.in
 
 export default getGlobalOverride(
   resolveSystemProxyWindowInjectable,
-  () => ({
+  async () => ({
     webContents: {
       session: {
         resolveProxy: () => "DIRECT",

diff --git a/packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-window.injectable.ts b/packages/core/src/main/utils/resolve-system-proxy/resolve-system-proxy-window.injectable.ts
@@ -4,12 +4,24 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { BrowserWindow } from "electron";
+import electronAppInjectable from "../../electron-app/electron-app.injectable";
 
 const resolveSystemProxyWindowInjectable = getInjectable({
   id: "resolve-system-proxy-window",
-  instantiate: () => new BrowserWindow({
-    show: false,
-  }),
+  instantiate: async (di) => {
+    const app = di.inject(electronAppInjectable);
+
+    await app.whenReady();
+
+    const window = new BrowserWindow({
+      show: false,
+      paintWhenInitiallyHidden: false,
+    });
+
+    window.hide();
+
+    return window;
+  },
   causesSideEffects: true,
 });
 

diff --git a/packages/extension-api/package.json b/packages/extension-api/package.json
@@ -2,7 +2,7 @@
   "name": "@k8slens/extensions",
   "productName": "OpenLens extensions",
   "description": "OpenLens - Open Source Kubernetes IDE: extensions",
-  "version": "6.4.11",
+  "version": "6.4.12",
   "copyright": "© 2022 OpenLens Authors",
   "license": "MIT",
   "main": "dist/extension-api.js",
@@ -26,7 +26,7 @@
     "prepare:dev": "yarn run build"
   },
   "dependencies": {
-    "@k8slens/core": "^6.4.11"
+    "@k8slens/core": "^6.4.12"
   },
   "devDependencies": {
     "@types/node": "^16.18.6",

diff --git a/packages/open-lens/package.json b/packages/open-lens/package.json
@@ -4,7 +4,7 @@
   "productName": "OpenLens",
   "description": "OpenLens - Open Source IDE for Kubernetes",
   "homepage": "https://github.com/lensapp/lens",
-  "version": "6.4.11",
+  "version": "6.4.12",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lensapp/lens.git"
@@ -192,7 +192,7 @@
     }
   },
   "dependencies": {
-    "@k8slens/core": "^6.4.11",
+    "@k8slens/core": "^6.4.12",
     "@k8slens/ensure-binaries": "^6.4.0-beta.16",
     "@k8slens/generate-tray-icons": "^6.4.0-beta.16",
     "@ogre-tools/fp": "^12.0.1",