Desktop: Fixes #16215: Increase defaultAutoSelectFamilyAttemptTimeout to 500 ms (#16576)

This commit is contained in:
mrjo118 authored and GitHub committed 2026-09-25 12:04:03 +01:00
1 parent c32c50fbe9
commit d9f0b4206a
5 files changed
+18

No files matched your search

+1
View File
@@ -704,6 +704,7 @@ packages/app-desktop/utils/customProtocols/registerCustomProtocols.js
packages/app-desktop/utils/getAssetPath.js
packages/app-desktop/utils/initReact.js
packages/app-desktop/utils/initializeCommandService.js
packages/app-desktop/utils/initializeNetworkConnectionAttemptTimeout.js
packages/app-desktop/utils/isSafeToOpen.test.js
packages/app-desktop/utils/isSafeToOpen.js
packages/app-desktop/utils/layout/layoutKeyToLabel.js
+1
View File
@@ -730,6 +730,7 @@ packages/app-desktop/utils/customProtocols/registerCustomProtocols.js
packages/app-desktop/utils/getAssetPath.js
packages/app-desktop/utils/initReact.js
packages/app-desktop/utils/initializeCommandService.js
packages/app-desktop/utils/initializeNetworkConnectionAttemptTimeout.js
packages/app-desktop/utils/isSafeToOpen.test.js
packages/app-desktop/utils/isSafeToOpen.js
packages/app-desktop/utils/layout/layoutKeyToLabel.js
+3
View File
@@ -38,8 +38,11 @@ import PerformanceLogger from '@joplin/lib/PerformanceLogger';
import * as pdfJs from 'pdfjs-dist';
import { isAppleSilicon } from 'is-apple-silicon';
import restart from './services/restart';
import initializeNetworkConnectionAttemptTimeout from './utils/initializeNetworkConnectionAttemptTimeout';
require('@sentry/electron/renderer');
initializeNetworkConnectionAttemptTimeout();
// Allows components to use React as a global
window.React = React;
+3
View File
@@ -13,6 +13,9 @@ const packageInfo = require('./packageInfo.js');
import { isCallbackUrl } from '@joplin/lib/callbackUrlUtils';
import determineBaseAppDirs from '@joplin/lib/determineBaseAppDirs';
import registerCustomProtocols from './utils/customProtocols/registerCustomProtocols';
import initializeNetworkConnectionAttemptTimeout from './utils/initializeNetworkConnectionAttemptTimeout';
initializeNetworkConnectionAttemptTimeout();
// Electron takes the application name from package.json `name` and
// displays this in the tray icon toolip and message box titles, however in
@@ -0,0 +1,10 @@
const net = require('net') as typeof import('net') & {
getDefaultAutoSelectFamilyAttemptTimeout: ()=> number;
setDefaultAutoSelectFamilyAttemptTimeout: (value: number)=> void;
};
export default () => {
// Prior to Node 26, the default value is 250 ms, which is too low in some situations. Increase the default to match the Node 26
// default of 500 ms, at least until the app is upgraded to Node 26
net.setDefaultAutoSelectFamilyAttemptTimeout(Math.max(net.getDefaultAutoSelectFamilyAttemptTimeout(), 500));
};