reference latest tags

Fix for Kerberos Vault persistence check
Fix for empty vault settings, throw error
2026-03-03 16:50:15 +00:00 · 2023-06-24 12:58:16 +02:00 · 2023-06-23 21:13:13 +02:00 · 2023-06-23 20:20:38 +02:00 · 2023-06-23 19:01:04 +02:00 · 2023-06-23 17:16:13 +02:00
60 changed files with 2467 additions and 765 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -14,7 +14,7 @@
 	// Uncomment the next line to run commands after the container is created - for example installing curl.
 	"postCreateCommand": "cd ui && yarn install && yarn build && cd ../machinery && go mod download",
 	"features": {
-		"ghcr.io/devcontainers-contrib/features/ansible:1": {},
+		"ghcr.io/devcontainers-contrib/features/ansible:1": {}
 	},
 	"customizations": {
 		"vscode": {
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ machinery/data/recordings
 machinery/data/snapshots
 machinery/test*
 machinery/init-dev.sh
+machinery/.env
 deployments/docker/private-docker-compose.yaml
--- a/3
+++ b/3
@@ -32,7 +32,7 @@ RUN cat /go/src/github.com/kerberos-io/agent/machinery/version

 RUN cd /go/src/github.com/kerberos-io/agent/machinery && \
 	go mod download && \
-	go build -tags timetzdata --ldflags '-s -w -extldflags "-static -latomic"' main.go && \
+	go build -tags timetzdata,netgo --ldflags '-s -w -extldflags "-static -latomic"' main.go && \
 	mkdir -p /agent && \
 	mv main /agent && \
 	mv version /agent && \
@@ -122,6 +122,7 @@ RUN cp /home/agent/data/config/config.json /home/agent/data/config.template.json
 # Set permissions correctly

 RUN chown -R agent:kerberosio /home/agent/data
+RUN chown -R agent:kerberosio /home/agent/www

 ###########################
 # Grant the necessary root capabilities to the process trying to bind to the privileged port
--- a/README.md
+++ b/README.md
@@ -28,8 +28,8 @@ Kerberos Agent is an isolated and scalable video (surveillance) management agent
 ## :thinking: Prerequisites

 - An IP camera which supports a RTSP H264 encoded stream,
-  - (or) a USB camera, Raspberry Pi camera or other camera, that [you can tranform to a valid RTSP stream](https://github.com/kerberos-io/camera-to-rtsp).
- Any hardware that can run a container, for example: a Raspberry Pi, NVidia Jetson, Intel NUC, a VM, Bare metal machine or a full blown Kubernetes cluster.
+  - (or) a USB camera, Raspberry Pi camera or other camera, that [you can tranform to a valid RTSP H264 stream](https://github.com/kerberos-io/camera-to-rtsp).
+- Any hardware (ARMv6, ARMv7, ARM64, AMD) that can run a binary or container, for example: a Raspberry Pi, NVidia Jetson, Intel NUC, a VM, Bare metal machine or a full blown Kubernetes cluster.

 ## :video_camera: Is my camera working?

@@ -104,7 +104,7 @@ This repository contains everything you'll need to know about our core product,
 - Post- and pre-recording on motion detection.
 - Ability to create fragmented recordings, and streaming though HLS fMP4.
 - [Deploy where you want](#how-to-run-and-deploy-a-kerberos-agent) with the tools you use: `docker`, `docker compose`, `ansible`, `terraform`, `kubernetes`, etc.
- Cloud storage (Kerberos Hub, Kerberos Vault). WIP: Minio, Storj, Dropbox, Google Drive etc.
+- Cloud storage/persistance: Kerberos Hub, Kerberos Vault and Dropbox. [(WIP: Minio, Storj, Google Drive, FTP etc.)](https://github.com/kerberos-io/agent/issues/95)
 - WIP: Integrations (Webhooks, MQTT, Script, etc).
 - REST API access and documentation through Swagger (trigger recording, update configuration, etc).
 - MIT License
@@ -147,7 +147,10 @@ You attach a volume to your container by leveraging the `-v` option. To mount yo
    -v $(pwd)/agent/recordings:/home/agent/data/recordings \
    -d --restart=always kerberos/agent:latest

-More example [can be found in the deployment section](https://github.com/kerberos-io/agent/tree/master/deployments) for each deployment and automation tool.
+More example [can be found in the deployment section](https://github.com/kerberos-io/agent/tree/master/deployments) for each deployment and automation tool. Please note to verify the permissions of the directory/volume you are attaching. More information in [this issue](https://github.com/kerberos-io/agent/issues/80).
+
+    chmod -R 755 kerberos-agent/
+    chown 100:101 kerberos-agent/ -R

 ## Configure with environment variables

@@ -160,52 +163,55 @@ Next to attaching the configuration file, it is also possible to override the co
    -e AGENT_CAPTURE_CONTINUOUS=true \
    -d --restart=always kerberos/agent:latest

-| Name                                    | Description                                                                                     | Default Value                   |
-| --------------------------------------- | ----------------------------------------------------------------------------------------------- | ------------------------------- |
-| `AGENT_USERNAME`                        | The username used to authenticate against the Kerberos Agent login page.                        | "root"                          |
-| `AGENT_PASSWORD`                        | The password used to authenticate against the Kerberos Agent login page.                        | "root"                          |
-| `AGENT_KEY`                             | A unique identifier for your Kerberos Agent, this is auto-generated but can be overriden.       | ""                              |
-| `AGENT_NAME`                            | The agent friendly-name.                                                                        | "agent"                         |
-| `AGENT_TIMEZONE`                        | Timezone which is used for converting time.                                                     | "Africa/Ceuta"                  |
-| `AGENT_REMOVE_AFTER_UPLOAD`             | When enabled, recordings uploaded successfully to a storage will be removed from disk.          | "true"                          |
-| `AGENT_OFFLINE`                         | Makes sure no external connection is made.                                                      | "false"                         |
-| `AGENT_AUTO_CLEAN`                      | Cleans up the recordings directory.                                                             | "true"                          |
-| `AGENT_AUTO_CLEAN_MAX_SIZE`             | If `AUTO_CLEAN` enabled, set the max size of the recordings directory in (MB).                  | "100"                           |
-| `AGENT_TIME`                            | Enable the timetable for Kerberos Agent                                                         | "false"                         |
-| `AGENT_TIMETABLE`                       | A (weekly) time table to specify when to make recordings "start1,end1,start2,end2;start1..      | ""                              |
-| `AGENT_REGION_POLYGON`                  | A single polygon set for motion detection: "x1,y1;x2,y2;x3,y3;...                               | ""                              |
-| `AGENT_CAPTURE_IPCAMERA_RTSP`           | Full-HD RTSP endpoint to the camera you're targetting.                                          | ""                              |
-| `AGENT_CAPTURE_IPCAMERA_SUB_RTSP`       | Sub-stream RTSP endpoint used for livestreaming (WebRTC).                                       | ""                              |
-| `AGENT_CAPTURE_IPCAMERA_ONVIF`          | Mark as a compliant ONVIF device.                                                               | ""                              |
-| `AGENT_CAPTURE_IPCAMERA_ONVIF_XADDR`    | ONVIF endpoint/address running on the camera.                                                   | ""                              |
-| `AGENT_CAPTURE_IPCAMERA_ONVIF_USERNAME` | ONVIF username to authenticate against.                                                         | ""                              |
-| `AGENT_CAPTURE_IPCAMERA_ONVIF_PASSWORD` | ONVIF password to authenticate against.                                                         | ""                              |
-| `AGENT_CAPTURE_RECORDING`               | Toggle for enabling making recordings.                                                          | "true"                          |
-| `AGENT_CAPTURE_CONTINUOUS`              | Toggle for enabling continuous or motion based recording.                                       | "false"                         |
-| `AGENT_CAPTURE_PRERECORDING`            | If `CONTINUOUS` set to `false`, specify the recording time (seconds) before after motion event. | "10"                            |
-| `AGENT_CAPTURE_POSTRECORDING`           | If `CONTINUOUS` set to `false`, specify the recording time (seconds) after motion event.        | "20"                            |
-| `AGENT_CAPTURE_MAXLENGTH`               | The maximum length of a single recording (seconds).                                             | "30"                            |
-| `AGENT_CAPTURE_PIXEL_CHANGE`            | If `CONTINUOUS` set to `false`, the number of pixel require to change before motion triggers.   | "150"                           |
-| `AGENT_CAPTURE_FRAGMENTED`              | Set the format of the recorded MP4 to fragmented (suitable for HLS).                            | "false"                         |
-| `AGENT_CAPTURE_FRAGMENTED_DURATION`     | If `AGENT_CAPTURE_FRAGMENTED` set to `true`, define the duration (seconds) of a fragment.       | "8"                             |
-| `AGENT_MQTT_URI`                        | A MQTT broker endpoint that is used for bi-directional communication (live view, onvif, etc)    | "tcp://mqtt.kerberos.io:1883"   |
-| `AGENT_MQTT_USERNAME`                   | Username of the MQTT broker.                                                                    | ""                              |
-| `AGENT_MQTT_PASSWORD`                   | Password of the MQTT broker.                                                                    | ""                              |
-| `AGENT_STUN_URI`                        | When using WebRTC, you'll need to provide a STUN server.                                        | "stun:turn.kerberos.io:8443"    |
-| `AGENT_TURN_URI`                        | When using WebRTC, you'll need to provide a TURN server.                                        | "turn:turn.kerberos.io:8443"    |
-| `AGENT_TURN_USERNAME`                   | TURN username used for WebRTC.                                                                  | "username1"                     |0
-| `AGENT_TURN_PASSWORD`                   | TURN password used for WebRTC.                                                                  | "password1"                     |
-| `AGENT_CLOUD`                           | Store recordings in a Kerberos Hub (s3) or your Kerberos Vault (kstorage).                      | "s3"                            |
-| `AGENT_HUB_URI`                         | The Kerberos Hub API, defaults to our Kerberos Hub SAAS.                                        | "https://api.cloud.kerberos.io" |
-| `AGENT_HUB_KEY`                         | The access key linked to your account in Kerberos Hub.                                          | ""                              |
-| `AGENT_HUB_PRIVATE_KEY`                 | The secret access key linked to your account in Kerberos Hub.                                   | ""                              |
-| `AGENT_HUB_USERNAME`                    | Your Kerberos Hub username, which owns the above access and secret keys.                        | ""                              |
-| `AGENT_HUB_SITE`                        | The site ID of a site you've created in your Kerberos Hub account.                              | ""                              |
-| `AGENT_KERBEROSVAULT_URI`               | The Kerberos Vault API url.                                                                     | ""                              |
-| `AGENT_KERBEROSVAULT_ACCESS_KEY`        | The access key of a Kerberos Vault account.                                                     | ""                              |
-| `AGENT_KERBEROSVAULT_SECRET_KEY`        | The secret key of a Kerberos Vault account.                                                     | ""                              |
-| `AGENT_KERBEROSVAULT_PROVIDER`          | A Kerberos Vault provider you have created (optional).                                          | ""                              |
-| `AGENT_KERBEROSVAULT_DIRECTORY`         | The directory, in the provider, where the recordings will be stored in.                         | ""                              |
+| Name                                    | Description                                                                                     | Default Value                  |
+| --------------------------------------- | ----------------------------------------------------------------------------------------------- | ------------------------------ |
+| `AGENT_MODE`                            | You can choose to run this in 'release' for production, and or 'demo' for showcasing.           | "release"                      |
+| `AGENT_USERNAME`                        | The username used to authenticate against the Kerberos Agent login page.                        | "root"                         |
+| `AGENT_PASSWORD`                        | The password used to authenticate against the Kerberos Agent login page.                        | "root"                         |
+| `AGENT_KEY`                             | A unique identifier for your Kerberos Agent, this is auto-generated but can be overriden.       | ""                             |
+| `AGENT_NAME`                            | The agent friendly-name.                                                                        | "agent"                        |
+| `AGENT_TIMEZONE`                        | Timezone which is used for converting time.                                                     | "Africa/Ceuta"                 |
+| `AGENT_REMOVE_AFTER_UPLOAD`             | When enabled, recordings uploaded successfully to a storage will be removed from disk.          | "true"                         |
+| `AGENT_OFFLINE`                         | Makes sure no external connection is made.                                                      | "false"                        |
+| `AGENT_AUTO_CLEAN`                      | Cleans up the recordings directory.                                                             | "true"                         |
+| `AGENT_AUTO_CLEAN_MAX_SIZE`             | If `AUTO_CLEAN` enabled, set the max size of the recordings directory in (MB).                  | "100"                          |
+| `AGENT_TIME`                            | Enable the timetable for Kerberos Agent                                                         | "false"                        |
+| `AGENT_TIMETABLE`                       | A (weekly) time table to specify when to make recordings "start1,end1,start2,end2;start1..      | ""                             |
+| `AGENT_REGION_POLYGON`                  | A single polygon set for motion detection: "x1,y1;x2,y2;x3,y3;...                               | ""                             |
+| `AGENT_CAPTURE_IPCAMERA_RTSP`           | Full-HD RTSP endpoint to the camera you're targetting.                                          | ""                             |
+| `AGENT_CAPTURE_IPCAMERA_SUB_RTSP`       | Sub-stream RTSP endpoint used for livestreaming (WebRTC).                                       | ""                             |
+| `AGENT_CAPTURE_IPCAMERA_ONVIF`          | Mark as a compliant ONVIF device.                                                               | ""                             |
+| `AGENT_CAPTURE_IPCAMERA_ONVIF_XADDR`    | ONVIF endpoint/address running on the camera.                                                   | ""                             |
+| `AGENT_CAPTURE_IPCAMERA_ONVIF_USERNAME` | ONVIF username to authenticate against.                                                         | ""                             |
+| `AGENT_CAPTURE_IPCAMERA_ONVIF_PASSWORD` | ONVIF password to authenticate against.                                                         | ""                             |
+| `AGENT_CAPTURE_RECORDING`               | Toggle for enabling making recordings.                                                          | "true"                         |
+| `AGENT_CAPTURE_CONTINUOUS`              | Toggle for enabling continuous or motion based recording.                                       | "false"                        |
+| `AGENT_CAPTURE_PRERECORDING`            | If `CONTINUOUS` set to `false`, specify the recording time (seconds) before after motion event. | "10"                           |
+| `AGENT_CAPTURE_POSTRECORDING`           | If `CONTINUOUS` set to `false`, specify the recording time (seconds) after motion event.        | "20"                           |
+| `AGENT_CAPTURE_MAXLENGTH`               | The maximum length of a single recording (seconds).                                             | "30"                           |
+| `AGENT_CAPTURE_PIXEL_CHANGE`            | If `CONTINUOUS` set to `false`, the number of pixel require to change before motion triggers.   | "150"                          |
+| `AGENT_CAPTURE_FRAGMENTED`              | Set the format of the recorded MP4 to fragmented (suitable for HLS).                            | "false"                        |
+| `AGENT_CAPTURE_FRAGMENTED_DURATION`     | If `AGENT_CAPTURE_FRAGMENTED` set to `true`, define the duration (seconds) of a fragment.       | "8"                            |
+| `AGENT_MQTT_URI`                        | A MQTT broker endpoint that is used for bi-directional communication (live view, onvif, etc)    | "tcp://mqtt.kerberos.io:1883"  |
+| `AGENT_MQTT_USERNAME`                   | Username of the MQTT broker.                                                                    | ""                             |
+| `AGENT_MQTT_PASSWORD`                   | Password of the MQTT broker.                                                                    | ""                             |
+| `AGENT_STUN_URI`                        | When using WebRTC, you'll need to provide a STUN server.                                        | "stun:turn.kerberos.io:8443"   |
+| `AGENT_TURN_URI`                        | When using WebRTC, you'll need to provide a TURN server.                                        | "turn:turn.kerberos.io:8443"   |
+| `AGENT_TURN_USERNAME`                   | TURN username used for WebRTC.                                                                  | "username1"                    |
+| `AGENT_TURN_PASSWORD`                   | TURN password used for WebRTC.                                                                  | "password1"                    |
+| `AGENT_CLOUD`                           | Store recordings in Kerberos Hub (s3), Kerberos Vault (kstorage) or Dropbox (dropbox).          | "s3"                           |
+| `AGENT_HUB_URI`                         | The Kerberos Hub API, defaults to our Kerberos Hub SAAS.                                        | "https://api.hub.domain.com"   |
+| `AGENT_HUB_KEY`                         | The access key linked to your account in Kerberos Hub.                                          | ""                             |
+| `AGENT_HUB_PRIVATE_KEY`                 | The secret access key linked to your account in Kerberos Hub.                                   | ""                             |
+| `AGENT_HUB_REGION`                      | The Kerberos Hub region, to which you want to upload.                                           | ""                             |
+| `AGENT_HUB_SITE`                        | The site ID of a site you've created in your Kerberos Hub account.                              | ""                             |
+| `AGENT_KERBEROSVAULT_URI`               | The Kerberos Vault API url.                                                                     | "https://vault.domain.com/api" |
+| `AGENT_KERBEROSVAULT_ACCESS_KEY`        | The access key of a Kerberos Vault account.                                                     | ""                             |
+| `AGENT_KERBEROSVAULT_SECRET_KEY`        | The secret key of a Kerberos Vault account.                                                     | ""                             |
+| `AGENT_KERBEROSVAULT_PROVIDER`          | A Kerberos Vault provider you have created (optional).                                          | ""                             |
+| `AGENT_KERBEROSVAULT_DIRECTORY`         | The directory, in the provider, where the recordings will be stored in.                         | ""                             |
+| `AGENT_DROPBOX_ACCESS_TOKEN`            | The Access Token from your Dropbox app, that is used to leverage the Dropbox SDK.               | ""                             |
+| `AGENT_DROPBOX_DIRECTORY`               | The directory, in the provider, where the recordings will be stored in.                         | ""                             |

 ## Contribute with Codespaces

@@ -319,14 +325,6 @@ By running the `docker build` command, you will create the Kerberos Agent Docker

    docker build -t kerberos/agent .

-## Support our project
-
-If you like our product please feel free to execute an Ethereum donation. All donations will flow back and split to our Open Source contributors, as they are the heart of this community.
-
-<img width="272" alt="Ethereum donation linke" src="https://user-images.githubusercontent.com/1546779/173443671-3d773068-ae10-4862-a990-dc7c89f3d9c2.png">
-
-Ethereum Address: `0xf4a759C9436E2280Ea9cdd23d3144D95538fF4bE`
-
 ## What is new?

 This repository contains the next generation of Kerberos.io, **Kerberos Agent (v3)**, and is the successor of the machinery and web repositories. A switch in technologies and architecture has been made. This version is still under active development and can be followed on the [develop branch](https://github.com/kerberos-io/agent/tree/develop) and [project overview](https://github.com/kerberos-io/agent/projects/1).
--- a/deployments/ansible-openshift/playbook.yml
+++ b/deployments/ansible-openshift/playbook.yml
@@ -82,7 +82,7 @@

                initContainers:
                  - name: download-config
-                    image: kerberos/agent:1b96d01
+                    image: kerberos/agent:latest
                    volumeMounts:
                      - name: kerberos-data
                        mountPath: /home/agent/data/config
@@ -96,7 +96,7 @@

                containers:
                  - name: agent
-                    image: kerberos/agent:1b96d01
+                    image: kerberos/agent:latest
                    volumeMounts:
                      - name: kerberos-data
                        mountPath: /home/agent/data/config
--- a/deployments/kubernetes/deployment-agent-volume.yml
+++ b/deployments/kubernetes/deployment-agent-volume.yml
@@ -21,7 +21,7 @@ spec:

      initContainers:
        - name: download-config
-          image: kerberos/agent:1b96d01
+          image: kerberos/agent:latest
          volumeMounts:
            - name: kerberos-data
              mountPath: /home/agent/data/config
--- a/machinery/.vscode/launch.json
+++ b/machinery/.vscode/launch.json
@@ -9,7 +9,10 @@
            "type": "go",
            "request": "launch",
            "mode": "auto",
-            "program": "${fileDirname}"
-        }
+            "program": "main.go",
+            "args": ["run", "cameraname", "8080"],
+            "envFile": "${workspaceFolder}/.env",
+            "buildFlags": "--tags dynamic",
+        },
    ]
 }
--- a/machinery/data/config/config.json
+++ b/machinery/data/config/config.json
@@ -95,7 +95,7 @@
 	"s3": {
 		"proxyuri": "http://proxy.kerberos.io",
 		"bucket": "kerberosaccept",
-		"region": "eu-west1"
+		"region": "eu-west-1"
 	},
 	"kstorage": {},
 	"dropbox": {},
@@ -112,4 +112,4 @@
 	"hub_private_key": "",
 	"hub_site": "",
 	"condition_uri": ""
-}
+}
--- a/machinery/data/test-480p.mp4
+++ b/machinery/data/test-480p.mp4
--- 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/go.mod
+++ b/machinery/go.mod
@@ -2,13 +2,15 @@ module github.com/kerberos-io/agent/machinery

 go 1.19

-//replace github.com/kerberos-io/joy4 v1.0.54 => ../../../../github.com/kerberos-io/joy4
-
-//replace github.com/kerberos-io/onvif v0.0.5 => ../../../../github.com/kerberos-io/onvif
+// replace github.com/kerberos-io/joy4 v1.0.57 => ../../../../github.com/kerberos-io/joy4
+// replace github.com/kerberos-io/onvif v0.0.5 => ../../../../github.com/kerberos-io/onvif

 require (
 	github.com/InVisionApp/conjungo v1.1.0
 	github.com/appleboy/gin-jwt/v2 v2.9.1
+	github.com/asticode/go-astits v1.11.0
+	github.com/bluenviron/gortsplib/v3 v3.6.1
+	github.com/bluenviron/mediacommon v0.5.0
 	github.com/cedricve/go-onvif v0.0.0-20200222191200-567e8ce298f6
 	github.com/deepch/vdk v0.0.19
 	github.com/dropbox/dropbox-sdk-go-unofficial/v6 v6.0.5
@@ -22,19 +24,20 @@ require (
 	github.com/golang-module/carbon/v2 v2.2.3
 	github.com/gorilla/websocket v1.5.0
 	github.com/kellydunn/golang-geo v0.7.0
-	github.com/kerberos-io/joy4 v1.0.55
+	github.com/kerberos-io/joy4 v1.0.58
 	github.com/kerberos-io/onvif v0.0.5
 	github.com/minio/minio-go/v6 v6.0.57
 	github.com/nsmith5/mjpeg v0.0.0-20200913181537-54b8ada0e53e
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
+	github.com/pion/rtp v1.7.13
 	github.com/pion/webrtc/v3 v3.1.50
 	github.com/sirupsen/logrus v1.9.0
 	github.com/swaggo/files v1.0.0
 	github.com/swaggo/gin-swagger v1.5.3
 	github.com/swaggo/swag v1.8.9
 	github.com/tevino/abool v1.2.0
+	go.mongodb.org/mongo-driver v1.7.5
 	gopkg.in/DataDog/dd-trace-go.v1 v1.46.0
-	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 )

@@ -50,6 +53,7 @@ require (
 	github.com/Microsoft/go-winio v0.5.1 // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+	github.com/asticode/go-astikit v0.30.0 // indirect
 	github.com/beevik/etree v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/clbanning/mxj v1.8.4 // indirect
@@ -66,15 +70,19 @@ require (
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
 	github.com/go-playground/validator/v10 v10.11.1 // indirect
+	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/goccy/go-json v0.10.0 // indirect
 	github.com/gofrs/uuid v3.2.0+incompatible // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/pprof v0.0.0-20210423192551-a2663126120b // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.15.0 // indirect
 	github.com/klauspost/cpuid v1.2.3 // indirect
 	github.com/kylelemons/go-gypsy v1.0.0 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
@@ -86,6 +94,7 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/onsi/gomega v1.27.4 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
 	github.com/philhofer/fwd v1.1.1 // indirect
 	github.com/pion/datachannel v1.5.5 // indirect
@@ -96,7 +105,6 @@ require (
 	github.com/pion/mdns v0.0.5 // indirect
 	github.com/pion/randutil v0.1.0 // indirect
 	github.com/pion/rtcp v1.2.10 // indirect
-	github.com/pion/rtp v1.7.13 // indirect
 	github.com/pion/sctp v1.8.5 // indirect
 	github.com/pion/sdp/v3 v3.0.6 // indirect
 	github.com/pion/srtp/v2 v2.0.10 // indirect
@@ -111,17 +119,21 @@ require (
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/tinylib/msgp v1.1.6 // indirect
 	github.com/ugorji/go/codec v1.2.7 // indirect
+	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
+	github.com/xdg-go/scram v1.0.2 // indirect
+	github.com/xdg-go/stringprep v1.0.2 // indirect
+	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
 	github.com/ziutek/mymysql v1.5.4 // indirect
 	go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
 	go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect
 	golang.org/x/crypto v0.4.0 // indirect
-	golang.org/x/net v0.4.0 // indirect
+	golang.org/x/net v0.9.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5 // indirect
-	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
-	golang.org/x/sys v0.3.0 // indirect
-	golang.org/x/text v0.5.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/sys v0.7.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
-	golang.org/x/tools v0.1.12 // indirect
+	golang.org/x/tools v0.7.0 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	google.golang.org/appengine v1.6.6 // indirect
 	google.golang.org/grpc v1.32.0 // indirect
--- a/machinery/go.sum
+++ b/machinery/go.sum
@@ -64,8 +64,16 @@ github.com/appleboy/gin-jwt/v2 v2.9.1 h1:l29et8iLW6omcHltsOP6LLk4s3v4g2FbFs0koxG
 github.com/appleboy/gin-jwt/v2 v2.9.1/go.mod h1:jwcPZJ92uoC9nOUTOKWoN/f6JZOgMSKlFSHw5/FrRUk=
 github.com/appleboy/gofight/v2 v2.1.2 h1:VOy3jow4vIK8BRQJoC/I9muxyYlJ2yb9ht2hZoS3rf4=
 github.com/appleboy/gofight/v2 v2.1.2/go.mod h1:frW+U1QZEdDgixycTj4CygQ48yLTUhplt43+Wczp3rw=
+github.com/asticode/go-astikit v0.30.0 h1:DkBkRQRIxYcknlaU7W7ksNfn4gMFsB0tqMJflxkRsZA=
+github.com/asticode/go-astikit v0.30.0/go.mod h1:h4ly7idim1tNhaVkdVBeXQZEE3L0xblP7fCWbgwipF0=
+github.com/asticode/go-astits v1.11.0 h1:GTHUXht0ZXAJXsVbsLIcyfHr1Bchi4QQwMARw2ZWAng=
+github.com/asticode/go-astits v1.11.0/go.mod h1:QSHmknZ51pf6KJdHKZHJTLlMegIrhega3LPWz3ND/iI=
 github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs=
 github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
+github.com/bluenviron/gortsplib/v3 v3.6.1 h1:+/kPiwmdRwUasU5thOBATJQ4/yD+vrIEutJyRTB/f+0=
+github.com/bluenviron/gortsplib/v3 v3.6.1/go.mod h1:gc6Z8pBUMC9QBqYxcOY9eVxjDPOrmFcwVH61Xs3Gu2A=
+github.com/bluenviron/mediacommon v0.5.0 h1:YsVFlEknaXWhZGfz+Y1QbuzXLMVSmHODc7OnRqZoITY=
+github.com/bluenviron/mediacommon v0.5.0/go.mod h1:t0dqPsWUTchyvib0MhixIwXEgvDX4V9G+I0GzWLQRb8=
 github.com/cedricve/go-onvif v0.0.0-20200222191200-567e8ce298f6 h1:bzFZYgZD5vf4PWaa2GjOh90HG88uKi2a+B6VnQcDlCA=
 github.com/cedricve/go-onvif v0.0.0-20200222191200-567e8ce298f6/go.mod h1:nBrjN2nMHendp0Cvb/6GaJ1v92Qv/kzqxWtNBnKJEK0=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -154,6 +162,8 @@ github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GO
 github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
 github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ=
 github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA=
@@ -190,8 +200,11 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -202,8 +215,10 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
@@ -249,11 +264,14 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/kellydunn/golang-geo v0.7.0 h1:A5j0/BvNgGwY6Yb6inXQxzYwlPHc6WVZR+MrarZYNNg=
 github.com/kellydunn/golang-geo v0.7.0/go.mod h1:YYlQPJ+DPEzrHx8kT3oPHC/NjyvCCXE+IuKGKdrjrcU=
-github.com/kerberos-io/joy4 v1.0.55 h1:P5RISBp8kUowgb/bvqLPVKPJL9n9jI/wXBCLs+XFMWg=
-github.com/kerberos-io/joy4 v1.0.55/go.mod h1:nZp4AjvKvTOXRrmDyAIOw+Da+JA5OcSo/JundGfOlFU=
+github.com/kerberos-io/joy4 v1.0.58 h1:R8EECSF+bG7o2yHC6cX/lF77Z+bDVGl6OioLZ3+5MN4=
+github.com/kerberos-io/joy4 v1.0.58/go.mod h1:nZp4AjvKvTOXRrmDyAIOw+Da+JA5OcSo/JundGfOlFU=
 github.com/kerberos-io/onvif v0.0.5 h1:kq9mnHZkih9Jl4DyIJ4Rzt++Y3DDKy3nI8S2ESEfZ5w=
 github.com/kerberos-io/onvif v0.0.5/go.mod h1:Hr2dJOH2LM5SpYKk17gYZ1CMjhGhUl+QlT5kwYogrW0=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
+github.com/klauspost/compress v1.15.0 h1:xqfchp4whNFxn5A4XFyyYtitiWI8Hy5EW59jEwcyL6U=
+github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/cpuid v1.2.3 h1:CCtW0xUnWGVINKvE/WWOYKdsPV6mawAtvQuSl8guwQs=
 github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -295,6 +313,7 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nsmith5/mjpeg v0.0.0-20200913181537-54b8ada0e53e h1:bQo/jQ9qvcw7zqnovm8IbLsaOq3F+ELUQcxtxvalQvA=
 github.com/nsmith5/mjpeg v0.0.0-20200913181537-54b8ada0e53e/go.mod h1:PW9xCZScEClMBP22n37i0SnN/8B9YzNXTNvOaIkLjv0=
@@ -311,8 +330,9 @@ github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
-github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
 github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
+github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E=
+github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
@@ -368,6 +388,7 @@ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsK
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/profile v1.4.0/go.mod h1:NWz/XGvpEW1FyYQ7fCx4dqYBLlfTcE+A9FLAkNKqjFE=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -408,8 +429,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a/go.mod h1:lKJPbtWzJ9JhsTN1k1gZgleJWY/cqq0psdoMmaThG3w=
 github.com/swaggo/files v1.0.0 h1:1gGXVIeUFCS/dta17rnP0iOpr6CXFwKD7EO5ID233e4=
 github.com/swaggo/files v1.0.0/go.mod h1:N59U6URJLyU1PQgFqPM7wXLMhJx7QAolnvfQkqO13kc=
@@ -425,6 +446,7 @@ github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw=
 github.com/tidwall/gjson v1.14.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw=
@@ -435,6 +457,14 @@ github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLY
 github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
 github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
+github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
+github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
+github.com/xdg-go/scram v1.0.2 h1:akYIkZ28e6A96dkWNJQu3nmCzH3YfwMPQExUYDaRv7w=
+github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
+github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc=
+github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
+github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
+github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -443,6 +473,8 @@ github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
+go.mongodb.org/mongo-driver v1.7.5 h1:ny3p0reEpgsR2cfA5cjgwFZg3Cv/ofFh/8jbhGtz9VI=
+go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -458,6 +490,7 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -498,8 +531,8 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -547,8 +580,9 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
-golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
 golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
+golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
+golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -566,8 +600,9 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -622,8 +657,9 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
+golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -634,11 +670,13 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
 golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -654,6 +692,7 @@ golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
@@ -689,8 +728,9 @@ golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
-golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
+golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -791,8 +831,6 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/ini.v1 v1.42.0 h1:7N3gPTt50s8GuLortA00n8AqRTk75qOP98+mTPpgzRk=
 gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw=
-gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
--- a/machinery/main.go
+++ b/machinery/main.go
@@ -1,6 +1,7 @@
 package main

 import (
+	"context"
 	"os"
 	"time"

@@ -16,7 +17,6 @@ import (
 var VERSION = "3.0.0"

 func main() {
-
 	// You might be interested in debugging the agent.
 	if os.Getenv("DATADOG_AGENT_ENABLED") == "true" {
 		if os.Getenv("DATADOG_AGENT_K8S_ENABLED") == "true" {
@@ -111,8 +111,14 @@ func main() {
 				}
 			}

+			// Create a 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())
+
 			// Bootstrapping the agent
 			communication := models.Communication{
+				Context:         &ctx,
+				CancelContext:   &cancel,
 				HandleBootstrap: make(chan string, 1),
 			}
 			go components.Bootstrap(&configuration, &communication)
--- a/machinery/src/capture/IPCamera.go
+++ b/machinery/src/capture/IPCamera.go
@@ -1,6 +1,7 @@
 package capture

 import (
+	"context"
 	"strconv"
 	"sync"
 	"time"
@@ -15,9 +16,9 @@ import (
 	"github.com/kerberos-io/joy4/format"
 )

-func OpenRTSP(url string) (av.DemuxCloser, []av.CodecData, error) {
+func OpenRTSP(ctx context.Context, url string) (av.DemuxCloser, []av.CodecData, error) {
 	format.RegisterAll()
-	infile, err := avutil.Open(url)
+	infile, err := avutil.Open(ctx, url)
 	if err == nil {
 		streams, errstreams := infile.Streams()
 		return infile, streams, errstreams
--- a/machinery/src/capture/main.go
+++ b/machinery/src/capture/main.go
@@ -2,6 +2,7 @@
 package capture

 import (
+	"context"
 	"os"
 	"strconv"
 	"time"
@@ -431,6 +432,10 @@ func VerifyCamera(c *gin.Context) {
 	var cameraStreams models.CameraStreams
 	err := c.BindJSON(&cameraStreams)

+	// Should return in 5 seconds.
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
 	if err == nil {

 		streamType := c.Param("streamType")
@@ -442,7 +447,7 @@ func VerifyCamera(c *gin.Context) {
 		if streamType == "secondary" {
 			rtspUrl = cameraStreams.SubRTSP
 		}
-		_, codecs, err := OpenRTSP(rtspUrl)
+		_, codecs, err := OpenRTSP(ctx, rtspUrl)
 		if err == nil {

 			videoIdx := -1
--- a/machinery/src/cloud/Cloud.go
+++ b/machinery/src/cloud/Cloud.go
@@ -2,7 +2,6 @@ package cloud

 import (
 	"bytes"
-	"crypto/tls"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
@@ -15,14 +14,12 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/golang-module/carbon/v2"
 	"github.com/kerberos-io/joy4/av/pubsub"
-	"github.com/minio/minio-go/v6"

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

 	"net/http"
-	"net/url"
 	"strconv"
 	"time"

@@ -85,9 +82,9 @@ func HandleUpload(configuration *models.Configuration, communication *models.Com
 					uploaded := false
 					configured := false
 					err = nil
-					if config.Cloud == "s3" {
-						uploaded, configured, err = UploadS3(configuration, fileName)
-					} else if config.Cloud == "kstorage" {
+					if config.Cloud == "s3" || config.Cloud == "kerberoshub" {
+						uploaded, configured, err = UploadKerberosHub(configuration, fileName)
+					} else if config.Cloud == "kstorage" || config.Cloud == "kerberosvault" {
 						uploaded, configured, err = UploadKerberosVault(configuration, fileName)
 					} else if config.Cloud == "dropbox" {
 						uploaded, configured, err = UploadDropbox(configuration, fileName)
@@ -103,6 +100,13 @@ func HandleUpload(configuration *models.Configuration, communication *models.Com
 						// Todo: implement ftp upload
 					} else if config.Cloud == "sftp" {
 						// Todo: implement sftp upload
+					} else if config.Cloud == "aws" {
+						// Todo: need to be updated, was previously used for hub.
+						uploaded, configured, err = UploadS3(configuration, fileName)
+					} else if config.Cloud == "azure" {
+						// Todo: implement azure upload
+					} else if config.Cloud == "google" {
+						// Todo: implement google upload
 					}
 					// And so on... (have a look here -> https://github.com/kerberos-io/agent/issues/95)

@@ -128,8 +132,10 @@ func HandleUpload(configuration *models.Configuration, communication *models.Com
 							log.Log.Error("HandleUpload: " + err.Error())
 						}
 					} else {
-						delay = 5 * time.Second // slow down
-						log.Log.Error("HandleUpload: " + err.Error())
+						delay = 20 * time.Second // slow down
+						if err != nil {
+							log.Log.Error("HandleUpload: " + err.Error())
+						}
 					}

 					time.Sleep(delay)
@@ -215,36 +221,36 @@ func GetSystemInfo() (models.System, error) {
 func HandleHeartBeat(configuration *models.Configuration, communication *models.Communication, uptimeStart time.Time) {
 	log.Log.Debug("HandleHeartBeat: started")

-	config := configuration.Config
+loop:
+	for {

-	if config.Offline == "true" {
-		log.Log.Debug("HandleHeartBeat: stopping as Offline is enabled.")
-	} else {
+		config := configuration.Config

-		url := config.HeartbeatURI
-		key := ""
-		username := ""
-		vaultURI := ""
+		if config.Offline == "true" {
+			log.Log.Debug("HandleHeartBeat: stopping as Offline is enabled.")
+		} else {
+
+			url := config.HeartbeatURI
+			key := ""
+			username := ""
+			vaultURI := ""

-		username = config.S3.Username
-		if config.Cloud == "s3" && config.S3 != nil && config.S3.Publickey != "" {
 			username = config.S3.Username
-			key = config.S3.Publickey
-		} else if config.Cloud == "kstorage" && config.KStorage != nil && config.KStorage.CloudKey != "" {
-			key = config.KStorage.CloudKey
-			username = config.KStorage.Directory
-		}
+			if config.Cloud == "s3" && config.S3 != nil && config.S3.Publickey != "" {
+				username = config.S3.Username
+				key = config.S3.Publickey
+			} else if config.Cloud == "kstorage" && config.KStorage != nil && config.KStorage.CloudKey != "" {
+				key = config.KStorage.CloudKey
+				username = config.KStorage.Directory
+			}

-		// This is the new way ;)
-		if config.HubURI != "" {
-			url = config.HubURI + "/devices/heartbeat"
-		}
-		if config.HubKey != "" {
-			key = config.HubKey
-		}
-
-	loop:
-		for {
+			// This is the new way ;)
+			if config.HubURI != "" {
+				url = config.HubURI + "/devices/heartbeat"
+			}
+			if config.HubKey != "" {
+				key = config.HubKey
+			}

 			if key != "" {
 				// Check if we have a friendly name or not.
@@ -270,13 +276,21 @@ func HandleHeartBeat(configuration *models.Configuration, communication *models.

 				// We'll check which mode is enabled for the camera.
 				onvifEnabled := "false"
+				onvifZoom := "false"
+				onvifPanTilt := "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 {
-							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"
 							}
 						}
 					}
@@ -292,39 +306,46 @@ func HandleHeartBeat(configuration *models.Configuration, communication *models.
 				// Congert to string
 				macs, _ := json.Marshal(system.MACs)
 				ips, _ := json.Marshal(system.IPs)
+				cameraConnected := "true"
+				if communication.CameraConnected == false {
+					cameraConnected = "false"
+				}

 				var object = fmt.Sprintf(`{
-					"key" : "%s",
-					"version" : "3.0.0",
-					"release" : "%s",
-					"cpuid" : "%s",
-					"clouduser" : "%s",
-					"cloudpublickey" : "%s",
-					"cameraname" : "%s",
-					"enterprise" : %t,
-					"hostname" : "%s",
-					"architecture" : "%s",
-					"totalMemory" : "%d",
-					"usedMemory" : "%d",
-					"freeMemory" : "%d",
-					"processMemory" : "%d",
-					"mac_list" : %s,
-					"ip_list" : %s,
-					"board" : "",
-					"disk1size" : "%s",
-					"disk3size" : "%s",
-					"diskvdasize" :  "%s",
-					"uptime" : "%s",
-					"boot_time" : "%s",
-					"siteID" : "%s",
-					"onvif" : "%s",
-					"numberoffiles" : "33",
-					"timestamp" : 1564747908,
-					"cameratype" : "IPCamera",
-					"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)
+						"key" : "%s",
+						"version" : "3.0.0",
+						"release" : "%s",
+						"cpuid" : "%s",
+						"clouduser" : "%s",
+						"cloudpublickey" : "%s",
+						"cameraname" : "%s",
+						"enterprise" : %t,
+						"hostname" : "%s",
+						"architecture" : "%s",
+						"totalMemory" : "%d",
+						"usedMemory" : "%d",
+						"freeMemory" : "%d",
+						"processMemory" : "%d",
+						"mac_list" : %s,
+						"ip_list" : %s,
+						"board" : "",
+						"disk1size" : "%s",
+						"disk3size" : "%s",
+						"diskvdasize" :  "%s",
+						"uptime" : "%s",
+						"boot_time" : "%s",
+						"siteID" : "%s",
+						"onvif" : "%s",
+						"onvif_zoom" : "%s",
+						"onvif_pantilt" : "%s",
+						"cameraConnected": "%s",
+						"numberoffiles" : "33",
+						"timestamp" : 1564747908,
+						"cameratype" : "IPCamera",
+						"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, onvifZoom, onvifPanTilt, cameraConnected)

 				var jsonStr = []byte(object)
 				buffy := bytes.NewBuffer(jsonStr)
@@ -340,6 +361,9 @@ func HandleHeartBeat(configuration *models.Configuration, communication *models.
 					communication.CloudTimestamp.Store(time.Now().Unix())
 					log.Log.Info("HandleHeartBeat: (200) Heartbeat received by Kerberos Hub.")
 				} else {
+					if communication.CloudTimestamp != nil && communication.CloudTimestamp.Load() != nil {
+						communication.CloudTimestamp.Store(int64(0))
+					}
 					log.Log.Error("HandleHeartBeat: (400) Something went wrong while sending to Kerberos Hub.")
 				}

@@ -365,14 +389,14 @@ func HandleHeartBeat(configuration *models.Configuration, communication *models.
 			} else {
 				log.Log.Error("HandleHeartBeat: Disabled as we do not have a public key defined.")
 			}
+		}

-			// This will check if we need to stop the thread,
-			// because of a reconfiguration.
-			select {
-			case <-communication.HandleHeartBeat:
-				break loop
-			case <-time.After(15 * time.Second):
-			}
+		// This will check if we need to stop the thread,
+		// because of a reconfiguration.
+		select {
+		case <-communication.HandleHeartBeat:
+			break loop
+		case <-time.After(15 * time.Second):
 		}
 	}

@@ -464,8 +488,9 @@ func HandleLiveStreamHD(livestreamCursor *pubsub.QueueCursor, configuration *mod
 		if config.Capture.Liveview != "false" {

 			// Should create a track here.
-			track := webrtc.NewVideoTrack()
-			go webrtc.WriteToTrack(livestreamCursor, configuration, communication, mqttClient, track, codecs, decoder, decoderMutex)
+			videoTrack := webrtc.NewVideoTrack(codecs)
+			audioTrack := webrtc.NewAudioTrack(codecs)
+			go webrtc.WriteToTrack(livestreamCursor, configuration, communication, mqttClient, videoTrack, audioTrack, codecs, decoder, decoderMutex)

 			if config.Capture.ForwardWebRTC == "true" {
 				// We get a request with an offer, but we'll forward it.
@@ -488,7 +513,7 @@ func HandleLiveStreamHD(livestreamCursor *pubsub.QueueCursor, configuration *mod
 						webrtc.CandidateArrays[key] = make(chan string, 30)
 					}
 					webrtc.CandidatesMutex.Unlock()
-					webrtc.InitializeWebRTCConnection(configuration, communication, mqttClient, track, handshake, webrtc.CandidateArrays[key])
+					webrtc.InitializeWebRTCConnection(configuration, communication, mqttClient, videoTrack, audioTrack, handshake, webrtc.CandidateArrays[key])

 				}
 			}
@@ -517,14 +542,14 @@ func VerifyHub(c *gin.Context) {
 	err := c.BindJSON(&config)

 	if err == nil {
-		hubKey := config.HubKey
 		hubURI := config.HubURI
+		publicKey := config.HubKey
+		privateKey := config.HubPrivateKey

-		content := []byte(`{"message": "fake-message"}`)
-		body := bytes.NewReader(content)
-		req, err := http.NewRequest("POST", hubURI+"/queue/test", body)
+		req, err := http.NewRequest("POST", hubURI+"/subscription/verify", nil)
 		if err == nil {
-			req.Header.Set("X-Kerberos-Cloud-Key", hubKey)
+			req.Header.Set("X-Kerberos-Hub-PublicKey", publicKey)
+			req.Header.Set("X-Kerberos-Hub-PrivateKey", privateKey)
 			client := &http.Client{}

 			resp, err := client.Do(req)
@@ -581,88 +606,80 @@ func VerifyPersistence(c *gin.Context) {

 		if config.Cloud == "dropbox" {
 			VerifyDropbox(config, c)
-		} else if config.Cloud == "s3" {
+		} else if config.Cloud == "s3" || config.Cloud == "kerberoshub" {

-			// timestamp_microseconds_instanceName_regionCoordinates_numberOfChanges_token
-			// 1564859471_6-474162_oprit_577-283-727-375_1153_27.mp4
-			// - Timestamp
-			// - Size + - + microseconds
-			// - device
-			// - Region
-			// - Number of changes
-			// - Token
-
-			aws_access_key_id := config.S3.Publickey
-			aws_secret_access_key := config.S3.Secretkey
-			aws_region := config.S3.Region
-
-			// This is the new way ;)
-			if config.HubKey != "" {
-				aws_access_key_id = config.HubKey
-			}
-			if config.HubPrivateKey != "" {
-				aws_secret_access_key = config.HubPrivateKey
-			}
-
-			s3Client, err := minio.NewWithRegion("s3.amazonaws.com", aws_access_key_id, aws_secret_access_key, true, aws_region)
-			if err != nil {
+			if config.HubURI == "" ||
+				config.HubKey == "" ||
+				config.HubPrivateKey == "" ||
+				config.S3.Region == "" {
+				msg := "VerifyPersistence: Kerberos Hub not properly configured."
+				log.Log.Info(msg)
 				c.JSON(400, models.APIResponse{
-					Data: "Creation of Kerberos Hub connection failed: " + err.Error(),
+					Data: msg,
 				})
 			} else {

-				// Check if we need to use the proxy.
-				if config.S3.ProxyURI != "" {
-					var transport http.RoundTripper = &http.Transport{
-						Proxy: func(*http.Request) (*url.URL, error) {
-							return url.Parse(config.S3.ProxyURI)
-						},
-						TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-					}
-					s3Client.SetCustomTransport(transport)
+				// Open test-480p.mp4
+				file, err := os.Open("./data/test-480p.mp4")
+				if err != nil {
+					msg := "VerifyPersistence: error reading test-480p.mp4: " + err.Error()
+					log.Log.Error(msg)
+					c.JSON(400, models.APIResponse{
+						Data: msg,
+					})
+				}
+				defer file.Close()
+
+				req, err := http.NewRequest("POST", config.HubURI+"/storage/upload", file)
+				if err != nil {
+					msg := "VerifyPersistence: error reading Kerberos Hub HEAD request, " + config.HubURI + "/storage: " + err.Error()
+					log.Log.Error(msg)
+					c.JSON(400, models.APIResponse{
+						Data: msg,
+					})
 				}

-				deviceKey := "fake-key"
-				devicename := "justatest"
-				coordinates := "200-200-400-400"
-				eventToken := "769"
-
 				timestamp := time.Now().Unix()
-				fileName := strconv.FormatInt(timestamp, 10) + "_6-967003_justatest_200-200-400-400_24_769.mp4"
-				content := []byte("test-file")
-				body := bytes.NewReader(content)
+				fileName := strconv.FormatInt(timestamp, 10) +
+					"_6-967003_" + config.Name + "_200-200-400-400_24_769.mp4"
+				req.Header.Set("X-Kerberos-Storage-FileName", fileName)
+				req.Header.Set("X-Kerberos-Storage-Capture", "IPCamera")
+				req.Header.Set("X-Kerberos-Storage-Device", config.Key)
+				req.Header.Set("X-Kerberos-Hub-PublicKey", config.HubKey)
+				req.Header.Set("X-Kerberos-Hub-PrivateKey", config.HubPrivateKey)
+				req.Header.Set("X-Kerberos-Hub-Region", config.S3.Region)

-				n, err := s3Client.PutObject(config.S3.Bucket,
-					config.S3.Username+"/"+fileName,
-					body,
-					body.Size(),
-					minio.PutObjectOptions{
-						ContentType:  "video/mp4",
-						StorageClass: "ONEZONE_IA",
-						UserMetadata: map[string]string{
-							"event-timestamp":         strconv.FormatInt(timestamp, 10),
-							"event-microseconds":      deviceKey,
-							"event-instancename":      devicename,
-							"event-regioncoordinates": coordinates,
-							"event-numberofchanges":   deviceKey,
-							"event-token":             eventToken,
-							"productid":               deviceKey,
-							"publickey":               aws_access_key_id,
-							"uploadtime":              "now",
-						},
-					})
+				client := &http.Client{}

-				if err != nil {
-					c.JSON(400, models.APIResponse{
-						Data: "Upload of fake recording failed: " + err.Error(),
-					})
+				resp, err := client.Do(req)
+				if resp != nil {
+					defer resp.Body.Close()
+				}
+
+				if err == nil && resp != nil {
+					if resp.StatusCode == 200 {
+						msg := "VerifyPersistence: Upload allowed using the credentials provided (" + config.HubKey + ", " + config.HubPrivateKey + ")"
+						log.Log.Info(msg)
+						c.JSON(200, models.APIResponse{
+							Data: msg,
+						})
+					} else {
+						msg := "VerifyPersistence: Upload NOT allowed using the credentials provided (" + config.HubKey + ", " + config.HubPrivateKey + ")"
+						log.Log.Info(msg)
+						c.JSON(400, models.APIResponse{
+							Data: msg,
+						})
+					}
 				} else {
-					c.JSON(200, models.APIResponse{
-						Data: "Upload Finished: file has been uploaded to bucket: " + strconv.FormatInt(n, 10),
+					msg := "VerifyPersistence: Error creating Kerberos Hub request"
+					log.Log.Info(msg)
+					c.JSON(400, models.APIResponse{
+						Data: msg,
 					})
 				}
 			}
-		} else if config.Cloud == "kstorage" {
+
+		} else if config.Cloud == "kstorage" || config.Cloud == "kerberosvault" {

 			uri := config.KStorage.URI
 			accessKey := config.KStorage.AccessKey
@@ -671,10 +688,9 @@ func VerifyPersistence(c *gin.Context) {
 			provider := config.KStorage.Provider

 			if err == nil && uri != "" && accessKey != "" && secretAccessKey != "" {
-				var postData = []byte(`{"title":"Buy cheese and bread for breakfast."}`)
-				client := &http.Client{}
-				req, err := http.NewRequest("POST", uri+"/ping", bytes.NewReader(postData))

+				client := &http.Client{}
+				req, err := http.NewRequest("POST", uri+"/ping", nil)
 				req.Header.Add("X-Kerberos-Storage-AccessKey", accessKey)
 				req.Header.Add("X-Kerberos-Storage-SecretAccessKey", secretAccessKey)
 				resp, err := client.Do(req)
@@ -686,32 +702,35 @@ func VerifyPersistence(c *gin.Context) {

 						if provider != "" || directory != "" {

-							hubKey := config.KStorage.CloudKey
-							// This is the new way ;)
-							if config.HubKey != "" {
-								hubKey = config.HubKey
-							}
-
 							// Generate a random name.
 							timestamp := time.Now().Unix()
 							fileName := strconv.FormatInt(timestamp, 10) +
-								"_6-967003_justatest_200-200-400-400_24_769.mp4"
-							content := []byte("test-file")
-							body := bytes.NewReader(content)
-							//fileSize := int64(len(content))
+								"_6-967003_" + config.Name + "_200-200-400-400_24_769.mp4"

-							req, err := http.NewRequest("POST", uri+"/storage", body)
+							// Open test-480p.mp4
+							file, err := os.Open("./data/test-480p.mp4")
+							if err != nil {
+								msg := "VerifyPersistence: error reading test-480p.mp4: " + err.Error()
+								log.Log.Error(msg)
+								c.JSON(400, models.APIResponse{
+									Data: msg,
+								})
+							}
+							defer file.Close()
+
+							req, err := http.NewRequest("POST", uri+"/storage", file)
 							if err == nil {

 								req.Header.Set("Content-Type", "video/mp4")
-								req.Header.Set("X-Kerberos-Storage-CloudKey", hubKey)
+								req.Header.Set("X-Kerberos-Storage-CloudKey", config.HubKey)
 								req.Header.Set("X-Kerberos-Storage-AccessKey", accessKey)
 								req.Header.Set("X-Kerberos-Storage-SecretAccessKey", secretAccessKey)
 								req.Header.Set("X-Kerberos-Storage-Provider", provider)
 								req.Header.Set("X-Kerberos-Storage-FileName", fileName)
-								req.Header.Set("X-Kerberos-Storage-Device", "test")
+								req.Header.Set("X-Kerberos-Storage-Device", config.Key)
 								req.Header.Set("X-Kerberos-Storage-Capture", "IPCamera")
 								req.Header.Set("X-Kerberos-Storage-Directory", directory)
+
 								client := &http.Client{}

 								resp, err := client.Do(req)
@@ -725,41 +744,45 @@ func VerifyPersistence(c *gin.Context) {
 												c.JSON(200, body)
 											} else {
 												c.JSON(400, models.APIResponse{
-													Data: "Something went wrong while verifying your persistence settings. Make sure your provider is the same as the storage provider in your Kerberos Vault, and the relevant storage provider is configured properly.",
+													Data: "VerifyPersistence: Something went wrong while verifying your persistence settings. Make sure your provider is the same as the storage provider in your Kerberos Vault, and the relevant storage provider is configured properly.",
 												})
 											}
 										}
 									}
 								} else {
 									c.JSON(400, models.APIResponse{
-										Data: "Upload of fake recording failed: " + err.Error(),
+										Data: "VerifyPersistence: Upload of fake recording failed: " + err.Error(),
 									})
 								}
 							} else {
 								c.JSON(400, models.APIResponse{
-									Data: "Something went wrong while creating /storage POST request." + err.Error(),
+									Data: "VerifyPersistence: Something went wrong while creating /storage POST request." + err.Error(),
 								})
 							}
 						} else {
 							c.JSON(400, models.APIResponse{
-								Data: "Provider and/or directory is missing from the request.",
+								Data: "VerifyPersistence: Provider and/or directory is missing from the request.",
 							})
 						}
 					} else {
 						c.JSON(400, models.APIResponse{
-							Data: "Something went wrong while verifying storage credentials: " + string(body),
+							Data: "VerifyPersistence: Something went wrong while verifying storage credentials: " + string(body),
 						})
 					}
 				} else {
 					c.JSON(400, models.APIResponse{
-						Data: "Something went wrong while verifying storage credentials:" + err.Error(),
+						Data: "VerifyPersistence: Something went wrong while verifying storage credentials:" + err.Error(),
 					})
 				}
+			} else {
+				c.JSON(400, models.APIResponse{
+					Data: "VerifyPersistence: please fill-in the required Kerberos Vault credentials.",
+				})
 			}
 		}
 	} else {
 		c.JSON(400, models.APIResponse{
-			Data: "No persistence was specified, so do not know what to verify:" + err.Error(),
+			Data: "VerifyPersistence: No persistence was specified, so do not know what to verify:" + err.Error(),
 		})
 	}
 }
--- a/machinery/src/cloud/KerberosHub.go
+++ b/machinery/src/cloud/KerberosHub.go
@@ -0,0 +1,125 @@
+package cloud
+
+import (
+	"errors"
+	"io/ioutil"
+	"net/http"
+	"os"
+
+	"github.com/kerberos-io/agent/machinery/src/log"
+	"github.com/kerberos-io/agent/machinery/src/models"
+)
+
+func UploadKerberosHub(configuration *models.Configuration, fileName string) (bool, bool, error) {
+	config := configuration.Config
+
+	if config.HubURI == "" ||
+		config.HubKey == "" ||
+		config.HubPrivateKey == "" ||
+		config.S3.Region == "" {
+		err := "UploadKerberosHub: Kerberos Hub not properly configured."
+		log.Log.Info(err)
+		return false, false, errors.New(err)
+	}
+
+	// timestamp_microseconds_instanceName_regionCoordinates_numberOfChanges_token
+	// 1564859471_6-474162_oprit_577-283-727-375_1153_27.mp4
+	// - Timestamp
+	// - Size + - + microseconds
+	// - device
+	// - Region
+	// - Number of changes
+	// - Token
+
+	log.Log.Info("UploadKerberosHub: Uploading to Kerberos Hub (" + config.HubURI + ")")
+	log.Log.Info("UploadKerberosHub: Upload started for " + fileName)
+	fullname := "data/recordings/" + fileName
+
+	// Check if we still have the file otherwise we abort the request.
+	file, err := os.OpenFile(fullname, os.O_RDWR, 0755)
+	if file != nil {
+		defer file.Close()
+	}
+	if err != nil {
+		err := "UploadKerberosHub: Upload Failed, file doesn't exists anymore."
+		log.Log.Info(err)
+		return false, true, errors.New(err)
+	}
+
+	// Check if we are allowed to upload to the hub with these credentials.
+	// There might be different reasons like (muted, read-only..)
+	req, err := http.NewRequest("HEAD", config.HubURI+"/storage/upload", nil)
+	if err != nil {
+		errorMessage := "UploadKerberosHub: error reading HEAD request, " + config.HubURI + "/storage: " + err.Error()
+		log.Log.Error(errorMessage)
+		return false, true, errors.New(errorMessage)
+	}
+
+	req.Header.Set("X-Kerberos-Storage-FileName", fileName)
+	req.Header.Set("X-Kerberos-Storage-Capture", "IPCamera")
+	req.Header.Set("X-Kerberos-Storage-Device", config.Key)
+	req.Header.Set("X-Kerberos-Hub-PublicKey", config.HubKey)
+	req.Header.Set("X-Kerberos-Hub-PrivateKey", config.HubPrivateKey)
+	req.Header.Set("X-Kerberos-Hub-Region", config.S3.Region)
+
+	client := &http.Client{}
+
+	resp, err := client.Do(req)
+	if resp != nil {
+		defer resp.Body.Close()
+	}
+
+	if err == nil {
+		if resp != nil {
+			if err == nil {
+				if resp.StatusCode == 200 {
+					log.Log.Info("UploadKerberosHub: Upload allowed using the credentials provided (" + config.HubKey + ", " + config.HubPrivateKey + ")")
+				} else {
+					log.Log.Info("UploadKerberosHub: Upload NOT allowed using the credentials provided (" + config.HubKey + ", " + config.HubPrivateKey + ")")
+					return false, true, nil
+				}
+			}
+		}
+	}
+
+	// Now we know we are allowed to upload to the hub, we can start uploading.
+	req, err = http.NewRequest("POST", config.HubURI+"/storage/upload", file)
+	if err != nil {
+		errorMessage := "UploadKerberosHub: error reading POST request, " + config.KStorage.URI + "/storage/upload: " + err.Error()
+		log.Log.Error(errorMessage)
+		return false, true, errors.New(errorMessage)
+	}
+	req.Header.Set("Content-Type", "video/mp4")
+	req.Header.Set("X-Kerberos-Storage-FileName", fileName)
+	req.Header.Set("X-Kerberos-Storage-Capture", "IPCamera")
+	req.Header.Set("X-Kerberos-Storage-Device", config.Key)
+	req.Header.Set("X-Kerberos-Hub-PublicKey", config.HubKey)
+	req.Header.Set("X-Kerberos-Hub-PrivateKey", config.HubPrivateKey)
+	req.Header.Set("X-Kerberos-Hub-Region", config.S3.Region)
+
+	client = &http.Client{}
+
+	resp, err = client.Do(req)
+	if resp != nil {
+		defer resp.Body.Close()
+	}
+
+	if err == nil {
+		if resp != nil {
+			body, err := ioutil.ReadAll(resp.Body)
+			if err == nil {
+				if resp.StatusCode == 200 {
+					log.Log.Info("UploadKerberosHub: Upload Finished, " + resp.Status + ".")
+					return true, true, nil
+				} else {
+					log.Log.Info("UploadKerberosHub: Upload Failed, " + resp.Status + ", " + string(body))
+					return false, true, nil
+				}
+			}
+		}
+	}
+
+	errorMessage := "UploadKerberosHub: Upload Failed, " + err.Error()
+	log.Log.Info(errorMessage)
+	return false, true, errors.New(errorMessage)
+}
--- a/machinery/src/components/Config.go
+++ b/machinery/src/components/Config.go
@@ -1,10 +1,10 @@
 package components

 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"image"
-	_ "image/png"
 	"io/ioutil"
 	"os"
 	"reflect"
@@ -17,7 +17,7 @@ import (
 	"github.com/kerberos-io/agent/machinery/src/database"
 	"github.com/kerberos-io/agent/machinery/src/log"
 	"github.com/kerberos-io/agent/machinery/src/models"
-	"gopkg.in/mgo.v2/bson"
+	"go.mongodb.org/mongo-driver/bson"
 )

 func GetImageFromFilePath() (image.Image, error) {
@@ -77,19 +77,31 @@ func OpenConfig(configuration *models.Configuration) {
 		// Multiple agents have there configuration stored, and can benefit from
 		// the concept of a global concept.

-		session := database.New().Copy()
-		defer session.Close()
-		db := session.DB(database.DatabaseName)
-		collection := db.C("configuration")
+		// Write to mongodb
+		client := database.New()

-		collection.Find(bson.M{
+		db := client.Database(database.DatabaseName)
+		collection := db.Collection("configuration")
+
+		var globalConfig models.Config
+		err := collection.FindOne(context.Background(), bson.M{
 			"type": "global",
-		}).One(&configuration.GlobalConfig)
+		}).Decode(&globalConfig)
+		if err != nil {
+			log.Log.Error("Could not find global configuration, using default configuration.")
+		}
+		configuration.GlobalConfig = globalConfig

-		collection.Find(bson.M{
+		var customConfig models.Config
+		deploymentName := os.Getenv("DEPLOYMENT_NAME")
+		err = collection.FindOne(context.Background(), bson.M{
 			"type": "config",
-			"name": os.Getenv("DEPLOYMENT_NAME"),
-		}).One(&configuration.CustomConfig)
+			"name": deploymentName,
+		}).Decode(&customConfig)
+		if err != nil {
+			log.Log.Error("Could not find configuration for " + deploymentName + ", using global configuration.")
+		}
+		configuration.CustomConfig = customConfig

 		// We will merge both configs in a single config file.
 		// Read again from database but this store overwrite the same object.
@@ -205,8 +217,7 @@ func OverrideWithEnvironmentVariables(configuration *models.Configuration) {

 				/* ONVIF connnection settings */
 			case "AGENT_CAPTURE_IPCAMERA_ONVIF":
-				isEnabled := value == " true"
-				configuration.Config.Capture.IPCamera.ONVIF = isEnabled
+				configuration.Config.Capture.IPCamera.ONVIF = value
 				break
 			case "AGENT_CAPTURE_IPCAMERA_ONVIF_XADDR":
 				configuration.Config.Capture.IPCamera.ONVIFXAddr = value
@@ -390,12 +401,12 @@ func OverrideWithEnvironmentVariables(configuration *models.Configuration) {
 			case "AGENT_HUB_PRIVATE_KEY":
 				configuration.Config.HubPrivateKey = value
 				break
-			case "AGENT_HUB_USERNAME":
-				configuration.Config.S3.Username = value
-				break
 			case "AGENT_HUB_SITE":
 				configuration.Config.HubSite = value
 				break
+			case "AGENT_HUB_REGION":
+				configuration.Config.S3.Region = value
+				break

 			/* When storing in a Kerberos Vault */
 			case "AGENT_KERBEROSVAULT_URI":
@@ -436,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()
@@ -453,15 +466,19 @@ func StoreConfig(config models.Config) error {
 	// Save into database
 	if os.Getenv("DEPLOYMENT") == "factory" || os.Getenv("MACHINERY_ENVIRONMENT") == "kubernetes" {
 		// Write to mongodb
-		session := database.New().Copy()
-		defer session.Close()
-		db := session.DB(database.DatabaseName)
-		collection := db.C("configuration")
+		client := database.New()

-		err := collection.Update(bson.M{
+		db := client.Database(database.DatabaseName)
+		collection := db.Collection("configuration")
+
+		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+		defer cancel()
+
+		_, err := collection.UpdateOne(ctx, bson.M{
 			"type": "config",
 			"name": os.Getenv("DEPLOYMENT_NAME"),
-		}, &config)
+		}, bson.M{"$set": config})
+
 		return err

 		// Save into file
--- a/machinery/src/components/Kerberos.go
+++ b/machinery/src/components/Kerberos.go
@@ -1,12 +1,14 @@
 package components

 import (
+	"context"
 	"runtime"
 	"strconv"
 	"sync"
 	"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"
@@ -53,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
@@ -64,30 +67,72 @@ func Bootstrap(configuration *models.Configuration, communication *models.Commun
 	subDecoder := &ffmpeg.VideoDecoder{}
 	cameraSettings := &models.Camera{}

+	// 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
 		}
-		// We will re open the configuration, might have changed :O!
-		OpenConfig(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) {
+			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())
+		communication.Context = &ctx
+		communication.CancelContext = &cancel
 	}
 	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 {
-	log.Log.Debug("RunAgent: bootstrapping agent")
+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

+	status := "not started"
+
 	// Currently only support H264 encoded cameras, this will change.
 	// Establishing the camera connection
 	rtspUrl := config.Capture.IPCamera.RTSP
-	infile, streams, err := capture.OpenRTSP(rtspUrl)
+	infile, streams, err := capture.OpenRTSP(context.Background(), rtspUrl)
+
+	// We will initialise the camera settings object
+	// so we can check if the camera settings have changed, and we need
+	// to reload the decoders.
+
+	videoStream, _ := capture.GetVideoStream(streams)
+	if videoStream == nil {
+		log.Log.Error("RunAgent: no video stream found, might be the wrong codec (we only support H264 for the moment)")
+		time.Sleep(time.Second * 3)
+		return status
+	}
+
+	num, denum := videoStream.(av.VideoCodecData).Framerate()
+	width := videoStream.(av.VideoCodecData).Width()
+	height := videoStream.(av.VideoCodecData).Height()

 	var queue *pubsub.Queue
 	var subQueue *pubsub.Queue
@@ -95,11 +140,9 @@ func RunAgent(configuration *models.Configuration, communication *models.Communi
 	var decoderMutex sync.Mutex
 	var subDecoderMutex sync.Mutex

-	status := "not started"
-
 	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
@@ -107,23 +150,21 @@ func RunAgent(configuration *models.Configuration, communication *models.Communi
 		subStreamEnabled := false
 		subRtspUrl := config.Capture.IPCamera.SubRTSP
 		if subRtspUrl != "" && subRtspUrl != rtspUrl {
-			subInfile, subStreams, err = capture.OpenRTSP(subRtspUrl)
+			subInfile, subStreams, err = capture.OpenRTSP(context.Background(), subRtspUrl)
 			if err == nil {
 				log.Log.Info("RunAgent: opened RTSP sub stream " + subRtspUrl)
 				subStreamEnabled = true
 			}
+
+			videoStream, _ := capture.GetVideoStream(subStreams)
+			if videoStream == nil {
+				log.Log.Error("RunAgent: no video substream found, might be the wrong codec (we only support H264 for the moment)")
+				time.Sleep(time.Second * 3)
+				return status
+			}
 		}

-		// We will initialise the camera settings object
-		// so we can check if the camera settings have changed, and we need
-		// to reload the decoders.
-		videoStream, _ := capture.GetVideoStream(streams)
-		num, denum := videoStream.(av.VideoCodecData).Framerate()
-		width := videoStream.(av.VideoCodecData).Width()
-		height := videoStream.(av.VideoCodecData).Height()
-
 		if cameraSettings.RTSP != rtspUrl || cameraSettings.SubRTSP != subRtspUrl || cameraSettings.Width != width || cameraSettings.Height != height || cameraSettings.Num != num || cameraSettings.Denum != denum || cameraSettings.Codec != videoStream.(av.VideoCodecData).Type() {
-
 			if cameraSettings.Initialized {
 				decoder.Close()
 				if subStreamEnabled {
@@ -181,13 +222,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 heartbeats
-		go cloud.HandleHeartBeat(configuration, communication, uptimeStart)
-
 		// Handle the camera stream
 		go capture.HandleStream(infile, queue, communication)

@@ -234,21 +268,37 @@ 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)()
+
+		// 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.HandleHeartBeat <- "stop"
 			communication.HandleUpload <- "stop"
 		}
 		communication.HandleStream <- "stop"
 		if subStreamEnabled {
 			communication.HandleSubStream <- "stop"
 		}
-		time.Sleep(time.Second * 1)
+
+		time.Sleep(time.Second * 3)

 		infile.Close()
 		infile = nil
@@ -262,22 +312,13 @@ 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)
-
 		// 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)
+
 	} else {
 		log.Log.Error("Something went wrong while opening RTSP: " + err.Error())
 		time.Sleep(time.Second * 3)
@@ -299,29 +340,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
@@ -10,15 +10,12 @@ import (
 	"time"

 	mqtt "github.com/eclipse/paho.mqtt.golang"
+	geo "github.com/kellydunn/golang-geo"
 	"github.com/kerberos-io/agent/machinery/src/capture"
 	"github.com/kerberos-io/agent/machinery/src/log"
 	"github.com/kerberos-io/agent/machinery/src/models"
-	"github.com/kerberos-io/joy4/av/pubsub"
-
-	//"github.com/whorfin/go-libjpeg/jpeg"
-
-	geo "github.com/kellydunn/golang-geo"
 	"github.com/kerberos-io/joy4/av"
+	"github.com/kerberos-io/joy4/av/pubsub"
 	"github.com/kerberos-io/joy4/cgo/ffmpeg"
 )

@@ -77,18 +74,21 @@ func ProcessMotion(motionCursor *pubsub.QueueCursor, configuration *models.Confi

 			// Calculate mask
 			var polyObjects []geo.Polygon
-			for _, polygon := range config.Region.Polygon {
-				coords := polygon.Coordinates
-				poly := geo.Polygon{}
-				for _, c := range coords {
-					x := c.X
-					y := c.Y
-					p := geo.NewPoint(x, y)
-					if !poly.Contains(p) {
-						poly.Add(p)
+
+			if config.Region != nil {
+				for _, polygon := range config.Region.Polygon {
+					coords := polygon.Coordinates
+					poly := geo.Polygon{}
+					for _, c := range coords {
+						x := c.X
+						y := c.Y
+						p := geo.NewPoint(x, y)
+						if !poly.Contains(p) {
+							poly.Add(p)
+						}
 					}
+					polyObjects = append(polyObjects, poly)
 				}
-				polyObjects = append(polyObjects, poly)
 			}

 			bounds := img.Bounds()
@@ -139,19 +139,21 @@ func ProcessMotion(motionCursor *pubsub.QueueCursor, configuration *models.Confi
 					hour := now.Hour()
 					minute := now.Minute()
 					second := now.Second()
-					timeInterval := config.Timetable[int(weekday)]
-					if timeInterval != nil {
-						start1 := timeInterval.Start1
-						end1 := timeInterval.End1
-						start2 := timeInterval.Start2
-						end2 := timeInterval.End2
-						currentTimeInSeconds := hour*60*60 + minute*60 + second
-						if (currentTimeInSeconds >= start1 && currentTimeInSeconds <= end1) ||
-							(currentTimeInSeconds >= start2 && currentTimeInSeconds <= end2) {
+					if config.Timetable != nil && len(config.Timetable) > 0 {
+						timeInterval := config.Timetable[int(weekday)]
+						if timeInterval != nil {
+							start1 := timeInterval.Start1
+							end1 := timeInterval.End1
+							start2 := timeInterval.Start2
+							end2 := timeInterval.End2
+							currentTimeInSeconds := hour*60*60 + minute*60 + second
+							if (currentTimeInSeconds >= start1 && currentTimeInSeconds <= end1) ||
+								(currentTimeInSeconds >= start2 && currentTimeInSeconds <= end2) {

-						} else {
-							detectMotion = false
-							log.Log.Info("ProcessMotion: Time interval not valid, disabling motion detection.")
+							} else {
+								detectMotion = false
+								log.Log.Info("ProcessMotion: Time interval not valid, disabling motion detection.")
+							}
 						}
 					}
 				}
--- a/machinery/src/database/main.go
+++ b/machinery/src/database/main.go
@@ -1,46 +1,55 @@
 package database

 import (
+	"context"
 	"fmt"
 	"os"
-	"strings"
 	"sync"
 	"time"

-	"github.com/kerberos-io/agent/machinery/src/log"
-	"gopkg.in/mgo.v2"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
 )

 type DB struct {
-	Session *mgo.Session
+	Client *mongo.Client
 }

 var _init_ctx sync.Once
 var _instance *DB
 var DatabaseName = "KerberosFactory"

-func New() *mgo.Session {
+func New() *mongo.Client {
+
 	host := os.Getenv("MONGODB_HOST")
-	database := os.Getenv("MONGODB_DATABASE_CREDENTIALS")
+	databaseCredentials := os.Getenv("MONGODB_DATABASE_CREDENTIALS")
+	replicaset := os.Getenv("MONGODB_REPLICASET")
 	username := os.Getenv("MONGODB_USERNAME")
 	password := os.Getenv("MONGODB_PASSWORD")
+	authentication := "SCRAM-SHA-256"
+
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()

 	_init_ctx.Do(func() {
 		_instance = new(DB)
-		mongoDBDialInfo := &mgo.DialInfo{
-			Addrs:    strings.Split(host, ","),
-			Timeout:  3 * time.Second,
-			Database: database,
-			Username: username,
-			Password: password,
+		mongodbURI := fmt.Sprintf("mongodb://%s:%s@%s", username, password, host)
+		if replicaset != "" {
+			mongodbURI = fmt.Sprintf("%s/?replicaSet=%s", mongodbURI, replicaset)
 		}
-		session, err := mgo.DialWithInfo(mongoDBDialInfo)
+
+		client, err := mongo.Connect(ctx, options.Client().ApplyURI(mongodbURI).SetAuth(options.Credential{
+			AuthMechanism: authentication,
+			AuthSource:    databaseCredentials,
+			Username:      username,
+			Password:      password,
+		}))
 		if err != nil {
-			log.Log.Error(fmt.Sprintf("Failed to connect to database: %s", err.Error()))
+			fmt.Printf("Error setting up mongodb connection: %+v\n", err)
 			os.Exit(1)
 		}
-		_instance.Session = session
+		_instance.Client = client
 	})

-	return _instance.Session
+	return _instance.Client
 }
--- 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/models/Communication.go
+++ b/machinery/src/models/Communication.go
@@ -1,6 +1,7 @@
 package models

 import (
+	"context"
 	"sync"
 	"sync/atomic"

@@ -12,6 +13,8 @@ import (
 // The communication struct that is managing
 // all the communication between the different goroutines.
 type Communication struct {
+	Context               *context.Context
+	CancelContext         *context.CancelFunc
 	PackageCounter        *atomic.Value
 	LastPacketTimer       *atomic.Value
 	CloudTimestamp        *atomic.Value
@@ -34,4 +37,5 @@ type Communication struct {
 	Decoder               *ffmpeg.VideoDecoder
 	SubDecoder            *ffmpeg.VideoDecoder
 	Image                 string
+	CameraConnected       bool
 }
--- a/machinery/src/models/Config.go
+++ b/machinery/src/models/Config.go
@@ -73,7 +73,7 @@ type IPCamera struct {
 	RTSP          string `json:"rtsp"`
 	SubRTSP       string `json:"sub_rtsp"`
 	FPS           string `json:"fps"`
-	ONVIF         bool   `json:"onvif,omitempty" bson:"onvif"`
+	ONVIF         string `json:"onvif,omitempty" bson:"onvif"`
 	ONVIFXAddr    string `json:"onvif_xaddr,omitempty" bson:"onvif_xaddr"`
 	ONVIFUsername string `json:"onvif_username,omitempty" bson:"onvif_username"`
 	ONVIFPassword string `json:"onvif_password,omitempty" bson:"onvif_password"`
--- 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"
@@ -62,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.
@@ -99,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,
@@ -196,6 +196,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/http/Server.go
+++ b/machinery/src/routers/http/Server.go
@@ -1,6 +1,8 @@
 package http

 import (
+	"os"
+
 	jwt "github.com/appleboy/gin-jwt/v2"
 	"github.com/gin-contrib/pprof"
 	"github.com/gin-gonic/contrib/static"
@@ -57,6 +59,17 @@ func StartServer(configuration *models.Configuration, communication *models.Comm
 	// Add all routes
 	AddRoutes(r, authMiddleware, configuration, communication)

+	// Update environment variables
+	environmentVariables := "./www/env.js"
+	if os.Getenv("AGENT_MODE") == "demo" {
+		demoEnvironmentVariables := "./www/env.demo.js"
+		// Move demo environment variables to environment variables
+		err := os.Rename(demoEnvironmentVariables, environmentVariables)
+		if err != nil {
+			log.Fatal(err)
+		}
+	}
+
 	// Add static routes to UI
 	r.Use(static.Serve("/", static.LocalFile("./www", true)))
 	r.Use(static.Serve("/dashboard", static.LocalFile("./www", true)))
--- 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/machinery/src/rtsp/client.go
+++ b/machinery/src/rtsp/client.go
@@ -0,0 +1,247 @@
+package rtsp
+
+import (
+	"fmt"
+	"image"
+	"image/jpeg"
+	"log"
+	"os"
+	"strconv"
+	"time"
+
+	"github.com/bluenviron/gortsplib/v3"
+	"github.com/bluenviron/gortsplib/v3/pkg/base"
+	"github.com/bluenviron/gortsplib/v3/pkg/formats"
+	"github.com/bluenviron/gortsplib/v3/pkg/formats/rtph265"
+	"github.com/bluenviron/gortsplib/v3/pkg/url"
+	"github.com/bluenviron/mediacommon/pkg/codecs/h264"
+
+	"github.com/pion/rtp"
+)
+
+func CreateClient() {
+	c := &gortsplib.Client{
+		OnRequest: func(req *base.Request) {
+			//log.Log.Info(logger.Debug, "c->s %v", req)
+		},
+		OnResponse: func(res *base.Response) {
+			//s.Log(logger.Debug, "s->c %v", res)
+		},
+		OnTransportSwitch: func(err error) {
+			//s.Log(logger.Warn, err.Error())
+		},
+		OnPacketLost: func(err error) {
+			//s.Log(logger.Warn, err.Error())
+		},
+		OnDecodeError: func(err error) {
+			//s.Log(logger.Warn, err.Error())
+		},
+	}
+
+	u, err := url.Parse("rtsp://admin:admin@192.168.1.111") //"rtsp://seing:bud-edPTQc@109.159.199.103:554/rtsp/defaultPrimary?mtu=1440&streamType=m") //
+	if err != nil {
+		panic(err)
+	}
+
+	err = c.Start(u.Scheme, u.Host)
+	if err != nil {
+		//return err
+	}
+	defer c.Close()
+
+	medias, baseURL, _, err := c.Describe(u)
+	if err != nil {
+		//return err
+	}
+	fmt.Println(medias)
+
+	// find the H264 media and format
+	var forma *formats.H265
+	medi := medias.FindFormat(&forma)
+	if medi == nil {
+		panic("media not found")
+	}
+
+	// setup RTP/H264 -> H264 decoder
+	rtpDec := forma.CreateDecoder()
+	// setup H264 -> MPEG-TS muxer
+	//pegtsMuxer, err := newMPEGTSMuxer(forma.SPS, forma.PPS)
+	if err != nil {
+		panic(err)
+	}
+
+	// setup H264 -> raw frames decoder
+	/*h264RawDec, err := newH264Decoder()
+	if err != nil {
+		panic(err)
+	}
+	defer h264RawDec.close()
+
+	// if SPS and PPS are present into the SDP, send them to the decoder
+	if forma.SPS != nil {
+		h264RawDec.decode(forma.SPS)
+	}
+	if forma.PPS != nil {
+		h264RawDec.decode(forma.PPS)
+	}*/
+
+	readErr := make(chan error)
+	go func() {
+		readErr <- func() error {
+			// Get codecs
+			for _, medi := range medias {
+				for _, forma := range medi.Formats {
+					fmt.Println(forma)
+				}
+			}
+
+			err = c.SetupAll(medias, baseURL)
+			if err != nil {
+				return err
+			}
+
+			for _, medi := range medias {
+				for _, forma := range medi.Formats {
+					c.OnPacketRTP(medi, forma, func(pkt *rtp.Packet) {
+
+						au, pts, err := rtpDec.Decode(pkt)
+						if err != nil {
+							if err != rtph265.ErrNonStartingPacketAndNoPrevious && err != rtph265.ErrMorePacketsNeeded {
+								log.Printf("ERR: %v", err)
+							}
+							return
+						}
+
+						for _, nalu := range au {
+							log.Printf("received NALU with PTS %v and size %d\n", pts, len(nalu))
+						}
+
+						/*// extract access unit from RTP packets
+						// DecodeUntilMarker is necessary for the DTS extractor to work
+						if pkt.PayloadType == 96 {
+							au, pts, err := rtpDec.DecodeUntilMarker(pkt)
+
+							if err != nil {
+								if err != rtph264.ErrNonStartingPacketAndNoPrevious && err != rtph264.ErrMorePacketsNeeded {
+									log.Printf("ERR: %v", err)
+								}
+								return
+							}
+
+							// encode the access unit into MPEG-TS
+							mpegtsMuxer.encode(au, pts)
+
+							for _, nalu := range au {
+								// convert NALUs into RGBA frames
+								img, err := h264RawDec.decode(nalu)
+								if err != nil {
+									panic(err)
+								}
+
+								// wait for a frame
+								if img == nil {
+									continue
+								}
+
+								// convert frame to JPEG and save to file
+								err = saveToFile(img)
+								if err != nil {
+									panic(err)
+								}
+							}
+						}*/
+
+					})
+				}
+			}
+
+			_, err = c.Play(nil)
+			if err != nil {
+				return err
+			}
+
+			return c.Wait()
+		}()
+	}()
+
+	for {
+		select {
+		case err := <-readErr:
+			fmt.Println(err)
+		}
+	}
+}
+
+func saveToFile(img image.Image) error {
+	// create file
+	fname := strconv.FormatInt(time.Now().UnixNano()/int64(time.Millisecond), 10) + ".jpg"
+	f, err := os.Create(fname)
+	if err != nil {
+		panic(err)
+	}
+	defer f.Close()
+
+	log.Println("saving", fname)
+
+	// convert to jpeg
+	return jpeg.Encode(f, img, &jpeg.Options{
+		Quality: 60,
+	})
+}
+
+// extract SPS and PPS without decoding RTP packets
+func rtpH264ExtractSPSPPS(pkt *rtp.Packet) ([]byte, []byte) {
+	if len(pkt.Payload) < 1 {
+		return nil, nil
+	}
+
+	typ := h264.NALUType(pkt.Payload[0] & 0x1F)
+
+	switch typ {
+	case h264.NALUTypeSPS:
+		return pkt.Payload, nil
+
+	case h264.NALUTypePPS:
+		return nil, pkt.Payload
+
+	case h264.NALUTypeSTAPA:
+		payload := pkt.Payload[1:]
+		var sps []byte
+		var pps []byte
+
+		for len(payload) > 0 {
+			if len(payload) < 2 {
+				break
+			}
+
+			size := uint16(payload[0])<<8 | uint16(payload[1])
+			payload = payload[2:]
+
+			if size == 0 {
+				break
+			}
+
+			if int(size) > len(payload) {
+				return nil, nil
+			}
+
+			nalu := payload[:size]
+			payload = payload[size:]
+
+			typ = h264.NALUType(nalu[0] & 0x1F)
+
+			switch typ {
+			case h264.NALUTypeSPS:
+				sps = nalu
+
+			case h264.NALUTypePPS:
+				pps = nalu
+			}
+		}
+
+		return sps, pps
+
+	default:
+		return nil, nil
+	}
+}
--- a/machinery/src/rtsp/h264decoder.go
+++ b/machinery/src/rtsp/h264decoder.go
@@ -0,0 +1,140 @@
+package rtsp
+
+import (
+	"fmt"
+	"image"
+	"unsafe"
+)
+
+// #cgo pkg-config: libavcodec libavutil libswscale
+// #include <libavcodec/avcodec.h>
+// #include <libavutil/imgutils.h>
+// #include <libswscale/swscale.h>
+import "C"
+
+func frameData(frame *C.AVFrame) **C.uint8_t {
+	return (**C.uint8_t)(unsafe.Pointer(&frame.data[0]))
+}
+
+func frameLineSize(frame *C.AVFrame) *C.int {
+	return (*C.int)(unsafe.Pointer(&frame.linesize[0]))
+}
+
+// h264Decoder is a wrapper around ffmpeg's H264 decoder.
+type h264Decoder struct {
+	codecCtx    *C.AVCodecContext
+	srcFrame    *C.AVFrame
+	swsCtx      *C.struct_SwsContext
+	dstFrame    *C.AVFrame
+	dstFramePtr []uint8
+}
+
+// newH264Decoder allocates a new h264Decoder.
+func newH264Decoder() (*h264Decoder, error) {
+	codec := C.avcodec_find_decoder(C.AV_CODEC_ID_H264)
+	if codec == nil {
+		return nil, fmt.Errorf("avcodec_find_decoder() failed")
+	}
+
+	codecCtx := C.avcodec_alloc_context3(codec)
+	if codecCtx == nil {
+		return nil, fmt.Errorf("avcodec_alloc_context3() failed")
+	}
+
+	res := C.avcodec_open2(codecCtx, codec, nil)
+	if res < 0 {
+		C.avcodec_close(codecCtx)
+		return nil, fmt.Errorf("avcodec_open2() failed")
+	}
+
+	srcFrame := C.av_frame_alloc()
+	if srcFrame == nil {
+		C.avcodec_close(codecCtx)
+		return nil, fmt.Errorf("av_frame_alloc() failed")
+	}
+
+	return &h264Decoder{
+		codecCtx: codecCtx,
+		srcFrame: srcFrame,
+	}, nil
+}
+
+// close closes the decoder.
+func (d *h264Decoder) close() {
+	if d.dstFrame != nil {
+		C.av_frame_free(&d.dstFrame)
+	}
+
+	if d.swsCtx != nil {
+		C.sws_freeContext(d.swsCtx)
+	}
+
+	C.av_frame_free(&d.srcFrame)
+	C.avcodec_close(d.codecCtx)
+}
+
+func (d *h264Decoder) decode(nalu []byte) (image.Image, error) {
+	nalu = append([]uint8{0x00, 0x00, 0x00, 0x01}, []uint8(nalu)...)
+
+	// send frame to decoder
+	var avPacket C.AVPacket
+	avPacket.data = (*C.uint8_t)(C.CBytes(nalu))
+	defer C.free(unsafe.Pointer(avPacket.data))
+	avPacket.size = C.int(len(nalu))
+	res := C.avcodec_send_packet(d.codecCtx, &avPacket)
+	if res < 0 {
+		return nil, nil
+	}
+
+	// receive frame if available
+	res = C.avcodec_receive_frame(d.codecCtx, d.srcFrame)
+	if res < 0 {
+		return nil, nil
+	}
+
+	// if frame size has changed, allocate needed objects
+	if d.dstFrame == nil || d.dstFrame.width != d.srcFrame.width || d.dstFrame.height != d.srcFrame.height {
+		if d.dstFrame != nil {
+			C.av_frame_free(&d.dstFrame)
+		}
+
+		if d.swsCtx != nil {
+			C.sws_freeContext(d.swsCtx)
+		}
+
+		d.dstFrame = C.av_frame_alloc()
+		d.dstFrame.format = C.AV_PIX_FMT_RGBA
+		d.dstFrame.width = d.srcFrame.width
+		d.dstFrame.height = d.srcFrame.height
+		d.dstFrame.color_range = C.AVCOL_RANGE_JPEG
+		res = C.av_frame_get_buffer(d.dstFrame, 1)
+		if res < 0 {
+			return nil, fmt.Errorf("av_frame_get_buffer() err")
+		}
+
+		d.swsCtx = C.sws_getContext(d.srcFrame.width, d.srcFrame.height, C.AV_PIX_FMT_YUV420P,
+			d.dstFrame.width, d.dstFrame.height, (int32)(d.dstFrame.format), C.SWS_BILINEAR, nil, nil, nil)
+		if d.swsCtx == nil {
+			return nil, fmt.Errorf("sws_getContext() err")
+		}
+
+		dstFrameSize := C.av_image_get_buffer_size((int32)(d.dstFrame.format), d.dstFrame.width, d.dstFrame.height, 1)
+		d.dstFramePtr = (*[1 << 30]uint8)(unsafe.Pointer(d.dstFrame.data[0]))[:dstFrameSize:dstFrameSize]
+	}
+
+	// convert frame from YUV420 to RGB
+	res = C.sws_scale(d.swsCtx, frameData(d.srcFrame), frameLineSize(d.srcFrame),
+		0, d.srcFrame.height, frameData(d.dstFrame), frameLineSize(d.dstFrame))
+	if res < 0 {
+		return nil, fmt.Errorf("sws_scale() err")
+	}
+
+	// embed frame into an image.Image
+	return &image.RGBA{
+		Pix:    d.dstFramePtr,
+		Stride: 4 * (int)(d.dstFrame.width),
+		Rect: image.Rectangle{
+			Max: image.Point{(int)(d.dstFrame.width), (int)(d.dstFrame.height)},
+		},
+	}, nil
+}
--- a/machinery/src/rtsp/mp4muxer.go
+++ b/machinery/src/rtsp/mp4muxer.go
@@ -0,0 +1,15 @@
+package rtsp
+
+// mp4Muxer allows to save a H264 stream into a Mp4 file.
+type mp4Muxer struct {
+	sps []byte
+	pps []byte
+}
+
+// newMp4Muxer allocates a mp4Muxer.
+func newMp4Muxer(sps []byte, pps []byte) (*mp4Muxer, error) {
+	return &mp4Muxer{
+		sps: sps,
+		pps: pps,
+	}, nil
+}
--- a/machinery/src/rtsp/mpegtsmuxer.go
+++ b/machinery/src/rtsp/mpegtsmuxer.go
@@ -0,0 +1,173 @@
+package rtsp
+
+import (
+	"bufio"
+	"context"
+	"log"
+	"os"
+	"time"
+
+	"github.com/asticode/go-astits"
+	"github.com/bluenviron/mediacommon/pkg/codecs/h264"
+)
+
+// mpegtsMuxer allows to save a H264 stream into a MPEG-TS file.
+type mpegtsMuxer struct {
+	sps []byte
+	pps []byte
+
+	f                *os.File
+	b                *bufio.Writer
+	mux              *astits.Muxer
+	dtsExtractor     *h264.DTSExtractor
+	firstIDRReceived bool
+	startDTS         time.Duration
+}
+
+// newMPEGTSMuxer allocates a mpegtsMuxer.
+func newMPEGTSMuxer(sps []byte, pps []byte) (*mpegtsMuxer, error) {
+	f, err := os.Create("mystream.ts")
+	if err != nil {
+		return nil, err
+	}
+	b := bufio.NewWriter(f)
+
+	mux := astits.NewMuxer(context.Background(), b)
+	mux.AddElementaryStream(astits.PMTElementaryStream{
+		ElementaryPID: 256,
+		StreamType:    astits.StreamTypeH264Video,
+	})
+	mux.SetPCRPID(256)
+
+	return &mpegtsMuxer{
+		sps: sps,
+		pps: pps,
+		f:   f,
+		b:   b,
+		mux: mux,
+	}, nil
+}
+
+// close closes all the mpegtsMuxer resources.
+func (e *mpegtsMuxer) close() {
+	e.b.Flush()
+	e.f.Close()
+}
+
+// encode encodes a H264 access unit into MPEG-TS.
+func (e *mpegtsMuxer) encode(au [][]byte, pts time.Duration) error {
+	// prepend an AUD. This is required by some players
+	filteredNALUs := [][]byte{
+		{byte(h264.NALUTypeAccessUnitDelimiter), 240},
+	}
+
+	nonIDRPresent := false
+	idrPresent := false
+
+	for _, nalu := range au {
+		typ := h264.NALUType(nalu[0] & 0x1F)
+		switch typ {
+		case h264.NALUTypeSPS:
+			e.sps = append([]byte(nil), nalu...)
+			continue
+
+		case h264.NALUTypePPS:
+			e.pps = append([]byte(nil), nalu...)
+			continue
+
+		case h264.NALUTypeAccessUnitDelimiter:
+			continue
+
+		case h264.NALUTypeIDR:
+			idrPresent = true
+
+		case h264.NALUTypeNonIDR:
+			nonIDRPresent = true
+		}
+
+		filteredNALUs = append(filteredNALUs, nalu)
+	}
+
+	au = filteredNALUs
+
+	if !nonIDRPresent && !idrPresent {
+		return nil
+	}
+
+	// add SPS and PPS before every group that contains an IDR
+	if idrPresent {
+		au = append([][]byte{e.sps, e.pps}, au...)
+	}
+
+	var dts time.Duration
+
+	if !e.firstIDRReceived {
+		// skip samples silently until we find one with a IDR
+		if !idrPresent {
+			return nil
+		}
+
+		e.firstIDRReceived = true
+		e.dtsExtractor = h264.NewDTSExtractor()
+
+		var err error
+		dts, err = e.dtsExtractor.Extract(au, pts)
+		if err != nil {
+			return err
+		}
+
+		e.startDTS = dts
+		dts = 0
+		pts -= e.startDTS
+
+	} else {
+		var err error
+		dts, err = e.dtsExtractor.Extract(au, pts)
+		if err != nil {
+			return err
+		}
+
+		dts -= e.startDTS
+		pts -= e.startDTS
+	}
+
+	oh := &astits.PESOptionalHeader{
+		MarkerBits: 2,
+	}
+
+	if dts == pts {
+		oh.PTSDTSIndicator = astits.PTSDTSIndicatorOnlyPTS
+		oh.PTS = &astits.ClockReference{Base: int64(pts.Seconds() * 90000)}
+	} else {
+		oh.PTSDTSIndicator = astits.PTSDTSIndicatorBothPresent
+		oh.DTS = &astits.ClockReference{Base: int64(dts.Seconds() * 90000)}
+		oh.PTS = &astits.ClockReference{Base: int64(pts.Seconds() * 90000)}
+	}
+
+	// encode into Annex-B
+	annexb, err := h264.AnnexBMarshal(au)
+	if err != nil {
+		return err
+	}
+
+	// write TS packet
+	_, err = e.mux.WriteData(&astits.MuxerData{
+		PID: 256,
+		AdaptationField: &astits.PacketAdaptationField{
+			RandomAccessIndicator: idrPresent,
+		},
+		PES: &astits.PESData{
+			Header: &astits.PESHeader{
+				OptionalHeader: oh,
+				StreamID:       224, // video
+			},
+			Data: annexb,
+		},
+	})
+	if err != nil {
+		return err
+	}
+
+	log.Println("wrote TS packet")
+	return nil
+}
--- a/machinery/src/webrtc/main.go
+++ b/machinery/src/webrtc/main.go
@@ -27,7 +27,7 @@ var (
 	CandidateArrays     map[string](chan string)
 	peerConnectionCount int64
 	peerConnections     map[string]*pionWebRTC.PeerConnection
-	encoder             *ffmpeg.VideoEncoder
+	//encoder             *ffmpeg.VideoEncoder
 )

 type WebRTC struct {
@@ -40,7 +40,8 @@ type WebRTC struct {
 	PacketsCount          chan int
 }

-func init() {
+// No longer used, is for transcoding, might comeback on this!
+/*func init() {
 	// Encoder is created for once and for all.
 	var err error
 	encoder, err = ffmpeg.NewVideoEncoderByCodecType(av.H264)
@@ -55,7 +56,7 @@ func init() {
 	encoder.SetPixelFormat(av.I420)
 	encoder.SetBitrate(1000000) // 1MB
 	encoder.SetGopSize(30 / 1)  // 1s
-}
+}*/

 func CreateWebRTC(name string, stunServers []string, turnServers []string, turnServersUsername string, turnServersCredential string) *WebRTC {
 	return &WebRTC{
@@ -86,7 +87,7 @@ func (w WebRTC) CreateOffer(sd []byte) pionWebRTC.SessionDescription {
 	return offer
 }

-func InitializeWebRTCConnection(configuration *models.Configuration, communication *models.Communication, mqttClient mqtt.Client, track *pionWebRTC.TrackLocalStaticSample, handshake models.SDPPayload, candidates chan string) {
+func InitializeWebRTCConnection(configuration *models.Configuration, communication *models.Communication, mqttClient mqtt.Client, videoTrack *pionWebRTC.TrackLocalStaticSample, audioTrack *pionWebRTC.TrackLocalStaticSample, handshake models.SDPPayload, candidates chan string) {

 	config := configuration.Config

@@ -127,15 +128,13 @@ func InitializeWebRTCConnection(configuration *models.Configuration, communicati

 		if err == nil && peerConnection != nil {

-			if _, err = peerConnection.AddTrack(track); err != nil {
+			if _, err = peerConnection.AddTrack(videoTrack); err != nil {
 				panic(err)
 			}

-			_, err = peerConnection.AddTransceiverFromTrack(track,
-				pionWebRTC.RtpTransceiverInit{
-					Direction: pionWebRTC.RTPTransceiverDirectionSendonly,
-				},
-			)
+			if _, err = peerConnection.AddTrack(audioTrack); err != nil {
+				panic(err)
+			}

 			if err != nil {
 				panic(err)
@@ -214,12 +213,29 @@ func InitializeWebRTCConnection(configuration *models.Configuration, communicati
 	}
 }

-func NewVideoTrack() *pionWebRTC.TrackLocalStaticSample {
-	outboundVideoTrack, _ := pionWebRTC.NewTrackLocalStaticSample(pionWebRTC.RTPCodecCapability{MimeType: "video/h264"}, "video", "pion124")
+func NewVideoTrack(codecs []av.CodecData) *pionWebRTC.TrackLocalStaticSample {
+	var mimeType string
+	mimeType = pionWebRTC.MimeTypeH264
+	outboundVideoTrack, _ := pionWebRTC.NewTrackLocalStaticSample(pionWebRTC.RTPCodecCapability{MimeType: mimeType}, "video", "pion124")
 	return outboundVideoTrack
 }

-func WriteToTrack(livestreamCursor *pubsub.QueueCursor, configuration *models.Configuration, communication *models.Communication, mqttClient mqtt.Client, track *pionWebRTC.TrackLocalStaticSample, codecs []av.CodecData, decoder *ffmpeg.VideoDecoder, decoderMutex *sync.Mutex) {
+func NewAudioTrack(codecs []av.CodecData) *pionWebRTC.TrackLocalStaticSample {
+	var mimeType string
+	for _, codec := range codecs {
+		if codec.Type().String() == "OPUS" {
+			mimeType = pionWebRTC.MimeTypeOpus
+		} else if codec.Type().String() == "PCM_MULAW" {
+			mimeType = pionWebRTC.MimeTypePCMU
+		} else if codec.Type().String() == "PCM_ALAW" {
+			mimeType = pionWebRTC.MimeTypePCMA
+		}
+	}
+	outboundAudioTrack, _ := pionWebRTC.NewTrackLocalStaticSample(pionWebRTC.RTPCodecCapability{MimeType: mimeType}, "audio", "pion124")
+	return outboundAudioTrack
+}
+
+func WriteToTrack(livestreamCursor *pubsub.QueueCursor, configuration *models.Configuration, communication *models.Communication, mqttClient mqtt.Client, videoTrack *pionWebRTC.TrackLocalStaticSample, audioTrack *pionWebRTC.TrackLocalStaticSample, codecs []av.CodecData, decoder *ffmpeg.VideoDecoder, decoderMutex *sync.Mutex) {

 	config := configuration.Config

@@ -233,7 +249,7 @@ func WriteToTrack(livestreamCursor *pubsub.QueueCursor, configuration *models.Co
 	for i, codec := range codecs {
 		if codec.Type().String() == "H264" && videoIdx < 0 {
 			videoIdx = i
-		} else if codec.Type().String() == "PCM_MULAW" && audioIdx < 0 {
+		} else if (codec.Type().String() == "OPUS" || codec.Type().String() == "PCM_MULAW" || codec.Type().String() == "PCM_ALAW") && audioIdx < 0 {
 			audioIdx = i
 		}
 	}
@@ -363,13 +379,17 @@ func WriteToTrack(livestreamCursor *pubsub.QueueCursor, configuration *models.Co
 							log.Log.Info("WriteToTrack: Error marshalling frame, " + err.Error())
 						}
 					} else {
-						if err := track.WriteSample(sample); err != nil && err != io.ErrClosedPipe {
+						if err := videoTrack.WriteSample(sample); err != nil && err != io.ErrClosedPipe {
 							log.Log.Error("WriteToTrack: something went wrong while writing sample: " + err.Error())
 						}
 					}
 				}
 			case audioIdx:
-				//log.Log.Info("WriteToTrack: not writing audio for the moment.")
+				// We will send the audio
+				sample := pionMedia.Sample{Data: pkt.Data, Duration: pkt.Time}
+				if err := audioTrack.WriteSample(sample); err != nil && err != io.ErrClosedPipe {
+					log.Log.Error("WriteToTrack: something went wrong while writing sample: " + err.Error())
+				}
 			}
 		}
 	}
@@ -378,6 +398,7 @@ func WriteToTrack(livestreamCursor *pubsub.QueueCursor, configuration *models.Co
 			p.Close()
 		}
 	}
+
 	peerConnectionCount = 0
 	log.Log.Info("WriteToTrack: stop writing to track.")
 }
--- a/ui/.eslintrc.json
+++ b/ui/.eslintrc.json
@@ -21,6 +21,7 @@
    "react/forbid-prop-types": "off",
    "no-case-declarations": "off",
    "camelcase": "off",
+    "dot-notation": "off",
    "jsx-a11y/media-has-caption": "off",
    "jsx-a11y/anchor-is-valid": "off",
    "jsx-a11y/click-events-have-key-events": "off",
--- 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/assets/env.template.js
+++ b/ui/public/assets/env.template.js
@@ -1,5 +1,5 @@
 (function (window) {
  window['env'] = window['env'] || {};
  // Environment variables
-  window['env']['apiUrl'] = '${FACTORY_API_URL}';
+  window['env']['mode'] = 'demo';
 })(this);
--- a/ui/public/assets/env.js
+++ b/ui/public/assets/env.js
@@ -1,5 +1,5 @@
 (function (window) {
  window['env'] = window['env'] || {};
  // Environment variables
-  window['env']['apiUrl'] = 'http://api.factory.kerberos.io';
+  window['env']['mode'] = 'release';
 })(this);
--- a/ui/public/index.html
+++ b/ui/public/index.html
@@ -19,7 +19,7 @@
      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
    -->
    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <script src="assets/env.js"></script>
+    <script src="%PUBLIC_URL%/env.js"></script>
    <!--
      Notice the use of %PUBLIC_URL% in the tags above.
      It will be replaced with the URL of the `public` folder during the build.
--- 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
@@ -0,0 +1,208 @@
+{
+  "breadcrumb": {
+    "watch_recordings": "观看录像",
+    "configure": "配置"
+  },
+  "buttons": {
+    "save": "保存",
+    "verify_connection": "Verify Connection"
+  },
+  "navigation": {
+    "profile": "配置文件",
+    "admin": "admin",
+    "management": "管理",
+    "dashboard": "仪表盘",
+    "recordings": "录像",
+    "settings": "设置",
+    "help_support": "帮助与支持",
+    "swagger": "Swagger API",
+    "documentation": "文档",
+    "ui_library": "UI 库",
+    "layout": "语言与布局",
+    "choose_language": "选择语言"
+  },
+  "dashboard": {
+    "title": "指示板",
+    "heading": "视频监控概述",
+    "number_of_days": "天数",
+    "total_recordings": "总录像数",
+    "connected": "连接",
+    "not_connected": "未连接",
+    "offline_mode": "离线模式",
+    "latest_events": "最新事件",
+    "configure_connection": "配置连接",
+    "no_events": "无事件",
+    "no_events_description": "没有发现录像，请确保正确配置了 Kerberos Agent。",
+    "motion_detected": "检测到运动",
+    "live_view": "实时视图",
+    "loading_live_view": "加载实时视图",
+    "loading_live_view_description": "请稍等，我们正在为您加载实时视图。如果您没有配置相机连接，请在设置页面进行更新。",
+    "time": "时间",
+    "description": "描述",
+    "name": "名称"
+  },
+  "recordings": {
+    "title": "录像",
+    "heading": "您所有的录像都存放在这",
+    "search_media": "搜索媒体"
+  },
+  "settings": {
+    "title": "设置",
+    "heading": "载入相机",
+    "submenu": {
+      "all": "所有",
+      "overview": "概述",
+      "camera": "相机",
+      "recording": "录像",
+      "streaming": "流",
+      "conditions": "条件",
+      "persistence": "持久化存储"
+    },
+    "info": {
+      "kerberos_hub_demo": "查看我们的 Kerberos Hub 演示环境，了解 Kerberos Hub 的实际运行情况！",
+      "configuration_updated_success": "您的配置已成功更新",
+      "configuration_updated_error": "保存时出错",
+      "verify_hub": "验证您的 Kerberos Hub 设置",
+      "verify_hub_success": "Kerberos Hub 设置验证成功",
+      "verify_hub_error": "验证 Kerberos Hub 时出错",
+      "verify_persistence": "验证持久化存储设置",
+      "verify_persistence_success": "持久化存储设置验证成功",
+      "verify_persistence_error": "验证持久化存储时出错",
+      "verify_camera": "验证您的相机设置",
+      "verify_camera_success": "相机设置验证成功",
+      "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": "常规",
+      "description_general": "Kerberos Agent 常规设置",
+      "key": "Key",
+      "camera_name": "相机名称",
+      "timezone": "时区",
+      "select_timezone": "选择时区",
+      "advanced_configuration": "高级配置",
+      "description_advanced_configuration": "启用或禁用 Kerberos Agent 特定部分详细配置选项",
+      "offline_mode": "离线模式",
+      "description_offline_mode": "禁用所有传出流量"
+    },
+    "camera": {
+      "camera": "相机",
+      "description_camera": "需要相机设置才能连接到您选择的相机。",
+      "only_h264": "目前仅支持 H264 RTSP 流。",
+      "rtsp_url": "RTSP 网址",
+      "rtsp_h264": "与摄像机的 H264 RTSP 连接。",
+      "sub_rtsp_url": "子 RTSP 网址（用于直播）",
+      "sub_rtsp_h264": "与低分辨率相机的辅助 RTSP 连接。",
+      "onvif": "ONVIF",
+      "description_onvif": "验证连接凭证以与 ONVIF 功能进行通信。这些用于 PTZ 或相机提供的其他功能。",
+      "onvif_xaddr": "ONVIF XADDR",
+      "onvif_username": "ONVIF 账户",
+      "onvif_password": "ONVIF 密码",
+      "verify_connection": "验证连接",
+      "verify_sub_connection": "验证子连接"
+    },
+    "recording": {
+      "recording": "录像",
+      "description_recording": "指定录制方式。具有连续的 24/7 全天候设置 或 基于运动的录制。",
+      "continuous_recording": "连续录制",
+      "description_continuous_recording": "进行 24/7 全天候 或 基于运动 的录制。",
+      "max_duration": "最长视频时长（秒）",
+      "description_max_duration": "录制的最长持续时间",
+      "pre_recording": "预录制（缓冲关键帧）",
+      "description_pre_recording": "事件发生前的秒数",
+      "post_recording": "录制后（秒）",
+      "description_post_recording": "事件发生后的秒数",
+      "threshold": "录制阈值（像素）",
+      "description_threshold": "录制改变的像素数",
+      "autoclean": "自动清理",
+      "description_autoclean": "指定 Kerberos Agent 代理是否可以在达到特定存储容量（MB）时清理录制文件。这将在达到容量时删除最旧的录制文件。",
+      "autoclean_enable": "启用自动清理",
+      "autoclean_description_enable": "启用自动清理",
+      "autoclean_max_directory_size": "最大目录大小（MB）",
+      "autoclean_description_max_directory_size": "存储录像最大的 MB 数",
+      "fragmentedrecordings": "碎片录制",
+      "description_fragmentedrecordings": "当录制文件碎片化时，它们适用于 HLS 流。打开 MP4 容器时，看起来会有点不同。",
+      "fragmentedrecordings_enable": "启用碎片",
+      "fragmentedrecordings_description_enable": "HLS 需要分段录制。",
+      "fragmentedrecordings_duration": "片段持续时间",
+      "fragmentedrecordings_description_duration": "单个片段的持续时间"
+    },
+    "streaming": {
+      "stun_turn": "WebRTC 的 STUN/TURN",
+      "description_stun_turn": "对于全分辨率直播，我们使用 WebRTC 的概念。其中一个关键功能是 ICE 候选功能，它允许使用 STUN/TURN 的概念进行 NAT 遍历。",
+      "stun_server": "STUN 服务",
+      "turn_server": "TURN 服务",
+      "turn_username": "账户",
+      "turn_password": "密码",
+      "stun_turn_forward": "转发和转码",
+      "stun_turn_description_forward": "TURN/STUN 通信的优化和增强。",
+      "stun_turn_webrtc": "转发到 WebRTC 代理",
+      "stun_turn_description_webrtc": "通过 MQTT 转发 h264 流",
+      "stun_turn_transcode": "转码流",
+      "stun_turn_description_transcode": "将流转换为较低分辨率",
+      "stun_turn_downscale": "缩小分辨率（以%或原始分辨率为单位）",
+      "mqtt": "MQTT",
+      "description_mqtt": "MQTT 代理用于从",
+      "description2_mqtt": "到 Kerberos Agent 进行通信, 以实现例如实时流式传输或 ONVIF （PTZ） 功能。",
+      "mqtt_brokeruri": "代理 URI",
+      "mqtt_username": "账户",
+      "mqtt_password": "密码"
+    },
+    "conditions": {
+      "timeofinterest": "兴趣时间",
+      "description_timeofinterest": "仅在特定时间间隔（基于时区）之间进行录制。",
+      "timeofinterest_enabled": "启用",
+      "timeofinterest_description_enabled": "如果启用，您可以指定时间窗口",
+      "sunday": "周日",
+      "monday": "周一",
+      "tuesday": "周二",
+      "wednesday": "周三",
+      "thursday": "周四",
+      "friday": "周五",
+      "saturday": "周六",
+      "externalcondition": "外界条件",
+      "description_externalcondition": "根据外部 Web 服务，可以启用或禁用录制。",
+      "regionofinterest": "兴趣地区",
+      "description_regionofinterest": "通过定义一个或多个区域，将仅在您定义的区域中跟踪运动。"
+    },
+    "persistence": {
+      "kerberoshub": "Kerberos Hub",
+      "description_kerberoshub": "Kerberos Agents 可以将检测信号发送到中央",
+      "description2_kerberoshub": "进行安装。检测信号和其他相关信息将同步到 Kerberos Hub，以显示有关视频环境的实时信息。",
+      "persistence": "持久化存储",
+      "saasoffering": "Kerberos Hub (SAAS 产品)",
+      "description_persistence": "能够存储您的录像是一切的开始。您可以在我们的",
+      "description2_persistence": ", 或第三方提供商之间进行选择。",
+      "select_persistence": "选择持久化存储",
+      "kerberoshub_proxyurl": "Kerberos Hub 代理 URL",
+      "kerberoshub_description_proxyurl": "用于上传您录像的代理端点",
+      "kerberoshub_apiurl": "Kerberos Hub API URL",
+      "kerberoshub_description_apiurl": "用于上传您录像的 API 端点",
+      "kerberoshub_publickey": "公钥",
+      "kerberoshub_description_publickey": "授予 Kerberos Hub 帐户的公钥",
+      "kerberoshub_privatekey": "私钥",
+      "kerberoshub_description_privatekey": "授予 Kerberos Hub 帐户的私钥",
+      "kerberoshub_site": "站点",
+      "kerberoshub_description_site": "Kerberos Agents 在 Kerberos Hub 中所属的站点 ID",
+      "kerberoshub_region": "区域",
+      "kerberoshub_description_region": "存储录像的区域",
+      "kerberoshub_bucket": "Bucket",
+      "kerberoshub_description_bucket": "存储录像的桶",
+      "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": "目录 (should match Kerberos Hub username)",
+      "kerberosvault_description_directory": "录像将存储在提供商中的子目录",
+      "kerberosvault_accesskey": "访问密钥",
+      "kerberosvault_description_accesskey": "Kerberos Vault 帐户的访问密钥",
+      "kerberosvault_secretkey": "密钥",
+      "kerberosvault_description_secretkey": "Kerberos Vault 帐户的密钥",
+      "verify_connection": "验证连接"
+    }
+  }
+}
--- 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',
@@ -82,111 +93,122 @@ class App extends React.Component {
    const { children, username, dashboard, dispatchLogout } = this.props;
    const cloudOnline = this.getCurrentTimestamp() - dashboard.cloudOnline < 30;
    return (
-      <div id="page-root">
-        <Sidebar logo={logo} title="Kerberos Agent" version="v1-beta" mobile>
-          <Profilebar
-            username={username}
-            email="support@kerberos.io"
-            userrole={t('navigation.admin')}
-            logout={dispatchLogout}
-          />
-          <Navigation>
-            <NavigationSection title={t('navigation.management')} />
-            <NavigationGroup>
-              <NavigationItem
-                title={t('navigation.dashboard')}
-                icon="dashboard"
-                link="dashboard"
-              />
-              <NavigationItem
-                title={t('navigation.recordings')}
-                icon="media"
-                link="media"
-              />
-              <NavigationItem
-                title={t('navigation.settings')}
-                icon="preferences"
-                link="settings"
-              />
-            </NavigationGroup>
-            <NavigationSection title={t('navigation.help_support')} />
-            <NavigationGroup>
-              <NavigationItem
-                title={t('navigation.swagger')}
-                icon="api"
-                external
-                link={`${config.URL}/swagger/index.html`}
-              />
-              <NavigationItem
-                title={t('navigation.documentation')}
-                icon="book"
-                external
-                link="https://doc.kerberos.io/agent/announcement"
-              />
-              <NavigationItem
-                title="Kerberos Hub"
-                icon="cloud"
-                external
-                link="https://app.kerberos.io"
-              />
-              <NavigationItem
-                title={t('navigation.ui_library')}
-                icon="paint"
-                external
-                link="https://ui.kerberos.io/"
-              />
-              <NavigationItem
-                title="Github"
-                icon="github-nav"
-                external
-                link="https://github.com/kerberos-io/agent"
-              />
-            </NavigationGroup>
-            <NavigationSection title={t('navigation.layout')} />
-            <NavigationGroup>
-              <LanguageSelect />
-            </NavigationGroup>
-
-            <NavigationSection title="Websocket" />
-            <NavigationGroup>
-              <div className="websocket-badge">
-                <Badge
-                  title={connected ? 'connected' : 'disconnected'}
-                  status={connected ? 'success' : 'warning'}
+      <>
+        {config.MODE !== 'release' && (
+          <div className={`environment ${config.MODE}`}>
+            Environment: {config.MODE}
+          </div>
+        )}
+        <div id="page-root">
+          <Sidebar logo={logo} title="Kerberos Agent" version="v1-beta" mobile>
+            <Profilebar
+              username={username}
+              email="support@kerberos.io"
+              userrole={t('navigation.admin')}
+              logout={dispatchLogout}
+            />
+            <Navigation>
+              <NavigationSection title={t('navigation.management')} />
+              <NavigationGroup>
+                <NavigationItem
+                  title={t('navigation.dashboard')}
+                  icon="dashboard"
+                  link="dashboard"
                />
-              </div>
-            </NavigationGroup>
-          </Navigation>
-        </Sidebar>
-        <Main>
-          <Gradient />
+                <NavigationItem
+                  title={t('navigation.recordings')}
+                  icon="media"
+                  link="media"
+                />
+                <NavigationItem
+                  title={t('navigation.settings')}
+                  icon="preferences"
+                  link="settings"
+                />
+              </NavigationGroup>
+              <NavigationSection title={t('navigation.help_support')} />
+              <NavigationGroup>
+                <NavigationItem
+                  title={t('navigation.swagger')}
+                  icon="api"
+                  external
+                  link={`${config.URL}/swagger/index.html`}
+                />
+                <NavigationItem
+                  title={t('navigation.documentation')}
+                  icon="book"
+                  external
+                  link="https://doc.kerberos.io/agent/announcement"
+                />
+                <NavigationItem
+                  title="Kerberos Hub"
+                  icon="cloud"
+                  external
+                  link="https://app.kerberos.io"
+                />
+                <NavigationItem
+                  title={t('navigation.ui_library')}
+                  icon="paint"
+                  external
+                  link="https://ui.kerberos.io/"
+                />
+                <NavigationItem
+                  title="Github"
+                  icon="github-nav"
+                  external
+                  link="https://github.com/kerberos-io/agent"
+                />
+              </NavigationGroup>
+              <NavigationSection title={t('navigation.layout')} />
+              <NavigationGroup>
+                <LanguageSelect />
+              </NavigationGroup>

-          {!cloudOnline && (
-            <a href="https://app.kerberos.io" target="_blank" rel="noreferrer">
-              <div className="cloud-not-installed">
-                <div>
-                  <Icon label="cloud" />
-                  Activate Kerberos Hub, and make your cameras and recordings
-                  available through a secured cloud!
+              <NavigationSection title="Websocket" />
+              <NavigationGroup>
+                <div className="websocket-badge">
+                  <Badge
+                    title={connected ? 'connected' : 'disconnected'}
+                    status={connected ? 'success' : 'warning'}
+                  />
                </div>
-              </div>
-            </a>
-          )}
+              </NavigationGroup>
+            </Navigation>
+          </Sidebar>
+          <Main>
+            <Gradient />

-          {dashboard.offlineMode === 'true' && (
-            <Link to="/settings">
-              <div className="offline-mode">
-                <div>
-                  <Icon label="info" />
-                  Attention! Kerberos is currently running in Offline mode.
+            {!cloudOnline && (
+              <a
+                href="https://app.kerberos.io"
+                target="_blank"
+                rel="noreferrer"
+              >
+                <div className="cloud-not-installed">
+                  <div>
+                    <Icon label="cloud" />
+                    Activate Kerberos Hub, and make your cameras and recordings
+                    available through a secured cloud!
+                  </div>
                </div>
-              </div>
-            </Link>
-          )}
+              </a>
+            )}

-          <MainBody>{children}</MainBody>
-        </Main>
-      </div>
+            {dashboard.offlineMode === 'true' && (
+              <Link to="/settings">
+                <div className="offline-mode">
+                  <div>
+                    <Icon label="info" />
+                    Attention! Kerberos is currently running in Offline mode.
+                  </div>
+                </div>
+              </Link>
+            )}
+
+            <MainBody>{children}</MainBody>
+          </Main>
+        </div>
+      </>
    );
  }
 }
--- 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/config.js
+++ b/ui/src/config.js
@@ -12,6 +12,7 @@ const dev = {
  API_URL: `${protocol}//${hostname}:8080/api`,
  URL: `${protocol}//${hostname}:8080`,
  WS_URL: `${websocketprotocol}//${hostname}:8080/ws`,
+  MODE: window['env']['mode'],
  // Uncomment, and comment the above lines, when using codespaces or other special DNS names (which you can't control)
  // HOSTNAME: externalHost,
  // API_URL: `${protocol}//${externalHost}/api`,
@@ -25,6 +26,7 @@ const prod = {
  API_URL: `${protocol}//${host}/api`,
  URL: `${protocol}//${host}`,
  WS_URL: `${websocketprotocol}//${host}/ws`,
+  MODE: window['env']['mode'],
 };

 const config = process.env.REACT_APP_ENVIRONMENT === 'production' ? prod : dev;
--- 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/index.scss
+++ b/ui/src/index.scss
@@ -144,3 +144,55 @@ body {
  padding: 0;
  font-family: 'Inter', sans-serif; // use regular Inter font by default..
 }
+
+.environment.develop {
+  background: repeating-linear-gradient(
+    -55deg,
+    #222,
+    #222 10px,
+    #035e1f 10px,
+    #035e1f 20px
+  );
+  text-align: center;
+  color: rgba(255, 255, 255, 0.75);
+  padding: size(1) 0;
+}
+
+.environment.demo {
+  background: repeating-linear-gradient(
+    -55deg,
+    #222,
+    #222 10px,
+    #035e1f 10px,
+    #035e1f 20px
+  );
+  text-align: center;
+  color: rgba(255, 255, 255, 0.75);
+  padding: 12px 0;
+}
+
+.environment.staging {
+  background: repeating-linear-gradient(
+    -55deg,
+    #222,
+    #222 10px,
+    #6d0e0e 10px,
+    #6d0e0e 20px
+  );
+  text-align: center;
+  color: white;
+  padding: 12px 0;
+}
+
+.environment.acceptance {
+  background: repeating-linear-gradient(
+    -55deg,
+    #222,
+    #222 10px,
+    #8b8203 10px,
+    #8b8203 20px
+  );
+  text-align: center;
+  color: white;
+  padding: 12px 0;
+}
--- 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,
@@ -34,7 +35,9 @@ class Dashboard extends React.Component {
      liveviewLoaded: false,
      open: false,
      currentRecording: '',
+      initialised: false,
    };
+    this.initialiseLiveview = this.initialiseLiveview.bind(this);
  }

  componentDidMount() {
@@ -46,27 +49,11 @@ class Dashboard extends React.Component {
        });
      });
    }
-
-    const { connected } = this.props;
-    if (connected === true) {
-      const { dispatchSend } = this.props;
-      const message = {
-        message_type: 'stream-sd',
-      };
-      dispatchSend(message);
-    }
+    this.initialiseLiveview();
  }

-  componentDidUpdate(prevProps) {
-    const { connected: connectedPrev } = prevProps;
-    const { connected } = this.props;
-    if (connectedPrev === false && connected === true) {
-      const { dispatchSend } = this.props;
-      const message = {
-        message_type: 'stream-sd',
-      };
-      dispatchSend(message);
-    }
+  componentDidUpdate() {
+    this.initialiseLiveview();
  }

  componentWillUnmount() {
@@ -75,6 +62,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',
@@ -93,6 +83,30 @@ class Dashboard extends React.Component {
    return Math.round(Date.now() / 1000);
  }

+  initialiseLiveview() {
+    const { initialised } = this.state;
+    if (!initialised) {
+      const message = {
+        message_type: 'stream-sd',
+      };
+      const { connected, dispatchSend } = this.props;
+      if (connected) {
+        dispatchSend(message);
+      }
+
+      const requestStreamInterval = interval(2000);
+      this.requestStreamSubscription = requestStreamInterval.subscribe(() => {
+        const { connected: isConnected } = this.props;
+        if (isConnected) {
+          dispatchSend(message);
+        }
+      });
+      this.setState({
+        initialised: true,
+      });
+    }
+  }
+
  openModal(file) {
    this.setState({
      open: true,
@@ -106,17 +120,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');
    }
@@ -176,7 +189,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'
              }
@@ -297,7 +310,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')}
@@ -307,7 +320,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] : ''
--- a/ui/src/pages/Login/Login.jsx
+++ b/ui/src/pages/Login/Login.jsx
@@ -49,60 +49,98 @@ class Login extends React.Component {
    const { loginError, error } = this.props;

    return (
-      <LandingLayout
-        title="Kerberos Agent"
-        version={config.VERSION}
-        description="Video surveillance for everyone"
-      >
-        <section className="login-body">
-          <Block>
-            <form onSubmit={this.handleSubmit} noValidate>
-              <BlockHeader>
-                <div>
-                  <Icon label="login" /> <h4>Login</h4>
-                </div>
-              </BlockHeader>
-              {loginError && (
-                <AlertMessage
-                  message={error}
-                  onClick={() => this.hideMessage()}
-                />
-              )}
-              <BlockBody>
-                <Input
-                  label="username or email"
-                  placeholder="Your username/email"
-                  readonly={false}
-                  disabled={false}
-                  type="text"
-                  name="username"
-                  iconleft="accounts"
-                />
-                <Input
-                  label="password"
-                  placeholder="Your password"
-                  readonly={false}
-                  disabled={false}
-                  type="password"
-                  name="password"
-                  iconleft="locked"
-                  iconright="activity"
-                  seperate
-                />
-              </BlockBody>
-              <BlockFooter>
-                <p />
-                <Button
-                  buttonType="submit"
-                  type="submit"
-                  icon="logout"
-                  label="Login"
-                />
-              </BlockFooter>
-            </form>
-          </Block>
-        </section>
-      </LandingLayout>
+      <>
+        {config.MODE !== 'release' && (
+          <div className={`environment ${config.MODE}`}>
+            Environment: {config.MODE}
+          </div>
+        )}
+        <LandingLayout
+          title="Kerberos Agent"
+          version={config.VERSION}
+          description="Video surveillance for everyone"
+        >
+          <section className="login-body">
+            <Block>
+              <form onSubmit={this.handleSubmit} noValidate>
+                <BlockHeader>
+                  <div>
+                    <Icon label="login" /> <h4>Login</h4>
+                  </div>
+                </BlockHeader>
+                {loginError && (
+                  <AlertMessage
+                    message={error}
+                    onClick={() => this.hideMessage()}
+                  />
+                )}
+                <BlockBody>
+                  {config.MODE === 'demo' && (
+                    <>
+                      <Input
+                        label="username or email"
+                        placeholder="Your username/email"
+                        readonly
+                        disabled={false}
+                        value="root"
+                        type="text"
+                        name="username"
+                        iconleft="accounts"
+                      />
+                      <Input
+                        label="password"
+                        placeholder="Your password"
+                        readonly
+                        disabled={false}
+                        value="root"
+                        type="password"
+                        name="password"
+                        iconleft="locked"
+                        iconright="activity"
+                        seperate
+                      />
+                    </>
+                  )}
+
+                  {config.MODE !== 'demo' && (
+                    <>
+                      <Input
+                        label="username or email"
+                        placeholder="Your username/email"
+                        readonly={false}
+                        disabled={false}
+                        type="text"
+                        name="username"
+                        iconleft="accounts"
+                      />
+                      <Input
+                        label="password"
+                        placeholder="Your password"
+                        readonly={false}
+                        disabled={false}
+                        type="password"
+                        name="password"
+                        iconleft="locked"
+                        iconright="activity"
+                        seperate
+                      />
+                    </>
+                  )}
+                </BlockBody>
+                <BlockFooter>
+                  <p />
+                  <Button
+                    buttonType="submit"
+                    type="submit"
+                    icon="logout"
+                    label="Login"
+                  />
+                </BlockFooter>
+              </form>
+            </Block>
+          </section>
+        </LandingLayout>
+      </>
    );
  }
 }
--- 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() {
@@ -224,13 +229,15 @@ class Settings extends React.Component {

  calculateTimetable(timetable) {
    this.timetable = timetable;
-    for (let i = 0; i < timetable.length; i += 1) {
-      const time = timetable[i];
-      const { start1, start2, end1, end2 } = time;
-      this.timetable[i].start1Full = this.convertSecondsToHourMinute(start1);
-      this.timetable[i].start2Full = this.convertSecondsToHourMinute(start2);
-      this.timetable[i].end1Full = this.convertSecondsToHourMinute(end1);
-      this.timetable[i].end2Full = this.convertSecondsToHourMinute(end2);
+    if (this.timetable) {
+      for (let i = 0; i < timetable.length; i += 1) {
+        const time = timetable[i];
+        const { start1, start2, end1, end2 } = time;
+        this.timetable[i].start1Full = this.convertSecondsToHourMinute(start1);
+        this.timetable[i].start2Full = this.convertSecondsToHourMinute(start2);
+        this.timetable[i].end1Full = this.convertSecondsToHourMinute(end1);
+        this.timetable[i].end2Full = this.convertSecondsToHourMinute(end2);
+      }
    }
  }

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

    if (config) {
@@ -293,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) {
@@ -315,6 +370,8 @@ class Settings extends React.Component {
        verifyCameraSuccess: false,
        verifyCameraError: false,
        verifyCameraErrorMessage: '',
+        verifyOnvifSuccess: false,
+        verifyOnvifError: false,
        loadingHub: true,
      });

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

      dispatchVerifyCamera(
@@ -451,6 +512,10 @@ class Settings extends React.Component {
      verifyCameraSuccess,
      verifyCameraError,
      verifyCameraErrorMessage,
+      loadingOnvif,
+      verifyOnvifSuccess,
+      verifyOnvifError,
+      verifyOnvifErrorMessage,
      loadingCamera,
      loading,
      loadingHub,
@@ -650,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')} />
        )}
@@ -1101,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',
@@ -1141,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"
@@ -2030,17 +2114,6 @@ class Settings extends React.Component {
                  />
                  {config.cloud === this.KERBEROS_HUB && (
                    <>
-                      <Input
-                        noPadding
-                        label={t('settings.persistence.kerberoshub_proxyurl')}
-                        placeholder={t(
-                          'settings.persistence.kerberoshub_description_proxyurl'
-                        )}
-                        value={config.s3 ? config.s3.proxyuri : ''}
-                        onChange={(value) =>
-                          this.onUpdateField('s3', 'proxyuri', value, config.s3)
-                        }
-                      />
                      <Input
                        noPadding
                        label={t('settings.persistence.kerberoshub_region')}
@@ -2052,28 +2125,6 @@ class Settings extends React.Component {
                          this.onUpdateField('s3', 'region', value, config.s3)
                        }
                      />
-                      <Input
-                        noPadding
-                        label={t('settings.persistence.kerberoshub_bucket')}
-                        placeholder={t(
-                          'settings.persistence.kerberoshub_description_bucket'
-                        )}
-                        value={config.s3 ? config.s3.bucket : ''}
-                        onChange={(value) =>
-                          this.onUpdateField('s3', 'bucket', value, config.s3)
-                        }
-                      />
-                      <Input
-                        noPadding
-                        label={t('settings.persistence.kerberoshub_username')}
-                        placeholder={t(
-                          'settings.persistence.kerberoshub_description_username'
-                        )}
-                        value={config.s3 ? config.s3.username : ''}
-                        onChange={(value) =>
-                          this.onUpdateField('s3', 'username', value, config.s3)
-                        }
-                      />
                    </>
                  )}
                  {config.cloud === this.KERBEROS_VAULT && (
@@ -2243,6 +2294,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) =>
@@ -2270,6 +2323,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	756b893ecd	reference latest tags	2023-06-24 12:58:16 +02:00
Cedric Verstraeten	36323b076f	Fix for Kerberos Vault persistence check	2023-06-23 21:13:13 +02:00
Cedric Verstraeten	95f43b6444	Fix for empty vault settings, throw error	2023-06-23 20:20:38 +02:00
Cedric Verstraeten	5c23a62ac3	New function to validate Kerberos Hub connectivity and subscription	2023-06-23 19:01:04 +02:00
Cedric Verstraeten	2b425a2ddd	add test video for verification	2023-06-23 17:16:13 +02:00
Cedric Verstraeten	abeeb95204	make region editable through ENV + add new upload function to upload to Kerberos Hub	2023-06-23 16:14:01 +02:00
Cédric Verstraeten	6aed20c466	Align to correct region	2023-06-22 15:53:46 +02:00
Cedric Verstraeten	6672535544	fix glitch with loading livestream when hitting dashboard page first	2023-06-14 17:14:40 +02:00
Cedric Verstraeten	ed397b6ecc	change environment box sizes	2023-06-14 16:59:26 +02:00
Cedric Verstraeten	530e4c654e	set permissions to modify the env.js file on runtime	2023-06-14 16:49:50 +02:00
Cedric Verstraeten	913bd1ba12	add demo environment mode	2023-06-14 16:29:13 +02:00
Cedric Verstraeten	84e532be47	reloading of configuration right after updating config + optimise loading stream + fix for ip camera online and cloud online + onvif ptz checks for hub	2023-06-13 23:12:58 +02:00
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
Cedric Verstraeten	229c246e1c	adding ctx (support) + unblock when unsupported codec	2023-06-08 21:50:10 +02:00
Cedric Verstraeten	15d9bcda4f	decoding issue caused new mongodb adapter to fail	2023-06-07 22:01:44 +02:00
Cedric Verstraeten	068063695e	time table might be empty	2023-06-07 20:24:09 +02:00
Cedric Verstraeten	b1722844f3	fix config overriding	2023-06-07 20:19:50 +02:00
Cedric Verstraeten	eb5ab48d6c	timetable might be empty	2023-06-07 18:47:48 +02:00
Cedric Verstraeten	b64f1039d7	hotfix: fix missing polygon from start	2023-06-07 18:22:18 +02:00
Cedric Verstraeten	6fcd6e53a1	hotfix: fix openconfig	2023-06-07 17:07:39 +02:00
Cedric Verstraeten	25537b5f02	add new mongodb adapter	2023-06-07 16:44:54 +02:00
Cédric Verstraeten	2fad541e06	Update README.md	2023-06-03 08:49:58 +02:00
Cédric Verstraeten	afefd32a1f	Merge pull request #102 from lubikx/master Alpine+go combination doesn't resolve DNS correctly under docker comp…	2023-05-30 09:07:52 +02:00
Lubor Nosek	89e01e065c	Alpine+go combination doesn't resolve DNS correctly under docker compose environment	2023-05-30 08:30:24 +02:00
Cedric Verstraeten	02f3e6a1e2	Update README.md	2023-05-16 12:01:09 +02:00
Cedric Verstraeten	ec5a00f3df	get rid of print!	2023-05-10 14:41:32 +02:00
Cedric Verstraeten	2860775954	unused var	2023-05-10 11:43:23 +02:00
Cedric Verstraeten	d2e8e04833	upgrade joy4, allow OPUS	2023-05-10 11:33:38 +02:00
Cedric Verstraeten	fad90390a6	disable transcoder, will free up some memory + add support for audio	2023-05-10 11:33:03 +02:00
Cedric Verstraeten	d6ba875473	add mods	2023-05-09 13:16:32 +02:00
Cedric Verstraeten	e9ea34c20f	connect to Kerberos Hub if required, even if camera is not working	2023-05-09 13:14:03 +02:00
Cedric Verstraeten	99cc7d419f	add .vscode launch file	2023-05-06 08:46:31 +02:00
Cedric Verstraeten	1a6dc27535	add vault uri example	2023-05-03 20:03:22 +02:00
Cedric Verstraeten	93f40a8d34	get rid of dependency	2023-04-20 15:28:27 +02:00
Cedric Verstraeten	d7f7de97b4	Merge branch 'develop'	2023-04-20 13:37:07 +02:00
Cedric Verstraeten	50babedcbf	remove trailing comma	2023-04-20 10:51:35 +02:00
Cédric Verstraeten	4352d993ed	Merge pull request #93 from AFLDT/patch-1 Adding Chinese support	2023-04-10 14:59:56 +02:00
xingZhe	1e144e1c60	Change the path of the translation file	2023-04-09 06:41:59 +00:00
Cedric Verstraeten	d4e37e0bae	update readme + few fixes + add env for dropbox	2023-04-07 23:27:05 +02:00
xingZhe	65fd400d4d	Adding Chinese support	2023-04-02 14:25:20 +08:00