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

Update dropInEvents.js 

- close fs.watch and delete monitor's folder onMonitorStop to drop requests when monitor is disabled.
- shorten file trigger timeout from 3 seconds to 1.2
- SMTP events check if monitor is started upon receipt, drop request if not
merge-requests/54/head
Moe 2019-02-28 11:27:20 -08:00
parent c4129e4202
commit 9ff20b8442
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libs/dropInEvents.js
View File

@ -1,4 +1,5 @@
var fs = require('fs') var fs = require('fs')
var execSync = require('child_process').execSync
module.exports = function(s,config,lang,app,io){ module.exports = function(s,config,lang,app,io){
if(config.dropInEventServer === true){ if(config.dropInEventServer === true){
if(config.dropInEventDeleteFileAfterTrigger === undefined)config.dropInEventDeleteFileAfterTrigger = true if(config.dropInEventDeleteFileAfterTrigger === undefined)config.dropInEventDeleteFileAfterTrigger = true
@ -39,11 +40,29 @@ module.exports = function(s,config,lang,app,io){
fs.mkdirSync(s.dir.dropInEvents) fs.mkdirSync(s.dir.dropInEvents)
} }
} }
var onMonitorInit = function(monitorConfig){ var getDropInEventDir = function(monitorConfig){
var ke = monitorConfig.ke var ke = monitorConfig.ke
var mid = monitorConfig.mid var mid = monitorConfig.mid
var groupEventDropDir = s.dir.dropInEvents + ke var groupEventDropDir = s.dir.dropInEvents + ke
var monitorEventDropDir = groupEventDropDir + '/' + mid + '/'
return monitorEventDropDir
}
var onMonitorStop = function(monitorConfig){
var ke = monitorConfig.ke
var mid = monitorConfig.mid
if(s.group[monitorConfig.ke].mon[monitorConfig.mid].dropInEventWatcher){
s.group[monitorConfig.ke].mon[monitorConfig.mid].dropInEventWatcher.close()
delete(s.group[monitorConfig.ke].mon[monitorConfig.mid].dropInEventWatcher)
}
var monitorEventDropDir = getDropInEventDir(monitorConfig)
if(fs.existsSync(monitorEventDropDir))execSync('rm -rf ' + monitorEventDropDir)
}
var onMonitorInit = function(monitorConfig){
onMonitorStop(monitorConfig)
var ke = monitorConfig.ke
var mid = monitorConfig.mid
var monitorEventDropDir = getDropInEventDir(monitorConfig)
var groupEventDropDir = s.dir.dropInEvents + ke
if(!fs.existsSync(groupEventDropDir)){ if(!fs.existsSync(groupEventDropDir)){
fs.mkdirSync(groupEventDropDir) fs.mkdirSync(groupEventDropDir)
} }
@ -51,15 +70,11 @@ module.exports = function(s,config,lang,app,io){
if(!fs.existsSync(monitorEventDropDir)){ if(!fs.existsSync(monitorEventDropDir)){
fs.mkdirSync(monitorEventDropDir) fs.mkdirSync(monitorEventDropDir)
} }
if(s.group[monitorConfig.ke].mon[monitorConfig.mid].dropInEventWatcher){
s.group[monitorConfig.ke].mon[monitorConfig.mid].dropInEventWatcher.close()
delete(s.group[monitorConfig.ke].mon[monitorConfig.mid].dropInEventWatcher)
}
var fileQueue = {} var fileQueue = {}
s.group[monitorConfig.ke].mon[monitorConfig.mid].dropInEventFileQueue = fileQueue s.group[monitorConfig.ke].mon[monitorConfig.mid].dropInEventFileQueue = fileQueue
var eventTrigger = function(eventType,filename){ var eventTrigger = function(eventType,filename){
var filePath = monitorEventDropDir + filename var filePath = monitorEventDropDir + filename
if(filename.indexOf('.jpg') > -1){ if(filename.indexOf('.jpg') > -1 || filename.indexOf('.jpeg') > -1){
var snapPath = s.dir.streams + ke + '/' + mid + '/s.jpg' var snapPath = s.dir.streams + ke + '/' + mid + '/s.jpg'
fs.unlink(snapPath,function(err){ fs.unlink(snapPath,function(err){
fs.createReadStream(filePath).pipe(fs.createWriteStream(snapPath)) fs.createReadStream(filePath).pipe(fs.createWriteStream(snapPath))
@ -99,7 +114,7 @@ module.exports = function(s,config,lang,app,io){
clearTimeout(fileQueue[filename]) clearTimeout(fileQueue[filename])
fileQueue[filename] = setTimeout(function(){ fileQueue[filename] = setTimeout(function(){
eventTrigger(eventType,filename) eventTrigger(eventType,filename)
},3000) },1200)
} }
}) })
s.group[monitorConfig.ke].mon[monitorConfig.mid].dropInEventWatcher = directoryWatch s.group[monitorConfig.ke].mon[monitorConfig.mid].dropInEventWatcher = directoryWatch
@ -136,6 +151,7 @@ module.exports = function(s,config,lang,app,io){
//add extensions //add extensions
s.beforeMonitorsLoadedOnStartup(beforeMonitorsLoadedOnStartup) s.beforeMonitorsLoadedOnStartup(beforeMonitorsLoadedOnStartup)
s.onMonitorInit(onMonitorInit) s.onMonitorInit(onMonitorInit)
s.onMonitorStop(onMonitorStop)
} }
// SMTP Server // SMTP Server
// allow starting SMTP server without dropInEventServer // allow starting SMTP server without dropInEventServer
@ -158,7 +174,7 @@ module.exports = function(s,config,lang,app,io){
var split = address.address.split('@') var split = address.address.split('@')
var monitorId = split[0] var monitorId = split[0]
var ke = session.user var ke = session.user
if(s.group[ke].mon_conf[monitorId]){ if(s.group[ke].mon_conf[monitorId] && s.group[ke].mon[monitorId].isStarted === true){
s.triggerEvent({ s.triggerEvent({
id: monitorId, id: monitorId,
ke: ke, ke: ke,