diff --git a/src/daemon/config.js b/src/daemon/config.js index 02b368d7e..20df91de4 100644 --- a/src/daemon/config.js +++ b/src/daemon/config.js @@ -95,7 +95,7 @@ function applyDefaults (ipfsd) { config.Swarm = config.Swarm ?? {} config.Swarm.DisableNatPortMap = false config.Swarm.ConnMgr = config.Swarm.ConnMgr ?? {} - config.Swarm.ConnMgr.GracePeriod = '1m' + config.Swarm.ConnMgr.GracePeriod = '3m' config.Swarm.ConnMgr.LowWater = 20 config.Swarm.ConnMgr.HighWater = 40 @@ -153,7 +153,7 @@ const getGatewayPort = (config) => getHttpPort(config.Addresses.Gateway) */ function migrateConfig (ipfsd) { // Bump revision number when new migration rule is added - const REVISION = 4 + const REVISION = 5 const REVISION_KEY = 'daemonConfigRevision' const CURRENT_REVISION = store.get(REVISION_KEY, 0) @@ -221,6 +221,16 @@ function migrateConfig (ipfsd) { } } + if (CURRENT_REVISION < 5) { + // expand pretection interval for new connections. + // Rationale: https://github.com/ipfs/ipfs-desktop/pull/2055#issuecomment-1090327377 + const { GracePeriod } = config.Swarm.ConnMgr + if (GracePeriod === '1m') { + config.Swarm.ConnMgr.GracePeriod = '3m' + changed = true + } + } + if (changed) { try { writeConfigFile(ipfsd, config) diff --git a/test/e2e/launch.e2e.test.js b/test/e2e/launch.e2e.test.js index 960134b6a..742bc284f 100644 --- a/test/e2e/launch.e2e.test.js +++ b/test/e2e/launch.e2e.test.js @@ -183,7 +183,7 @@ test.describe.serial('Application launch', async () => { const config = fs.readJsonSync(configPath) // ensure app has migrated config - expect(config.Swarm.ConnMgr.GracePeriod).toEqual('1m') + expect(config.Swarm.ConnMgr.GracePeriod).toEqual('3m') expect(config.Swarm.ConnMgr.LowWater).toEqual(20) expect(config.Swarm.ConnMgr.HighWater).toEqual(40) })