feat: bring back static hook timeout

v1.18.x
Barış Soner Uşaklı 4 years ago
parent 56b0bfd518
commit 46270f9f20

@ -165,19 +165,35 @@ async function fireStaticHook(hook, hookList, params) {
if (hookFn.constructor && hookFn.constructor.name !== 'AsyncFunction') {
hookFn = util.promisify(hookFn);
}
try {
// eslint-disable-next-line
await hookFn(params);
await timeout(hookFn(params), 5000, 'timeout');
} catch (err) {
winston.error(`[plugins] Error executing '${hook}' in plugin '${hookObj.id}'\n${err.stack}`);
if (!noErrorHooks.includes(hook)) {
throw err;
if (err && err.message === 'timeout') {
winston.warn(`[plugins] Callback timed out, hook '${hook}' in plugin '${hookObj.id}'`);
} else {
winston.error(`[plugins] Error executing '${hook}' in plugin '${hookObj.id}'\n${err.stack}`);
if (!noErrorHooks.includes(hook)) {
throw err;
}
}
}
}
}
}
// https://advancedweb.hu/how-to-add-timeout-to-a-promise-in-javascript/
const timeout = (prom, time, error) => {
let timer;
return Promise.race([
prom,
new Promise((resolve, reject) => {
timer = setTimeout(reject, time, new Error(error));
}),
]).finally(() => clearTimeout(timer));
};
async function fireResponseHook(hook, hookList, params) {
if (!Array.isArray(hookList) || !hookList.length) {
return;

@ -135,6 +135,21 @@ describe('Plugins', () => {
});
});
it('should register and timeout a static hook returning a promise but takes too long', (done) => {
async function method(data) {
assert.equal(data.bar, 'test');
return new Promise((resolve) => {
setTimeout(resolve, 6000);
});
}
plugins.hooks.register('test-plugin', { hook: 'static:test.hook', method: method });
plugins.hooks.fire('static:test.hook', { bar: 'test' }, (err) => {
assert.ifError(err);
plugins.hooks.unregister('test-plugin', 'static:test.hook', method);
done();
});
});
it('should get plugin data from nbbpm', (done) => {
plugins.get('nodebb-plugin-markdown', (err, data) => {
assert.ifError(err);

Loading…
Cancel
Save