Desktop: Upgrade Electron to v40.8.3 (#14882)

packages/app-desktop/package.json

@@ -168,7 +168,7 @@
     "color": "3.2.1",
     "compare-versions": "6.1.1",
     "debounce": "1.2.1",
-    "electron": "39.2.3",
+    "electron": "40.8.3",
     "electron-builder": "24.13.3",
     "electron-updater": "6.6.8",
     "electron-window-state": "5.0.3",

packages/app-desktop/tools/electronRebuild.js

@@ -24,8 +24,8 @@ async function main() {
 	// We need to force the ABI because Electron Builder or node-abi picks the
 	// wrong one. However it means it will have to be manually upgraded for each
 	// new Electron release. Some ABI map there:
-	// https://github.com/electron/node-abi/tree/master/test
-	const forceAbiArgs = '--force-abi 142';
+	// https://github.com/electron/node-abi/blob/main/abi_registry.json
+	const forceAbiArgs = '--force-abi 143';
 
 	if (isWindows()) {
 		// Cannot run this in parallel, or the 64-bit version might end up

packages/lib/services/keychain/KeychainService.ts

@@ -79,7 +79,11 @@ export default class KeychainService extends BaseService {
 		let i = 0;
 		let didSet = false;
 		for (; i < this.drivers_.length && !didSet; i++) {
-			didSet = await this.drivers_[i].setPassword(name, password);
+			try {
+				didSet = await this.drivers_[i].setPassword(name, password);
+			} catch (error) {
+				logger.warn('Failed to set password using driver marked as "supported"', this.drivers_[i].driverId, error);
+			}
 		}
 
 		if (didSet && this.keysNeedingMigration_.has(name)) {
@@ -103,7 +107,18 @@ export default class KeychainService extends BaseService {
 		let foundInPreferredDriver = true;
 		let password: string|null = null;
 		for (const driver of this.drivers_) {
-			password = await driver.password(name);
+			try {
+				password = await driver.password(name);
+			} catch (error) {
+				// If MacOS prompts a user for keychain access, but the user clicks "Disallow", a password request
+				// can fail.
+				logger.warn(
+					'Failed to read password for entry',
+					{ name, driverId: driver.driverId },
+					error,
+				);
+			}
+
 			if (password) {
 				break;
 			}

yarn.lock

@@ -10535,7 +10535,7 @@ __metadata:
     color: "npm:3.2.1"
     compare-versions: "npm:6.1.1"
     debounce: "npm:1.2.1"
-    electron: "npm:39.2.3"
+    electron: "npm:40.8.3"
     electron-builder: "npm:24.13.3"
     electron-updater: "npm:6.6.8"
     electron-window-state: "npm:5.0.3"
@@ -16957,12 +16957,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^22.7.7":
-  version: 22.13.10
-  resolution: "@types/node@npm:22.13.10"
+"@types/node@npm:^24.9.0":
+  version: 24.12.0
+  resolution: "@types/node@npm:24.12.0"
   dependencies:
-    undici-types: "npm:~6.20.0"
-  checksum: 10/57dc6a5e0110ca9edea8d7047082e649fa7fa813f79e4a901653b9174141c622f4336435648baced5b38d9f39843f404fa2d8d7a10981610da26066bc8caab48
+    undici-types: "npm:~7.16.0"
+  checksum: 10/e9dcf8a378af5a636353b6d88a6fae018504bab776410ac6b5411e29afbe601ba9d7957356556fc27268a62814ca4085974f785613482c18f739686efcd49655
   languageName: node
   linkType: hard
 
@@ -26644,16 +26644,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron@npm:39.2.3":
-  version: 39.2.3
-  resolution: "electron@npm:39.2.3"
+"electron@npm:40.8.3":
+  version: 40.8.3
+  resolution: "electron@npm:40.8.3"
   dependencies:
     "@electron/get": "npm:^2.0.0"
-    "@types/node": "npm:^22.7.7"
+    "@types/node": "npm:^24.9.0"
     extract-zip: "npm:^2.0.1"
   bin:
     electron: cli.js
-  checksum: 10/52e3af56a2a1796bbb681f532c6c2a62ccea3464550fd85caaa001abbc69a70d28e1e2760a17865a71e7840e91f3589694e01fe4420014d390c7424c69136189
+  checksum: 10/6d53f8a359de40c6b5c11c8b2b253f1b59db45a3c6dff6edd78a47af02c382ec67143a7f695f6e63c49d85f6bae39ad337b6b5f4cf73056a789f6e272a945dc5
   languageName: node
   linkType: hard
 
@@ -51823,10 +51823,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"undici-types@npm:~6.20.0":
-  version: 6.20.0
-  resolution: "undici-types@npm:6.20.0"
-  checksum: 10/583ac7bbf4ff69931d3985f4762cde2690bb607844c16a5e2fbb92ed312fe4fa1b365e953032d469fa28ba8b224e88a595f0b10a449332f83fa77c695e567dbe
+"undici-types@npm:~7.16.0":
+  version: 7.16.0
+  resolution: "undici-types@npm:7.16.0"
+  checksum: 10/db43439f69c2d94cc29f75cbfe9de86df87061d6b0c577ebe9bb3255f49b22c50162a7d7eb413b0458b6510b8ca299ac7cff38c3a29fbd31af9f504bcf7fbc0d
   languageName: node
   linkType: hard