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

plugins: asyncify more functions

Browse source
This commit is contained in:
Richard Hansen 2020-11-13 13:59:20 -05:00 • committed by John McLear
parent 9f575ebc84
commit 8a918fbc46
2 changed files with 44 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

78
src/static/js/pluginfw/installer.js
View file

@ -2,21 +2,15 @@ var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins");
var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks");
var npm = require("npm");
var request = require("request");
const util = require('util');
var npmIsLoaded = false;
var withNpm = function(npmfn) {
if (npmIsLoaded) return npmfn();
npm.load({}, function(er) {
if (er) return npmfn(er);
npmIsLoaded = true;
npm.on("log", function(message) {
console.log('npm: ',message)
});
npmfn();
});
}
let npmIsLoaded = false;
const loadNpm = async () => {
if (npmIsLoaded) return;
await util.promisify(npm.load)({});
npmIsLoaded = true;
npm.on('log', (message) => console.log('npm: ', message));
};
var tasks = 0
@ -34,44 +28,32 @@ function onAllTasksFinished() {
hooks.aCallAll("restartServer", {}, function() {});
}
/*
* We cannot use arrow functions in this file, because code in /src/static
* can end up being loaded in browsers, and we still support IE11.
*/
exports.uninstall = function(plugin_name, cb) {
exports.uninstall = async (pluginName, cb = null) => {
cb = wrapTaskCb(cb);
withNpm(function(er) {
if (er) return cb && cb(er);
npm.commands.uninstall([plugin_name], function(er) {
if (er) return cb && cb(er);
hooks.aCallAll("pluginUninstall", {plugin_name: plugin_name})
.then(plugins.update)
.then(function() { cb(null) })
.catch(function(er) { cb(er) });
});
});
try {
await loadNpm();
await util.promisify(npm.commands.uninstall)([pluginName]);
await hooks.aCallAll('pluginUninstall', {pluginName});
await plugins.update();
} catch (err) {
cb(err || new Error(err));
throw err;
}
cb(null);
};
/*
* We cannot use arrow functions in this file, because code in /src/static
* can end up being loaded in browsers, and we still support IE11.
*/
exports.install = function(plugin_name, cb) {
exports.install = async (pluginName, cb = null) => {
cb = wrapTaskCb(cb);
withNpm(function(er) {
if (er) return cb && cb(er);
npm.commands.install([plugin_name], function(er) {
if (er) return cb && cb(er);
hooks.aCallAll("pluginInstall", {plugin_name: plugin_name})
.then(plugins.update)
.then(function() { cb(null) })
.catch(function(er) { cb(er) });
});
});
try {
await loadNpm();
await util.promisify(npm.commands.install)([pluginName]);
await hooks.aCallAll('pluginInstall', {pluginName});
await plugins.update();
} catch (err) {
cb(err || new Error(err));
throw err;
}
cb(null);
};
exports.availablePlugins = null;