reloading of configuration right after updating config + optimise loading stream + fix for ip camera online and cloud online + onvif ptz checks for hub

machinery/src/cloud/Cloud.go

@@ -272,14 +272,21 @@ loop:
 
 				// We'll check which mode is enabled for the camera.
 				onvifEnabled := "false"
+				onvifZoom := "false"
+				onvifPanTilt := "false"
 				if config.Capture.IPCamera.ONVIFXAddr != "" {
 					cameraConfiguration := configuration.Config.Capture.IPCamera
 					device, err := onvif.ConnectToOnvifDevice(&cameraConfiguration)
 					if err == nil {
-						capabilities := onvif.GetCapabilitiesFromDevice(device)
-						for _, v := range capabilities {
-							if v == "PTZ" || v == "ptz" {
-								onvifEnabled = "true"
+						configurations, err := onvif.GetPTZConfigurationsFromDevice(device)
+						if err == nil {
+							onvifEnabled = "true"
+							_, canZoom, canPanTilt := onvif.GetPTZFunctionsFromDevice(configurations)
+							if canZoom {
+								onvifZoom = "true"
+							}
+							if canPanTilt {
+								onvifPanTilt = "true"
 							}
 						}
 					}
@@ -325,6 +332,8 @@ loop:
 						"boot_time" : "%s",
 						"siteID" : "%s",
 						"onvif" : "%s",
+						"onvif_zoom" : "%s",
+						"onvif_pantilt" : "%s",
 						"cameraConnected": "%s",
 						"numberoffiles" : "33",
 						"timestamp" : 1564747908,
@@ -332,7 +341,7 @@ loop:
 						"docker" : true,
 						"kios" : false,
 						"raspberrypi" : false
-					}`, config.Key, system.Version, system.CPUId, username, key, name, isEnterprise, system.Hostname, system.Architecture, system.TotalMemory, system.UsedMemory, system.FreeMemory, system.ProcessUsedMemory, macs, ips, "0", "0", "0", uptimeString, boottimeString, config.HubSite, onvifEnabled, cameraConnected)
+					}`, config.Key, system.Version, system.CPUId, username, key, name, isEnterprise, system.Hostname, system.Architecture, system.TotalMemory, system.UsedMemory, system.FreeMemory, system.ProcessUsedMemory, macs, ips, "0", "0", "0", uptimeString, boottimeString, config.HubSite, onvifEnabled, onvifZoom, onvifPanTilt, cameraConnected)
 
 				var jsonStr = []byte(object)
 				buffy := bytes.NewBuffer(jsonStr)
@@ -348,6 +357,7 @@ loop:
 					communication.CloudTimestamp.Store(time.Now().Unix())
 					log.Log.Info("HandleHeartBeat: (200) Heartbeat received by Kerberos Hub.")
 				} else {
+					communication.CloudTimestamp.Store(0)
 					log.Log.Error("HandleHeartBeat: (400) Something went wrong while sending to Kerberos Hub.")
 				}
 

machinery/src/components/Kerberos.go

@@ -85,11 +85,12 @@ func Bootstrap(configuration *models.Configuration, communication *models.Commun
 			break
 		}
 
-		// We will re open the configuration, might have changed :O!
-		OpenConfig(configuration)
-
-		// We will override the configuration with the environment variables
-		OverrideWithEnvironmentVariables(configuration)
+		if status == "not started" {
+			// We will re open the configuration, might have changed :O!
+			OpenConfig(configuration)
+			// We will override the configuration with the environment variables
+			OverrideWithEnvironmentVariables(configuration)
+		}
 
 		// Reset the MQTT client, might have provided new information, so we need to reconnect.
 		if routers.HasMQTTClientModified(configuration) {
@@ -282,6 +283,12 @@ func RunAgent(configuration *models.Configuration, communication *models.Communi
 		// Cancel the main context, this will stop all the other goroutines.
 		(*communication.CancelContext)()
 
+		// We will re open the configuration, might have changed :O!
+		OpenConfig(configuration)
+
+		// We will override the configuration with the environment variables
+		OverrideWithEnvironmentVariables(configuration)
+
 		// Here we are cleaning up everything!
 		if configuration.Config.Offline != "true" {
 			communication.HandleUpload <- "stop"
@@ -308,9 +315,6 @@ func RunAgent(configuration *models.Configuration, communication *models.Communi
 		close(communication.HandleMotion)
 		communication.HandleMotion = nil
 
-		// Wait a few seconds to stop the decoder.
-		time.Sleep(time.Second * 3)
-
 		// Waiting for some seconds to make sure everything is properly closed.
 		log.Log.Info("RunAgent: waiting 3 seconds to make sure everything is properly closed.")
 		time.Sleep(time.Second * 3)

machinery/src/computervision/main.go

@@ -139,7 +139,7 @@ func ProcessMotion(motionCursor *pubsub.QueueCursor, configuration *models.Confi
 					hour := now.Hour()
 					minute := now.Minute()
 					second := now.Second()
-					if config.Timetable != nil {
+					if config.Timetable != nil && len(config.Timetable) > 0 {
 						timeInterval := config.Timetable[int(weekday)]
 						if timeInterval != nil {
 							start1 := timeInterval.Start1

machinery/src/routers/http/Routes.go

@@ -63,19 +63,18 @@ func AddRoutes(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware, configuratio
 
 		api.GET("/dashboard", func(c *gin.Context) {
 
-			// This will return the timestamp when the last packet was correctyl received
-			// this is to calculate if the camera connection is still working.
-			lastPacketReceived := int64(0)
-			if communication.LastPacketTimer != nil && communication.LastPacketTimer.Load() != nil {
-				lastPacketReceived = communication.LastPacketTimer.Load().(int64)
-			}
+			// Check if camera is online.
+			cameraIsOnline := communication.CameraConnected
 
 			// If an agent is properly setup with Kerberos Hub, we will send
 			// a ping to Kerberos Hub every 15seconds. On receiving a positive response
 			// it will update the CloudTimestamp value.
-			cloudTimestamp := int64(0)
+			cloudIsOnline := false
 			if communication.CloudTimestamp != nil && communication.CloudTimestamp.Load() != nil {
-				cloudTimestamp = communication.CloudTimestamp.Load().(int64)
+				timestamp := communication.CloudTimestamp.Load().(int64)
+				if timestamp > 0 {
+					cloudIsOnline = true
+				}
 			}
 
 			// The total number of recordings stored in the directory.
@@ -100,8 +99,8 @@ func AddRoutes(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware, configuratio
 
 			c.JSON(200, gin.H{
 				"offlineMode":        configuration.Config.Offline,
-				"cameraOnline":       lastPacketReceived,
-				"cloudOnline":        cloudTimestamp,
+				"cameraOnline":       cameraIsOnline,
+				"cloudOnline":        cloudIsOnline,
 				"numberOfRecordings": numberOfRecordings,
 				"days":               days,
 				"latestEvents":       latestEvents,

ui/src/pages/Dashboard/Dashboard.jsx

@@ -35,6 +35,7 @@ class Dashboard extends React.Component {
       liveviewLoaded: false,
       open: false,
       currentRecording: '',
+      initialised: false,
     };
   }
 
@@ -47,30 +48,28 @@ class Dashboard extends React.Component {
         });
       });
     }
-
-    const { connected } = this.props;
-    if (connected === true) {
-      const { dispatchSend } = this.props;
-      const message = {
-        message_type: 'stream-sd',
-      };
-      dispatchSend(message);
-    }
   }
 
-  componentDidUpdate(prevProps) {
-    const { connected: connectedPrev } = prevProps;
-    const { connected } = this.props;
-    if (connectedPrev === false && connected === true) {
-      const { dispatchSend } = this.props;
+  componentDidUpdate() {
+    const { initialised } = this.state;
+    if (!initialised) {
+      const { connected, dispatchSend } = this.props;
       const message = {
         message_type: 'stream-sd',
       };
-      dispatchSend(message);
-
-      const requestStreamInterval = interval(3000);
-      this.requestStreamSubscription = requestStreamInterval.subscribe(() => {
+      if (connected) {
         dispatchSend(message);
+      }
+
+      const requestStreamInterval = interval(2000);
+      this.requestStreamSubscription = requestStreamInterval.subscribe(() => {
+        if (connected) {
+          dispatchSend(message);
+        }
+      });
+
+      this.setState({
+        initialised: true,
       });
     }
   }
@@ -115,17 +114,16 @@ class Dashboard extends React.Component {
 
     // We check if the camera was getting a valid frame
     // during the last 5 seconds, otherwise we assume the camera is offline.
-    const isCameraOnline =
-      this.getCurrentTimestamp() - dashboard.cameraOnline < 15;
+    const isCameraOnline = dashboard.cameraOnline;
 
     // We check if a connection is made to Kerberos Hub, or if Offline mode
     // has been turned on.
-    const cloudOnline = this.getCurrentTimestamp() - dashboard.cloudOnline < 30;
+    const isCloudOnline = dashboard.cloudOnline;
     let cloudConnection = t('dashboard.not_connected');
     if (dashboard.offlineMode === 'true') {
       cloudConnection = t('dashboard.offline_mode');
     } else {
-      cloudConnection = cloudOnline
+      cloudConnection = isCloudOnline
         ? t('dashboard.connected')
         : t('dashboard.not_connected');
     }
@@ -185,7 +183,7 @@ class Dashboard extends React.Component {
               subtitle={cloudConnection}
               footer="Cloud"
               icon={
-                cloudOnline && dashboard.offlineMode !== 'true'
+                isCloudOnline && dashboard.offlineMode !== 'true'
                   ? 'circle-check-big'
                   : 'circle-cross-big'
               }
@@ -306,7 +304,7 @@ class Dashboard extends React.Component {
           </div>
           <div>
             <h2>{t('dashboard.live_view')}</h2>
-            {!liveviewLoaded && (
+            {(!liveviewLoaded || !isCameraOnline) && (
               <SetupBox
                 btnicon="preferences"
                 btnlabel={t('dashboard.configure_connection')}
@@ -316,7 +314,12 @@ class Dashboard extends React.Component {
                 text={t('dashboard.loading_live_view_description')}
               />
             )}
-            <div style={{ visibility: liveviewLoaded ? 'visible' : 'hidden' }}>
+            <div
+              style={{
+                visibility:
+                  liveviewLoaded && isCameraOnline ? 'visible' : 'hidden',
+              }}
+            >
               <ImageCard
                 imageSrc={`data:image/png;base64, ${
                   images.length ? images[0] : ''

ui/src/pages/Settings/Settings.jsx

@@ -328,8 +328,7 @@ class Settings extends React.Component {
     if (config) {
       dispatchVerifyOnvif(
         cameraConfig,
-        (data) => {
-          console.log(data);
+        () => {
           this.setState({
             verifyOnvifSuccess: true,
             verifyOnvifError: false,