mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-06 07:07:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 52

Added proxy support for axios. (#6334)

Browse source
This commit is contained in:
SamTV12345 2024-04-16 19:11:05 +02:00 • committed by GitHub
parent 15f36a1350
commit 0b80e256b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 41 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/node/utils/UpdateCheck.ts
View file

@ -1,7 +1,7 @@
'use strict';
const semver = require('semver');
const settings = require('./Settings');
const axios = require('axios');
import axios from 'axios';
const headers = {
'User-Agent': 'Etherpad/' + settings.getEpVersion(),
}
@ -17,7 +17,7 @@ let lastLoadingTime: number | null = null;
const loadEtherpadInformations = () => {
if (lastLoadingTime !== null && Date.now() - lastLoadingTime < updateInterval) {
return Promise.resolve(infos);
return infos;
}
return axios.get('https://static.etherpad.org/info.json', {headers: headers})
@ -29,10 +29,10 @@ const loadEtherpadInformations = () => {
}
lastLoadingTime = Date.now();
return await Promise.resolve(infos);
return infos;
})
.catch(async (err: Error) => {
return await Promise.reject(err);
throw err;
});
}
@ -43,15 +43,15 @@ exports.getLatestVersion = () => {
};
exports.needsUpdate = async (cb?: Function) => {
await loadEtherpadInformations()
.then((info:Infos) => {
if (semver.gt(info.latestVersion, settings.getEpVersion())) {
try {
const info = await loadEtherpadInformations()
if (semver.gt(info!.latestVersion, settings.getEpVersion())) {
if (cb) return cb(true);
}
}).catch((err: Error) => {
} catch (err) {
console.error(`Can not perform Etherpad update check: ${err}`);
if (cb) return cb(false);
});
}
};
exports.check = () => {