do not read if not needed

.devcontainer/Dockerfile

@@ -1,26 +1,2 @@
-FROM mcr.microsoft.com/devcontainers/go:1.24-bookworm
-
-# Install node environment
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    nodejs \
-    npm \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install ffmpeg
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    ffmpeg \
-    libavcodec-extra \
-    libavutil-dev \
-    libavformat-dev \
-    libavfilter-dev \
-    libavdevice-dev \
-    libswscale-dev \
-    libswresample-dev \
-    && rm -rf /var/lib/apt/lists/*
-
-USER vscode
-
-# Install go swagger
-RUN go install github.com/swaggo/swag/cmd/swag@latest
+FROM kerberos/devcontainer:5da0fe7
+LABEL AUTHOR=Kerberos.io

.devcontainer/devcontainer.json

@@ -1,24 +1,21 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/python
 {
-	"name": "go:1.24-bookworm",
-	"runArgs": [
-		"--name=agent",
-		"--network=host"
+	"name": "A Dockerfile containing FFmpeg, OpenCV, Go and Yarn",
+	"context": "..",
+	"dockerFile": "./Dockerfile",
+	"forwardPorts": [
+		3000,
+		80
 	],
-	"dockerFile": "Dockerfile",
+	"postCreateCommand": "cd ui && yarn install && yarn build && cd ../machinery && go mod download",
 	"customizations": {
 		"vscode": {
 			"extensions": [
-				"GitHub.copilot",
+				"ms-kubernetes-tools.vscode-kubernetes-tools",
 				"ms-azuretools.vscode-docker",
-				"mongodb.mongodb-vscode"
+				"GitHub.copilot",
+				"golang.go",
+				"ms-vscode.vscode-typescript-next"
 			]
 		}
-	},
-	"forwardPorts": [
-		3000,
-		8080
-	],
-	"postCreateCommand": "cd ui && yarn install && yarn build && cd ../machinery && go mod download"
+	}
 }

.github/workflows/docker.yml

@@ -0,0 +1,113 @@
+name: Docker release build
+
+on:
+  release:
+    types: [created]
+
+env:
+  REPO: kerberos/agent
+
+jobs:
+  build-amd64:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    strategy:
+      matrix:
+        architecture: [amd64]
+    steps:
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Checkout
+        uses: actions/checkout@v3
+      - uses: benjlevesque/short-sha@v2.1
+        id: short-sha
+        with:
+          length: 7
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Available platforms
+        run: echo ${{ steps.buildx.outputs.platforms }}
+      - name: Run Buildx
+        run: docker buildx build --platform linux/$(echo ${{matrix.architecture}} | tr - /) -t $REPO-arch:arch-${{matrix.architecture}}-${{github.ref_name}} --push .
+      - name: Create new and append to manifest
+        run: docker buildx imagetools create -t $REPO:${{ github.ref_name }} $REPO-arch:arch-${{matrix.architecture}}-${{github.ref_name}}
+      - name: Create new and append to manifest latest
+        run: docker buildx imagetools create -t $REPO:latest $REPO-arch:arch-${{matrix.architecture}}-${{github.ref_name}}
+      - name: Run Buildx with output
+        run: docker buildx build --platform linux/$(echo ${{matrix.architecture}} | tr - /) -t $REPO-arch:arch-$(echo ${{matrix.architecture}} | tr / -)-${{github.ref_name}} --output type=tar,dest=output-${{matrix.architecture}}.tar .
+      - name: Strip binary
+        run: mkdir -p output/ && tar -xf output-${{matrix.architecture}}.tar -C output && rm output-${{matrix.architecture}}.tar && cd output/ && tar -cf ../agent-${{matrix.architecture}}.tar -C home/agent . && rm -rf output
+      - name: Create a release
+        uses: ncipollo/release-action@v1
+        with:
+          latest: true
+          allowUpdates: true
+          name: ${{ github.ref_name }}
+          tag: ${{ github.ref_name }}
+          generateReleaseNotes: false
+          omitBodyDuringUpdate: true
+          artifacts: "agent-${{matrix.architecture}}.tar"
+      # Taken from GoReleaser's own release workflow.
+      # The available Snapcraft Action has some bugs described in the issue below.
+      # The mkdirs are a hack for https://github.com/goreleaser/goreleaser/issues/1715.
+      #- name: Setup Snapcraft
+      #  run: |
+      #    sudo apt-get update
+      #    sudo apt-get -yq --no-install-suggests --no-install-recommends install snapcraft
+      #    mkdir -p $HOME/.cache/snapcraft/download
+      #    mkdir -p $HOME/.cache/snapcraft/stage-packages
+      #- name: Use Snapcraft
+      #  run: tar -xf agent-${{matrix.architecture}}.tar && snapcraft
+  build-other:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    needs: build-amd64
+    strategy:
+      matrix:
+        architecture: [arm64, arm-v7, arm-v6]
+        #architecture: [arm64, arm-v7]
+    steps:
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Checkout
+        uses: actions/checkout@v3
+      - uses: benjlevesque/short-sha@v2.1
+        id: short-sha
+        with:
+          length: 7
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Available platforms
+        run: echo ${{ steps.buildx.outputs.platforms }}
+      - name: Run Buildx
+        run: docker buildx build --platform linux/$(echo ${{matrix.architecture}} | tr - /) -t $REPO-arch:arch-${{matrix.architecture}}-${{github.ref_name}} --push .
+      - name: Create new and append to manifest
+        run: docker buildx imagetools create --append -t $REPO:${{ github.ref_name }} $REPO-arch:arch-${{matrix.architecture}}-${{github.ref_name}}
+      - name: Create new and append to manifest latest
+        run: docker buildx imagetools create --append -t $REPO:latest $REPO-arch:arch-${{matrix.architecture}}-${{github.ref_name}}
+      - name: Run Buildx with output
+        run: docker buildx build --platform linux/$(echo ${{matrix.architecture}} | tr - /) -t $REPO-arch:arch-$(echo ${{matrix.architecture}} | tr / -)-${{github.ref_name}} --output type=tar,dest=output-${{matrix.architecture}}.tar .
+      - name: Strip binary
+        run: mkdir -p output/ && tar -xf output-${{matrix.architecture}}.tar -C output && rm output-${{matrix.architecture}}.tar && cd output/ && tar -cf ../agent-${{matrix.architecture}}.tar -C home/agent . && rm -rf output
+      - name: Create a release
+        uses: ncipollo/release-action@v1
+        with:
+          latest: true
+          allowUpdates: true
+          name: ${{ github.ref_name }}
+          tag: ${{ github.ref_name }}
+          generateReleaseNotes: false
+          omitBodyDuringUpdate: true
+          artifacts: "agent-${{matrix.architecture}}.tar"

.github/workflows/go.yml

@@ -17,7 +17,7 @@ jobs:
       matrix:
         #No longer supported Go versions.
         #go-version: ['1.17', '1.18', '1.19', '1.20', '1.21']
-        go-version: ["1.24"]
+        go-version: ["1.22"]
 
     steps:
       - name: Set up Go ${{ matrix.go-version }}

.github/workflows/pr-build.yml

@@ -1,75 +0,0 @@
-name: Build pull request
-on:
-  pull_request:
-    types: [opened, synchronize]
-
-env:
-  REPO: kerberos/agent
-
-jobs:
-  build-amd64:
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: write
-    strategy:
-      matrix:
-        architecture: [amd64]
-    steps:
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Checkout
-        uses: actions/checkout@v3
-      - uses: benjlevesque/short-sha@v2.1
-        id: short-sha
-        with:
-          length: 7
-      - name: Run Build
-        run: |
-          docker build -t ${{matrix.architecture}} .
-          CID=$(docker create ${{matrix.architecture}})
-          docker cp ${CID}:/home/agent ./output-${{matrix.architecture}}
-          docker rm ${CID}
-      - name: Strip binary
-        run: tar -cf agent-${{matrix.architecture}}.tar -C output-${{matrix.architecture}} . && rm -rf output-${{matrix.architecture}}
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: agent-${{matrix.architecture}}.tar
-          path: agent-${{matrix.architecture}}.tar
-          
-  build-arm64:
-    runs-on: ubuntu-24.04-arm 
-    permissions:
-      contents: write
-    strategy:
-      matrix:
-        architecture: [arm64]
-    steps:
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Checkout
-        uses: actions/checkout@v3
-      - uses: benjlevesque/short-sha@v2.1
-        id: short-sha
-        with:
-          length: 7
-      - name: Run Build
-        run: |
-          docker build -t ${{matrix.architecture}} -f Dockerfile.arm64 .
-          CID=$(docker create ${{matrix.architecture}})
-          docker cp ${CID}:/home/agent ./output-${{matrix.architecture}}
-          docker rm ${CID}
-      - name: Strip binary
-        run: tar -cf agent-${{matrix.architecture}}.tar -C output-${{matrix.architecture}} . && rm -rf output-${{matrix.architecture}}
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: agent-${{matrix.architecture}}.tar
-          path: agent-${{matrix.architecture}}.tar
-

.github/workflows/pr-description.yaml

@@ -2,11 +2,6 @@ name: Autofill PR description
 
 on: pull_request
 
-env:
-  ORGANIZATION: uugai
-  PROJECT: ${{ github.event.repository.name }}
-  PR_NUMBER: ${{ github.event.number }}
-  
 jobs:
   openai-pr-description:
     runs-on: ubuntu-22.04
@@ -21,6 +16,4 @@ jobs:
           azure_openai_api_key: ${{ secrets.AZURE_OPENAI_API_KEY }}
           azure_openai_endpoint: ${{ secrets.AZURE_OPENAI_ENDPOINT }}
           azure_openai_version: ${{ secrets.AZURE_OPENAI_VERSION }}
-          openai_model: ${{ secrets.OPENAI_MODEL }}
-          pull_request_url: https://pr${{ env.PR_NUMBER }}.api.kerberos.lol
           overwrite_description: true

.github/workflows/release-create.yml

@@ -1,130 +0,0 @@
-name: Create a new release
-on:
-  release:
-    types: [created]
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: "Tag for the Docker image"
-        required: true
-        default: "test"
-
-env:
-  REPO: kerberos/agent
-
-jobs:
-  build-amd64:
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: write
-    strategy:
-      matrix:
-        architecture: [amd64]
-    steps:
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Checkout
-        uses: actions/checkout@v3
-      - uses: benjlevesque/short-sha@v2.1
-        id: short-sha
-        with:
-          length: 7
-      - name: Run Build
-        run: |
-          docker build -t ${{matrix.architecture}} .
-          CID=$(docker create ${{matrix.architecture}})
-          docker cp ${CID}:/home/agent ./output-${{matrix.architecture}}
-          docker rm ${CID}
-      - name: Strip binary
-        run: tar -cf agent-${{matrix.architecture}}.tar -C output-${{matrix.architecture}} . && rm -rf output-${{matrix.architecture}}
-      - name: Build and push Docker image
-        run: |
-          docker tag ${{matrix.architecture}} $REPO-arch:arch-${{matrix.architecture}}-${{github.event.inputs.tag || github.ref_name}}
-          docker push $REPO-arch:arch-${{matrix.architecture}}-${{github.event.inputs.tag || github.ref_name}}
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: agent-${{matrix.architecture}}.tar
-          path: agent-${{matrix.architecture}}.tar
-          
-  build-arm64:
-    runs-on: ubuntu-24.04-arm 
-    permissions:
-      contents: write
-    strategy:
-      matrix:
-        architecture: [arm64]
-    steps:
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Checkout
-        uses: actions/checkout@v3
-      - uses: benjlevesque/short-sha@v2.1
-        id: short-sha
-        with:
-          length: 7
-      - name: Run Build
-        run: |
-          docker build -t ${{matrix.architecture}} -f Dockerfile.arm64 .
-          CID=$(docker create ${{matrix.architecture}})
-          docker cp ${CID}:/home/agent ./output-${{matrix.architecture}}
-          docker rm ${CID}
-      - name: Strip binary
-        run: tar -cf agent-${{matrix.architecture}}.tar -C output-${{matrix.architecture}} . && rm -rf output-${{matrix.architecture}}
-      - name: Build and push Docker image
-        run: |
-          docker tag ${{matrix.architecture}} $REPO-arch:arch-${{matrix.architecture}}-${{github.event.inputs.tag || github.ref_name}}
-          docker push $REPO-arch:arch-${{matrix.architecture}}-${{github.event.inputs.tag || github.ref_name}}
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: agent-${{matrix.architecture}}.tar
-          path: agent-${{matrix.architecture}}.tar
-
-  create-manifest:
-    runs-on: ubuntu-24.04
-    needs: [build-amd64, build-arm64]
-    steps:
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Create and push multi-arch manifest
-        run: |
-          docker manifest create $REPO:${{ github.event.inputs.tag || github.ref_name }} \
-            $REPO-arch:arch-amd64-${{github.event.inputs.tag || github.ref_name}} \
-            $REPO-arch:arch-arm64-${{github.event.inputs.tag || github.ref_name}}
-          docker manifest push $REPO:${{ github.event.inputs.tag || github.ref_name }}
-      - name: Create and push latest manifest
-        run: |
-          docker manifest create $REPO:latest \
-            $REPO-arch:arch-amd64-${{github.event.inputs.tag || github.ref_name}} \
-            $REPO-arch:arch-arm64-${{github.event.inputs.tag || github.ref_name}}
-          docker manifest push $REPO:latest
-        if: github.event.inputs.tag == 'test'
-
-  create-release:
-    runs-on: ubuntu-24.04
-    needs: [build-amd64, build-arm64]
-    permissions:
-      contents: write
-    steps:
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-      - name: Create a release
-        uses: ncipollo/release-action@v1
-        with:
-          latest: true
-          allowUpdates: true
-          name: ${{ github.event.inputs.tag || github.ref_name }}
-          tag: ${{ github.event.inputs.tag || github.ref_name }}
-          generateReleaseNotes: false
-          omitBodyDuringUpdate: true
-          artifacts: "agent-*.tar/agent-*.tar"

.gitignore

@@ -1,8 +1,6 @@
 ui/node_modules
 ui/build
 ui/public/assets/env.js
-.DS_Store
-__debug*
 .idea
 machinery/www
 yarn.lock
@@ -12,6 +10,6 @@ machinery/data/recordings
 machinery/data/snapshots
 machinery/test*
 machinery/init-dev.sh
-machinery/.env.local
+machinery/.env
 machinery/vendor
 deployments/docker/private-docker-compose.yaml

.travis.yml

@@ -0,0 +1,19 @@
+language: go
+
+go:
+  - 1.12.x
+  - 1.13.x
+  - 1.14.x
+  - 1.15.x
+  - tip
+
+before_install:
+  - cd machinery
+  - go mod download
+
+script:
+  - go vet
+  - go test -race -coverprofile=coverage.txt -covermode=atomic
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

.vscode/launch.json

@@ -12,11 +12,9 @@
             "program": "${workspaceFolder}/machinery/main.go",
             "args": [
                 "-action",
-                "run",
-                "-port",
-                "8080"
+                "run"
             ],
-            "envFile": "${workspaceFolder}/machinery/.env.local",
+            "envFile": "${workspaceFolder}/machinery/.env",
             "buildFlags": "--tags dynamic",
         },
         {

Dockerfile

@@ -1,7 +1,6 @@
 
-ARG BASE_IMAGE_VERSION=amd64-ddbe40e
-FROM kerberos/base:${BASE_IMAGE_VERSION} AS build-machinery
-LABEL AUTHOR=uug.ai
+FROM kerberos/base:5d5e86b AS build-machinery
+LABEL AUTHOR=Kerberos.io
 
 ENV GOROOT=/usr/local/go
 ENV GOPATH=/go
@@ -44,7 +43,8 @@ RUN cd /go/src/github.com/kerberos-io/agent/machinery && \
 	mkdir -p /agent/data/log && \
 	mkdir -p /agent/data/recordings && \
 	mkdir -p /agent/data/capture-test && \
-	mkdir -p /agent/data/config
+	mkdir -p /agent/data/config && \
+	rm -rf /go/src/gitlab.com/
 
 ####################################
 # Let's create a /dist folder containing just the files necessary for runtime.
@@ -58,6 +58,18 @@ RUN cp -r /agent ./
 
 RUN /dist/agent/main version
 
+###############################################
+# Build Bento4 -> we want fragmented mp4 files
+
+ENV BENTO4_VERSION 1.6.0-639
+RUN cd /tmp && git clone https://github.com/axiomatic-systems/Bento4 && cd Bento4 && \
+	git checkout tags/v${BENTO4_VERSION} && \
+	cd Build && \
+	cmake -DCMAKE_BUILD_TYPE=Release .. && \
+	make && \
+	mv /tmp/Bento4/Build/mp4fragment /dist/agent/ && \
+	rm -rf /tmp/Bento4
+
 FROM node:18.14.0-alpine3.16 AS build-ui
 
 RUN apk update && apk upgrade --available && sync
@@ -99,6 +111,7 @@ RUN apk update && apk add ca-certificates curl libstdc++ libc6-compat --no-cache
 # Try running agent
 
 RUN mv /agent/* /home/agent/
+RUN cp /home/agent/mp4fragment /usr/local/bin/
 RUN /home/agent/main version
 
 #######################
@@ -135,4 +148,4 @@ HEALTHCHECK CMD curl --fail http://localhost:80 || exit 1
 # Leeeeettttt'ssss goooooo!!!
 # Run the shizzle from the right working directory.
 WORKDIR /home/agent
-CMD ["./main", "-action", "run", "-port", "80"]
+CMD ["./main", "-action", "run", "-port", "80"]

Dockerfile.arm64

@@ -1,138 +0,0 @@
-
-ARG BASE_IMAGE_VERSION=arm64-ddbe40e
-FROM kerberos/base:${BASE_IMAGE_VERSION} AS build-machinery
-LABEL AUTHOR=uug.ai
-
-ENV GOROOT=/usr/local/go
-ENV GOPATH=/go
-ENV PATH=$GOPATH/bin:$GOROOT/bin:/usr/local/lib:$PATH
-ENV GOSUMDB=off
-
-##########################################
-# Installing some additional dependencies.
-
-RUN apt-get upgrade -y && apt-get update && apt-get install -y --fix-missing --no-install-recommends \
-	git build-essential cmake pkg-config unzip libgtk2.0-dev \
-	curl ca-certificates libcurl4-openssl-dev libssl-dev libjpeg62-turbo-dev && \
-	rm -rf /var/lib/apt/lists/*
-
-##############################################################################
-# Copy all the relevant source code in the Docker image, so we can build this.
-
-RUN mkdir -p /go/src/github.com/kerberos-io/agent
-COPY machinery /go/src/github.com/kerberos-io/agent/machinery
-RUN rm -rf /go/src/github.com/kerberos-io/agent/machinery/.env
-
-##################################################################
-# Get the latest commit hash, so we know which version we're running
-COPY .git /go/src/github.com/kerberos-io/agent/.git
-RUN cd /go/src/github.com/kerberos-io/agent/.git && git log --format="%H" -n 1 | head -c7 > /go/src/github.com/kerberos-io/agent/machinery/version
-RUN cat /go/src/github.com/kerberos-io/agent/machinery/version
-
-##################
-# Build Machinery
-
-RUN cd /go/src/github.com/kerberos-io/agent/machinery && \
-	go mod download && \
-	go build -tags timetzdata,netgo,osusergo --ldflags '-s -w -extldflags "-static -latomic"' main.go && \
-	mkdir -p /agent && \
-	mv main /agent && \
-	mv version /agent && \
-	mv data /agent && \
-	mkdir -p /agent/data/cloud && \
-	mkdir -p /agent/data/snapshots && \
-	mkdir -p /agent/data/log && \
-	mkdir -p /agent/data/recordings && \
-	mkdir -p /agent/data/capture-test && \
-	mkdir -p /agent/data/config
-
-####################################
-# Let's create a /dist folder containing just the files necessary for runtime.
-# Later, it will be copied as the / (root) of the output image.
-
-WORKDIR /dist
-RUN cp -r /agent ./
-
-####################################################################################
-# This will collect dependent libraries so they're later copied to the final image.
-
-RUN /dist/agent/main version
-
-FROM node:18.14.0-alpine3.16 AS build-ui
-
-RUN apk update && apk upgrade --available && sync
-
-########################
-# Build Web (React app)
-
-RUN mkdir -p /go/src/github.com/kerberos-io/agent/machinery/www
-COPY ui /go/src/github.com/kerberos-io/agent/ui
-RUN cd /go/src/github.com/kerberos-io/agent/ui && rm -rf yarn.lock && yarn config set network-timeout 300000 && \
-	yarn && yarn build
-
-####################################
-# Let's create a /dist folder containing just the files necessary for runtime.
-# Later, it will be copied as the / (root) of the output image.
-
-WORKDIR /dist
-RUN mkdir -p ./agent && cp -r /go/src/github.com/kerberos-io/agent/machinery/www ./agent/
-
-############################################
-# Publish main binary to GitHub release
-
-FROM alpine:latest
-
-############################
-# Protect by non-root user.
-
-RUN addgroup -S kerberosio && adduser -S agent -G kerberosio && addgroup agent video
-
-#################################
-# Copy files from previous images
-
-COPY --chown=0:0 --from=build-machinery /dist /
-COPY --chown=0:0 --from=build-ui /dist /
-
-RUN apk update && apk add ca-certificates curl libstdc++ libc6-compat --no-cache && rm -rf /var/cache/apk/*
-
-##################
-# Try running agent
-
-RUN mv /agent/* /home/agent/
-RUN /home/agent/main version
-
-#######################
-# Make template config
-
-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
-RUN apk add libcap && setcap 'cap_net_bind_service=+ep' /home/agent/main
-
-###################
-# Run non-root user
-
-USER agent
-
-######################################
-# By default the app runs on port 80
-
-EXPOSE 80
-
-######################################
-# Check if agent is still running
-
-HEALTHCHECK CMD curl --fail http://localhost:80 || exit 1   
-
-###################################################
-# Leeeeettttt'ssss goooooo!!!
-# Run the shizzle from the right working directory.
-WORKDIR /home/agent
-CMD ["./main", "-action", "run", "-port", "80"]

README.md

@@ -190,78 +190,68 @@ Next to attaching the configuration file, it is also possible to override the co
 
 | Name                                    | Description                                                                                     | Default Value                  |
 | --------------------------------------- | ----------------------------------------------------------------------------------------------- | ------------------------------ |
-| `LOG_LEVEL`                                 | Level for logging, could be "info", "warning", "debug", "error" or "fatal".                     | "info"                         |
-| `LOG_OUTPUT`                                | Logging output format "json" or "text".                                                         | "text"                         |
-| `AGENT_MODE`                                | You can choose to run this in 'release' for production, and or 'demo' for showcasing.           | "release"                      |
-| `AGENT_TLS_INSECURE`                        | Specify if you want to use `InsecureSkipVerify` for the internal HTTP client.                   | "false"                        |
-| `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_BASE_WIDTH`         | Force a specific width resolution for live view processing.                                     | ""                             |
-| `AGENT_CAPTURE_IPCAMERA_BASE_HEIGHT`        | Force a specific height resolution for live view processing.                                    | ""                             |
-| `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_MOTION`                      | Toggle for enabling or disabling motion.                                                        | "true"                         |
-| `AGENT_CAPTURE_LIVEVIEW`                    | Toggle for enabling or disabling liveview.                                                      | "true"                         |
-| `AGENT_CAPTURE_SNAPSHOTS`                   | Toggle for enabling or disabling snapshot generation.                                           | "true"                         |
-| `AGENT_CAPTURE_RECORDING`                   | Toggle for enabling making recordings.                                                          | "true"                         |
-| `AGENT_CAPTURE_CONTINUOUS`                  | Toggle for enabling continuous "true" or motion "false".                                        | "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`                            | An 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_REALTIME_PROCESSING`                 | If `AGENT_REALTIME_PROCESSING` set to `true`, the agent will send key frames to the topic       | ""                             |
-| `AGENT_REALTIME_PROCESSING_TOPIC`           | The topic to which keyframes will be sent in base64 encoded format.                             | ""                             |
-| `AGENT_STUN_URI`                            | When using WebRTC, you'll need to provide a STUN server.                                        | "stun:turn.kerberos.io:8443"   |
-| `AGENT_FORCE_TURN`                          | Force using a TURN server, by generating relay candidates only.                                 | "false"                        |
-| `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_ENCRYPTION`                      | Turning on/off encryption of traffic from your Kerberos Agent to Kerberos Hub.                  | "true"                         |
-| `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 Kerberos vault, where the recordings will be stored.                      | ""                             |
-| `AGENT_KERBEROSVAULT_SECONDARY_URI`         | The Kerberos Vault API url.                                                                     | "https://vault.domain.com/api" |
-| `AGENT_KERBEROSVAULT_SECONDARY_ACCESS_KEY`  | The access key of a secondary Kerberos Vault account.                                           | ""                             |
-| `AGENT_KERBEROSVAULT_SECONDARY_SECRET_KEY`  | The secret key of a secondary Kerberos Vault account.                                           | ""                             |
-| `AGENT_KERBEROSVAULT_SECONDARY_PROVIDER`    | A secondary Kerberos Vault provider you have created (optional).                                | ""                             |
-| `AGENT_KERBEROSVAULT_SECONDARY_DIRECTORY`   | The directory, in the secondary Kerberos vault, where the recordings will be stored.            | ""                             |
-| `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 Dropbox, where the recordings will be stored.                                 | ""                             |
-| `AGENT_ENCRYPTION`                          | Enable 'true' or disable 'false' end-to-end encryption for MQTT messages.                       | "false"                        |
-| `AGENT_ENCRYPTION_RECORDINGS`               | Enable 'true' or disable 'false' end-to-end encryption for recordings.                          | "false"                        |
-| `AGENT_ENCRYPTION_FINGERPRINT`              | The fingerprint of the keypair (public/private keys), so you know which one to use.             | ""                             |
-| `AGENT_ENCRYPTION_PRIVATE_KEY`              | The private key (assymetric/RSA) to decrypt and sign requests send over MQTT.                   | ""                             |
-| `AGENT_ENCRYPTION_SYMMETRIC_KEY`            | The symmetric key (AES) to encrypt and decrypt requests sent over MQTT.                         | ""                             |
-| `AGENT_SIGNING`                             | Enable 'true' or disable 'false' for signing recordings.                                        | "true"                         |
-| `AGENT_SIGNING_PRIVATE_KEY`                 | The private key (RSA) to sign the recordings fingerprint to validate origin.                    | "" - uses default one if empty |
-
+| `LOG_LEVEL`                             | Level for logging, could be "info", "warning", "debug", "error" or "fatal".                     | "info"                         |
+| `LOG_OUTPUT`                            | Logging output format "json" or "text".                                                         | "text"                         |
+| `AGENT_MODE`                            | You can choose to run this in 'release' for production, and or 'demo' for showcasing.           | "release"                      |
+| `AGENT_TLS_INSECURE`                    | Specify if you want to use `InsecureSkipVerify` for the internal HTTP client.                   | "false"                        |
+| `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_MOTION`                  | Toggle for enabling or disabling motion.                                                        | "true"                         |
+| `AGENT_CAPTURE_LIVEVIEW`                | Toggle for enabling or disabling liveview.                                                      | "true"                         |
+| `AGENT_CAPTURE_SNAPSHOTS`               | Toggle for enabling or disabling snapshot generation.                                           | "true"                         |
+| `AGENT_CAPTURE_RECORDING`               | Toggle for enabling making recordings.                                                          | "true"                         |
+| `AGENT_CAPTURE_CONTINUOUS`              | Toggle for enabling continuous "true" or motion "false".                                        | "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`                        | An 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_REALTIME_PROCESSING`             | If `AGENT_REALTIME_PROCESSING` set to `true`, the agent will send key frames to the topic       | ""                             |
+| `AGENT_REALTIME_PROCESSING_TOPIC`       | The topic to which keyframes will be sent in base64 encoded format.                             | ""                             |
+| `AGENT_STUN_URI`                        | When using WebRTC, you'll need to provide a STUN server.                                        | "stun:turn.kerberos.io:8443"   |
+| `AGENT_FORCE_TURN`                      | Force using a TURN server, by generating relay candidates only.                                 | "false"                        |
+| `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_ENCRYPTION`                  | Turning on/off encryption of traffic from your Kerberos Agent to Kerberos Hub.                  | "true"                         |
+| `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 Kerberos vault, where the recordings will be stored.                      | ""                             |
+| `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 Dropbox, where the recordings will be stored.                                 | ""                             |
+| `AGENT_ENCRYPTION`                      | Enable 'true' or disable 'false' end-to-end encryption for MQTT messages.                       | "false"                        |
+| `AGENT_ENCRYPTION_RECORDINGS`           | Enable 'true' or disable 'false' end-to-end encryption for recordings.                          | "false"                        |
+| `AGENT_ENCRYPTION_FINGERPRINT`          | The fingerprint of the keypair (public/private keys), so you know which one to use.             | ""                             |
+| `AGENT_ENCRYPTION_PRIVATE_KEY`          | The private key (assymetric/RSA) to decrypt and sign requests send over MQTT.                   | ""                             |
+| `AGENT_ENCRYPTION_SYMMETRIC_KEY`        | The symmetric key (AES) to encrypt and decrypt requests sent over MQTT.                         | ""                             |
 
 ## Encryption
 
@@ -423,7 +413,7 @@ Read more about this [at the FAQ](#faq) below.
 
 ## Contributors
 
-This project exists thanks to all the people who contribute. Bravo!
+This project exists thanks to all the people who contribute.
 
 <a href="https://github.com/kerberos-io/agent/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=kerberos-io/agent" />

build.sh

@@ -0,0 +1,10 @@
+export version=0.0.1
+export name=agent
+
+docker build -t $name .
+
+docker tag $name kerberos/$name:$version
+docker push kerberos/$name:$version
+
+docker tag $name kerberos/$name:latest
+docker push kerberos/$name:latest

deployments/docker/README.md

@@ -41,7 +41,7 @@ You attach a volume to your container by leveraging the `-v` option. To mount yo
 
 ### Override with environment variables
 
-Next to attaching the configuration file, it is also possible to override the configuration with environment variables. This makes deployments when leveraging `docker compose` or `kubernetes` much easier and more scalable. Using this approach we simplify automation through `ansible` and `terraform`. You'll find [the full list of environment variables on the main README.md file](https://github.com/kerberos-io/agent#override-with-environment-variables).
+Next to attaching the configuration file, it is also possible to override the configuration with environment variables. This makes deployments easier when leveraging `docker compose` or `kubernetes` deployments much easier and scalable. Using this approach we simplify automation through `ansible` and `terraform`. You'll find [the full list of environment variables on the main README.md file](https://github.com/kerberos-io/agent#override-with-environment-variables).
 
 ### 2. Running multiple containers with Docker compose
 

machinery/.env

@@ -1,31 +0,0 @@
-AGENT_NAME=camera-name
-AGENT_KEY=uniq-camera-id
-AGENT_TIMEZONE=Europe/Brussels
-#AGENT_CAPTURE_CONTINUOUS=true
-#AGENT_CAPTURE_IPCAMERA_RTSP=rtsp://fake.kerberos.io/stream
-#AGENT_CAPTURE_IPCAMERA_SUB_RTSP=rtsp://fake.kerberos.io/stream
-AGENT_CAPTURE_IPCAMERA_ONVIF_XADDR=x.x.x.x
-AGENT_CAPTURE_IPCAMERA_ONVIF_USERNAME=xxx
-AGENT_CAPTURE_IPCAMERA_ONVIF_PASSWORD=xxx
-AGENT_HUB_URI=https://api.cloud.kerberos.io
-AGENT_HUB_KEY=AKIXxxx4JBEI
-AGENT_HUB_PRIVATE_KEY=DIOXxxxAlYpaxxxxXioL0txxx
-AGENT_HUB_SITE=681xxxxxxx9bcda5
-
-# By default will send to Hub (=S3), if you wish to send to Kerberos Vault, set to "kstorage"
-AGENT_CLOUD=s3
-AGENT_KERBEROSVAULT_URI=
-AGENT_KERBEROSVAULT_PROVIDER=
-AGENT_KERBEROSVAULT_DIRECTORY=
-AGENT_KERBEROSVAULT_ACCESS_KEY=
-AGENT_KERBEROSVAULT_SECRET_KEY=
-AGENT_KERBEROSVAULT_MAX_RETRIES=10
-AGENT_KERBEROSVAULT_TIMEOUT=120
-AGENT_KERBEROSVAULT_SECONDARY_URI=
-AGENT_KERBEROSVAULT_SECONDARY_PROVIDER=
-AGENT_KERBEROSVAULT_SECONDARY_DIRECTORY=
-AGENT_KERBEROSVAULT_SECONDARY_ACCESS_KEY=
-AGENT_KERBEROSVAULT_SECONDARY_SECRET_KEY=
-
-# Open telemetry tracing endpoint
-OTEL_EXPORTER_OTLP_ENDPOINT=

machinery/data/config/config.json

@@ -14,9 +14,7 @@
 		"ipcamera": {
 			"rtsp": "",
 			"sub_rtsp": "",
-			"fps": "",
-			"base_width": 640,
-			"base_height": 0
+			"fps": ""
 		},
 		"usbcamera": {
 			"device": ""
@@ -28,7 +26,6 @@
 		"recording": "true",
 		"snapshots": "true",
 		"liveview": "true",
-		"liveview_chunking": "false",
 		"motion": "true",
 		"postrecording": 20,
 		"prerecording": 10,
@@ -101,7 +98,6 @@
 		"region": "eu-west-1"
 	},
 	"kstorage": {},
-	"kstorage_secondary": {},
 	"dropbox": {},
 	"mqtturi": "tcp://mqtt.kerberos.io:1883",
 	"mqtt_username": "",
@@ -119,7 +115,6 @@
 	"hub_site": "",
 	"condition_uri": "",
 	"encryption": {},
-	"signing": {},
 	"realtimeprocessing": "false",
 	"realtimeprocessing_topic": ""
 }

machinery/go.mod

@@ -1,115 +1,147 @@
 module github.com/kerberos-io/agent/machinery
 
-go 1.24.2
-
-replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20250519155744-55703ea1f237
+go 1.23.1
 
 require (
-	github.com/Eyevinn/mp4ff v0.48.0
 	github.com/InVisionApp/conjungo v1.1.0
-	github.com/appleboy/gin-jwt/v2 v2.10.3
-	github.com/bluenviron/gortsplib/v4 v4.14.1
-	github.com/bluenviron/mediacommon v1.14.0
+	github.com/appleboy/gin-jwt/v2 v2.10.1
+	github.com/bluenviron/gortsplib/v4 v4.12.1
+	github.com/bluenviron/mediacommon v1.13.3
 	github.com/cedricve/go-onvif v0.0.0-20200222191200-567e8ce298f6
-	github.com/dromara/carbon/v2 v2.6.8
+	github.com/dromara/carbon/v2 v2.5.2
 	github.com/dropbox/dropbox-sdk-go-unofficial/v6 v6.0.5
 	github.com/eclipse/paho.mqtt.golang v1.5.0
-	github.com/elastic/go-sysinfo v1.15.3
-	github.com/gin-contrib/cors v1.7.5
-	github.com/gin-contrib/pprof v1.5.3
-	github.com/gin-gonic/contrib v0.0.0-20250521004450-2b1292699c15
-	github.com/gin-gonic/gin v1.10.1
+	github.com/elastic/go-sysinfo v1.15.0
+	github.com/gin-contrib/cors v1.7.3
+	github.com/gin-contrib/pprof v1.5.2
+	github.com/gin-gonic/contrib v0.0.0-20241229022435-d12709533de6
+	github.com/gin-gonic/gin v1.10.0
 	github.com/gofrs/uuid v4.4.0+incompatible
-	github.com/golang-jwt/jwt/v4 v4.5.2
+	github.com/golang-jwt/jwt/v4 v4.5.1
 	github.com/gorilla/websocket v1.5.3
 	github.com/kellydunn/golang-geo v0.7.0
 	github.com/kerberos-io/joy4 v1.0.64
 	github.com/kerberos-io/onvif v1.0.0
 	github.com/minio/minio-go/v6 v6.0.57
-	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
-	github.com/pion/interceptor v0.1.40
-	github.com/pion/rtp v1.8.19
-	github.com/pion/webrtc/v4 v4.1.2
+	github.com/pion/rtp v1.8.10
+	github.com/pion/webrtc/v4 v4.0.7
 	github.com/sirupsen/logrus v1.9.3
 	github.com/swaggo/files v1.0.1
 	github.com/swaggo/gin-swagger v1.6.0
 	github.com/swaggo/swag v1.16.4
 	github.com/tevino/abool v1.2.0
+	github.com/yapingcat/gomedia v0.0.0-20240906162731-17feea57090c
 	github.com/zaf/g711 v1.4.0
-	go.mongodb.org/mongo-driver v1.17.3
-	go.opentelemetry.io/otel v1.36.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0
-	go.opentelemetry.io/otel/sdk v1.36.0
-	go.opentelemetry.io/otel/trace v1.36.0
+	go.mongodb.org/mongo-driver v1.17.1
+	gopkg.in/DataDog/dd-trace-go.v1 v1.70.1
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 )
 
 require (
+	github.com/DataDog/appsec-internal-go v1.9.0 // indirect
+	github.com/DataDog/datadog-agent/pkg/obfuscate v0.58.0 // indirect
+	github.com/DataDog/datadog-agent/pkg/proto v0.58.0 // indirect
+	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.58.0 // indirect
+	github.com/DataDog/datadog-agent/pkg/trace v0.58.0 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/log v0.58.0 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.58.0 // indirect
+	github.com/DataDog/datadog-go/v5 v5.5.0 // indirect
+	github.com/DataDog/go-libddwaf/v3 v3.5.1 // indirect
+	github.com/DataDog/go-runtime-metrics-internal v0.0.0-20241106155157-194426bbbd59 // indirect
+	github.com/DataDog/go-sqllexer v0.0.14 // indirect
+	github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
+	github.com/DataDog/gostackparse v0.7.0 // indirect
+	github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.20.0 // indirect
+	github.com/DataDog/sketches-go v1.4.5 // indirect
 	github.com/KyleBanks/depth v1.2.1 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/beevik/etree v1.2.0 // indirect
-	github.com/bluenviron/mediacommon/v2 v2.2.0 // indirect
-	github.com/bytedance/sonic v1.13.2 // indirect
-	github.com/bytedance/sonic/loader v0.2.4 // indirect
-	github.com/cenkalti/backoff/v5 v5.0.2 // indirect
+	github.com/bytedance/sonic v1.12.6 // indirect
+	github.com/bytedance/sonic/loader v0.2.1 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
 	github.com/clbanning/mxj v1.8.4 // indirect
 	github.com/clbanning/mxj/v2 v2.7.0 // indirect
-	github.com/cloudwego/base64x v0.1.5 // indirect
-	github.com/elastic/go-windows v1.0.2 // indirect
+	github.com/cloudwego/base64x v0.1.4 // indirect
+	github.com/cloudwego/iasm v0.2.0 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4 // indirect
+	github.com/ebitengine/purego v0.6.0-alpha.5 // indirect
+	github.com/elastic/go-windows v1.0.0 // indirect
 	github.com/elgs/gostrgen v0.0.0-20161222160715-9d61ae07eeae // indirect
 	github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
-	github.com/gin-contrib/sse v1.0.0 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.7 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.19.6 // indirect
 	github.com/go-openapi/spec v0.20.4 // indirect
 	github.com/go-openapi/swag v0.19.15 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.26.0 // indirect
-	github.com/goccy/go-json v0.10.5 // indirect
+	github.com/go-playground/validator/v10 v10.23.0 // indirect
+	github.com/goccy/go-json v0.10.4 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
+	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 // indirect
+	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
+	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
 	github.com/icholy/digest v0.1.23 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/juju/errors v1.0.0 // indirect
-	github.com/klauspost/compress v1.16.7 // indirect
+	github.com/klauspost/compress v1.17.1 // indirect
 	github.com/klauspost/cpuid v1.2.3 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
 	github.com/kylelemons/go-gypsy v1.0.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
-	github.com/lib/pq v1.10.9 // indirect
-	github.com/mailru/easyjson v0.7.6 // indirect
+	github.com/lib/pq v1.10.2 // indirect
+	github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/minio/md5-simd v1.1.0 // indirect
 	github.com/minio/sha256-simd v0.1.1 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/nxadm/tail v1.4.11 // indirect
+	github.com/outcaste-io/ristretto v0.2.3 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect
 	github.com/pion/datachannel v1.5.10 // indirect
-	github.com/pion/dtls/v3 v3.0.6 // indirect
-	github.com/pion/ice/v4 v4.0.10 // indirect
-	github.com/pion/logging v0.2.3 // indirect
+	github.com/pion/dtls/v3 v3.0.4 // indirect
+	github.com/pion/ice/v4 v4.0.3 // indirect
+	github.com/pion/interceptor v0.1.37 // indirect
+	github.com/pion/logging v0.2.2 // indirect
 	github.com/pion/mdns/v2 v2.0.7 // indirect
 	github.com/pion/randutil v0.1.0 // indirect
 	github.com/pion/rtcp v1.2.15 // indirect
-	github.com/pion/sctp v1.8.39 // indirect
-	github.com/pion/sdp/v3 v3.0.13 // indirect
-	github.com/pion/srtp/v3 v3.0.5 // indirect
+	github.com/pion/sctp v1.8.35 // indirect
+	github.com/pion/sdp/v3 v3.0.9 // indirect
+	github.com/pion/srtp/v3 v3.0.4 // indirect
 	github.com/pion/stun/v3 v3.0.0 // indirect
 	github.com/pion/transport/v3 v3.0.7 // indirect
 	github.com/pion/turn/v4 v4.0.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/richardartoul/molecule v1.0.1-0.20240531184615-7ca0df43c0b3 // indirect
+	github.com/ryanuber/go-glob v1.0.0 // indirect
+	github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect
+	github.com/shirou/gopsutil/v3 v3.24.4 // indirect
+	github.com/shoenig/go-m1cpu v0.1.6 // indirect
+	github.com/spaolacci/murmur3 v1.1.0 // indirect
+	github.com/tinylib/msgp v1.2.1 // indirect
+	github.com/tklauser/go-sysconf v0.3.12 // indirect
+	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/wlynxg/anet v0.0.5 // indirect
@@ -117,23 +149,34 @@ require (
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	github.com/ziutek/mymysql v1.5.4 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/otel/metric v1.36.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.6.0 // indirect
-	golang.org/x/arch v0.16.0 // indirect
-	golang.org/x/crypto v0.38.0 // indirect
-	golang.org/x/net v0.40.0 // indirect
-	golang.org/x/oauth2 v0.30.0 // indirect
-	golang.org/x/sync v0.14.0 // indirect
-	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/text v0.25.0 // indirect
-	golang.org/x/tools v0.30.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
-	google.golang.org/grpc v1.72.1 // indirect
-	google.golang.org/protobuf v1.36.6 // indirect
-	gopkg.in/ini.v1 v1.42.0 // indirect
+	go.opentelemetry.io/collector/component v0.104.0 // indirect
+	go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect
+	go.opentelemetry.io/collector/pdata v1.11.0 // indirect
+	go.opentelemetry.io/collector/semconv v0.104.0 // indirect
+	go.opentelemetry.io/otel v1.27.0 // indirect
+	go.opentelemetry.io/otel/metric v1.27.0 // indirect
+	go.opentelemetry.io/otel/trace v1.27.0 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/arch v0.12.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/mod v0.20.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/oauth2 v0.18.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/time v0.6.0 // indirect
+	golang.org/x/tools v0.24.0 // indirect
+	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect
+	google.golang.org/grpc v1.64.0 // indirect
+	google.golang.org/protobuf v1.36.1 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect

machinery/main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"flag"
-	"fmt"
 	"os"
 	"time"
 
@@ -12,61 +11,47 @@ import (
 	"github.com/kerberos-io/agent/machinery/src/log"
 	"github.com/kerberos-io/agent/machinery/src/models"
 	"github.com/kerberos-io/agent/machinery/src/onvif"
-	"go.opentelemetry.io/otel"
-	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
-	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
-	"go.opentelemetry.io/otel/sdk/resource"
-	"go.opentelemetry.io/otel/sdk/trace"
-	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
 
 	configService "github.com/kerberos-io/agent/machinery/src/config"
 	"github.com/kerberos-io/agent/machinery/src/routers"
 	"github.com/kerberos-io/agent/machinery/src/utils"
+	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
+	"gopkg.in/DataDog/dd-trace-go.v1/profiler"
 )
 
 var VERSION = utils.VERSION
 
-func startTracing(agentKey string, otelEndpoint string) (*trace.TracerProvider, error) {
-	serviceName := "agent-" + agentKey
-	headers := map[string]string{
-		"content-type": "application/json",
-	}
-
-	exporter, err := otlptrace.New(
-		context.Background(),
-		otlptracehttp.NewClient(
-			otlptracehttp.WithEndpoint(otelEndpoint),
-			otlptracehttp.WithHeaders(headers),
-			otlptracehttp.WithInsecure(),
-		),
-	)
-	if err != nil {
-		return nil, fmt.Errorf("creating new exporter: %w", err)
-	}
-
-	tracerprovider := trace.NewTracerProvider(
-		trace.WithBatcher(
-			exporter,
-			trace.WithMaxExportBatchSize(trace.DefaultMaxExportBatchSize),
-			trace.WithBatchTimeout(trace.DefaultScheduleDelay*time.Millisecond),
-			trace.WithMaxExportBatchSize(trace.DefaultMaxExportBatchSize),
-		),
-		trace.WithResource(
-			resource.NewWithAttributes(
-				semconv.SchemaURL,
-				semconv.ServiceNameKey.String(serviceName),
-				attribute.String("environment", "develop"),
-			),
-		),
-	)
-
-	otel.SetTracerProvider(tracerprovider)
-
-	return tracerprovider, nil
-}
-
 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" {
+			tracer.Start()
+			defer tracer.Stop()
+		} else {
+			service := os.Getenv("DATADOG_AGENT_SERVICE")
+			environment := os.Getenv("DATADOG_AGENT_ENVIRONMENT")
+			log.Log.Info("Starting Datadog Agent with service: " + service + " and environment: " + environment)
+			rules := []tracer.SamplingRule{tracer.RateRule(1)}
+			tracer.Start(
+				tracer.WithSamplingRules(rules),
+				tracer.WithService(service),
+				tracer.WithEnv(environment),
+			)
+			defer tracer.Stop()
+			err := profiler.Start(
+				profiler.WithService(service),
+				profiler.WithEnv(environment),
+				profiler.WithProfileTypes(
+					profiler.CPUProfile,
+					profiler.HeapProfile,
+				),
+			)
+			if err != nil {
+				log.Log.Fatal(err.Error())
+			}
+			defer profiler.Stop()
+		}
+	}
 
 	// Start the show ;)
 	// We'll parse the flags (named variables), and start the agent.
@@ -101,39 +86,35 @@ func main() {
 	switch action {
 
 	case "version":
-		{
-			log.Log.Info("main.Main(): You are currrently running Kerberos Agent " + VERSION)
-		}
+		log.Log.Info("main.Main(): You are currrently running Kerberos Agent " + VERSION)
+
 	case "discover":
-		{
-			// Convert duration to int
-			timeout, err := time.ParseDuration(timeout + "ms")
-			if err != nil {
-				log.Log.Fatal("main.Main(): could not parse timeout: " + err.Error())
-				return
-			}
-			onvif.Discover(timeout)
+		// Convert duration to int
+		timeout, err := time.ParseDuration(timeout + "ms")
+		if err != nil {
+			log.Log.Fatal("main.Main(): could not parse timeout: " + err.Error())
+			return
 		}
+		onvif.Discover(timeout)
+
 	case "decrypt":
-		{
-			log.Log.Info("main.Main(): Decrypting: " + flag.Arg(0) + " with key: " + flag.Arg(1))
-			symmetricKey := []byte(flag.Arg(1))
+		log.Log.Info("main.Main(): Decrypting: " + flag.Arg(0) + " with key: " + flag.Arg(1))
+		symmetricKey := []byte(flag.Arg(1))
 
-			if len(symmetricKey) == 0 {
-				log.Log.Fatal("main.Main(): symmetric key should not be empty")
-				return
-			}
-			if len(symmetricKey) != 32 {
-				log.Log.Fatal("main.Main(): symmetric key should be 32 bytes")
-				return
-			}
-
-			utils.Decrypt(flag.Arg(0), symmetricKey)
+		if symmetricKey == nil || len(symmetricKey) == 0 {
+			log.Log.Fatal("main.Main(): symmetric key should not be empty")
+			return
 		}
+		if len(symmetricKey) != 32 {
+			log.Log.Fatal("main.Main(): symmetric key should be 32 bytes")
+			return
+		}
+
+		utils.Decrypt(flag.Arg(0), symmetricKey)
 
 	case "run":
 		{
-			// Print Agent ASCII art
+			// Print Kerberos.io ASCII art
 			utils.PrintASCIIArt()
 
 			// Print the environment variables which include "AGENT_" as prefix.
@@ -146,29 +127,12 @@ func main() {
 			configuration.Name = name
 			configuration.Port = port
 
-			// Open this configuration either from Agent or Factory.
+			// Open this configuration either from Kerberos Agent or Kerberos Factory.
 			configService.OpenConfig(configDirectory, &configuration)
 
 			// We will override the configuration with the environment variables
 			configService.OverrideWithEnvironmentVariables(&configuration)
 
-			// Start OpenTelemetry tracing
-			if otelEndpoint := os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT"); otelEndpoint == "" {
-				log.Log.Info("main.Main(): No OpenTelemetry endpoint provided, skipping tracing")
-			} else {
-				log.Log.Info("main.Main(): Starting OpenTelemetry tracing with endpoint: " + otelEndpoint)
-				agentKey := configuration.Config.Key
-				traceProvider, err := startTracing(agentKey, otelEndpoint)
-				if err != nil {
-					log.Log.Error("traceprovider: " + err.Error())
-				}
-				defer func() {
-					if err := traceProvider.Shutdown(context.Background()); err != nil {
-						log.Log.Error("traceprovider: " + err.Error())
-					}
-				}()
-			}
-
 			// Printing final configuration
 			utils.PrintConfiguration(&configuration)
 
@@ -211,14 +175,12 @@ func main() {
 				HandleBootstrap: make(chan string, 1),
 			}
 
-			go components.Bootstrap(ctx, configDirectory, &configuration, &communication, &capture)
+			go components.Bootstrap(configDirectory, &configuration, &communication, &capture)
 
 			// Start the REST API.
 			routers.StartWebserver(configDirectory, &configuration, &communication, &capture)
 		}
 	default:
-		{
-			log.Log.Error("main.Main(): Sorry I don't understand :(")
-		}
+		log.Log.Error("main.Main(): Sorry I don't understand :(")
 	}
 }

machinery/src/capture/RTSPClient.go

@@ -38,16 +38,16 @@ func (c *Capture) SetBackChannelClient(rtspUrl string) *Golibrtsp {
 // RTSPClient is a interface that abstracts the RTSP client implementation.
 type RTSPClient interface {
 	// Connect to the RTSP server.
-	Connect(ctx context.Context, otelContext context.Context) error
+	Connect(ctx context.Context) error
 
 	// Connect to a backchannel RTSP server.
-	ConnectBackChannel(ctx context.Context, otelContext context.Context) error
+	ConnectBackChannel(ctx context.Context) error
 
 	// Start the RTSP client, and start reading packets.
 	Start(ctx context.Context, streamType string, queue *packets.Queue, configuration *models.Configuration, communication *models.Communication) error
 
 	// Start the RTSP client, and start reading packets.
-	StartBackChannel(ctx context.Context, otelContext context.Context) error
+	StartBackChannel(ctx context.Context) (err error)
 
 	// Decode a packet into a image.
 	DecodePacket(pkt packets.Packet) (image.YCbCr, error)
@@ -59,7 +59,7 @@ type RTSPClient interface {
 	WritePacket(pkt packets.Packet) error
 
 	// Close the connection to the RTSP server.
-	Close(ctx context.Context) error
+	Close() error
 
 	// Get a list of streams from the RTSP server.
 	GetStreams() ([]packets.Stream, error)

machinery/src/capture/gortsplib.go

@@ -33,11 +33,8 @@ import (
 	"github.com/kerberos-io/agent/machinery/src/models"
 	"github.com/kerberos-io/agent/machinery/src/packets"
 	"github.com/pion/rtp"
-	"go.opentelemetry.io/otel"
 )
 
-var tracer = otel.Tracer("github.com/kerberos-io/agent/machinery/src/capture")
-
 // Implements the RTSPClient interface.
 type Golibrtsp struct {
 	RTSPClient
@@ -84,21 +81,6 @@ type Golibrtsp struct {
 	AudioMPEG4Decoder *rtpmpeg4audio.Decoder
 
 	Streams []packets.Stream
-
-	// FPS calculation fields
-	lastFrameTime    time.Time
-	frameTimeBuffer  []time.Duration
-	frameBufferSize  int
-	frameBufferIndex int
-	fpsMutex         sync.Mutex
-
-	// I-frame interval tracking fields
-	packetsSinceLastKeyframe int
-	lastKeyframePacketCount  int
-	keyframeIntervals        []int
-	keyframeBufferSize       int
-	keyframeBufferIndex      int
-	keyframeMutex            sync.Mutex
 }
 
 // Init function
@@ -121,10 +103,7 @@ func init() {
 }
 
 // Connect to the RTSP server.
-func (g *Golibrtsp) Connect(ctx context.Context, ctxOtel context.Context) (err error) {
-
-	_, span := tracer.Start(ctxOtel, "Connect")
-	defer span.End()
+func (g *Golibrtsp) Connect(ctx context.Context) (err error) {
 
 	transport := gortsplib.TransportTCP
 	g.Client = gortsplib.Client{
@@ -152,9 +131,8 @@ func (g *Golibrtsp) Connect(ctx context.Context, ctxOtel context.Context) (err e
 		return
 	}
 
-	// Initialize the mutex and FPS calculation.
+	// Iniatlise the mutex.
 	g.VideoDecoderMutex = &sync.Mutex{}
-	g.initFPSCalculation()
 
 	// find the H264 media and format
 	var formaH264 *format.H264
@@ -178,9 +156,7 @@ func (g *Golibrtsp) Connect(ctx context.Context, ctxOtel context.Context) (err e
 			// but try to fetch it later on.
 			if errSPS != nil {
 				log.Log.Debug("capture.golibrtsp.Connect(H264): " + errSPS.Error())
-				streamIndex := len(g.Streams)
 				g.Streams = append(g.Streams, packets.Stream{
-					Index:         streamIndex,
 					Name:          formaH264.Codec(),
 					IsVideo:       true,
 					IsAudio:       false,
@@ -192,9 +168,7 @@ func (g *Golibrtsp) Connect(ctx context.Context, ctxOtel context.Context) (err e
 					IsBackChannel: false,
 				})
 			} else {
-				streamIndex := len(g.Streams)
 				g.Streams = append(g.Streams, packets.Stream{
-					Index:         streamIndex,
 					Name:          formaH264.Codec(),
 					IsVideo:       true,
 					IsAudio:       false,
@@ -242,9 +216,8 @@ func (g *Golibrtsp) Connect(ctx context.Context, ctxOtel context.Context) (err e
 				log.Log.Info("capture.golibrtsp.Connect(H265): " + err.Error())
 				return
 			}
-			streamIndex := len(g.Streams)
+
 			g.Streams = append(g.Streams, packets.Stream{
-				Index:         streamIndex,
 				Name:          formaH265.Codec(),
 				IsVideo:       true,
 				IsAudio:       false,
@@ -292,9 +265,8 @@ func (g *Golibrtsp) Connect(ctx context.Context, ctxOtel context.Context) (err e
 				log.Log.Error("capture.golibrtsp.Connect(G711): " + err.Error())
 			} else {
 				g.AudioG711Decoder = audiortpDec
-				streamIndex := len(g.Streams)
+
 				g.Streams = append(g.Streams, packets.Stream{
-					Index:         streamIndex,
 					Name:          "PCM_MULAW",
 					IsVideo:       false,
 					IsAudio:       true,
@@ -328,9 +300,8 @@ func (g *Golibrtsp) Connect(ctx context.Context, ctxOtel context.Context) (err e
 				log.Log.Error("capture.golibrtsp.Connect(Opus): " + err.Error())
 			} else {
 				g.AudioOpusDecoder = audiortpDec
-				streamIndex := len(g.Streams)
+
 				g.Streams = append(g.Streams, packets.Stream{
-					Index:         streamIndex,
 					Name:          "OPUS",
 					IsVideo:       false,
 					IsAudio:       true,
@@ -357,15 +328,11 @@ func (g *Golibrtsp) Connect(ctx context.Context, ctxOtel context.Context) (err e
 			// Something went wrong .. Do something
 			log.Log.Error("capture.golibrtsp.Connect(MPEG4): " + err.Error())
 		} else {
-			streamIndex := len(g.Streams)
 			g.Streams = append(g.Streams, packets.Stream{
-				Index:         streamIndex,
 				Name:          "AAC",
 				IsVideo:       false,
 				IsAudio:       true,
 				IsBackChannel: false,
-				SampleRate:    audioFormaMPEG4.Config.SampleRate,
-				Channels:      audioFormaMPEG4.Config.ChannelCount,
 			})
 
 			// Set the index for the audio
@@ -385,11 +352,7 @@ func (g *Golibrtsp) Connect(ctx context.Context, ctxOtel context.Context) (err e
 	return
 }
 
-func (g *Golibrtsp) ConnectBackChannel(ctx context.Context, ctxRunAgent context.Context) (err error) {
-
-	_, span := tracer.Start(ctxRunAgent, "ConnectBackChannel")
-	defer span.End()
-
+func (g *Golibrtsp) ConnectBackChannel(ctx context.Context) (err error) {
 	// Transport TCP
 	transport := gortsplib.TransportTCP
 	g.Client = gortsplib.Client{
@@ -434,9 +397,7 @@ func (g *Golibrtsp) ConnectBackChannel(ctx context.Context, ctxRunAgent context.
 			g.HasBackChannel = false
 		} else {
 			g.HasBackChannel = true
-			streamIndex := len(g.Streams)
 			g.Streams = append(g.Streams, packets.Stream{
-				Index:         streamIndex,
 				Name:          "PCM_MULAW",
 				IsVideo:       false,
 				IsAudio:       true,
@@ -478,7 +439,6 @@ func (g *Golibrtsp) Start(ctx context.Context, streamType string, queue *packets
 				Time:            pts2,
 				TimeLegacy:      pts,
 				CompositionTime: pts2,
-				CurrentTime:     time.Now().UnixMilli(),
 				Idx:             g.AudioG711Index,
 				IsVideo:         false,
 				IsAudio:         true,
@@ -520,7 +480,6 @@ func (g *Golibrtsp) Start(ctx context.Context, streamType string, queue *packets
 				Time:            pts2,
 				TimeLegacy:      pts,
 				CompositionTime: pts2,
-				CurrentTime:     time.Now().UnixMilli(),
 				Idx:             g.AudioG711Index,
 				IsVideo:         false,
 				IsAudio:         true,
@@ -592,9 +551,6 @@ func (g *Golibrtsp) Start(ctx context.Context, streamType string, queue *packets
 						var sps h264.SPS
 						errSPS := sps.Unmarshal(nalu)
 						if errSPS == nil {
-							// Debug SPS information
-							g.debugSPSInfo(&sps, streamType)
-
 							// Get width
 							g.Streams[g.VideoH264Index].Width = sps.Width()
 							if streamType == "main" {
@@ -609,14 +565,12 @@ func (g *Golibrtsp) Start(ctx context.Context, streamType string, queue *packets
 							} else if streamType == "sub" {
 								configuration.Config.Capture.IPCamera.SubHeight = sps.Height()
 							}
-							// Get FPS using enhanced method
-							fps := g.getEnhancedFPS(&sps, g.VideoH264Index)
-							g.Streams[g.VideoH264Index].FPS = fps
-							log.Log.Debug(fmt.Sprintf("capture.golibrtsp.Start(%s): Final FPS=%.2f", streamType, fps))
+							// Get FPS
+							g.Streams[g.VideoH264Index].FPS = sps.FPS()
 							g.VideoH264Forma.SPS = nalu
-
 						}
 					case h264.NALUTypePPS:
+						// Read out pps
 						g.VideoH264Forma.PPS = nalu
 					}
 					filteredAU = append(filteredAU, nalu)
@@ -633,13 +587,19 @@ func (g *Golibrtsp) Start(ctx context.Context, streamType string, queue *packets
 					return
 				}
 
+				// Extract DTS from RTP packets
+				//dts2, err := dtsExtractor.Extract(filteredAU, pts2)
+				//if err != nil {
+				// log.Log.Error("capture.golibrtsp.Start(): " + err.Error())
+				// return
+				//}
+
 				pkt := packets.Packet{
 					IsKeyFrame:      idrPresent,
 					Packet:          rtppkt,
 					Data:            enc,
 					Time:            pts2,
 					TimeLegacy:      pts,
-					CurrentTime:     time.Now().UnixMilli(),
 					CompositionTime: pts2,
 					Idx:             g.VideoH264Index,
 					IsVideo:         true,
@@ -647,21 +607,6 @@ func (g *Golibrtsp) Start(ctx context.Context, streamType string, queue *packets
 					Codec:           "H264",
 				}
 
-				// Track keyframe intervals
-				keyframeInterval := g.trackKeyframeInterval(idrPresent)
-				if idrPresent && keyframeInterval > 0 {
-					avgInterval := g.getAverageKeyframeInterval()
-					gopDuration := float64(keyframeInterval) / g.Streams[g.VideoH265Index].FPS
-					gopSize := int(avgInterval) // Store GOP size in a separate variable
-					g.Streams[g.VideoH264Index].GopSize = gopSize
-					log.Log.Debug(fmt.Sprintf("capture.golibrtsp.Start(%s): Keyframe interval=%d packets, Avg=%.1f, GOP=%.1fs, GOPSize=%d",
-						streamType, keyframeInterval, avgInterval, gopDuration, gopSize))
-					preRecording := configuration.Config.Capture.PreRecording
-					if preRecording > 0 && int(gopDuration) > 0 {
-						queue.SetMaxGopCount(int(preRecording)/int(gopDuration) + 1)
-					}
-				}
-
 				pkt.Data = pkt.Data[4:]
 				if pkt.IsKeyFrame {
 					annexbNALUStartCode := func() []byte { return []byte{0x00, 0x00, 0x00, 0x01} }
@@ -784,7 +729,6 @@ func (g *Golibrtsp) Start(ctx context.Context, streamType string, queue *packets
 					Data:            enc,
 					Time:            pts2,
 					TimeLegacy:      pts,
-					CurrentTime:     time.Now().UnixMilli(),
 					CompositionTime: pts2,
 					Idx:             g.VideoH265Index,
 					IsVideo:         true,
@@ -792,21 +736,6 @@ func (g *Golibrtsp) Start(ctx context.Context, streamType string, queue *packets
 					Codec:           "H265",
 				}
 
-				// Track keyframe intervals for H265
-				keyframeInterval := g.trackKeyframeInterval(isRandomAccess)
-				if isRandomAccess && keyframeInterval > 0 {
-					avgInterval := g.getAverageKeyframeInterval()
-					gopDuration := float64(keyframeInterval) / g.Streams[g.VideoH265Index].FPS
-					gopSize := int(avgInterval) // Store GOP size in a separate variable
-					g.Streams[g.VideoH265Index].GopSize = gopSize
-					log.Log.Debug(fmt.Sprintf("capture.golibrtsp.Start(%s): Keyframe interval=%d packets, Avg=%.1f, GOP=%.1fs, GOPSize=%d",
-						streamType, keyframeInterval, avgInterval, gopDuration, gopSize))
-					preRecording := configuration.Config.Capture.PreRecording
-					if preRecording > 0 && int(gopDuration) > 0 {
-						queue.SetMaxGopCount(int(preRecording)/int(gopDuration) + 1)
-					}
-				}
-
 				queue.WritePacket(pkt)
 
 				// This will check if we need to stop the thread,
@@ -849,7 +778,7 @@ func (g *Golibrtsp) Start(ctx context.Context, streamType string, queue *packets
 }
 
 // Start the RTSP client, and start reading packets.
-func (g *Golibrtsp) StartBackChannel(ctx context.Context, ctxRunAgent context.Context) (err error) {
+func (g *Golibrtsp) StartBackChannel(ctx context.Context) (err error) {
 	log.Log.Info("capture.golibrtsp.StartBackChannel(): started")
 	// Wait for a second, so we can be sure the stream is playing.
 	time.Sleep(1 * time.Second)
@@ -931,8 +860,8 @@ func (g *Golibrtsp) DecodePacketRaw(pkt packets.Packet) (image.Gray, error) {
 }
 
 // Get a list of streams from the RTSP server.
-func (g *Golibrtsp) GetStreams() ([]packets.Stream, error) {
-	return g.Streams, nil
+func (j *Golibrtsp) GetStreams() ([]packets.Stream, error) {
+	return j.Streams, nil
 }
 
 // Get a list of video streams from the RTSP server.
@@ -958,11 +887,7 @@ func (g *Golibrtsp) GetAudioStreams() ([]packets.Stream, error) {
 }
 
 // Close the connection to the RTSP server.
-func (g *Golibrtsp) Close(ctxOtel context.Context) error {
-
-	_, span := tracer.Start(ctxOtel, "Close")
-	defer span.End()
-
+func (g *Golibrtsp) Close() error {
 	// Close the demuxer.
 	g.Client.Close()
 
@@ -1164,7 +1089,7 @@ func WriteMPEG4Audio(forma *format.MPEG4Audio, aus [][]byte) ([]byte, error) {
 	pkts := make(mpeg4audio.ADTSPackets, len(aus))
 	for i, au := range aus {
 		pkts[i] = &mpeg4audio.ADTSPacket{
-			Type:         mpeg4audio.ObjectType(forma.Config.Type),
+			Type:         forma.Config.Type,
 			SampleRate:   forma.Config.SampleRate,
 			ChannelCount: forma.Config.ChannelCount,
 			AU:           au,
@@ -1176,185 +1101,3 @@ func WriteMPEG4Audio(forma *format.MPEG4Audio, aus [][]byte) ([]byte, error) {
 	}
 	return enc, nil
 }
-
-// Initialize FPS calculation buffers
-func (g *Golibrtsp) initFPSCalculation() {
-	g.frameBufferSize = 30 // Store last 30 frame intervals
-	g.frameTimeBuffer = make([]time.Duration, g.frameBufferSize)
-	g.frameBufferIndex = 0
-	g.lastFrameTime = time.Time{}
-
-	// Initialize I-frame interval tracking
-	g.keyframeBufferSize = 10 // Store last 10 keyframe intervals
-	g.keyframeIntervals = make([]int, g.keyframeBufferSize)
-	g.keyframeBufferIndex = 0
-	g.packetsSinceLastKeyframe = 0
-	g.lastKeyframePacketCount = 0
-}
-
-// Calculate FPS from frame timestamps
-func (g *Golibrtsp) calculateFPSFromTimestamps() float64 {
-	g.fpsMutex.Lock()
-	defer g.fpsMutex.Unlock()
-
-	if g.lastFrameTime.IsZero() {
-		g.lastFrameTime = time.Now()
-		return 0
-	}
-
-	now := time.Now()
-	interval := now.Sub(g.lastFrameTime)
-	g.lastFrameTime = now
-
-	// Store the interval
-	g.frameTimeBuffer[g.frameBufferIndex] = interval
-	g.frameBufferIndex = (g.frameBufferIndex + 1) % g.frameBufferSize
-
-	// Calculate average FPS from stored intervals
-	var totalInterval time.Duration
-	validSamples := 0
-
-	for _, interval := range g.frameTimeBuffer {
-		if interval > 0 {
-			totalInterval += interval
-			validSamples++
-		}
-	}
-
-	if validSamples == 0 {
-		return 0
-	}
-
-	avgInterval := totalInterval / time.Duration(validSamples)
-	if avgInterval == 0 {
-		return 0
-	}
-
-	return float64(time.Second) / float64(avgInterval)
-}
-
-// Get enhanced FPS information from SPS with fallback
-func (g *Golibrtsp) getEnhancedFPS(sps *h264.SPS, streamIndex int8) float64 {
-	// First try to get FPS from SPS
-	spsFPS := sps.FPS()
-
-	// Check if SPS FPS is reasonable (between 1 and 120 fps)
-	if spsFPS > 0 && spsFPS <= 120 {
-		log.Log.Debug(fmt.Sprintf("capture.golibrtsp.getEnhancedFPS(): SPS FPS: %.2f", spsFPS))
-		return spsFPS
-	}
-
-	// Fallback to timestamp-based calculation
-	timestampFPS := g.calculateFPSFromTimestamps()
-	if timestampFPS > 0 && timestampFPS <= 120 {
-		log.Log.Debug(fmt.Sprintf("capture.golibrtsp.getEnhancedFPS(): Timestamp FPS: %.2f", timestampFPS))
-		return timestampFPS
-	}
-
-	// Return SPS FPS even if it seems unreasonable, or default
-	if spsFPS > 0 {
-		return spsFPS
-	}
-
-	return 25.0 // Default fallback FPS
-}
-
-// Track I-frame intervals by counting packets between keyframes
-func (g *Golibrtsp) trackKeyframeInterval(isKeyframe bool) int {
-	g.keyframeMutex.Lock()
-	defer g.keyframeMutex.Unlock()
-
-	g.packetsSinceLastKeyframe++
-
-	if isKeyframe {
-		// Store the interval since the last keyframe
-		if g.lastKeyframePacketCount > 0 {
-			interval := g.packetsSinceLastKeyframe
-			g.keyframeIntervals[g.keyframeBufferIndex] = interval
-			g.keyframeBufferIndex = (g.keyframeBufferIndex + 1) % g.keyframeBufferSize
-		}
-
-		// Reset counter for next interval
-		g.lastKeyframePacketCount = g.packetsSinceLastKeyframe
-		g.packetsSinceLastKeyframe = 0
-
-		return g.lastKeyframePacketCount
-	}
-
-	return 0
-}
-
-// Get average keyframe interval (GOP size)
-func (g *Golibrtsp) getAverageKeyframeInterval() float64 {
-	g.keyframeMutex.Lock()
-	defer g.keyframeMutex.Unlock()
-
-	var totalInterval int
-	validSamples := 0
-
-	for _, interval := range g.keyframeIntervals {
-		if interval > 0 {
-			totalInterval += interval
-			validSamples++
-		}
-	}
-
-	if validSamples == 0 {
-		return 0
-	}
-
-	return float64(totalInterval) / float64(validSamples)
-}
-
-// Calculate GOP size in seconds based on FPS and keyframe interval
-func (g *Golibrtsp) getGOPDuration(fps float64) float64 {
-	avgInterval := g.getAverageKeyframeInterval()
-	if avgInterval > 0 && fps > 0 {
-		return avgInterval / fps
-	}
-	return 0
-}
-
-// Get detailed SPS timing information
-func (g *Golibrtsp) getSPSTimingInfo(sps *h264.SPS) (hasVUI bool, timeScale uint32, numUnitsInTick uint32, fps float64) {
-	// Try to get FPS from SPS
-	fps = sps.FPS()
-
-	// Note: The gortsplib SPS struct may not expose VUI parameters directly
-	// but we can still work with the calculated FPS
-	if fps > 0 {
-		hasVUI = true
-		// These are estimated values based on common patterns
-		if fps == 25.0 {
-			timeScale = 50
-			numUnitsInTick = 1
-		} else if fps == 30.0 {
-			timeScale = 60
-			numUnitsInTick = 1
-		} else if fps == 24.0 {
-			timeScale = 48
-			numUnitsInTick = 1
-		} else {
-			// Generic calculation
-			timeScale = uint32(fps * 2)
-			numUnitsInTick = 1
-		}
-	}
-
-	return hasVUI, timeScale, numUnitsInTick, fps
-}
-
-// Debug SPS information
-func (g *Golibrtsp) debugSPSInfo(sps *h264.SPS, streamType string) {
-	hasVUI, timeScale, numUnitsInTick, fps := g.getSPSTimingInfo(sps)
-
-	log.Log.Debug(fmt.Sprintf("capture.golibrtsp.debugSPSInfo(%s): Width=%d, Height=%d",
-		streamType, sps.Width(), sps.Height()))
-	log.Log.Debug(fmt.Sprintf("capture.golibrtsp.debugSPSInfo(%s): HasVUI=%t, FPS=%.2f",
-		streamType, hasVUI, fps))
-
-	if hasVUI {
-		log.Log.Debug(fmt.Sprintf("capture.golibrtsp.debugSPSInfo(%s): TimeScale=%d, NumUnitsInTick=%d",
-			streamType, timeScale, numUnitsInTick))
-	}
-}

machinery/src/capture/main.go

@@ -16,8 +16,7 @@ import (
 	"github.com/kerberos-io/agent/machinery/src/models"
 	"github.com/kerberos-io/agent/machinery/src/packets"
 	"github.com/kerberos-io/agent/machinery/src/utils"
-	"github.com/kerberos-io/agent/machinery/src/video"
-	"go.opentelemetry.io/otel/trace"
+	"github.com/yapingcat/gomedia/go-mp4"
 )
 
 func CleanupRecordingDirectory(configDirectory string, configuration *models.Configuration) {
@@ -64,46 +63,26 @@ func HandleRecordStream(queue *packets.Queue, configDirectory string, configurat
 	} else {
 		log.Log.Debug("capture.main.HandleRecordStream(): started")
 
-		preRecording := config.Capture.PreRecording * 1000
-		postRecording := config.Capture.PostRecording * 1000           // number of seconds to record.
-		maxRecordingPeriod := config.Capture.MaxLengthRecording * 1000 // maximum number of seconds to record.
+		recordingPeriod := config.Capture.PostRecording         // number of seconds to record.
+		maxRecordingPeriod := config.Capture.MaxLengthRecording // maximum number of seconds to record.
 
-		// We will calculate the maxRecordingPeriod based on the preRecording and postRecording values.
-		if maxRecordingPeriod == 0 {
-			// If maxRecordingPeriod is not set, we will use the preRecording and postRecording values
-			maxRecordingPeriod = preRecording + postRecording
-		}
-
-		if maxRecordingPeriod < preRecording+postRecording {
-			log.Log.Error("capture.main.HandleRecordStream(): maxRecordingPeriod is less than preRecording + postRecording, this is not allowed. Setting maxRecordingPeriod to preRecording + postRecording.")
-			maxRecordingPeriod = preRecording + postRecording
-		}
+		// Synchronise the last synced time
+		now := time.Now().Unix()
+		startRecording := now
+		timestamp := now
 
 		if config.FriendlyName != "" {
 			config.Name = config.FriendlyName
 		}
 
-		// Get the audio and video codec from the camera.
-		// We only expect one audio and one video codec.
-		// If there are multiple audio or video streams, we will use the first one.
-		audioCodec := ""
-		videoCodec := ""
-		audioStreams, _ := rtspClient.GetAudioStreams()
-		videoStreams, _ := rtspClient.GetVideoStreams()
-		if len(audioStreams) > 0 {
-			audioCodec = audioStreams[0].Name
-			config.Capture.IPCamera.SampleRate = audioStreams[0].SampleRate
-			config.Capture.IPCamera.Channels = audioStreams[0].Channels
-		}
-		if len(videoStreams) > 0 {
-			videoCodec = videoStreams[0].Name
-		}
+		// For continuous and motion based recording we will use a single file.
+		var file *os.File
 
 		// Check if continuous recording.
 		if config.Capture.Continuous == "true" {
 
 			//var cws *cacheWriterSeeker
-			var mp4Video *video.MP4
+			var myMuxer *mp4.Movmuxer
 			var videoTrack uint32
 			var audioTrack uint32
 			var name string
@@ -111,15 +90,15 @@ func HandleRecordStream(queue *packets.Queue, configDirectory string, configurat
 			// Do not do anything!
 			log.Log.Info("capture.main.HandleRecordStream(continuous): start recording")
 
+			now = time.Now().Unix()
+			timestamp = now
 			start := false
 
 			// If continuous record the full length
-			postRecording = maxRecordingPeriod
+			recordingPeriod = maxRecordingPeriod
 			// Recording file name
 			fullName := ""
 
-			var startRecording int64 = 0 // start recording timestamp in milliseconds
-
 			// Get as much packets we need.
 			var cursorError error
 			var pkt packets.Packet
@@ -135,21 +114,20 @@ func HandleRecordStream(queue *packets.Queue, configDirectory string, configurat
 
 				nextPkt, cursorError = recordingCursor.ReadPacket()
 
-				now := time.Now().UnixMilli()
+				now := time.Now().Unix()
 
 				if start && // If already recording and current frame is a keyframe and we should stop recording
-					nextPkt.IsKeyFrame && (startRecording+postRecording-now <= 0 || now-startRecording > maxRecordingPeriod-500) {
+					nextPkt.IsKeyFrame && (timestamp+recordingPeriod-now <= 0 || now-startRecording >= maxRecordingPeriod) {
 
-					pts := convertPTS(pkt.TimeLegacy)
+					// Write the last packet
+					ttime := convertPTS(pkt.TimeLegacy)
 					if pkt.IsVideo {
-						// Write the last packet
-						if err := mp4Video.AddSampleToTrack(videoTrack, pkt.IsKeyFrame, pkt.Data, pts); err != nil {
+						if err := myMuxer.Write(videoTrack, pkt.Data, ttime, ttime); err != nil {
 							log.Log.Error("capture.main.HandleRecordStream(continuous): " + err.Error())
 						}
 					} else if pkt.IsAudio {
-						// Write the last packet
 						if pkt.Codec == "AAC" {
-							if err := mp4Video.AddSampleToTrack(audioTrack, pkt.IsKeyFrame, pkt.Data, pts); err != nil {
+							if err := myMuxer.Write(audioTrack, pkt.Data, ttime, ttime); err != nil {
 								log.Log.Error("capture.main.HandleRecordStream(continuous): " + err.Error())
 							}
 						} else if pkt.Codec == "PCM_MULAW" {
@@ -158,44 +136,21 @@ func HandleRecordStream(queue *packets.Queue, configDirectory string, configurat
 						}
 					}
 
-					// Close mp4
-					mp4Video.Close(&config)
+					// This will write the trailer a well.
+					if err := myMuxer.WriteTrailer(); err != nil {
+						log.Log.Error("capture.main.HandleRecordStream(continuous): " + err.Error())
+					}
+
 					log.Log.Info("capture.main.HandleRecordStream(continuous): recording finished: file save: " + name)
 
 					// Cleanup muxer
 					start = false
+					file.Close()
+					file = nil
 
-					// Update the name of the recording with the duration.
-					// We will update the name of the recording with the duration in milliseconds.
-					if mp4Video.VideoTotalDuration > 0 {
-						duration := mp4Video.VideoTotalDuration
-						// Update the name with the duration in milliseconds.
-						startRecordingSeconds := startRecording / 1000      // convert to seconds
-						startRecordingMilliseconds := startRecording % 1000 // convert to milliseconds
-						s := strconv.FormatInt(startRecordingSeconds, 10) + "_" +
-							strconv.Itoa(len(strconv.FormatInt(startRecordingMilliseconds, 10))) + "-" +
-							strconv.FormatInt(startRecordingMilliseconds, 10) + "_" +
-							config.Name + "_" +
-							"0-0-0-0" + "_" + // region coordinates, we
-							"-1" + "_" + // token
-							strconv.FormatInt(int64(duration), 10) // + "_" + // duration of recording
-							//utils.VERSION // version of the agent
-
-						oldName := name
-						name = s + ".mp4"
-						fullName = configDirectory + "/data/recordings/" + name
-						log.Log.Info("capture.main.HandleRecordStream(motiondetection): renamed file from: " + oldName + " to: " + name)
-
-						// Rename the file to the new name.
-						err := os.Rename(
-							configDirectory+"/data/recordings/"+oldName,
-							configDirectory+"/data/recordings/"+s+".mp4")
-
-						if err != nil {
-							log.Log.Error("capture.main.HandleRecordStream(motiondetection): error renaming file: " + err.Error())
-						}
-					} else {
-						log.Log.Info("capture.main.HandleRecordStream(continuous): no video data recorded, not renaming file.")
+					// Check if need to convert to fragmented using bento
+					if config.Capture.Fragmented == "true" && config.Capture.FragmentedDuration > 0 {
+						utils.CreateFragmentedMP4(fullName, config.Capture.FragmentedDuration)
 					}
 
 					// Check if we need to encrypt the recording.
@@ -242,6 +197,7 @@ func HandleRecordStream(queue *packets.Queue, configDirectory string, configurat
 					}
 
 					start = true
+					timestamp = now
 
 					// timestamp_microseconds_instanceName_regionCoordinates_numberOfChanges_token
 					// 1564859471_6-474162_oprit_577-283-727-375_1153_27.mp4
@@ -252,17 +208,13 @@ func HandleRecordStream(queue *packets.Queue, configDirectory string, configurat
 					// - Number of changes
 					// - Token
 
-					startRecording = pkt.CurrentTime
-					startRecordingSeconds := startRecording / 1000            // convert to seconds
-					startRecordingMilliseconds := startRecording % 1000       // convert to milliseconds
-					s := strconv.FormatInt(startRecordingSeconds, 10) + "_" + // start timestamp in seconds
-						strconv.Itoa(len(strconv.FormatInt(startRecordingMilliseconds, 10))) + "-" + // length of milliseconds
-						strconv.FormatInt(startRecordingMilliseconds, 10) + "_" + // milliseconds
-						config.Name + "_" + // device name
-						"0-0-0-0" + "_" + // region coordinates, we will not use this for continuous recording
-						"0" + "_" + // token
-						"0" + "_" //+ // duration of recording in milliseconds
-					//utils.VERSION // version of the agent
+					startRecording = time.Now().Unix() // we mark the current time when the record started.ss
+					s := strconv.FormatInt(startRecording, 10) + "_" +
+						"6" + "-" +
+						"967003" + "_" +
+						config.Name + "_" +
+						"200-200-400-400" + "_0_" +
+						"769"
 
 					name = s + ".mp4"
 					fullName = configDirectory + "/data/recordings/" + name
@@ -270,61 +222,53 @@ func HandleRecordStream(queue *packets.Queue, configDirectory string, configurat
 					// Running...
 					log.Log.Info("capture.main.HandleRecordStream(continuous): recording started")
 
-					// Get width and height from the camera.
-					width := configuration.Config.Capture.IPCamera.Width
-					height := configuration.Config.Capture.IPCamera.Height
-
-					// Get SPS and PPS NALUs from the camera.
-					spsNALUS := configuration.Config.Capture.IPCamera.SPSNALUs
-					ppsNALUS := configuration.Config.Capture.IPCamera.PPSNALUs
-					vpsNALUS := configuration.Config.Capture.IPCamera.VPSNALUs
-
-					// Create a video file, and set the dimensions.
-					mp4Video = video.NewMP4(fullName, spsNALUS, ppsNALUS, vpsNALUS, configuration.Config.Capture.MaxLengthRecording)
-					mp4Video.SetWidth(width)
-					mp4Video.SetHeight(height)
-
-					if videoCodec == "H264" {
-						videoTrack = mp4Video.AddVideoTrack("H264")
-					} else if videoCodec == "H265" {
-						videoTrack = mp4Video.AddVideoTrack("H265")
-					}
-					if audioCodec == "AAC" {
-						audioTrack = mp4Video.AddAudioTrack("AAC")
-					} else if audioCodec == "PCM_MULAW" {
-						log.Log.Debug("capture.main.HandleRecordStream(continuous): no AAC audio codec detected, skipping audio track.")
+					file, err = os.Create(fullName)
+					if err == nil {
+						//cws = newCacheWriterSeeker(4096)
+						myMuxer, _ = mp4.CreateMp4Muxer(file)
+						// We choose between H264 and H265
+						width := configuration.Config.Capture.IPCamera.Width
+						height := configuration.Config.Capture.IPCamera.Height
+						widthOption := mp4.WithVideoWidth(uint32(width))
+						heightOption := mp4.WithVideoHeight(uint32(height))
+						if pkt.Codec == "H264" {
+							videoTrack = myMuxer.AddVideoTrack(mp4.MP4_CODEC_H264, widthOption, heightOption)
+						} else if pkt.Codec == "H265" {
+							videoTrack = myMuxer.AddVideoTrack(mp4.MP4_CODEC_H265, widthOption, heightOption)
+						}
+						// For an MP4 container, AAC is the only audio codec supported.
+						audioTrack = myMuxer.AddAudioTrack(mp4.MP4_CODEC_AAC)
+					} else {
+						log.Log.Error("capture.main.HandleRecordStream(continuous): " + err.Error())
 					}
 
-					pts := convertPTS(pkt.TimeLegacy)
+					ttime := convertPTS(pkt.TimeLegacy)
 					if pkt.IsVideo {
-						if err := mp4Video.AddSampleToTrack(videoTrack, pkt.IsKeyFrame, pkt.Data, pts); err != nil {
+						if err := myMuxer.Write(videoTrack, pkt.Data, ttime, ttime); err != nil {
 							log.Log.Error("capture.main.HandleRecordStream(continuous): " + err.Error())
 						}
 					} else if pkt.IsAudio {
 						if pkt.Codec == "AAC" {
-							if err := mp4Video.AddSampleToTrack(audioTrack, pkt.IsKeyFrame, pkt.Data, pts); err != nil {
+							if err := myMuxer.Write(audioTrack, pkt.Data, ttime, ttime); err != nil {
 								log.Log.Error("capture.main.HandleRecordStream(continuous): " + err.Error())
 							}
 						} else if pkt.Codec == "PCM_MULAW" {
 							// TODO: transcode to AAC, some work to do..
-							// We might need to use ffmpeg to transcode the audio to AAC.
-							// For now we will skip the audio track.
 							log.Log.Debug("capture.main.HandleRecordStream(continuous): no AAC audio codec detected, skipping audio track.")
 						}
 					}
+
 					recordingStatus = "started"
 
 				} else if start {
-
-					pts := convertPTS(pkt.TimeLegacy)
+					ttime := convertPTS(pkt.TimeLegacy)
 					if pkt.IsVideo {
-						// New method using new mp4 library
-						if err := mp4Video.AddSampleToTrack(videoTrack, pkt.IsKeyFrame, pkt.Data, pts); err != nil {
+						if err := myMuxer.Write(videoTrack, pkt.Data, ttime, ttime); err != nil {
 							log.Log.Error("capture.main.HandleRecordStream(continuous): " + err.Error())
 						}
 					} else if pkt.IsAudio {
 						if pkt.Codec == "AAC" {
-							if err := mp4Video.AddSampleToTrack(audioTrack, pkt.IsKeyFrame, pkt.Data, pts); err != nil {
+							if err := myMuxer.Write(audioTrack, pkt.Data, ttime, ttime); err != nil {
 								log.Log.Error("capture.main.HandleRecordStream(continuous): " + err.Error())
 							}
 						} else if pkt.Codec == "PCM_MULAW" {
@@ -333,6 +277,7 @@ func HandleRecordStream(queue *packets.Queue, configDirectory string, configurat
 						}
 					}
 				}
+
 				pkt = nextPkt
 			}
 
@@ -340,43 +285,21 @@ func HandleRecordStream(queue *packets.Queue, configDirectory string, configurat
 			// If this happens we need to check to properly close the recording.
 			if cursorError != nil {
 				if recordingStatus == "started" {
+					// This will write the trailer a well.
+					if err := myMuxer.WriteTrailer(); err != nil {
+						log.Log.Error(err.Error())
+					}
 
 					log.Log.Info("capture.main.HandleRecordStream(continuous): Recording finished: file save: " + name)
 
 					// Cleanup muxer
 					start = false
+					file.Close()
+					file = nil
 
-					// Update the name of the recording with the duration.
-					// We will update the name of the recording with the duration in milliseconds.
-					if mp4Video.VideoTotalDuration > 0 {
-						duration := mp4Video.VideoTotalDuration
-						// Update the name with the duration in milliseconds.
-						startRecordingSeconds := startRecording / 1000      // convert to seconds
-						startRecordingMilliseconds := startRecording % 1000 // convert to milliseconds
-						s := strconv.FormatInt(startRecordingSeconds, 10) + "_" +
-							strconv.Itoa(len(strconv.FormatInt(startRecordingMilliseconds, 10))) + "-" +
-							strconv.FormatInt(startRecordingMilliseconds, 10) + "_" +
-							config.Name + "_" +
-							"0-0-0-0" + "_" + // region coordinates, we
-							"-1" + "_" + // token
-							strconv.FormatInt(int64(duration), 10) // + "_" + // duration of recording
-							//utils.VERSION // version of the agent
-
-						oldName := name
-						name = s + ".mp4"
-						fullName = configDirectory + "/data/recordings/" + name
-						log.Log.Info("capture.main.HandleRecordStream(motiondetection): renamed file from: " + oldName + " to: " + name)
-
-						// Rename the file to the new name.
-						err := os.Rename(
-							configDirectory+"/data/recordings/"+oldName,
-							configDirectory+"/data/recordings/"+s+".mp4")
-
-						if err != nil {
-							log.Log.Error("capture.main.HandleRecordStream(motiondetection): error renaming file: " + err.Error())
-						}
-					} else {
-						log.Log.Info("capture.main.HandleRecordStream(continuous): no video data recorded, not renaming file.")
+					// Check if need to convert to fragmented using bento
+					if config.Capture.Fragmented == "true" && config.Capture.FragmentedDuration > 0 {
+						utils.CreateFragmentedMP4(fullName, config.Capture.FragmentedDuration)
 					}
 
 					// Check if we need to encrypt the recording.
@@ -414,44 +337,33 @@ func HandleRecordStream(queue *packets.Queue, configDirectory string, configurat
 
 			log.Log.Info("capture.main.HandleRecordStream(motiondetection): Start motion based recording ")
 
-			var lastRecordingTime int64 = 0 // last recording timestamp in milliseconds
-			var displayTime int64 = 0       // display time in milliseconds
+			var lastDuration int64
+			var lastRecordingTime int64
 
+			//var cws *cacheWriterSeeker
+			var myMuxer *mp4.Movmuxer
 			var videoTrack uint32
 			var audioTrack uint32
 
 			for motion := range communication.HandleMotion {
 
-				// Get as much packets we need.
-				var cursorError error
-				var pkt packets.Packet
-				var nextPkt packets.Packet
-				recordingCursor := queue.Oldest() // Start from the latest packet in the queue)
+				timestamp = time.Now().Unix()
+				startRecording = time.Now().Unix() // we mark the current time when the record started.
+				numberOfChanges := motion.NumberOfChanges
 
-				now := time.Now().UnixMilli()
-				motionTimestamp := now
+				// If we have prerecording we will substract the number of seconds.
+				// Taking into account FPS = GOP size (Keyfram interval)
+				if config.Capture.PreRecording > 0 {
 
-				start := false
+					// Might be that recordings are coming short after each other.
+					// Therefore we do some math with the current time and the last recording time.
 
-				if cursorError == nil {
-					pkt, cursorError = recordingCursor.ReadPacket()
-				}
-
-				displayTime = pkt.CurrentTime
-				startRecording := pkt.CurrentTime
-
-				// We have more packets in the queue (which might still be older than where we close the previous recording).
-				// In that case we will use the last recording time to determine the start time of the recording, otherwise
-				// we will have duplicate frames in the recording.
-				if startRecording < lastRecordingTime {
-					displayTime = lastRecordingTime
-					startRecording = lastRecordingTime
-				}
-
-				// If startRecording is 0, we will continue as it might be we are in a state of restarting the agent.
-				if startRecording == 0 {
-					log.Log.Info("capture.main.HandleRecordStream(motiondetection): startRecording is 0, we will continue as it might be we are in a state of restarting the agent.")
-					continue
+					timeBetweenNowAndLastRecording := startRecording - lastRecordingTime
+					if timeBetweenNowAndLastRecording > int64(config.Capture.PreRecording) {
+						startRecording = startRecording - int64(config.Capture.PreRecording) + 1
+					} else {
+						startRecording = startRecording - timeBetweenNowAndLastRecording
+					}
 				}
 
 				// timestamp_microseconds_instanceName_regionCoordinates_numberOfChanges_token
@@ -463,56 +375,47 @@ func HandleRecordStream(queue *packets.Queue, configDirectory string, configurat
 				// - Number of changes
 				// - Token
 
-				displayTimeSeconds := displayTime / 1000      // convert to seconds
-				displayTimeMilliseconds := displayTime % 1000 // convert to milliseconds
-				motionRectangleString := "0-0-0-0"
-				if motion.Rectangle.X != 0 || motion.Rectangle.Y != 0 ||
-					motion.Rectangle.Width != 0 || motion.Rectangle.Height != 0 {
-					motionRectangleString = strconv.Itoa(motion.Rectangle.X) + "-" + strconv.Itoa(motion.Rectangle.Y) + "-" +
-						strconv.Itoa(motion.Rectangle.Width) + "-" + strconv.Itoa(motion.Rectangle.Height)
-				}
-
-				// Get the number of changes from the motion detection.
-				numberOfChanges := motion.NumberOfChanges
-
-				s := strconv.FormatInt(displayTimeSeconds, 10) + "_" + // start timestamp in seconds
-					strconv.Itoa(len(strconv.FormatInt(displayTimeMilliseconds, 10))) + "-" + // length of milliseconds
-					strconv.FormatInt(displayTimeMilliseconds, 10) + "_" + // milliseconds
-					config.Name + "_" + // device name
-					motionRectangleString + "_" + // region coordinates, we will not use this for continuous recording
-					strconv.Itoa(numberOfChanges) + "_" + // number of changes
-					"0" // + "_" + // duration of recording in milliseconds
-					//utils.VERSION // version of the agent
+				s := strconv.FormatInt(startRecording, 10) + "_" +
+					"6" + "-" +
+					"967003" + "_" +
+					config.Name + "_" +
+					"200-200-400-400" + "_" +
+					strconv.Itoa(numberOfChanges) + "_" +
+					"769"
 
 				name := s + ".mp4"
 				fullName := configDirectory + "/data/recordings/" + name
 
 				// Running...
-				log.Log.Info("capture.main.HandleRecordStream(motiondetection): recording started (" + name + ")" + " at " + strconv.FormatInt(displayTimeSeconds, 10) + " unix")
+				log.Log.Info("capture.main.HandleRecordStream(motiondetection): recording started")
+				file, _ = os.Create(fullName)
+				myMuxer, _ = mp4.CreateMp4Muxer(file)
 
-				// Get width and height from the camera.
-				width := configuration.Config.Capture.IPCamera.Width
-				height := configuration.Config.Capture.IPCamera.Height
-
-				// Get SPS and PPS NALUs from the camera.
-				spsNALUS := configuration.Config.Capture.IPCamera.SPSNALUs
-				ppsNALUS := configuration.Config.Capture.IPCamera.PPSNALUs
-				vpsNALUS := configuration.Config.Capture.IPCamera.VPSNALUs
-
-				// Create a video file, and set the dimensions.
-				mp4Video := video.NewMP4(fullName, spsNALUS, ppsNALUS, vpsNALUS, configuration.Config.Capture.MaxLengthRecording)
-				mp4Video.SetWidth(width)
-				mp4Video.SetHeight(height)
-
-				if videoCodec == "H264" {
-					videoTrack = mp4Video.AddVideoTrack("H264")
-				} else if videoCodec == "H265" {
-					videoTrack = mp4Video.AddVideoTrack("H265")
+				// Check which video codec we need to use.
+				videoSteams, _ := rtspClient.GetVideoStreams()
+				for _, stream := range videoSteams {
+					width := configuration.Config.Capture.IPCamera.Width
+					height := configuration.Config.Capture.IPCamera.Height
+					widthOption := mp4.WithVideoWidth(uint32(width))
+					heightOption := mp4.WithVideoHeight(uint32(height))
+					if stream.Name == "H264" {
+						videoTrack = myMuxer.AddVideoTrack(mp4.MP4_CODEC_H264, widthOption, heightOption)
+					} else if stream.Name == "H265" {
+						videoTrack = myMuxer.AddVideoTrack(mp4.MP4_CODEC_H265, widthOption, heightOption)
+					}
 				}
-				if audioCodec == "AAC" {
-					audioTrack = mp4Video.AddAudioTrack("AAC")
-				} else if audioCodec == "PCM_MULAW" {
-					log.Log.Debug("capture.main.HandleRecordStream(continuous): no AAC audio codec detected, skipping audio track.")
+				// For an MP4 container, AAC is the only audio codec supported.
+				audioTrack = myMuxer.AddAudioTrack(mp4.MP4_CODEC_AAC)
+				start := false
+
+				// Get as much packets we need.
+				var cursorError error
+				var pkt packets.Packet
+				var nextPkt packets.Packet
+				recordingCursor := queue.DelayedGopCount(int(config.Capture.PreRecording + 1))
+
+				if cursorError == nil {
+					pkt, cursorError = recordingCursor.ReadPacket()
 				}
 
 				for cursorError == nil {
@@ -522,91 +425,68 @@ func HandleRecordStream(queue *packets.Queue, configDirectory string, configurat
 						log.Log.Error("capture.main.HandleRecordStream(motiondetection): " + cursorError.Error())
 					}
 
-					now = time.Now().UnixMilli()
+					now := time.Now().Unix()
 					select {
 					case motion := <-communication.HandleMotion:
-						motionTimestamp = now
+						timestamp = now
 						log.Log.Info("capture.main.HandleRecordStream(motiondetection): motion detected while recording. Expanding recording.")
-						numberOfChanges := motion.NumberOfChanges
+						numberOfChanges = motion.NumberOfChanges
 						log.Log.Info("capture.main.HandleRecordStream(motiondetection): Received message with recording data, detected changes to save: " + strconv.Itoa(numberOfChanges))
 					default:
 					}
 
-					if (motionTimestamp+postRecording-now < 0 || now-startRecording > maxRecordingPeriod-500) && nextPkt.IsKeyFrame {
-						log.Log.Info("capture.main.HandleRecordStream(motiondetection): timestamp+postRecording-now < 0  - " + strconv.FormatInt(motionTimestamp+postRecording-now, 10) + " < 0")
-						log.Log.Info("capture.main.HandleRecordStream(motiondetection): now-startRecording > maxRecordingPeriod-500 - " + strconv.FormatInt(now-startRecording, 10) + " > " + strconv.FormatInt(maxRecordingPeriod-500, 10))
-						log.Log.Info("capture.main.HandleRecordStream(motiondetection): closing recording (timestamp: " + strconv.FormatInt(motionTimestamp, 10) + ", postRecording: " + strconv.FormatInt(postRecording, 10) + ", now: " + strconv.FormatInt(now, 10) + ", startRecording: " + strconv.FormatInt(startRecording, 10) + ", maxRecordingPeriod: " + strconv.FormatInt(maxRecordingPeriod, 10))
+					if (timestamp+recordingPeriod-now < 0 || now-startRecording > maxRecordingPeriod) && nextPkt.IsKeyFrame {
+						log.Log.Info("capture.main.HandleRecordStream(motiondetection): closing recording (timestamp: " + strconv.FormatInt(timestamp, 10) + ", recordingPeriod: " + strconv.FormatInt(recordingPeriod, 10) + ", now: " + strconv.FormatInt(now, 10) + ", startRecording: " + strconv.FormatInt(startRecording, 10) + ", maxRecordingPeriod: " + strconv.FormatInt(maxRecordingPeriod, 10))
 						break
 					}
-					if pkt.IsKeyFrame && !start && pkt.CurrentTime >= startRecording {
-						// We start the recording if we have a keyframe and the last duration is 0 or less than the current packet time.
-						// It could be start we start from the beginning of the recording.
+					if pkt.IsKeyFrame && !start && pkt.Time >= lastDuration {
 						log.Log.Debug("capture.main.HandleRecordStream(motiondetection): write frames")
 						start = true
 					}
 					if start {
-						pts := convertPTS(pkt.TimeLegacy)
+						ttime := convertPTS(pkt.TimeLegacy)
 						if pkt.IsVideo {
-							log.Log.Debug("capture.main.HandleRecordStream(motiondetection): add video sample")
-							if err := mp4Video.AddSampleToTrack(videoTrack, pkt.IsKeyFrame, pkt.Data, pts); err != nil {
+							if err := myMuxer.Write(videoTrack, pkt.Data, ttime, ttime); err != nil {
 								log.Log.Error("capture.main.HandleRecordStream(motiondetection): " + err.Error())
 							}
 						} else if pkt.IsAudio {
-							log.Log.Debug("capture.main.HandleRecordStream(motiondetection): add audio sample")
 							if pkt.Codec == "AAC" {
-								if err := mp4Video.AddSampleToTrack(audioTrack, pkt.IsKeyFrame, pkt.Data, pts); err != nil {
+								if err := myMuxer.Write(audioTrack, pkt.Data, ttime, ttime); err != nil {
 									log.Log.Error("capture.main.HandleRecordStream(motiondetection): " + err.Error())
 								}
 							} else if pkt.Codec == "PCM_MULAW" {
 								// TODO: transcode to AAC, some work to do..
-								// We might need to use ffmpeg to transcode the audio to AAC.
-								// For now we will skip the audio track.
 								log.Log.Debug("capture.main.HandleRecordStream(motiondetection): no AAC audio codec detected, skipping audio track.")
 							}
 						}
+
+						// We will sync to file every keyframe.
+						if pkt.IsKeyFrame {
+							err := file.Sync()
+							if err != nil {
+								log.Log.Error("capture.main.HandleRecordStream(motiondetection): " + err.Error())
+							} else {
+								log.Log.Debug("capture.main.HandleRecordStream(motiondetection): synced file " + name)
+							}
+						}
 					}
 
 					pkt = nextPkt
 				}
 
-				// Update the last duration and last recording time.
-				// This is used to determine if we need to start a new recording.
-				lastRecordingTime = pkt.CurrentTime
+				// This will write the trailer a well.
+				myMuxer.WriteTrailer()
 
-				// This will close the recording and write the last packet.
-				mp4Video.Close(&config)
 				log.Log.Info("capture.main.HandleRecordStream(motiondetection): file save: " + name)
 
-				// Update the name of the recording with the duration.
-				// We will update the name of the recording with the duration in milliseconds.
-				if mp4Video.VideoTotalDuration > 0 {
-					duration := mp4Video.VideoTotalDuration
+				lastDuration = pkt.Time
+				lastRecordingTime = time.Now().Unix()
+				file.Close()
+				file = nil
 
-					// Update the name with the duration in milliseconds.
-					s := strconv.FormatInt(displayTimeSeconds, 10) + "_" +
-						strconv.Itoa(len(strconv.FormatInt(displayTimeMilliseconds, 10))) + "-" +
-						strconv.FormatInt(displayTimeMilliseconds, 10) + "_" +
-						config.Name + "_" +
-						motionRectangleString + "_" +
-						strconv.Itoa(numberOfChanges) + "_" + // number of changes
-						strconv.FormatInt(int64(duration), 10) // + "_" + // duration of recording in milliseconds
-						//utils.VERSION // version of the agent
-
-					oldName := name
-					name = s + ".mp4"
-					fullName = configDirectory + "/data/recordings/" + name
-					log.Log.Info("capture.main.HandleRecordStream(motiondetection): renamed file from: " + oldName + " to: " + name)
-
-					// Rename the file to the new name.
-					err := os.Rename(
-						configDirectory+"/data/recordings/"+oldName,
-						configDirectory+"/data/recordings/"+s+".mp4")
-
-					if err != nil {
-						log.Log.Error("capture.main.HandleRecordStream(motiondetection): error renaming file: " + err.Error())
-					}
-				} else {
-					log.Log.Info("capture.main.HandleRecordStream(motiondetection): no video data recorded, not renaming file.")
+				// Check if need to convert to fragmented using bento
+				if config.Capture.Fragmented == "true" && config.Capture.FragmentedDuration > 0 {
+					utils.CreateFragmentedMP4(fullName, config.Capture.FragmentedDuration)
 				}
 
 				// Check if we need to encrypt the recording.
@@ -654,10 +534,6 @@ func HandleRecordStream(queue *packets.Queue, configDirectory string, configurat
 // @Success 200 {object} models.APIResponse
 func VerifyCamera(c *gin.Context) {
 
-	// Start OpenTelemetry tracing
-	ctxVerifyCamera, span := tracer.Start(context.Background(), "VerifyCamera", trace.WithSpanKind(trace.SpanKindServer))
-	defer span.End()
-
 	var cameraStreams models.CameraStreams
 	err := c.BindJSON(&cameraStreams)
 
@@ -683,11 +559,12 @@ func VerifyCamera(c *gin.Context) {
 			Url: rtspUrl,
 		}
 
-		err := rtspClient.Connect(ctx, ctxVerifyCamera)
+		err := rtspClient.Connect(ctx)
 		if err == nil {
 
 			// Get the streams from the rtsp client.
 			streams, _ := rtspClient.GetStreams()
+
 			videoIdx := -1
 			audioIdx := -1
 			for i, stream := range streams {
@@ -698,7 +575,7 @@ func VerifyCamera(c *gin.Context) {
 				}
 			}
 
-			err := rtspClient.Close(ctxVerifyCamera)
+			err := rtspClient.Close()
 			if err == nil {
 				if videoIdx > -1 {
 					c.JSON(200, models.APIResponse{
@@ -727,7 +604,7 @@ func VerifyCamera(c *gin.Context) {
 	}
 }
 
-func Base64Image(captureDevice *Capture, communication *models.Communication, configuration *models.Configuration) string {
+func Base64Image(captureDevice *Capture, communication *models.Communication) string {
 	// We'll try to get a snapshot from the camera.
 	var queue *packets.Queue
 	var cursor *packets.QueueCursor
@@ -757,8 +634,7 @@ func Base64Image(captureDevice *Capture, communication *models.Communication, co
 				var img image.YCbCr
 				img, err = (*rtspClient).DecodePacket(pkt)
 				if err == nil {
-					imageResized, _ := utils.ResizeImage(&img, uint(configuration.Config.Capture.IPCamera.BaseWidth), uint(configuration.Config.Capture.IPCamera.BaseHeight))
-					bytes, _ := utils.ImageToBytes(imageResized)
+					bytes, _ := utils.ImageToBytes(&img)
 					encodedImage = base64.StdEncoding.EncodeToString(bytes)
 					break
 				} else {
@@ -819,6 +695,6 @@ func convertPTS(v time.Duration) uint64 {
 	return uint64(v.Milliseconds())
 }
 
-/*func convertPTS2(v int64) uint64 {
+func convertPTS2(v int64) uint64 {
 	return uint64(v) / 100
-}*/
+}

machinery/src/cloud/Cloud.go

@@ -6,6 +6,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"image"
 	"io"
 	"os"
 	"strings"
@@ -131,7 +132,7 @@ func HandleUpload(configDirectory string, configuration *models.Configuration, c
 							log.Log.Error("HandleUpload: " + err.Error())
 						}
 					} else {
-						delay = 5 * time.Second // slow down
+						delay = 20 * time.Second // slow down
 						if err != nil {
 							log.Log.Error("HandleUpload: " + err.Error())
 						}
@@ -672,7 +673,6 @@ func HandleLiveStreamSD(livestreamCursor *packets.QueueCursor, configuration *mo
 		// Check if we need to enable the live stream
 		if config.Capture.Liveview != "false" {
 
-			deviceId := config.Key
 			hubKey := ""
 			if config.Cloud == "s3" && config.S3 != nil && config.S3.Publickey != "" {
 				hubKey = config.S3.Publickey
@@ -690,95 +690,46 @@ func HandleLiveStreamSD(livestreamCursor *packets.QueueCursor, configuration *mo
 			var pkt packets.Packet
 
 			for cursorError == nil {
-				pkt, cursorError = livestreamCursor.ReadPacket()
-				if len(pkt.Data) == 0 || !pkt.IsKeyFrame {
-					continue
-				}
+
 				now := time.Now().Unix()
 				select {
 				case <-communication.HandleLiveSD:
 					lastLivestreamRequest = now
 				default:
 				}
+
 				if now-lastLivestreamRequest > 3 {
 					continue
 				}
+
+				pkt, cursorError = livestreamCursor.ReadPacket()
+				if len(pkt.Data) == 0 || !pkt.IsKeyFrame {
+					continue
+				}
+
 				log.Log.Info("cloud.HandleLiveStreamSD(): Sending base64 encoded images to MQTT.")
 				img, err := rtspClient.DecodePacket(pkt)
 				if err == nil {
-					imageResized, _ := utils.ResizeImage(&img, uint(config.Capture.IPCamera.BaseWidth), uint(config.Capture.IPCamera.BaseHeight))
-					bytes, _ := utils.ImageToBytes(imageResized)
-
-					chunking := config.Capture.LiveviewChunking
-
-					if chunking == "true" {
-
-						// Split encoded image into chunks of 2kb
-						// This is to prevent the MQTT message to be too large.
-						// By default, bytes are not encoded to base64 here; you are splitting the raw JPEG/PNG bytes.
-						// However, in MQTT and web contexts, binary data may not be handled well, so base64 is often used.
-						// To avoid base64 encoding, just send the raw []byte chunks as you do here.
-						// If you want to avoid base64, make sure the receiver can handle binary payloads.
-
-						chunkSize := 25 * 1024 // 25KB chunks
-						var chunks [][]byte
-						for i := 0; i < len(bytes); i += chunkSize {
-							end := i + chunkSize
-							if end > len(bytes) {
-								end = len(bytes)
-							}
-							chunk := bytes[i:end]
-							chunks = append(chunks, chunk)
-						}
-
-						log.Log.Infof("cloud.HandleLiveStreamSD(): Sending %d chunks of size %d bytes.", len(chunks), chunkSize)
-
-						timestamp := time.Now().Unix()
-						for i, chunk := range chunks {
-							valueMap := make(map[string]interface{})
-							valueMap["id"] = timestamp
-							valueMap["chunk"] = chunk
-							valueMap["chunkIndex"] = i
-							valueMap["chunkSize"] = chunkSize
-							valueMap["chunkCount"] = len(chunks)
-							message := models.Message{
-								Payload: models.Payload{
-									Version:  "v1.0.0",
-									Action:   "receive-sd-stream",
-									DeviceId: deviceId,
-									Value:    valueMap,
-								},
-							}
-							payload, err := models.PackageMQTTMessage(configuration, message)
-							if err == nil {
-								mqttClient.Publish("kerberos/hub/"+hubKey+"/"+deviceId, 1, false, payload)
-								log.Log.Infof("cloud.HandleLiveStreamSD(): sent chunk %d/%d to MQTT topic kerberos/hub/%s/%s", i+1, len(chunks), hubKey, deviceId)
-								time.Sleep(33 * time.Millisecond) // Sleep to avoid flooding the MQTT broker with messages
-							} else {
-								log.Log.Info("cloud.HandleLiveStreamSD(): something went wrong while sending acknowledge config to hub: " + string(payload))
-							}
-						}
+					bytes, _ := utils.ImageToBytes(&img)
+					encoded := base64.StdEncoding.EncodeToString(bytes)
+					valueMap := make(map[string]interface{})
+					valueMap["image"] = encoded
+					message := models.Message{
+						Payload: models.Payload{
+							Action:   "receive-sd-stream",
+							DeviceId: configuration.Config.Key,
+							Value:    valueMap,
+						},
+					}
+					payload, err := models.PackageMQTTMessage(configuration, message)
+					if err == nil {
+						mqttClient.Publish("kerberos/hub/"+hubKey, 0, false, payload)
 					} else {
-
-						valueMap := make(map[string]interface{})
-						valueMap["image"] = bytes
-						message := models.Message{
-							Payload: models.Payload{
-								Action:   "receive-sd-stream",
-								DeviceId: configuration.Config.Key,
-								Value:    valueMap,
-							},
-						}
-						payload, err := models.PackageMQTTMessage(configuration, message)
-						if err == nil {
-							mqttClient.Publish("kerberos/hub/"+hubKey, 0, false, payload)
-						} else {
-							log.Log.Info("cloud.HandleLiveStreamSD(): something went wrong while sending acknowledge config to hub: " + string(payload))
-						}
-
+						log.Log.Info("cloud.HandleLiveStreamSD(): something went wrong while sending acknowledge config to hub: " + string(payload))
 					}
 				}
-				time.Sleep(1000 * time.Millisecond) // Sleep to avoid flooding the MQTT broker with messages
+				// Cleaning image
+				img = image.YCbCr{}
 			}
 
 		} else {
@@ -804,12 +755,6 @@ func HandleLiveStreamHD(livestreamCursor *packets.QueueCursor, configuration *mo
 			streams, _ := rtspClient.GetStreams()
 			videoTrack := webrtc.NewVideoTrack(streams)
 			audioTrack := webrtc.NewAudioTrack(streams)
-
-			if videoTrack == nil && audioTrack == nil {
-				log.Log.Error("cloud.HandleLiveStreamHD(): failed to create both video and audio tracks")
-				return
-			}
-
 			go webrtc.WriteToTrack(livestreamCursor, configuration, communication, mqttClient, videoTrack, audioTrack, rtspClient)
 
 			if config.Capture.ForwardWebRTC == "true" {
@@ -871,8 +816,7 @@ func HandleRealtimeProcessing(processingCursor *packets.QueueCursor, configurati
 				log.Log.Info("cloud.RealtimeProcessing(): Sending base64 encoded images to MQTT.")
 				img, err := rtspClient.DecodePacket(pkt)
 				if err == nil {
-					imageResized, _ := utils.ResizeImage(&img, uint(config.Capture.IPCamera.BaseWidth), uint(config.Capture.IPCamera.BaseHeight))
-					bytes, _ := utils.ImageToBytes(imageResized)
+					bytes, _ := utils.ImageToBytes(&img)
 					encoded := base64.StdEncoding.EncodeToString(bytes)
 
 					valueMap := make(map[string]interface{})
@@ -886,6 +830,7 @@ func HandleRealtimeProcessing(processingCursor *packets.QueueCursor, configurati
 					}
 					payload, err := models.PackageMQTTMessage(configuration, message)
 					if err == nil {
+
 						mqttClient.Publish(realtimeProcessingTopic, 0, false, payload)
 					} else {
 						log.Log.Info("cloud.RealtimeProcessing(): something went wrong while sending acknowledge config to hub: " + string(payload))
@@ -1224,184 +1169,3 @@ func VerifyPersistence(c *gin.Context, configDirectory string) {
 		})
 	}
 }
-
-// VerifySecondaryPersistence godoc
-// @Router /api/persistence/secondary/verify [post]
-// @ID verify-persistence
-// @Security Bearer
-// @securityDefinitions.apikey Bearer
-// @in header
-// @name Authorization
-// @Tags persistence
-// @Param config body models.Config true "Config"
-// @Summary Will verify the secondary persistence.
-// @Description Will verify the secondary persistence.
-// @Success 200 {object} models.APIResponse
-func VerifySecondaryPersistence(c *gin.Context, configDirectory string) {
-
-	var config models.Config
-	err := c.BindJSON(&config)
-	if err != nil || config.Cloud != "" {
-
-		if config.Cloud == "kstorage" || config.Cloud == "kerberosvault" {
-
-			if config.KStorageSecondary == nil {
-				msg := "cloud.VerifySecondaryPersistence(kerberosvault): please fill-in the required Kerberos Vault credentials."
-				log.Log.Error(msg)
-				c.JSON(400, models.APIResponse{
-					Data: msg,
-				})
-
-			} else {
-
-				uri := config.KStorageSecondary.URI
-				accessKey := config.KStorageSecondary.AccessKey
-				secretAccessKey := config.KStorageSecondary.SecretAccessKey
-				directory := config.KStorageSecondary.Directory
-				provider := config.KStorageSecondary.Provider
-
-				if err == nil && uri != "" && accessKey != "" && secretAccessKey != "" {
-
-					var client *http.Client
-					if os.Getenv("AGENT_TLS_INSECURE") == "true" {
-						tr := &http.Transport{
-							TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-						}
-						client = &http.Client{Transport: tr}
-					} else {
-						client = &http.Client{}
-					}
-
-					req, err := http.NewRequest("POST", uri+"/ping", nil)
-					if err == nil {
-						req.Header.Add("X-Kerberos-Storage-AccessKey", accessKey)
-						req.Header.Add("X-Kerberos-Storage-SecretAccessKey", secretAccessKey)
-						resp, err := client.Do(req)
-
-						if err == nil {
-							body, err := io.ReadAll(resp.Body)
-							defer resp.Body.Close()
-							if err == nil && resp.StatusCode == http.StatusOK {
-
-								if provider != "" || directory != "" {
-
-									// Generate a random name.
-									timestamp := time.Now().Unix()
-									fileName := strconv.FormatInt(timestamp, 10) +
-										"_6-967003_" + config.Name + "_200-200-400-400_24_769.mp4"
-
-									// Open test-480p.mp4
-									file, err := os.Open(configDirectory + "/data/test-480p.mp4")
-									if err != nil {
-										msg := "cloud.VerifyPersistence(kerberosvault): 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", 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", config.Key)
-										req.Header.Set("X-Kerberos-Storage-Capture", "IPCamera")
-										req.Header.Set("X-Kerberos-Storage-Directory", directory)
-
-										var client *http.Client
-										if os.Getenv("AGENT_TLS_INSECURE") == "true" {
-											tr := &http.Transport{
-												TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-											}
-											client = &http.Client{Transport: tr}
-										} else {
-											client = &http.Client{}
-										}
-
-										resp, err := client.Do(req)
-
-										if err == nil {
-											if resp != nil {
-												body, err := io.ReadAll(resp.Body)
-												defer resp.Body.Close()
-												if err == nil {
-													if resp.StatusCode == 200 {
-														msg := "cloud.VerifySecondaryPersistence(kerberosvault): Upload allowed using the credentials provided (" + accessKey + ", " + secretAccessKey + ")"
-														log.Log.Info(msg)
-														c.JSON(200, models.APIResponse{
-															Data: body,
-														})
-													} else {
-														msg := "cloud.VerifySecondaryPersistence(kerberosvault): 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."
-														log.Log.Error(msg)
-														c.JSON(400, models.APIResponse{
-															Data: msg,
-														})
-													}
-												}
-											}
-										} else {
-											msg := "cloud.VerifySecondaryPersistence(kerberosvault): Upload of fake recording failed: " + err.Error()
-											log.Log.Error(msg)
-											c.JSON(400, models.APIResponse{
-												Data: msg,
-											})
-										}
-									} else {
-										msg := "cloud.VerifySecondaryPersistence(kerberosvault): Something went wrong while creating /storage POST request." + err.Error()
-										log.Log.Error(msg)
-										c.JSON(400, models.APIResponse{
-											Data: msg,
-										})
-									}
-								} else {
-									msg := "cloud.VerifySecondaryPersistence(kerberosvault): Provider and/or directory is missing from the request."
-									log.Log.Error(msg)
-									c.JSON(400, models.APIResponse{
-										Data: msg,
-									})
-								}
-							} else {
-								msg := "cloud.VerifySecondaryPersistence(kerberosvault): Something went wrong while verifying storage credentials: " + string(body)
-								log.Log.Error(msg)
-								c.JSON(400, models.APIResponse{
-									Data: msg,
-								})
-							}
-						} else {
-							msg := "cloud.VerifySecondaryPersistence(kerberosvault): Something went wrong while verifying storage credentials:" + err.Error()
-							log.Log.Error(msg)
-							c.JSON(400, models.APIResponse{
-								Data: msg,
-							})
-						}
-					} else {
-						msg := "cloud.VerifySecondaryPersistence(kerberosvault): Something went wrong while verifying storage credentials:" + err.Error()
-						log.Log.Error(msg)
-						c.JSON(400, models.APIResponse{
-							Data: msg,
-						})
-					}
-				} else {
-					msg := "cloud.VerifySecondaryPersistence(kerberosvault): please fill-in the required Kerberos Vault credentials."
-					log.Log.Error(msg)
-					c.JSON(400, models.APIResponse{
-						Data: msg,
-					})
-				}
-			}
-		}
-	} else {
-		msg := "cloud.VerifySecondaryPersistence(): No persistence was specified, so do not know what to verify:" + err.Error()
-		log.Log.Error(msg)
-		c.JSON(400, models.APIResponse{
-			Data: msg,
-		})
-	}
-}

machinery/src/cloud/kerberos_vault.go

@@ -3,20 +3,14 @@ package cloud
 import (
 	"crypto/tls"
 	"errors"
-	"io"
+	"io/ioutil"
 	"net/http"
 	"os"
-	"time"
 
 	"github.com/kerberos-io/agent/machinery/src/log"
 	"github.com/kerberos-io/agent/machinery/src/models"
 )
 
-// We will count the number of retries we have done.
-// If we have done more than "kstorageRetryPolicy" retries, we will stop, and start sending to the secondary storage.
-var kstorageRetryCount = 0
-var kstorageRetryTimeout = time.Now().Unix()
-
 func UploadKerberosVault(configuration *models.Configuration, fileName string) (bool, bool, error) {
 
 	config := configuration.Config
@@ -25,7 +19,7 @@ func UploadKerberosVault(configuration *models.Configuration, fileName string) (
 		config.KStorage.SecretAccessKey == "" ||
 		config.KStorage.Directory == "" ||
 		config.KStorage.URI == "" {
-		err := "UploadKerberosVault: Kerberos Vault not properly configured"
+		err := "UploadKerberosVault: Kerberos Vault not properly configured."
 		log.Log.Info(err)
 		return false, false, errors.New(err)
 	}
@@ -48,147 +42,64 @@ func UploadKerberosVault(configuration *models.Configuration, fileName string) (
 		defer file.Close()
 	}
 	if err != nil {
-		err := "UploadKerberosVault: Upload Failed, file doesn't exists anymore"
+		err := "UploadKerberosVault: Upload Failed, file doesn't exists anymore."
 		log.Log.Info(err)
 		return false, false, errors.New(err)
 	}
 
 	publicKey := config.KStorage.CloudKey
+	// This is the new way ;)
 	if config.HubKey != "" {
 		publicKey = config.HubKey
 	}
 
-	// We need to check if we are in a retry timeout.
-	if kstorageRetryTimeout <= time.Now().Unix() {
-
-		req, err := http.NewRequest("POST", config.KStorage.URI+"/storage", file)
-		if err != nil {
-			errorMessage := "UploadKerberosVault: error reading request, " + config.KStorage.URI + "/storage: " + 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-CloudKey", publicKey)
-		req.Header.Set("X-Kerberos-Storage-AccessKey", config.KStorage.AccessKey)
-		req.Header.Set("X-Kerberos-Storage-SecretAccessKey", config.KStorage.SecretAccessKey)
-		req.Header.Set("X-Kerberos-Storage-Provider", config.KStorage.Provider)
-		req.Header.Set("X-Kerberos-Storage-FileName", fileName)
-		req.Header.Set("X-Kerberos-Storage-Device", config.Key)
-		req.Header.Set("X-Kerberos-Storage-Capture", "IPCamera")
-		req.Header.Set("X-Kerberos-Storage-Directory", config.KStorage.Directory)
-
-		var client *http.Client
-		if os.Getenv("AGENT_TLS_INSECURE") == "true" {
-			tr := &http.Transport{
-				TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-			}
-			client = &http.Client{Transport: tr}
-		} else {
-			client = &http.Client{}
-		}
-
-		resp, err := client.Do(req)
-		if resp != nil {
-			defer resp.Body.Close()
-		}
-
-		if err == nil {
-			if resp != nil {
-				body, err := io.ReadAll(resp.Body)
-				if err == nil {
-					if resp.StatusCode == 200 {
-						kstorageRetryCount = 0
-						log.Log.Info("UploadKerberosVault: Upload Finished, " + resp.Status + ", " + string(body))
-						return true, true, nil
-					} else {
-						// We increase the retry count, and set the timeout.
-						// If we have reached the retry policy, we set the timeout.
-						// This means we will not retry for the next 5 minutes.
-						if kstorageRetryCount < config.KStorage.MaxRetries {
-							kstorageRetryCount = (kstorageRetryCount + 1)
-						}
-						if kstorageRetryCount == config.KStorage.MaxRetries {
-							kstorageRetryTimeout = time.Now().Add(time.Duration(config.KStorage.Timeout) * time.Second).Unix()
-						}
-						log.Log.Info("UploadKerberosVault: Upload Failed, " + resp.Status + ", " + string(body))
-					}
-				}
-			}
-		} else {
-			log.Log.Info("UploadKerberosVault: Upload Failed, " + err.Error())
-		}
+	req, err := http.NewRequest("POST", config.KStorage.URI+"/storage", file)
+	if err != nil {
+		errorMessage := "UploadKerberosVault: error reading request, " + config.KStorage.URI + "/storage: " + 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-CloudKey", publicKey)
+	req.Header.Set("X-Kerberos-Storage-AccessKey", config.KStorage.AccessKey)
+	req.Header.Set("X-Kerberos-Storage-SecretAccessKey", config.KStorage.SecretAccessKey)
+	req.Header.Set("X-Kerberos-Storage-Provider", config.KStorage.Provider)
+	req.Header.Set("X-Kerberos-Storage-FileName", fileName)
+	req.Header.Set("X-Kerberos-Storage-Device", config.Key)
+	req.Header.Set("X-Kerberos-Storage-Capture", "IPCamera")
+	req.Header.Set("X-Kerberos-Storage-Directory", config.KStorage.Directory)
 
-	// We might need to check if we can upload to our secondary storage.
-	if config.KStorageSecondary.AccessKey == "" ||
-		config.KStorageSecondary.SecretAccessKey == "" ||
-		config.KStorageSecondary.Directory == "" ||
-		config.KStorageSecondary.URI == "" {
-		log.Log.Info("UploadKerberosVault (Secondary): Secondary Kerberos Vault not properly configured.")
+	var client *http.Client
+	if os.Getenv("AGENT_TLS_INSECURE") == "true" {
+		tr := &http.Transport{
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+		}
+		client = &http.Client{Transport: tr}
 	} else {
+		client = &http.Client{}
+	}
 
-		if kstorageRetryCount < config.KStorage.MaxRetries {
-			log.Log.Info("UploadKerberosVault (Secondary): Do not upload to secondary storage, we are still in retry policy.")
-			return false, true, nil
-		}
+	resp, err := client.Do(req)
+	if resp != nil {
+		defer resp.Body.Close()
+	}
 
-		log.Log.Info("UploadKerberosVault (Secondary): Uploading to Secondary Kerberos Vault (" + config.KStorageSecondary.URI + ")")
-
-		file, err = os.OpenFile(fullname, os.O_RDWR, 0755)
-		if file != nil {
-			defer file.Close()
-		}
-		if err != nil {
-			err := "UploadKerberosVault (Secondary): Upload Failed, file doesn't exists anymore"
-			log.Log.Info(err)
-			return false, false, errors.New(err)
-		}
-
-		req, err := http.NewRequest("POST", config.KStorageSecondary.URI+"/storage", file)
-		if err != nil {
-			errorMessage := "UploadKerberosVault (Secondary): error reading request, " + config.KStorageSecondary.URI + "/storage: " + 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-CloudKey", publicKey)
-		req.Header.Set("X-Kerberos-Storage-AccessKey", config.KStorageSecondary.AccessKey)
-		req.Header.Set("X-Kerberos-Storage-SecretAccessKey", config.KStorageSecondary.SecretAccessKey)
-		req.Header.Set("X-Kerberos-Storage-Provider", config.KStorageSecondary.Provider)
-		req.Header.Set("X-Kerberos-Storage-FileName", fileName)
-		req.Header.Set("X-Kerberos-Storage-Device", config.Key)
-		req.Header.Set("X-Kerberos-Storage-Capture", "IPCamera")
-		req.Header.Set("X-Kerberos-Storage-Directory", config.KStorageSecondary.Directory)
-
-		var client *http.Client
-		if os.Getenv("AGENT_TLS_INSECURE") == "true" {
-			tr := &http.Transport{
-				TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-			}
-			client = &http.Client{Transport: tr}
-		} else {
-			client = &http.Client{}
-		}
-
-		resp, err := client.Do(req)
+	if err == nil {
 		if resp != nil {
-			defer resp.Body.Close()
-		}
-
-		if err == nil {
-			if resp != nil {
-				body, err := io.ReadAll(resp.Body)
-				if err == nil {
-					if resp.StatusCode == 200 {
-						log.Log.Info("UploadKerberosVault (Secondary): Upload Finished to secondary, " + resp.Status + ", " + string(body))
-						return true, true, nil
-					} else {
-						log.Log.Info("UploadKerberosVault (Secondary): Upload Failed to secondary, " + resp.Status + ", " + string(body))
-					}
+			body, err := ioutil.ReadAll(resp.Body)
+			if err == nil {
+				if resp.StatusCode == 200 {
+					log.Log.Info("UploadKerberosVault: Upload Finished, " + resp.Status + ", " + string(body))
+					return true, true, nil
+				} else {
+					log.Log.Info("UploadKerberosVault: Upload Failed, " + resp.Status + ", " + string(body))
+					return false, true, nil
 				}
 			}
 		}
 	}
 
-	return false, true, nil
+	errorMessage := "UploadKerberosVault: Upload Failed, " + err.Error()
+	log.Log.Info(errorMessage)
+	return false, true, errors.New(errorMessage)
 }

machinery/src/components/Kerberos.go

@@ -9,7 +9,6 @@ import (
 
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 	"github.com/gin-gonic/gin"
-	"go.opentelemetry.io/otel"
 
 	"github.com/kerberos-io/agent/machinery/src/capture"
 	"github.com/kerberos-io/agent/machinery/src/cloud"
@@ -24,15 +23,9 @@ import (
 	"github.com/tevino/abool"
 )
 
-var tracer = otel.Tracer("github.com/kerberos-io/agent/machinery/src/components")
-
-func Bootstrap(ctx context.Context, configDirectory string, configuration *models.Configuration, communication *models.Communication, captureDevice *capture.Capture) {
-
+func Bootstrap(configDirectory string, configuration *models.Configuration, communication *models.Communication, captureDevice *capture.Capture) {
 	log.Log.Debug("components.Kerberos.Bootstrap(): bootstrapping the kerberos agent.")
 
-	bootstrapContext := context.Background()
-	_, span := tracer.Start(bootstrapContext, "Bootstrap")
-
 	// We will keep track of the Kerberos Agent up time
 	// This is send to Kerberos Hub in a heartbeat.
 	uptimeStart := time.Now()
@@ -85,8 +78,6 @@ func Bootstrap(ctx context.Context, configDirectory string, configuration *model
 	// Configure a MQTT client which helps for a bi-directional communication
 	mqttClient := routers.ConfigureMQTT(configDirectory, configuration, communication)
 
-	span.End()
-
 	// Run the agent and fire up all the other
 	// goroutines which do image capture, motion detection, onvif, etc.
 	for {
@@ -123,9 +114,6 @@ func Bootstrap(ctx context.Context, configDirectory string, configuration *model
 
 func RunAgent(configDirectory string, configuration *models.Configuration, communication *models.Communication, mqttClient mqtt.Client, uptimeStart time.Time, cameraSettings *models.Camera, captureDevice *capture.Capture) string {
 
-	ctx := context.Background()
-	ctxRunAgent, span := tracer.Start(ctx, "RunAgent")
-
 	log.Log.Info("components.Kerberos.RunAgent(): Creating camera and processing threads.")
 	config := configuration.Config
 
@@ -136,10 +124,10 @@ func RunAgent(configDirectory string, configuration *models.Configuration, commu
 	rtspUrl := config.Capture.IPCamera.RTSP
 	rtspClient := captureDevice.SetMainClient(rtspUrl)
 	if rtspUrl != "" {
-		err := rtspClient.Connect(ctx, ctxRunAgent)
+		err := rtspClient.Connect(context.Background())
 		if err != nil {
 			log.Log.Error("components.Kerberos.RunAgent(): error connecting to RTSP stream: " + err.Error())
-			rtspClient.Close(ctxRunAgent)
+			rtspClient.Close()
 			rtspClient = nil
 			time.Sleep(time.Second * 3)
 			return status
@@ -157,7 +145,7 @@ func RunAgent(configDirectory string, configuration *models.Configuration, commu
 	videoStreams, err := rtspClient.GetVideoStreams()
 	if err != nil || len(videoStreams) == 0 {
 		log.Log.Error("components.Kerberos.RunAgent(): no video stream found, might be the wrong codec (we only support H264 for the moment)")
-		rtspClient.Close(ctxRunAgent)
+		rtspClient.Close()
 		time.Sleep(time.Second * 3)
 		return status
 	}
@@ -173,27 +161,6 @@ func RunAgent(configDirectory string, configuration *models.Configuration, commu
 	configuration.Config.Capture.IPCamera.Width = width
 	configuration.Config.Capture.IPCamera.Height = height
 
-	// Set the liveview width and height, this is used for the liveview and motion regions (drawing on the hub).
-	baseWidth := config.Capture.IPCamera.BaseWidth
-	baseHeight := config.Capture.IPCamera.BaseHeight
-	// If the liveview height is not set, we will calculate it based on the width and aspect ratio of the camera.
-	if baseWidth > 0 && baseHeight == 0 {
-		widthAspectRatio := float64(baseWidth) / float64(width)
-		configuration.Config.Capture.IPCamera.BaseHeight = int(float64(height) * widthAspectRatio)
-	} else if baseHeight > 0 && baseWidth > 0 {
-		configuration.Config.Capture.IPCamera.BaseHeight = baseHeight
-		configuration.Config.Capture.IPCamera.BaseWidth = baseWidth
-	} else {
-		configuration.Config.Capture.IPCamera.BaseHeight = height
-		configuration.Config.Capture.IPCamera.BaseWidth = width
-	}
-
-	// Set the SPS and PPS values in the configuration.
-	configuration.Config.Capture.IPCamera.SPSNALUs = [][]byte{videoStream.SPS}
-	configuration.Config.Capture.IPCamera.PPSNALUs = [][]byte{videoStream.PPS}
-	configuration.Config.Capture.IPCamera.VPSNALUs = [][]byte{videoStream.VPS}
-
-	// Define queues for the main and sub stream.
 	var queue *packets.Queue
 	var subQueue *packets.Queue
 
@@ -215,7 +182,7 @@ func RunAgent(configDirectory string, configuration *models.Configuration, commu
 		rtspSubClient := captureDevice.SetSubClient(subRtspUrl)
 		captureDevice.RTSPSubClient = rtspSubClient
 
-		err := rtspSubClient.Connect(ctx, ctxRunAgent)
+		err := rtspSubClient.Connect(context.Background())
 		if err != nil {
 			log.Log.Error("components.Kerberos.RunAgent(): error connecting to RTSP sub stream: " + err.Error())
 			time.Sleep(time.Second * 3)
@@ -227,7 +194,7 @@ func RunAgent(configDirectory string, configuration *models.Configuration, commu
 		videoSubStreams, err = rtspSubClient.GetVideoStreams()
 		if err != nil || len(videoSubStreams) == 0 {
 			log.Log.Error("components.Kerberos.RunAgent(): no video sub stream found, might be the wrong codec (we only support H264 for the moment)")
-			rtspSubClient.Close(ctxRunAgent)
+			rtspSubClient.Close()
 			time.Sleep(time.Second * 3)
 			return status
 		}
@@ -241,22 +208,6 @@ func RunAgent(configDirectory string, configuration *models.Configuration, commu
 		// Set config values as well
 		configuration.Config.Capture.IPCamera.SubWidth = width
 		configuration.Config.Capture.IPCamera.SubHeight = height
-
-		// If we have a substream, we need to set the width and height of the substream. (so we will override above information)
-		// Set the liveview width and height, this is used for the liveview and motion regions (drawing on the hub).
-		baseWidth := config.Capture.IPCamera.BaseWidth
-		baseHeight := config.Capture.IPCamera.BaseHeight
-		// If the liveview height is not set, we will calculate it based on the width and aspect ratio of the camera.
-		if baseWidth > 0 && baseHeight == 0 {
-			widthAspectRatio := float64(baseWidth) / float64(width)
-			configuration.Config.Capture.IPCamera.BaseHeight = int(float64(height) * widthAspectRatio)
-		} else if baseHeight > 0 && baseWidth > 0 {
-			configuration.Config.Capture.IPCamera.BaseHeight = baseHeight
-			configuration.Config.Capture.IPCamera.BaseWidth = baseWidth
-		} else {
-			configuration.Config.Capture.IPCamera.BaseHeight = height
-			configuration.Config.Capture.IPCamera.BaseWidth = width
-		}
 	}
 
 	// We are creating a queue to store the RTSP frames in, these frames will be
@@ -266,28 +217,28 @@ func RunAgent(configDirectory string, configuration *models.Configuration, commu
 
 	// Set the maximum GOP count, this is used to determine the pre-recording time.
 	log.Log.Info("components.Kerberos.RunAgent(): SetMaxGopCount was set with: " + strconv.Itoa(int(config.Capture.PreRecording)+1))
-	queue.SetMaxGopCount(1) // We will adjust this later on, when we have the GOP size.
+	queue.SetMaxGopCount(int(config.Capture.PreRecording) + 1) // GOP time frame is set to prerecording (we'll add 2 gops to leave some room).
 	queue.WriteHeader(videoStreams)
-	go rtspClient.Start(ctx, "main", queue, configuration, communication)
+	go rtspClient.Start(context.Background(), "main", queue, configuration, communication)
 
 	// Main stream is connected and ready to go.
 	communication.MainStreamConnected = true
 
 	// Try to create backchannel
 	rtspBackChannelClient := captureDevice.SetBackChannelClient(rtspUrl)
-	err = rtspBackChannelClient.ConnectBackChannel(ctx, ctxRunAgent)
+	err = rtspBackChannelClient.ConnectBackChannel(context.Background())
 	if err == nil {
 		log.Log.Info("components.Kerberos.RunAgent(): opened RTSP backchannel stream: " + rtspUrl)
-		go rtspBackChannelClient.StartBackChannel(ctx, ctxRunAgent)
+		go rtspBackChannelClient.StartBackChannel(context.Background())
 	}
 
 	rtspSubClient := captureDevice.RTSPSubClient
 	if subStreamEnabled && rtspSubClient != nil {
 		subQueue = packets.NewQueue()
 		communication.SubQueue = subQueue
-		subQueue.SetMaxGopCount(1) // GOP time frame is set to 1 for motion detection and livestreaming.
+		subQueue.SetMaxGopCount(3) // GOP time frame is set to prerecording (we'll add 2 gops to leave some room).
 		subQueue.WriteHeader(videoSubStreams)
-		go rtspSubClient.Start(ctx, "sub", subQueue, configuration, communication)
+		go rtspSubClient.Start(context.Background(), "sub", subQueue, configuration, communication)
 
 		// Sub stream is connected and ready to go.
 		communication.SubStreamConnected = true
@@ -303,7 +254,7 @@ func RunAgent(configDirectory string, configuration *models.Configuration, commu
 	}
 
 	// Handle livestream HD (high resolution over WEBRTC)
-	communication.HandleLiveHDHandshake = make(chan models.RequestHDStreamPayload, 10)
+	communication.HandleLiveHDHandshake = make(chan models.RequestHDStreamPayload, 1)
 	if subStreamEnabled {
 		livestreamHDCursor := subQueue.Latest()
 		go cloud.HandleLiveStreamHD(livestreamHDCursor, configuration, communication, mqttClient, rtspSubClient)
@@ -316,7 +267,7 @@ func RunAgent(configDirectory string, configuration *models.Configuration, commu
 	go capture.HandleRecordStream(queue, configDirectory, configuration, communication, rtspClient)
 
 	// Handle processing of motion
-	communication.HandleMotion = make(chan models.MotionDataPartial, 10)
+	communication.HandleMotion = make(chan models.MotionDataPartial, 1)
 	if subStreamEnabled {
 		motionCursor := subQueue.Latest()
 		go computervision.ProcessMotion(motionCursor, configuration, communication, mqttClient, rtspSubClient)
@@ -338,10 +289,10 @@ func RunAgent(configDirectory string, configuration *models.Configuration, commu
 	go cloud.HandleUpload(configDirectory, configuration, communication)
 
 	// Handle ONVIF actions
-	communication.HandleONVIF = make(chan models.OnvifAction, 10)
+	communication.HandleONVIF = make(chan models.OnvifAction, 1)
 	go onvif.HandleONVIFActions(configuration, communication)
 
-	communication.HandleAudio = make(chan models.AudioDataPartial, 10)
+	communication.HandleAudio = make(chan models.AudioDataPartial, 1)
 	if rtspBackChannelClient.HasBackChannel {
 		communication.HasBackChannel = true
 		go WriteAudioToBackchannel(communication, rtspBackChannelClient)
@@ -350,9 +301,6 @@ func RunAgent(configDirectory string, configuration *models.Configuration, commu
 	// If we reach this point, we have a working RTSP connection.
 	communication.CameraConnected = true
 
-	// Otel end span
-	span.End()
-
 	// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 	// This will go into a blocking state, once this channel is triggered
 	// the agent will cleanup and restart.
@@ -396,7 +344,7 @@ func RunAgent(configDirectory string, configuration *models.Configuration, commu
 
 	time.Sleep(time.Second * 3)
 
-	err = rtspClient.Close(ctxRunAgent)
+	err = rtspClient.Close()
 	if err != nil {
 		log.Log.Error("components.Kerberos.RunAgent(): error closing RTSP stream: " + err.Error())
 		time.Sleep(time.Second * 3)
@@ -408,7 +356,7 @@ func RunAgent(configDirectory string, configuration *models.Configuration, commu
 	communication.Queue = nil
 
 	if subStreamEnabled {
-		err = rtspSubClient.Close(ctxRunAgent)
+		err = rtspSubClient.Close()
 		if err != nil {
 			log.Log.Error("components.Kerberos.RunAgent(): error closing RTSP sub stream: " + err.Error())
 			time.Sleep(time.Second * 3)
@@ -419,7 +367,7 @@ func RunAgent(configDirectory string, configuration *models.Configuration, commu
 		communication.SubQueue = nil
 	}
 
-	err = rtspBackChannelClient.Close(ctxRunAgent)
+	err = rtspBackChannelClient.Close()
 	if err != nil {
 		log.Log.Error("components.Kerberos.RunAgent(): error closing RTSP backchannel stream: " + err.Error())
 	}
@@ -707,7 +655,7 @@ func MakeRecording(c *gin.Context, communication *models.Communication) {
 // @Success 200
 func GetSnapshotBase64(c *gin.Context, captureDevice *capture.Capture, configuration *models.Configuration, communication *models.Communication) {
 	// We'll try to get a snapshot from the camera.
-	base64Image := capture.Base64Image(captureDevice, communication, configuration)
+	base64Image := capture.Base64Image(captureDevice, communication)
 	if base64Image != "" {
 		communication.Image = base64Image
 	}
@@ -729,8 +677,7 @@ func GetSnapshotRaw(c *gin.Context, captureDevice *capture.Capture, configuratio
 	image := capture.JpegImage(captureDevice, communication)
 
 	// encode image to jpeg
-	imageResized, _ := utils.ResizeImage(&image, uint(configuration.Config.Capture.IPCamera.BaseWidth), uint(configuration.Config.Capture.IPCamera.BaseHeight))
-	bytes, _ := utils.ImageToBytes(imageResized)
+	bytes, _ := utils.ImageToBytes(&image)
 
 	// Return image/jpeg
 	c.Data(200, "image/jpeg", bytes)
@@ -745,7 +692,7 @@ func GetSnapshotRaw(c *gin.Context, captureDevice *capture.Capture, configuratio
 // @Success 200
 func GetConfig(c *gin.Context, captureDevice *capture.Capture, configuration *models.Configuration, communication *models.Communication) {
 	// We'll try to get a snapshot from the camera.
-	base64Image := capture.Base64Image(captureDevice, communication, configuration)
+	base64Image := capture.Base64Image(captureDevice, communication)
 	if base64Image != "" {
 		communication.Image = base64Image
 	}

machinery/src/computervision/main.go

@@ -21,7 +21,6 @@ func ProcessMotion(motionCursor *packets.QueueCursor, configuration *models.Conf
 
 	var isPixelChangeThresholdReached = false
 	var changesToReturn = 0
-	var motionRectangle models.MotionRectangle
 
 	pixelThreshold := config.Capture.PixelChangeThreshold
 	// Might not be set in the config file, so set it to 150
@@ -63,34 +62,16 @@ func ProcessMotion(motionCursor *packets.QueueCursor, configuration *models.Conf
 			}
 		}
 
-		// A user might have set the base width and height for the IPCamera.
-		// This means also the polygon coordinates are set to a specific width and height (which might be different than the actual packets
-		// received from the IPCamera). So we will resize the polygon coordinates to the base width and height.
-		baseWidthRatio := 1.0
-		baseHeightRatio := 1.0
-		baseWidth := config.Capture.IPCamera.BaseWidth
-		baseHeight := config.Capture.IPCamera.BaseHeight
-		if baseWidth > 0 && baseHeight > 0 {
-			// We'll get the first image to calculate the ratio
-			img := imageArray[0]
-			if img != nil {
-				bounds := img.Bounds()
-				rows := bounds.Dy()
-				cols := bounds.Dx()
-				baseWidthRatio = float64(cols) / float64(baseWidth)
-				baseHeightRatio = float64(rows) / float64(baseHeight)
-			}
-		}
-
 		// Calculate mask
 		var polyObjects []geo.Polygon
+
 		if config.Region != nil {
 			for _, polygon := range config.Region.Polygon {
 				coords := polygon.Coordinates
 				poly := geo.Polygon{}
 				for _, c := range coords {
-					x := c.X * baseWidthRatio
-					y := c.Y * baseHeightRatio
+					x := c.X
+					y := c.Y
 					p := geo.NewPoint(x, y)
 					if !poly.Contains(p) {
 						poly.Add(p)
@@ -151,7 +132,7 @@ func ProcessMotion(motionCursor *packets.QueueCursor, configuration *models.Conf
 					if detectMotion {
 
 						// Remember additional information about the result of findmotion
-						isPixelChangeThresholdReached, changesToReturn, motionRectangle = FindMotion(imageArray, coordinatesToCheck, pixelThreshold)
+						isPixelChangeThresholdReached, changesToReturn = FindMotion(imageArray, coordinatesToCheck, pixelThreshold)
 						if isPixelChangeThresholdReached {
 
 							// If offline mode is disabled, send a message to the hub
@@ -169,7 +150,7 @@ func ProcessMotion(motionCursor *packets.QueueCursor, configuration *models.Conf
 										}
 										payload, err := models.PackageMQTTMessage(configuration, message)
 										if err == nil {
-											mqttClient.Publish("kerberos/hub/"+hubKey, 2, false, payload)
+											mqttClient.Publish("kerberos/hub/"+hubKey, 0, false, payload)
 										} else {
 											log.Log.Info("computervision.main.ProcessMotion(): failed to package MQTT message: " + err.Error())
 										}
@@ -183,7 +164,6 @@ func ProcessMotion(motionCursor *packets.QueueCursor, configuration *models.Conf
 								dataToPass := models.MotionDataPartial{
 									Timestamp:       time.Now().Unix(),
 									NumberOfChanges: changesToReturn,
-									Rectangle:       motionRectangle,
 								}
 								communication.HandleMotion <- dataToPass //Save data to the channel
 							}
@@ -205,58 +185,24 @@ func ProcessMotion(motionCursor *packets.QueueCursor, configuration *models.Conf
 	log.Log.Debug("computervision.main.ProcessMotion(): stop the motion detection.")
 }
 
-func FindMotion(imageArray [3]*image.Gray, coordinatesToCheck []int, pixelChangeThreshold int) (thresholdReached bool, changesDetected int, motionRectangle models.MotionRectangle) {
+func FindMotion(imageArray [3]*image.Gray, coordinatesToCheck []int, pixelChangeThreshold int) (thresholdReached bool, changesDetected int) {
 	image1 := imageArray[0]
 	image2 := imageArray[1]
 	image3 := imageArray[2]
 	threshold := 60
-	changes, motionRectangle := AbsDiffBitwiseAndThreshold(image1, image2, image3, threshold, coordinatesToCheck)
-	return changes > pixelChangeThreshold, changes, motionRectangle
+	changes := AbsDiffBitwiseAndThreshold(image1, image2, image3, threshold, coordinatesToCheck)
+	return changes > pixelChangeThreshold, changes
 }
 
-func AbsDiffBitwiseAndThreshold(img1 *image.Gray, img2 *image.Gray, img3 *image.Gray, threshold int, coordinatesToCheck []int) (int, models.MotionRectangle) {
+func AbsDiffBitwiseAndThreshold(img1 *image.Gray, img2 *image.Gray, img3 *image.Gray, threshold int, coordinatesToCheck []int) int {
 	changes := 0
-	var pixelList [][]int
 	for i := 0; i < len(coordinatesToCheck); i++ {
 		pixel := coordinatesToCheck[i]
 		diff := int(img3.Pix[pixel]) - int(img1.Pix[pixel])
 		diff2 := int(img3.Pix[pixel]) - int(img2.Pix[pixel])
 		if (diff > threshold || diff < -threshold) && (diff2 > threshold || diff2 < -threshold) {
 			changes++
-			// Store the pixel coordinates where the change is detected
-			pixelList = append(pixelList, []int{pixel % img1.Bounds().Dx(), pixel / img1.Bounds().Dx()})
 		}
 	}
-
-	// Calculate rectangle of pixelList (startX, startY, endX, endY)
-	var motionRectangle models.MotionRectangle
-	if len(pixelList) > 0 {
-		startX := pixelList[0][0]
-		startY := pixelList[0][1]
-		endX := startX
-		endY := startY
-		for _, pixel := range pixelList {
-			if pixel[0] < startX {
-				startX = pixel[0]
-			}
-			if pixel[1] < startY {
-				startY = pixel[1]
-			}
-			if pixel[0] > endX {
-				endX = pixel[0]
-			}
-			if pixel[1] > endY {
-				endY = pixel[1]
-			}
-		}
-		log.Log.Debugf("Rectangle of changes detected: startX: %d, startY: %d, endX: %d, endY: %d", startX, startY, endX, endY)
-		motionRectangle = models.MotionRectangle{
-			X:      startX,
-			Y:      startY,
-			Width:  endX - startX,
-			Height: endY - startY,
-		}
-		log.Log.Debugf("Motion rectangle: %+v", motionRectangle)
-	}
-	return changes, motionRectangle
+	return changes
 }

machinery/src/config/main.go

@@ -135,12 +135,6 @@ func OpenConfig(configDirectory string, configuration *models.Configuration) {
 		conjungo.Merge(&kerberosvault, configuration.CustomConfig.KStorage, opts)
 		configuration.Config.KStorage = &kerberosvault
 
-		// Merge Secondary Kerberos Vault settings
-		var kerberosvaultSecondary models.KStorage
-		conjungo.Merge(&kerberosvaultSecondary, configuration.GlobalConfig.KStorageSecondary, opts)
-		conjungo.Merge(&kerberosvaultSecondary, configuration.CustomConfig.KStorageSecondary, opts)
-		configuration.Config.KStorageSecondary = &kerberosvaultSecondary
-
 		// Merge Kerberos S3 settings
 		var s3 models.S3
 		conjungo.Merge(&s3, configuration.GlobalConfig.S3, opts)
@@ -189,19 +183,15 @@ func OpenConfig(configDirectory string, configuration *models.Configuration) {
 			}
 			jsonFile.Close()
 		}
+
 	}
+
 	return
 }
 
 // This function will override the configuration with environment variables.
 func OverrideWithEnvironmentVariables(configuration *models.Configuration) {
 	environmentVariables := os.Environ()
-
-	// Initialize the configuration for some new fields.
-	if configuration.Config.KStorageSecondary == nil {
-		configuration.Config.KStorageSecondary = &models.KStorage{}
-	}
-
 	for _, env := range environmentVariables {
 		if strings.Contains(env, "AGENT_") {
 			key := strings.Split(env, "=")[0]
@@ -239,15 +229,7 @@ func OverrideWithEnvironmentVariables(configuration *models.Configuration) {
 				configuration.Config.Capture.IPCamera.SubRTSP = value
 				break
 
-			/* Base width and height for the liveview and motion regions */
-			case "AGENT_CAPTURE_IPCAMERA_BASE_WIDTH":
-				configuration.Config.Capture.IPCamera.BaseWidth, _ = strconv.Atoi(value)
-				break
-			case "AGENT_CAPTURE_IPCAMERA_BASE_HEIGHT":
-				configuration.Config.Capture.IPCamera.BaseHeight, _ = strconv.Atoi(value)
-				break
-
-			/* ONVIF connnection settings */
+				/* ONVIF connnection settings */
 			case "AGENT_CAPTURE_IPCAMERA_ONVIF":
 				configuration.Config.Capture.IPCamera.ONVIF = value
 				break
@@ -400,11 +382,6 @@ func OverrideWithEnvironmentVariables(configuration *models.Configuration) {
 				configuration.Config.MQTTPassword = value
 				break
 
-			/* MQTT chunking of low-resolution images into multiple messages */
-			case "AGENT_CAPTURE_LIVEVIEW_CHUNKING":
-				configuration.Config.Capture.LiveviewChunking = value
-				break
-
 			/* Real-time streaming of keyframes to a MQTT topic */
 			case "AGENT_REALTIME_PROCESSING":
 				configuration.Config.RealtimeProcessing = value
@@ -459,7 +436,7 @@ func OverrideWithEnvironmentVariables(configuration *models.Configuration) {
 				configuration.Config.S3.Region = value
 				break
 
-			/* When storing in a Vault */
+			/* When storing in a Kerberos Vault */
 			case "AGENT_KERBEROSVAULT_URI":
 				configuration.Config.KStorage.URI = value
 				break
@@ -476,37 +453,6 @@ func OverrideWithEnvironmentVariables(configuration *models.Configuration) {
 				configuration.Config.KStorage.Directory = value
 				break
 
-			/* Retry policy and timeout */
-			case "AGENT_KERBEROSVAULT_MAX_RETRIES":
-				maxRetries, err := strconv.Atoi(value)
-				if err == nil {
-					configuration.Config.KStorage.MaxRetries = maxRetries
-				}
-				break
-			case "AGENT_KERBEROSVAULT_TIMEOUT":
-				timeout, err := strconv.Atoi(value)
-				if err == nil {
-					configuration.Config.KStorage.Timeout = timeout
-				}
-				break
-
-			/* When storing in a secondary Vault */
-			case "AGENT_KERBEROSVAULT_SECONDARY_URI":
-				configuration.Config.KStorageSecondary.URI = value
-				break
-			case "AGENT_KERBEROSVAULT_SECONDARY_ACCESS_KEY":
-				configuration.Config.KStorageSecondary.AccessKey = value
-				break
-			case "AGENT_KERBEROSVAULT_SECONDARY_SECRET_KEY":
-				configuration.Config.KStorageSecondary.SecretAccessKey = value
-				break
-			case "AGENT_KERBEROSVAULT_SECONDARY_PROVIDER":
-				configuration.Config.KStorageSecondary.Provider = value
-				break
-			case "AGENT_KERBEROSVAULT_SECONDARY_DIRECTORY":
-				configuration.Config.KStorageSecondary.Directory = value
-				break
-
 			/* When storing in dropbox */
 			case "AGENT_DROPBOX_ACCESS_TOKEN":
 				configuration.Config.Dropbox.AccessToken = value
@@ -532,26 +478,9 @@ func OverrideWithEnvironmentVariables(configuration *models.Configuration) {
 			case "AGENT_ENCRYPTION_SYMMETRIC_KEY":
 				configuration.Config.Encryption.SymmetricKey = value
 				break
-
-			/* When signing is enabled */
-			case "AGENT_SIGNING":
-				configuration.Config.Signing.Enabled = value
-				break
-			case "AGENT_SIGNING_PRIVATE_KEY":
-				signingPrivateKey := strings.ReplaceAll(value, "\\n", "\n")
-				configuration.Config.Signing.PrivateKey = signingPrivateKey
-				break
 			}
 		}
 	}
-
-	// Signing is a new feature, so if empty we set default values.
-	if configuration.Config.Signing == nil || configuration.Config.Signing.PrivateKey == "" {
-		configuration.Config.Signing = &models.Signing{
-			Enabled:    "true",
-			PrivateKey: "-----BEGIN PRIVATE KEY-----\nMIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQDoSxjyw08lRxF4Yoqmcaewjq3XjB55dMy4tlN5MGLdr8aAPuNR9Mwh3jlh1bDpwQXNgZkHDV/q9bpdPGGi7SQo2xw+rDuo5Y1f3wdzz+iuCTPbzoGFalE+1PZlU5TEtUtlbt7MRc4pxTaLP3u0P3EtW3KnzcUarcJWZJYxzv7gqVNCA/47BN+1ptqjwz3LAlah5yaftEvVjkaANOsafUswbS4VT44XfSlbKgebORCKDuNgQiyhuV5gU+J0TOaqRWwwMAWV0UoScyJLfhHRBCrUwrCUTwqH9jfkB7pgRFsYoZJd4MKMeHJjFSum+QXCBqInSnwu8c2kJChiLMWqJ+mhpTdfUAmSkeUSStfbbcavIPbDABvMgzOcmYMIVXXe57twU0xdu3AqWLtc9kw1BkUgZblM9pSSpYrIDheEyMs2/hiLgXsIaM0nVQtqwrA7rbeEGuPblzA6hvHgwN9K6HaBqdlGSlpYZ0v3SWIMwmxRB+kIojlyuggm8Qa4mqL97GFDGl6gOBGlNUFTBUVEa3EaJ7NJpGobRGsh/9dXzcW4aYmT9WxlzTlIKksI1ro6KdRfuVWfEs4AnG8bVEJmofK8EUrueB9IdXlcJZB49xolnOZPFohtMe/0U7evQOQP3sZnX+KotCsE7OXJvL09oF58JKoqmK9lPp0+pFBU4g6NjQIDAQABAoICAA+RSWph1t+q5R3nxUxFTYMrhv5IjQe2mDxJpF3B409zolC9OHxgGUisobTY3pBqs0DtKbxUeH2A0ehUH/axEosWHcz3cmIbgxHE9kdlJ9B3Lmss6j/uw+PWutu1sgm5phaIFIvuNNRWhPB6yXUwU4sLRat1+Z9vTmIQiKdtLIrtJz/n2VDvrJxn1N+yAsE20fnrksFKyZuxVsJaZPiX/t5Yv1/z0LjFjVoL7GUA5/Si7csN4ftqEhUrkNr2BvcZlTyffrF4lZCXrtl76RNUaxhqIu3H0gFbV2UfBpuckkfAhNRpXJ4iFSxm4nQbk4ojV8+l21RFOBeDN2Z7Ocu6auP5MnzpopR66vmDCmPoid498VGgDzFQEVkOar8WAa4v9h85QgLKrth6FunmaWJUT6OggQD3yY58GSwp5+ARMETMBP2x6Eld+PGgqoJvPT1+l/e9gOw7/SJ+Wz6hRXZAm/eiXMppHtB7sfea5rscNanPjJkK9NvPM0MX9cq/iA6QjXuETkMbubjo+Cxk3ydZiIQmWQDAx/OgxTyHbeRCVhLPcAphX0clykCuHZpI9Mvvj643/LoE0mjTByWJXf/WuGJA8ElHkjSdokVJ7jumz8OZZHfq0+V7+la2opsObeQANHW5MLWrnHlRVzTGV0IRZDXh7h1ptUJ4ubdvw/GJ2NeTAoIBAQD0lXXdjYKWC4uZ4YlgydP8b1CGda9cBV5RcPt7q9Ya1R2E4ieYyohmzltopvdaOXdsTZzhtdzOzKF+2qNcbBKhBTleYZ8GN5RKbo7HwXWpzfCTjseKHOD/QPwvBKXzLVWNtXn1NrLR79Rv0wbkYF6DtoqpEPf5kMs4bx79yW+mz8FUgdEeMjKphx6Jd5RYlTUxS64K6bnK7gjHNCF2cwdxsh4B6EB649GKeNz4JXi+oQBmOcX5ncXnkJrbju+IjtCkQ40HINVNdX7XeEaaw6KGaImVjw61toPUuDaioYUojufayoyXaUJnDbHQ2tNekEpq5iwnenZCbUKWmSeRe7dLAoIBAQDzIscYujsrmPxiTj2prhG0v36NRNP99mShnnJGowiIs+UBS0EMdOmBFa2sC9uFs/VnreQNYPDJdfr7O5VK9kfbH/PSiiKJ+wVebfdAlWkJYH27JN2Kl2l/OsvRVelNvF3BWIYF46qzGxIM0axaz3T2ZAJ9SrUgeAYhak6uyM4fbexEWXxDgPGu6C0jB6IAzmHJnnh+j5+4ZXqjVyUxBYtUsWXF/TXomVcT9jxj7aUmS2/Us0XTVOVNpALqqYcekrzsX/wX0OEi5HkivYXHcNaDHx3NuUf6KdYof5DwPUM76qe+5/kWlSIHP3M6rIFK3pYFUnkHn2E8jNWcO97Aio+HAoIBAA+bcff/TbPxbKkXIUMR3fsfx02tONFwbkJYKVQM9Q6lRsrx+4Dee7HDvUWCUgpp3FsG4NnuVvbDTBLiNMZzBwVLZgvFwvYMmePeBjJs/+sj/xQLamQ/z4O6S91cOJK589mlGPEy2lpXKYExQCFWnPFetp5vPMOqH62sOZgMQJmubDHOTt/UaDM1Mhenj8nPS6OnpqV/oKF4awr7Ip+CW5k/unZ4sZSl8PsbF06mZXwUngfn6+Av1y8dpSQZjONz6ZBx1w/7YmEc/EkXnbnGfhqBlTX7+P5TdTofvyzFjc+2vsjRYANRbjFRSGWBcTd5kaYcpfim8eDvQ+6EO2gnMt0CggEAH2ln1Y8B5AEQ4lZ/avOdP//ZhsDUrqPtnl/NHckkahzrwj4JumVEYbP+SxMBGoYEd4+kvgG/OhfvBBRPlm65G9tF8fZ8vdzbdba5UfO7rUV1GP+LS8OCErjy6imySaPDbR5Vul8Oh7NAor1YCidxUf/bvnovanF3QUvtvHEfCDp4YuA4yLPZBaLjaforePUw9w5tPNSravRZYs74dBvmQ1vj7S9ojpN5B5AxfyuNwaPPX+iFZec69MvywISEe3Ozysof1Kfc3lgsOkvIA9tVK32SqSh93xkWnQbWH+OaUxxe7bAko0FDMzKEXZk53wVg1nEwR8bUljEPy+6EOdXs8wKCAQEAsEOWYMY5m7HkeG2XTTvX7ECmmdGl/c4ZDVwzB4IPxqUG7XfLmtsON8YoKOEUpJoc4ANafLXzmU+esUGbH4Ph22IWgP9jzws7jxaN/Zoku64qrSjgEZFTRIpKyhFk/ImWbS9laBW4l+m0tqTTRqoE0QEJf/2uv/04q65zrA70X9z2+KTrAtqOiRQPWl/IxRe9U4OEeGL+oD+YlXKCDsnJ3rwUIOZgJx0HWZg7K35DKwqs1nVi56FBdljiTRKAjVLRedjgDCSfGS1yUZ3krHzpaPt1qgnT3rdtYcIdbYDr66V2/gEEaz6XMGHuTk/ewjzUJxq9UTVeXOCbkRPXgVJg1w==\n-----END PRIVATE KEY-----",
-		}
-	}
 }
 
 func SaveConfig(configDirectory string, config models.Config, configuration *models.Configuration, communication *models.Communication) error {
@@ -591,10 +520,6 @@ func StoreConfig(configDirectory string, config models.Config) error {
 		config.Encryption.PrivateKey = encryptionPrivateKey
 	}
 
-	// Reset the basewidth and baseheight
-	config.Capture.IPCamera.BaseWidth = 0
-	config.Capture.IPCamera.BaseHeight = 0
-
 	// Save into database
 	if os.Getenv("DEPLOYMENT") == "factory" || os.Getenv("MACHINERY_ENVIRONMENT") == "kubernetes" {
 		// Write to mongodb

machinery/src/log/main.go

@@ -118,16 +118,6 @@ func (self *Logging) Info(sentence string) {
 	}
 }
 
-func (self *Logging) Infof(format string, args ...interface{}) {
-	switch self.Logger {
-	case "go-logging":
-		gologging.Infof(format, args...)
-	case "logrus":
-		logrus.Infof(format, args...)
-	default:
-	}
-}
-
 func (self *Logging) Warning(sentence string) {
 	switch self.Logger {
 	case "go-logging":
@@ -148,16 +138,6 @@ func (self *Logging) Debug(sentence string) {
 	}
 }
 
-func (self *Logging) Debugf(format string, args ...interface{}) {
-	switch self.Logger {
-	case "go-logging":
-		gologging.Debugf(format, args...)
-	case "logrus":
-		logrus.Debugf(format, args...)
-	default:
-	}
-}
-
 func (self *Logging) Error(sentence string) {
 	switch self.Logger {
 	case "go-logging":

machinery/src/models/Config.go

@@ -28,7 +28,6 @@ type Config struct {
 	Cloud                   string       `json:"cloud" bson:"cloud"`
 	S3                      *S3          `json:"s3,omitempty" bson:"s3,omitempty"`
 	KStorage                *KStorage    `json:"kstorage,omitempty" bson:"kstorage,omitempty"`
-	KStorageSecondary       *KStorage    `json:"kstorage_secondary,omitempty" bson:"kstorage_secondary,omitempty"`
 	Dropbox                 *Dropbox     `json:"dropbox,omitempty" bson:"dropbox,omitempty"`
 	MQTTURI                 string       `json:"mqtturi" bson:"mqtturi,omitempty"`
 	MQTTUsername            string       `json:"mqtt_username" bson:"mqtt_username"`
@@ -46,7 +45,6 @@ type Config struct {
 	HubSite                 string       `json:"hub_site" bson:"hub_site"`
 	ConditionURI            string       `json:"condition_uri" bson:"condition_uri"`
 	Encryption              *Encryption  `json:"encryption,omitempty" bson:"encryption,omitempty"`
-	Signing                 *Signing     `json:"signing,omitempty" bson:"signing,omitempty"`
 	RealtimeProcessing      string       `json:"realtimeprocessing,omitempty" bson:"realtimeprocessing,omitempty"`
 	RealtimeProcessingTopic string       `json:"realtimeprocessing_topic" bson:"realtimeprocessing_topic"`
 }
@@ -62,11 +60,9 @@ type Capture struct {
 	Snapshots             string      `json:"snapshots,omitempty"`
 	Motion                string      `json:"motion,omitempty"`
 	Liveview              string      `json:"liveview,omitempty"`
-	LiveviewChunking      string      `json:"liveview_chunking,omitempty" bson:"liveview_chunking,omitempty"`
 	Continuous            string      `json:"continuous,omitempty"`
 	PostRecording         int64       `json:"postrecording"`
 	PreRecording          int64       `json:"prerecording"`
-	GopSize               int         `json:"gopsize,omitempty" bson:"gopsize,omitempty"` // GOP size in seconds, used for pre-recording
 	MaxLengthRecording    int64       `json:"maxlengthrecording"`
 	TranscodingWebRTC     string      `json:"transcodingwebrtc"`
 	TranscodingResolution int64       `json:"transcodingresolution"`
@@ -79,28 +75,18 @@ type Capture struct {
 // IPCamera configuration, such as the RTSP url of the IPCamera and the FPS.
 // Also includes ONVIF integration
 type IPCamera struct {
-	RTSP   string `json:"rtsp"`
-	Width  int    `json:"width"`
-	Height int    `json:"height"`
-	FPS    string `json:"fps"`
-
-	SubRTSP   string `json:"sub_rtsp"`
-	SubWidth  int    `json:"sub_width"`
-	SubHeight int    `json:"sub_height"`
-
-	BaseWidth  int `json:"base_width"`
-	BaseHeight int `json:"base_height"`
-
-	SubFPS        string   `json:"sub_fps"`
-	ONVIF         string   `json:"onvif,omitempty" bson:"onvif"`
-	ONVIFXAddr    string   `json:"onvif_xaddr" bson:"onvif_xaddr"`
-	ONVIFUsername string   `json:"onvif_username" bson:"onvif_username"`
-	ONVIFPassword string   `json:"onvif_password" bson:"onvif_password"`
-	SPSNALUs      [][]byte `json:"sps_nalus,omitempty" bson:"sps_nalus,omitempty"`
-	PPSNALUs      [][]byte `json:"pps_nalus,omitempty" bson:"pps_nalus,omitempty"`
-	VPSNALUs      [][]byte `json:"vps_nalus,omitempty" bson:"vps_nalus,omitempty"`
-	SampleRate    int      `json:"sample_rate,omitempty" bson:"sample_rate,omitempty"`
-	Channels      int      `json:"channels,omitempty" bson:"channels,omitempty"`
+	RTSP          string `json:"rtsp"`
+	Width         int    `json:"width"`
+	Height        int    `json:"height"`
+	FPS           string `json:"fps"`
+	SubRTSP       string `json:"sub_rtsp"`
+	SubWidth      int    `json:"sub_width"`
+	SubHeight     int    `json:"sub_height"`
+	SubFPS        string `json:"sub_fps"`
+	ONVIF         string `json:"onvif,omitempty" bson:"onvif"`
+	ONVIFXAddr    string `json:"onvif_xaddr" bson:"onvif_xaddr"`
+	ONVIFUsername string `json:"onvif_username" bson:"onvif_username"`
+	ONVIFPassword string `json:"onvif_password" bson:"onvif_password"`
 }
 
 // USBCamera configuration, such as the device path (/dev/video*)
@@ -172,8 +158,6 @@ type KStorage struct {
 	SecretAccessKey string `json:"secret_access_key,omitempty" bson:"secret_access_key,omitempty"`
 	Provider        string `json:"provider,omitempty" bson:"provider,omitempty"`
 	Directory       string `json:"directory,omitempty" bson:"directory,omitempty"`
-	MaxRetries      int    `json:"max_retries,omitempty" bson:"max_retries,omitempty"`
-	Timeout         int    `json:"timeout,omitempty" bson:"timeout,omitempty"`
 }
 
 // Dropbox integration
@@ -190,9 +174,3 @@ type Encryption struct {
 	PrivateKey   string `json:"private_key" bson:"private_key"`
 	SymmetricKey string `json:"symmetric_key" bson:"symmetric_key"`
 }
-
-// Signing
-type Signing struct {
-	Enabled    string `json:"enabled" bson:"enabled"`
-	PrivateKey string `json:"private_key" bson:"private_key"`
-}

machinery/src/models/MQTT.go

@@ -132,7 +132,6 @@ type Message struct {
 // The payload structure which is used to send over
 // and receive messages from the MQTT broker
 type Payload struct {
-	Version        string                 `json:"version"` // Version of the message, e.g. "1.0"
 	Action         string                 `json:"action"`
 	DeviceId       string                 `json:"device_id"`
 	Signature      string                 `json:"signature"`

machinery/src/models/motion_data.go

@@ -1,9 +1,8 @@
 package models
 
 type MotionDataPartial struct {
-	Timestamp       int64           `json:"timestamp" bson:"timestamp"`
-	NumberOfChanges int             `json:"numberOfChanges" bson:"numberOfChanges"`
-	Rectangle       MotionRectangle `json:"rectangle" bson:"rectangle"`
+	Timestamp       int64 `json:"timestamp" bson:"timestamp"`
+	NumberOfChanges int   `json:"numberOfChanges" bson:"numberOfChanges"`
 }
 
 type MotionDataFull struct {
@@ -15,10 +14,3 @@ type MotionDataFull struct {
 	NumberOfChanges int     `json:"numberOfChanges" bson:"numberOfChanges"`
 	Token           int     `json:"token" bson:"token"`
 }
-
-type MotionRectangle struct {
-	X      int `json:"x" bson:"x"`
-	Y      int `json:"y" bson:"y"`
-	Width  int `json:"width" bson:"width"`
-	Height int `json:"height" bson:"height"`
-}

machinery/src/packets/packet.go

@@ -17,7 +17,5 @@ type Packet struct {
 	CompositionTime int64  // packet presentation time minus decode time for H264 B-Frame
 	Time            int64  // packet decode time
 	TimeLegacy      time.Duration
-	CurrentTime     int64  // current time in milliseconds (UNIX timestamp)
 	Data            []byte // packet data
-	Gopsize         int    // size of the GOP
 }

machinery/src/packets/queue.go

@@ -45,11 +45,6 @@ func (self *Queue) SetMaxGopCount(n int) {
 	return
 }
 
-func (self *Queue) GetMaxGopCount() int {
-	n := self.maxgopcount
-	return n
-}
-
 func (self *Queue) WriteHeader(streams []Stream) error {
 	self.lock.Lock()
 

machinery/src/packets/stream.go

@@ -1,9 +1,6 @@
 package packets
 
 type Stream struct {
-	// The ID of the stream.
-	Index int `json:"index" bson:"index"`
-
 	// The name of the stream.
 	Name string
 
@@ -42,13 +39,4 @@ type Stream struct {
 
 	// IsBackChannel is true if this stream is a back channel.
 	IsBackChannel bool
-
-	// SampleRate is the sample rate of the audio stream.
-	SampleRate int
-
-	// Channels is the number of audio channels.
-	Channels int
-
-	// GopSize is the size of the GOP (Group of Pictures).
-	GopSize int
 }

machinery/src/routers/http/routes.go

@@ -15,7 +15,7 @@ import (
 func AddRoutes(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware, configDirectory string, configuration *models.Configuration, communication *models.Communication, captureDevice *capture.Capture) *gin.RouterGroup {
 
 	r.GET("/ws", func(c *gin.Context) {
-		websocket.WebsocketHandler(c, configuration, communication, captureDevice)
+		websocket.WebsocketHandler(c, communication, captureDevice)
 	})
 
 	// This is legacy should be removed in future! Now everything
@@ -54,21 +54,16 @@ func AddRoutes(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware, configDirect
 			components.UpdateConfig(c, configDirectory, configuration, communication)
 		})
 
-		// Will verify the hub settings.
+		// Will verify the current hub settings.
 		api.POST("/hub/verify", func(c *gin.Context) {
 			cloud.VerifyHub(c)
 		})
 
-		// Will verify the persistence settings.
+		// Will verify the current persistence settings.
 		api.POST("/persistence/verify", func(c *gin.Context) {
 			cloud.VerifyPersistence(c, configDirectory)
 		})
 
-		// Will verify the secondary persistence settings.
-		api.POST("/persistence/secondary/verify", func(c *gin.Context) {
-			cloud.VerifySecondaryPersistence(c, configDirectory)
-		})
-
 		// Camera specific methods. Doesn't require any authorization.
 		// These are available for anyone, but require the agent, to reach
 		// the camera.

machinery/src/routers/mqtt/main.go

@@ -123,6 +123,7 @@ func ConfigureMQTT(configDirectory string, configuration *models.Configuration,
 			opts.SetClientID(mqttClientID)
 			log.Log.Info("routers.mqtt.main.ConfigureMQTT(): Set ClientID " + mqttClientID)
 			rand.Seed(time.Now().UnixNano())
+			webrtc.CandidateArrays = make(map[string](chan string))
 
 			opts.OnConnect = func(c mqtt.Client) {
 				// We managed to connect to the MQTT broker, hurray!
@@ -340,7 +341,7 @@ func HandleGetPTZPosition(mqttClient mqtt.Client, hubKey string, payload models.
 			}
 			payload, err := models.PackageMQTTMessage(configuration, message)
 			if err == nil {
-				mqttClient.Publish("kerberos/hub/"+hubKey, 2, false, payload)
+				mqttClient.Publish("kerberos/hub/"+hubKey, 0, false, payload)
 			} else {
 				log.Log.Info("routers.mqtt.main.HandlePTZPosition(): something went wrong while sending position to hub: " + string(payload))
 			}
@@ -388,6 +389,13 @@ func HandleRequestConfig(mqttClient mqtt.Client, hubKey string, payload models.P
 			// Copy the config, as we don't want to share the encryption part.
 			deepCopy := configuration.Config
 
+			// We need a fix for the width and height if a substream.
+			// The ROI requires the width and height of the sub stream.
+			if configuration.Config.Capture.IPCamera.SubRTSP != "" {
+				deepCopy.Capture.IPCamera.Width = configuration.Config.Capture.IPCamera.SubWidth
+				deepCopy.Capture.IPCamera.Height = configuration.Config.Capture.IPCamera.SubHeight
+			}
+
 			var configMap map[string]interface{}
 			inrec, _ := json.Marshal(deepCopy)
 			json.Unmarshal(inrec, &configMap)
@@ -404,7 +412,7 @@ func HandleRequestConfig(mqttClient mqtt.Client, hubKey string, payload models.P
 			}
 			payload, err := models.PackageMQTTMessage(configuration, message)
 			if err == nil {
-				mqttClient.Publish("kerberos/hub/"+hubKey, 2, false, payload)
+				mqttClient.Publish("kerberos/hub/"+hubKey, 0, false, payload)
 			} else {
 				log.Log.Info("routers.mqtt.main.HandleRequestConfig(): something went wrong while sending config to hub: " + string(payload))
 			}
@@ -443,7 +451,7 @@ func HandleUpdateConfig(mqttClient mqtt.Client, hubKey string, payload models.Pa
 			}
 			payload, err := models.PackageMQTTMessage(configuration, message)
 			if err == nil {
-				mqttClient.Publish("kerberos/hub/"+hubKey, 2, false, payload)
+				mqttClient.Publish("kerberos/hub/"+hubKey, 0, false, payload)
 			} else {
 				log.Log.Info("routers.mqtt.main.HandleUpdateConfig(): something went wrong while sending acknowledge config to hub: " + string(payload))
 			}

machinery/src/routers/websocket/main.go

@@ -49,7 +49,7 @@ var upgrader = websocket.Upgrader{
 	},
 }
 
-func WebsocketHandler(c *gin.Context, configuration *models.Configuration, communication *models.Communication, captureDevice *capture.Capture) {
+func WebsocketHandler(c *gin.Context, communication *models.Communication, captureDevice *capture.Capture) {
 	w := c.Writer
 	r := c.Request
 	conn, err := upgrader.Upgrade(w, r, nil)
@@ -112,7 +112,7 @@ func WebsocketHandler(c *gin.Context, configuration *models.Configuration, commu
 
 						ctx, cancel := context.WithCancel(context.Background())
 						sockets[clientID].Cancels["stream-sd"] = cancel
-						go ForwardSDStream(ctx, clientID, sockets[clientID], configuration, communication, captureDevice)
+						go ForwardSDStream(ctx, clientID, sockets[clientID], communication, captureDevice)
 					}
 				}
 			}
@@ -131,7 +131,7 @@ func WebsocketHandler(c *gin.Context, configuration *models.Configuration, commu
 	}
 }
 
-func ForwardSDStream(ctx context.Context, clientID string, connection *Connection, configuration *models.Configuration, communication *models.Communication, captureDevice *capture.Capture) {
+func ForwardSDStream(ctx context.Context, clientID string, connection *Connection, communication *models.Communication, captureDevice *capture.Capture) {
 
 	var queue *packets.Queue
 	var cursor *packets.QueueCursor
@@ -159,10 +159,7 @@ logreader:
 				var img image.YCbCr
 				img, err = (*rtspClient).DecodePacket(pkt)
 				if err == nil {
-					config := configuration.Config
-					// Resize the image to the base width and height
-					imageResized, _ := utils.ResizeImage(&img, uint(config.Capture.IPCamera.BaseWidth), uint(config.Capture.IPCamera.BaseHeight))
-					bytes, _ := utils.ImageToBytes(imageResized)
+					bytes, _ := utils.ImageToBytes(&img)
 					encodedImage = base64.StdEncoding.EncodeToString(bytes)
 				} else {
 					continue

machinery/src/utils/main.go

@@ -21,11 +21,9 @@ import (
 	"github.com/kerberos-io/agent/machinery/src/encryption"
 	"github.com/kerberos-io/agent/machinery/src/log"
 	"github.com/kerberos-io/agent/machinery/src/models"
-
-	"github.com/nfnt/resize"
 )
 
-const VERSION = "3.5.0"
+const VERSION = "3.2.6"
 
 const letterBytes = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 
@@ -403,31 +401,9 @@ func Decrypt(directoryOrFile string, symmetricKey []byte) {
 	}
 }
 
-func ImageToBytes(img *image.Image) ([]byte, error) {
+func ImageToBytes(img image.Image) ([]byte, error) {
 	buffer := new(bytes.Buffer)
 	w := bufio.NewWriter(buffer)
-	err := jpeg.Encode(w, *img, &jpeg.Options{Quality: 35})
-	log.Log.Debug("ImageToBytes() - buffer size: " + strconv.Itoa(buffer.Len()))
+	err := jpeg.Encode(w, img, &jpeg.Options{Quality: 15})
 	return buffer.Bytes(), err
 }
-
-func ResizeImage(img image.Image, newWidth uint, newHeight uint) (*image.Image, error) {
-	if img == nil {
-		return nil, errors.New("image is nil")
-	}
-
-	// resize to width 640 using Lanczos resampling
-	// and preserve aspect ratio
-	m := resize.Resize(newWidth, newHeight, img, resize.Lanczos3)
-	return &m, nil
-}
-
-func ResizeHeightWithAspectRatio(newWidth int, width int, height int) (int, int) {
-	if newWidth <= 0 || width <= 0 || height <= 0 {
-		return width, height
-	}
-	// Calculate the new height based on the aspect ratio
-	newHeight := (newWidth * height) / width
-	// Return the new dimensions
-	return newWidth, newHeight
-}

machinery/src/webrtc/main.go

@@ -1,7 +1,6 @@
 package webrtc
 
 import (
-	"context"
 	"encoding/base64"
 	"encoding/json"
 	"io"
@@ -17,109 +16,17 @@ import (
 	"github.com/kerberos-io/agent/machinery/src/packets"
 
 	mqtt "github.com/eclipse/paho.mqtt.golang"
-	"github.com/pion/interceptor"
-	"github.com/pion/interceptor/pkg/intervalpli"
 	pionWebRTC "github.com/pion/webrtc/v4"
 	pionMedia "github.com/pion/webrtc/v4/pkg/media"
 )
 
-const (
-	// Channel buffer sizes
-	candidateChannelBuffer = 100
-	rtcpBufferSize         = 1500
-
-	// Timeouts and intervals
-	keepAliveTimeout = 15 * time.Second
-	defaultTimeout   = 10 * time.Second
-
-	// Track identifiers
-	trackStreamID = "kerberos-stream"
-)
-
-// ConnectionManager manages WebRTC peer connections in a thread-safe manner
-type ConnectionManager struct {
-	mu                  sync.RWMutex
-	candidateChannels   map[string]chan string
-	peerConnections     map[string]*peerConnectionWrapper
+var (
+	CandidatesMutex     sync.Mutex
+	CandidateArrays     map[string](chan string)
 	peerConnectionCount int64
-}
-
-// peerConnectionWrapper wraps a peer connection with additional metadata
-type peerConnectionWrapper struct {
-	conn      *pionWebRTC.PeerConnection
-	cancelCtx context.CancelFunc
-	done      chan struct{}
-}
-
-var globalConnectionManager = NewConnectionManager()
-
-// NewConnectionManager creates a new connection manager
-func NewConnectionManager() *ConnectionManager {
-	return &ConnectionManager{
-		candidateChannels: make(map[string]chan string),
-		peerConnections:   make(map[string]*peerConnectionWrapper),
-	}
-}
-
-// GetOrCreateCandidateChannel gets or creates a candidate channel for a session
-func (cm *ConnectionManager) GetOrCreateCandidateChannel(sessionKey string) chan string {
-	cm.mu.Lock()
-	defer cm.mu.Unlock()
-
-	if ch, exists := cm.candidateChannels[sessionKey]; exists {
-		return ch
-	}
-
-	ch := make(chan string, candidateChannelBuffer)
-	cm.candidateChannels[sessionKey] = ch
-	return ch
-}
-
-// CloseCandidateChannel safely closes and removes a candidate channel
-func (cm *ConnectionManager) CloseCandidateChannel(sessionKey string) {
-	cm.mu.Lock()
-	defer cm.mu.Unlock()
-
-	if ch, exists := cm.candidateChannels[sessionKey]; exists {
-		close(ch)
-		delete(cm.candidateChannels, sessionKey)
-	}
-}
-
-// AddPeerConnection adds a peer connection to the manager
-func (cm *ConnectionManager) AddPeerConnection(sessionID string, wrapper *peerConnectionWrapper) {
-	cm.mu.Lock()
-	defer cm.mu.Unlock()
-	cm.peerConnections[sessionID] = wrapper
-}
-
-// RemovePeerConnection removes a peer connection from the manager
-func (cm *ConnectionManager) RemovePeerConnection(sessionID string) {
-	cm.mu.Lock()
-	defer cm.mu.Unlock()
-
-	if wrapper, exists := cm.peerConnections[sessionID]; exists {
-		if wrapper.cancelCtx != nil {
-			wrapper.cancelCtx()
-		}
-		delete(cm.peerConnections, sessionID)
-	}
-}
-
-// GetPeerConnectionCount returns the current count of active peer connections
-func (cm *ConnectionManager) GetPeerConnectionCount() int64 {
-	return atomic.LoadInt64(&cm.peerConnectionCount)
-}
-
-// IncrementPeerCount atomically increments the peer connection count
-func (cm *ConnectionManager) IncrementPeerCount() int64 {
-	return atomic.AddInt64(&cm.peerConnectionCount, 1)
-}
-
-// DecrementPeerCount atomically decrements the peer connection count
-func (cm *ConnectionManager) DecrementPeerCount() int64 {
-	return atomic.AddInt64(&cm.peerConnectionCount, -1)
-}
+	peerConnections     map[string]*pionWebRTC.PeerConnection
+	//encoder             *ffmpeg.VideoEncoder
+)
 
 type WebRTC struct {
 	Name                  string
@@ -131,6 +38,24 @@ type WebRTC struct {
 	PacketsCount          chan int
 }
 
+// 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)
+	if err != nil {
+		return
+	}
+	if encoder == nil {
+		err = fmt.Errorf("Video encoder not found")
+		return
+	}
+	encoder.SetFramerate(30, 1)
+	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{
 		Name:                  name,
@@ -138,7 +63,8 @@ func CreateWebRTC(name string, stunServers []string, turnServers []string, turnS
 		TurnServers:           turnServers,
 		TurnServersUsername:   turnServersUsername,
 		TurnServersCredential: turnServersCredential,
-		Timer:                 time.NewTimer(defaultTimeout),
+		Timer:                 time.NewTimer(time.Second * 10),
+		PacketsCount:          make(chan int),
 	}
 }
 
@@ -160,27 +86,19 @@ func (w WebRTC) CreateOffer(sd []byte) pionWebRTC.SessionDescription {
 }
 
 func RegisterCandidates(key string, candidate models.ReceiveHDCandidatesPayload) {
-	ch := globalConnectionManager.GetOrCreateCandidateChannel(key)
-
-	log.Log.Info("webrtc.main.RegisterCandidates(): " + candidate.Candidate)
+	// Set lock
+	CandidatesMutex.Lock()
+	_, ok := CandidateArrays[key]
+	if !ok {
+		CandidateArrays[key] = make(chan string)
+	}
+	log.Log.Info("webrtc.main.HandleReceiveHDCandidates(): " + candidate.Candidate)
 	select {
-	case ch <- candidate.Candidate:
+	case CandidateArrays[key] <- candidate.Candidate:
 	default:
-		log.Log.Info("webrtc.main.RegisterCandidates(): channel is full, dropping candidate")
+		log.Log.Info("webrtc.main.HandleReceiveHDCandidates(): channel is full.")
 	}
-}
-
-func RegisterDefaultInterceptors(mediaEngine *pionWebRTC.MediaEngine, interceptorRegistry *interceptor.Registry) error {
-	if err := pionWebRTC.ConfigureNack(mediaEngine, interceptorRegistry); err != nil {
-		return err
-	}
-	if err := pionWebRTC.ConfigureRTCPReports(interceptorRegistry); err != nil {
-		return err
-	}
-	if err := pionWebRTC.ConfigureSimulcastExtensionHeaders(mediaEngine); err != nil {
-		return err
-	}
-	return nil
+	CandidatesMutex.Unlock()
 }
 
 func InitializeWebRTCConnection(configuration *models.Configuration, communication *models.Communication, mqttClient mqtt.Client, videoTrack *pionWebRTC.TrackLocalStaticSample, audioTrack *pionWebRTC.TrackLocalStaticSample, handshake models.RequestHDStreamPayload) {
@@ -194,7 +112,12 @@ func InitializeWebRTCConnection(configuration *models.Configuration, communicati
 
 	// We create a channel which will hold the candidates for this session.
 	sessionKey := config.Key + "/" + handshake.SessionID
-	candidateChannel := globalConnectionManager.GetOrCreateCandidateChannel(sessionKey)
+	CandidatesMutex.Lock()
+	_, ok := CandidateArrays[sessionKey]
+	if !ok {
+		CandidateArrays[sessionKey] = make(chan string)
+	}
+	CandidatesMutex.Unlock()
 
 	// Set variables
 	hubKey := handshake.HubKey
@@ -211,31 +134,7 @@ func InitializeWebRTCConnection(configuration *models.Configuration, communicati
 			log.Log.Error("webrtc.main.InitializeWebRTCConnection(): something went wrong registering codecs for media engine: " + err.Error())
 		}
 
-		// Create a InterceptorRegistry. This is the user configurable RTP/RTCP Pipeline.
-		// This provides NACKs, RTCP Reports and other features. If you use `webrtc.NewPeerConnection`
-		// this is enabled by default. If you are manually managing You MUST create a InterceptorRegistry
-		// for each PeerConnection.
-		interceptorRegistry := &interceptor.Registry{}
-
-		// Use the default set of Interceptors
-		if err := pionWebRTC.RegisterDefaultInterceptors(mediaEngine, interceptorRegistry); err != nil {
-			panic(err)
-		}
-
-		// Register a intervalpli factory
-		// This interceptor sends a PLI every 3 seconds. A PLI causes a video keyframe to be generated by the sender.
-		// This makes our video seekable and more error resilent, but at a cost of lower picture quality and higher bitrates
-		// A real world application should process incoming RTCP packets from viewers and forward them to senders
-		intervalPliFactory, err := intervalpli.NewReceiverInterceptor()
-		if err != nil {
-			panic(err)
-		}
-		interceptorRegistry.Add(intervalPliFactory)
-
-		api := pionWebRTC.NewAPI(
-			pionWebRTC.WithMediaEngine(mediaEngine),
-			pionWebRTC.WithInterceptorRegistry(interceptorRegistry),
-		)
+		api := pionWebRTC.NewAPI(pionWebRTC.WithMediaEngine(mediaEngine))
 
 		policy := pionWebRTC.ICETransportPolicyAll
 		if config.ForceTurn == "true" {
@@ -260,128 +159,48 @@ func InitializeWebRTCConnection(configuration *models.Configuration, communicati
 
 		if err == nil && peerConnection != nil {
 
-			// Create context for this connection
-			ctx, cancel := context.WithCancel(context.Background())
-			wrapper := &peerConnectionWrapper{
-				conn:      peerConnection,
-				cancelCtx: cancel,
-				done:      make(chan struct{}),
+			if _, err = peerConnection.AddTrack(videoTrack); err != nil {
+				log.Log.Error("webrtc.main.InitializeWebRTCConnection(): something went wrong while adding video track: " + err.Error())
 			}
 
-			var videoSender *pionWebRTC.RTPSender = nil
-			if videoTrack != nil {
-				if videoSender, err = peerConnection.AddTrack(videoTrack); err != nil {
-					log.Log.Error("webrtc.main.InitializeWebRTCConnection(): error adding video track: " + err.Error())
-					cancel()
-					return
-				}
-			} else {
-				log.Log.Info("webrtc.main.InitializeWebRTCConnection(): video track is nil, skipping video")
+			if _, err = peerConnection.AddTrack(audioTrack); err != nil {
+				log.Log.Error("webrtc.main.InitializeWebRTCConnection(): something went wrong while adding audio track: " + err.Error())
 			}
 
-			// Read incoming RTCP packets
-			// Before these packets are returned they are processed by interceptors. For things
-			// like NACK this needs to be called.
-			if videoSender != nil {
-				go func() {
-					defer func() {
-						log.Log.Info("webrtc.main.InitializeWebRTCConnection(): video RTCP reader stopped")
-					}()
-					rtcpBuf := make([]byte, rtcpBufferSize)
-					for {
-						select {
-						case <-ctx.Done():
-							return
-						default:
-							if _, _, rtcpErr := videoSender.Read(rtcpBuf); rtcpErr != nil {
-								return
-							}
-						}
+			peerConnection.OnICEConnectionStateChange(func(connectionState pionWebRTC.ICEConnectionState) {
+				if connectionState == pionWebRTC.ICEConnectionStateDisconnected {
+					atomic.AddInt64(&peerConnectionCount, -1)
+
+					// Set lock
+					CandidatesMutex.Lock()
+					peerConnections[handshake.SessionID] = nil
+					_, ok := CandidateArrays[sessionKey]
+					if ok {
+						close(CandidateArrays[sessionKey])
 					}
-				}()
-			}
-
-			var audioSender *pionWebRTC.RTPSender = nil
-			if audioTrack != nil {
-				if audioSender, err = peerConnection.AddTrack(audioTrack); err != nil {
-					log.Log.Error("webrtc.main.InitializeWebRTCConnection(): error adding audio track: " + err.Error())
-					cancel()
-					return
-				}
-			} else {
-				log.Log.Info("webrtc.main.InitializeWebRTCConnection(): audio track is nil, skipping audio")
-			}
-
-			// Read incoming RTCP packets
-			// Before these packets are returned they are processed by interceptors. For things
-			// like NACK this needs to be called.
-			if audioSender != nil {
-				go func() {
-					defer func() {
-						log.Log.Info("webrtc.main.InitializeWebRTCConnection(): audio RTCP reader stopped")
-					}()
-					rtcpBuf := make([]byte, rtcpBufferSize)
-					for {
-						select {
-						case <-ctx.Done():
-							return
-						default:
-							if _, _, rtcpErr := audioSender.Read(rtcpBuf); rtcpErr != nil {
-								return
-							}
-						}
-					}
-				}()
-			}
-
-			peerConnection.OnConnectionStateChange(func(connectionState pionWebRTC.PeerConnectionState) {
-				log.Log.Info("webrtc.main.InitializeWebRTCConnection(): connection state changed to: " + connectionState.String())
-
-				switch connectionState {
-				case pionWebRTC.PeerConnectionStateDisconnected, pionWebRTC.PeerConnectionStateClosed:
-					count := globalConnectionManager.DecrementPeerCount()
-					log.Log.Info("webrtc.main.InitializeWebRTCConnection(): Peer disconnected. Active peers: " + string(rune(count)))
-
-					// Clean up resources
-					globalConnectionManager.CloseCandidateChannel(sessionKey)
+					CandidatesMutex.Unlock()
 
+					close(w.PacketsCount)
 					if err := peerConnection.Close(); err != nil {
-						log.Log.Error("webrtc.main.InitializeWebRTCConnection(): error closing peer connection: " + err.Error())
+						log.Log.Error("webrtc.main.InitializeWebRTCConnection(): something went wrong while closing peer connection: " + err.Error())
 					}
-
-					globalConnectionManager.RemovePeerConnection(handshake.SessionID)
-					close(wrapper.done)
-
-				case pionWebRTC.PeerConnectionStateConnected:
-					count := globalConnectionManager.IncrementPeerCount()
-					log.Log.Info("webrtc.main.InitializeWebRTCConnection(): Peer connected. Active peers: " + string(rune(count)))
-
-				case pionWebRTC.PeerConnectionStateFailed:
-					log.Log.Info("webrtc.main.InitializeWebRTCConnection(): ICE connection failed")
-				}
-			})
-
-			go func() {
-				defer func() {
-					log.Log.Info("webrtc.main.InitializeWebRTCConnection(): candidate processor stopped for session: " + handshake.SessionID)
-				}()
-
-				// Iterate over the candidates and send them to the remote client
-				for {
-					select {
-					case <-ctx.Done():
-						return
-					case candidate, ok := <-candidateChannel:
-						if !ok {
-							return
-						}
+				} else if connectionState == pionWebRTC.ICEConnectionStateConnected {
+					atomic.AddInt64(&peerConnectionCount, 1)
+				} else if connectionState == pionWebRTC.ICEConnectionStateChecking {
+					// Iterate over the candidates and send them to the remote client
+					// Non blocking channel
+					for candidate := range CandidateArrays[sessionKey] {
 						log.Log.Info("webrtc.main.InitializeWebRTCConnection(): Received candidate from channel: " + candidate)
-						if candidateErr := peerConnection.AddICECandidate(pionWebRTC.ICECandidateInit{Candidate: candidate}); candidateErr != nil {
-							log.Log.Error("webrtc.main.InitializeWebRTCConnection(): error adding candidate: " + candidateErr.Error())
+						if candidateErr := peerConnection.AddICECandidate(pionWebRTC.ICECandidateInit{Candidate: string(candidate)}); candidateErr != nil {
+							log.Log.Error("webrtc.main.InitializeWebRTCConnection(): something went wrong while adding candidate: " + candidateErr.Error())
 						}
 					}
+				} else if connectionState == pionWebRTC.ICEConnectionStateFailed {
+					log.Log.Info("webrtc.main.InitializeWebRTCConnection(): ICEConnectionStateFailed")
 				}
-			}()
+				log.Log.Info("webrtc.main.InitializeWebRTCConnection(): connection state changed to: " + connectionState.String())
+				log.Log.Info("webrtc.main.InitializeWebRTCConnection(): Number of peers connected (" + strconv.FormatInt(peerConnectionCount, 10) + ")")
+			})
 
 			offer := w.CreateOffer(sd)
 			if err = peerConnection.SetRemoteDescription(offer); err != nil {
@@ -397,56 +216,22 @@ func InitializeWebRTCConnection(configuration *models.Configuration, communicati
 
 			// When an ICE candidate is available send to the other peer using the signaling server (MQTT).
 			// The other peer will add this candidate by calling AddICECandidate
-			var hasRelayCandidates bool
 			peerConnection.OnICECandidate(func(candidate *pionWebRTC.ICECandidate) {
-
 				if candidate == nil {
-					log.Log.Info("webrtc.main.InitializeWebRTCConnection(): ICE gathering complete (candidate is nil)")
-					if !hasRelayCandidates {
-						log.Log.Error("webrtc.main.InitializeWebRTCConnection(): WARNING - No TURN (relay) candidates were gathered! TURN servers: " +
-							config.TURNURI + ", Username: " + config.TURNUsername + ", ForceTurn: " + config.ForceTurn)
-					}
 					return
 				}
-
-				// Log candidate details for debugging
-				candidateJSON := candidate.ToJSON()
-				candidateStr := candidateJSON.Candidate
-
-				// Determine candidate type from the candidate string
-				candidateType := "unknown"
-				if candidateJSON.Candidate != "" {
-					switch candidate.Typ {
-					case pionWebRTC.ICECandidateTypeRelay:
-						candidateType = "relay"
-					case pionWebRTC.ICECandidateTypeSrflx:
-						candidateType = "srflx"
-					case pionWebRTC.ICECandidateTypeHost:
-						candidateType = "host"
-					case pionWebRTC.ICECandidateTypePrflx:
-						candidateType = "prflx"
-					}
-				}
-
-				// Track if we received any relay (TURN) candidates
-				if candidateType == "relay" {
-					hasRelayCandidates = true
-				}
-
-				log.Log.Info("webrtc.main.InitializeWebRTCConnection(): ICE candidate received - Type: " + candidateType +
-					", Candidate: " + candidateStr)
-
 				//  Create a config map
 				valueMap := make(map[string]interface{})
-				candateBinary, err := json.Marshal(candidateJSON)
+				candateJSON := candidate.ToJSON()
+				sdpmid := "0"
+				candateJSON.SDPMid = &sdpmid
+				candateBinary, err := json.Marshal(candateJSON)
 				if err == nil {
 					valueMap["candidate"] = string(candateBinary)
-					// SDP is not needed to be send..
-					//valueMap["sdp"] = []byte(base64.StdEncoding.EncodeToString([]byte(answer.SDP)))
+					valueMap["sdp"] = []byte(base64.StdEncoding.EncodeToString([]byte(answer.SDP)))
 					valueMap["session_id"] = handshake.SessionID
-					log.Log.Info("webrtc.main.InitializeWebRTCConnection(): sending " + candidateType + " candidate to hub")
 				} else {
-					log.Log.Error("webrtc.main.InitializeWebRTCConnection(): failed to marshal candidate: " + err.Error())
+					log.Log.Info("webrtc.main.InitializeWebRTCConnection(): something went wrong while marshalling candidate: " + err.Error())
 				}
 
 				// We'll send the candidate to the hub
@@ -466,8 +251,8 @@ func InitializeWebRTCConnection(configuration *models.Configuration, communicati
 				}
 			})
 
-			// Store peer connection in manager
-			globalConnectionManager.AddPeerConnection(handshake.SessionID, wrapper)
+			// Create a channel which will be used to send candidates to the other peer
+			peerConnections[handshake.SessionID] = peerConnection
 
 			if err == nil {
 				//  Create a config map
@@ -500,11 +285,7 @@ func InitializeWebRTCConnection(configuration *models.Configuration, communicati
 
 func NewVideoTrack(streams []packets.Stream) *pionWebRTC.TrackLocalStaticSample {
 	mimeType := pionWebRTC.MimeTypeH264
-	outboundVideoTrack, err := pionWebRTC.NewTrackLocalStaticSample(pionWebRTC.RTPCodecCapability{MimeType: mimeType}, "video", trackStreamID)
-	if err != nil {
-		log.Log.Error("webrtc.main.NewVideoTrack(): error creating video track: " + err.Error())
-		return nil
-	}
+	outboundVideoTrack, _ := pionWebRTC.NewTrackLocalStaticSample(pionWebRTC.RTPCodecCapability{MimeType: mimeType}, "video", "pion124")
 	return outboundVideoTrack
 }
 
@@ -519,245 +300,157 @@ func NewAudioTrack(streams []packets.Stream) *pionWebRTC.TrackLocalStaticSample
 			mimeType = pionWebRTC.MimeTypePCMA
 		}
 	}
-	if mimeType == "" {
-		log.Log.Error("webrtc.main.NewAudioTrack(): no supported audio codec found")
-		return nil
-	}
-	outboundAudioTrack, err := pionWebRTC.NewTrackLocalStaticSample(pionWebRTC.RTPCodecCapability{MimeType: mimeType}, "audio", trackStreamID)
-	if err != nil {
-		log.Log.Error("webrtc.main.NewAudioTrack(): error creating audio track: " + err.Error())
-		return nil
-	}
+	outboundAudioTrack, _ := pionWebRTC.NewTrackLocalStaticSample(pionWebRTC.RTPCodecCapability{MimeType: mimeType}, "audio", "pion124")
 	return outboundAudioTrack
 }
 
-// streamState holds state information for the streaming process
-type streamState struct {
-	lastKeepAlive    int64
-	peerCount        int64
-	start            bool
-	receivedKeyFrame bool
-	lastAudioSample  *pionMedia.Sample
-	lastVideoSample  *pionMedia.Sample
-}
-
-// codecSupport tracks which codecs are available in the stream
-type codecSupport struct {
-	hasH264      bool
-	hasPCM_MULAW bool
-	hasAAC       bool
-	hasOpus      bool
-}
-
-// detectCodecs examines the stream to determine which codecs are available
-func detectCodecs(rtspClient capture.RTSPClient) codecSupport {
-	support := codecSupport{}
-	streams, _ := rtspClient.GetStreams()
-
-	for _, stream := range streams {
-		switch stream.Name {
-		case "H264":
-			support.hasH264 = true
-		case "PCM_MULAW":
-			support.hasPCM_MULAW = true
-		case "AAC":
-			support.hasAAC = true
-		case "OPUS":
-			support.hasOpus = true
-		}
-	}
-
-	return support
-}
-
-// hasValidCodecs checks if at least one valid video or audio codec is present
-func (cs codecSupport) hasValidCodecs() bool {
-	hasVideo := cs.hasH264
-	hasAudio := cs.hasPCM_MULAW || cs.hasAAC || cs.hasOpus
-	return hasVideo || hasAudio
-}
-
-// shouldContinueStreaming determines if streaming should continue based on keepalive and peer count
-func shouldContinueStreaming(config models.Config, state *streamState) bool {
-	if config.Capture.ForwardWebRTC != "true" {
-		return true
-	}
-
-	now := time.Now().Unix()
-	hasTimedOut := (now - state.lastKeepAlive) > int64(keepAliveTimeout.Seconds())
-	hasNoPeers := state.peerCount == 0
-
-	return !hasTimedOut && !hasNoPeers
-}
-
-// updateStreamState updates keepalive and peer count from communication channels
-func updateStreamState(communication *models.Communication, state *streamState) {
-	select {
-	case keepAliveStr := <-communication.HandleLiveHDKeepalive:
-		if val, err := strconv.ParseInt(keepAliveStr, 10, 64); err == nil {
-			state.lastKeepAlive = val
-		}
-	default:
-	}
-
-	select {
-	case peerCountStr := <-communication.HandleLiveHDPeers:
-		if val, err := strconv.ParseInt(peerCountStr, 10, 64); err == nil {
-			state.peerCount = val
-		}
-	default:
-	}
-}
-
-// writeFinalSamples writes any remaining buffered samples
-func writeFinalSamples(state *streamState, videoTrack, audioTrack *pionWebRTC.TrackLocalStaticSample) {
-	if state.lastVideoSample != nil && videoTrack != nil {
-		if err := videoTrack.WriteSample(*state.lastVideoSample); err != nil && err != io.ErrClosedPipe {
-			log.Log.Error("webrtc.main.writeFinalSamples(): error writing final video sample: " + err.Error())
-		}
-	}
-
-	if state.lastAudioSample != nil && audioTrack != nil {
-		if err := audioTrack.WriteSample(*state.lastAudioSample); err != nil && err != io.ErrClosedPipe {
-			log.Log.Error("webrtc.main.writeFinalSamples(): error writing final audio sample: " + err.Error())
-		}
-	}
-}
-
-// processVideoPacket processes a video packet and writes samples to the track
-func processVideoPacket(pkt packets.Packet, state *streamState, videoTrack *pionWebRTC.TrackLocalStaticSample, config models.Config) {
-	if videoTrack == nil {
-		return
-	}
-
-	// Start at the first keyframe
-	if pkt.IsKeyFrame {
-		state.start = true
-	}
-
-	if !state.start {
-		return
-	}
-
-	sample := pionMedia.Sample{Data: pkt.Data, PacketTimestamp: uint32(pkt.Time)}
-
-	if config.Capture.ForwardWebRTC == "true" {
-		// Remote forwarding not yet implemented
-		log.Log.Debug("webrtc.main.processVideoPacket(): remote forwarding not implemented")
-		return
-	}
-
-	if state.lastVideoSample != nil {
-		duration := sample.PacketTimestamp - state.lastVideoSample.PacketTimestamp
-		state.lastVideoSample.Duration = time.Duration(duration) * time.Millisecond
-
-		if err := videoTrack.WriteSample(*state.lastVideoSample); err != nil && err != io.ErrClosedPipe {
-			log.Log.Error("webrtc.main.processVideoPacket(): error writing video sample: " + err.Error())
-		}
-	}
-
-	state.lastVideoSample = &sample
-}
-
-// processAudioPacket processes an audio packet and writes samples to the track
-func processAudioPacket(pkt packets.Packet, state *streamState, audioTrack *pionWebRTC.TrackLocalStaticSample, hasAAC bool) {
-	if audioTrack == nil {
-		return
-	}
-
-	if hasAAC {
-		// AAC transcoding not yet implemented
-		// TODO: Implement AAC to PCM_MULAW transcoding
-		return
-	}
-
-	sample := pionMedia.Sample{Data: pkt.Data, PacketTimestamp: uint32(pkt.Time)}
-
-	if state.lastAudioSample != nil {
-		duration := sample.PacketTimestamp - state.lastAudioSample.PacketTimestamp
-		state.lastAudioSample.Duration = time.Duration(duration) * time.Millisecond
-
-		if err := audioTrack.WriteSample(*state.lastAudioSample); err != nil && err != io.ErrClosedPipe {
-			log.Log.Error("webrtc.main.processAudioPacket(): error writing audio sample: " + err.Error())
-		}
-	}
-
-	state.lastAudioSample = &sample
-}
-
 func WriteToTrack(livestreamCursor *packets.QueueCursor, configuration *models.Configuration, communication *models.Communication, mqttClient mqtt.Client, videoTrack *pionWebRTC.TrackLocalStaticSample, audioTrack *pionWebRTC.TrackLocalStaticSample, rtspClient capture.RTSPClient) {
 
 	config := configuration.Config
 
-	// Check if at least one track is available
-	if videoTrack == nil && audioTrack == nil {
-		log.Log.Error("webrtc.main.WriteToTrack(): both video and audio tracks are nil, cannot proceed")
-		return
+	// Make peerconnection map
+	peerConnections = make(map[string]*pionWebRTC.PeerConnection)
+
+	// Set the indexes for the video & audio streams
+	// Later when we read a packet we need to figure out which track to send it to.
+	hasH264 := false
+	hasPCM_MULAW := false
+	hasAAC := false
+	hasOpus := false
+	streams, _ := rtspClient.GetStreams()
+	for _, stream := range streams {
+		if stream.Name == "H264" {
+			hasH264 = true
+		} else if stream.Name == "PCM_MULAW" {
+			hasPCM_MULAW = true
+		} else if stream.Name == "AAC" {
+			hasAAC = true
+		} else if stream.Name == "OPUS" {
+			hasOpus = true
+		}
 	}
 
-	// Detect available codecs
-	codecs := detectCodecs(rtspClient)
-
-	if !codecs.hasValidCodecs() {
-		log.Log.Error("webrtc.main.WriteToTrack(): no valid video or audio codec found")
-		return
-	}
-
-	if config.Capture.TranscodingWebRTC == "true" {
-		log.Log.Info("webrtc.main.WriteToTrack(): transcoding enabled but not yet implemented")
-	}
-
-	// Initialize streaming state
-	state := &streamState{
-		lastKeepAlive: time.Now().Unix(),
-		peerCount:     0,
-	}
-
-	defer func() {
-		writeFinalSamples(state, videoTrack, audioTrack)
-		log.Log.Info("webrtc.main.WriteToTrack(): stopped writing to track")
-	}()
-
-	var pkt packets.Packet
-	var cursorError error
-
-	for cursorError == nil {
-		pkt, cursorError = livestreamCursor.ReadPacket()
-
-		if cursorError != nil {
-			break
+	if !hasH264 && !hasPCM_MULAW && !hasAAC && !hasOpus {
+		log.Log.Error("webrtc.main.WriteToTrack(): no valid video codec and audio codec found.")
+	} else {
+		if config.Capture.TranscodingWebRTC == "true" {
+			// Todo..
+		} else {
+			//log.Log.Info("webrtc.main.WriteToTrack(): not using a transcoder.")
 		}
 
-		// Update state from communication channels
-		updateStreamState(communication, state)
+		var cursorError error
+		var pkt packets.Packet
+		//var previousTimeVideo int64
+		//var previousTimeAudio int64
 
-		// Check if we should continue streaming
-		if !shouldContinueStreaming(config, state) {
-			state.start = false
-			state.receivedKeyFrame = false
-			continue
-		}
+		start := false
+		receivedKeyFrame := false
+		lastKeepAlive := "0"
+		peerCount := "0"
 
-		// Skip empty packets
-		if len(pkt.Data) == 0 || pkt.Data == nil {
-			state.receivedKeyFrame = false
-			continue
-		}
+		for cursorError == nil {
 
-		// Wait for first keyframe before processing
-		if !state.receivedKeyFrame {
-			if pkt.IsKeyFrame {
-				state.receivedKeyFrame = true
-			} else {
+			pkt, cursorError = livestreamCursor.ReadPacket()
+
+			//if config.Capture.ForwardWebRTC != "true" && peerConnectionCount == 0 {
+			//	start = false
+			//	receivedKeyFrame = false
+			//	continue
+			//}
+
+			select {
+			case lastKeepAlive = <-communication.HandleLiveHDKeepalive:
+			default:
+			}
+
+			select {
+			case peerCount = <-communication.HandleLiveHDPeers:
+			default:
+			}
+
+			now := time.Now().Unix()
+			lastKeepAliveN, _ := strconv.ParseInt(lastKeepAlive, 10, 64)
+			hasTimedOut := (now - lastKeepAliveN) > 15 // if longer then no response in 15 sec.
+			hasNoPeers := peerCount == "0"
+
+			if config.Capture.ForwardWebRTC == "true" && (hasTimedOut || hasNoPeers) {
+				start = false
+				receivedKeyFrame = false
 				continue
 			}
-		}
 
-		// Process video or audio packets
-		if pkt.IsVideo {
-			processVideoPacket(pkt, state, videoTrack, config)
-		} else if pkt.IsAudio {
-			processAudioPacket(pkt, state, audioTrack, codecs.hasAAC)
+			if len(pkt.Data) == 0 || pkt.Data == nil {
+				receivedKeyFrame = false
+				continue
+			}
+
+			if !receivedKeyFrame {
+				if pkt.IsKeyFrame {
+					receivedKeyFrame = true
+				} else {
+					continue
+				}
+			}
+
+			//if config.Capture.TranscodingWebRTC == "true" {
+			// We will transcode the video
+			// TODO..
+			//}
+
+			if pkt.IsVideo {
+
+				// Calculate the difference
+				//bufferDuration := pkt.Time - previousTimeVideo
+				//previousTimeVideo = pkt.Time
+
+				// Start at the first keyframe
+				if pkt.IsKeyFrame {
+					start = true
+				}
+				if start {
+					//bufferDurationCasted := time.Duration(bufferDuration) * time.Millisecond
+					sample := pionMedia.Sample{Data: pkt.Data, PacketTimestamp: uint32(pkt.Time)}
+					if config.Capture.ForwardWebRTC == "true" {
+						// We will send the video to a remote peer
+						// TODO..
+					} else {
+						if err := videoTrack.WriteSample(sample); err != nil && err != io.ErrClosedPipe {
+							log.Log.Error("webrtc.main.WriteToTrack(): something went wrong while writing sample: " + err.Error())
+						}
+					}
+				}
+			} else if pkt.IsAudio {
+
+				// @TODO: We need to check if the audio is PCM_MULAW or AAC
+				// If AAC we need to transcode it to PCM_MULAW
+				// If PCM_MULAW we can send it directly.
+
+				if hasAAC {
+					// We will transcode the audio
+					// TODO..
+					//d := fdkaac.NewAacDecoder()
+				}
+
+				// Calculate the difference
+				//bufferDuration := pkt.Time - previousTimeAudio
+				//previousTimeAudio = pkt.Time
+
+				// We will send the audio
+				//bufferDurationCasted := time.Duration(bufferDuration) * time.Millisecond
+				sample := pionMedia.Sample{Data: pkt.Data, PacketTimestamp: uint32(pkt.Time)}
+				if err := audioTrack.WriteSample(sample); err != nil && err != io.ErrClosedPipe {
+					log.Log.Error("webrtc.main.WriteToTrack(): something went wrong while writing sample: " + err.Error())
+				}
+			}
 		}
 	}
+	for _, p := range peerConnections {
+		if p != nil {
+			p.Close()
+		}
+	}
+
+	peerConnectionCount = 0
+	log.Log.Info("webrtc.main.WriteToTrack(): stop writing to track.")
 }

ui/public/locales/en/translation.json

@@ -9,7 +9,7 @@
   },
   "navigation": {
     "profile": "Profile",
-    "admin": "Admin",
+    "admin": "admin",
     "management": "Management",
     "dashboard": "Dashboard",
     "recordings": "Recordings",
@@ -32,11 +32,11 @@
     "latest_events": "Latest events",
     "configure_connection": "Configure connection",
     "no_events": "No events",
-    "no_events_description": "No recordings were found, make sure your Agent is properly configured.",
+    "no_events_description": "No recordings where found, make sure your Kerberos Agent is properly configured.",
     "motion_detected": "Motion was detected",
     "live_view": "Live view",
     "loading_live_view": "Loading live view",
-    "loading_live_view_description": "Hold on, we are loading your live view here. If you didn't configure your camera connection, update it on the settings pages.",
+    "loading_live_view_description": "Hold on we are loading your live view here. If you didn't configure your camera connection, update it on the settings pages.",
     "time": "Time",
     "description": "Description",
     "name": "Name"
@@ -59,32 +59,32 @@
       "persistence": "Persistence"
     },
     "info": {
-      "kerberos_hub_demo": "Have a look at our Hub demo environment, to see Hub in action!",
-      "configuration_updated_success": "Your configuration has been updated successfully.",
+      "kerberos_hub_demo": "Have a look at our Kerberos Hub demo environment, to see Kerberos Hub in action!",
+      "configuration_updated_success": "Your configuration have been updated successfully.",
       "configuration_updated_error": "Something went wrong while saving.",
-      "verify_hub": "Verifying your Hub settings.",
-      "verify_hub_success": "Hub settings are successfully verified.",
-      "verify_hub_error": "Something went wrong while verifying Hub.",
+      "verify_hub": "Verifying your Kerberos Hub settings.",
+      "verify_hub_success": "Kerberos Hub settings are successfully verified.",
+      "verify_hub_error": "Something went wrong while verifying Kerberos Hub",
       "verify_persistence": "Verifying your persistence settings.",
       "verify_persistence_success": "Persistence settings are successfully verified.",
-      "verify_persistence_error": "Something went wrong while verifying the persistence.",
+      "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."
+      "verify_onvif_error": "Something went wrong while verifying the ONVIF settings"
     },
     "overview": {
       "general": "General",
-      "description_general": "General settings for your Agent",
+      "description_general": "General settings for your Kerberos Agent",
       "key": "Key",
       "camera_name": "Camera name",
       "camera_friendly_name": "Friendly name",
       "timezone": "Timezone",
       "select_timezone": "Select a timezone",
       "advanced_configuration": "Advanced configuration",
-      "description_advanced_configuration": "Detailed configuration options to enable or disable specific parts of the Agent",
+      "description_advanced_configuration": "Detailed configuration options to enable or disable specific parts of the Kerberos Agent",
       "offline_mode": "Offline mode",
       "description_offline_mode": "Disable all outgoing traffic",
       "encryption": "Encryption",
@@ -101,9 +101,9 @@
       "camera": "Camera",
       "description_camera": "Camera settings are required to make a connection to your camera of choice.",
       "only_h264": "Currently only H264/H265 RTSP streams are supported.",
-      "rtsp_url": "RTSP URL",
+      "rtsp_url": "RTSP url",
       "rtsp_h264": "A H264/H265 RTSP connection to your camera.",
-      "sub_rtsp_url": "Sub RTSP URL (used for livestreaming)",
+      "sub_rtsp_url": "Sub RTSP url (used for livestreaming)",
       "sub_rtsp_h264": "A secondary RTSP connection to the low resolution of your camera.",
       "onvif": "ONVIF",
       "description_onvif": "Credentials to communicate with ONVIF capabilities. These are used for PTZ or other capabilities provided by the camera.",
@@ -115,28 +115,28 @@
     },
     "recording": {
       "recording": "Recording",
-      "description_recording": "Specify how you would like to make recordings. Having a continuous 24/7 setup or a motion-based recording.",
+      "description_recording": "Specify how you would like to make recordings. Having a continuous 24/7 setup or a motion based recording.",
       "continuous_recording": "Continuous recording",
-      "description_continuous_recording": "Make 24/7 or motion-based recordings.",
-      "max_duration": "Max video duration (seconds)",
+      "description_continuous_recording": "Make 24/7 or motion based recordings.",
+      "max_duration": "max video duration (seconds)",
       "description_max_duration": "The maximum duration of a recording.",
-      "pre_recording": "Pre recording (key frames buffered)",
+      "pre_recording": "pre recording (key frames buffered)",
       "description_pre_recording": "Seconds before an event occurred.",
-      "post_recording": "Post recording (seconds)",
+      "post_recording": "post recording (seconds)",
       "description_post_recording": "Seconds after an event occurred.",
       "threshold": "Recording threshold (pixels)",
-      "description_threshold": "The number of pixels changed to record.",
+      "description_threshold": "The number of pixels changed to record",
       "autoclean": "Auto clean",
-      "description_autoclean": "Specify if the Agent can clean up recordings when a specific storage capacity (MB) is reached. This will remove the oldest recordings when the capacity is reached.",
+      "description_autoclean": "Specify if the Kerberos Agent can cleanup recordings when a specific storage capacity (MB) is reached. This will remove the oldest recordings when the capacity is reached.",
       "autoclean_enable": "Enable auto clean",
       "autoclean_description_enable": "Remove oldest recording when capacity reached.",
       "autoclean_max_directory_size": "Maximum directory size (MB)",
-      "autoclean_description_max_directory_size": "The maximum MBs of recordings stored.",
+      "autoclean_description_max_directory_size": "The maximum MB's of recordings stored.",
       "fragmentedrecordings": "Fragmented recordings",
-      "description_fragmentedrecordings": "When recordings are fragmented they are suitable for an HLS stream. When turned on, the MP4 container will look a bit different.",
+      "description_fragmentedrecordings": "When recordings are fragmented they are suitable for an HLS stream. When turned on the MP4 container will look a bit different.",
       "fragmentedrecordings_enable": "Enable fragmentation",
       "fragmentedrecordings_description_enable": "Fragmented recordings are required for HLS.",
-      "fragmentedrecordings_duration": "Fragment duration",
+      "fragmentedrecordings_duration": "fragment duration",
       "fragmentedrecordings_description_duration": "Duration of a single fragment."
     },
     "streaming": {
@@ -149,16 +149,16 @@
       "force_turn": "Force TURN",
       "force_turn_description": "Force TURN usage, even when STUN is available.",
       "stun_turn_forward": "Forwarding and transcoding",
-      "stun_turn_description_forward": "Optimizations and enhancements for TURN/STUN communication.",
+      "stun_turn_description_forward": "Optimisations and enhancements for TURN/STUN communication.",
       "stun_turn_webrtc": "Forwarding to WebRTC broker",
-      "stun_turn_description_webrtc": "Forward H264 stream through MQTT",
+      "stun_turn_description_webrtc": "Forward h264 stream through MQTT",
       "stun_turn_transcode": "Transcode stream",
       "stun_turn_description_transcode": "Convert stream to a lower resolution",
       "stun_turn_downscale": "Downscale resolution (in % of original resolution)",
       "mqtt": "MQTT",
-      "description_mqtt": "An MQTT broker is used to communicate from",
-      "description2_mqtt": "to the Agent, to achieve for example livestreaming or ONVIF (PTZ) capabilities.",
-      "mqtt_brokeruri": "Broker URI",
+      "description_mqtt": "A MQTT broker is used to communicate from",
+      "description2_mqtt": "to the Kerberos Agent, to achieve for example livestreaming or ONVIF (PTZ) capabilities.",
+      "mqtt_brokeruri": "Broker Uri",
       "mqtt_username": "Username",
       "mqtt_password": "Password",
       "realtimeprocessing": "Realtime Processing",
@@ -180,61 +180,55 @@
       "friday": "Friday",
       "saturday": "Saturday",
       "externalcondition": "External Condition",
-      "description_externalcondition": "Depending on an external web service, recording can be enabled or disabled.",
+      "description_externalcondition": "Depending on an external webservice recording can be enabled or disabled.",
       "regionofinterest": "Region Of Interest",
       "description_regionofinterest": "By defining one or more regions, motion will be tracked only in the regions you have defined."
     },
     "persistence": {
-      "kerberoshub": "Hub",
-      "description_kerberoshub": "Agents can send heartbeats to a central",
-      "description2_kerberoshub": "installation. Heartbeats and other relevant information are synced to Hub to show realtime information about your video landscape.",
+      "kerberoshub": "Kerberos Hub",
+      "description_kerberoshub": "Kerberos Agents can send heartbeats to a central",
+      "description2_kerberoshub": "installation. Heartbeats and other relevant information are synced to Kerberos Hub to show realtime information about your video landscape.",
       "persistence": "Persistence",
-      "secondary_persistence": "Secondary Persistence",
-      "description_secondary_persistence": "Recordings will be sent to secondary persistence if the primary persistence is unavailable or fails. This can be useful for failover purposes.",
-      "saasoffering": "Hub (SaaS offering)",
+      "saasoffering": "Kerberos Hub (SAAS offering)",
       "description_persistence": "Having the ability to store your recordings is the beginning of everything. You can choose between our",
       "description2_persistence": ", or a 3rd party provider",
       "select_persistence": "Select a persistence",
       "kerberoshub_encryption": "Encryption",
-      "kerberoshub_encryption_description": "All traffic from/to Hub will be encrypted using AES-256.",
-      "kerberoshub_proxyurl": "Hub Proxy URL",
+      "kerberoshub_encryption_description": "All traffic from/to Kerberos Hub will encrypted using AES-256.",
+      "kerberoshub_proxyurl": "Kerberos Hub Proxy URL",
       "kerberoshub_description_proxyurl": "The Proxy endpoint for uploading your recordings.",
-      "kerberoshub_apiurl": "Hub API URL",
+      "kerberoshub_apiurl": "Kerberos Hub API URL",
       "kerberoshub_description_apiurl": "The API endpoint for uploading your recordings.",
       "kerberoshub_publickey": "Public key",
-      "kerberoshub_description_publickey": "The public key granted to your Hub account.",
+      "kerberoshub_description_publickey": "The public key granted to your Kerberos Hub account.",
       "kerberoshub_privatekey": "Private key",
-      "kerberoshub_description_privatekey": "The private key granted to your Hub account.",
+      "kerberoshub_description_privatekey": "The private key granted to your Kerberos Hub account.",
       "kerberoshub_site": "Site",
-      "kerberoshub_description_site": "The site ID the Agents belong to in Hub.",
+      "kerberoshub_description_site": "The site ID the Kerberos Agents are belonging to in Kerberos Hub.",
       "kerberoshub_region": "Region",
       "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 (should match Hub username)",
-      "kerberoshub_description_username": "The username of your Hub account.",
-      "kerberosvault_apiurl": "Vault API URL",
-      "kerberosvault_description_apiurl": "The Vault API",
+      "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 sent.",
-      "kerberosvault_directory": "Directory (should match Hub username)",
-      "kerberosvault_description_directory": "Subdirectory the recordings will be stored in your provider.",
+      "kerberosvault_description_provider": "The provider to which your recordings will be send.",
+      "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 Vault account.",
+      "kerberosvault_description_accesskey": "The access key of your Kerberos Vault account.",
       "kerberosvault_secretkey": "Secret key",
-      "kerberosvault_description_secretkey": "The secret key of your Vault account.",
-      "kerberosvault_maxretries": "Max retries",
-      "kerberosvault_description_maxretries": "The maximum number of retries to upload a recording.",
-      "kerberosvault_timeout": "Timeout",
-      "kerberosvault_description_timeout": "If a timeout occurs, recordings will be sent directly to the secondary Vault.",
+      "kerberosvault_description_secretkey": "The secret key of your Kerberos Vault account.",
       "dropbox_directory": "Directory",
-      "dropbox_description_directory": "The subdirectory where the recordings will be stored in your Dropbox account.",
+      "dropbox_description_directory": "The sub directory where the recordings will be stored in your Dropbox account.",
       "dropbox_accesstoken": "Access token",
       "dropbox_description_accesstoken": "The access token of your Dropbox account/app.",
       "verify_connection": "Verify Connection",
-      "remove_after_upload": "Once recordings are uploaded to some persistence, you might want to remove them from the local Agent.",
+      "remove_after_upload": "Once recordings are uploaded to some persistence, you might want to remove them from the local Kerberos Agent.",
       "remove_after_upload_description": "Remove recordings after they are uploaded successfully.",
-      "remove_after_upload_enabled": "Enable delete on upload"
+      "remove_after_upload_enabled": "Enabled delete on upload"
     }
   }
-}
+}

ui/public/locales/it/translation.json

@@ -226,4 +226,4 @@
       "remove_after_upload_enabled": "Abilita cancellazione al caricamento"
     }
   }
-}
+}

ui/public/locales/ja/translation.json

@@ -226,4 +226,4 @@
       "remove_after_upload_enabled": "Enabled delete on upload"
     }
   }
-}
+}

ui/public/locales/vi/translation.json

@@ -1,234 +0,0 @@
-{
-  "breadcrumb": {
-    "watch_recordings": "Xem bản ghi",
-    "configure": "Cấu hình"
-  },
-  "buttons": {
-    "save": "Lưu",
-    "verify_connection": "Xác minh kết nối"
-  },
-  "navigation": {
-    "profile": "Hồ sơ",
-    "admin": "Quản trị",
-    "management": "Quản lý",
-    "dashboard": "Bảng điều khiển",
-    "recordings": "Bản ghi",
-    "settings": "Cài đặt",
-    "help_support": "Trợ giúp & Hỗ trợ",
-    "swagger": "API Swagger",
-    "documentation": "Tài liệu",
-    "ui_library": "Thư viện UI",
-    "layout": "Ngôn ngữ & Bố cục",
-    "choose_language": "Chọn ngôn ngữ"
-  },
-  "dashboard": {
-    "title": "Bảng điều khiển",
-    "heading": "Tổng quan về giám sát video của bạn",
-    "number_of_days": "Số ngày",
-    "total_recordings": "Tổng số bản ghi",
-    "connected": "Đã kết nối",
-    "not_connected": "Chưa kết nối",
-    "offline_mode": "Chế độ ngoại tuyến",
-    "latest_events": "Sự kiện gần đây",
-    "configure_connection": "Cấu hình kết nối",
-    "no_events": "Không có sự kiện",
-    "no_events_description": "Không tìm thấy bản ghi nào, hãy đảm bảo Kerberos Agent của bạn được cấu hình đúng cách.",
-    "motion_detected": "Phát hiện chuyển động",
-    "live_view": "Xem trực tiếp",
-    "loading_live_view": "Đang tải xem trực tiếp",
-    "loading_live_view_description": "Vui lòng chờ trong khi chúng tôi tải xem trực tiếp của bạn. Nếu bạn chưa cấu hình kết nối camera, hãy cập nhật trong trang cài đặt.",
-    "time": "Thời gian",
-    "description": "Mô tả",
-    "name": "Tên"
-  },
-  "recordings": {
-    "title": "Bản ghi",
-    "heading": "Tất cả bản ghi của bạn ở một nơi",
-    "search_media": "Tìm kiếm phương tiện"
-  },
-  "settings": {
-    "title": "Cài đặt",
-    "heading": "Thiết lập camera của bạn",
-    "submenu": {
-      "all": "Tất cả",
-      "overview": "Tổng quan",
-      "camera": "Camera",
-      "recording": "Ghi hình",
-      "streaming": "Truyền phát",
-      "conditions": "Điều kiện",
-      "persistence": "Lưu trữ"
-    },
-    "info": {
-      "kerberos_hub_demo": "Xem thử môi trường demo của Kerberos Hub để thấy Kerberos Hub hoạt động như thế nào!",
-      "configuration_updated_success": "Cấu hình của bạn đã được cập nhật thành công.",
-      "configuration_updated_error": "Đã xảy ra lỗi khi lưu.",
-      "verify_hub": "Đang xác minh cài đặt Kerberos Hub của bạn.",
-      "verify_hub_success": "Cài đặt Kerberos Hub đã được xác minh thành công.",
-      "verify_hub_error": "Đã xảy ra lỗi khi xác minh Kerberos Hub",
-      "verify_persistence": "Đang xác minh cài đặt lưu trữ.",
-      "verify_persistence_success": "Cài đặt lưu trữ đã được xác minh thành công.",
-      "verify_persistence_error": "Đã xảy ra lỗi khi xác minh lưu trữ",
-      "verify_camera": "Đang xác minh cài đặt camera.",
-      "verify_camera_success": "Cài đặt camera đã được xác minh thành công.",
-      "verify_camera_error": "Đã xảy ra lỗi khi xác minh cài đặt camera",
-      "verify_onvif": "Đang xác minh cài đặt ONVIF.",
-      "verify_onvif_success": "Cài đặt ONVIF đã được xác minh thành công.",
-      "verify_onvif_error": "Đã xảy ra lỗi khi xác minh cài đặt ONVIF"
-    },
-    "overview": {
-      "general": "Chung",
-      "description_general": "Cài đặt chung cho Kerberos Agent của bạn",
-      "key": "Khóa",
-      "camera_name": "Tên camera",
-      "camera_friendly_name": "Tên thân thiện",
-      "timezone": "Múi giờ",
-      "select_timezone": "Chọn múi giờ",
-      "advanced_configuration": "Cấu hình nâng cao",
-      "description_advanced_configuration": "Tùy chọn cấu hình chi tiết để bật hoặc tắt các phần cụ thể của Kerberos Agent",
-      "offline_mode": "Chế độ ngoại tuyến",
-      "description_offline_mode": "Vô hiệu hóa toàn bộ lưu lượng đi",
-      "encryption": "Mã hóa",
-      "description_encryption": "Bật mã hóa cho toàn bộ lưu lượng đi. Các tin nhắn MQTT và/hoặc bản ghi sẽ được mã hóa bằng AES-256. Một khóa riêng tư được sử dụng để ký.",
-      "encryption_enabled": "Bật mã hóa MQTT",
-      "description_encryption_enabled": "Bật mã hóa cho toàn bộ tin nhắn MQTT.",
-      "encryption_recordings_enabled": "Bật mã hóa bản ghi",
-      "description_encryption_recordings_enabled": "Bật mã hóa cho tất cả các bản ghi.",
-      "encryption_fingerprint": "Dấu vân tay",
-      "encryption_privatekey": "Khóa riêng tư",
-      "encryption_symmetrickey": "Khóa đối xứng"
-    },
-    "camera": {
-      "camera": "Camera",
-      "description_camera": "Cài đặt camera là bắt buộc để kết nối với camera bạn chọn.",
-      "only_h264": "Hiện tại chỉ hỗ trợ luồng RTSP H264/H265.",
-      "rtsp_url": "URL RTSP",
-      "rtsp_h264": "Kết nối RTSP H264/H265 với camera của bạn.",
-      "sub_rtsp_url": "URL RTSP phụ (dùng để phát trực tiếp)",
-      "sub_rtsp_h264": "Kết nối RTSP phụ với độ phân giải thấp của camera.",
-      "onvif": "ONVIF",
-      "description_onvif": "Thông tin xác thực để giao tiếp với các chức năng ONVIF. Chúng được sử dụng cho PTZ hoặc các khả năng khác do camera cung cấp.",
-      "onvif_xaddr": "Địa chỉ ONVIF",
-      "onvif_username": "Tên người dùng ONVIF",
-      "onvif_password": "Mật khẩu ONVIF",
-      "verify_connection": "Xác minh kết nối",
-      "verify_sub_connection": "Xác minh kết nối phụ"
-    },
-    "recording": {
-      "recording": "Ghi hình",
-      "description_recording": "Chỉ định cách bạn muốn thực hiện ghi hình. Có thể ghi liên tục 24/7 hoặc dựa trên chuyển động.",
-      "continuous_recording": "Ghi hình liên tục",
-      "description_continuous_recording": "Ghi hình liên tục 24/7 hoặc dựa trên chuyển động.",
-      "max_duration": "Thời lượng video tối đa (giây)",
-      "description_max_duration": "Thời lượng tối đa của một bản ghi.",
-      "pre_recording": "Ghi trước (khung hình chính được lưu vào bộ đệm)",
-      "description_pre_recording": "Số giây trước khi sự kiện xảy ra.",
-      "post_recording": "Ghi sau (giây)",
-      "description_post_recording": "Số giây sau khi sự kiện xảy ra.",
-      "threshold": "Ngưỡng ghi hình (pixel)",
-      "description_threshold": "Số pixel thay đổi cần đạt để bắt đầu ghi hình.",
-      "autoclean": "Tự động dọn dẹp",
-      "description_autoclean": "Chỉ định xem Kerberos Agent có thể dọn dẹp các bản ghi khi dung lượng lưu trữ đạt giới hạn nhất định (MB) hay không. Hệ thống sẽ xóa bản ghi cũ nhất khi đạt giới hạn.",
-      "autoclean_enable": "Bật tự động dọn dẹp",
-      "autoclean_description_enable": "Xóa bản ghi cũ nhất khi đạt giới hạn dung lượng.",
-      "autoclean_max_directory_size": "Dung lượng thư mục tối đa (MB)",
-      "autoclean_description_max_directory_size": "Dung lượng tối đa (MB) của các bản ghi được lưu trữ.",
-      "fragmentedrecordings": "Ghi hình phân đoạn",
-      "description_fragmentedrecordings": "Khi các bản ghi được phân đoạn, chúng phù hợp để phát trực tuyến HLS. Khi bật, định dạng MP4 sẽ có một số khác biệt.",
-      "fragmentedrecordings_enable": "Bật ghi hình phân đoạn",
-      "fragmentedrecordings_description_enable": "Ghi hình phân đoạn là bắt buộc đối với HLS.",
-      "fragmentedrecordings_duration": "Thời lượng phân đoạn",
-      "fragmentedrecordings_description_duration": "Thời lượng của một phân đoạn duy nhất."
-    },
-    "streaming": {
-      "stun_turn": "STUN/TURN cho WebRTC",
-      "description_stun_turn": "Để phát trực tiếp độ phân giải đầy đủ, chúng tôi sử dụng khái niệm WebRTC. Một trong những tính năng chính là ICE-candidate, cho phép vượt qua NAT bằng STUN/TURN.",
-      "stun_server": "Máy chủ STUN",
-      "turn_server": "Máy chủ TURN",
-      "turn_username": "Tên người dùng",
-      "turn_password": "Mật khẩu",
-      "force_turn": "Buộc sử dụng TURN",
-      "force_turn_description": "Buộc sử dụng TURN ngay cả khi STUN có sẵn.",
-      "stun_turn_forward": "Chuyển tiếp và mã hóa",
-      "stun_turn_description_forward": "Tối ưu hóa và cải thiện giao tiếp TURN/STUN.",
-      "stun_turn_webrtc": "Chuyển tiếp đến WebRTC broker",
-      "stun_turn_description_webrtc": "Chuyển tiếp luồng H264 qua MQTT",
-      "stun_turn_transcode": "Chuyển mã luồng",
-      "stun_turn_description_transcode": "Chuyển đổi luồng sang độ phân giải thấp hơn",
-      "stun_turn_downscale": "Giảm độ phân giải (theo % của độ phân giải gốc)",
-      "mqtt": "MQTT",
-      "description_mqtt": "Một MQTT broker được sử dụng để giao tiếp từ",
-      "description2_mqtt": "đến Kerberos Agent, nhằm hỗ trợ phát trực tiếp hoặc chức năng ONVIF (PTZ).",
-      "mqtt_brokeruri": "Broker Uri",
-      "mqtt_username": "Tên người dùng",
-      "mqtt_password": "Mật khẩu",
-      "realtimeprocessing": "Xử lý thời gian thực",
-      "description_realtimeprocessing": "Bằng cách bật xử lý thời gian thực, bạn sẽ nhận được các khung hình video thời gian thực qua kết nối MQTT đã chỉ định.",
-      "realtimeprocessing_topic": "Chủ đề để xuất bản",
-      "realtimeprocessing_enabled": "Bật xử lý thời gian thực",
-      "description_realtimeprocessing_enabled": "Gửi khung hình video thời gian thực qua MQTT."
-    },
-    "conditions": {
-      "timeofinterest": "Thời gian quan tâm",
-      "description_timeofinterest": "Chỉ ghi hình trong các khoảng thời gian cụ thể (dựa trên múi giờ).",
-      "timeofinterest_enabled": "Đã bật",
-      "timeofinterest_description_enabled": "Nếu bật, bạn có thể chỉ định các khoảng thời gian ghi hình.",
-      "sunday": "Chủ nhật",
-      "monday": "Thứ hai",
-      "tuesday": "Thứ ba",
-      "wednesday": "Thứ tư",
-      "thursday": "Thứ năm",
-      "friday": "Thứ sáu",
-      "saturday": "Thứ bảy",
-      "externalcondition": "Điều kiện bên ngoài",
-      "description_externalcondition": "Tùy thuộc vào một dịch vụ web bên ngoài, việc ghi hình có thể được bật hoặc tắt.",
-      "regionofinterest": "Khu vực quan tâm",
-      "description_regionofinterest": "Bằng cách xác định một hoặc nhiều khu vực, hệ thống sẽ chỉ theo dõi chuyển động trong các khu vực bạn đã chọn."
-    },
-    "persistence": {
-      "kerberoshub": "Kerberos Hub",
-      "description_kerberoshub": "Các Kerberos Agent có thể gửi tín hiệu nhịp tim đến một hệ thống trung tâm",
-      "description2_kerberoshub": "để đồng bộ hóa thông tin quan trọng với Kerberos Hub, giúp hiển thị trạng thái giám sát video theo thời gian thực.",
-      "persistence": "Lưu trữ",
-      "saasoffering": "Kerberos Hub (dịch vụ SAAS)",
-      "description_persistence": "Khả năng lưu trữ bản ghi là bước khởi đầu của mọi thứ. Bạn có thể chọn giữa dịch vụ của chúng tôi",
-      "description2_persistence": "hoặc một nhà cung cấp bên thứ ba.",
-      "select_persistence": "Chọn phương thức lưu trữ",
-      "kerberoshub_encryption": "Mã hóa",
-      "kerberoshub_encryption_description": "Tất cả lưu lượng đến/từ Kerberos Hub sẽ được mã hóa bằng AES-256.",
-      "kerberoshub_proxyurl": "URL Proxy Kerberos Hub",
-      "kerberoshub_description_proxyurl": "Điểm cuối Proxy để tải bản ghi lên.",
-      "kerberoshub_apiurl": "URL API Kerberos Hub",
-      "kerberoshub_description_apiurl": "Điểm cuối API để tải bản ghi lên.",
-      "kerberoshub_publickey": "Khóa công khai",
-      "kerberoshub_description_publickey": "Khóa công khai được cấp cho tài khoản Kerberos Hub của bạn.",
-      "kerberoshub_privatekey": "Khóa riêng tư",
-      "kerberoshub_description_privatekey": "Khóa riêng tư được cấp cho tài khoản Kerberos Hub của bạn.",
-      "kerberoshub_site": "Trang web",
-      "kerberoshub_description_site": "ID trang web mà các Kerberos Agent thuộc về trong Kerberos Hub.",
-      "kerberoshub_region": "Khu vực",
-      "kerberoshub_description_region": "Khu vực nơi chúng tôi lưu trữ bản ghi.",
-      "kerberoshub_bucket": "Kho lưu trữ",
-      "kerberoshub_description_bucket": "Kho lưu trữ nơi chúng tôi lưu trữ bản ghi.",
-      "kerberoshub_username": "Tên người dùng / Thư mục (phải khớp với tên người dùng Kerberos Hub)",
-      "kerberoshub_description_username": "Tên người dùng tài khoản Kerberos Hub của bạn.",
-      "kerberosvault_apiurl": "URL API Kerberos Vault",
-      "kerberosvault_description_apiurl": "API của Kerberos Vault",
-      "kerberosvault_provider": "Nhà cung cấp",
-      "kerberosvault_description_provider": "Nhà cung cấp nơi bản ghi của bạn sẽ được gửi đến.",
-      "kerberosvault_directory": "Thư mục (phải khớp với tên người dùng Kerberos Hub)",
-      "kerberosvault_description_directory": "Thư mục con nơi các bản ghi sẽ được lưu trữ trong nhà cung cấp của bạn.",
-      "kerberosvault_accesskey": "Khóa truy cập",
-      "kerberosvault_description_accesskey": "Khóa truy cập của tài khoản Kerberos Vault của bạn.",
-      "kerberosvault_secretkey": "Khóa bí mật",
-      "kerberosvault_description_secretkey": "Khóa bí mật của tài khoản Kerberos Vault của bạn.",
-      "dropbox_directory": "Thư mục",
-      "dropbox_description_directory": "Thư mục con nơi bản ghi sẽ được lưu trữ trong tài khoản Dropbox của bạn.",
-      "dropbox_accesstoken": "Mã truy cập",
-      "dropbox_description_accesstoken": "Mã truy cập của tài khoản / ứng dụng Dropbox của bạn.",
-      "verify_connection": "Xác minh kết nối",
-      "remove_after_upload": "Sau khi bản ghi được tải lên một hệ thống lưu trữ, bạn có thể muốn xóa chúng khỏi Kerberos Agent cục bộ.",
-      "remove_after_upload_description": "Xóa bản ghi sau khi chúng được tải lên thành công.",
-      "remove_after_upload_enabled": "Bật xóa sau khi tải lên"
-    }
-  }
-}

ui/src/actions/agent.js

@@ -4,7 +4,6 @@ import {
   doVerifyOnvif,
   doVerifyHub,
   doVerifyPersistence,
-  doVerifySecondaryPersistence,
   doGetKerberosAgentTags,
   doGetDashboardInformation,
   doGetEvents,
@@ -108,28 +107,6 @@ export const verifyPersistence = (config, onSuccess, onError) => {
   };
 };
 
-export const verifySecondaryPersistence = (config, onSuccess, onError) => {
-  return (dispatch) => {
-    doVerifySecondaryPersistence(
-      config,
-      () => {
-        dispatch({
-          type: 'VERIFY_SECONDARY_PERSISTENCE',
-        });
-        if (onSuccess) {
-          onSuccess();
-        }
-      },
-      (error) => {
-        const { data } = error.response.data;
-        if (onError) {
-          onError(data);
-        }
-      }
-    );
-  };
-};
-
 export const verifyHub = (config, onSuccess, onError) => {
   return (dispatch) => {
     doVerifyHub(

ui/src/api/agent.js

@@ -72,25 +72,6 @@ export function doVerifyPersistence(config, onSuccess, onError) {
     });
 }
 
-export function doVerifySecondaryPersistence(config, onSuccess, onError) {
-  const endpoint = API.post(`persistence/secondary/verify`, {
-    ...config,
-  });
-  endpoint
-    .then((res) => {
-      if (res.status !== 200) {
-        throw new Error(res.data);
-      }
-      return res.data;
-    })
-    .then((data) => {
-      onSuccess(data);
-    })
-    .catch((error) => {
-      onError(error);
-    });
-}
-
 export function doVerifyHub(config, onSuccess, onError) {
   const endpoint = API.post(`hub/verify`, {
     ...config,

ui/src/config.js

@@ -9,9 +9,9 @@ const dev = {
   ENV: 'dev',
   // Comment the below lines, when using codespaces or other special DNS names (which you can't control)
   HOSTNAME: hostname,
-  API_URL: `${protocol}//${hostname}:8080/api`,
-  URL: `${protocol}//${hostname}:8080`,
-  WS_URL: `${websocketprotocol}//${hostname}:8080/ws`,
+  API_URL: `${protocol}//${hostname}:80/api`,
+  URL: `${protocol}//${hostname}:80`,
+  WS_URL: `${websocketprotocol}//${hostname}:80/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,

ui/src/pages/Settings/Settings.jsx

@@ -33,7 +33,6 @@ import {
   verifyCamera,
   verifyHub,
   verifyPersistence,
-  verifySecondaryPersistence,
   getConfig,
   updateConfig,
 } from '../../actions/agent';
@@ -64,9 +63,6 @@ class Settings extends React.Component {
       verifyPersistenceSuccess: false,
       verifyPersistenceError: false,
       verifyPersistenceMessage: '',
-      verifySecondaryPersistenceSuccess: false,
-      verifySecondaryPersistenceError: false,
-      verifySecondaryPersistenceMessage: '',
       verifyCameraSuccess: false,
       verifyCameraError: false,
       verifyCameraMessage: '',
@@ -74,7 +70,6 @@ class Settings extends React.Component {
       verifyOnvifError: false,
       verifyOnvifErrorMessage: '',
       loading: false,
-      loadingSecondary: false,
       loadingHub: false,
       loadingCamera: false,
     };
@@ -130,8 +125,6 @@ class Settings extends React.Component {
     this.onUpdateTimeline = this.onUpdateTimeline.bind(this);
     this.initialiseLiveview = this.initialiseLiveview.bind(this);
     this.verifyPersistenceSettings = this.verifyPersistenceSettings.bind(this);
-    this.verifySecondaryPersistenceSettings =
-      this.verifySecondaryPersistenceSettings.bind(this);
     this.verifyHubSettings = this.verifyHubSettings.bind(this);
     this.verifyCameraSettings = this.verifyCameraSettings.bind(this);
     this.verifySubCameraSettings = this.verifySubCameraSettings.bind(this);
@@ -357,8 +350,6 @@ class Settings extends React.Component {
       configSuccess: false,
       configError: false,
       loadingCamera: false,
-      loading: false,
-      loadingSecondary: false,
       loadingOnvif: true,
     });
 
@@ -399,8 +390,6 @@ class Settings extends React.Component {
         configError: false,
         verifyPersistenceSuccess: false,
         verifyPersistenceError: false,
-        verifySecondaryPersistenceSuccess: false,
-        verifySecondaryPersistenceError: false,
         verifyHubSuccess: false,
         verifyHubError: false,
         verifyHubErrorMessage: '',
@@ -412,8 +401,6 @@ class Settings extends React.Component {
         verifyOnvifSuccess: false,
         verifyOnvifError: false,
         loadingHub: true,
-        loading: false,
-        loadingSecondary: false,
       });
 
       // .... test fields
@@ -454,8 +441,6 @@ class Settings extends React.Component {
         verifyHubError: false,
         verifyPersistenceSuccess: false,
         verifyPersistenceError: false,
-        verifySecondaryPersistenceSuccess: false,
-        verifySecondaryPersistenceError: false,
         persistenceSuccess: false,
         persistenceError: false,
         verifyCameraSuccess: false,
@@ -464,7 +449,6 @@ class Settings extends React.Component {
         verifyOnvifError: false,
         verifyCameraErrorMessage: '',
         loading: true,
-        loadingSecondary: false,
       });
 
       dispatchVerifyPersistence(
@@ -477,7 +461,6 @@ class Settings extends React.Component {
             persistenceSuccess: false,
             persistenceError: false,
             loading: false,
-            loadingSecondary: false,
           });
         },
         (error) => {
@@ -488,58 +471,6 @@ class Settings extends React.Component {
             persistenceSuccess: false,
             persistenceError: false,
             loading: false,
-            loadingSecondary: false,
-          });
-        }
-      );
-    }
-  }
-
-  verifySecondaryPersistenceSettings() {
-    const { config, dispatchVerifySecondaryPersistence } = this.props;
-    if (config) {
-      this.setState({
-        configSuccess: false,
-        configError: false,
-        verifyHubSuccess: false,
-        verifyHubError: false,
-        verifyPersistenceSuccess: false,
-        verifyPersistenceError: false,
-        verifySecondaryPersistenceSuccess: false,
-        verifySecondaryPersistenceError: false,
-        persistenceSuccess: false,
-        persistenceError: false,
-        verifyCameraSuccess: false,
-        verifyCameraError: false,
-        verifyOnvifSuccess: false,
-        verifyOnvifError: false,
-        verifyCameraErrorMessage: '',
-        loading: false,
-        loadingSecondary: true,
-      });
-
-      dispatchVerifySecondaryPersistence(
-        config.config,
-        () => {
-          this.setState({
-            verifySecondaryPersistenceSuccess: true,
-            verifySecondaryPersistenceError: false,
-            verifySecondaryPersistenceMessage: '',
-            persistenceSuccess: false,
-            persistenceError: false,
-            loading: false,
-            loadingSecondary: false,
-          });
-        },
-        (error) => {
-          this.setState({
-            verifySecondaryPersistenceSuccess: false,
-            verifySecondaryPersistenceError: true,
-            verifySecondaryPersistenceMessage: error,
-            persistenceSuccess: false,
-            persistenceError: false,
-            loading: false,
-            loadingSecondary: false,
           });
         }
       );
@@ -606,9 +537,6 @@ class Settings extends React.Component {
       verifyPersistenceSuccess,
       verifyPersistenceError,
       verifyPersistenceMessage,
-      verifySecondaryPersistenceSuccess,
-      verifySecondaryPersistenceError,
-      verifySecondaryPersistenceMessage,
       verifyCameraSuccess,
       verifyCameraError,
       verifyCameraErrorMessage,
@@ -618,7 +546,6 @@ class Settings extends React.Component {
       verifyOnvifErrorMessage,
       loadingCamera,
       loading,
-      loadingSecondary,
       loadingHub,
     } = this.state;
 
@@ -871,20 +798,6 @@ class Settings extends React.Component {
             )} :${verifyPersistenceMessage}`}
           />
         )}
-        {verifySecondaryPersistenceSuccess && (
-          <InfoBar
-            type="success"
-            message={t('settings.info.verify_persistence_success')}
-          />
-        )}
-        {verifySecondaryPersistenceError && (
-          <InfoBar
-            type="alert"
-            message={`${t(
-              'settings.info.verify_persistence_error'
-            )} :${verifySecondaryPersistenceMessage}`}
-          />
-        )}
         <div className="stats grid-container --two-columns">
           <div>
             {/* General settings block */}
@@ -2536,43 +2449,6 @@ class Settings extends React.Component {
                           )
                         }
                       />
-                      <Input
-                        noPadding
-                        label={t(
-                          'settings.persistence.kerberosvault_maxretries'
-                        )}
-                        placeholder={t(
-                          'settings.persistence.kerberosvault_description_maxretries'
-                        )}
-                        value={
-                          config.kstorage ? config.kstorage.max_retries : ''
-                        }
-                        onChange={(value) =>
-                          this.onUpdateField(
-                            'kstorage',
-                            'max_retries',
-                            value,
-                            config.kstorage
-                          )
-                        }
-                      />
-
-                      <Input
-                        noPadding
-                        label={t('settings.persistence.kerberosvault_timeout')}
-                        placeholder={t(
-                          'settings.persistence.kerberosvault_description_timeout'
-                        )}
-                        value={config.kstorage ? config.kstorage.timeout : ''}
-                        onChange={(value) =>
-                          this.onUpdateField(
-                            'kstorage',
-                            'timeout',
-                            value,
-                            config.kstorage
-                          )
-                        }
-                      />
                     </>
                   )}
                   {config.cloud === this.DROPBOX && (
@@ -2632,140 +2508,6 @@ class Settings extends React.Component {
                 </BlockFooter>
               </Block>
             )}
-
-            {/* Secondary Vault block */}
-            {showPersistenceSection && config.cloud === this.KERBEROS_VAULT && (
-              <Block>
-                <BlockHeader>
-                  <h4>{t('settings.persistence.secondary_persistence')}</h4>
-                </BlockHeader>
-                <BlockBody>
-                  <p>
-                    {t(
-                      'settings.persistence.description_secondary_persistence'
-                    )}
-                  </p>
-                  <Input
-                    noPadding
-                    label={t('settings.persistence.kerberosvault_apiurl')}
-                    placeholder={t(
-                      'settings.persistence.kerberosvault_description_apiurl'
-                    )}
-                    value={
-                      config.kstorage_secondary
-                        ? config.kstorage_secondary.uri
-                        : ''
-                    }
-                    onChange={(value) =>
-                      this.onUpdateField(
-                        'kstorage_secondary',
-                        'uri',
-                        value,
-                        config.kstorage_secondary
-                      )
-                    }
-                  />
-                  <Input
-                    noPadding
-                    label={t('settings.persistence.kerberosvault_provider')}
-                    placeholder={t(
-                      'settings.persistence.kerberosvault_description_provider'
-                    )}
-                    value={
-                      config.kstorage_secondary
-                        ? config.kstorage_secondary.provider
-                        : ''
-                    }
-                    onChange={(value) =>
-                      this.onUpdateField(
-                        'kstorage_secondary',
-                        'provider',
-                        value,
-                        config.kstorage_secondary
-                      )
-                    }
-                  />
-                  <Input
-                    noPadding
-                    label={t('settings.persistence.kerberosvault_directory')}
-                    placeholder={t(
-                      'settings.persistence.kerberosvault_description_directory'
-                    )}
-                    value={
-                      config.kstorage_secondary
-                        ? config.kstorage_secondary.directory
-                        : ''
-                    }
-                    onChange={(value) =>
-                      this.onUpdateField(
-                        'kstorage_secondary',
-                        'directory',
-                        value,
-                        config.kstorage_secondary
-                      )
-                    }
-                  />
-                  <Input
-                    type="password"
-                    iconright="activity"
-                    label={t('settings.persistence.kerberosvault_accesskey')}
-                    placeholder={t(
-                      'settings.persistence.kerberosvault_description_accesskey'
-                    )}
-                    value={
-                      config.kstorage_secondary
-                        ? config.kstorage_secondary.access_key
-                        : ''
-                    }
-                    onChange={(value) =>
-                      this.onUpdateField(
-                        'kstorage_secondary',
-                        'access_key',
-                        value,
-                        config.kstorage_secondary
-                      )
-                    }
-                  />
-                  <Input
-                    type="password"
-                    iconright="activity"
-                    label={t('settings.persistence.kerberosvault_secretkey')}
-                    placeholder={t(
-                      'settings.persistence.kerberosvault_description_secretkey'
-                    )}
-                    value={
-                      config.kstorage_secondary
-                        ? config.kstorage_secondary.secret_access_key
-                        : ''
-                    }
-                    onChange={(value) =>
-                      this.onUpdateField(
-                        'kstorage_secondary',
-                        'secret_access_key',
-                        value,
-                        config.kstorage_secondary
-                      )
-                    }
-                  />
-                </BlockBody>
-                <BlockFooter>
-                  <Button
-                    label={t('settings.persistence.verify_connection')}
-                    disabled={loadingSecondary}
-                    onClick={this.verifySecondaryPersistenceSettings}
-                    type={loadingSecondary ? 'neutral' : 'default'}
-                    icon="verify"
-                  />
-                  <Button
-                    label="Save"
-                    type="submit"
-                    onClick={this.saveConfig}
-                    buttonType="submit"
-                    icon="pencil"
-                  />
-                </BlockFooter>
-              </Block>
-            )}
           </div>
         </div>
       </div>
@@ -2790,8 +2532,6 @@ const mapDispatchToProps = (dispatch /* , ownProps */) => ({
     dispatch(verifyHub(config, success, error)),
   dispatchVerifyPersistence: (config, success, error) =>
     dispatch(verifyPersistence(config, success, error)),
-  dispatchVerifySecondaryPersistence: (config, success, error) =>
-    dispatch(verifySecondaryPersistence(config, success, error)),
   dispatchGetConfig: (callback) => dispatch(getConfig(callback)),
   dispatchUpdateConfig: (field, value) => dispatch(updateConfig(field, value)),
   dispatchSaveConfig: (config, success, error) =>
@@ -2809,7 +2549,6 @@ Settings.propTypes = {
   images: PropTypes.array.isRequired,
   dispatchVerifyHub: PropTypes.func.isRequired,
   dispatchVerifyPersistence: PropTypes.func.isRequired,
-  dispatchVerifySecondaryPersistence: PropTypes.func.isRequired,
   dispatchGetConfig: PropTypes.func.isRequired,
   dispatchUpdateConfig: PropTypes.func.isRequired,
   dispatchSaveConfig: PropTypes.func.isRequired,

ui/yarn.lock

@@ -1715,10 +1715,10 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@kerberos-io/ui@^1.76.0":
-  version "1.77.0"
-  resolved "https://registry.yarnpkg.com/@kerberos-io/ui/-/ui-1.77.0.tgz#b748b2a9abf793ff2a9ba64ee41f84debc0ca9dc"
-  integrity sha512-CHh4jeLKwrYvJRL5PM3UEN4p2k1fqwMKgSF2U6IR4v0fE2FwPc/2Ry4zGk6pvLDFHbDpR9jUkHX+iNphvStoyQ==
+"@kerberos-io/ui@^1.71.0":
+  version "1.71.0"
+  resolved "https://registry.yarnpkg.com/@kerberos-io/ui/-/ui-1.71.0.tgz#06914c94e8b0982068d2099acf8158917a511bfc"
+  integrity sha512-pHCTn/iQTcQEPoCK82eJHGRn6BgzW3wgV4C+mNqdKOtLTquxL+vh7molEgC66tl3DGf7HyjSNa8LuoxYbt9TEg==
   dependencies:
     "@emotion/react" "^11.10.4"
     "@emotion/styled" "^11.10.4"