Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-13 17:35:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: closes #12365, staticHooks with callbacks

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2024-02-26 00:50:22 -05:00
parent c61b3bbd25
commit 00e29403f0
1 changed files with 30 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/plugins/hooks.js
View File

@@ -207,6 +207,34 @@ Hooks.hasListeners = function (hook) {
return !!(plugins.loadedHooks[hook] && plugins.loadedHooks[hook].length > 0); return !!(plugins.loadedHooks[hook] && plugins.loadedHooks[hook].length > 0);
}; };
function hookHandlerPromise(hook, hookObj, params) {
return new Promise((resolve, reject) => {
let resolved = false;
function _resolve(result) {
if (resolved) {
winston.warn(`[plugins] ${hook} already resolved in plugin ${hookObj.id}`);
return;
}
resolved = true;
resolve(result);
}
const returned = hookObj.method(params, (err, result) => {
if (err) reject(err); else _resolve(result);
});
if (utils.isPromise(returned)) {
returned.then(
payload => _resolve(payload),
err => reject(err)
);
return;
}
if (returned) {
_resolve(returned);
}
});
}
async function fireFilterHook(hook, hookList, params) { async function fireFilterHook(hook, hookList, params) {
if (!Array.isArray(hookList) || !hookList.length) { if (!Array.isArray(hookList) || !hookList.length) {
return params; return params;
@@ -223,31 +251,7 @@ async function fireFilterHook(hook, hookList, params) {
if (hookObj.method.constructor && hookObj.method.constructor.name === 'AsyncFunction') { if (hookObj.method.constructor && hookObj.method.constructor.name === 'AsyncFunction') {
return await hookObj.method(params); return await hookObj.method(params);
} }
return new Promise((resolve, reject) => { return hookHandlerPromise(hook, hookObj, params);
let resolved = false;
function _resolve(result) {
if (resolved) {
winston.warn(`[plugins] ${hook} already resolved in plugin ${hookObj.id}`);
return;
}
resolved = true;
resolve(result);
}
const returned = hookObj.method(params, (err, result) => {
if (err) reject(err); else _resolve(result);
});
if (utils.isPromise(returned)) {
returned.then(
payload => _resolve(payload),
err => reject(err)
);
return;
}
if (returned) {
_resolve(returned);
}
});
} }
for (const hookObj of hookList) { for (const hookObj of hookList) {
@@ -303,28 +307,7 @@ async function fireStaticHook(hook, hookList, params) {
return timeout(hookObj.method(params), 10000, 'timeout'); return timeout(hookObj.method(params), 10000, 'timeout');
} }
return new Promise((resolve, reject) => { return hookHandlerPromise(hook, hookObj, params);
let resolved = false;
function _resolve(result) {
if (resolved) {
return;
}
resolved = true;
resolve(result);
}
const returned = hookObj.method(params, (err, result) => {
if (err) reject(err); else _resolve(result);
});
if (utils.isPromise(returned)) {
returned.then(
payload => _resolve(payload),
err => reject(err)
);
return;
}
_resolve();
});
} }
for (const hookObj of hookList) { for (const hookObj of hookList) {