diff --git a/definitions/en_CA.js b/definitions/en_CA.js index 79f35dcd..37c3f35e 100644 --- a/definitions/en_CA.js +++ b/definitions/en_CA.js @@ -1,5 +1,17 @@ module.exports = function(s,config,lang){ return { + "Monitor Status Codes": { + "0": "Disabled", + "1": "Starting", + "2": "Watching", + "3": "Recording", + "4": "Restarting", + "5": "Stopped", + "6": "Idle", + "7": "Died", + "8": "Stopping", + "9": "Started", + }, "Monitor Settings": { "section": "Monitor Settings", "blocks": { diff --git a/libs/monitor.js b/libs/monitor.js index aeda0453..da39c984 100644 --- a/libs/monitor.js +++ b/libs/monitor.js @@ -619,7 +619,8 @@ module.exports = function(s,config,lang){ s.sendMonitorStatus({ id: monitor.mid, ke: monitor.ke, - status: lang.Restarting + status: lang.Restarting, + code: 4, }) launchMonitorProcesses(monitorConfig) s.userLog({ @@ -718,7 +719,12 @@ module.exports = function(s,config,lang){ s.group[e.ke].activeMonitors[e.id].spawn = s.ffmpeg(e) },3000) } - s.sendMonitorStatus({id:e.id,ke:e.ke,status:e.wantedStatus}); + s.sendMonitorStatus({ + id: e.id, + ke: e.ke, + status: e.wantedStatus, + code: e.wantedStatusCode + }); //on unexpected exit restart s.group[e.ke].activeMonitors[e.id].spawn_exit = function(){ if(s.group[e.ke].activeMonitors[e.id].isStarted === true){ @@ -1369,7 +1375,12 @@ module.exports = function(s,config,lang){ }else{ cameraDestroy(e) } - s.sendMonitorStatus({id:e.id,ke:e.ke,status:lang.Died}) + s.sendMonitorStatus({ + id: e.id, + ke: e.ke, + status: lang.Died, + code: 7 + }) clearTimeout(activeMonitor.onMonitorStartTimer) s.onMonitorDiedExtensions.forEach(function(extender){ extender(Object.assign(s.group[e.ke].rawMonitorConfigurations[e.id],{}),e) @@ -1536,7 +1547,12 @@ module.exports = function(s,config,lang){ },'MON_'+e.ke+e.id) break; case'restart'://restart monitor - s.sendMonitorStatus({id:e.id,ke:e.ke,status:'Restarting'}); + s.sendMonitorStatus({ + id: e.id, + ke: e.ke, + status: 'Restarting', + code: 4, + }); s.camera('stop',e) setTimeout(function(){ s.camera(e.mode,e) @@ -1583,10 +1599,17 @@ module.exports = function(s,config,lang){ } } var wantedStatus = lang.Stopped + var wantedStatusCode = 5 if(e.functionMode === 'idle'){ - var wantedStatus = lang.Idle + wantedStatus = lang.Idle + wantedStatusCode = 6 } - s.sendMonitorStatus({id:e.id,ke:e.ke,status:wantedStatus}) + s.sendMonitorStatus({ + id:e.id, + ke:e.ke, + status: wantedStatus, + code: wantedStatusCode, + }) setTimeout(() => { scanForOrphanedVideos({ ke: e.ke, @@ -1627,6 +1650,7 @@ module.exports = function(s,config,lang){ id: e.id, ke: e.ke, status: lang.Starting, + code: 1 }); activeMonitor.isStarted = true if(e.details && e.details.dir && e.details.dir !== ''){ diff --git a/libs/startup.js b/libs/startup.js index cf5e6451..3a0c980c 100644 --- a/libs/startup.js +++ b/libs/startup.js @@ -76,7 +76,12 @@ module.exports = function(s,config,lang,io){ if(!orphanedVideosForMonitors[monitor.ke][monitor.mid])orphanedVideosForMonitors[monitor.ke][monitor.mid] = 0 s.initiateMonitorObject(monitor) s.group[monitor.ke].rawMonitorConfigurations[monitor.mid] = monitor - s.sendMonitorStatus({id:monitor.mid,ke:monitor.ke,status:'Stopped'}); + s.sendMonitorStatus({ + id: monitor.mid, + ke: monitor.ke, + status: 'Stopped', + code: 5 + }); var monObj = Object.assign(monitor,{id : monitor.mid}) s.camera(monitor.mode,monObj) checkAnother()