mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-24 09:26:14 -04:00
fix: simplified code in wrapped promise
This commit is contained in:
parent
d62d5a0460
commit
7fde6ee9bd
3 changed files with 22 additions and 20 deletions
|
@ -162,25 +162,18 @@ export const install = async (pluginName: string, cb:Function|null = null) => {
|
|||
export let availablePlugins:MapArrayType<PackageInfo>|null = null;
|
||||
let cacheTimestamp = 0;
|
||||
|
||||
export const getAvailablePlugins = (maxCacheAge: number|false) => {
|
||||
export const getAvailablePlugins = async (maxCacheAge: number | false) => {
|
||||
const nowTimestamp = Math.round(Date.now() / 1000);
|
||||
|
||||
return new Promise<MapArrayType<PackageInfo>>(async (resolve, reject) => {
|
||||
// check cache age before making any request
|
||||
if (availablePlugins && maxCacheAge && (nowTimestamp - cacheTimestamp) <= maxCacheAge) {
|
||||
return resolve(availablePlugins);
|
||||
}
|
||||
// check cache age before making any request
|
||||
if (availablePlugins && maxCacheAge && (nowTimestamp - cacheTimestamp) <= maxCacheAge) {
|
||||
return availablePlugins;
|
||||
}
|
||||
|
||||
await axios.get(`${settings.updateServer}/plugins.json`, {headers})
|
||||
.then((pluginsLoaded: AxiosResponse<MapArrayType<PackageInfo>>) => {
|
||||
availablePlugins = pluginsLoaded.data;
|
||||
cacheTimestamp = nowTimestamp;
|
||||
resolve(availablePlugins);
|
||||
})
|
||||
.catch(async (err) => {
|
||||
logger.error(`Error fetching available plugins: ${err}`);
|
||||
});
|
||||
});
|
||||
const pluginsLoaded: AxiosResponse<MapArrayType<PackageInfo>> = await axios.get(`${settings.updateServer}/plugins.json`, {headers})
|
||||
availablePlugins = pluginsLoaded.data;
|
||||
cacheTimestamp = nowTimestamp;
|
||||
return availablePlugins;
|
||||
};
|
||||
|
||||
|
||||
|
@ -213,4 +206,7 @@ export const search = (searchTerm: string, maxCacheAge: number) => getAvailableP
|
|||
|
||||
return res;
|
||||
}
|
||||
);
|
||||
).catch((err)=>{
|
||||
logger.error(`Error searching plugins: ${err}`);
|
||||
return {} as MapArrayType<PackageInfo>;
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue