timetable might be empty

Update Settings.jsx
2026-03-03 06:50:09 +00:00 · 2023-06-13 09:22:51 +02:00 · 2023-06-12 21:08:05 +02:00 · 2023-06-12 21:06:21 +02:00 · 2023-06-12 20:33:41 +02:00 · 2023-06-09 14:44:09 +02:00
29 changed files with 693 additions and 161 deletions
--- a/machinery/docs/docs.go
+++ b/machinery/docs/docs.go
@@ -244,6 +244,40 @@ const docTemplate = `{
                }
            }
        },
+        "/api/onvif/verify": {
+            "post": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
+                "description": "Will verify the ONVIF connectivity.",
+                "tags": [
+                    "config"
+                ],
+                "summary": "Will verify the ONVIF connectivity.",
+                "operationId": "verify-onvif",
+                "parameters": [
+                    {
+                        "description": "Camera Config",
+                        "name": "cameraConfig",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.IPCamera"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/models.APIResponse"
+                        }
+                    }
+                }
+            }
+        },
        "/api/persistence/verify": {
            "post": {
                "security": [
@@ -347,9 +381,15 @@ const docTemplate = `{
                "ipcamera": {
                    "$ref": "#/definitions/models.IPCamera"
                },
+                "liveview": {
+                    "type": "string"
+                },
                "maxlengthrecording": {
                    "type": "integer"
                },
+                "motion": {
+                    "type": "string"
+                },
                "name": {
                    "type": "string"
                },
@@ -365,6 +405,12 @@ const docTemplate = `{
                "raspicamera": {
                    "$ref": "#/definitions/models.RaspiCamera"
                },
+                "recording": {
+                    "type": "string"
+                },
+                "snapshots": {
+                    "type": "string"
+                },
                "transcodingresolution": {
                    "type": "integer"
                },
@@ -391,6 +437,12 @@ const docTemplate = `{
                "condition_uri": {
                    "type": "string"
                },
+                "dropbox": {
+                    "$ref": "#/definitions/models.Dropbox"
+                },
+                "friendly_name": {
+                    "type": "string"
+                },
                "heartbeaturi": {
                    "description": "obsolete",
                    "type": "string"
@@ -434,6 +486,9 @@ const docTemplate = `{
                "region": {
                    "$ref": "#/definitions/models.Region"
                },
+                "remove_after_upload": {
+                    "type": "string"
+                },
                "s3": {
                    "$ref": "#/definitions/models.S3"
                },
@@ -477,6 +532,17 @@ const docTemplate = `{
                }
            }
        },
+        "models.Dropbox": {
+            "type": "object",
+            "properties": {
+                "access_token": {
+                    "type": "string"
+                },
+                "directory": {
+                    "type": "string"
+                }
+            }
+        },
        "models.IPCamera": {
            "type": "object",
            "properties": {
@@ -484,7 +550,7 @@ const docTemplate = `{
                    "type": "string"
                },
                "onvif": {
-                    "type": "boolean"
+                    "type": "string"
                },
                "onvif_password": {
                    "type": "string"
--- a/machinery/docs/swagger.json
+++ b/machinery/docs/swagger.json
@@ -236,6 +236,40 @@
                }
            }
        },
+        "/api/onvif/verify": {
+            "post": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
+                "description": "Will verify the ONVIF connectivity.",
+                "tags": [
+                    "config"
+                ],
+                "summary": "Will verify the ONVIF connectivity.",
+                "operationId": "verify-onvif",
+                "parameters": [
+                    {
+                        "description": "Camera Config",
+                        "name": "cameraConfig",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.IPCamera"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/models.APIResponse"
+                        }
+                    }
+                }
+            }
+        },
        "/api/persistence/verify": {
            "post": {
                "security": [
@@ -339,9 +373,15 @@
                "ipcamera": {
                    "$ref": "#/definitions/models.IPCamera"
                },
+                "liveview": {
+                    "type": "string"
+                },
                "maxlengthrecording": {
                    "type": "integer"
                },
+                "motion": {
+                    "type": "string"
+                },
                "name": {
                    "type": "string"
                },
@@ -357,6 +397,12 @@
                "raspicamera": {
                    "$ref": "#/definitions/models.RaspiCamera"
                },
+                "recording": {
+                    "type": "string"
+                },
+                "snapshots": {
+                    "type": "string"
+                },
                "transcodingresolution": {
                    "type": "integer"
                },
@@ -383,6 +429,12 @@
                "condition_uri": {
                    "type": "string"
                },
+                "dropbox": {
+                    "$ref": "#/definitions/models.Dropbox"
+                },
+                "friendly_name": {
+                    "type": "string"
+                },
                "heartbeaturi": {
                    "description": "obsolete",
                    "type": "string"
@@ -426,6 +478,9 @@
                "region": {
                    "$ref": "#/definitions/models.Region"
                },
+                "remove_after_upload": {
+                    "type": "string"
+                },
                "s3": {
                    "$ref": "#/definitions/models.S3"
                },
@@ -469,6 +524,17 @@
                }
            }
        },
+        "models.Dropbox": {
+            "type": "object",
+            "properties": {
+                "access_token": {
+                    "type": "string"
+                },
+                "directory": {
+                    "type": "string"
+                }
+            }
+        },
        "models.IPCamera": {
            "type": "object",
            "properties": {
@@ -476,7 +542,7 @@
                    "type": "string"
                },
                "onvif": {
-                    "type": "boolean"
+                    "type": "string"
                },
                "onvif_password": {
                    "type": "string"
--- a/machinery/docs/swagger.yaml
+++ b/machinery/docs/swagger.yaml
@@ -44,8 +44,12 @@ definitions:
        type: integer
      ipcamera:
        $ref: '#/definitions/models.IPCamera'
+      liveview:
+        type: string
      maxlengthrecording:
        type: integer
+      motion:
+        type: string
      name:
        type: string
      pixelChangeThreshold:
@@ -56,6 +60,10 @@ definitions:
        type: integer
      raspicamera:
        $ref: '#/definitions/models.RaspiCamera'
+      recording:
+        type: string
+      snapshots:
+        type: string
      transcodingresolution:
        type: integer
      transcodingwebrtc:
@@ -73,6 +81,10 @@ definitions:
        type: string
      condition_uri:
        type: string
+      dropbox:
+        $ref: '#/definitions/models.Dropbox'
+      friendly_name:
+        type: string
      heartbeaturi:
        description: obsolete
        type: string
@@ -102,6 +114,8 @@ definitions:
        type: string
      region:
        $ref: '#/definitions/models.Region'
+      remove_after_upload:
+        type: string
      s3:
        $ref: '#/definitions/models.S3'
      stunuri:
@@ -130,12 +144,19 @@ definitions:
      "y":
        type: number
    type: object
+  models.Dropbox:
+    properties:
+      access_token:
+        type: string
+      directory:
+        type: string
+    type: object
  models.IPCamera:
    properties:
      fps:
        type: string
      onvif:
-        type: boolean
+        type: string
      onvif_password:
        type: string
      onvif_username:
@@ -414,6 +435,27 @@ paths:
      summary: Get Authorization token.
      tags:
      - authentication
+  /api/onvif/verify:
+    post:
+      description: Will verify the ONVIF connectivity.
+      operationId: verify-onvif
+      parameters:
+      - description: Camera Config
+        in: body
+        name: cameraConfig
+        required: true
+        schema:
+          $ref: '#/definitions/models.IPCamera'
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/models.APIResponse'
+      security:
+      - Bearer: []
+      summary: Will verify the ONVIF connectivity.
+      tags:
+      - config
  /api/persistence/verify:
    post:
      description: Will verify the persistence.
--- a/machinery/src/cloud/Cloud.go
+++ b/machinery/src/cloud/Cloud.go
@@ -273,7 +273,8 @@ loop:
 				// We'll check which mode is enabled for the camera.
 				onvifEnabled := "false"
 				if config.Capture.IPCamera.ONVIFXAddr != "" {
-					device, err := onvif.ConnectToOnvifDevice(configuration)
+					cameraConfiguration := configuration.Config.Capture.IPCamera
+					device, err := onvif.ConnectToOnvifDevice(&cameraConfiguration)
 					if err == nil {
 						capabilities := onvif.GetCapabilitiesFromDevice(device)
 						for _, v := range capabilities {
--- a/machinery/src/components/Config.go
+++ b/machinery/src/components/Config.go
@@ -447,9 +447,11 @@ func SaveConfig(config models.Config, configuration *models.Configuration, commu
 			return err
 		}

-		select {
-		case communication.HandleBootstrap <- "restart":
-		default:
+		if communication.CameraConnected {
+			select {
+			case communication.HandleBootstrap <- "restart":
+			default:
+			}
 		}

 		communication.IsConfiguring.UnSet()
--- a/machinery/src/components/Kerberos.go
+++ b/machinery/src/components/Kerberos.go
@@ -8,6 +8,7 @@ import (
 	"sync/atomic"
 	"time"

+	mqtt "github.com/eclipse/paho.mqtt.golang"
 	"github.com/kerberos-io/joy4/cgo/ffmpeg"

 	"github.com/kerberos-io/agent/machinery/src/capture"
@@ -54,6 +55,7 @@ func Bootstrap(configuration *models.Configuration, communication *models.Commun
 	communication.HandleLiveSD = make(chan int64, 1)
 	communication.HandleLiveHDKeepalive = make(chan string, 1)
 	communication.HandleLiveHDPeers = make(chan string, 1)
+	communication.HandleONVIF = make(chan models.OnvifAction, 1)
 	communication.IsConfiguring = abool.New()

 	// Before starting the agent, we have a control goroutine, that might
@@ -68,12 +70,16 @@ func Bootstrap(configuration *models.Configuration, communication *models.Commun
 	// Handle heartbeats
 	go cloud.HandleHeartBeat(configuration, communication, uptimeStart)

+	// We'll create a MQTT handler, which will be used to communicate with Kerberos Hub.
+	// Configure a MQTT client which helps for a bi-directional communication
+	mqttClient := routers.ConfigureMQTT(configuration, communication)
+
 	// Run the agent and fire up all the other
 	// goroutines which do image capture, motion detection, onvif, etc.
-
 	for {
+
 		// This will blocking until receiving a signal to be restarted, reconfigured, stopped, etc.
-		status := RunAgent(configuration, communication, uptimeStart, cameraSettings, decoder, subDecoder)
+		status := RunAgent(configuration, communication, mqttClient, uptimeStart, cameraSettings, decoder, subDecoder)

 		if status == "stop" {
 			break
@@ -85,6 +91,12 @@ func Bootstrap(configuration *models.Configuration, communication *models.Commun
 		// 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) {
+			routers.DisconnectMQTT(mqttClient, &configuration.Config)
+			mqttClient = routers.ConfigureMQTT(configuration, communication)
+		}
+
 		// We will create a new cancelable context, which will be used to cancel and restart.
 		// This is used to restart the agent when the configuration is updated.
 		ctx, cancel := context.WithCancel(context.Background())
@@ -94,7 +106,7 @@ func Bootstrap(configuration *models.Configuration, communication *models.Commun
 	log.Log.Debug("Bootstrap: finished")
 }

-func RunAgent(configuration *models.Configuration, communication *models.Communication, uptimeStart time.Time, cameraSettings *models.Camera, decoder *ffmpeg.VideoDecoder, subDecoder *ffmpeg.VideoDecoder) string {
+func RunAgent(configuration *models.Configuration, communication *models.Communication, mqttClient mqtt.Client, uptimeStart time.Time, cameraSettings *models.Camera, decoder *ffmpeg.VideoDecoder, subDecoder *ffmpeg.VideoDecoder) string {

 	log.Log.Debug("RunAgent: bootstrapping agent")
 	config := configuration.Config
@@ -129,7 +141,7 @@ func RunAgent(configuration *models.Configuration, communication *models.Communi

 	if err == nil {

-		log.Log.Info("RunAgent: opened RTSP stream" + rtspUrl)
+		log.Log.Info("RunAgent: opened RTSP stream: " + rtspUrl)

 		// We might have a secondary rtsp url, so we might need to use that.
 		var subInfile av.DemuxCloser
@@ -209,10 +221,6 @@ func RunAgent(configuration *models.Configuration, communication *models.Communi
 			subQueue.WriteHeader(subStreams)
 		}

-		// Configure a MQTT client which helps for a bi-directional communication
-		communication.HandleONVIF = make(chan models.OnvifAction, 1)
-		mqttClient := routers.ConfigureMQTT(configuration, communication)
-
 		// Handle the camera stream
 		go capture.HandleStream(infile, queue, communication)

@@ -259,12 +267,18 @@ func RunAgent(configuration *models.Configuration, communication *models.Communi
 		// Handle ONVIF actions
 		go onvif.HandleONVIFActions(configuration, communication)

+		// If we reach this point, we have a working RTSP connection.
+		communication.CameraConnected = true
+
 		// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 		// This will go into a blocking state, once this channel is triggered
 		// the agent will cleanup and restart.

 		status = <-communication.HandleBootstrap

+		// If we reach this point, we are stopping the stream.
+		communication.CameraConnected = false
+
 		// Cancel the main context, this will stop all the other goroutines.
 		(*communication.CancelContext)()

@@ -291,16 +305,9 @@ func RunAgent(configuration *models.Configuration, communication *models.Communi
 			subQueue = nil
 			communication.SubQueue = nil
 		}
-		close(communication.HandleONVIF)
-		communication.HandleONVIF = nil
-		close(communication.HandleLiveHDHandshake)
-		communication.HandleLiveHDHandshake = nil
 		close(communication.HandleMotion)
 		communication.HandleMotion = nil

-		// Disconnect MQTT
-		routers.DisconnectMQTT(mqttClient, &configuration.Config)
-
 		// Wait a few seconds to stop the decoder.
 		time.Sleep(time.Second * 3)

@@ -329,29 +336,32 @@ func ControlAgent(communication *models.Communication) {
 		var previousPacket int64 = 0
 		var occurence = 0
 		for {
-			packetsR := packageCounter.Load().(int64)
-			if packetsR == previousPacket {
-				// If we are already reconfiguring,
-				// we dont need to check if the stream is blocking.
-				if !communication.IsConfiguring.IsSet() {
-					occurence = occurence + 1
+
+			// If camera is connected, we'll check if we are still receiving packets.
+			if communication.CameraConnected {
+				packetsR := packageCounter.Load().(int64)
+				if packetsR == previousPacket {
+					// If we are already reconfiguring,
+					// we dont need to check if the stream is blocking.
+					if !communication.IsConfiguring.IsSet() {
+						occurence = occurence + 1
+					}
+				} else {
+					occurence = 0
 				}
-			} else {

-				occurence = 0
+				log.Log.Info("ControlAgent: Number of packets read " + strconv.FormatInt(packetsR, 10))
+
+				// After 15 seconds without activity this is thrown..
+				if occurence == 3 {
+					log.Log.Info("Main: Restarting machinery.")
+					communication.HandleBootstrap <- "restart"
+					time.Sleep(2 * time.Second)
+					occurence = 0
+				}
+				previousPacket = packageCounter.Load().(int64)
 			}

-			log.Log.Info("ControlAgent: Number of packets read " + strconv.FormatInt(packetsR, 10))
-
-			// After 15 seconds without activity this is thrown..
-			if occurence == 3 {
-				log.Log.Info("Main: Restarting machinery.")
-				communication.HandleBootstrap <- "restart"
-				time.Sleep(2 * time.Second)
-				occurence = 0
-			}
-			previousPacket = packageCounter.Load().(int64)
-
 			time.Sleep(5 * time.Second)
 		}
 	}()
--- a/machinery/src/computervision/main.go
+++ b/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
--- a/machinery/src/models/ApiResponse.go
+++ b/machinery/src/models/ApiResponse.go
@@ -1,8 +1,11 @@
 package models

 type APIResponse struct {
-	Data    interface{} `json:"data" bson:"data"`
-	Message interface{} `json:"message" bson:"message"`
+	Data         interface{} `json:"data" bson:"data"`
+	Message      interface{} `json:"message" bson:"message"`
+	PTZFunctions interface{} `json:"ptz_functions" bson:"ptz_functions"`
+	CanZoom      bool        `json:"can_zoom" bson:"can_zoom"`
+	CanPanTilt   bool        `json:"can_pan_tilt" bson:"can_pan_tilt"`
 }

 type OnvifCredentials struct {
--- a/machinery/src/onvif/main.go
+++ b/machinery/src/onvif/main.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 	"time"

+	"github.com/gin-gonic/gin"
 	"github.com/kerberos-io/agent/machinery/src/log"
 	"github.com/kerberos-io/agent/machinery/src/models"
 	"github.com/kerberos-io/onvif/media"
@@ -31,7 +32,8 @@ func HandleONVIFActions(configuration *models.Configuration, communication *mode
 		json.Unmarshal(b, &ptzAction)

 		// Connect to Onvif device
-		device, err := ConnectToOnvifDevice(configuration)
+		cameraConfiguration := configuration.Config.Capture.IPCamera
+		device, err := ConnectToOnvifDevice(&cameraConfiguration)
 		if err == nil {

 			// Get token from the first profile
@@ -39,7 +41,7 @@ func HandleONVIFActions(configuration *models.Configuration, communication *mode
 			if err == nil {

 				// Get the configurations from the device
-				configurations, err := GetConfigurationsFromDevice(device)
+				configurations, err := GetPTZConfigurationsFromDevice(device)

 				if err == nil {

@@ -100,16 +102,13 @@ func HandleONVIFActions(configuration *models.Configuration, communication *mode
 	log.Log.Debug("HandleONVIFActions: finished")
 }

-func ConnectToOnvifDevice(configuration *models.Configuration) (*onvif.Device, error) {
+func ConnectToOnvifDevice(cameraConfiguration *models.IPCamera) (*onvif.Device, error) {
 	log.Log.Debug("ConnectToOnvifDevice: started")

-	config := configuration.Config
-
-	// Get the capabilities of the ONVIF device
 	device, err := onvif.NewDevice(onvif.DeviceParams{
-		Xaddr:    config.Capture.IPCamera.ONVIFXAddr,
-		Username: config.Capture.IPCamera.ONVIFUsername,
-		Password: config.Capture.IPCamera.ONVIFPassword,
+		Xaddr:    cameraConfiguration.ONVIFXAddr,
+		Username: cameraConfiguration.ONVIFUsername,
+		Password: cameraConfiguration.ONVIFPassword,
 	})

 	if err != nil {
@@ -154,11 +153,11 @@ func GetTokenFromProfile(device *onvif.Device, profileId int) (xsd.ReferenceToke
 	return profileToken, err
 }

-func GetConfigurationsFromDevice(device *onvif.Device) (ptz.GetConfigurationsResponse, error) {
+func GetPTZConfigurationsFromDevice(device *onvif.Device) (ptz.GetConfigurationsResponse, error) {
 	// We'll try to receive the PTZ configurations from the server
 	var configurations ptz.GetConfigurationsResponse

-	// Get the configurations from the device
+	// Get the PTZ configurations from the device
 	resp, err := device.CallMethod(ptz.GetConfigurations{})
 	if err == nil {
 		defer resp.Body.Close()
@@ -167,11 +166,11 @@ func GetConfigurationsFromDevice(device *onvif.Device) (ptz.GetConfigurationsRes
 			stringBody := string(b)
 			decodedXML, et, err := getXMLNode(stringBody, "GetConfigurationsResponse")
 			if err != nil {
-				log.Log.Error("GetConfigurationsFromDevice: " + err.Error())
+				log.Log.Error("GetPTZConfigurationsFromDevice: " + err.Error())
 				return configurations, err
 			} else {
 				if err := decodedXML.DecodeElement(&configurations, et); err != nil {
-					log.Log.Error("GetConfigurationsFromDevice: " + err.Error())
+					log.Log.Error("GetPTZConfigurationsFromDevice: " + err.Error())
 					return configurations, err
 				}
 			}
@@ -317,3 +316,89 @@ func getXMLNode(xmlBody string, nodeName string) (*xml.Decoder, *xml.StartElemen
 	}
 	return nil, nil, errors.New("error in NodeName - username and password might be wrong")
 }
+
+func GetPTZFunctionsFromDevice(configurations ptz.GetConfigurationsResponse) ([]string, bool, bool) {
+	var functions []string
+	canZoom := false
+	canPanTilt := false
+
+	if configurations.PTZConfiguration.DefaultAbsolutePantTiltPositionSpace != "" {
+		functions = append(functions, "AbsolutePanTiltMove")
+		canPanTilt = true
+	}
+	if configurations.PTZConfiguration.DefaultAbsoluteZoomPositionSpace != "" {
+		functions = append(functions, "AbsoluteZoomMove")
+		canZoom = true
+	}
+	if configurations.PTZConfiguration.DefaultRelativePanTiltTranslationSpace != "" {
+		functions = append(functions, "RelativePanTiltMove")
+		canPanTilt = true
+	}
+	if configurations.PTZConfiguration.DefaultRelativeZoomTranslationSpace != "" {
+		functions = append(functions, "RelativeZoomMove")
+		canZoom = true
+	}
+	if configurations.PTZConfiguration.DefaultContinuousPanTiltVelocitySpace != "" {
+		functions = append(functions, "ContinuousPanTiltMove")
+		canPanTilt = true
+	}
+	if configurations.PTZConfiguration.DefaultContinuousZoomVelocitySpace != "" {
+		functions = append(functions, "ContinuousZoomMove")
+		canZoom = true
+	}
+	if configurations.PTZConfiguration.DefaultPTZSpeed != nil {
+		functions = append(functions, "PTZSpeed")
+	}
+	if configurations.PTZConfiguration.DefaultPTZTimeout != "" {
+		functions = append(functions, "PTZTimeout")
+	}
+
+	return functions, canZoom, canPanTilt
+}
+
+// VerifyOnvifConnection godoc
+// @Router /api/onvif/verify [post]
+// @ID verify-onvif
+// @Security Bearer
+// @securityDefinitions.apikey Bearer
+// @in header
+// @name Authorization
+// @Tags config
+// @Param cameraConfig body models.IPCamera true "Camera Config"
+// @Summary Will verify the ONVIF connectivity.
+// @Description Will verify the ONVIF connectivity.
+// @Success 200 {object} models.APIResponse
+func VerifyOnvifConnection(c *gin.Context) {
+	var cameraConfig models.IPCamera
+	err := c.BindJSON(&cameraConfig)
+	if err == nil {
+		device, err := ConnectToOnvifDevice(&cameraConfig)
+		if err == nil {
+			// Get the list of configurations
+			configurations, err := GetPTZConfigurationsFromDevice(device)
+			if err == nil {
+
+				// Check if can zoom and/or pan/tilt is supported
+				ptzFunctions, canZoom, canPanTilt := GetPTZFunctionsFromDevice(configurations)
+				c.JSON(200, models.APIResponse{
+					Data:         device,
+					PTZFunctions: ptzFunctions,
+					CanZoom:      canZoom,
+					CanPanTilt:   canPanTilt,
+				})
+			} else {
+				c.JSON(400, models.APIResponse{
+					Message: "Something went wrong while getting the configurations " + err.Error(),
+				})
+			}
+		} else {
+			c.JSON(400, models.APIResponse{
+				Message: "Something went wrong while verifying the ONVIF connection " + err.Error(),
+			})
+		}
+	} else {
+		c.JSON(400, models.APIResponse{
+			Message: "Something went wrong while receiving the config " + err.Error(),
+		})
+	}
+}
--- a/machinery/src/routers/http/Methods.go
+++ b/machinery/src/routers/http/Methods.go
@@ -42,7 +42,8 @@ func LoginToOnvif(c *gin.Context) {
 			},
 		}

-		device, err := onvif.ConnectToOnvifDevice(configuration)
+		cameraConfiguration := configuration.Config.Capture.IPCamera
+		device, err := onvif.ConnectToOnvifDevice(&cameraConfiguration)
 		if err == nil {
 			c.JSON(200, gin.H{
 				"device": device,
@@ -85,7 +86,8 @@ func GetOnvifCapabilities(c *gin.Context) {
 			},
 		}

-		device, err := onvif.ConnectToOnvifDevice(configuration)
+		cameraConfiguration := configuration.Config.Capture.IPCamera
+		device, err := onvif.ConnectToOnvifDevice(&cameraConfiguration)
 		if err == nil {
 			c.JSON(200, gin.H{
 				"capabilities": onvif.GetCapabilitiesFromDevice(device),
@@ -128,7 +130,8 @@ func DoOnvifPanTilt(c *gin.Context) {
 			},
 		}

-		device, err := onvif.ConnectToOnvifDevice(configuration)
+		cameraConfiguration := configuration.Config.Capture.IPCamera
+		device, err := onvif.ConnectToOnvifDevice(&cameraConfiguration)

 		if err == nil {
 			// Get token from the first profile
@@ -137,13 +140,13 @@ func DoOnvifPanTilt(c *gin.Context) {
 			if err == nil {

 				// Get the configurations from the device
-				configurations, err := onvif.GetConfigurationsFromDevice(device)
+				ptzConfigurations, err := onvif.GetPTZConfigurationsFromDevice(device)

 				if err == nil {

 					pan := onvifPanTilt.Pan
 					tilt := onvifPanTilt.Tilt
-					err := onvif.ContinuousPanTilt(device, configurations, token, pan, tilt)
+					err := onvif.ContinuousPanTilt(device, ptzConfigurations, token, pan, tilt)
 					if err == nil {
 						c.JSON(200, models.APIResponse{
 							Message: "Successfully pan/tilted the camera",
@@ -201,7 +204,8 @@ func DoOnvifZoom(c *gin.Context) {
 			},
 		}

-		device, err := onvif.ConnectToOnvifDevice(configuration)
+		cameraConfiguration := configuration.Config.Capture.IPCamera
+		device, err := onvif.ConnectToOnvifDevice(&cameraConfiguration)

 		if err == nil {
 			// Get token from the first profile
@@ -209,13 +213,13 @@ func DoOnvifZoom(c *gin.Context) {

 			if err == nil {

-				// Get the configurations from the device
-				configurations, err := onvif.GetConfigurationsFromDevice(device)
+				// Get the PTZ configurations from the device
+				ptzConfigurations, err := onvif.GetPTZConfigurationsFromDevice(device)

 				if err == nil {

 					zoom := onvifZoom.Zoom
-					err := onvif.ContinuousZoom(device, configurations, token, zoom)
+					err := onvif.ContinuousZoom(device, ptzConfigurations, token, zoom)
 					if err == nil {
 						c.JSON(200, models.APIResponse{
 							Message: "Successfully zoomed the camera",
--- a/machinery/src/routers/http/Routes.go
+++ b/machinery/src/routers/http/Routes.go
@@ -7,6 +7,7 @@ import (
 	jwt "github.com/appleboy/gin-jwt/v2"
 	"github.com/gin-gonic/gin"
 	"github.com/kerberos-io/agent/machinery/src/capture"
+	"github.com/kerberos-io/agent/machinery/src/onvif"
 	"github.com/kerberos-io/agent/machinery/src/routers/websocket"

 	"github.com/kerberos-io/agent/machinery/src/cloud"
@@ -196,6 +197,10 @@ func AddRoutes(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware, configuratio
 			})
 		})

+		api.POST("/onvif/verify", func(c *gin.Context) {
+			onvif.VerifyOnvifConnection(c)
+		})
+
 		api.POST("/hub/verify", func(c *gin.Context) {
 			cloud.VerifyHub(c)
 		})
--- a/machinery/src/routers/mqtt/main.go
+++ b/machinery/src/routers/mqtt/main.go
@@ -13,10 +13,38 @@ import (
 	"github.com/kerberos-io/agent/machinery/src/webrtc"
 )

+// We'll cache the MQTT settings to know if we need to reinitialize the MQTT client connection.
+// If we update the configuration but no new MQTT settings are provided, we don't need to restart it.
+var PREV_MQTTURI string
+var PREV_MQTTUsername string
+var PREV_MQTTPassword string
+var PREV_HubKey string
+var PREV_AgentKey string
+
+func HasMQTTClientModified(configuration *models.Configuration) bool {
+	MTTURI := configuration.Config.MQTTURI
+	MTTUsername := configuration.Config.MQTTUsername
+	MQTTPassword := configuration.Config.MQTTPassword
+	HubKey := configuration.Config.HubKey
+	AgentKey := configuration.Config.Key
+	if PREV_MQTTURI != MTTURI || PREV_MQTTUsername != MTTUsername || PREV_MQTTPassword != MQTTPassword || PREV_HubKey != HubKey || PREV_AgentKey != AgentKey {
+		log.Log.Info("HasMQTTClientModified: MQTT settings have been modified, restarting MQTT client.")
+		return true
+	}
+	return false
+}
+
 func ConfigureMQTT(configuration *models.Configuration, communication *models.Communication) mqtt.Client {

 	config := configuration.Config

+	// Set the MQTT settings.
+	PREV_MQTTURI = configuration.Config.MQTTURI
+	PREV_MQTTUsername = configuration.Config.MQTTUsername
+	PREV_MQTTPassword = configuration.Config.MQTTPassword
+	PREV_HubKey = configuration.Config.HubKey
+	PREV_AgentKey = configuration.Config.Key
+
 	if config.Offline == "true" {
 		log.Log.Info("ConfigureMQTT: not starting as running in Offline mode.")
 	} else {
@@ -78,7 +106,6 @@ func ConfigureMQTT(configuration *models.Configuration, communication *models.Co
 			webrtc.CandidateArrays = make(map[string](chan string))

 			opts.OnConnect = func(c mqtt.Client) {
-
 				// We managed to connect to the MQTT broker, hurray!
 				log.Log.Info("ConfigureMQTT: " + mqttClientID + " connected to " + mqttURL)

@@ -117,11 +144,15 @@ func MQTTListenerHandleLiveSD(mqttClient mqtt.Client, hubKey string, configurati
 	config := configuration.Config
 	topicRequest := "kerberos/" + hubKey + "/device/" + config.Key + "/request-live"
 	mqttClient.Subscribe(topicRequest, 0, func(c mqtt.Client, msg mqtt.Message) {
-		select {
-		case communication.HandleLiveSD <- time.Now().Unix():
-		default:
+		if communication.CameraConnected {
+			select {
+			case communication.HandleLiveSD <- time.Now().Unix():
+			default:
+			}
+			log.Log.Info("MQTTListenerHandleLiveSD: received request to livestream.")
+		} else {
+			log.Log.Info("MQTTListenerHandleLiveSD: received request to livestream, but camera is not connected.")
 		}
-		log.Log.Info("MQTTListenerHandleLiveSD: received request to livestream.")
 		msg.Ack()
 	})
 }
@@ -130,12 +161,16 @@ func MQTTListenerHandleLiveHDHandshake(mqttClient mqtt.Client, hubKey string, co
 	config := configuration.Config
 	topicRequestWebRtc := config.Key + "/register"
 	mqttClient.Subscribe(topicRequestWebRtc, 0, func(c mqtt.Client, msg mqtt.Message) {
-		log.Log.Info("MQTTListenerHandleLiveHDHandshake: received request to setup webrtc.")
-		var sdp models.SDPPayload
-		json.Unmarshal(msg.Payload(), &sdp)
-		select {
-		case communication.HandleLiveHDHandshake <- sdp:
-		default:
+		if communication.CameraConnected {
+			var sdp models.SDPPayload
+			json.Unmarshal(msg.Payload(), &sdp)
+			select {
+			case communication.HandleLiveHDHandshake <- sdp:
+			default:
+			}
+			log.Log.Info("MQTTListenerHandleLiveHDHandshake: received request to setup webrtc.")
+		} else {
+			log.Log.Info("MQTTListenerHandleLiveHDHandshake: received request to setup webrtc, but camera is not connected.")
 		}
 		msg.Ack()
 	})
@@ -145,9 +180,13 @@ func MQTTListenerHandleLiveHDKeepalive(mqttClient mqtt.Client, hubKey string, co
 	config := configuration.Config
 	topicKeepAlive := fmt.Sprintf("kerberos/webrtc/keepalivehub/%s", config.Key)
 	mqttClient.Subscribe(topicKeepAlive, 0, func(c mqtt.Client, msg mqtt.Message) {
-		alive := string(msg.Payload())
-		communication.HandleLiveHDKeepalive <- alive
-		log.Log.Info("MQTTListenerHandleLiveHDKeepalive: Received keepalive: " + alive)
+		if communication.CameraConnected {
+			alive := string(msg.Payload())
+			communication.HandleLiveHDKeepalive <- alive
+			log.Log.Info("MQTTListenerHandleLiveHDKeepalive: Received keepalive: " + alive)
+		} else {
+			log.Log.Info("MQTTListenerHandleLiveHDKeepalive: received keepalive, but camera is not connected.")
+		}
 	})
 }

@@ -155,9 +194,13 @@ func MQTTListenerHandleLiveHDPeers(mqttClient mqtt.Client, hubKey string, config
 	config := configuration.Config
 	topicPeers := fmt.Sprintf("kerberos/webrtc/peers/%s", config.Key)
 	mqttClient.Subscribe(topicPeers, 0, func(c mqtt.Client, msg mqtt.Message) {
-		peerCount := string(msg.Payload())
-		communication.HandleLiveHDPeers <- peerCount
-		log.Log.Info("MQTTListenerHandleLiveHDPeers: Number of peers listening: " + peerCount)
+		if communication.CameraConnected {
+			peerCount := string(msg.Payload())
+			communication.HandleLiveHDPeers <- peerCount
+			log.Log.Info("MQTTListenerHandleLiveHDPeers: Number of peers listening: " + peerCount)
+		} else {
+			log.Log.Info("MQTTListenerHandleLiveHDPeers: received peer count, but camera is not connected.")
+		}
 	})
 }

@@ -165,19 +208,23 @@ func MQTTListenerHandleLiveHDCandidates(mqttClient mqtt.Client, hubKey string, c
 	config := configuration.Config
 	topicCandidates := "candidate/cloud"
 	mqttClient.Subscribe(topicCandidates, 0, func(c mqtt.Client, msg mqtt.Message) {
-		var candidate models.Candidate
-		json.Unmarshal(msg.Payload(), &candidate)
-		if candidate.CloudKey == config.Key {
-			key := candidate.CloudKey + "/" + candidate.Cuuid
-			candidatesExists := false
-			var channel chan string
-			for !candidatesExists {
-				webrtc.CandidatesMutex.Lock()
-				channel, candidatesExists = webrtc.CandidateArrays[key]
-				webrtc.CandidatesMutex.Unlock()
+		if communication.CameraConnected {
+			var candidate models.Candidate
+			json.Unmarshal(msg.Payload(), &candidate)
+			if candidate.CloudKey == config.Key {
+				key := candidate.CloudKey + "/" + candidate.Cuuid
+				candidatesExists := false
+				var channel chan string
+				for !candidatesExists {
+					webrtc.CandidatesMutex.Lock()
+					channel, candidatesExists = webrtc.CandidateArrays[key]
+					webrtc.CandidatesMutex.Unlock()
+				}
+				log.Log.Info("MQTTListenerHandleLiveHDCandidates: " + string(msg.Payload()))
+				channel <- string(msg.Payload())
 			}
-			log.Log.Info("MQTTListenerHandleLiveHDCandidates: " + string(msg.Payload()))
-			channel <- string(msg.Payload())
+		} else {
+			log.Log.Info("MQTTListenerHandleLiveHDCandidates: received candidate, but camera is not connected.")
 		}
 	})
 }
@@ -186,23 +233,28 @@ func MQTTListenerHandleONVIF(mqttClient mqtt.Client, hubKey string, configuratio
 	config := configuration.Config
 	topicOnvif := fmt.Sprintf("kerberos/onvif/%s", config.Key)
 	mqttClient.Subscribe(topicOnvif, 0, func(c mqtt.Client, msg mqtt.Message) {
-		var onvifAction models.OnvifAction
-		json.Unmarshal(msg.Payload(), &onvifAction)
-		communication.HandleONVIF <- onvifAction
-		log.Log.Info("MQTTListenerHandleONVIF: Received an action - " + onvifAction.Action)
+		if communication.CameraConnected {
+			var onvifAction models.OnvifAction
+			json.Unmarshal(msg.Payload(), &onvifAction)
+			communication.HandleONVIF <- onvifAction
+			log.Log.Info("MQTTListenerHandleONVIF: Received an action - " + onvifAction.Action)
+		} else {
+			log.Log.Info("MQTTListenerHandleONVIF: received action, but camera is not connected.")
+		}
 	})
 }

 func DisconnectMQTT(mqttClient mqtt.Client, config *models.Config) {
 	if mqttClient != nil {
-		// Cleanup all subscriptions.
-		mqttClient.Unsubscribe("kerberos/" + config.HubKey + "/device/" + config.Key + "/request-live")
-		mqttClient.Unsubscribe(config.Key + "/register")
-		mqttClient.Unsubscribe("kerberos/webrtc/keepalivehub/" + config.Key)
-		mqttClient.Unsubscribe("kerberos/webrtc/peers/" + config.Key)
+		// Cleanup all subscriptions
+		mqttClient.Unsubscribe("kerberos/" + PREV_HubKey + "/device/" + PREV_AgentKey + "/request-live")
+		mqttClient.Unsubscribe(PREV_AgentKey + "/register")
+		mqttClient.Unsubscribe("kerberos/webrtc/keepalivehub/" + PREV_AgentKey)
+		mqttClient.Unsubscribe("kerberos/webrtc/peers/" + PREV_AgentKey)
 		mqttClient.Unsubscribe("candidate/cloud")
-		mqttClient.Unsubscribe("kerberos/onvif/" + config.Key)
+		mqttClient.Unsubscribe("kerberos/onvif/" + PREV_AgentKey)
 		mqttClient.Disconnect(1000)
 		mqttClient = nil
+		log.Log.Info("DisconnectMQTT: MQTT client disconnected.")
 	}
 }
--- a/machinery/src/routers/websocket/main.go
+++ b/machinery/src/routers/websocket/main.go
@@ -51,6 +51,7 @@ func WebsocketHandler(c *gin.Context, communication *models.Communication) {
 	w := c.Writer
 	r := c.Request
 	conn, err := upgrader.Upgrade(w, r, nil)
+
 	// error handling here
 	if err == nil {
 		defer conn.Close()
@@ -83,28 +84,29 @@ func WebsocketHandler(c *gin.Context, communication *models.Communication) {
 				_, exists := sockets[clientID].Cancels["stream-sd"]
 				if exists {
 					sockets[clientID].Cancels["stream-sd"]()
-					delete(sockets[clientID].Cancels, "stream-sd")
 				} else {
 					log.Log.Error("Streaming sd does not exists for " + clientID)
 				}

 			case "stream-sd":
-				startStrean := Message{
-					ClientID:    clientID,
-					MessageType: "stream-sd",
-					Message: map[string]string{
-						"message": "Start streaming low resolution",
-					},
-				}
-				sockets[clientID].WriteJson(startStrean)
+				if communication.CameraConnected {
+					_, exists := sockets[clientID].Cancels["stream-sd"]
+					if exists {
+						log.Log.Info("Already streaming sd for " + clientID)
+					} else {
+						startStream := Message{
+							ClientID:    clientID,
+							MessageType: "stream-sd",
+							Message: map[string]string{
+								"message": "Start streaming low resolution",
+							},
+						}
+						sockets[clientID].WriteJson(startStream)

-				_, exists := sockets[clientID].Cancels["stream-sd"]
-				if exists {
-					log.Log.Info("Already streaming sd for " + clientID)
-				} else {
-					ctx, cancel := context.WithCancel(context.Background())
-					sockets[clientID].Cancels["stream-sd"] = cancel
-					go ForwardSDStream(ctx, clientID, sockets[clientID], communication)
+						ctx, cancel := context.WithCancel(context.Background())
+						sockets[clientID].Cancels["stream-sd"] = cancel
+						go ForwardSDStream(ctx, clientID, sockets[clientID], communication)
+					}
 				}
 			}

@@ -173,5 +175,14 @@ logreader:

 	frame.Free()

+	// Close socket for streaming
+	_, exists := connection.Cancels["stream-sd"]
+	if exists {
+		delete(connection.Cancels, "stream-sd")
+	} else {
+		log.Log.Error("Streaming sd does not exists for " + clientID)
+	}
+
+	// Send stop streaming message
 	log.Log.Info("ForwardSDStream: stop sending streaming over websocket")
 }
--- a/ui/package.json
+++ b/ui/package.json
@@ -4,7 +4,7 @@
  "private": false,
  "dependencies": {
    "@giantmachines/redux-websocket": "^1.5.1",
-    "@kerberos-io/ui": "^1.72.0",
+    "@kerberos-io/ui": "^1.76.0",
    "@material-ui/core": "^4.12.4",
    "@material-ui/icons": "^4.11.3",
    "@testing-library/jest-dom": "^5.16.5",
--- a/ui/public/locales/de/translation.json
+++ b/ui/public/locales/de/translation.json
@@ -4,7 +4,8 @@
    "configure": "Konfigurieren"
  },
  "buttons": {
-    "save": "Speichern"
+    "save": "Speichern",
+    "verify_connection": "Verify Connection"
  },
  "navigation": {
    "profile": "Profil",
@@ -69,7 +70,10 @@
      "verify_persistence_error": "Beim überprüfen der Speichereinstellungen ist ein Fehler aufgetreten",
      "verify_camera": "Überprüfen der Kameraeinstellungen.",
      "verify_camera_success": "Die Kameraeinstellungen wurden erfolgreich überprüft.",
-      "verify_camera_error": "Beim überprüfen der Kameraeinstellungen ist ein Fehler aufgetreten"
+      "verify_camera_error": "Beim überprüfen der Kameraeinstellungen ist ein Fehler aufgetreten",
+      "verify_onvif": "Verifying your ONVIF settings.",
+      "verify_onvif_success": "ONVIF settings are successfully verified.",
+      "verify_onvif_error": "Something went wrong while verifying the ONVIF settings"
    },
    "overview": {
      "general": "Allgemein",
@@ -186,13 +190,13 @@
      "kerberoshub_description_region": "Die Region in der die Aufnahmen gespeichert werden sollen.",
      "kerberoshub_bucket": "Bucket",
      "kerberoshub_description_bucket": "Der Bucket in dem die Aufnahmen gespeichert werden.",
-      "kerberoshub_username": "Benutzername/Verzeichnis",
+      "kerberoshub_username": "Benutzername/Verzeichnis (should match Kerberos Hub username)",
      "kerberoshub_description_username": "Der Benutzername des Kerberos Hub Accounts.",
      "kerberosvault_apiurl": "Kerberos Vault API URL",
      "kerberosvault_description_apiurl": "Die Kerberos Vault API URL.",
      "kerberosvault_provider": "Anbieter",
      "kerberosvault_description_provider": "Der Anbieter zu dem die Aufnahmen gesendet werden.",
-      "kerberosvault_directory": "Verzeichnis",
+      "kerberosvault_directory": "Verzeichnis (should match Kerberos Hub username)",
      "kerberosvault_description_directory": "Das Uneterverzeichnis in dem die Aufnahmen gespeichert werden sollen.",
      "kerberosvault_accesskey": "Zugriffsschlüssel",
      "kerberosvault_description_accesskey": "Der Zugriffsschlüssel des Kerberos Vault Accounts..",
--- a/ui/public/locales/en/translation.json
+++ b/ui/public/locales/en/translation.json
@@ -4,7 +4,8 @@
    "configure": "Configure"
  },
  "buttons": {
-    "save": "Save"
+    "save": "Save",
+    "verify_connection": "Verify Connection"
  },
  "navigation": {
    "profile": "Profile",
@@ -69,7 +70,10 @@
      "verify_persistence_error": "Something went wrong while verifying the persistence",
      "verify_camera": "Verifying your camera settings.",
      "verify_camera_success": "Camera settings are successfully verified.",
-      "verify_camera_error": "Something went wrong while verifying the camera settings"
+      "verify_camera_error": "Something went wrong while verifying the camera settings",
+      "verify_onvif": "Verifying your ONVIF settings.",
+      "verify_onvif_success": "ONVIF settings are successfully verified.",
+      "verify_onvif_error": "Something went wrong while verifying the ONVIF settings"
    },
    "overview": {
      "general": "General",
@@ -186,13 +190,13 @@
      "kerberoshub_description_region": "The region we are storing our recordings in.",
      "kerberoshub_bucket": "Bucket",
      "kerberoshub_description_bucket": "The bucket we are storing our recordings in.",
-      "kerberoshub_username": "Username/Directory",
+      "kerberoshub_username": "Username/Directory (should match Kerberos Hub username)",
      "kerberoshub_description_username": "The username of your Kerberos Hub account.",
      "kerberosvault_apiurl": "Kerberos Vault API URL",
      "kerberosvault_description_apiurl": "The Kerberos Vault API",
      "kerberosvault_provider": "Provider",
      "kerberosvault_description_provider": "The provider to which your recordings will be send.",
-      "kerberosvault_directory": "Directory",
+      "kerberosvault_directory": "Directory (should match Kerberos Hub username)",
      "kerberosvault_description_directory": "Sub directory the recordings will be stored in your provider.",
      "kerberosvault_accesskey": "Access key",
      "kerberosvault_description_accesskey": "The access key of your Kerberos Vault account.",
--- a/ui/public/locales/es/translation.json
+++ b/ui/public/locales/es/translation.json
@@ -4,7 +4,8 @@
    "configure": "Configure"
  },
  "buttons": {
-    "save": "Save"
+    "save": "Save",
+    "verify_connection": "Verify Connection"
  },
  "navigation": {
    "profile": "Perfil",
@@ -69,7 +70,10 @@
      "verify_persistence_error": "Something went wrong while verifying the persistence",
      "verify_camera": "Verifying your camera settings.",
      "verify_camera_success": "Camera settings are successfully verified.",
-      "verify_camera_error": "Something went wrong while verifying the camera settings"
+      "verify_camera_error": "Something went wrong while verifying the camera settings",
+      "verify_onvif": "Verifying your ONVIF settings.",
+      "verify_onvif_success": "ONVIF settings are successfully verified.",
+      "verify_onvif_error": "Something went wrong while verifying the ONVIF settings"
    },
    "overview": {
      "general": "General",
@@ -186,13 +190,13 @@
      "kerberoshub_description_region": "The region we are storing our recordings in.",
      "kerberoshub_bucket": "Bucket",
      "kerberoshub_description_bucket": "The bucket we are storing our recordings in.",
-      "kerberoshub_username": "Username/Directory",
+      "kerberoshub_username": "Username/Directory (should match Kerberos Hub username)",
      "kerberoshub_description_username": "The username of your Kerberos Hub account.",
      "kerberosvault_apiurl": "Kerberos Vault API URL",
      "kerberosvault_description_apiurl": "The Kerberos Vault API",
      "kerberosvault_provider": "Provider",
      "kerberosvault_description_provider": "The provider to which your recordings will be send.",
-      "kerberosvault_directory": "Directory",
+      "kerberosvault_directory": "Directory (should match Kerberos Hub username)",
      "kerberosvault_description_directory": "Sub directory the recordings will be stored in your provider.",
      "kerberosvault_accesskey": "Access key",
      "kerberosvault_description_accesskey": "The access key of your Kerberos Vault account.",
--- a/ui/public/locales/fr/translation.json
+++ b/ui/public/locales/fr/translation.json
@@ -69,7 +69,10 @@
      "verify_persistence_error": "Quelque chose s'est mal déroulé lors de la vérification de la persistance",
      "verify_camera": "Vérifier les paramètres de votre caméra.",
      "verify_camera_success": "Les paramètres de la caméra sont vérifiés avec succès.",
-      "verify_camera_error": "Quelque chose s'est mal déroulé lors de la vérification des paramètres de la caméra"
+      "verify_camera_error": "Quelque chose s'est mal déroulé lors de la vérification des paramètres de la caméra",
+      "verify_onvif": "Verifying your ONVIF settings.",
+      "verify_onvif_success": "ONVIF settings are successfully verified.",
+      "verify_onvif_error": "Something went wrong while verifying the ONVIF settings"
    },
    "overview": {
      "general": "Général",
@@ -186,13 +189,13 @@
      "kerberoshub_description_region": "La région dans laquelle nous stockons vos enregistrements.",
      "kerberoshub_bucket": "Compartiment",
      "kerberoshub_description_bucket": "Le compartiment dans lequel nous stockons vos enregistrements.",
-      "kerberoshub_username": "Utilisateur/Répertoire",
+      "kerberoshub_username": "Utilisateur/Répertoire (should match Kerberos Hub username)",
      "kerberoshub_description_username": "Le nom d'utilisateur de votre compte Kerberos Hub.",
      "kerberosvault_apiurl": "URL de l'API Kerberos Vault",
      "kerberosvault_description_apiurl": "L'API Kerberos Vault",
      "kerberosvault_provider": "Fournisseur",
      "kerberosvault_description_provider": "Le fournisseur auquel vos enregistrements seront envoyés.",
-      "kerberosvault_directory": "Répertoire",
+      "kerberosvault_directory": "Répertoire (should match Kerberos Hub username)",
      "kerberosvault_description_directory": "Le sous-répertoire dans lequel les enregistrements seront stockés chez votre fournisseur.",
      "kerberosvault_accesskey": "Clé d'accès",
      "kerberosvault_description_accesskey": "La clé d'accès de votre compte Kerberos Vault.",
--- a/ui/public/locales/ja/translation.json
+++ b/ui/public/locales/ja/translation.json
@@ -4,7 +4,8 @@
    "configure": "設定"
  },
  "buttons": {
-    "save": "保存"
+    "save": "保存",
+    "verify_connection": "Verify Connection"
  },
  "navigation": {
    "profile": "プロフィール",
@@ -69,7 +70,10 @@
      "verify_persistence_error": "持続性の検証中に問題が発生しました",
      "verify_camera": "カメラの設定を確認しています。",
      "verify_camera_success": "カメラの設定が正常に検証されました。",
-      "verify_camera_error": "カメラ設定の確認中に問題が発生しました"
+      "verify_camera_error": "カメラ設定の確認中に問題が発生しました",
+      "verify_onvif": "Verifying your ONVIF settings.",
+      "verify_onvif_success": "ONVIF settings are successfully verified.",
+      "verify_onvif_error": "Something went wrong while verifying the ONVIF settings"
    },
    "overview": {
      "general": "全般的",
@@ -186,13 +190,13 @@
      "kerberoshub_description_region": "録音を保存しているリージョン。",
      "kerberoshub_bucket": "bucket",
      "kerberoshub_description_bucket": "録音を保存しているbucket",
-      "kerberoshub_username": "ユーザー名/ディレクトリ",
+      "kerberoshub_username": "ユーザー名/ディレクトリ (should match Kerberos Hub username)",
      "kerberoshub_description_username": "Kerberos Hub アカウントのユーザー名。",
      "kerberosvault_apiurl": "Kerberos ボールト API URL",
      "kerberosvault_description_apiurl": "Kerberos ボールト API",
      "kerberosvault_provider": "プロバイダ",
      "kerberosvault_description_provider": "録音の送信先のプロバイダー。",
-      "kerberosvault_directory": "ディレクトリ",
+      "kerberosvault_directory": "ディレクトリ (should match Kerberos Hub username)",
      "kerberosvault_description_directory": "録音がプロバイダーに保存されるサブディレクトリ。",
      "kerberosvault_accesskey": "アクセスキー",
      "kerberosvault_description_accesskey": "Kerberos Vault アカウントのアクセス キー。",
--- a/ui/public/locales/nl/translation.json
+++ b/ui/public/locales/nl/translation.json
@@ -4,7 +4,8 @@
    "configure": "Instellingen"
  },
  "buttons": {
-    "save": "Opslaan"
+    "save": "Opslaan",
+    "verify_connection": "Verifieer Connectie"
  },
  "navigation": {
    "profile": "Profiel",
@@ -69,7 +70,10 @@
      "verify_persistence_error": "Er ging iets fout tijdens het controleren van de opslag instellingen",
      "verify_camera": "We controleren de camera instellingen.",
      "verify_camera_success": "De camera instellingen zijn gevalideerd.",
-      "verify_camera_error": "Er ging iets mis met de camera instellingen."
+      "verify_camera_error": "Er ging iets mis met de camera instellingen.",
+      "verify_onvif": "Verifying your ONVIF settings.",
+      "verify_onvif_success": "ONVIF settings are successfully verified.",
+      "verify_onvif_error": "Something went wrong while verifying the ONVIF settings"
    },
    "overview": {
      "general": "Algemeen",
@@ -187,13 +191,13 @@
      "kerberoshub_description_region": "De regio waar jouw opnames worden opgeslagen.",
      "kerberoshub_bucket": "Bucket",
      "kerberoshub_description_bucket": "De bucket opslag locatie",
-      "kerberoshub_username": "Gebruikersnaam/Map",
+      "kerberoshub_username": "Gebruikersnaam/Map (moet overeenkomen met de Kerberos Hub username)",
      "kerberoshub_description_username": "De gebruikersnaam van jouw Kerberos Hub account.",
      "kerberosvault_apiurl": "Kerberos Vault API URL",
      "kerberosvault_description_apiurl": "De Kerberos Vault API",
      "kerberosvault_provider": "Provider",
      "kerberosvault_description_provider": "De provider verantwoordelijk voor de opnames op te slaan.",
-      "kerberosvault_directory": "Map",
+      "kerberosvault_directory": "Map (moet overeenkomen met de Kerberos Hub username)",
      "kerberosvault_description_directory": "Sub map waarin de opnames worden opgeslagen.",
      "kerberosvault_accesskey": "Access key",
      "kerberosvault_description_accesskey": "De access key van jouw Kerberos Vault account.",
--- a/ui/public/locales/pl/translation.json
+++ b/ui/public/locales/pl/translation.json
@@ -4,7 +4,8 @@
    "configure": "Configure"
  },
  "buttons": {
-    "save": "Save"
+    "save": "Save",
+    "verify_connection": "Verify Connection"
  },
  "navigation": {
    "profile": "Profil",
@@ -69,7 +70,10 @@
      "verify_persistence_error": "Something went wrong while verifying the persistence",
      "verify_camera": "Verifying your camera settings.",
      "verify_camera_success": "Camera settings are successfully verified.",
-      "verify_camera_error": "Something went wrong while verifying the camera settings"
+      "verify_camera_error": "Something went wrong while verifying the camera settings",
+      "verify_onvif": "Verifying your ONVIF settings.",
+      "verify_onvif_success": "ONVIF settings are successfully verified.",
+      "verify_onvif_error": "Something went wrong while verifying the ONVIF settings"
    },
    "overview": {
      "general": "General",
@@ -186,13 +190,13 @@
      "kerberoshub_description_region": "The region we are storing our recordings in.",
      "kerberoshub_bucket": "Bucket",
      "kerberoshub_description_bucket": "The bucket we are storing our recordings in.",
-      "kerberoshub_username": "Username/Directory",
+      "kerberoshub_username": "Username/Directory (should match Kerberos Hub username)",
      "kerberoshub_description_username": "The username of your Kerberos Hub account.",
      "kerberosvault_apiurl": "Kerberos Vault API URL",
      "kerberosvault_description_apiurl": "The Kerberos Vault API",
      "kerberosvault_provider": "Provider",
      "kerberosvault_description_provider": "The provider to which your recordings will be send.",
-      "kerberosvault_directory": "Directory",
+      "kerberosvault_directory": "Directory (should match Kerberos Hub username)",
      "kerberosvault_description_directory": "Sub directory the recordings will be stored in your provider.",
      "kerberosvault_accesskey": "Access key",
      "kerberosvault_description_accesskey": "The access key of your Kerberos Vault account.",
--- a/ui/public/locales/pt/translation.json
+++ b/ui/public/locales/pt/translation.json
@@ -4,7 +4,8 @@
    "configure": "Configurar"
  },
  "buttons": {
-    "save": "Salvar"
+    "save": "Salvar",
+    "verify_connection": "Verify Connection"
  },
  "navigation": {
    "profile": "Perfil",
@@ -69,7 +70,10 @@
      "verify_persistence_error": "Algo deu errado ao verificar o armazenamento",
      "verify_camera": "Verificando as configurações de sua câmera.",
      "verify_camera_success": "As configurações da câmera foram verificadas com sucesso.",
-      "verify_camera_error": "Algo deu errado ao verificar as configurações da câmera."
+      "verify_camera_error": "Algo deu errado ao verificar as configurações da câmera.",
+      "verify_onvif": "Verifying your ONVIF settings.",
+      "verify_onvif_success": "ONVIF settings are successfully verified.",
+      "verify_onvif_error": "Something went wrong while verifying the ONVIF settings"
    },
    "overview": {
      "general": "Geral",
@@ -186,13 +190,13 @@
      "kerberoshub_description_region": "A região em que estamos armazenando nossas gravações.",
      "kerberoshub_bucket": "Bucket",
      "kerberoshub_description_bucket": "O bucket no qual estamos armazenando nossas gravações.",
-      "kerberoshub_username": "Nome de usuário/diretório (Username/Directory)",
+      "kerberoshub_username": "Nome de usuário/diretório (should match Kerberos Hub username)",
      "kerberoshub_description_username": "O nome de usuário da sua conta do Kerberos Hub.",
      "kerberosvault_apiurl": "Url da API do Kerberos Vault",
      "kerberosvault_description_apiurl": "a API Kerberos Vault",
      "kerberosvault_provider": "Provedor",
      "kerberosvault_description_provider": "O provedor para o qual suas gravações serão enviadas.",
-      "kerberosvault_directory": "Diretório",
+      "kerberosvault_directory": "Diretório (should match Kerberos Hub username)",
      "kerberosvault_description_directory": "Subdiretório as gravações serão armazenadas em seu provedor.",
      "kerberosvault_accesskey": "Chave de acesso(Access key)",
      "kerberosvault_description_accesskey": "A chave de acesso da sua conta do Kerberos Vault.",
--- a/ui/public/locales/zh/translation.json
+++ b/ui/public/locales/zh/translation.json
@@ -4,7 +4,8 @@
    "configure": "配置"
  },
  "buttons": {
-    "save": "保存"
+    "save": "保存",
+    "verify_connection": "Verify Connection"
  },
  "navigation": {
    "profile": "配置文件",
@@ -69,7 +70,10 @@
      "verify_persistence_error": "验证持久化存储时出错",
      "verify_camera": "验证您的相机设置",
      "verify_camera_success": "相机设置验证成功",
-      "verify_camera_error": "验证相机设置时出错"
+      "verify_camera_error": "验证相机设置时出错",
+      "verify_onvif": "Verifying your ONVIF settings.",
+      "verify_onvif_success": "ONVIF settings are successfully verified.",
+      "verify_onvif_error": "Something went wrong while verifying the ONVIF settings"
    },
    "overview": {
      "general": "常规",
@@ -186,13 +190,13 @@
      "kerberoshub_description_region": "存储录像的区域",
      "kerberoshub_bucket": "Bucket",
      "kerberoshub_description_bucket": "存储录像的桶",
-      "kerberoshub_username": "账户/目录",
+      "kerberoshub_username": "账户/目录 (should match Kerberos Hub username)",
      "kerberoshub_description_username": "您的 Kerberos Hub 帐户的用户名",
      "kerberosvault_apiurl": "Kerberos Vault API URL",
      "kerberosvault_description_apiurl": "Kerberos Vault API",
      "kerberosvault_provider": "供应商",
      "kerberosvault_description_provider": "您的录像将会被发送到的提供商",
-      "kerberosvault_directory": "目录",
+      "kerberosvault_directory": "目录 (should match Kerberos Hub username)",
      "kerberosvault_description_directory": "录像将存储在提供商中的子目录",
      "kerberosvault_accesskey": "访问密钥",
      "kerberosvault_description_accesskey": "Kerberos Vault 帐户的访问密钥",
--- a/ui/src/App.jsx
+++ b/ui/src/App.jsx
@@ -38,6 +38,16 @@ class App extends React.Component {
    dispatchGetDashboardInformation();
    dispatchConnect();

+    const connectInterval = interval(1000);
+    this.connectionSubscription = connectInterval.subscribe(() => {
+      const { connected } = this.props;
+      if (connected) {
+        // Already connected
+      } else {
+        dispatchConnect();
+      }
+    });
+
    const interval$ = interval(5000);
    this.subscription = interval$.subscribe(() => {
      dispatchGetDashboardInformation();
@@ -64,6 +74,7 @@ class App extends React.Component {

  componentWillUnmount() {
    this.subscription.unsubscribe();
+    this.connectionSubscription.unsubscribe();
    const message = {
      client_id: uuid(),
      message_type: 'goodbye',
--- a/ui/src/actions/agent.js
+++ b/ui/src/actions/agent.js
@@ -1,6 +1,7 @@
 import {
  doGetConfig,
  doSaveConfig,
+  doVerifyOnvif,
  doVerifyHub,
  doVerifyPersistence,
  doGetKerberosAgentTags,
@@ -39,6 +40,28 @@ export const updateRegion = (id, polygon) => {
  };
 };

+export const verifyOnvif = (config, onSuccess, onError) => {
+  return (dispatch) => {
+    doVerifyOnvif(
+      config,
+      (data) => {
+        dispatch({
+          type: 'VERIFY_ONVIF',
+        });
+        if (onSuccess) {
+          onSuccess(data);
+        }
+      },
+      (error) => {
+        const { message } = error;
+        if (onError) {
+          onError(message);
+        }
+      }
+    );
+  };
+};
+
 export const verifyCamera = (streamType, config, onSuccess, onError) => {
  return (dispatch) => {
    doVerifyCamera(
--- a/ui/src/api/agent.js
+++ b/ui/src/api/agent.js
@@ -91,6 +91,26 @@ export function doVerifyHub(config, onSuccess, onError) {
    });
 }

+export function doVerifyOnvif(config, onSuccess, onError) {
+  const endpoint = API.post(`onvif/verify`, {
+    ...config,
+  });
+  endpoint
+    .then((res) => {
+      if (res.status !== 200) {
+        throw new Error(res.data);
+      }
+      return res.data;
+    })
+    .then((data) => {
+      onSuccess(data);
+    })
+    .catch((e) => {
+      const { data } = e.response;
+      onError(data);
+    });
+}
+
 export function doVerifyCamera(streamType, config, onSuccess, onError) {
  const cameraStreams = {
    rtsp: '',
--- a/ui/src/index.jsx
+++ b/ui/src/index.jsx
@@ -50,7 +50,9 @@ function getAuthState() {
  }
 }

-const reduxWebsocketMiddleware = reduxWebsocket();
+const reduxWebsocketMiddleware = reduxWebsocket({
+  reconnectOnClose: true,
+});

 const store = createStore(
  rootReducer(history),
--- a/ui/src/pages/Dashboard/Dashboard.jsx
+++ b/ui/src/pages/Dashboard/Dashboard.jsx
@@ -4,6 +4,7 @@ import { Link, withRouter } from 'react-router-dom';
 import { withTranslation } from 'react-i18next';
 import { send } from '@giantmachines/redux-websocket';
 import { connect } from 'react-redux';
+import { interval } from 'rxjs';
 import {
  Breadcrumb,
  KPI,
@@ -66,6 +67,11 @@ class Dashboard extends React.Component {
        message_type: 'stream-sd',
      };
      dispatchSend(message);
+
+      const requestStreamInterval = interval(3000);
+      this.requestStreamSubscription = requestStreamInterval.subscribe(() => {
+        dispatchSend(message);
+      });
    }
  }

@@ -75,6 +81,9 @@ class Dashboard extends React.Component {
      liveview[0].remove();
    }

+    if (this.requestStreamSubscription) {
+      this.requestStreamSubscription.unsubscribe();
+    }
    const { dispatchSend } = this.props;
    const message = {
      message_type: 'stop-sd',
--- a/ui/src/pages/Settings/Settings.jsx
+++ b/ui/src/pages/Settings/Settings.jsx
@@ -27,6 +27,7 @@ import {
  updateRegion,
  removeRegion,
  saveConfig,
+  verifyOnvif,
  verifyCamera,
  verifyHub,
  verifyPersistence,
@@ -63,6 +64,9 @@ class Settings extends React.Component {
      verifyCameraSuccess: false,
      verifyCameraError: false,
      verifyCameraMessage: '',
+      verifyOnvifSuccess: false,
+      verifyOnvifError: false,
+      verifyOnvifErrorMessage: '',
      loading: false,
      loadingHub: false,
      loadingCamera: false,
@@ -127,6 +131,7 @@ class Settings extends React.Component {
    this.onAddRegion = this.onAddRegion.bind(this);
    this.onUpdateRegion = this.onUpdateRegion.bind(this);
    this.onDeleteRegion = this.onDeleteRegion.bind(this);
+    this.verifyONVIF = this.verifyONVIF.bind(this);
  }

  componentDidMount() {
@@ -274,6 +279,8 @@ class Settings extends React.Component {
      verifyHubError: false,
      configSuccess: false,
      configError: false,
+      verifyOnvifSuccess: false,
+      verifyOnvifError: false,
    });

    if (config) {
@@ -295,6 +302,52 @@ class Settings extends React.Component {
    }
  }

+  verifyONVIF() {
+    const { config, dispatchVerifyOnvif } = this.props;
+
+    // Get camera configuration (subset of config).
+    const cameraConfig = {
+      onvif_xaddr: config.config.capture.ipcamera.onvif_xaddr,
+      onvif_username: config.config.capture.ipcamera.onvif_username,
+      onvif_password: config.config.capture.ipcamera.onvif_password,
+    };
+
+    this.setState({
+      verifyOnvifSuccess: false,
+      verifyOnvifError: false,
+      verifyOnvifErrorMessage: '',
+      verifyCameraSuccess: false,
+      verifyCameraError: false,
+      verifyCameraErrorMessage: '',
+      configSuccess: false,
+      configError: false,
+      loadingCamera: false,
+      loadingOnvif: true,
+    });
+
+    if (config) {
+      dispatchVerifyOnvif(
+        cameraConfig,
+        () => {
+          this.setState({
+            verifyOnvifSuccess: true,
+            verifyOnvifError: false,
+            verifyOnvifErrorMessage: '',
+            loadingOnvif: false,
+          });
+        },
+        (error) => {
+          this.setState({
+            verifyOnvifSuccess: false,
+            verifyOnvifError: true,
+            verifyOnvifErrorMessage: error,
+            loadingOnvif: false,
+          });
+        }
+      );
+    }
+  }
+
  verifyHubSettings() {
    const { config, dispatchVerifyHub } = this.props;
    if (config) {
@@ -317,6 +370,8 @@ class Settings extends React.Component {
        verifyCameraSuccess: false,
        verifyCameraError: false,
        verifyCameraErrorMessage: '',
+        verifyOnvifSuccess: false,
+        verifyOnvifError: false,
        loadingHub: true,
      });

@@ -362,6 +417,8 @@ class Settings extends React.Component {
        persistenceError: false,
        verifyCameraSuccess: false,
        verifyCameraError: false,
+        verifyOnvifSuccess: false,
+        verifyOnvifError: false,
        verifyCameraErrorMessage: '',
        loading: true,
      });
@@ -402,6 +459,7 @@ class Settings extends React.Component {
      this.setState({
        configSuccess: false,
        configError: false,
+        loadingCamera: true,
        verifyPersistenceSuccess: false,
        verifyPersistenceError: false,
        verifyHubSuccess: false,
@@ -410,9 +468,10 @@ class Settings extends React.Component {
        verifyCameraSuccess: false,
        verifyCameraError: false,
        verifyCameraErrorMessage: '',
+        verifyOnvifSuccess: false,
+        verifyOnvifError: false,
        hubSuccess: false,
        hubError: false,
-        loadingCamera: true,
      });

      dispatchVerifyCamera(
@@ -453,6 +512,10 @@ class Settings extends React.Component {
      verifyCameraSuccess,
      verifyCameraError,
      verifyCameraErrorMessage,
+      loadingOnvif,
+      verifyOnvifSuccess,
+      verifyOnvifError,
+      verifyOnvifErrorMessage,
      loadingCamera,
      loading,
      loadingHub,
@@ -652,10 +715,23 @@ class Settings extends React.Component {
            type="alert"
            message={`${t(
              'settings.info.verify_camera_error'
-            )} :${verifyCameraErrorMessage}`}
+            )}: ${verifyCameraErrorMessage}`}
          />
        )}

+        {loadingOnvif && (
+          <InfoBar type="loading" message={t('settings.info.verify_onvif')} />
+        )}
+        {verifyOnvifSuccess && (
+          <InfoBar
+            type="success"
+            message={t('settings.info.verify_onvif_success')}
+          />
+        )}
+        {verifyOnvifError && (
+          <InfoBar type="alert" message={`${verifyOnvifErrorMessage}`} />
+        )}
+
        {loadingHub && (
          <InfoBar type="loading" message={t('settings.info.verify_hub')} />
        )}
@@ -1103,7 +1179,7 @@ class Settings extends React.Component {
                    noPadding
                    label={t('settings.camera.onvif_xaddr')}
                    value={config.capture.ipcamera.onvif_xaddr}
-                    placeholder="http://x.x.x.x/onvif/device_service"
+                    placeholder="x.x.x.x:yyyy"
                    onChange={(value) =>
                      this.onUpdateField(
                        'capture.ipcamera',
@@ -1143,6 +1219,12 @@ class Settings extends React.Component {
                  />
                </BlockBody>
                <BlockFooter>
+                  <Button
+                    label={t('buttons.verify_connection')}
+                    type="default"
+                    icon="verify"
+                    onClick={this.verifyONVIF}
+                  />
                  <Button
                    label={t('buttons.save')}
                    type="default"
@@ -2245,6 +2327,8 @@ const mapStateToProps = (state /* , ownProps */) => ({
 });

 const mapDispatchToProps = (dispatch /* , ownProps */) => ({
+  dispatchVerifyOnvif: (config, success, error) =>
+    dispatch(verifyOnvif(config, success, error)),
  dispatchVerifyCamera: (streamType, config, success, error) =>
    dispatch(verifyCamera(streamType, config, success, error)),
  dispatchVerifyHub: (config, success, error) =>
@@ -2272,6 +2356,7 @@ Settings.propTypes = {
  dispatchUpdateRegion: PropTypes.func.isRequired,
  dispatchRemoveRegion: PropTypes.func.isRequired,
  dispatchVerifyCamera: PropTypes.func.isRequired,
+  dispatchVerifyOnvif: PropTypes.func.isRequired,
 };

 export default withTranslation()(
Author	SHA1	Message	Date
Cedric Verstraeten	3341e99af1	timetable might be empty	2023-06-13 09:22:51 +02:00
Cedric Verstraeten	ced6e678ec	Update Settings.jsx	2023-06-12 21:08:05 +02:00
Cedric Verstraeten	340a5d7ef6	Update Settings.jsx	2023-06-12 21:06:21 +02:00
Cedric Verstraeten	60e8edc876	add onvif verify option + improve streaming logic + reconnect websocket	2023-06-12 20:33:41 +02:00
Cedric Verstraeten	9cf9babd73	introduce camera connected variable + allow MQTT stream to be connected even when no camera attached	2023-06-09 14:44:09 +02:00