ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make custom events run syncronously inside async function

install-with-shinobicctv-user-instead-of-root
Moe 2020-08-12 17:37:24 -07:00
parent f2828dd0cc
commit 09a92e7d17
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/events.js
View File

@ -170,7 +170,7 @@ module.exports = function(s,config,lang){
extender(x,d)
})
}
s.triggerEvent = function(d,forceSave){
s.triggerEvent = async (d,forceSave) => {
var didCountingAlready = false
var filter = {
halt : false,
@ -452,10 +452,6 @@ module.exports = function(s,config,lang){
d.screenshotName = d.details.reason + '_'+(d.mon.name.replace(/[^\w\s]/gi,''))+'_'+d.id+'_'+d.ke+'_'+s.formattedTime()
d.screenshotBuffer = null
s.onEventTriggerExtensions.forEach(function(extender){
extender(d,filter)
})
if(filter.webhook && currentConfig.detector_webhook === '1'){
var detector_webhook_url = s.addEventDetailsToString(d,currentConfig.detector_webhook_url)
var webhookMethod = currentConfig.detector_webhook_method
@ -475,6 +471,11 @@ module.exports = function(s,config,lang){
if(err)s.debugLog(err)
})
}
for (var i = 0; i < s.onEventTriggerExtensions.length; i++) {
const extender = s.onEventTriggerExtensions[i]
await extender(d,filter)
}
}
//show client machines the event
d.cx={f:'detector_trigger',id:d.id,ke:d.ke,details:d.details,doObjectDetection:d.doObjectDetection};