jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

sysinfo: cache the ipv4/ipv6 for 5 mins

Browse Source 
reduces burden on our api.cloudron.io servers

initially, i just implemented a simple value cache but the email UI, queries all the
domains in parallel. without the request caching, the cache is hardly ever used.
This commit is contained in:
Girish Ramakrishnan
2023-03-26 18:53:10 +02:00
parent 73d8e71861
commit ff3029f1fb
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/sysinfo/generic.js
View File

@@ -13,17 +13,26 @@ const assert = require('assert'),
safe = require('safetydance'), safe = require('safetydance'),
superagent = require('superagent'); superagent = require('superagent');
const gCache = { ipv4: {}, ipv6: {} }; // each has { timestamp, value, request }
async function getServerIPv4(config) { async function getServerIPv4(config) {
assert.strictEqual(typeof config, 'object'); assert.strictEqual(typeof config, 'object');
if (process.env.BOX_ENV === 'test') return '127.0.0.1'; 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') let request = gCache.ipv4.request; // allow reuse for parallel requests
.timeout(30 * 1000) if (!request) {
.retry(2) debug('getServerIPv4: querying ipv4.api.cloudron.io to get server IPv4');
.ok(() => true)); 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) { if (networkError || response.status !== 200) {
debug('getServerIPv4: Error getting IP', networkError); 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'); 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; return response.body.ip;
} }
@@ -43,12 +54,19 @@ async function getServerIPv6(config) {
if (process.env.BOX_ENV === 'test') return '::1'; 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') let request = gCache.ipv6.request; // allow reuse for parallel requests
.timeout(30 * 1000) if (!request) {
.retry(2) debug('getServerIPv6: querying ipv6.api.cloudron.io to get server IPv6');
.ok(() => true)); 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) { if (networkError || response.status !== 200) {
debug('getServerIPv6: Error getting IP', networkError); 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'); 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; return response.body.ip;
} }