diff --git a/src/sysinfo/generic.js b/src/sysinfo/generic.js index 7105bf8ec..017952ac5 100644 --- a/src/sysinfo/generic.js +++ b/src/sysinfo/generic.js @@ -13,17 +13,26 @@ const assert = require('assert'), safe = require('safetydance'), superagent = require('superagent'); +const gCache = { ipv4: {}, ipv6: {} }; // each has { timestamp, value, request } + async function getServerIPv4(config) { assert.strictEqual(typeof config, 'object'); if (process.env.BOX_ENV === 'test') return '127.0.0.1'; - debug('getServerIPv4: getting server IP'); + if (gCache.ipv4.value && (Date.now() - gCache.ipv4.timestamp <= 5 * 60 * 1000)) return gCache.ipv4.value; - const [networkError, response] = await safe(superagent.get('https://ipv4.api.cloudron.io/api/v1/helper/public_ip') - .timeout(30 * 1000) - .retry(2) - .ok(() => true)); + let request = gCache.ipv4.request; // allow reuse for parallel requests + if (!request) { + debug('getServerIPv4: querying ipv4.api.cloudron.io to get server IPv4'); + request = superagent.get('https://ipv4.api.cloudron.io/api/v1/helper/public_ip').timeout(30 * 1000).retry(2).ok(() => true); + gCache.ipv4.request = request; + } + + gCache.ipv4.value = null; + + const [networkError, response] = await safe(request); + gCache.ipv4.request = null; if (networkError || response.status !== 200) { debug('getServerIPv4: Error getting IP', networkError); @@ -35,6 +44,8 @@ async function getServerIPv4(config) { throw new BoxError(BoxError.EXTERNAL_ERROR, 'Unable to detect IPv4. No IP found in response'); } + gCache.ipv4.value = response.body.ip; + gCache.ipv4.timestamp = Date.now(); return response.body.ip; } @@ -43,12 +54,19 @@ async function getServerIPv6(config) { if (process.env.BOX_ENV === 'test') return '::1'; - debug('getServerIPv6: getting server IP'); + if (gCache.ipv6.value && (Date.now() - gCache.ipv6.timestamp <= 5 * 60 * 1000)) return gCache.ipv6.value; - const [networkError, response] = await safe(superagent.get('https://ipv6.api.cloudron.io/api/v1/helper/public_ip') - .timeout(30 * 1000) - .retry(2) - .ok(() => true)); + let request = gCache.ipv6.request; // allow reuse for parallel requests + if (!request) { + debug('getServerIPv6: querying ipv6.api.cloudron.io to get server IPv6'); + request = superagent.get('https://ipv6.api.cloudron.io/api/v1/helper/public_ip').timeout(30 * 1000).retry(2).ok(() => true); + gCache.ipv6.request = request; + } + + gCache.ipv6.value = null; + + const [networkError, response] = await safe(request); + gCache.ipv6.request = null; if (networkError || response.status !== 200) { debug('getServerIPv6: Error getting IP', networkError); @@ -60,6 +78,8 @@ async function getServerIPv6(config) { throw new BoxError(BoxError.EXTERNAL_ERROR, 'Unable to detect IPv6. No IP found in response'); } + gCache.ipv6.value = response.body.ip; + gCache.ipv6.timestamp = Date.now(); return response.body.ip; }