Compare commits

...
Author SHA1 Message Date
Cedric Verstraeten 5d4a6472d9 Merge branch 'develop' 2022-09-08 16:51:37 +02:00
Cédric Verstraeten 4924bbb7d1 Merge pull request #43 from olokos/fix_pre3
Fix prerecording timing
2022-09-08 13:51:00 +02:00
olokos 56a2558ed8 Try removing GOP +1 2022-09-08 13:45:24 +02:00
olokos 0cb125720b Attempt to fix prerecording 2022-09-07 21:33:03 +02:00
olokos 0b12b7d118 Add logging for prerecording and MaxGopCount 2022-09-07 21:30:37 +02:00
Cédric Verstraeten 5f82a497ca Update main.go 2022-09-06 18:53:33 +02:00
Cedric Verstraeten a67c84a670 add dutch translation + add placeholders + stop loading when empty media 2022-09-05 22:02:05 +02:00
Cedric Verstraeten 13a93d0432 add auto cleanup configuration 2022-09-05 14:05:46 +02:00
Cedric Verstraeten 9e18d927bf add latest tags 2022-09-05 13:31:43 +02:00
Cedric Verstraeten 44f4d2913c add some kerberos hub branding 2022-09-05 13:29:01 +02:00
Cedric Verstraeten 0caea6cf3c Update README.md 2022-09-05 13:02:36 +02:00
Cedric Verstraeten 026b343b76 Update README.md 2022-09-05 13:00:43 +02:00
Cedric Verstraeten fea45cf349 Update README.md 2022-09-05 12:57:35 +02:00
Cedric Verstraeten 8a0481da03 fix video width + update base config 2022-09-05 12:43:23 +02:00
Cedric Verstraeten a32ae05f69 Update config.json 2022-09-05 12:43:04 +02:00
Cedric Verstraeten 19fd33f26a add gif readme 2022-09-05 12:00:39 +02:00
Cedric Verstraeten 3d5c5b62cb language fix, add manual fallback in languageselector 2022-09-05 11:15:56 +02:00
Cedric Verstraeten 793bb28c55 add polish file 2022-09-05 08:25:34 +02:00
Cedric Verstraeten 10d6004f58 hard code 'en' for the time being 2022-09-05 08:24:27 +02:00
Cedric Verstraeten 59af5db610 load language only! 2022-09-04 21:57:40 +02:00
Cedric Verstraeten d0457cfd7c Update LanguageSelect.jsx 2022-09-04 21:51:09 +02:00
Cedric Verstraeten 856fd8717a Update LanguageSelect.jsx 2022-09-04 21:50:58 +02:00
Cedric Verstraeten 169946dad0 set fallback 2022-09-04 21:50:12 +02:00
Cedric Verstraeten f2e9e534ca change fallback 2022-09-04 21:46:37 +02:00
Cedric Verstraeten 6cb7906076 move translations not able to be resolved in container 2022-09-04 21:11:51 +02:00
Cedric Verstraeten 68f1de2dbf optimise and make more accurate pre recording 2022-09-04 21:05:18 +02:00
Cedric Verstraeten a9f5e0d34e fix for language selector 2022-09-04 17:44:50 +02:00
Cedric Verstraeten c1a958890f update translation 2022-09-04 16:19:17 +02:00
Cedric Verstraeten 8f4c7bbadc Update index.jsx 2022-09-03 22:01:49 +02:00
Cedric Verstraeten 38ee070598 change opacity + add first version of language selector 2022-09-03 22:00:15 +02:00
Cedric Verstraeten 235641cf72 change restart order (on config) + hide time settings when disabled 2022-09-03 20:07:26 +02:00
Cedric Verstraeten ce4693cb0e add additional check 2022-09-02 15:27:59 +02:00
Thomas Quandalle a08728d119 prerecording was not take into account 2022-09-01 21:53:42 +02:00
Thomas Quandalle d50a888bdf Update IPCamera.go 2022-09-01 21:12:32 +02:00
Thomas Quandalle 72fefba530 add recordings page 2022-09-01 19:54:42 +02:00
Thomas Quandalle f5cb48c2e9 Update config.js 2022-08-31 20:17:56 +02:00
Thomas Quandalle 9477fe9585 fix for hostname 2022-08-31 19:50:19 +02:00
Thomas Quandalle e1d468cfca hide specific settings when toggled off, small tweak for infobar 2022-08-31 16:58:23 +02:00
Thomas Quandalle e67500a4fe add link to ui library + camerasonline 2022-08-31 16:37:59 +02:00
Thomas Quandalle daed0ee33a when in offlineMode, mqttClient can nil + try something for disconnects 2022-08-31 16:25:44 +02:00
Thomas Quandalle 721c8b6c65 cleanup config + smaller bug fixes 2022-08-31 16:09:01 +02:00
Thomas Quandalle fb7ef7aa97 update dashboard page, add breadcrumb buttons 2022-08-31 15:12:14 +02:00
Thomas Quandalle cf40b68338 add links + recording threshold 2022-08-31 11:15:31 +02:00
Thomas Quandalle cdca6d77cb fix heartbeat + add kerberos hub connection kpi 2022-08-31 10:06:56 +02:00
Thomas Quandalle f2b1f82f59 Update Dashboard.jsx 2022-08-30 20:40:52 +02:00
Thomas Quandalle 963c330c00 Update Dashboard.jsx 2022-08-30 19:29:19 +02:00
Thomas Quandalle 10864fbfe4 move dashboard info to app.jsx 2022-08-30 19:26:03 +02:00
Thomas Quandalle 7423cb36ea fix errors here and there :) 2022-08-30 10:30:21 +02:00
Thomas Quandalle efbf03858e fix live view + add total recordings + offline mode option 2022-08-29 22:33:55 +02:00
Thomas Quandalle b37787dd02 fix for config url, live view need some tweaks 2022-08-29 15:19:51 +02:00
Thomas Quandalle 19a680cfd8 add MJPEG and live view on dashboard page (WIP)
snapshots are now stored in color instead of gray
2022-08-29 15:12:17 +02:00
Thomas Quandalle 3de747dbb9 update config 2022-08-27 21:25:33 +02:00
Thomas Quandalle dbaa2ddcbe add webrtc extra logging 2022-08-27 21:19:48 +02:00
Thomas Quandalle 60be32dea3 Update authentication.js 2022-08-27 15:29:09 +02:00
Thomas Quandalle 6a561c6464 change env 2022-08-27 14:40:49 +02:00
Thomas Quandalle e62ae2f770 fix for API url (port might be different) 2022-08-27 13:38:47 +02:00
Thomas Quandalle 2fb6625e9a fix prod build 2022-08-26 22:03:45 +02:00
Cédric Verstraeten 018a0baf0a Update README.md 2022-08-26 21:49:02 +02:00
Thomas Quandalle 6182594b6e enterprise agent depending how is running + github action worlflow failed 2022-08-26 21:19:07 +02:00
Thomas Quandalle e00b45037c add a random key when empty + add verification for hub and vault 2022-08-26 21:13:43 +02:00
Thomas Quandalle a1c000e84f add a working settings page (Finally) 2022-08-26 18:01:18 +02:00
Thomas Quandalle c1684bb743 add update config function - less strict linting 2022-08-22 22:48:41 +02:00
Thomas Quandalle 31b9f7022b remove console print - broke build 2022-08-22 12:26:17 +02:00
Thomas Quandalle 6b9f25ef57 a few fixes for settings page + add sub rtsp url (WIP) 2022-08-22 10:50:10 +02:00
Thomas Quandalle 24c3b97629 remove double reading from channel 2022-08-21 20:34:15 +02:00
Cédric Verstraeten 03f7201540 Merge pull request #39 from olokos/develop
Save num of changes to filename, update a lot of dependencies and fix compiling develop branch
2022-08-18 10:21:49 +02:00
olokos 9ffd9700db Revert channel size back to 1
Having the size of 2 gives no profits, but creates a side effect of 1kb recording files being saved, because of message channel being blocked awaiting for the other parameter, giving unexpected results
2022-08-17 23:33:20 +02:00
olokos 87f84e993a Eslint: Fix Unexpected unnamed function func-names
This is the proper and correct new way of using anonymous functions.

Reference: https://stackoverflow.com/questions/52735032/warning-unexpected-unnamed-function-func-names-under-eslint-rule
2022-08-17 21:12:01 +02:00
olokos 23b357e669 Fix build after 3debf62975
Because of missing imports and some undefined variables the latest code wouldn't compile.

I have fixed it.

The only thing I am not sure about is dispatchConfig: PropTypes.bool.isRequired
Not sure if it's truly bool or if this is valid, but it works finally again, but with proper log timezone!
2022-08-17 20:27:26 +02:00
olokos 4021c0dada No idea how those 2 got downgraded, but lets use the latest versions again 2022-08-17 11:50:02 +02:00
olokos dac55e489a Merge remote-tracking branch 'upstream/develop' into develop 2022-08-17 11:44:31 +02:00
Thomas Quandalle 14e1584ca7 add timezone for logging 2022-08-16 22:59:51 +02:00
Thomas Quandalle 3dd61eea6e Merge branch 'master' into develop 2022-08-15 22:08:41 +02:00
Thomas Quandalle 3debf62975 update settings page 2022-08-15 22:08:08 +02:00
olokos fb20aa3bf5 Split filename source line into multiple lines, improve logging message 2022-08-15 18:39:41 +02:00
olokos e4ba5570a7 Use node 16 instead of 14 and use latest kerberos/base 2022-08-15 18:15:16 +02:00
olokos 592e03fc3b Update most of go and javascript dependencies
There were some build issues, also eslint was preventing build because of too old react-scripts, that was in conflict with another requirement for more recent eslint, so I've updated react-scripts, so newer eslint isn't a problem anymore.
2022-08-15 18:11:40 +02:00
Cédric Verstraeten 0b1fd776f4 Merge pull request #36 from olokos/master
Implement changesTreshold parameter and config.json
2022-08-15 08:17:40 +02:00
olokos 098bf0b75f Attempt to fix compilation 2022-08-15 02:52:04 +02:00
olokos 204359c6be MotionData: Implement saving changed pixels into filename
Attempt to fix saving changes detected into filename
models/MotionData.go is meant to be a model containing all of the data in regards to currently recorded video

Since I currently mostly need pixel changed saved in the filename properly, I've created 2 structs:

Partial= Timestamp + Changes working
Full= Everything - Not yet used but prepared for fully implementing the rest of data into the filename

Currently filename only saves proper timestamp and the rest is hardcoded, this is one step forwards to have it fully save a dynamic filename.
2022-08-15 02:15:39 +02:00
olokos d0d8531537 Change changeTreshhold parameter to pixelChangeThreshold 2022-08-14 01:23:43 +02:00
olokos 1b73f5857d Implement changesTreshold parameter and config.json
In case there is no changesTreshold defined in config.json, then treshold will be 75, to stick with original hardcoded value.
2022-08-13 19:52:19 +02:00
Thomas Quandalle 5fbba44109 Merge branch 'develop' 2022-08-05 09:52:38 +02:00
Thomas Quandalle 99c68c220d add update commit before installing packages 2022-08-05 09:18:53 +02:00
Thomas Quandalle 4d7baecb32 fix hub key for motion detection alert 2022-08-05 09:06:17 +02:00
Thomas Quandalle 1853e4e33d Update main.go 2022-06-27 08:22:28 +02:00
Thomas Quandalle eacd341cc7 refactor and rename to usbcamera-test 2022-06-27 07:59:15 +02:00
Thomas Quandalle 8b9d4f2eb6 disable window 2022-06-26 22:12:30 +02:00
Thomas Quandalle fb8f7fc042 get rid of dependency 2022-06-26 21:36:11 +02:00
Thomas Quandalle ae79b7c248 set x264 and fixed fps 2022-06-26 21:31:00 +02:00
Thomas Quandalle 00e62734c7 disable auto reconnect 2022-06-26 19:48:28 +02:00
Thomas Quandalle a50f2e5435 add v4l-utils 2022-06-26 19:13:52 +02:00
Thomas Quandalle 3324ea8fa2 add user to video group 2022-06-26 18:08:09 +02:00
Thomas Quandalle 37f904c586 move it to a dedicated folder capture-test 2022-06-26 16:25:14 +02:00
Thomas Quandalle 4071bbfa98 add a webcam-test command to verify if a camera is working 2022-06-26 16:21:01 +02:00
71 changed files with 7077 additions and 3670 deletions
+5 -1
View File
@@ -28,6 +28,8 @@ jobs:
run: docker buildx build --platform linux/${{matrix.architecture}} -t kerberos/agent-dev:arch-$(echo ${{matrix.architecture}} | tr / -)-$(echo $GITHUB_SHA | cut -c1-7) --push .
- name: Create new and append to manifest
run: docker buildx imagetools create -t kerberos/agent-dev:$(echo $GITHUB_SHA | cut -c1-7) kerberos/agent-dev:arch-$(echo ${{matrix.architecture}} | tr / -)-$(echo $GITHUB_SHA | cut -c1-7)
- name: Create new and append to latest manifest
run: docker buildx imagetools create -t kerberos/agent-dev:latest kerberos/agent-dev:arch-$(echo ${{matrix.architecture}} | tr / -)-$(echo $GITHUB_SHA | cut -c1-7)
build-other:
runs-on: ubuntu-latest
strategy:
@@ -50,4 +52,6 @@ jobs:
- name: Run Buildx
run: docker buildx build --platform linux/${{matrix.architecture}} -t kerberos/agent-dev:arch-$(echo ${{matrix.architecture}} | tr / -)-$(echo $GITHUB_SHA | cut -c1-7) --push .
- name: Create new and append to manifest
run: docker buildx imagetools create --append -t kerberos/agent-dev:$(echo $GITHUB_SHA | cut -c1-7) kerberos/agent-dev:arch-$(echo ${{matrix.architecture}} | tr / -)-$(echo $GITHUB_SHA | cut -c1-7)
run: docker buildx imagetools create --append -t kerberos/agent-dev:$(echo $GITHUB_SHA | cut -c1-7) kerberos/agent-dev:arch-$(echo ${{matrix.architecture}} | tr / -)-$(echo $GITHUB_SHA | cut -c1-7)
- name: Create new and append to manifest latest
run: docker buildx imagetools create --append -t kerberos/agent-dev:latest kerberos/agent-dev:arch-$(echo ${{matrix.architecture}} | tr / -)-$(echo $GITHUB_SHA | cut -c1-7)
+5 -1
View File
@@ -28,6 +28,8 @@ jobs:
run: docker buildx build --platform linux/${{matrix.architecture}} -t kerberos/agent:arch-$(echo ${{matrix.architecture}} | tr / -)-$(echo $GITHUB_SHA | cut -c1-7) --push .
- name: Create new and append to manifest
run: docker buildx imagetools create -t kerberos/agent:$(echo $GITHUB_SHA | cut -c1-7) kerberos/agent:arch-$(echo ${{matrix.architecture}} | tr / -)-$(echo $GITHUB_SHA | cut -c1-7)
- name: Create new and append to manifest latest
run: docker buildx imagetools create -t kerberos/agent:latest kerberos/agent:arch-$(echo ${{matrix.architecture}} | tr / -)-$(echo $GITHUB_SHA | cut -c1-7)
build-other:
runs-on: ubuntu-latest
strategy:
@@ -50,4 +52,6 @@ jobs:
- name: Run Buildx
run: docker buildx build --platform linux/${{matrix.architecture}} -t kerberos/agent:arch-$(echo ${{matrix.architecture}} | tr / -)-$(echo $GITHUB_SHA | cut -c1-7) --push .
- name: Create new and append to manifest
run: docker buildx imagetools create --append -t kerberos/agent:$(echo $GITHUB_SHA | cut -c1-7) kerberos/agent:arch-$(echo ${{matrix.architecture}} | tr / -)-$(echo $GITHUB_SHA | cut -c1-7)
run: docker buildx imagetools create --append -t kerberos/agent:$(echo $GITHUB_SHA | cut -c1-7) kerberos/agent:arch-$(echo ${{matrix.architecture}} | tr / -)-$(echo $GITHUB_SHA | cut -c1-7)
- name: Create new and append to manifest latest
run: docker buildx imagetools create --append -t kerberos/agent:latest kerberos/agent:arch-$(echo ${{matrix.architecture}} | tr / -)-$(echo $GITHUB_SHA | cut -c1-7)
+1 -1
View File
@@ -26,7 +26,7 @@ jobs:
- name: Check out code into the Go module directory
uses: actions/checkout@v2
- name: Install dependencies
run: apt install -y --no-install-recommends git build-essential cmake pkg-config unzip libgtk2.0-dev curl ca-certificates libcurl4-openssl-dev libssl-dev libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev
run: apt update -y && apt install -y --no-install-recommends git build-essential cmake pkg-config unzip libgtk2.0-dev curl ca-certificates libcurl4-openssl-dev libssl-dev libavcodec-dev libavformat-dev libswscale-dev libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libdc1394-22-dev
- name: Get dependencies
run: cd machinery && go mod download
- name: Build
+4 -1
View File
@@ -1,8 +1,11 @@
ui/node_modules
ui/build
ui/public/assets/env.js
.idea
machinery/www
yarn.lock
machinery/data/config
machinery/data/cloud
machinery/data/recordings
machinery/data/recordings
machinery/data/snapshots
machinery/test*
+15
View File
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Launch Package",
"type": "go",
"request": "launch",
"mode": "auto",
"program": "${fileDirname}"
}
]
}
+5 -4
View File
@@ -1,4 +1,4 @@
FROM kerberos/base:6e68480 AS builder
FROM kerberos/base:977706d AS builder
LABEL AUTHOR=Kerberos.io
ENV GOROOT=/usr/local/go
@@ -26,7 +26,7 @@ COPY ui /go/src/github.com/kerberos-io/agent/ui
########################
# Download NPM and Yarns
RUN apt-get update && apt-get install -y curl && curl -sL https://deb.nodesource.com/setup_14.x | bash - && \
RUN apt-get update && apt-get install -y curl && curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
apt update && apt install yarn -y
@@ -51,6 +51,7 @@ RUN cd /go/src/github.com/kerberos-io/agent/machinery && \
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 && \
rm -rf /go/src/gitlab.com/
@@ -108,7 +109,7 @@ FROM alpine:latest
############################
# Protect by non-root user.
RUN addgroup -S kerberosio && adduser -S agent -G kerberosio
RUN addgroup -S kerberosio && adduser -S agent -G kerberosio && addgroup agent video
#################################
# Copy files from previous images
@@ -119,7 +120,7 @@ COPY --chown=0:0 --from=builder /usr/local/go/lib/time/zoneinfo.zip /zoneinfo.zi
ENV ZONEINFO=/zoneinfo.zip
RUN apk update && apk add ca-certificates --no-cache && \
apk add tzdata --no-cache && apk add curl --no-cache && rm -rf /var/cache/apk/*
apk add tzdata curl --no-cache && rm -rf /var/cache/apk/*
#################
# Install Bento4
+70 -24
View File
@@ -25,41 +25,37 @@ https://brianmacdonald.github.io/Ethonate/address#0xf4a759C9436E2280Ea9cdd23d314
Kerberos Agent is a cutting edge video surveillance management system made available as Open Source under the MIT License. This means that all the source code is available for you or your company, and you can use, transform and distribute the source code; as long you keep a reference of the original license. Kerberos Agent can be used for commercial usage (which was not the case for v2). Read more [about the license here](LICENSE).
![login-agent](./assets/img/agent-login.png)
![Kerberos Agent go through UI](./assets/img/kerberos-agent-overview.gif)
## Quickstart - Docker
The easiest to get your Kerberos Agent up and running is to use our Docker image on [Docker hub](https://hub.docker.com/r/kerberos/agent). Once you selected a specific tag, run below command, which will open the web interface of your Kerberos agent on port `8080`. For persisting your configuration and/or recordings [attach a volume](#attach-a-volume).
## Support our project
docker run -p 8080:8080 --name mycamera -d kerberos/agent:latest
If you like our product please feel free to execute an Ethereum donation. All donations will flow back and split to our Open Source contributors, as they are the heart of this community.
<img width="272" alt="Ethereum donation linke" src="https://user-images.githubusercontent.com/1546779/173443671-3d773068-ae10-4862-a990-dc7c89f3d9c2.png">
Ethereum Address: `0xf4a759C9436E2280Ea9cdd23d3144D95538fF4bE`
## Quickstart - Balena
To be written
## Work In Progress
Kerberos Agent (v3) is not yet released, and is actively developed. You can follow the progress [on our project board](https://github.com/kerberos-io/agent/projects/1) and review our designs at [Figma](https://www.figma.com/proto/msuYC6sv2cOCqZeDtBxNy7/%5BNEW%5D-Kerberos.io-Apps?node-id=1%3A1788&viewport=-490%2C191%2C0.34553584456443787&scaling=min-zoom&page-id=1%3A2%3Ffuid%3D449684443467913607). Feel free to give any feedback.
## Quickstart - Snap
## Previous releases
To be written
This repository contains the next generation of Kerberos.io, **Kerberos Agent (v3)**, and is the successor of the machinery and web repositories. A switch in technologies and architecture has been made. This version is still under active development and can be followed on the [develop branch](https://github.com/kerberos-io/agent/tree/develop) and [project overview](https://github.com/kerberos-io/agent/projects/1).
Read more about this [at the FAQ](#faq) below.
![opensource-to-agent](https://user-images.githubusercontent.com/1546779/172066873-7752c979-de63-4417-8d26-34192fdbd1e6.svg)
## Introduction
Kerberos.io is a cutting edge video surveillance system with a strong focus on user experience, scalability, resilience, extension and integration. Kerberos.io provides different solutions, but from a high level point of view it comes into two flavours: Kerberos Agent and Kerberos Enterprise Suite. Bottom line Kerberos Enterprise Suite extends Kerberos Agent with additional components such as Kerberos Factory, Kerberos Vault and Kerberos Hub.
### Kerberos Agent
- Installation in seconds (Kerberos Etcher, Docker, Binaries).
- Installation in seconds (Docker, Balena, Snap, etc).
- Simplified and modern user interface.
- Multi architecture (ARMv7, ARMv8, amd64, etc).
- Multi camera support: IP Cameras (MJPEG/H264), USB cameras, Raspberry Pi Cameras.
- Multi camera support: IP Cameras (MJPEG/H264), USB cameras and Raspberry Pi Cameras through a RTSP proxy.
- Single camera per instance (e.g. One Docker container per camera).
- Cloud integration through Webhooks, MQTT, etc.
- Cloud storage through Kerberos Hub.
- Integrations (Webhooks, MQTT, Script, etc).
- Cloud storage (Kerberos Hub, Kerberos Vault, Minio, Storj, etc).
- MIT License
### Kerberos Factory (part of [Kerberos Enterprise suite](https://doc.kerberos.io/enterprise/first-things-first/))
@@ -78,10 +74,41 @@ Kerberos.io applies the concept of agents. An agent is running next to or on you
If you are looking for a solution that scales better with your video surveillance and/or video analytics requirements, [Kerberos Enterprise Suite might be a better fit](https://doc.kerberos.io/enterprise/first-things-first).
## Installation
Kerberos Agent **will ship in different formats**: Docker, binary, snap, KiOS. Version 3 is still in active development right now, and not yet released.
## Running as a container
## Run and develop
We are creating Docker images as part of our CI/CD process. You'll find our Docker images on [Docker hub](https://hub.docker.com/r/kerberos/agent). Pick a specific tag of choice, or use latest. Once done run below command, this will open the web interface of your Kerberos agent on port 8080.
docker run -p 8080:8080 --name mycamera -d kerberos/agent:latest
Or for a develop build:
docker run -p 8080:8080 --name mycamera -d kerberos/agent-dev:latest
Feel free to use another port if your host system already has a workload running on `8080`. For example `8082`.
docker run -p 8082:8080 --name mycamera -d kerberos/agent:latest
## Attach a volume
By default your Kerberos agent will store all its configuration and recordings inside the container. It might be interesting to store both configuration and your recordings outside the container, on your local disk. This helps persisting your storage even after you decide to wipe out your Kerberos agent.
You attach a volume to your container by leveraging the `-v` option. To mount your own configuration file, execute as following:
1. Decide where you would like to store your configuration and recordings; create a new directory for the config file and recordings folder accordingly.
mkdir agent
mkdir agent/config
mkdir agent/recordings
2. Once you have located your desired directory, copy the latest [`config.json`](https://github.com/kerberos-io/agent/blob/master/machinery/data/config/config.json) file into your config directory.
wget https://raw.githubusercontent.com/kerberos-io/agent/master/machinery/data/config/config.json -O agent/config/config.json
3. Run the docker command as following to attach your config directory and recording directory.
docker run -p 8080:8080 --name mycamera -v $(pwd)/agent/config:/home/agent/data/config -v $(pwd)/agent/recordings:/home/agent/data/recordings -d kerberos/agent:latest
## Develop and build
Kerberos Agent is divided in two parts a `machinery` and `web`. Both parts live in this repository in their relative folders. For development or running the application on your local machine, you have to run both the `machinery` and the `web` as described below. When running in production everything is shipped as only one artifact, read more about this at [Building for production](#building-for-production).
@@ -97,6 +124,10 @@ This will start a webserver and launches the web app on port `3000`.
![login-agent](./assets/img/agent-login.gif)
Once signed in you'll see the dashboard page showing up. After successfull configuration of your agent, you'll should see a live view and possible events recorded to disk.
![dashboard-agent](./assets/img/agent-dashboard.png)
### Machinery
The `machinery` is a **Golang** project which delivers two functions: it acts as the Kerberos Agent which is doing all the heavy lifting with camera processing and other kinds of logic, on the other hand it acts as a webserver (Rest API) that allows communication from the web (React) or any other custom application. The API is documented using `swagger`.
@@ -107,7 +138,7 @@ You can simply run the `machinery` using following commands.
cd machinery
go run main.go run mycameraname 8080
This will launch the Kerberos Agent and run a webserver on port `8080`. You can change the port by your own preference. We strongly support the usage of [Goland](https://www.jetbrains.com/go/), as it comes with all the debugging and linting features builtin.
This will launch the Kerberos Agent and run a webserver on port `8080`. You can change the port by your own preference. We strongly support the usage of [Goland](https://www.jetbrains.com/go/) or [Visual Studio Code](https://code.visualstudio.com/), as it comes with all the debugging and linting features builtin.
![run-in-goland](https://user-images.githubusercontent.com/1546779/111139940-0a4d1a80-8582-11eb-8985-ceaf7359f4ee.gif)
@@ -139,7 +170,22 @@ This base image contains already a couple of tools, such as Golang, FFmpeg and O
By running the `docker build` command, you will create the Kerberos Agent Docker image. After building you can simply run the image as a Docker container.
docker build -t kerberos/agent .
docker run -p 8080:8080 --name mycamera -d kerberos/agent:edge
## Support our project
If you like our product please feel free to execute an Ethereum donation. All donations will flow back and split to our Open Source contributors, as they are the heart of this community.
<img width="272" alt="Ethereum donation linke" src="https://user-images.githubusercontent.com/1546779/173443671-3d773068-ae10-4862-a990-dc7c89f3d9c2.png">
Ethereum Address: `0xf4a759C9436E2280Ea9cdd23d3144D95538fF4bE`
## Previous releases
This repository contains the next generation of Kerberos.io, **Kerberos Agent (v3)**, and is the successor of the machinery and web repositories. A switch in technologies and architecture has been made. This version is still under active development and can be followed on the [develop branch](https://github.com/kerberos-io/agent/tree/develop) and [project overview](https://github.com/kerberos-io/agent/projects/1).
Read more about this [at the FAQ](#faq) below.
![opensource-to-agent](https://user-images.githubusercontent.com/1546779/172066873-7752c979-de63-4417-8d26-34192fdbd1e6.svg)
## FAQ
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 MiB

+42 -35
View File
@@ -1,37 +1,35 @@
{
"type": "template",
"key": "0x123-a-test-agent",
"name": "camera",
"mqtturi": "tcp://mqtt.kerberos.io",
"mqtt_username": "xxx",
"mqtt_password": "xxx",
"timezone": "Europe/Brussels",
"stunuri": "stun:turn.kerberos.io:8443",
"turnuri": "turn:turn.kerberos.io:8443",
"turn_password": "xxx",
"type": "",
"key": "",
"name": "agent",
"time": "false",
"offline": "false",
"auto_clean": "true",
"max_directory_size": 100,
"timezone": "Africa/Ceuta",
"capture": {
"id": "ipcamera",
"name": "",
"ipcamera": {
"rtsp": "xxx",
"rtsp": "",
"sub_rtsp": "",
"fps": ""
},
"usbcamera": {
"device": "",
"fps": ""
"device": ""
},
"raspicamera": {
"device": "",
"fps": ""
"device": ""
},
"continuous": "false",
"postrecording": 10,
"prerecording": 5,
"maxlengthrecording":60,
"postrecording": 20,
"prerecording": 10,
"maxlengthrecording": 30,
"transcodingwebrtc": "",
"transcodingresolution": 0,
"forwardwebrtc": "",
"transcodingwebrtc": "false",
"transcodingresolution": 25,
"fragmented": "false",
"fragmentedduration": 1
"fragmentedduration": 8,
"pixelChangeThreshold": 150
},
"timetable": [
{
@@ -42,8 +40,8 @@
},
{
"start1": 0,
"end1": 69840,
"start2": 70080,
"end1": 43199,
"start2": 43200,
"end2": 86400
},
{
@@ -78,6 +76,7 @@
}
],
"region": {
"name": "",
"rectangle": {
"x1": 0,
"y1": 0,
@@ -86,16 +85,24 @@
},
"polygon": []
},
"cloud": "kstorage",
"cloud": "s3",
"s3": {
"proxyuri": "http://proxy.kerberos.io",
"bucket": "kerberosaccept",
"region": "eu-west1"
},
"kstorage": {},
"mqtturi": "tcp://mqtt.kerberos.io:1883",
"mqtt_username": "",
"mqtt_password": "",
"stunuri": "stun:turn.kerberos.io:8443",
"turnuri": "turn:turn.kerberos.io:8443",
"turn_username": "username1",
"turn_password": "password1",
"heartbeaturi": "",
"hub_uri": "https://api.cloud.kerberos.io",
"hub_key": "xxx",
"hub_private_key": "xxx",
"hub_key": "",
"hub_private_key": "",
"hub_site": "",
"kstorage": {
"uri": "https://staging.api.vault.kerberos.live",
"access_key": "xxx",
"secret_access_key": "xxx",
"provider": "",
"directory": "xxx"
}
}
"condition_uri": ""
}
+376 -1
View File
@@ -24,7 +24,382 @@ const docTemplate = `{
},
"host": "{{.Host}}",
"basePath": "{{.BasePath}}",
"paths": {},
"paths": {
"/api/hub/verify": {
"post": {
"security": [
{
"Bearer": []
}
],
"description": "Will verify the hub connectivity.",
"tags": [
"config"
],
"summary": "Will verify the hub connectivity.",
"operationId": "verify-hub",
"parameters": [
{
"description": "Config",
"name": "config",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/models.Config"
}
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/models.APIResponse"
}
}
}
}
},
"/api/persistence/verify": {
"post": {
"security": [
{
"Bearer": []
}
],
"description": "Will verify the persistence.",
"tags": [
"config"
],
"summary": "Will verify the persistence.",
"operationId": "verify-persistence",
"parameters": [
{
"description": "Config",
"name": "config",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/models.Config"
}
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/models.APIResponse"
}
}
}
}
}
},
"definitions": {
"models.APIResponse": {
"type": "object",
"properties": {
"data": {}
}
},
"models.Capture": {
"type": "object",
"properties": {
"continuous": {
"type": "string"
},
"forwardwebrtc": {
"type": "string"
},
"fragmented": {
"type": "string"
},
"fragmentedduration": {
"type": "integer"
},
"ipcamera": {
"$ref": "#/definitions/models.IPCamera"
},
"maxlengthrecording": {
"type": "integer"
},
"name": {
"type": "string"
},
"pixelChangeThreshold": {
"type": "integer"
},
"postrecording": {
"type": "integer"
},
"prerecording": {
"type": "integer"
},
"raspicamera": {
"$ref": "#/definitions/models.RaspiCamera"
},
"transcodingresolution": {
"type": "integer"
},
"transcodingwebrtc": {
"type": "string"
},
"usbcamera": {
"$ref": "#/definitions/models.USBCamera"
}
}
},
"models.Config": {
"type": "object",
"properties": {
"capture": {
"$ref": "#/definitions/models.Capture"
},
"cloud": {
"type": "string"
},
"condition_uri": {
"type": "string"
},
"heartbeaturi": {
"description": "obsolete",
"type": "string"
},
"hub_key": {
"type": "string"
},
"hub_private_key": {
"type": "string"
},
"hub_site": {
"type": "string"
},
"hub_uri": {
"type": "string"
},
"key": {
"type": "string"
},
"kstorage": {
"$ref": "#/definitions/models.KStorage"
},
"mqtt_password": {
"type": "string"
},
"mqtt_username": {
"type": "string"
},
"mqtturi": {
"type": "string"
},
"name": {
"type": "string"
},
"offline": {
"type": "string"
},
"region": {
"$ref": "#/definitions/models.Region"
},
"s3": {
"$ref": "#/definitions/models.S3"
},
"stunuri": {
"type": "string"
},
"time": {
"type": "string"
},
"timetable": {
"type": "array",
"items": {
"$ref": "#/definitions/models.Timetable"
}
},
"timezone": {
"type": "string"
},
"turn_password": {
"type": "string"
},
"turn_username": {
"type": "string"
},
"turnuri": {
"type": "string"
},
"type": {
"type": "string"
}
}
},
"models.Coordinate": {
"type": "object",
"properties": {
"x": {
"type": "number"
},
"y": {
"type": "number"
}
}
},
"models.IPCamera": {
"type": "object",
"properties": {
"fps": {
"type": "string"
},
"onvif": {
"type": "boolean"
},
"onvif_password": {
"type": "string"
},
"onvif_username": {
"type": "string"
},
"onvif_xaddr": {
"type": "string"
},
"rtsp": {
"type": "string"
},
"sub_rtsp": {
"type": "string"
}
}
},
"models.KStorage": {
"type": "object",
"properties": {
"access_key": {
"type": "string"
},
"cloud_key": {
"type": "string"
},
"directory": {
"type": "string"
},
"provider": {
"type": "string"
},
"secret_access_key": {
"type": "string"
},
"uri": {
"type": "string"
}
}
},
"models.Polygon": {
"type": "object",
"properties": {
"coordinates": {
"type": "array",
"items": {
"$ref": "#/definitions/models.Coordinate"
}
},
"id": {
"type": "string"
}
}
},
"models.RaspiCamera": {
"type": "object",
"properties": {
"device": {
"type": "string"
}
}
},
"models.Rectangle": {
"type": "object",
"properties": {
"x1": {
"type": "integer"
},
"x2": {
"type": "integer"
},
"y1": {
"type": "integer"
},
"y2": {
"type": "integer"
}
}
},
"models.Region": {
"type": "object",
"properties": {
"name": {
"type": "string"
},
"polygon": {
"type": "array",
"items": {
"$ref": "#/definitions/models.Polygon"
}
},
"rectangle": {
"$ref": "#/definitions/models.Rectangle"
}
}
},
"models.S3": {
"type": "object",
"properties": {
"bucket": {
"type": "string"
},
"proxy": {
"type": "string"
},
"proxyuri": {
"type": "string"
},
"publickey": {
"type": "string"
},
"region": {
"type": "string"
},
"secretkey": {
"type": "string"
},
"username": {
"type": "string"
}
}
},
"models.Timetable": {
"type": "object",
"properties": {
"end1": {
"type": "integer"
},
"end2": {
"type": "integer"
},
"start1": {
"type": "integer"
},
"start2": {
"type": "integer"
}
}
},
"models.USBCamera": {
"type": "object",
"properties": {
"device": {
"type": "string"
}
}
}
},
"securityDefinitions": {
"Bearer": {
"type": "apiKey",
+376 -1
View File
@@ -16,7 +16,382 @@
"version": "1.0"
},
"basePath": "/",
"paths": {},
"paths": {
"/api/hub/verify": {
"post": {
"security": [
{
"Bearer": []
}
],
"description": "Will verify the hub connectivity.",
"tags": [
"config"
],
"summary": "Will verify the hub connectivity.",
"operationId": "verify-hub",
"parameters": [
{
"description": "Config",
"name": "config",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/models.Config"
}
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/models.APIResponse"
}
}
}
}
},
"/api/persistence/verify": {
"post": {
"security": [
{
"Bearer": []
}
],
"description": "Will verify the persistence.",
"tags": [
"config"
],
"summary": "Will verify the persistence.",
"operationId": "verify-persistence",
"parameters": [
{
"description": "Config",
"name": "config",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/models.Config"
}
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/models.APIResponse"
}
}
}
}
}
},
"definitions": {
"models.APIResponse": {
"type": "object",
"properties": {
"data": {}
}
},
"models.Capture": {
"type": "object",
"properties": {
"continuous": {
"type": "string"
},
"forwardwebrtc": {
"type": "string"
},
"fragmented": {
"type": "string"
},
"fragmentedduration": {
"type": "integer"
},
"ipcamera": {
"$ref": "#/definitions/models.IPCamera"
},
"maxlengthrecording": {
"type": "integer"
},
"name": {
"type": "string"
},
"pixelChangeThreshold": {
"type": "integer"
},
"postrecording": {
"type": "integer"
},
"prerecording": {
"type": "integer"
},
"raspicamera": {
"$ref": "#/definitions/models.RaspiCamera"
},
"transcodingresolution": {
"type": "integer"
},
"transcodingwebrtc": {
"type": "string"
},
"usbcamera": {
"$ref": "#/definitions/models.USBCamera"
}
}
},
"models.Config": {
"type": "object",
"properties": {
"capture": {
"$ref": "#/definitions/models.Capture"
},
"cloud": {
"type": "string"
},
"condition_uri": {
"type": "string"
},
"heartbeaturi": {
"description": "obsolete",
"type": "string"
},
"hub_key": {
"type": "string"
},
"hub_private_key": {
"type": "string"
},
"hub_site": {
"type": "string"
},
"hub_uri": {
"type": "string"
},
"key": {
"type": "string"
},
"kstorage": {
"$ref": "#/definitions/models.KStorage"
},
"mqtt_password": {
"type": "string"
},
"mqtt_username": {
"type": "string"
},
"mqtturi": {
"type": "string"
},
"name": {
"type": "string"
},
"offline": {
"type": "string"
},
"region": {
"$ref": "#/definitions/models.Region"
},
"s3": {
"$ref": "#/definitions/models.S3"
},
"stunuri": {
"type": "string"
},
"time": {
"type": "string"
},
"timetable": {
"type": "array",
"items": {
"$ref": "#/definitions/models.Timetable"
}
},
"timezone": {
"type": "string"
},
"turn_password": {
"type": "string"
},
"turn_username": {
"type": "string"
},
"turnuri": {
"type": "string"
},
"type": {
"type": "string"
}
}
},
"models.Coordinate": {
"type": "object",
"properties": {
"x": {
"type": "number"
},
"y": {
"type": "number"
}
}
},
"models.IPCamera": {
"type": "object",
"properties": {
"fps": {
"type": "string"
},
"onvif": {
"type": "boolean"
},
"onvif_password": {
"type": "string"
},
"onvif_username": {
"type": "string"
},
"onvif_xaddr": {
"type": "string"
},
"rtsp": {
"type": "string"
},
"sub_rtsp": {
"type": "string"
}
}
},
"models.KStorage": {
"type": "object",
"properties": {
"access_key": {
"type": "string"
},
"cloud_key": {
"type": "string"
},
"directory": {
"type": "string"
},
"provider": {
"type": "string"
},
"secret_access_key": {
"type": "string"
},
"uri": {
"type": "string"
}
}
},
"models.Polygon": {
"type": "object",
"properties": {
"coordinates": {
"type": "array",
"items": {
"$ref": "#/definitions/models.Coordinate"
}
},
"id": {
"type": "string"
}
}
},
"models.RaspiCamera": {
"type": "object",
"properties": {
"device": {
"type": "string"
}
}
},
"models.Rectangle": {
"type": "object",
"properties": {
"x1": {
"type": "integer"
},
"x2": {
"type": "integer"
},
"y1": {
"type": "integer"
},
"y2": {
"type": "integer"
}
}
},
"models.Region": {
"type": "object",
"properties": {
"name": {
"type": "string"
},
"polygon": {
"type": "array",
"items": {
"$ref": "#/definitions/models.Polygon"
}
},
"rectangle": {
"$ref": "#/definitions/models.Rectangle"
}
}
},
"models.S3": {
"type": "object",
"properties": {
"bucket": {
"type": "string"
},
"proxy": {
"type": "string"
},
"proxyuri": {
"type": "string"
},
"publickey": {
"type": "string"
},
"region": {
"type": "string"
},
"secretkey": {
"type": "string"
},
"username": {
"type": "string"
}
}
},
"models.Timetable": {
"type": "object",
"properties": {
"end1": {
"type": "integer"
},
"end2": {
"type": "integer"
},
"start1": {
"type": "integer"
},
"start2": {
"type": "integer"
}
}
},
"models.USBCamera": {
"type": "object",
"properties": {
"device": {
"type": "string"
}
}
}
},
"securityDefinitions": {
"Bearer": {
"type": "apiKey",
+243 -1
View File
@@ -1,4 +1,204 @@
basePath: /
definitions:
models.APIResponse:
properties:
data: {}
type: object
models.Capture:
properties:
continuous:
type: string
forwardwebrtc:
type: string
fragmented:
type: string
fragmentedduration:
type: integer
ipcamera:
$ref: '#/definitions/models.IPCamera'
maxlengthrecording:
type: integer
name:
type: string
pixelChangeThreshold:
type: integer
postrecording:
type: integer
prerecording:
type: integer
raspicamera:
$ref: '#/definitions/models.RaspiCamera'
transcodingresolution:
type: integer
transcodingwebrtc:
type: string
usbcamera:
$ref: '#/definitions/models.USBCamera'
type: object
models.Config:
properties:
capture:
$ref: '#/definitions/models.Capture'
cloud:
type: string
condition_uri:
type: string
heartbeaturi:
description: obsolete
type: string
hub_key:
type: string
hub_private_key:
type: string
hub_site:
type: string
hub_uri:
type: string
key:
type: string
kstorage:
$ref: '#/definitions/models.KStorage'
mqtt_password:
type: string
mqtt_username:
type: string
mqtturi:
type: string
name:
type: string
offline:
type: string
region:
$ref: '#/definitions/models.Region'
s3:
$ref: '#/definitions/models.S3'
stunuri:
type: string
time:
type: string
timetable:
items:
$ref: '#/definitions/models.Timetable'
type: array
timezone:
type: string
turn_password:
type: string
turn_username:
type: string
turnuri:
type: string
type:
type: string
type: object
models.Coordinate:
properties:
x:
type: number
"y":
type: number
type: object
models.IPCamera:
properties:
fps:
type: string
onvif:
type: boolean
onvif_password:
type: string
onvif_username:
type: string
onvif_xaddr:
type: string
rtsp:
type: string
sub_rtsp:
type: string
type: object
models.KStorage:
properties:
access_key:
type: string
cloud_key:
type: string
directory:
type: string
provider:
type: string
secret_access_key:
type: string
uri:
type: string
type: object
models.Polygon:
properties:
coordinates:
items:
$ref: '#/definitions/models.Coordinate'
type: array
id:
type: string
type: object
models.RaspiCamera:
properties:
device:
type: string
type: object
models.Rectangle:
properties:
x1:
type: integer
x2:
type: integer
y1:
type: integer
y2:
type: integer
type: object
models.Region:
properties:
name:
type: string
polygon:
items:
$ref: '#/definitions/models.Polygon'
type: array
rectangle:
$ref: '#/definitions/models.Rectangle'
type: object
models.S3:
properties:
bucket:
type: string
proxy:
type: string
proxyuri:
type: string
publickey:
type: string
region:
type: string
secretkey:
type: string
username:
type: string
type: object
models.Timetable:
properties:
end1:
type: integer
end2:
type: integer
start1:
type: integer
start2:
type: integer
type: object
models.USBCamera:
properties:
device:
type: string
type: object
info:
contact:
email: support@kerberos.io
@@ -11,7 +211,49 @@ info:
termsOfService: https://kerberos.io
title: Swagger Kerberos Agent API
version: "1.0"
paths: {}
paths:
/api/hub/verify:
post:
description: Will verify the hub connectivity.
operationId: verify-hub
parameters:
- description: Config
in: body
name: config
required: true
schema:
$ref: '#/definitions/models.Config'
responses:
"200":
description: OK
schema:
$ref: '#/definitions/models.APIResponse'
security:
- Bearer: []
summary: Will verify the hub connectivity.
tags:
- config
/api/persistence/verify:
post:
description: Will verify the persistence.
operationId: verify-persistence
parameters:
- description: Config
in: body
name: config
required: true
schema:
$ref: '#/definitions/models.Config'
responses:
"200":
description: OK
schema:
$ref: '#/definitions/models.APIResponse'
security:
- Bearer: []
summary: Will verify the persistence.
tags:
- config
securityDefinitions:
Bearer:
in: header
+40 -41
View File
@@ -2,29 +2,31 @@ module github.com/kerberos-io/agent/machinery
go 1.18
//replace github.com/kerberos-io/joy4 v1.0.33 => ../../../../github.com/kerberos-io/joy4
require (
github.com/InVisionApp/conjungo v1.1.0
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
github.com/appleboy/gin-jwt/v2 v2.8.0
github.com/cedricve/go-onvif v0.0.0-20200222191200-567e8ce298f6
github.com/deepch/vdk v0.0.17
github.com/deepch/vdk v0.0.19
github.com/eclipse/paho.mqtt.golang v1.4.1
github.com/gin-contrib/cors v1.3.1
github.com/gin-contrib/pprof v1.3.0
github.com/gin-contrib/cors v1.4.0
github.com/gin-contrib/pprof v1.4.0
github.com/gin-gonic/contrib v0.0.0-20201101042839-6a891bf89f19
github.com/gin-gonic/gin v1.8.1
github.com/golang-jwt/jwt/v4 v4.2.0
github.com/golang-jwt/jwt/v4 v4.4.2
github.com/kellydunn/golang-geo v0.7.0
github.com/kerberos-io/joy4 v1.0.33
github.com/kerberos-io/onvif v0.0.3
github.com/minio/minio-go/v6 v6.0.57
github.com/nsmith5/mjpeg v0.0.0-20200913181537-54b8ada0e53e
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
github.com/pion/webrtc/v3 v3.1.41
github.com/pion/webrtc/v3 v3.1.43
github.com/shirou/gopsutil v3.21.11+incompatible
github.com/sirupsen/logrus v1.8.1
github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe
github.com/swaggo/gin-swagger v1.5.0
github.com/swaggo/swag v1.8.3
github.com/sirupsen/logrus v1.9.0
github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a
github.com/swaggo/gin-swagger v1.5.2
github.com/swaggo/swag v1.8.4
github.com/tevino/abool v1.2.0
gocv.io/x/gocv v0.31.0
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
@@ -33,69 +35,66 @@ require (
require (
github.com/KyleBanks/depth v1.2.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.1.0 // indirect
github.com/clbanning/mxj v1.8.4 // indirect
github.com/elgs/gostrgen v0.0.0-20161222160715-9d61ae07eeae // indirect
github.com/elgs/gostrgen v0.0.0-20220325073726-0c3e00d082f6 // indirect
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // 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-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/spec v0.20.6 // indirect
github.com/go-openapi/swag v0.22.0 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/go-playground/validator/v10 v10.10.0 // indirect
github.com/goccy/go-json v0.9.7 // indirect
github.com/go-playground/validator/v10 v10.11.0 // indirect
github.com/goccy/go-json v0.9.10 // indirect
github.com/gofrs/uuid v4.2.0+incompatible // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/cpuid v1.2.3 // indirect
github.com/klauspost/cpuid/v2 v2.1.0 // indirect
github.com/kylelemons/go-gypsy v1.0.0 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/lib/pq v1.10.6 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/minio/md5-simd v1.1.0 // indirect
github.com/minio/sha256-simd v0.1.1 // indirect
github.com/minio/md5-simd v1.1.2 // indirect
github.com/minio/sha256-simd v1.0.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
github.com/pelletier/go-toml/v2 v2.0.2 // indirect
github.com/pion/datachannel v1.5.2 // indirect
github.com/pion/dtls/v2 v2.1.5 // indirect
github.com/pion/ice/v2 v2.2.6 // indirect
github.com/pion/interceptor v0.1.11 // indirect
github.com/pion/ice/v2 v2.2.7 // indirect
github.com/pion/interceptor v0.1.12 // indirect
github.com/pion/logging v0.2.2 // indirect
github.com/pion/mdns v0.0.5 // indirect
github.com/pion/randutil v0.1.0 // indirect
github.com/pion/rtcp v1.2.9 // indirect
github.com/pion/rtcp v1.2.10 // indirect
github.com/pion/rtp v1.7.13 // indirect
github.com/pion/sctp v1.8.2 // indirect
github.com/pion/sdp/v3 v3.0.5 // indirect
github.com/pion/srtp/v2 v2.0.9 // indirect
github.com/pion/sdp/v3 v3.0.6 // indirect
github.com/pion/srtp/v2 v2.0.10 // indirect
github.com/pion/stun v0.3.5 // indirect
github.com/pion/transport v0.13.0 // indirect
github.com/pion/transport v0.13.1 // indirect
github.com/pion/turn/v2 v2.0.8 // indirect
github.com/pion/udp v0.1.1 // indirect
github.com/tklauser/go-sysconf v0.3.10 // indirect
github.com/tklauser/numcpus v0.4.0 // indirect
github.com/tklauser/numcpus v0.5.0 // indirect
github.com/ugorji/go/codec v1.2.7 // indirect
github.com/yuin/goldmark v1.4.1 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
github.com/ziutek/mymysql v1.5.4 // indirect
golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 // indirect
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
golang.org/x/net v0.0.0-20220812174116-3211cb980234 // indirect
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.11 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/ini.v1 v1.42.0 // indirect
golang.org/x/tools v0.1.12 // indirect
google.golang.org/protobuf v1.28.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
)
+93 -113
View File
@@ -4,13 +4,9 @@ github.com/InVisionApp/conjungo v1.1.0 h1:NMPwvjK0i7UujnGnpbvAscruuroeYYVR55OAgB
github.com/InVisionApp/conjungo v1.1.0/go.mod h1:86uJs2j/N0qcjh0ORLQDw1bB5kPFS/CoprqySSyp8dc=
github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
github.com/agiledragon/gomonkey/v2 v2.3.1/go.mod h1:ap1AmDzcVOAz1YpeJ3TCzIgstoaWLA6jbbgxfB4w2iY=
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/appleboy/gin-jwt/v2 v2.8.0 h1:Glo7cb9eBR+hj8Y7WzgfkOlqCaNLjP+RV4dNO3fpdps=
github.com/appleboy/gin-jwt/v2 v2.8.0/go.mod h1:KsK7E8HTvRg3vOiumTsr/ntNTHbZ3IbHLe4Eto31p7k=
github.com/appleboy/gofight/v2 v2.1.2 h1:VOy3jow4vIK8BRQJoC/I9muxyYlJ2yb9ht2hZoS3rf4=
@@ -19,7 +15,6 @@ github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs=
github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
github.com/cedricve/go-onvif v0.0.0-20200222191200-567e8ce298f6 h1:bzFZYgZD5vf4PWaa2GjOh90HG88uKi2a+B6VnQcDlCA=
github.com/cedricve/go-onvif v0.0.0-20200222191200-567e8ce298f6/go.mod h1:nBrjN2nMHendp0Cvb/6GaJ1v92Qv/kzqxWtNBnKJEK0=
github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
github.com/clbanning/mxj v1.8.4 h1:HuhwZtbyvyOw+3Z1AowPkU87JkJUSv751ELWaiTpj8I=
github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng=
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
@@ -27,32 +22,31 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/deepch/vdk v0.0.17 h1:FbNgJ3DVHRuMoVCUFcKAwAQ+EBfgP8nygVbg+fiqUAY=
github.com/deepch/vdk v0.0.17/go.mod h1:KqQ/KU3hOc4a62l/jPRH5Hiz5fhTq5cGCl8IqeCxWQI=
github.com/deepch/vdk v0.0.19 h1:r6xYyBTtXEIEh+csO0XHT00sI7xLF+hQFkJE9/go5II=
github.com/deepch/vdk v0.0.19/go.mod h1:7ydHfSkflMZxBXfWR79dMjrT54xzvLxnPaByOa9Jpzg=
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/eclipse/paho.mqtt.golang v1.4.1 h1:tUSpviiL5G3P9SZZJPC4ZULZJsxQKXxfENpMvdbAXAI=
github.com/eclipse/paho.mqtt.golang v1.4.1/go.mod h1:JGt0RsEwEX+Xa/agj90YJ9d9DH2b7upDZMK9HRbFvCA=
github.com/elgs/gostrgen v0.0.0-20161222160715-9d61ae07eeae h1:3KvK2DmA7TxQ6PZ2f0rWbdqjgJhRcqgbY70bBeE4clI=
github.com/elgs/gostrgen v0.0.0-20161222160715-9d61ae07eeae/go.mod h1:wruC5r2gHdr/JIUs5Rr1V45YtsAzKXZxAnn/5rPC97g=
github.com/elgs/gostrgen v0.0.0-20220325073726-0c3e00d082f6 h1:x9TA+vnGEyqmWY+eA9HfgxNRkOQqwiEpFE9IPXSGuEA=
github.com/elgs/gostrgen v0.0.0-20220325073726-0c3e00d082f6/go.mod h1:wruC5r2gHdr/JIUs5Rr1V45YtsAzKXZxAnn/5rPC97g=
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y=
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/gin-contrib/cors v1.3.1 h1:doAsuITavI4IOcd0Y19U4B+O0dNWihRyX//nn4sEmgA=
github.com/gin-contrib/cors v1.3.1/go.mod h1:jjEJ4268OPZUcU7k9Pm653S7lXUGcqMADzFA61xsmDk=
github.com/gin-contrib/gzip v0.0.5 h1:mhnVU32YnnBh2LPH2iqRqsA/eR7SAqRaD388jL2s/j0=
github.com/gin-contrib/gzip v0.0.5/go.mod h1:OPIK6HR0Um2vNmBUTlayD7qle4yVVRZT0PyhdUigrKk=
github.com/gin-contrib/pprof v1.3.0 h1:G9eK6HnbkSqDZBYbzG4wrjCsA4e+cvYAHUZw6W+W9K0=
github.com/gin-contrib/pprof v1.3.0/go.mod h1:waMjT1H9b179t3CxuG1cV3DHpga6ybizwfBaM5OXaB0=
github.com/gin-contrib/cors v1.4.0 h1:oJ6gwtUl3lqV0WEIwM/LxPF1QZ5qe2lGWdY2+bz7y0g=
github.com/gin-contrib/cors v1.4.0/go.mod h1:bs9pNM0x/UsmHPBWT2xZz9ROh8xYjYkiURUfmBoMlcs=
github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4=
github.com/gin-contrib/gzip v0.0.6/go.mod h1:QOJlmV2xmayAjkNS2Y8NQsMneuRShOU/kjovCXNuzzk=
github.com/gin-contrib/pprof v1.4.0 h1:XxiBSf5jWZ5i16lNOPbMTVdgHBdhfGRD5PZ1LWazzvg=
github.com/gin-contrib/pprof v1.4.0/go.mod h1:RrehPJasUVBPK6yTUwOl8/NP6i0vbUgmxtis+Z5KE90=
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
github.com/gin-gonic/contrib v0.0.0-20201101042839-6a891bf89f19 h1:J2LPEOcQmWaooBnBtUDV9KHFEnP5LYTZY03GiQ0oQBw=
github.com/gin-gonic/contrib v0.0.0-20201101042839-6a891bf89f19/go.mod h1:iqneQ2Df3omzIVTkIfn7c1acsVnMGiSLn4XF5Blh3Yg=
github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
github.com/gin-gonic/gin v1.6.2/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
github.com/gin-gonic/gin v1.7.4/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8=
github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
@@ -61,38 +55,40 @@ github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiU
github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
github.com/go-openapi/jsonreference v0.19.6 h1:UBIxjkht+AWIgYzCDSv2GN+E/togfwXUJFRTWhl2Jjs=
github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns=
github.com/go-openapi/spec v0.20.4 h1:O8hJrt0UMnhHcluhIdUgCLRWyM2x7QkBXRvOs7m+O1M=
github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA=
github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I=
github.com/go-openapi/spec v0.20.6 h1:ich1RQ3WDbfoeTqTAb+5EIxNmpKVJZWBNah9RAT0jIQ=
github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM=
github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
github.com/go-openapi/swag v0.22.0 h1:1VXunYCNgapcSzFtcY+eBmrwESlYCnFJZahQRgTRoo8=
github.com/go-openapi/swag v0.22.0/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU=
github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho=
github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
github.com/go-playground/validator/v10 v10.10.0 h1:I7mrTYv78z8k8VXa/qJlOlEXn/nBh+BF8dHX5nt/dr0=
github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
github.com/go-playground/validator/v10 v10.11.0 h1:0W+xRM511GY47Yy3bZUbJVitCNg2BOGlCyvTqsp/xIw=
github.com/go-playground/validator/v10 v10.11.0/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
github.com/goccy/go-json v0.9.7 h1:IcB+Aqpx/iMHu5Yooh7jEzJk1JZ7Pjtmys2ukPr7EeM=
github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
github.com/goccy/go-json v0.9.10 h1:hCeNmprSNLB8B8vQKWl6DpuH0t60oEs+TAk9a7CScKc=
github.com/goccy/go-json v0.9.10/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0=
github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8eU=
github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang-jwt/jwt/v4 v4.4.2 h1:rcc4lwaZgFMCZ5jxF9ABolDcIHdBytAFgqFPbSJQAYs=
github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
@@ -108,22 +104,19 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/hybridgroup/mjpeg v0.0.0-20140228234708-4680f319790e/go.mod h1:eagM805MRKrioHYuU7iKLUyFPVKqVV6um5DAvCkUtXs=
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/kellydunn/golang-geo v0.7.0 h1:A5j0/BvNgGwY6Yb6inXQxzYwlPHc6WVZR+MrarZYNNg=
github.com/kellydunn/golang-geo v0.7.0/go.mod h1:YYlQPJ+DPEzrHx8kT3oPHC/NjyvCCXE+IuKGKdrjrcU=
@@ -131,8 +124,11 @@ github.com/kerberos-io/joy4 v1.0.33 h1:JSIZMm7sWU9Ir7DykaSnySz4tzQMTtVgiUrp3uKWy
github.com/kerberos-io/joy4 v1.0.33/go.mod h1:nZp4AjvKvTOXRrmDyAIOw+Da+JA5OcSo/JundGfOlFU=
github.com/kerberos-io/onvif v0.0.3 h1:Jcc6kKO2hyhaBddQyXyKAhqkrzeX53UH6WKoASXSBoc=
github.com/kerberos-io/onvif v0.0.3/go.mod h1:Hr2dJOH2LM5SpYKk17gYZ1CMjhGhUl+QlT5kwYogrW0=
github.com/klauspost/cpuid v1.2.3 h1:CCtW0xUnWGVINKvE/WWOYKdsPV6mawAtvQuSl8guwQs=
github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
github.com/klauspost/cpuid/v2 v2.1.0 h1:eyi1Ad2aNJMW95zcSbmGg7Cg6cq3ADwLpMAP96d8rF0=
github.com/klauspost/cpuid/v2 v2.1.0/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -144,46 +140,46 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kylelemons/go-gypsy v1.0.0 h1:7/wQ7A3UL1bnqRMnZ6T8cwCOArfZCxFmb1iTxaOOo1s=
github.com/kylelemons/go-gypsy v1.0.0/go.mod h1:chkXM0zjdpXOiqkCW1XcCHDfjfk14PH2KKkQWxfJUcU=
github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs=
github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/lucas-clemente/quic-go v0.7.1-0.20190401152353-907071221cf9/go.mod h1:PpMmPfPKO9nKJ/psF49ESTAGQSdfXxlg1otPbEB2nOw=
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk=
github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
github.com/minio/md5-simd v1.1.0 h1:QPfiOqlZH+Cj9teu0t9b1nTBfPbyTl16Of5MeuShdK4=
github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw=
github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
github.com/minio/minio-go/v6 v6.0.57 h1:ixPkbKkyD7IhnluRgQpGSpHdpvNVaW6OD5R9IAO/9Tw=
github.com/minio/minio-go/v6 v6.0.57/go.mod h1:5+R/nM9Pwrh0vqF+HbYYDQ84wdUFPyXHkrdT4AIkifM=
github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU=
github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nsmith5/mjpeg v0.0.0-20200913181537-54b8ada0e53e h1:bQo/jQ9qvcw7zqnovm8IbLsaOq3F+ELUQcxtxvalQvA=
github.com/nsmith5/mjpeg v0.0.0-20200913181537-54b8ada0e53e/go.mod h1:PW9xCZScEClMBP22n37i0SnN/8B9YzNXTNvOaIkLjv0=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE=
@@ -196,67 +192,53 @@ github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6
github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
github.com/otiai10/mint v1.3.3/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU=
github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
github.com/pion/datachannel v1.4.21/go.mod h1:oiNyP4gHx2DIwRzX/MFyH0Rz/Gz05OgBlayAI2hAWjg=
github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw=
github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI=
github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E=
github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ=
github.com/pion/dtls/v2 v2.0.1/go.mod h1:uMQkz2W0cSqY00xav7WByQ4Hb+18xeQh2oH2fRezr5U=
github.com/pion/dtls/v2 v2.0.2/go.mod h1:27PEO3MDdaCfo21heT59/vsdmZc0zMt9wQPcSlLu/1I=
github.com/pion/dtls/v2 v2.1.3/go.mod h1:o6+WvyLDAlXF7YiPB/RlskRoeK+/JtuaZa5emwQcWus=
github.com/pion/dtls/v2 v2.1.5 h1:jlh2vtIyUBShchoTDqpCCqiYCyRFJ/lvf/gQ8TALs+c=
github.com/pion/dtls/v2 v2.1.5/go.mod h1:BqCE7xPZbPSubGasRoDFJeTsyJtdD1FanJYL0JGheqY=
github.com/pion/ice v0.7.18/go.mod h1:+Bvnm3nYC6Nnp7VV6glUkuOfToB/AtMRZpOU8ihuf4c=
github.com/pion/ice/v2 v2.2.6 h1:R/vaLlI1J2gCx141L5PEwtuGAGcyS6e7E0hDeJFq5Ig=
github.com/pion/ice/v2 v2.2.6/go.mod h1:SWuHiOGP17lGromHTFadUe1EuPgFh/oCU6FCMZHooVE=
github.com/pion/interceptor v0.1.11 h1:00U6OlqxA3FFB50HSg25J/8cWi7P6FbSzw4eFn24Bvs=
github.com/pion/ice/v2 v2.2.7 h1:kG9tux3WdYUSqqqnf+O5zKlpy41PdlvLUBlYJeV2emQ=
github.com/pion/ice/v2 v2.2.7/go.mod h1:Ckj7cWZ717rtU01YoDQA9ntGWCk95D42uVZ8sI0EL+8=
github.com/pion/interceptor v0.1.11/go.mod h1:tbtKjZY14awXd7Bq0mmWvgtHB5MDaRN7HV3OZ/uy7s8=
github.com/pion/interceptor v0.1.12 h1:CslaNriCFUItiXS5o+hh5lpL0t0ytQkFnUcbbCs2Zq8=
github.com/pion/interceptor v0.1.12/go.mod h1:bDtgAD9dRkBZpWHGKaoKb42FhDHTG2rX8Ii9LRALLVA=
github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
github.com/pion/mdns v0.0.4/go.mod h1:R1sL0p50l42S5lJs91oNdUL58nm0QHrhxnSegr++qC0=
github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw=
github.com/pion/mdns v0.0.5/go.mod h1:UgssrvdD3mxpi8tMxAXbsppL3vJ4Jipw1mTCW+al01g=
github.com/pion/quic v0.1.1/go.mod h1:zEU51v7ru8Mp4AUBJvj6psrSth5eEFNnVQK5K48oV3k=
github.com/pion/randutil v0.0.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
github.com/pion/rtcp v1.2.3/go.mod h1:zGhIv0RPRF0Z1Wiij22pUt5W/c9fevqSzT4jje/oK7I=
github.com/pion/rtcp v1.2.9 h1:1ujStwg++IOLIEoOiIQ2s+qBuJ1VN81KW+9pMPsif+U=
github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo=
github.com/pion/rtp v1.6.0/go.mod h1:QgfogHsMBVE/RFNno467U/KBqfUywEH+HK+0rtnwsdI=
github.com/pion/rtcp v1.2.10 h1:nkr3uj+8Sp97zyItdN60tE/S6vk4al5CPRR6Gejsdjc=
github.com/pion/rtcp v1.2.10/go.mod h1:ztfEwXZNLGyF1oQDttz/ZKIBaeeg/oWbRYqzBM9TL1I=
github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA=
github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
github.com/pion/sctp v1.7.10/go.mod h1:EhpTUQu1/lcK3xI+eriS6/96fWetHGCvBi9MSsnaBN0=
github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
github.com/pion/sctp v1.8.2 h1:yBBCIrUMJ4yFICL3RIvR4eh/H2BTTvlligmSTy+3kiA=
github.com/pion/sctp v1.8.2/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
github.com/pion/sdp/v2 v2.4.0/go.mod h1:L2LxrOpSTJbAns244vfPChbciR/ReU1KWfG04OpkR7E=
github.com/pion/sdp/v3 v3.0.5 h1:ouvI7IgGl+V4CrqskVtr3AaTrPvPisEOxwgpdktctkU=
github.com/pion/sdp/v3 v3.0.5/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw=
github.com/pion/srtp v1.5.1/go.mod h1:B+QgX5xPeQTNc1CJStJPHzOlHK66ViMDWTT0HZTCkcA=
github.com/pion/srtp/v2 v2.0.9 h1:JJq3jClmDFBPX/F5roEb0U19jSU7eUhyDqR/NZ34EKQ=
github.com/pion/srtp/v2 v2.0.9/go.mod h1:5TtM9yw6lsH0ppNCehB/EjEUli7VkUgKSPJqWVqbhQ4=
github.com/pion/sdp/v3 v3.0.6 h1:WuDLhtuFUUVpTfus9ILC4HRyHsW6TdugjEX/QY9OiUw=
github.com/pion/sdp/v3 v3.0.6/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw=
github.com/pion/srtp/v2 v2.0.10 h1:b8ZvEuI+mrL8hbr/f1YiJFB34UMrOac3R3N1yq2UN0w=
github.com/pion/srtp/v2 v2.0.10/go.mod h1:XEeSWaK9PfuMs7zxXyiN252AHPbH12NX5q/CFDWtUuA=
github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg=
github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA=
github.com/pion/transport v0.6.0/go.mod h1:iWZ07doqOosSLMhZ+FXUTq+TamDoXSllxpbGcfkCmbE=
github.com/pion/transport v0.8.10/go.mod h1:tBmha/UCjpum5hqTWhfAEs3CO4/tHSg0MYRhSzR+CZ8=
github.com/pion/transport v0.10.0/go.mod h1:BnHnUipd0rZQyTVB2SBGojFHT9CBt5C5TcsJSQGkvSE=
github.com/pion/transport v0.10.1/go.mod h1:PBis1stIILMiis0PewDw91WJeLJkyIMcEk+DwKOzf4A=
github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q=
github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A=
github.com/pion/transport v0.13.0 h1:KWTA5ZrQogizzYwPEciGtHPLwpAjE91FgXnyu+Hv2uY=
github.com/pion/transport v0.13.0/go.mod h1:yxm9uXpK9bpBBWkITk13cLo1y5/ur5VQpG22ny6EP7g=
github.com/pion/turn/v2 v2.0.4/go.mod h1:1812p4DcGVbYVBTiraUmP50XoKye++AMkbfp+N27mog=
github.com/pion/transport v0.13.1 h1:/UH5yLeQtwm2VZIPjxwnNFxjS4DFhyLfS4GlfuKUzfA=
github.com/pion/transport v0.13.1/go.mod h1:EBxbqzyv+ZrmDb82XswEE0BjfQFtuw1Nu6sjnjWCsGg=
github.com/pion/turn/v2 v2.0.8 h1:KEstL92OUN3k5k8qxsXHpr7WWfrdp7iJZHx99ud8muw=
github.com/pion/turn/v2 v2.0.8/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw=
github.com/pion/udp v0.1.0/go.mod h1:BPELIjbwE9PRbd/zxI/KYBnbo7B6+oA6YuEaNE8lths=
github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o=
github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M=
github.com/pion/webrtc/v2 v2.2.26/go.mod h1:XMZbZRNHyPDe1gzTIHFcQu02283YO45CbiwFgKvXnmc=
github.com/pion/webrtc/v3 v3.1.41 h1:QogLjtriu+OwerRp4r6emTg4+zDWUy5R6EqthDBy7c0=
github.com/pion/webrtc/v3 v3.1.41/go.mod h1:sUcW9SFPEWerDqGOBmdYEMfRvbdd7rgwo4bNzfsXww4=
github.com/pion/webrtc/v3 v3.1.43 h1:YT3ZTO94UT4kSBvZnRAH82+0jJPUruiKr9CEstdlQzk=
github.com/pion/webrtc/v3 v3.1.43/go.mod h1:G/J8k0+grVsjC/rjCZ24AKoCCxcFFODgh7zThNZGs0M=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
@@ -268,29 +250,31 @@ github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKl
github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe h1:K8pHPVoTgxFJt1lXuIzzOX7zZhZFldJQK/CgKx9BFIc=
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe/go.mod h1:lKJPbtWzJ9JhsTN1k1gZgleJWY/cqq0psdoMmaThG3w=
github.com/swaggo/gin-swagger v1.5.0 h1:hlLbxPj6qvbtX2wpbsZuOIlcnPRCUDGccA0zMKVNpME=
github.com/swaggo/gin-swagger v1.5.0/go.mod h1:3mKpZClKx7mnUGsiwJeEkNhnr1VHMkMaTAXIoFYUXrA=
github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a h1:kAe4YSu0O0UFn1DowNo2MY5p6xzqtJ/wQ7LZynSvGaY=
github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a/go.mod h1:lKJPbtWzJ9JhsTN1k1gZgleJWY/cqq0psdoMmaThG3w=
github.com/swaggo/gin-swagger v1.5.2 h1:dj2es17EaOHoy0Owu4xn3An1mI8/xjdFyIH6KAbOdYo=
github.com/swaggo/gin-swagger v1.5.2/go.mod h1:Cbj/MlHApPOjZdf4joWFXLLgmZVPyh54GPvPPyVjVZM=
github.com/swaggo/swag v1.8.1/go.mod h1:ugemnJsPZm/kRwFUnzBlbHRd0JY9zE1M4F+uy2pAaPQ=
github.com/swaggo/swag v1.8.3 h1:3pZSSCQ//gAH88lfmxM3Cd1+JCsxV8Md6f36b9hrZ5s=
github.com/swaggo/swag v1.8.3/go.mod h1:jMLeXOOmYyjk8PvHTsXBdrubsNd9gUJTTCzL5iBnseg=
github.com/swaggo/swag v1.8.4 h1:oGB351qH1JqUqK1tsMYEE5qTBbPk394BhsZxmUfebcI=
github.com/swaggo/swag v1.8.4/go.mod h1:jMLeXOOmYyjk8PvHTsXBdrubsNd9gUJTTCzL5iBnseg=
github.com/tevino/abool v1.2.0 h1:heAkClL8H6w+mK5md9dzsuohKeXHUpY7Vw0ZCKW+huA=
github.com/tevino/abool v1.2.0/go.mod h1:qc66Pna1RiIsPa7O4Egxxs9OqkuxDX55zznh9K07Tzg=
github.com/tidwall/gjson v1.12.1 h1:ikuZsLdhr8Ws0IdROXUS1Gi4v9Z4pGqpX/CvJkxvfpo=
@@ -301,8 +285,9 @@ github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
github.com/tklauser/numcpus v0.5.0 h1:ooe7gN0fg6myJ0EKoTAf5hebTZrH52px3New/D9iJ+A=
github.com/tklauser/numcpus v0.5.0/go.mod h1:OGzpTxpcIMNGYQdit2BYL1pvk/dSOaJWjKoflh+RQjo=
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
@@ -311,43 +296,33 @@ github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95
github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.1 h1:/vn0k+RBvwlxEmP5E7SZMqNxPhfMVFEJiykr15/0XKM=
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
gocv.io/x/gocv v0.31.0 h1:BHDtK8v+YPvoSPQTTiZB2fM/7BLg6511JqkruY2z6LQ=
gocv.io/x/gocv v0.31.0/go.mod h1:oc6FvfYqfBp99p+yOEzs9tbYF9gOrAQSeL/dyIPefJU=
golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8 h1:y+mHpWoQJNAHt26Nhh6JP7hvM71IRZureyvZhoVALIs=
golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c=
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -359,27 +334,27 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx
golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 h1:HVyaeDAYux4pnY+D/SiwmLOR36ewZ4iGQIIrtnuCjFA=
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.0.0-20220630215102-69896b714898/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E=
golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -390,8 +365,15 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 h1:XDXtA5hveEEV8JB2l7nhMTp3t3cHp9ZpwcdjqyEWLlo=
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -405,10 +387,8 @@ golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
golang.org/x/tools v0.1.11 h1:loJ25fNOEhSXfHrpoGj91eCUThwdNX6u24rO1xnNteY=
golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4=
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -422,8 +402,9 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -432,17 +413,15 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
gopkg.in/ini.v1 v1.42.0 h1:7N3gPTt50s8GuLortA00n8AqRTk75qOP98+mTPpgzRk=
gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw=
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -452,5 +431,6 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+27 -1
View File
@@ -3,11 +3,14 @@ package main
import (
"fmt"
"os"
"time"
"github.com/kerberos-io/agent/machinery/src/capture"
"github.com/kerberos-io/agent/machinery/src/components"
"github.com/kerberos-io/agent/machinery/src/log"
"github.com/kerberos-io/agent/machinery/src/models"
"github.com/kerberos-io/agent/machinery/src/routers"
"github.com/kerberos-io/agent/machinery/src/utils"
)
func main() {
@@ -15,9 +18,11 @@ func main() {
const VERSION = "3.0"
action := os.Args[1]
log.Log.Init()
timezone, _ := time.LoadLocation("CET")
log.Log.Init(timezone)
switch action {
case "version":
log.Log.Info("You are currrently running Kerberos Agent " + VERSION)
@@ -29,6 +34,11 @@ func main() {
timeout := os.Args[2]
fmt.Println(timeout)
case "usbcamera-test":
deviceID := os.Args[2]
capture.TestUSBCamera(deviceID)
case "run":
{
name := os.Args[2]
@@ -44,6 +54,22 @@ func main() {
// Open this configuration either from Kerberos Agent or Kerberos Factory.
components.OpenConfig(&configuration)
timezone, _ := time.LoadLocation(configuration.Config.Timezone)
log.Log.Init(timezone)
// Check if we have a device Key or not, if not
// we will generate one.
if configuration.Config.Key == "" {
key := utils.RandStringBytesMaskImpr(30)
configuration.Config.Key = key
err := components.StoreConfig(configuration.Config)
if err == nil {
log.Log.Info("Main: updated unique key for agent to: " + key)
} else {
log.Log.Info("Main: something went wrong while trying to store key: " + key)
}
}
// Bootstrapping the agent
communication := models.Communication{
HandleBootstrap: make(chan string, 1),
+2 -3
View File
@@ -64,9 +64,7 @@ loop:
var pkt av.Packet
if pkt, err = infile.ReadPacket(); err != nil { // sometimes this throws an end of file..
log.Log.Error("HandleStream: " + err.Error())
if err.Error() == "EOF" {
time.Sleep(30 * time.Second)
}
time.Sleep(1 * time.Second)
}
// Could be that a decode is throwing errors.
@@ -89,6 +87,7 @@ loop:
r := communication.PackageCounter.Load().(int64)
log.Log.Info("HandleStream: packet size " + strconv.Itoa(len(pkt.Data)))
communication.PackageCounter.Store((r + 1) % 1000)
communication.LastPacketTimer.Store(time.Now().Unix())
}
}
}
+55
View File
@@ -0,0 +1,55 @@
package capture
import (
"strconv"
"time"
"github.com/kerberos-io/agent/machinery/src/log"
"gocv.io/x/gocv"
)
func TestUSBCamera(deviceID string) {
webcam, err := gocv.OpenVideoCapture(deviceID)
if err != nil {
log.Log.Error("Error opening video capture device: " + deviceID)
return
}
defer webcam.Close()
buf := gocv.NewMat()
defer buf.Close()
ok := webcam.Read(&buf)
if ok {
now := time.Now().Unix()
saveFile := "./data/capture-test/" + strconv.FormatInt(now, 10) + ".mp4"
fps := 20.0 // webcam.Get(gocv.VideoCaptureFPS)
writer, err := gocv.VideoWriterFile(saveFile, "X264", fps, buf.Cols(), buf.Rows(), true)
if err != nil {
log.Log.Error("error opening video writer device: " + saveFile)
return
}
defer writer.Close()
//window := gocv.NewWindow("Hello")
log.Log.Info("Start reading device: " + deviceID)
for i := 0; i < 100; i++ {
if ok := webcam.Read(&buf); !ok {
log.Log.Error("Device closed: " + deviceID)
return
}
if buf.Empty() {
continue
}
writer.Write(buf)
//window.IMShow(buf)
//window.WaitKey(1)
log.Log.Info("Read frame")
}
}
log.Log.Info("Done. Close videocapture and recording file.")
}
+65 -9
View File
@@ -17,6 +17,40 @@ import (
"github.com/kerberos-io/joy4/av"
)
func CleanupRecordingDirectory(configuration *models.Configuration) {
autoClean := configuration.Config.AutoClean
if autoClean == "true" {
maxSize := configuration.Config.MaxDirectorySize
if maxSize == 0 {
maxSize = 50
}
// Total size of the recording directory.
recordingsDirectory := "./data/recordings"
size, err := utils.DirSize(recordingsDirectory)
if err == nil {
sizeInMB := size / 1000 / 1000
if sizeInMB >= maxSize {
// Remove the oldest recording
oldestFile, err := utils.FindOldestFile(recordingsDirectory)
if err == nil {
err := os.Remove(recordingsDirectory + "/" + oldestFile.Name())
log.Log.Info("HandleRecordStream: removed oldest file as part of cleanup - " + recordingsDirectory + "/" + oldestFile.Name())
if err != nil {
log.Log.Info("HandleRecordStream: something went wrong, " + err.Error())
}
} else {
log.Log.Info("HandleRecordStream: something went wrong, " + err.Error())
}
}
} else {
log.Log.Info("HandleRecordStream: something went wrong, " + err.Error())
}
} else {
log.Log.Info("HandleRecordStream: Autoclean disabled, nothing to do here.")
}
}
func HandleRecordStream(recordingCursor *pubsub.QueueCursor, configuration *models.Configuration, communication *models.Communication, streams []av.CodecData) {
log.Log.Debug("HandleRecordStream: started")
@@ -88,6 +122,9 @@ func HandleRecordStream(recordingCursor *pubsub.QueueCursor, configuration *mode
debug.FreeOSMemory()
recordingStatus = "idle"
// Clean up the recording directory if necessary.
CleanupRecordingDirectory(configuration)
}
// If not yet started and a keyframe, let's make a recording
@@ -131,7 +168,13 @@ func HandleRecordStream(recordingCursor *pubsub.QueueCursor, configuration *mode
// - Token
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" + "_" + "24" + "_" + "769"
s := strconv.FormatInt(startRecording, 10) + "_" +
"6" + "-" +
"967003" + "_" +
config.Name + "_" +
"200-200-400-400" + "_0_" +
"769"
name = s + ".mp4"
fullName = "./data/recordings/" + name
@@ -202,11 +245,11 @@ func HandleRecordStream(recordingCursor *pubsub.QueueCursor, configuration *mode
var file *os.File
var err error
for _ = range communication.HandleMotion {
for motion := range communication.HandleMotion {
now = time.Now().Unix()
timestamp = now
startRecording = now // we mark the current time when the record started.
timestamp = time.Now().Unix()
startRecording = time.Now().Unix() // we mark the current time when the record started.
numberOfChanges := motion.NumberOfChanges
// timestamp_microseconds_instanceName_regionCoordinates_numberOfChanges_token
// 1564859471_6-474162_oprit_577-283-727-375_1153_27.mp4
@@ -217,7 +260,14 @@ func HandleRecordStream(recordingCursor *pubsub.QueueCursor, configuration *mode
// - Number of changes
// - Token
s := strconv.FormatInt(startRecording, 10) + "_" + "6" + "-" + "967003" + "_" + config.Name + "_" + "200-200-400-400" + "_" + "24" + "_" + "769"
s := strconv.FormatInt(startRecording, 10) + "_" +
"6" + "-" +
"967003" + "_" +
config.Name + "_" +
"200-200-400-400" + "_" +
strconv.Itoa(numberOfChanges) + "_" +
"769"
name := s + ".mp4"
fullName := "./data/recordings/" + name
@@ -252,16 +302,19 @@ func HandleRecordStream(recordingCursor *pubsub.QueueCursor, configuration *mode
now := time.Now().Unix()
select {
case <-communication.HandleMotion:
case motion := <-communication.HandleMotion:
timestamp = now
log.Log.Info("HandleRecordStream: motion detected while recording. Expanding recording.")
numberOfChanges = motion.NumberOfChanges
log.Log.Info("Received message with recording data, detected changes to save: " + strconv.Itoa(numberOfChanges))
default:
}
if timestamp+recordingPeriod-now <= 0 || now-startRecording >= maxRecordingPeriod {
if timestamp+recordingPeriod-now < 0 || now-startRecording > maxRecordingPeriod {
log.Log.Info("HandleRecordStream: 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 {
if pkt.IsKeyFrame && start == false {
log.Log.Info("HandleRecordStream: write frames")
start = true
}
@@ -288,6 +341,9 @@ func HandleRecordStream(recordingCursor *pubsub.QueueCursor, configuration *mode
// Create a symbol linc.
fc, _ := os.Create("./data/cloud/" + name)
fc.Close()
// Clean up the recording directory if necessary.
CleanupRecordingDirectory(configuration)
}
}
+450 -149
View File
@@ -2,12 +2,17 @@ package cloud
import (
"bytes"
"crypto/tls"
"encoding/base64"
"encoding/json"
"fmt"
"io/ioutil"
"os"
"sync"
"github.com/gin-gonic/gin"
"github.com/kerberos-io/joy4/av/pubsub"
"github.com/minio/minio-go/v6"
mqtt "github.com/eclipse/paho.mqtt.golang"
av "github.com/kerberos-io/joy4/av"
@@ -15,6 +20,7 @@ import (
"gocv.io/x/gocv"
"net/http"
"net/url"
"runtime"
"runtime/debug"
"strconv"
@@ -45,38 +51,42 @@ func HandleUpload(configuration *models.Configuration, communication *models.Com
config := configuration.Config
watchDirectory := "./data/cloud/"
loop:
for {
ff, err := utils.ReadDirectory(watchDirectory)
if config.Offline == "true" {
log.Log.Debug("HandleUpload: stopping as Offline is enabled.")
} else {
// This will check if we need to stop the thread,
// because of a reconfiguration.
select {
case <-communication.HandleUpload:
break loop
default:
}
loop:
for {
ff, err := utils.ReadDirectory(watchDirectory)
if err == nil {
for _, f := range ff {
// This will check if we need to stop the thread,
// because of a reconfiguration.
select {
case <-communication.HandleUpload:
break loop
case <-time.After(2 * time.Second):
}
// This will check if we need to stop the thread,
// because of a reconfiguration.
select {
case <-communication.HandleUpload:
break loop
default:
}
if err == nil {
for _, f := range ff {
fileName := f.Name()
if config.Cloud == "s3" {
UploadS3(configuration, fileName, watchDirectory)
} else if config.Cloud == "kstorage" {
UploadKerberosVault(configuration, fileName, watchDirectory)
// This will check if we need to stop the thread,
// because of a reconfiguration.
select {
case <-communication.HandleUpload:
break loop
default:
}
fileName := f.Name()
if config.Cloud == "s3" {
UploadS3(configuration, fileName, watchDirectory)
} else if config.Cloud == "kstorage" {
UploadKerberosVault(configuration, fileName, watchDirectory)
}
}
}
}
time.Sleep(1 * time.Second)
}
log.Log.Debug("HandleUpload: finished")
@@ -88,52 +98,56 @@ func HandleHeartBeat(configuration *models.Configuration, communication *models.
config := configuration.Config
url := config.HeartbeatURI
key := ""
username := ""
vaultURI := ""
if config.Offline == "true" {
log.Log.Debug("HandleHeartBeat: stopping as Offline is enabled.")
} else {
if config.Cloud == "s3" && config.S3.Publickey != "" {
username = config.S3.Username
key = config.S3.Publickey
} else if config.Cloud == "kstorage" && config.KStorage.CloudKey != "" {
key = config.KStorage.CloudKey
username = config.KStorage.Directory
vaultURI = config.KStorage.URI
}
url := config.HeartbeatURI
key := ""
username := ""
vaultURI := ""
// This is the new way ;)
if config.HubURI != "" {
url = config.HubURI + "/devices/heartbeat"
}
if config.HubKey != "" {
key = config.HubKey
}
loop:
for {
// This will check if we need to stop the thread,
// because of a reconfiguration.
select {
case <-communication.HandleHeartBeat:
break loop
default:
if config.Cloud == "s3" && config.S3 != nil && config.S3.Publickey != "" {
username = config.S3.Username
key = config.S3.Publickey
} else if config.Cloud == "kstorage" && config.KStorage != nil && config.KStorage.CloudKey != "" {
key = config.KStorage.CloudKey
username = config.KStorage.Directory
vaultURI = config.KStorage.URI
}
uptime, _ := host.Uptime()
days := strconv.Itoa(int(uptime / (60 * 60 * 24)))
//12:11:48 up 11 days
//partitions, _ := disk.Partitions(false)
usage, _ := disk.Usage("/")
diskPercentUsed := strconv.Itoa(int(usage.UsedPercent))
onvifEnabled := "false"
if config.Capture.IPCamera.ONVIFXAddr != "" {
onvifEnabled = "true"
// This is the new way ;)
if config.HubURI != "" {
url = config.HubURI + "/devices/heartbeat"
}
if config.HubKey != "" {
key = config.HubKey
}
var object = fmt.Sprintf(`{
loop:
for {
uptime, _ := host.Uptime()
days := strconv.Itoa(int(uptime / (60 * 60 * 24)))
//12:11:48 up 11 days
//partitions, _ := disk.Partitions(false)
usage, _ := disk.Usage("/")
diskPercentUsed := strconv.Itoa(int(usage.UsedPercent))
onvifEnabled := "false"
if config.Capture.IPCamera.ONVIFXAddr != "" {
onvifEnabled = "true"
}
// Check if the agent is running inside a cluster (Kerberos Factory) or as
// an open source agent
isEnterprise := false
if os.Getenv("DEPLOYMENT") == "factory" || os.Getenv("MACHINERY_ENVIRONMENT") == "kubernetes" {
isEnterprise = true
}
var object = fmt.Sprintf(`{
"key" : "%s",
"hash" : "826133658",
"version" : "3.0.0",
@@ -145,7 +159,7 @@ loop:
"docker" : true,
"kios" : false,
"raspberrypi" : false,
"enterprise" : true,
"enterprise" : %t,
"board" : "",
"disk1size" : "%s",
"disk3size" : "%s",
@@ -158,44 +172,52 @@ loop:
"timestamp" : 1564747908,
"siteID" : "%s",
"onvif" : "%s"
}`, config.Key, username, key, config.Name, "0", "0", diskPercentUsed, days, config.HubSite, onvifEnabled)
}`, config.Key, username, key, config.Name, isEnterprise, "0", "0", diskPercentUsed, days, config.HubSite, onvifEnabled)
var jsonStr = []byte(object)
buffy := bytes.NewBuffer(jsonStr)
req, _ := http.NewRequest("POST", url, buffy)
req.Header.Set("Content-Type", "application/json")
client := &http.Client{}
resp, err := client.Do(req)
if resp != nil {
resp.Body.Close()
}
if err == nil && resp.StatusCode == 200 {
log.Log.Info("HandleHeartBeat: (200) Heartbeat received by Kerberos Hub.")
} else {
log.Log.Error("HandleHeartBeat: (400) Something went wrong while sending to Kerberos Hub.")
}
// If we have a vault connect, we will also send some analytics
// to that service.
if vaultURI != "" {
buffy = bytes.NewBuffer(jsonStr)
req, _ = http.NewRequest("POST", vaultURI+"/devices/heartbeat", buffy)
var jsonStr = []byte(object)
buffy := bytes.NewBuffer(jsonStr)
req, _ := http.NewRequest("POST", url, buffy)
req.Header.Set("Content-Type", "application/json")
client = &http.Client{}
resp, err = client.Do(req)
client := &http.Client{}
resp, err := client.Do(req)
if resp != nil {
resp.Body.Close()
}
if err == nil && resp.StatusCode == 200 {
log.Log.Info("HandleHeartBeat: (200) Heartbeat received by Kerberos Vault.")
communication.CloudTimestamp.Store(time.Now().Unix())
log.Log.Info("HandleHeartBeat: (200) Heartbeat received by Kerberos Hub.")
} else {
log.Log.Error("HandleHeartBeat: (400) Something went wrong while sending to Kerberos Vault.")
log.Log.Error("HandleHeartBeat: (400) Something went wrong while sending to Kerberos Hub.")
}
// If we have a vault connect, we will also send some analytics
// to that service.
if vaultURI != "" {
buffy = bytes.NewBuffer(jsonStr)
req, _ = http.NewRequest("POST", vaultURI+"/devices/heartbeat", buffy)
req.Header.Set("Content-Type", "application/json")
client = &http.Client{}
resp, err = client.Do(req)
if resp != nil {
resp.Body.Close()
}
if err == nil && resp.StatusCode == 200 {
log.Log.Info("HandleHeartBeat: (200) Heartbeat received by Kerberos Vault.")
} else {
log.Log.Error("HandleHeartBeat: (400) Something went wrong while sending to Kerberos Vault.")
}
}
// This will check if we need to stop the thread,
// because of a reconfiguration.
select {
case <-communication.HandleHeartBeat:
break loop
case <-time.After(15 * time.Second):
}
}
time.Sleep(30 * time.Second)
}
log.Log.Debug("HandleHeartBeat: finished")
@@ -203,43 +225,49 @@ loop:
func HandleLiveStreamSD(livestreamCursor *pubsub.QueueCursor, configuration *models.Configuration, communication *models.Communication, mqttClient mqtt.Client, decoder *ffmpeg.VideoDecoder, decoderMutex *sync.Mutex) {
log.Log.Debug("HandleLiveStreamSD: finished")
log.Log.Debug("HandleLiveStreamSD: started")
config := configuration.Config
key := ""
if config.Cloud == "s3" && config.S3.Publickey != "" {
key = config.S3.Publickey
} else if config.Cloud == "kstorage" && config.KStorage.CloudKey != "" {
key = config.KStorage.CloudKey
}
// This is the new way ;)
if config.HubKey != "" {
key = config.HubKey
}
topic := "kerberos/" + key + "/device/" + config.Key + "/live"
if config.Offline == "true" {
log.Log.Debug("HandleLiveStreamSD: stopping as Offline is enabled.")
} else {
lastLivestreamRequest := int64(0)
var cursorError error
var pkt av.Packet
for cursorError == nil {
pkt, cursorError = livestreamCursor.ReadPacket()
if len(pkt.Data) == 0 || !pkt.IsKeyFrame {
continue
key := ""
if config.Cloud == "s3" && config.S3 != nil && config.S3.Publickey != "" {
key = config.S3.Publickey
} else if config.Cloud == "kstorage" && config.KStorage != nil && config.KStorage.CloudKey != "" {
key = config.KStorage.CloudKey
}
now := time.Now().Unix()
select {
case <-communication.HandleLiveSD:
lastLivestreamRequest = now
default:
// This is the new way ;)
if config.HubKey != "" {
key = config.HubKey
}
if now-lastLivestreamRequest > 3 {
continue
topic := "kerberos/" + key + "/device/" + config.Key + "/live"
lastLivestreamRequest := int64(0)
var cursorError error
var pkt av.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
}
log.Log.Info("HandleLiveStreamSD: Sending base64 encoded images to MQTT.")
sendImage(topic, mqttClient, pkt, decoder, decoderMutex)
}
log.Log.Info("HandleLiveStreamSD: Sending base64 encoded images to MQTT.")
sendImage(topic, mqttClient, pkt, decoder, decoderMutex)
}
log.Log.Debug("HandleLiveStreamSD: finished")
@@ -261,33 +289,306 @@ func HandleLiveStreamHD(livestreamCursor *pubsub.QueueCursor, configuration *mod
config := configuration.Config
// Should create a track here.
track := webrtc.NewVideoTrack()
go webrtc.WriteToTrack(livestreamCursor, configuration, communication, mqttClient, track, codecs, decoder, decoderMutex)
if config.Capture.ForwardWebRTC == "true" {
// We get a request with an offer, but we'll forward it.
for m := range communication.HandleLiveHDHandshake {
// Forward SDP
m.CloudKey = config.Key
request, err := json.Marshal(m)
if err == nil {
mqttClient.Publish("kerberos/webrtc/request", 2, false, request)
}
}
if config.Offline == "true" {
log.Log.Debug("HandleLiveStreamHD: stopping as Offline is enabled.")
} else {
log.Log.Info("HandleLiveStreamHD: Waiting for peer connections.")
for handshake := range communication.HandleLiveHDHandshake {
log.Log.Info("HandleLiveStreamHD: setting up a peer connection.")
key := config.Key + "/" + handshake.Cuuid
webrtc.CandidatesMutex.Lock()
_, ok := webrtc.CandidateArrays[key]
if !ok {
webrtc.CandidateArrays[key] = make(chan string, 30)
}
webrtc.CandidatesMutex.Unlock()
webrtc.InitializeWebRTCConnection(configuration, communication, mqttClient, track, handshake, webrtc.CandidateArrays[key])
// Should create a track here.
track := webrtc.NewVideoTrack()
go webrtc.WriteToTrack(livestreamCursor, configuration, communication, mqttClient, track, codecs, decoder, decoderMutex)
if config.Capture.ForwardWebRTC == "true" {
// We get a request with an offer, but we'll forward it.
for m := range communication.HandleLiveHDHandshake {
// Forward SDP
m.CloudKey = config.Key
request, err := json.Marshal(m)
if err == nil {
mqttClient.Publish("kerberos/webrtc/request", 2, false, request)
}
}
} else {
log.Log.Info("HandleLiveStreamHD: Waiting for peer connections.")
for handshake := range communication.HandleLiveHDHandshake {
log.Log.Info("HandleLiveStreamHD: setting up a peer connection.")
key := config.Key + "/" + handshake.Cuuid
webrtc.CandidatesMutex.Lock()
_, ok := webrtc.CandidateArrays[key]
if !ok {
webrtc.CandidateArrays[key] = make(chan string, 30)
}
webrtc.CandidatesMutex.Unlock()
webrtc.InitializeWebRTCConnection(configuration, communication, mqttClient, track, handshake, webrtc.CandidateArrays[key])
}
}
}
}
// VerifyHub godoc
// @Router /api/hub/verify [post]
// @ID verify-hub
// @Security Bearer
// @securityDefinitions.apikey Bearer
// @in header
// @name Authorization
// @Tags config
// @Param config body models.Config true "Config"
// @Summary Will verify the hub connectivity.
// @Description Will verify the hub connectivity.
// @Success 200 {object} models.APIResponse
func VerifyHub(c *gin.Context) {
var config models.Config
err := c.BindJSON(&config)
if err == nil {
hubKey := config.HubKey
//hubPrivateKey := config.HubPrivateKey
//hubSite := config.HubSite
hubURI := config.HubURI
content := []byte(`{"message": "fake-message"}`)
body := bytes.NewReader(content)
req, err := http.NewRequest("POST", hubURI+"/queue/test", body)
if err == nil {
req.Header.Set("X-Kerberos-Cloud-Key", hubKey)
client := &http.Client{}
resp, err := client.Do(req)
if err == nil {
body, err := ioutil.ReadAll(resp.Body)
defer resp.Body.Close()
if err == nil {
if resp.StatusCode == 200 {
c.JSON(200, body)
} else {
c.JSON(400, models.APIResponse{
Data: "Something went wrong while reaching the Kerberos Hub API: " + string(body),
})
}
} else {
c.JSON(400, models.APIResponse{
Data: "Something went wrong while ready the response body: " + err.Error(),
})
}
} else {
c.JSON(400, models.APIResponse{
Data: "Something went wrong while reaching to the Kerberos Hub API: " + hubURI,
})
}
} else {
c.JSON(400, models.APIResponse{
Data: "Something went wrong while creating the HTTP request: " + err.Error(),
})
}
} else {
c.JSON(400, models.APIResponse{
Data: "Something went wrong while receiving the config " + err.Error(),
})
}
}
// VerifyPersistence godoc
// @Router /api/persistence/verify [post]
// @ID verify-persistence
// @Security Bearer
// @securityDefinitions.apikey Bearer
// @in header
// @name Authorization
// @Tags config
// @Param config body models.Config true "Config"
// @Summary Will verify the persistence.
// @Description Will verify the persistence.
// @Success 200 {object} models.APIResponse
func VerifyPersistence(c *gin.Context) {
var config models.Config
err := c.BindJSON(&config)
if err != nil || config.Cloud != "" {
if config.Cloud == "s3" {
//fmt.Println("Uploading...")
// timestamp_microseconds_instanceName_regionCoordinates_numberOfChanges_token
// 1564859471_6-474162_oprit_577-283-727-375_1153_27.mp4
// - Timestamp
// - Size + - + microseconds
// - device
// - Region
// - Number of changes
// - Token
aws_access_key_id := config.S3.Publickey
aws_secret_access_key := config.S3.Secretkey
aws_region := config.S3.Region
// This is the new way ;)
if config.HubKey != "" {
aws_access_key_id = config.HubKey
}
if config.HubPrivateKey != "" {
aws_secret_access_key = config.HubPrivateKey
}
s3Client, err := minio.NewWithRegion("s3.amazonaws.com", aws_access_key_id, aws_secret_access_key, true, aws_region)
if err != nil {
c.JSON(400, models.APIResponse{
Data: "Creation of Kerberos Hub connection failed: " + err.Error(),
})
} else {
// Check if we need to use the proxy.
if config.S3.ProxyURI != "" {
var transport http.RoundTripper = &http.Transport{
Proxy: func(*http.Request) (*url.URL, error) {
return url.Parse(config.S3.ProxyURI)
},
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}
s3Client.SetCustomTransport(transport)
}
deviceKey := "fake-key"
devicename := "justatest"
coordinates := "200-200-400-400"
eventToken := "769"
timestamp := time.Now().Unix()
fileName := strconv.FormatInt(timestamp, 10) + "_6-967003_justatest_200-200-400-400_24_769.mp4"
content := []byte("test-file")
body := bytes.NewReader(content)
n, err := s3Client.PutObject(config.S3.Bucket,
config.S3.Username+"/"+fileName,
body,
body.Size(),
minio.PutObjectOptions{
ContentType: "video/mp4",
StorageClass: "ONEZONE_IA",
UserMetadata: map[string]string{
"event-timestamp": strconv.FormatInt(timestamp, 10),
"event-microseconds": deviceKey,
"event-instancename": devicename,
"event-regioncoordinates": coordinates,
"event-numberofchanges": deviceKey,
"event-token": eventToken,
"productid": deviceKey,
"publickey": aws_access_key_id,
"uploadtime": "now",
},
})
if err != nil {
c.JSON(400, models.APIResponse{
Data: "Upload of fake recording failed: " + err.Error(),
})
} else {
c.JSON(200, models.APIResponse{
Data: "Upload Finished: file has been uploaded to bucket: " + strconv.FormatInt(n, 10),
})
}
}
}
if config.Cloud == "kstorage" {
uri := config.KStorage.URI
accessKey := config.KStorage.AccessKey
secretAccessKey := config.KStorage.SecretAccessKey
directory := config.KStorage.Directory
provider := config.KStorage.Provider
if err == nil && uri != "" && accessKey != "" && secretAccessKey != "" {
var postData = []byte(`{"title":"Buy cheese and bread for breakfast."}`)
client := &http.Client{}
req, err := http.NewRequest("POST", uri+"/ping", bytes.NewReader(postData))
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 := ioutil.ReadAll(resp.Body)
defer resp.Body.Close()
if err == nil && resp.StatusCode == http.StatusOK {
if provider != "" || directory != "" {
hubKey := config.KStorage.CloudKey
// This is the new way ;)
if config.HubKey != "" {
hubKey = config.HubKey
}
// Generate a random name.
timestamp := time.Now().Unix()
fileName := strconv.FormatInt(timestamp, 10) +
"_6-967003_justatest_200-200-400-400_24_769.mp4"
content := []byte("test-file")
body := bytes.NewReader(content)
//fileSize := int64(len(content))
req, err := http.NewRequest("POST", uri+"/storage", body)
if err == nil {
req.Header.Set("Content-Type", "video/mp4")
req.Header.Set("X-Kerberos-Storage-CloudKey", hubKey)
req.Header.Set("X-Kerberos-Storage-AccessKey", accessKey)
req.Header.Set("X-Kerberos-Storage-SecretAccessKey", secretAccessKey)
req.Header.Set("X-Kerberos-Storage-Provider", provider)
req.Header.Set("X-Kerberos-Storage-FileName", fileName)
req.Header.Set("X-Kerberos-Storage-Device", "test")
req.Header.Set("X-Kerberos-Storage-Capture", "IPCamera")
req.Header.Set("X-Kerberos-Storage-Directory", directory)
client := &http.Client{}
resp, err := client.Do(req)
if err == nil {
if resp != nil {
body, err := ioutil.ReadAll(resp.Body)
defer resp.Body.Close()
if err == nil {
if resp.StatusCode == 200 {
c.JSON(200, body)
} else {
c.JSON(400, models.APIResponse{
Data: "Something went wrong while verifying your persistence settings. Make sure your provider is the same as the storage provider in your Kerberos Vault, and the relevant storage provider is configured properly.",
})
}
}
}
} else {
c.JSON(400, models.APIResponse{
Data: "Upload of fake recording failed: " + err.Error(),
})
}
} else {
c.JSON(400, models.APIResponse{
Data: "Something went wrong while creating /storage POST request." + err.Error(),
})
}
} else {
c.JSON(400, models.APIResponse{
Data: "Provider and/or directory is missing from the request.",
})
}
} else {
c.JSON(400, models.APIResponse{
Data: "Something went wrong while verifying storage credentials: " + string(body),
})
}
} else {
c.JSON(400, models.APIResponse{
Data: "Something went wrong while verifying storage credentials:" + err.Error(),
})
}
}
}
} else {
c.JSON(400, models.APIResponse{
Data: "No persistence was specified, so do not know what to verify:" + err.Error(),
})
}
}
+5
View File
@@ -27,6 +27,11 @@ func UploadS3(configuration *models.Configuration, fileName string, directory st
// - Number of changes
// - Token
if config.S3 == nil {
log.Log.Error("UploadS3: Uploading Failed, as no settings found")
return false
}
aws_access_key_id := config.S3.Publickey
aws_secret_access_key := config.S3.Secretkey
aws_region := config.S3.Region
+70
View File
@@ -4,7 +4,10 @@ import (
"bufio"
"encoding/base64"
"encoding/json"
"errors"
"fmt"
"image"
_ "image/png"
"io/ioutil"
"os"
"reflect"
@@ -18,6 +21,25 @@ import (
"gopkg.in/mgo.v2/bson"
)
func GetImageFromFilePath() (image.Image, error) {
snapshotDirectory := "./data/snapshots"
files, err := ioutil.ReadDir(snapshotDirectory)
if err == nil && len(files) > 1 {
sort.Slice(files, func(i, j int) bool {
return files[i].ModTime().Before(files[j].ModTime())
})
filePath := "./data/snapshots/" + files[1].Name()
f, err := os.Open(filePath)
if err != nil {
return nil, err
}
defer f.Close()
image, _, err := image.Decode(f)
return image, err
}
return nil, errors.New("Could not find a snapshot in " + snapshotDirectory)
}
func GetSnapshot() string {
var snapshot string
files, err := ioutil.ReadDir("./data/snapshots")
@@ -157,3 +179,51 @@ func OpenConfig(configuration *models.Configuration) {
return
}
func SaveConfig(config models.Config, configuration *models.Configuration, communication *models.Communication) error {
if !communication.IsConfiguring.IsSet() {
communication.IsConfiguring.Set()
err := StoreConfig(config)
if err != nil {
communication.IsConfiguring.UnSet()
return err
}
select {
case communication.HandleBootstrap <- "restart":
default:
}
communication.IsConfiguring.UnSet()
return nil
} else {
return errors.New("☄ Already reconfiguring")
}
}
func StoreConfig(config models.Config) error {
// Save into database
if os.Getenv("DEPLOYMENT") == "factory" || os.Getenv("MACHINERY_ENVIRONMENT") == "kubernetes" {
// Write to mongodb
session := database.New().Copy()
defer session.Close()
db := session.DB(database.DatabaseName)
collection := db.C("configuration")
err := collection.Update(bson.M{
"type": "config",
"name": os.Getenv("DEPLOYMENT_NAME"),
}, &config)
return err
// Save into file
} else if os.Getenv("DEPLOYMENT") == "" || os.Getenv("DEPLOYMENT") == "agent" {
res, _ := json.MarshalIndent(config, "", "\t")
err := ioutil.WriteFile("./data/config/config.json", res, 0644)
return err
}
return errors.New("Not able to update config")
}
+28 -7
View File
@@ -25,6 +25,19 @@ func Bootstrap(configuration *models.Configuration, communication *models.Commun
var packageCounter atomic.Value
packageCounter.Store(int64(0))
communication.PackageCounter = &packageCounter
// This is used when the last packet was received (timestamp),
// this metric is used to determine if the camera is still online/connected.
var lastPacketTimer atomic.Value
packageCounter.Store(int64(0))
communication.LastPacketTimer = &lastPacketTimer
// This is used to understand if we have a working Kerberos Hub connection
// cloudTimestamp will be updated when successfully sending heartbeats.
var cloudTimestamp atomic.Value
cloudTimestamp.Store(int64(0))
communication.CloudTimestamp = &cloudTimestamp
communication.HandleStream = make(chan string, 1)
communication.HandleUpload = make(chan string, 1)
communication.HandleHeartBeat = make(chan string, 1)
@@ -76,8 +89,13 @@ func RunAgent(configuration *models.Configuration, communication *models.Communi
// Create a packet queue, which is filled by the HandleStream routing
// and consumed by all other routines: motion, livestream, etc.
if config.Capture.PreRecording <= 0 {
config.Capture.PreRecording = 1
log.Log.Warning("RunAgent: Prerecording value not found in config or invalid value! Found: " + strconv.FormatInt(config.Capture.PreRecording, 10))
}
queue = pubsub.NewQueue()
queue.SetMaxGopCount(5) // GOP time frame is set to 5.
queue.SetMaxGopCount(int(config.Capture.PreRecording)) // GOP time frame is set to prerecording.
log.Log.Info("RunAgent: SetMaxGopCount was set with: " + strconv.Itoa(int(config.Capture.PreRecording)))
queue.WriteHeader(streams)
// Configure a MQTT client which helps for a bi-directional communication
@@ -92,7 +110,7 @@ func RunAgent(configuration *models.Configuration, communication *models.Communi
// Handle processing of motion
motionCursor := queue.Oldest()
communication.HandleMotion = make(chan int64, 1)
communication.HandleMotion = make(chan models.MotionDataPartial, 1)
go computervision.ProcessMotion(motionCursor, configuration, communication, mqttClient, decoder, &decoderMutex)
// Handle livestream SD (low resolution over MQTT)
@@ -120,9 +138,10 @@ func RunAgent(configuration *models.Configuration, communication *models.Communi
status = <-communication.HandleBootstrap
// Here we are cleaning up everything!
communication.HandleStream <- "stop"
communication.HandleHeartBeat <- "stop"
communication.HandleUpload <- "stop"
if configuration.Config.Offline != "true" {
communication.HandleHeartBeat <- "stop"
communication.HandleUpload <- "stop"
}
infile.Close()
queue.Close()
close(communication.HandleONVIF)
@@ -130,10 +149,11 @@ func RunAgent(configuration *models.Configuration, communication *models.Communi
close(communication.HandleMotion)
routers.DisconnectMQTT(mqttClient)
decoder.Close()
communication.HandleStream <- "stop"
// Waiting for some seconds to make sure everything is properly closed.
log.Log.Info("RunAgent: waiting 1 second to make sure everything is properly closed.")
time.Sleep(time.Second * 1)
log.Log.Info("RunAgent: waiting 3 seconds to make sure everything is properly closed.")
time.Sleep(time.Second * 3)
} else {
log.Log.Error("Something went wrong while opening RTSP: " + err.Error())
time.Sleep(time.Second * 3)
@@ -160,6 +180,7 @@ func ControlAgent(communication *models.Communication) {
occurence = occurence + 1
}
} else {
occurence = 0
}
+11
View File
@@ -2,12 +2,15 @@ package components
import (
"fmt"
"image"
"image/jpeg"
"log"
"time"
"github.com/deepch/vdk/av"
"github.com/deepch/vdk/codec/h264parser"
"github.com/deepch/vdk/format/rtsp"
"github.com/nsmith5/mjpeg"
)
type Stream struct {
@@ -81,3 +84,11 @@ func GetSPSFromCodec(codecs []av.CodecData) ([]byte, []byte) {
pps := codecs[0].(h264parser.CodecData).PPS()
return sps, pps
}
func StartMotionJPEG(imageFunction func() (image.Image, error), quality int) mjpeg.Handler {
stream := mjpeg.Handler{
Next: imageFunction,
Options: &jpeg.Options{Quality: quality},
}
return stream
}
+58 -36
View File
@@ -1,7 +1,6 @@
package computervision
import (
"fmt"
"image"
"io/ioutil"
"os"
@@ -35,7 +34,7 @@ func GetRGBImage(pkt av.Packet, dec *ffmpeg.VideoDecoder, decoderMutex *sync.Mut
}
func GetImage(pkt av.Packet, dec *ffmpeg.VideoDecoder, decoderMutex *sync.Mutex) gocv.Mat {
var gray gocv.Mat
var rgb gocv.Mat
img, err := capture.DecodeImage(pkt, dec, decoderMutex)
if err == nil && img != nil {
@@ -45,7 +44,7 @@ func GetImage(pkt av.Packet, dec *ffmpeg.VideoDecoder, decoderMutex *sync.Mutex)
height := img.Height()
newWidth := width
newHeight := height
// Try minify twice.
scaleFactor := 1.0
if newWidth > 800 {
@@ -62,19 +61,23 @@ func GetImage(pkt av.Packet, dec *ffmpeg.VideoDecoder, decoderMutex *sync.Mutex)
newWidth = width / 2
newHeight = height / 2
scaleFactor *= 2
}
}
im := img.Image
rgb, _ := ToRGB8(im)
rgb, _ = ToRGB8(im)
img.Free()
if scaleFactor > 1 {
gocv.Resize(rgb, &rgb, image.Pt(newWidth, newHeight), 0, 0, gocv.InterpolationArea)
}
gray = gocv.NewMat()
gocv.CvtColor(rgb, &gray, gocv.ColorBGRToGray)
rgb.Close()
}
return gray
return rgb
}
func ToGray(rgb gocv.Mat) (gocv.Mat, error) {
gray := gocv.NewMat()
gocv.CvtColor(rgb, &gray, gocv.ColorBGRToGray)
rgb.Close()
return gray, nil
}
func ToRGB8(img image.YCbCr) (gocv.Mat, error) {
@@ -84,8 +87,11 @@ func ToRGB8(img image.YCbCr) (gocv.Mat, error) {
bytes := make([]byte, 0, x*y*3)
for j := bounds.Min.Y; j < bounds.Max.Y; j++ {
for i := bounds.Min.X; i < bounds.Max.X; i++ {
r, g, b, _ := img.At(i, j).RGBA()
bytes = append(bytes, byte(b>>8), byte(g>>8), byte(r>>8))
iy := img.At(i, j)
if iy != nil {
r, g, b, _ := iy.RGBA()
bytes = append(bytes, byte(b>>8), byte(g>>8), byte(r>>8))
}
}
}
return gocv.NewMatFromBytes(y, x, gocv.MatTypeCV8UC3, bytes)
@@ -95,6 +101,9 @@ func ProcessMotion(motionCursor *pubsub.QueueCursor, configuration *models.Confi
log.Log.Debug("ProcessMotion: started")
config := configuration.Config
var isPixelChangeThresholdReached = false
var changesToReturn = 0
if config.Capture.Continuous == "true" {
log.Log.Info("ProcessMotion: Continuous recording, so no motion detection.")
@@ -103,12 +112,7 @@ func ProcessMotion(motionCursor *pubsub.QueueCursor, configuration *models.Confi
log.Log.Info("ProcessMotion: Motion detection enabled.")
key := ""
if config.Cloud == "s3" && config.S3.Publickey != "" {
key = config.S3.Publickey
} else if config.Cloud == "kstorage" && config.KStorage.CloudKey != "" {
key = config.KStorage.CloudKey
}
key := config.HubKey
// Initialise first 2 elements
var matArray [3]*gocv.Mat
@@ -123,7 +127,8 @@ func ProcessMotion(motionCursor *pubsub.QueueCursor, configuration *models.Confi
// Check If valid package.
if len(pkt.Data) > 0 && pkt.IsKeyFrame {
rgb := GetImage(pkt, decoder, decoderMutex)
matArray[j] = &rgb
gray, _ := ToGray(rgb)
matArray[j] = &gray
j++
}
if j == 2 {
@@ -178,22 +183,23 @@ func ProcessMotion(motionCursor *pubsub.QueueCursor, configuration *models.Confi
}
rgb := GetImage(pkt, decoder, decoderMutex)
matArray[2] = &rgb
gray, _ := ToGray(rgb)
matArray[2] = &gray
// Store snapshots (jpg) or hull.
if i%3 == 0 {
files, err := ioutil.ReadDir("./data/snapshots")
if err == nil {
sort.Slice(files, func(i, j int) bool {
return files[i].ModTime().Before(files[j].ModTime())
})
if len(files) > 3 {
os.Remove("./data/snapshots/" + files[0].Name())
}
files, err := ioutil.ReadDir("./data/snapshots")
if err == nil {
sort.Slice(files, func(i, j int) bool {
return files[i].ModTime().Before(files[j].ModTime())
})
if len(files) > 3 {
os.Remove("./data/snapshots/" + files[0].Name())
}
t := strconv.FormatInt(time.Now().Unix(), 10)
gocv.IMWrite("./data/snapshots/"+t+".png", rgb)
}
t := strconv.FormatInt(time.Now().Unix(), 10)
snapshotRGB := GetImage(pkt, decoder, decoderMutex)
gocv.IMWrite("./data/snapshots/"+t+".png", snapshotRGB)
snapshotRGB.Close()
// Check if continuous recording.
if config.Capture.Continuous == "true" {
@@ -226,10 +232,21 @@ func ProcessMotion(motionCursor *pubsub.QueueCursor, configuration *models.Confi
}
}
if detectMotion && FindMotion(matArray, coordinatesToCheck) {
mqttClient.Publish("kerberos/"+key+"/device/"+config.Key+"/motion", 2, false, "motion")
fmt.Println(key)
communication.HandleMotion <- time.Now().Unix()
// Remember additional information about the result of findmotion
isPixelChangeThresholdReached, changesToReturn = FindMotion(matArray, coordinatesToCheck, config.Capture.PixelChangeThreshold)
if detectMotion && isPixelChangeThresholdReached {
if mqttClient != nil {
mqttClient.Publish("kerberos/"+key+"/device/"+config.Key+"/motion", 2, false, "motion")
}
//FIXME: In the future MotionDataPartial should be replaced with MotionDataFull
dataToPass := models.MotionDataPartial{
Timestamp: time.Now().Unix(),
NumberOfChanges: changesToReturn,
}
communication.HandleMotion <- dataToPass //Save data to the channel
}
}
@@ -251,7 +268,7 @@ func ProcessMotion(motionCursor *pubsub.QueueCursor, configuration *models.Confi
log.Log.Debug("ProcessMotion: finished")
}
func FindMotion(matArray [3]*gocv.Mat, coordinatesToCheck [][]int) bool {
func FindMotion(matArray [3]*gocv.Mat, coordinatesToCheck [][]int, pixelChangeThreshold int) (thresholdReached bool, changesDetected int) {
h1 := gocv.NewMat()
gocv.AbsDiff(*matArray[2], *matArray[0], &h1)
@@ -284,5 +301,10 @@ func FindMotion(matArray [3]*gocv.Mat, coordinatesToCheck [][]int) bool {
log.Log.Info("FindMotion: Number of changes detected:" + strconv.Itoa(changes))
return changes > 75
if pixelChangeThreshold == 0 {
pixelChangeThreshold = 75 // Keep hardcoded value of 75 for now if no value is given for changes treshold in config.json
}
changesDetected = changes // Assign final amount of changes to the return variable
return changes > pixelChangeThreshold, changesDetected // Return bool ifReachedThreshold AND the amount of changes detected in total
}
+18 -13
View File
@@ -2,6 +2,7 @@ package log
import (
"os"
"time"
"github.com/op/go-logging"
"github.com/sirupsen/logrus"
@@ -20,7 +21,7 @@ var Log = Logging{
var gologging = logging.MustGetLogger("gologger")
func ConfigureGoLogging() {
func ConfigureGoLogging(timezone *time.Location) {
// Logging
var format = logging.MustStringFormatter(
`%{color}%{time:15:04:05.000} %{shortfunc} ▶ %{level:.4s} %{id:03x}%{color:reset} %{message}`,
@@ -44,9 +45,12 @@ func ConfigureGoLogging() {
// This a logrus
// -> github.com/sirupsen/logrus
func ConfigureLogrus() {
func ConfigureLogrus(timezone *time.Location) {
// Log as JSON instead of the default ASCII formatter.
logrus.SetFormatter(&logrus.JSONFormatter{})
logrus.SetFormatter(LocalTimeZoneFormatter{
Timezone: timezone,
Formatter: &logrus.JSONFormatter{},
}) // Use local timezone for providing datetime in logs!
// Output to stdout instead of the default stderr
// Can be any io.Writer, see below for File example
@@ -56,13 +60,14 @@ func ConfigureLogrus() {
logrus.SetLevel(logrus.InfoLevel)
}
func NewLogger(logger string, level string) *Logging {
loggy := Logging{
Logger: logger,
Level: level,
}
loggy.Init()
return &loggy
type LocalTimeZoneFormatter struct {
Timezone *time.Location
Formatter logrus.Formatter
}
func (u LocalTimeZoneFormatter) Format(e *logrus.Entry) ([]byte, error) {
e.Time = e.Time.In(u.Timezone)
return u.Formatter.Format(e)
}
type Logging struct {
@@ -70,12 +75,12 @@ type Logging struct {
Level string
}
func (self *Logging) Init() {
func (self *Logging) Init(timezone *time.Location) {
switch self.Logger {
case "go-logging":
ConfigureGoLogging()
ConfigureGoLogging(timezone)
case "logrus":
ConfigureLogrus()
ConfigureLogrus(timezone)
default:
}
}
+3 -1
View File
@@ -10,9 +10,11 @@ import (
// all the communication between the different goroutines.
type Communication struct {
PackageCounter *atomic.Value
LastPacketTimer *atomic.Value
CloudTimestamp *atomic.Value
HandleBootstrap chan string
HandleStream chan string
HandleMotion chan int64
HandleMotion chan MotionDataPartial
HandleUpload chan string
HandleHeartBeat chan string
HandleLiveSD chan int64
+50 -45
View File
@@ -9,37 +9,40 @@ type Configuration struct {
GlobalConfig Config
}
//Config is the highlevel struct which contains all the configuration of
//your Kerberos Open Source instance.
// Config is the highlevel struct which contains all the configuration of
// your Kerberos Open Source instance.
type Config struct {
Type string `json:"type" binding:"required"`
Key string `json:"key"`
Name string `json:"name"`
Time string `json:"time,omitempty" bson:"time"`
Timezone string `json:"timezone,omitempty" bson:"timezone,omitempty"`
Capture Capture `json:"capture"`
Timetable []*Timetable `json:"timetable"`
Region *Region `json:"region"`
Cloud string `json:"cloud,omitempty" bson:"cloud,omitempty"`
S3 *S3 `json:"s3,omitempty" bson:"s3,omitempty"`
KStorage *KStorage `json:"kstorage,omitempty" bson:"kstorage,omitempty"`
MQTTURI string `json:"mqtturi,omitempty" bson:"mqtturi,omitempty"`
MQTTUsername string `json:"mqtt_username,omitempty" bson:"mqtt_username"`
MQTTPassword string `json:"mqtt_password,omitempty" bson:"mqtt_password"`
STUNURI string `json:"stunuri,omitempty" bson:"stunuri"`
TURNURI string `json:"turnuri,omitempty" bson:"turnuri"`
TURNUsername string `json:"turn_username,omitempty" bson:"turn_username"`
TURNPassword string `json:"turn_password,omitempty" bson:"turn_password"`
HeartbeatURI string `json:"heartbeaturi,omitempty" bson:"heartbeaturi"` /*obsolete*/
HubURI string `json:"hub_uri,omitempty" bson:"hub_uri"`
HubKey string `json:"hub_key,omitempty" bson:"hub_key"`
HubPrivateKey string `json:"hub_private_key,omitempty" bson:"hub_private_key"`
HubSite string `json:"hub_site,omitempty" bson:"hub_site"`
ConditionURI string `json:"condition_uri,omitempty" bson:"condition_uri"`
Type string `json:"type"`
Key string `json:"key"`
Name string `json:"name"`
Time string `json:"time" bson:"time"`
Offline string `json:"offline"`
AutoClean string `json:"auto_clean"`
MaxDirectorySize int64 `json:"max_directory_size"`
Timezone string `json:"timezone,omitempty" bson:"timezone,omitempty"`
Capture Capture `json:"capture"`
Timetable []*Timetable `json:"timetable"`
Region *Region `json:"region"`
Cloud string `json:"cloud" bson:"cloud"`
S3 *S3 `json:"s3,omitempty" bson:"s3,omitempty"`
KStorage *KStorage `json:"kstorage,omitempty" bson:"kstorage,omitempty"`
MQTTURI string `json:"mqtturi" bson:"mqtturi,omitempty"`
MQTTUsername string `json:"mqtt_username" bson:"mqtt_username"`
MQTTPassword string `json:"mqtt_password" bson:"mqtt_password"`
STUNURI string `json:"stunuri" bson:"stunuri"`
TURNURI string `json:"turnuri" bson:"turnuri"`
TURNUsername string `json:"turn_username" bson:"turn_username"`
TURNPassword string `json:"turn_password" bson:"turn_password"`
HeartbeatURI string `json:"heartbeaturi" bson:"heartbeaturi"` /*obsolete*/
HubURI string `json:"hub_uri" bson:"hub_uri"`
HubKey string `json:"hub_key" bson:"hub_key"`
HubPrivateKey string `json:"hub_private_key" bson:"hub_private_key"`
HubSite string `json:"hub_site" bson:"hub_site"`
ConditionURI string `json:"condition_uri" bson:"condition_uri"`
}
//Capture defines which camera type (Id) you are using (IP, USB or Raspberry Pi camera),
//and also contains recording specific parameters.
// Capture defines which camera type (Id) you are using (IP, USB or Raspberry Pi camera),
// and also contains recording specific parameters.
type Capture struct {
Name string `json:"name"`
IPCamera IPCamera `json:"ipcamera"`
@@ -47,19 +50,21 @@ type Capture struct {
RaspiCamera RaspiCamera `json:"raspicamera"`
Continuous string `json:"continuous,omitempty"`
PostRecording int64 `json:"postrecording"`
PreRecording int `json:"prerecording"`
PreRecording int64 `json:"prerecording"`
MaxLengthRecording int64 `json:"maxlengthrecording"`
TranscodingWebRTC string `json:"transcodingwebrtc"`
TranscodingResolution int64 `json:"transcodingresolution"`
ForwardWebRTC string `json:"forwardwebrtc"`
Fragmented string `json:"fragmented,omitempty" bson:"fragmented,omitempty"`
FragmentedDuration int64 `json:"fragmentedduration,omitempty" bson:"fragmentedduration,omitempty"`
PixelChangeThreshold int `json:"pixelChangeThreshold,omitempty"`
}
//IPCamera configuration, such as the RTSP url of the IPCamera and the FPS.
//Also includes ONVIF integration
// IPCamera configuration, such as the RTSP url of the IPCamera and the FPS.
// Also includes ONVIF integration
type IPCamera struct {
RTSP string `json:"rtsp"`
SubRTSP string `json:"sub_rtsp"`
FPS string `json:"fps"`
ONVIF bool `json:"onvif,omitempty" bson:"onvif"`
ONVIFXAddr string `json:"onvif_xaddr,omitempty" bson:"onvif_xaddr"`
@@ -67,25 +72,25 @@ type IPCamera struct {
ONVIFPassword string `json:"onvif_password,omitempty" bson:"onvif_password"`
}
//USBCamera configuration, such as the device path (/dev/video*)
// USBCamera configuration, such as the device path (/dev/video*)
type USBCamera struct {
Device string `json:"device"`
}
//RaspiCamera configuration, such as the device path (/dev/video*)
// RaspiCamera configuration, such as the device path (/dev/video*)
type RaspiCamera struct {
Device string `json:"device"`
}
//Region specifies the type (Id) of Region Of Interest (ROI), you
//would like to use.
// Region specifies the type (Id) of Region Of Interest (ROI), you
// would like to use.
type Region struct {
Name string `json:"name"`
Rectangle Rectangle `json:"rectangle"`
Polygon []Polygon `json:"polygon"`
}
//Rectangle is defined by a starting point, left top (x1,y1) and end point (x2,y2).
// Rectangle is defined by a starting point, left top (x1,y1) and end point (x2,y2).
type Rectangle struct {
X1 int `json:"x1"`
Y1 int `json:"y1"`
@@ -93,22 +98,22 @@ type Rectangle struct {
Y2 int `json:"y2"`
}
//Polygon is a sequence of coordinates (x,y). The ID specifies an unique identifier,
//as multiple polygons can be defined.
// Polygon is a sequence of coordinates (x,y). The ID specifies an unique identifier,
// as multiple polygons can be defined.
type Polygon struct {
ID string `json:"id"`
Coordinates []Coordinate `json:"coordinates"`
}
//Coordinate belongs to a Polygon.
// Coordinate belongs to a Polygon.
type Coordinate struct {
X float64 `json:"x"`
Y float64 `json:"y"`
}
//Timetable allows you to set a Time Of Intterest (TOI), which limits recording or
//detection to a predefined time interval. Two tracks can be set, which allows you
//to give some flexibility.
// Timetable allows you to set a Time Of Intterest (TOI), which limits recording or
// detection to a predefined time interval. Two tracks can be set, which allows you
// to give some flexibility.
type Timetable struct {
Start1 int `json:"start1"`
End1 int `json:"end1"`
@@ -116,7 +121,7 @@ type Timetable struct {
End2 int `json:"end2"`
}
//S3 integration
// S3 integration
type S3 struct {
Proxy string `json:"proxy,omitempty" bson:"proxy,omitempty"`
ProxyURI string `json:"proxyuri,omitempty" bson:"proxyuri,omitempty"`
@@ -127,8 +132,8 @@ type S3 struct {
Secretkey string `json:"secretkey,omitempty" bson:"secretkey,omitempty"`
}
//KStorage contains the credentials of the Kerberos Storage/Kerberos Cloud instance.
//By defining KStorage you can make your recordings available in the cloud, at a centrel place.
// KStorage contains the credentials of the Kerberos Storage/Kerberos Cloud instance.
// By defining KStorage you can make your recordings available in the cloud, at a centrel place.
type KStorage struct {
URI string `json:"uri,omitempty" bson:"uri,omitempty"`
CloudKey string `json:"cloud_key,omitempty" bson:"cloud_key,omitempty"`
+18
View File
@@ -0,0 +1,18 @@
package models
type Media struct {
Key string `json:"key"`
Path string `json:"path"`
Day string `json:"day"`
ShortDay string `json:"short_day"`
Time string `json:"time"`
Timestamp string `json:"timestamp"`
CameraName string `json:"camera_name"`
CameraKey string `json:"camera_key"`
}
type EventFilter struct {
TimestampOffsetStart int64 `json:"timestamp_offset_start"`
TimestampOffsetEnd int64 `json:"timestamp_offset_end"`
NumberOfElements int `json:"number_of_elements"`
}
+16
View File
@@ -0,0 +1,16 @@
package models
type MotionDataPartial struct {
Timestamp int64 `json:"timestamp" bson:"timestamp"`
NumberOfChanges int `json:"numberOfChanges" bson:"numberOfChanges"`
}
type MotionDataFull struct {
Timestamp int64 `json:"timestamp" bson:"timestamp"`
Size float64 `json:"size" bson:"size"`
Microseconds float64 `json:"microseconds" bson:"microseconds"`
DeviceName string `json:"deviceName" bson:"deviceName"`
Region string `json:"region" bson:"region"`
NumberOfChanges int `json:"numberOfChanges" bson:"numberOfChanges"`
Token int `json:"token" bson:"token"`
}
+158 -39
View File
@@ -1,21 +1,23 @@
package http
import (
"encoding/json"
"io/ioutil"
"os"
"image"
"time"
jwt "github.com/appleboy/gin-jwt/v2"
"github.com/gin-gonic/gin"
"gopkg.in/mgo.v2/bson"
"github.com/kerberos-io/agent/machinery/src/cloud"
"github.com/kerberos-io/agent/machinery/src/components"
"github.com/kerberos-io/agent/machinery/src/database"
"github.com/kerberos-io/agent/machinery/src/log"
"github.com/kerberos-io/agent/machinery/src/models"
"github.com/kerberos-io/agent/machinery/src/utils"
)
func AddRoutes(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware, configuration *models.Configuration, communication *models.Communication) *gin.RouterGroup {
// This is legacy should be removed in future! Now everything
// lives under the /api prefix.
r.GET("/config", func(c *gin.Context) {
c.JSON(200, gin.H{
"config": configuration.Config,
@@ -25,43 +27,25 @@ func AddRoutes(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware, configuratio
})
})
// This is legacy should be removed in future! Now everything
// lives under the /api prefix.
r.POST("/config", func(c *gin.Context) {
if !communication.IsConfiguring.IsSet() {
communication.IsConfiguring.Set()
// Save into file
var conf models.Config
c.BindJSON(&conf)
if os.Getenv("DEPLOYMENT") == "factory" || os.Getenv("MACHINERY_ENVIRONMENT") == "kubernetes" {
// Write to mongodb
session := database.New().Copy()
defer session.Close()
db := session.DB(database.DatabaseName)
collection := db.C("configuration")
collection.Update(bson.M{
"type": "config",
"name": os.Getenv("DEPLOYMENT_NAME"),
}, &conf)
} else if os.Getenv("DEPLOYMENT") == "" || os.Getenv("DEPLOYMENT") == "agent" {
res, _ := json.MarshalIndent(conf, "", "\t")
ioutil.WriteFile("./data/config/config.json", res, 0644)
var config models.Config
err := c.BindJSON(&config)
if err == nil {
err := components.SaveConfig(config, configuration, communication)
if err == nil {
c.JSON(200, gin.H{
"data": "☄ Reconfiguring",
})
} else {
c.JSON(400, gin.H{
"data": "Something went wrong: " + err.Error(),
})
}
select {
case communication.HandleBootstrap <- "restart":
default:
}
communication.IsConfiguring.UnSet()
c.JSON(200, gin.H{
"data": "☄ Reconfiguring",
})
} else {
c.JSON(200, gin.H{
"data": "☄ Already reconfiguring",
c.JSON(400, gin.H{
"data": "Something went wrong: " + err.Error(),
})
}
})
@@ -70,6 +54,112 @@ func AddRoutes(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware, configuratio
{
api.POST("/login", authMiddleware.LoginHandler)
api.GET("/dashboard", func(c *gin.Context) {
// This will return the timestamp when the last packet was correctyl received
// this is to calculate if the camera connection is still working.
lastPacketReceived := int64(0)
if communication.LastPacketTimer != nil && communication.LastPacketTimer.Load() != nil {
lastPacketReceived = communication.LastPacketTimer.Load().(int64)
}
// If an agent is properly setup with Kerberos Hub, we will send
// a ping to Kerberos Hub every 15seconds. On receiving a positive response
// it will update the CloudTimestamp value.
cloudTimestamp := int64(0)
if communication.CloudTimestamp != nil && communication.CloudTimestamp.Load() != nil {
cloudTimestamp = communication.CloudTimestamp.Load().(int64)
}
// The total number of recordings stored in the directory.
recordingDirectory := "./data/recordings"
numberOfRecordings := utils.NumberOfFilesInDirectory(recordingDirectory)
// All days stored in this agent.
days := []string{}
latestEvents := []models.Media{}
files, err := utils.ReadDirectory(recordingDirectory)
if err == nil {
events := utils.GetSortedDirectory(files)
// Get All days
days = utils.GetDays(events, recordingDirectory, configuration)
// Get all latest events
var eventFilter models.EventFilter
eventFilter.NumberOfElements = 5
latestEvents = utils.GetMediaFormatted(events, recordingDirectory, configuration, eventFilter) // will get 5 latest recordings.
}
c.JSON(200, gin.H{
"offlineMode": configuration.Config.Offline,
"cameraOnline": lastPacketReceived,
"cloudOnline": cloudTimestamp,
"numberOfRecordings": numberOfRecordings,
"days": days,
"latestEvents": latestEvents,
})
})
api.POST("/latest-events", func(c *gin.Context) {
var eventFilter models.EventFilter
err := c.BindJSON(&eventFilter)
if err == nil {
// Default to 10 if no limit is set.
if eventFilter.NumberOfElements == 0 {
eventFilter.NumberOfElements = 10
}
recordingDirectory := "./data/recordings"
files, err := utils.ReadDirectory(recordingDirectory)
if err == nil {
events := utils.GetSortedDirectory(files)
// We will get all recordings from the directory (as defined by the filter).
fileObjects := utils.GetMediaFormatted(events, recordingDirectory, configuration, eventFilter)
c.JSON(200, gin.H{
"events": fileObjects,
})
} else {
c.JSON(400, gin.H{
"data": "Something went wrong: " + err.Error(),
})
}
} else {
c.JSON(400, gin.H{
"data": "Something went wrong: " + err.Error(),
})
}
})
api.GET("/days", func(c *gin.Context) {
recordingDirectory := "./data/recordings"
files, err := utils.ReadDirectory(recordingDirectory)
if err == nil {
events := utils.GetSortedDirectory(files)
days := utils.GetDays(events, recordingDirectory, configuration)
c.JSON(200, gin.H{
"events": days,
})
} else {
c.JSON(400, gin.H{
"data": "Something went wrong: " + err.Error(),
})
}
})
// Streaming handler
api.GET("/stream", func(c *gin.Context) {
// TODO add a token validation!
imageFunction := func() (image.Image, error) {
// We will only send an image once per second.
time.Sleep(time.Second * 1)
log.Log.Info("AddRoutes (/stream): reading from MJPEG stream")
img, err := components.GetImageFromFilePath()
return img, err
}
h := components.StartMotionJPEG(imageFunction, 80)
h.ServeHTTP(c.Writer, c.Request)
})
api.GET("/config", func(c *gin.Context) {
c.JSON(200, gin.H{
"config": configuration.Config,
@@ -79,6 +169,27 @@ func AddRoutes(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware, configuratio
})
})
api.POST("/config", func(c *gin.Context) {
var config models.Config
err := c.BindJSON(&config)
if err == nil {
err := components.SaveConfig(config, configuration, communication)
if err == nil {
c.JSON(200, gin.H{
"data": "☄ Reconfiguring",
})
} else {
c.JSON(200, gin.H{
"data": "☄ Reconfiguring",
})
}
} else {
c.JSON(400, gin.H{
"data": "Something went wrong: " + err.Error(),
})
}
})
api.GET("/restart", func(c *gin.Context) {
communication.HandleBootstrap <- "restart"
c.JSON(200, gin.H{
@@ -93,6 +204,14 @@ func AddRoutes(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware, configuratio
})
})
api.POST("/hub/verify", func(c *gin.Context) {
cloud.VerifyHub(c)
})
api.POST("/persistence/verify", func(c *gin.Context) {
cloud.VerifyPersistence(c)
})
api.Use(authMiddleware.MiddlewareFunc())
{
// Secured endpoints..
+1
View File
@@ -63,6 +63,7 @@ func StartServer(configuration *models.Configuration, communication *models.Comm
r.Use(static.Serve("/media", static.LocalFile("./www", true)))
r.Use(static.Serve("/settings", static.LocalFile("./www", true)))
r.Use(static.Serve("/login", static.LocalFile("./www", true)))
r.StaticFS("/file", gin.Dir("./data/recordings", false))
// Run the api on port
err = r.Run(":" + configuration.Port)
+88 -79
View File
@@ -17,93 +17,100 @@ func ConfigureMQTT(configuration *models.Configuration, communication *models.Co
config := configuration.Config
opts := mqtt.NewClientOptions()
if config.Offline == "true" {
log.Log.Info("ConfigureMQTT: not starting as running in Offline mode.")
} else {
// We will set the MQTT endpoint to which we want to connect
// and share and receive messages to/from.
mqttURL := config.MQTTURI
opts.AddBroker(mqttURL)
log.Log.Info("ConfigureMQTT: Set broker uri " + mqttURL)
opts := mqtt.NewClientOptions()
// Our MQTT broker can have username/password credentials
// to protect it from the outside.
mqtt_username := config.MQTTUsername
mqtt_password := config.MQTTPassword
if mqtt_username != "" || mqtt_password != "" {
opts.SetUsername(mqtt_username)
opts.SetPassword(mqtt_password)
log.Log.Info("ConfigureMQTT: Set username " + mqtt_username)
log.Log.Info("ConfigureMQTT: Set password " + mqtt_password)
}
// We will set the MQTT endpoint to which we want to connect
// and share and receive messages to/from.
mqttURL := config.MQTTURI
opts.AddBroker(mqttURL)
log.Log.Info("ConfigureMQTT: Set broker uri " + mqttURL)
// Some extra options to make sure the connection behaves
// properly. More information here: github.com/eclipse/paho.mqtt.golang.
opts.SetCleanSession(true)
opts.SetConnectRetry(true)
opts.SetAutoReconnect(true)
opts.SetConnectTimeout(30 * time.Second)
hubKey := ""
// This is the old way ;)
if config.Cloud == "s3" && config.S3.Publickey != "" {
hubKey = config.S3.Publickey
} else if config.Cloud == "kstorage" && config.KStorage.CloudKey != "" {
hubKey = config.KStorage.CloudKey
}
// This is the new way ;)
if config.HubKey != "" {
hubKey = config.HubKey
}
if hubKey != "" {
rand.Seed(time.Now().UnixNano())
random := rand.Intn(100)
mqttClientID := config.Key + strconv.Itoa(random) // this random int is to avoid conflicts.
// This is a worked-around.
// current S3 (Kerberos Hub SAAS) is using a secured MQTT, where the client id,
// should match the kerberos hub key.
if config.Cloud == "s3" {
mqttClientID = config.Key
// Our MQTT broker can have username/password credentials
// to protect it from the outside.
mqtt_username := config.MQTTUsername
mqtt_password := config.MQTTPassword
if mqtt_username != "" || mqtt_password != "" {
opts.SetUsername(mqtt_username)
opts.SetPassword(mqtt_password)
log.Log.Info("ConfigureMQTT: Set username " + mqtt_username)
log.Log.Info("ConfigureMQTT: Set password " + mqtt_password)
}
opts.SetClientID(mqttClientID)
log.Log.Info("ConfigureMQTT: Set ClientID " + mqttClientID)
rand.Seed(time.Now().UnixNano())
webrtc.CandidateArrays = make(map[string](chan string))
// Some extra options to make sure the connection behaves
// properly. More information here: github.com/eclipse/paho.mqtt.golang.
opts.SetCleanSession(true)
opts.SetConnectRetry(true)
//opts.SetAutoReconnect(true)
opts.SetConnectTimeout(30 * time.Second)
opts.OnConnect = func(c mqtt.Client) {
// We managed to connect to the MQTT broker, hurray!
log.Log.Info("ConfigureMQTT: " + mqttClientID + " connected to " + mqttURL)
// Create a subscription to know if send out a livestream or not.
MQTTListenerHandleLiveSD(c, hubKey, configuration, communication)
// Create a subscription for the WEBRTC livestream.
MQTTListenerHandleLiveHDHandshake(c, hubKey, configuration, communication)
// Create a subscription for keeping alive the WEBRTC livestream.
MQTTListenerHandleLiveHDKeepalive(c, hubKey, configuration, communication)
// Create a subscription to listen to the number of WEBRTC peers.
MQTTListenerHandleLiveHDPeers(c, hubKey, configuration, communication)
// Create a subscription to listen for WEBRTC candidates.
MQTTListenerHandleLiveHDCandidates(c, hubKey, configuration, communication)
// Create a susbcription to listen for ONVIF actions: e.g. PTZ, Zoom, etc.
MQTTListenerHandleONVIF(c, hubKey, configuration, communication)
hubKey := ""
// This is the old way ;)
if config.Cloud == "s3" && config.S3 != nil && config.S3.Publickey != "" {
hubKey = config.S3.Publickey
} else if config.Cloud == "kstorage" && config.KStorage != nil && config.KStorage.CloudKey != "" {
hubKey = config.KStorage.CloudKey
}
}
mqc := mqtt.NewClient(opts)
if token := mqc.Connect(); token.WaitTimeout(3 * time.Second) {
if token.Error() != nil {
log.Log.Error("ConfigureMQTT: unable to establish mqtt broker connection, error was: " + token.Error().Error())
// This is the new way ;)
if config.HubKey != "" {
hubKey = config.HubKey
}
if hubKey != "" {
rand.Seed(time.Now().UnixNano())
random := rand.Intn(100)
mqttClientID := config.Key + strconv.Itoa(random) // this random int is to avoid conflicts.
// This is a worked-around.
// current S3 (Kerberos Hub SAAS) is using a secured MQTT, where the client id,
// should match the kerberos hub key.
if config.Cloud == "s3" {
mqttClientID = config.Key
}
opts.SetClientID(mqttClientID)
log.Log.Info("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!
log.Log.Info("ConfigureMQTT: " + mqttClientID + " connected to " + mqttURL)
// Create a subscription to know if send out a livestream or not.
MQTTListenerHandleLiveSD(c, hubKey, configuration, communication)
// Create a subscription for the WEBRTC livestream.
MQTTListenerHandleLiveHDHandshake(c, hubKey, configuration, communication)
// Create a subscription for keeping alive the WEBRTC livestream.
MQTTListenerHandleLiveHDKeepalive(c, hubKey, configuration, communication)
// Create a subscription to listen to the number of WEBRTC peers.
MQTTListenerHandleLiveHDPeers(c, hubKey, configuration, communication)
// Create a subscription to listen for WEBRTC candidates.
MQTTListenerHandleLiveHDCandidates(c, hubKey, configuration, communication)
// Create a susbcription to listen for ONVIF actions: e.g. PTZ, Zoom, etc.
MQTTListenerHandleONVIF(c, hubKey, configuration, communication)
}
}
mqc := mqtt.NewClient(opts)
if token := mqc.Connect(); token.WaitTimeout(3 * time.Second) {
if token.Error() != nil {
log.Log.Error("ConfigureMQTT: unable to establish mqtt broker connection, error was: " + token.Error().Error())
}
}
return mqc
}
return mqc
return nil
}
func MQTTListenerHandleLiveSD(mqttClient mqtt.Client, hubKey string, configuration *models.Configuration, communication *models.Communication) {
@@ -187,5 +194,7 @@ func MQTTListenerHandleONVIF(mqttClient mqtt.Client, hubKey string, configuratio
}
func DisconnectMQTT(mqttClient mqtt.Client) {
mqttClient.Disconnect(1000)
if mqttClient != nil {
mqttClient.Disconnect(1000)
}
}
+155
View File
@@ -7,13 +7,76 @@ import (
"math/rand"
"os"
"os/exec"
"path/filepath"
"sort"
"strconv"
"strings"
"time"
"github.com/kerberos-io/agent/machinery/src/log"
"github.com/kerberos-io/agent/machinery/src/models"
)
const letterBytes = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
const (
letterIdxBits = 6 // 6 bits to represent a letter index
letterIdxMask = 1<<letterIdxBits - 1 // All 1-bits, as many as letterIdxBits
letterIdxMax = 63 / letterIdxBits // # of letter indices fitting in 63 bits
)
func DirSize(path string) (int64, error) {
var size int64
err := filepath.Walk(path, func(_ string, info os.FileInfo, err error) error {
if err != nil {
return err
}
if !info.IsDir() {
size += info.Size()
}
return err
})
return size, err
}
func FindOldestFile(dir string) (oldestFile os.FileInfo, err error) {
files, err := ioutil.ReadDir(dir)
if err != nil {
return
}
oldestTime := time.Now()
for _, file := range files {
if file.Mode().IsRegular() && file.ModTime().Before(oldestTime) {
oldestFile = file
oldestTime = file.ModTime()
}
}
if oldestFile == nil {
err = os.ErrNotExist
}
return
}
func RandStringBytesMaskImpr(n int) string {
b := make([]byte, n)
// A rand.Int63() generates 63 random bits, enough for letterIdxMax letters!
for i, cache, remain := n-1, rand.Int63(), letterIdxMax; i >= 0; {
if remain == 0 {
cache, remain = rand.Int63(), letterIdxMax
}
if idx := int(cache & letterIdxMask); idx < len(letterBytes) {
b[i] = letterBytes[idx]
i--
}
cache >>= letterIdxBits
remain--
}
return string(b)
}
func CountDigits(i int64) (count int) {
for i != 0 {
i /= 10
@@ -31,6 +94,98 @@ func ReadDirectory(directory string) ([]os.FileInfo, error) {
return ff, err
}
func GetSortedDirectory(files []os.FileInfo) []os.FileInfo {
sort.Slice(files, func(i, j int) bool {
return files[i].ModTime().After(files[j].ModTime())
})
return files
}
func GetMediaFormatted(files []os.FileInfo, recordingDirectory string, configuration *models.Configuration, eventFilter models.EventFilter) []models.Media {
filePaths := []models.Media{}
count := 0
for _, file := range files {
fileName := file.Name()
fileParts := strings.Split(fileName, "_")
if len(fileParts) == 6 {
timestamp := fileParts[0]
timestampInt, err := strconv.ParseInt(timestamp, 10, 64)
if err == nil {
// If we have an offset we will check if we should skip or not
if eventFilter.TimestampOffsetEnd > 0 {
// Medias are sorted from new to older. TimestampOffsetEnd holds the oldest
// timestamp of the previous batch of events. By doing this check, we make sure
// to skip the previous batch.
if timestampInt >= eventFilter.TimestampOffsetEnd {
continue
}
}
loc, _ := time.LoadLocation(configuration.Config.Timezone)
time := time.Unix(timestampInt, 0).In(loc)
day := time.Format("02-01-2006")
timeString := time.Format("15:04:05")
shortDay := time.Format("Jan _2")
media := models.Media{
Key: fileName,
Path: recordingDirectory + "/" + fileName,
CameraName: configuration.Config.Name,
CameraKey: configuration.Config.Key,
Day: day,
ShortDay: shortDay,
Time: timeString,
Timestamp: timestamp,
}
filePaths = append(filePaths, media)
count = count + 1
if eventFilter.NumberOfElements > 0 && count >= eventFilter.NumberOfElements {
break
}
}
}
}
return filePaths
}
func GetDays(files []os.FileInfo, recordingDirectory string, configuration *models.Configuration) []string {
days := []string{}
for _, file := range files {
fileName := file.Name()
fileParts := strings.Split(fileName, "_")
if len(fileParts) == 6 {
timestamp := fileParts[0]
timestampInt, err := strconv.ParseInt(timestamp, 10, 64)
if err == nil {
loc, _ := time.LoadLocation(configuration.Config.Timezone)
time := time.Unix(timestampInt, 0).In(loc)
day := time.Format("02-01-2006")
days = append(days, day)
}
}
}
uniqueDays := Unique(days)
return uniqueDays
}
func Unique(intSlice []string) []string {
keys := make(map[string]bool)
list := []string{}
for _, entry := range intSlice {
if _, value := keys[entry]; !value {
keys[entry] = true
list = append(list, entry)
}
}
return list
}
func NumberOfFilesInDirectory(path string) int {
files, _ := ioutil.ReadDir(path)
return len(files)
}
func RandStringBytesRmndr(n int) string {
b := make([]byte, n)
for i := range b {
+77 -72
View File
@@ -106,7 +106,7 @@ func InitializeWebRTCConnection(configuration *models.Configuration, communicati
mediaEngine := &pionWebRTC.MediaEngine{}
if err := mediaEngine.RegisterDefaultCodecs(); err != nil {
panic("InitializeWebRTCConnection: something went wrong registering codecs.")
log.Log.Error("InitializeWebRTCConnection: something went wrong registering codecs.")
}
api := pionWebRTC.NewAPI(pionWebRTC.WithMediaEngine(mediaEngine))
@@ -127,89 +127,94 @@ func InitializeWebRTCConnection(configuration *models.Configuration, communicati
},
)
if _, err = peerConnection.AddTrack(track); err != nil {
panic(err)
}
if err == nil && peerConnection != nil {
_, err = peerConnection.AddTransceiverFromTrack(track,
pionWebRTC.RtpTransceiverInit{
Direction: pionWebRTC.RTPTransceiverDirectionSendonly,
},
)
if _, err = peerConnection.AddTrack(track); err != nil {
panic(err)
}
if err != nil {
panic(err)
}
_, err = peerConnection.AddTransceiverFromTrack(track,
pionWebRTC.RtpTransceiverInit{
Direction: pionWebRTC.RTPTransceiverDirectionSendonly,
},
)
peerConnection.OnICEConnectionStateChange(func(connectionState pionWebRTC.ICEConnectionState) {
if connectionState == pionWebRTC.ICEConnectionStateDisconnected {
atomic.AddInt64(&peerConnectionCount, -1)
peerConnections[handshake.Cuuid] = nil
close(candidates)
close(w.PacketsCount)
if err := peerConnection.Close(); err != nil {
panic(err)
}
runtime.GC()
debug.FreeOSMemory()
} else if connectionState == pionWebRTC.ICEConnectionStateConnected {
atomic.AddInt64(&peerConnectionCount, 1)
} else if connectionState == pionWebRTC.ICEConnectionStateChecking {
for candidate := range candidates {
log.Log.Info("InitializeWebRTCConnection: Received candidate.")
if candidateErr := peerConnection.AddICECandidate(pionWebRTC.ICECandidateInit{Candidate: string(candidate)}); candidateErr != nil {
if err != nil {
panic(err)
}
peerConnection.OnICEConnectionStateChange(func(connectionState pionWebRTC.ICEConnectionState) {
if connectionState == pionWebRTC.ICEConnectionStateDisconnected {
atomic.AddInt64(&peerConnectionCount, -1)
peerConnections[handshake.Cuuid] = nil
close(candidates)
close(w.PacketsCount)
if err := peerConnection.Close(); err != nil {
panic(err)
}
runtime.GC()
debug.FreeOSMemory()
} else if connectionState == pionWebRTC.ICEConnectionStateConnected {
atomic.AddInt64(&peerConnectionCount, 1)
} else if connectionState == pionWebRTC.ICEConnectionStateChecking {
for candidate := range candidates {
log.Log.Info("InitializeWebRTCConnection: Received candidate.")
if candidateErr := peerConnection.AddICECandidate(pionWebRTC.ICECandidateInit{Candidate: string(candidate)}); candidateErr != nil {
}
}
}
}
log.Log.Info("InitializeWebRTCConnection: connection state changed to: " + connectionState.String())
log.Log.Info("InitializeWebRTCConnection: Number of peers connected (" + strconv.FormatInt(peerConnectionCount, 10) + ")")
})
log.Log.Info("InitializeWebRTCConnection: connection state changed to: " + connectionState.String())
log.Log.Info("InitializeWebRTCConnection: Number of peers connected (" + strconv.FormatInt(peerConnectionCount, 10) + ")")
})
offer := w.CreateOffer(sd)
if err = peerConnection.SetRemoteDescription(offer); err != nil {
panic(err)
}
//gatherCompletePromise := pionWebRTC.GatheringCompletePromise(peerConnection)
answer, err := peerConnection.CreateAnswer(nil)
if err != nil {
panic(err)
} else if err = peerConnection.SetLocalDescription(answer); err != nil {
panic(err)
}
// When an ICE candidate is available send to the other Pion instance
// the other Pion instance will add this candidate by calling AddICECandidate
var candidatesMux sync.Mutex
peerConnection.OnICECandidate(func(candidate *pionWebRTC.ICECandidate) {
if candidate == nil {
return
offer := w.CreateOffer(sd)
if err = peerConnection.SetRemoteDescription(offer); err != nil {
panic(err)
}
candidatesMux.Lock()
defer candidatesMux.Unlock()
//gatherCompletePromise := pionWebRTC.GatheringCompletePromise(peerConnection)
answer, err := peerConnection.CreateAnswer(nil)
if err != nil {
panic(err)
} else if err = peerConnection.SetLocalDescription(answer); err != nil {
panic(err)
}
// When an ICE candidate is available send to the other Pion instance
// the other Pion instance will add this candidate by calling AddICECandidate
var candidatesMux sync.Mutex
peerConnection.OnICECandidate(func(candidate *pionWebRTC.ICECandidate) {
if candidate == nil {
return
}
candidatesMux.Lock()
defer candidatesMux.Unlock()
topic := fmt.Sprintf("%s/%s/candidate/edge", name, handshake.Cuuid)
log.Log.Info("InitializeWebRTCConnection: Send candidate to " + topic)
candiInit := candidate.ToJSON()
sdpmid := "0"
candiInit.SDPMid = &sdpmid
candi, err := json.Marshal(candiInit)
if err == nil {
log.Log.Info("InitializeWebRTCConnection:" + string(candi))
token := mqttClient.Publish(topic, 2, false, candi)
token.Wait()
}
})
peerConnections[handshake.Cuuid] = peerConnection
topic := fmt.Sprintf("%s/%s/candidate/edge", name, handshake.Cuuid)
log.Log.Info("InitializeWebRTCConnection: Send candidate to " + topic)
candiInit := candidate.ToJSON()
sdpmid := "0"
candiInit.SDPMid = &sdpmid
candi, err := json.Marshal(candiInit)
if err == nil {
log.Log.Info("InitializeWebRTCConnection:" + string(candi))
token := mqttClient.Publish(topic, 2, false, candi)
token.Wait()
topic := fmt.Sprintf("%s/%s/answer", name, handshake.Cuuid)
log.Log.Info("InitializeWebRTCConnection: Send SDP answer to " + topic)
mqttClient.Publish(topic, 2, false, []byte(base64.StdEncoding.EncodeToString([]byte(answer.SDP))))
}
})
peerConnections[handshake.Cuuid] = peerConnection
if err == nil {
topic := fmt.Sprintf("%s/%s/answer", name, handshake.Cuuid)
log.Log.Info("InitializeWebRTCConnection: Send SDP answer to " + topic)
mqttClient.Publish(topic, 2, false, []byte(base64.StdEncoding.EncodeToString([]byte(answer.SDP))))
}
} else {
log.Log.Error("InitializeWebRTCConnection: NewPeerConnection failed: " + err.Error())
}
}
+8
View File
@@ -18,6 +18,14 @@
"plugins": ["react"],
"rules": {
"class-methods-use-this": "off",
"react/forbid-prop-types": "off",
"no-case-declarations": "off",
"camelcase": "off",
"jsx-a11y/media-has-caption": "off",
"jsx-a11y/anchor-is-valid": "off",
"jsx-a11y/click-events-have-key-events": "off",
"jsx-a11y/no-noninteractive-element-interactions": "off",
"jsx-a11y/no-static-element-interactions": "off",
"jsx-a11y/label-has-associated-control": [
"error",
{
+1 -1
View File
@@ -1,3 +1,3 @@
{
"singleQuote": true
}
}
+40 -29
View File
@@ -4,39 +4,50 @@
"private": false,
"dependencies": {
"@giantmachines/redux-websocket": "^1.5.1",
"@kerberos-io/ui": "1.64.0",
"@material-ui/core": "^4.11.2",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"axios": "^0.21.1",
"classnames": "^2.2.6",
"connected-react-router": "^6.8.0",
"crypto-browserify": "^3.12.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-prettier": "^3.3.1",
"@kerberos-io/ui": "1.70.0",
"@material-ui/core": "^4.12.4",
"@material-ui/icons": "^4.11.3",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^11.2.7",
"@testing-library/user-event": "^12.8.3",
"axios": "^0.21.4",
"classnames": "^2.3.1",
"connected-react-router": "^6.9.3",
"eslint-config-prettier": "8.5.*",
"eslint-plugin-prettier": "4.2.*",
"eslint-watch": "^7.0.0",
"history": "4.10.1",
"prettier": "^2.2.1",
"prop-types": "^15.7.2",
"i18next": "^21.9.1",
"i18next-browser-languagedetector": "^6.1.5",
"i18next-http-backend": "^1.4.1",
"i18next-xhr-backend": "^3.2.2",
"md5": "^2.3.0",
"prettier": "^2.7.1",
"prop-types": "^15.8.1",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-redux": "^7.2.2",
"react-dom": "^17.0.2",
"react-i18next": "^11.18.5",
"react-redux": "^7.2.8",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-router-dom": "^5.3.3",
"react-router-redux": "^4.0.8",
"react-scripts": "^5.0.1",
"react-scripts": "5.*",
"react-tooltip": "^4.2.21",
"redux": "^4.0.5",
"redux-devtools-extension": "^2.13.8",
"redux-thunk": "^2.3.0",
"redux": "^4.2.0",
"redux-devtools-extension": "^2.13.9",
"redux-thunk": "^2.4.1",
"rxjs": "^7.5.6",
"typeface-roboto": "^1.1.13",
"vott-ct": "^2.2.27",
"uuid": "^8.3.2",
"vott-ct": "^2.3.3",
"web-vitals": "^0.2.4"
},
"browser": {
"crypto": false
},
"scripts": {
"start": "react-scripts start",
"build": "GENERATE_SOURCEMAP=false react-scripts build && rm -rf ../machinery/www && mv build ../machinery/www",
"build": "GENERATE_SOURCEMAP=false REACT_APP_ENVIRONMENT=production react-scripts build && rm -rf ../machinery/www && mv build ../machinery/www",
"test": "react-scripts test",
"eject": "react-scripts eject",
"lint": "eslint --debug 'src/**/*.{js,jsx,ts,tsx}'",
@@ -55,13 +66,13 @@
]
},
"devDependencies": {
"eslint": "^7.22.0",
"eslint": "^7.32.0",
"eslint-config-airbnb": "^18.2.1",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.22.0",
"eslint-plugin-react-hooks": "^4.2.0",
"sass": "^1.52.2",
"sass-loader": "^10.2.0"
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"sass": "^1.54.4",
"sass-loader": "^10.3.1"
}
}
+3 -3
View File
@@ -1,5 +1,5 @@
(function(window) {
window["env"] = window["env"] || {};
(function (window) {
window['env'] = window['env'] || {};
// Environment variables
window["env"]["apiUrl"] = "${FACTORY_API_URL}";
window['env']['apiUrl'] = '${FACTORY_API_URL}';
})(this);
+15
View File
@@ -0,0 +1,15 @@
{
"navigation": {
"profile": "",
"admin": "",
"management": "",
"dashboard": "",
"recordings": "",
"settings": "",
"help_support": "",
"swagger": "",
"documentation": "",
"ui_library": "",
"layout": ""
}
}
+39
View File
@@ -0,0 +1,39 @@
{
"breadcrumb": {
"watch_recordings": "Watch recordings",
"configure": "Configure"
},
"navigation": {
"profile": "Profile",
"admin": "admin",
"management": "Management",
"dashboard": "Dashboard",
"recordings": "Recordings",
"settings": "Settings",
"help_support": "Help & Support",
"swagger": "Swagger API",
"documentation": "Documentation",
"ui_library": "UI Library",
"layout": "Language & Layout",
"choose_language": "Choose language"
},
"dashboard": {
"title": "Dashboard",
"heading": "Overview of your video surveilance",
"number_of_days": "Number of days",
"connected": "Connected",
"not_connected": "Not connected",
"offline_mode": "Offline mode",
"latest_events": "Latest events",
"configure_connection": "Configure connection",
"no_events": "No events",
"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.",
"time": "Time",
"description": "Description",
"name": "Name"
}
}
+15
View File
@@ -0,0 +1,15 @@
{
"navigation": {
"profile": "",
"admin": "",
"management": "",
"dashboard": "",
"recordings": "",
"settings": "",
"help_support": "",
"swagger": "",
"documentation": "",
"ui_library": "",
"layout": ""
}
}
+40
View File
@@ -0,0 +1,40 @@
{
"breadcrumb": {
"watch_recordings": "Bekijk opnames",
"configure": "Instellingen"
},
"navigation": {
"profile": "Profiel",
"admin": "beheerder",
"management": "Beheer",
"dashboard": "Overzicht",
"recordings": "Opnames",
"settings": "Instellingen",
"help_support": "Hulp & informatie",
"swagger": "Swagger API",
"documentation": "Documentatie",
"ui_library": "UI bibliotheek",
"layout": "Taal & Weergave",
"choose_language": "Kies taal"
},
"dashboard": {
"title": "Overzicht",
"heading": "Overzicht van je video beveiliging",
"number_of_days": "Aantal dagen",
"total_recordings": "Aantal opnames",
"connected": "Verbonden",
"not_connected": "Niet verbonden",
"offline_mode": "Offline modus",
"latest_events": "Laatste opnames",
"configure_connection": "Configureer verbinding",
"no_events": "Geen opnames",
"no_events_description": "Geen opnames gevonden, zorg ervoor dat je Kerberos Agent geconfigureerd is.",
"motion_detected": "Beweging gedetecteerd",
"live_view": "Live weergave",
"loading_live_view": "Live view laden",
"loading_live_view_description": "Eventjes geduld we laden jouw live weergave. Indien je de camera connectie nog niet geconfigureerd hebt, ga naar de instellingen pagina.",
"time": "Tijd",
"description": "Omschrijving",
"name": "Naam"
}
}
+15
View File
@@ -0,0 +1,15 @@
{
"navigation": {
"profile": "",
"admin": "",
"management": "",
"dashboard": "",
"recordings": "",
"settings": "",
"help_support": "",
"swagger": "",
"documentation": "",
"ui_library": "",
"layout": ""
}
}
+94 -21
View File
@@ -1,5 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { withTranslation } from 'react-i18next';
import {
Main,
MainBody,
@@ -10,61 +11,97 @@ import {
NavigationItem,
NavigationGroup,
Profilebar,
Icon,
} from '@kerberos-io/ui';
import { interval } from 'rxjs';
import { connect } from 'react-redux';
import './App.module.scss';
import logo from './header-minimal-logo-36x36.svg';
import '@kerberos-io/ui/lib/index.css';
import { Link } from 'react-router-dom';
import { logout } from './actions';
import config from './config';
import { getDashboardInformation } from './actions/agent';
import LanguageSelect from './components/LanguageSelect/LanguageSelect';
import logo from './header-minimal-logo-36x36.svg';
import '@kerberos-io/ui/lib/index.css';
import './App.scss';
// eslint-disable-next-line react/prefer-stateless-function
class App extends React.Component {
componentDidMount() {
const { dispatchGetDashboardInformation } = this.props;
dispatchGetDashboardInformation();
const interval$ = interval(5000);
this.subscription = interval$.subscribe(() => {
dispatchGetDashboardInformation();
});
}
componentWillUnmount() {
this.subscription.unsubscribe();
}
getCurrentTimestamp() {
return Math.round(Date.now() / 1000);
}
render() {
const { children, username, dispatchLogout } = this.props;
const { t } = this.props;
const { children, username, dashboard, dispatchLogout } = this.props;
const cloudOnline = this.getCurrentTimestamp() - dashboard.cloudOnline < 30;
return (
<div id="page-root">
<Sidebar
logo={logo}
title="Kerberos Agent"
version={config.VERSION}
mobile
>
<Sidebar logo={logo} title="Kerberos Agent" version="v1-beta" mobile>
<Profilebar
username={username}
email="support@kerberos.io"
userrole="admin"
userrole={t('navigation.admin')}
logout={dispatchLogout}
/>
<Navigation>
<NavigationSection title="management" />
<NavigationSection title={t('navigation.management')} />
<NavigationGroup>
<NavigationItem
title="Dashboard"
title={t('navigation.dashboard')}
icon="dashboard"
link="dashboard"
/>
<NavigationItem title="Recordings" icon="media" link="media" />
<NavigationItem
title="Settings"
title={t('navigation.recordings')}
icon="media"
link="media"
/>
<NavigationItem
title={t('navigation.settings')}
icon="preferences"
link="settings"
/>
</NavigationGroup>
<NavigationSection title="help & support" />
<NavigationSection title={t('navigation.help_support')} />
<NavigationGroup>
<NavigationItem
title="Swagger API docs"
title={t('navigation.swagger')}
icon="api"
external
link={`${config.API_URL}swagger/index.html`}
link={`${config.URL}/swagger/index.html`}
/>
<NavigationItem
title="Documentation"
title={t('navigation.documentation')}
icon="book"
external
link="https://doc.kerberos.io/agent/announcement"
/>
<NavigationItem
title="Kerberos Hub"
icon="cloud"
external
link="https://app.kerberos.io"
/>
<NavigationItem
title={t('navigation.ui_library')}
icon="paint"
external
link="https://ui.kerberos.io/"
/>
<NavigationItem
title="Github"
icon="github-nav"
@@ -72,10 +109,38 @@ class App extends React.Component {
link="https://github.com/kerberos-io/agent"
/>
</NavigationGroup>
<NavigationSection title={t('navigation.layout')} />
<NavigationGroup>
<LanguageSelect />
</NavigationGroup>
</Navigation>
</Sidebar>
<Main>
<Gradient />
{!cloudOnline && (
<a href="https://app.kerberos.io" target="_blank" rel="noreferrer">
<div className="cloud-not-installed">
<div>
<Icon label="cloud" />
Activate Kerberos Hub, and make your cameras and recordings
available through a secured cloud!
</div>
</div>
</a>
)}
{dashboard.offlineMode === 'true' && (
<Link to="/settings">
<div className="offline-mode">
<div>
<Icon label="info" />
Attention! Kerberos is currently running in Offline mode.
</div>
</div>
</Link>
)}
<MainBody>{children}</MainBody>
</Main>
</div>
@@ -84,18 +149,26 @@ class App extends React.Component {
}
const mapStateToProps = (state) => ({
username: state.auth.username,
username: state.authentication.username,
dashboard: state.agent.dashboard,
});
const mapDispatchToProps = (dispatch) => ({
dispatchLogout: () => dispatch(logout()),
dispatchGetDashboardInformation: (dashboard, success, error) =>
dispatch(getDashboardInformation(dashboard, success, error)),
});
App.propTypes = {
t: PropTypes.func.isRequired,
dispatchLogout: PropTypes.func.isRequired,
// eslint-disable-next-line react/forbid-prop-types
children: PropTypes.array.isRequired,
username: PropTypes.string.isRequired,
dashboard: PropTypes.objectOf(PropTypes.object).isRequired,
dispatchGetDashboardInformation: PropTypes.func.isRequired,
};
export default connect(mapStateToProps, mapDispatchToProps)(App);
export default withTranslation()(
connect(mapStateToProps, mapDispatchToProps)(App)
);
-1
View File
@@ -1 +0,0 @@
@import "./app.variables";
+25
View File
@@ -0,0 +1,25 @@
@import "./app.variables";
.offline-mode, .cloud-not-installed {
background: var(--upper-gradient);
width: 100%;
color: white;
margin: -6px 0 0 0;
display: flex;
align-items: center;
> div {
padding: size(1.5) size(4);
display: flex;
align-items: center;
}
svg {
padding-right: size(1);
}
}
.cloud-not-installed {
background: linear-gradient(90deg, hsl(170deg 48% 34%) 0%, hsl(127deg 62% 31%) 58.33%, hsl(278deg 16% 42%) 100%);
}
+201
View File
@@ -0,0 +1,201 @@
import {
doGetConfig,
doSaveConfig,
doVerifyHub,
doVerifyPersistence,
doGetKerberosAgentTags,
doGetDashboardInformation,
doGetEvents,
} from '../api/agent';
export const addRegion = (id, polygon) => {
return (dispatch) => {
dispatch({
type: 'ADD_REGION',
id,
polygon,
});
};
};
export const removeRegion = (id, polygon) => {
return (dispatch) => {
dispatch({
type: 'REMOVE_REGION',
id,
polygon,
});
};
};
export const updateRegion = (id, polygon) => {
return (dispatch) => {
dispatch({
type: 'UPDATE_REGION',
id,
polygon,
});
};
};
export const verifyPersistence = (config, onSuccess, onError) => {
return (dispatch) => {
doVerifyPersistence(
config,
() => {
dispatch({
type: 'VERIFY_PERSISTENCE',
});
if (onSuccess) {
onSuccess();
}
},
(error) => {
const { data } = error.response.data;
if (onError) {
onError(data);
}
}
);
};
};
export const verifyHub = (config, onSuccess, onError) => {
return (dispatch) => {
doVerifyHub(
config,
() => {
dispatch({
type: 'VERIFY_HUB',
});
if (onSuccess) {
onSuccess();
}
},
(error) => {
const { data } = error.response.data;
if (onError) {
onError(data);
}
}
);
};
};
export const getKerberosAgentTags = (onSuccess, onError) => {
return (dispatch) => {
doGetKerberosAgentTags(
(data) => {
dispatch({
type: 'GET_MACHINERY_TAGS',
tags: data.data,
});
if (onSuccess) {
onSuccess();
}
},
() => {
if (onError) {
onError();
}
}
);
};
};
export const getDashboardInformation = (onSuccess, onError) => {
return (dispatch) => {
doGetDashboardInformation(
(data) => {
dispatch({
type: 'GET_DASHBOARD',
dashboard: data,
});
if (onSuccess) {
onSuccess();
}
},
() => {
if (onError) {
onError();
}
}
);
};
};
export const getEvents = (eventfilter, onSuccess, onError) => {
return (dispatch) => {
doGetEvents(
eventfilter,
(data) => {
dispatch({
type: 'GET_EVENTS',
events: data.events,
filter: eventfilter,
});
if (onSuccess) {
onSuccess();
}
},
() => {
if (onError) {
onError();
}
}
);
};
};
export const getConfig = (onSuccess, onError) => {
return (dispatch) => {
doGetConfig(
(config) => {
dispatch({
type: 'GET_CONFIG',
config,
});
if (onSuccess) {
onSuccess(config);
}
},
() => {
if (onError) {
onError();
}
}
);
};
};
export const updateConfig = (field, value) => {
return (dispatch) => {
dispatch({
type: 'UPDATE_CONFIG',
field,
value,
});
};
};
export const saveConfig = (service, config, onSuccess, onError) => {
return (dispatch) => {
doSaveConfig(
service,
config,
() => {
dispatch({
type: 'SAVE_CONTAINER',
});
if (onSuccess) {
onSuccess();
}
},
() => {
if (onError) {
onError();
}
}
);
};
};
+1
View File
@@ -1 +1,2 @@
export * from './authentication';
export * from './agent';
+126
View File
@@ -0,0 +1,126 @@
import API from './api';
export function doGetConfig(onSuccess, onError) {
const endpoint = API.get(`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 doSaveConfig(config, onSuccess, onError) {
const endpoint = API.post(`config`, {
...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 doGetKerberosAgentTags(onSuccess, onError) {
const endpoint = API.get(`kerberos-agent/tags`);
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 doVerifyPersistence(config, onSuccess, onError) {
const endpoint = API.post(`persistence/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,
});
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 doGetDashboardInformation(onSuccess, onError) {
const endpoint = API.get(`dashboard`);
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 doGetEvents(eventfilter, onSuccess, onError) {
const endpoint = API.post(`latest-events`, eventfilter);
endpoint
.then((res) => {
if (res.status !== 200) {
throw new Error(res.data);
}
return res.data;
})
.then((data) => {
onSuccess(data);
})
.catch((error) => {
onError(error);
});
}
+2 -2
View File
@@ -1,7 +1,7 @@
import API from './api';
export function doLogin(username, password, onSuccess, onError) {
API.post('api/login', {
API.post('login', {
username,
password,
})
@@ -26,7 +26,7 @@ export function doLogin(username, password, onSuccess, onError) {
}
export function doCheckIfInstalled(onSuccess, onError) {
API.get('api/installed')
API.get('installed')
.then((res) => {
if (res.status !== 200) {
throw new Error(res.data);
@@ -0,0 +1,84 @@
import React from 'react';
import i18next from 'i18next';
import Popover from '@material-ui/core/Popover';
import List from '@material-ui/core/List';
import ListItem from '@material-ui/core/ListItem';
import ListSubheader from '@material-ui/core/ListSubheader';
import { Icon } from '@kerberos-io/ui';
import { useTranslation } from 'react-i18next';
import './LanguageSelect.scss';
const LanguageSelect = () => {
let selected = localStorage.getItem('i18nextLng') || 'en';
const languageMap = {
en: {
label: 'English',
dir: 'ltr',
active: true,
},
nl: { label: 'Nederlands', dir: 'ltr', active: false },
fr: { label: 'Francais', dir: 'ltr', active: false },
pl: { label: 'Polski', dir: 'ltr', active: false },
de: { label: 'Deutsch', dir: 'ltr', active: false },
};
if (!languageMap[selected]) {
selected = 'en';
}
const [menuAnchor, setMenuAnchor] = React.useState(null);
React.useEffect(() => {
document.body.dir = languageMap[selected].dir;
}, [menuAnchor, selected]);
const { t } = useTranslation();
return (
<>
<li
id="language-picker"
onClick={({ currentTarget }) => setMenuAnchor(currentTarget)}
>
<a>
<Icon label="world" />
<span>{languageMap[selected].label}</span>
</a>
</li>
<Popover
open={!!menuAnchor}
anchorEl={menuAnchor}
onClose={() => setMenuAnchor(null)}
anchorOrigin={{
vertical: 'bottom',
horizontal: 'left',
}}
transformOrigin={{
vertical: 'top',
horizontal: 'left',
}}
>
<div>
<List>
<ListSubheader>{t('navigation.choose_language')}</ListSubheader>
{Object.keys(languageMap)?.map((item) => (
<ListItem
button
key={item}
onClick={() => {
i18next.changeLanguage(item);
localStorage.setItem('i18nextLng', item);
setMenuAnchor(null);
}}
>
{languageMap[item] ? languageMap[item].label : ''}
</ListItem>
))}
</List>
</div>
</Popover>
</>
);
};
export default LanguageSelect;
@@ -0,0 +1,24 @@
.MuiPopover-paper {
box-shadow: none !important;
}
.MuiListItem-button {
font-size: 14px;
line-height: 14px;
}
.MuiList-padding {
padding-top: 8px;
padding-bottom: 8px;
border-left: 2px solid #eeecec;
}
.MuiListSubheader-sticky {
line-height: 40px !important;
text-transform: uppercase;
font-size: 12px !important;
}
#language-picker {
cursor: pointer;
}
+7 -6
View File
@@ -1,19 +1,20 @@
const { hostname } = window.location;
const { protocol } = window.location;
const { hostname, host, protocol } = window.location;
const dev = {
ENV: 'dev',
HOSTNAME: hostname,
API_URL: `${protocol}//${hostname}:8080/`,
API_URL: `${protocol}//${hostname}:8080/api`,
URL: `${protocol}//${hostname}:8080`,
};
const prod = {
ENV: 'prod',
ENV: process.env.REACT_APP_ENVIRONMENT,
HOSTNAME: hostname,
API_URL: `${protocol}//${hostname}/api/`,
API_URL: `${protocol}//${host}/api`,
URL: `${protocol}//${host}`,
};
const config = process.env.REACT_APP_STAGE === 'production' ? prod : dev;
const config = process.env.REACT_APP_ENVIRONMENT === 'production' ? prod : dev;
export default {
// Add common config values here
+2 -2
View File
@@ -25,8 +25,8 @@ export default function RequireAuth(ComposedComponent) {
}
const mapStateToProps = (state) => ({
isAuthenticated: state.auth.loggedIn,
isInstalled: state.auth.installed,
isAuthenticated: state.authentication.loggedIn,
isInstalled: state.authentication.installed,
});
const mapDispatchToProps = (dispatch) =>
+2 -2
View File
@@ -27,8 +27,8 @@ export default function RequireGuest(ComposedComponent) {
}
const mapStateToProps = (state) => ({
isAuthenticated: state.auth.loggedIn,
isInstalled: state.auth.installed,
isAuthenticated: state.authentication.loggedIn,
isInstalled: state.authentication.installed,
});
const mapDispatchToProps = (dispatch) =>
+2 -2
View File
@@ -25,8 +25,8 @@ export default function RequireInstall(ComposedComponent) {
}
const mapStateToProps = (state) => ({
isAuthenticated: state.auth.loggedIn,
isInstalled: state.auth.installed,
isAuthenticated: state.authentication.loggedIn,
isInstalled: state.authentication.installed,
});
const mapDispatchToProps = (dispatch) =>
+20
View File
@@ -0,0 +1,20 @@
import i18n from 'i18next';
import { initReactI18next } from 'react-i18next';
import Backend from 'i18next-xhr-backend';
import LanguageDetector from 'i18next-browser-languagedetector';
i18n
.use(Backend)
.use(LanguageDetector)
.use(initReactI18next)
.init({
fallbackLng: 'en',
debug: false,
interpolation: {
escapeValue: false,
},
load: 'languageOnly',
whitelist: ['de', 'en', 'nl', 'fr', 'pl'],
});
export default i18n;
+14 -9
View File
@@ -1,4 +1,4 @@
import React from 'react';
import React, { Suspense } from 'react';
import ReactDOM from 'react-dom';
import { Route, Switch } from 'react-router-dom';
import { createStore, applyMiddleware } from 'redux';
@@ -17,6 +17,7 @@ import Media from './pages/Media/Media';
import Settings from './pages/Settings/Settings';
import RequireAuth from './containers/RequireAuth';
import RequireGuest from './containers/RequireGuest';
import './i18n';
const history = createBrowserHistory();
@@ -31,7 +32,7 @@ function getAuthState() {
// const installed = localStorage.getItem('installed') || null;
const difference = new Date(expire) - new Date();
const state = {
auth: {
authentication: {
token,
expire,
username,
@@ -54,18 +55,22 @@ const store = createStore(
composeWithDevTools(applyMiddleware(thunk, routerMiddleware(history)))
);
const Loader = () => <div>loading...</div>;
ReactDOM.render(
<Provider store={store}>
<ConnectedRouter history={history}>
<Switch>
<Route path="/login" component={RequireGuest(Login)} />
<App>
<Route exact path="/" component={RequireAuth(Dashboard)} />
<Route exact path="/dashboard" component={RequireAuth(Dashboard)} />
<Route exact path="/" render={() => <Redirect to="/dashboard" />} />
<Route exact path="/media" component={RequireAuth(Media)} />
<Route exact path="/settings" component={RequireAuth(Settings)} />
</App>
<Suspense fallback={<Loader />}>
<App>
<Route exact path="/" component={RequireAuth(Dashboard)} />
<Route exact path="/dashboard" component={RequireAuth(Dashboard)} />
<Route exact path="/" render={() => <Redirect to="/dashboard" />} />
<Route exact path="/media" component={RequireAuth(Media)} />
<Route exact path="/settings" component={RequireAuth(Settings)} />
</App>
</Suspense>
</Switch>
</ConnectedRouter>
</Provider>,
+256 -121
View File
@@ -1,159 +1,280 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Link, withRouter } from 'react-router-dom';
import { withTranslation } from 'react-i18next';
import { connect } from 'react-redux';
import {
Breadcrumb,
KPI,
VideoCard,
ImageCard,
Table,
TableHeader,
TableBody,
TableRow,
Icon,
Ellipse,
Button,
Card,
SetupBox,
Modal,
ModalHeader,
ModalBody,
ModalFooter,
} from '@kerberos-io/ui';
// import { Link } from 'react-router-dom';
import './Dashboard.scss';
import ReactTooltip from 'react-tooltip';
import config from '../../config';
// eslint-disable-next-line react/prefer-stateless-function
class Dashboard extends React.Component {
constructor() {
super();
this.state = {
liveviewLoaded: false,
open: false,
currentRecording: '',
};
}
componentDidMount() {
const liveview = document.getElementsByClassName('videocard-video');
if (liveview && liveview.length > 0) {
liveview[0].addEventListener('load', () => {
this.setState({
liveviewLoaded: true,
});
});
}
}
componentWillUnmount() {
const liveview = document.getElementsByClassName('videocard-video');
if (liveview && liveview.length > 0) {
liveview[0].remove();
}
}
handleClose() {
this.setState({
open: false,
currentRecording: '',
});
}
getCurrentTimestamp() {
return Math.round(Date.now() / 1000);
}
openModal(file) {
this.setState({
open: true,
currentRecording: file,
});
}
render() {
const { dashboard, t } = this.props;
const { liveviewLoaded, open, currentRecording } = this.state;
// We check if the camera was getting a valid frame
// during the last 5 seconds, otherwise we assume the camera is offline.
const isCameraOnline =
this.getCurrentTimestamp() - dashboard.cameraOnline < 15;
// We check if a connection is made to Kerberos Hub, or if Offline mode
// has been turned on.
const cloudOnline = this.getCurrentTimestamp() - dashboard.cloudOnline < 30;
let cloudConnection = t('dashboard.not_connected');
if (dashboard.offlineMode === 'true') {
cloudConnection = t('dashboard.offline_mode');
} else {
cloudConnection = cloudOnline
? t('dashboard.connected')
: t('dashboard.not_connected');
}
return (
<div>
<div id="dashboard">
<Breadcrumb
title="Dashboard"
level1="Overview of your video surveilance"
title={t('dashboard.title')}
level1={t('dashboard.heading')}
level1Link=""
>
{/* <Link to="/deployments">
<Link to="/media">
<Button
label="Add Kerberos Agent"
icon="plus-circle"
label={t('breadcrumb.watch_recordings')}
icon="media"
type="default"
/>
</Link> */}
</Link>
<Link to="/settings">
<Button
label={t('breadcrumb.configure')}
icon="preferences"
type={isCameraOnline ? 'neutral' : 'default'}
/>
</Link>
</Breadcrumb>
<div className="stats grid-container --four-columns">
<KPI number="69" divider="0" footer="Number of days" />
<KPI number="1540" divider="0" footer="Total recordings" />
<Card
title="Camera"
subtitle="succesfully connected"
footer="IP Camera"
icon="circle-check-big"
<KPI
number={dashboard.days ? dashboard.days.length : 0}
divider="0"
footer={t('dashboard.number_of_days')}
/>
<Card
title="Cloud"
subtitle="Not connected"
footer="Kerberos Hub"
icon="circle-cross-big"
<KPI
number={
dashboard.numberOfRecordings ? dashboard.numberOfRecordings : 0
}
divider="0"
footer={t('dashboard.total_recordings')}
/>
<Link to="/settings">
<Card
title="IP Camera"
subtitle={
isCameraOnline
? t('dashboard.connected')
: t('dashboard.not_connected')
}
footer="Camera"
icon={isCameraOnline ? 'circle-check-big' : 'circle-cross-big'}
/>
</Link>
<Link to="/settings">
<Card
title="Kerberos Hub"
subtitle={cloudConnection}
footer="Cloud"
icon={
cloudOnline && dashboard.offlineMode !== 'true'
? 'circle-check-big'
: 'circle-cross-big'
}
/>
</Link>
</div>
<hr />
<div className="stats grid-container --two-columns">
<div>
<h2>Latest events</h2>
<Table>
<TableHeader>
<TableRow
id="header"
headercells={['time', 'description', 'name']}
/>
</TableHeader>
<TableBody>
<TableRow
id="cells1"
bodycells={[
<>
<Ellipse status="success" />{' '}
<p data-tip="10m and 5s ago">19:45:10</p>
</>,
<>
<p>Motion was detected</p>
</>,
<>
<span className="version">Frontdoor</span>&nbsp;
<Icon label="cameras" />
</>,
]}
/>
<TableRow
id="cells1"
bodycells={[
<>
<Ellipse status="success" />{' '}
<p data-tip="10m and 5s ago">18:23:44</p>
</>,
<>
<p>Motion was detected</p>
</>,
<>
<span>Frontdoor</span>&nbsp;
<Icon label="cameras" />
</>,
]}
/>
<TableRow
id="cells1"
bodycells={[
<>
<Ellipse status="success" />{' '}
<p data-tip="10m and 5s ago">18:20:29</p>
</>,
<>
<p>Motion was detected</p>
</>,
<>
<span className="version">Frontdoor</span>&nbsp;
<Icon label="cameras" />
</>,
]}
/>
<TableRow
id="cells1"
bodycells={[
<>
<Ellipse status="success" />{' '}
<p data-tip="10m and 5s ago">15:16:58</p>
</>,
<>
<p>Motion was detected</p>
</>,
<>
<span className="version">Frontdoor</span>&nbsp;
<Icon label="cameras" />
</>,
]}
/>
<TableRow
id="cells1"
bodycells={[
<>
<Ellipse status="success" />{' '}
<p data-tip="10m and 5s ago">10:05:44</p>
</>,
<>
<p>Motion was detected</p>
</>,
<>
<span className="version">Frontdoor</span>&nbsp;
<Icon label="cameras" />
</>,
]}
/>
</TableBody>
</Table>
<h2>{t('dashboard.latest_events')}</h2>
{(!dashboard.latestEvents ||
dashboard.latestEvents.length === 0) && (
<SetupBox
dashed
url="/settings"
btnicon="preferences"
btnlabel={t('dashboard.configure_connection')}
header={t('dashboard.no_events')}
text={t('dashboard.no_events_description')}
/>
)}
{dashboard.latestEvents && dashboard.latestEvents.length > 0 && (
<Table>
<TableHeader>
<TableRow
id="header"
headercells={[
t('dashboard.time'),
t('dashboard.description'),
t('dashboard.name'),
]}
/>
</TableHeader>
<TableBody>
{dashboard.latestEvents &&
dashboard.latestEvents.map((event) => (
<TableRow
key={event.timestamp}
id="cells1"
bodycells={[
<>
<div className="time">
<Ellipse status="success" />{' '}
<p data-tip="10m and 5s ago">{event.time}</p>
</div>
</>,
<>
<p
className="pointer"
onClick={() =>
this.openModal(
`${config.URL}/file/${event.key}`
)
}
>
{t('dashboard.motion_detected')}
</p>
</>,
<>
<span className="version">{event.camera_name}</span>
&nbsp;
<Icon label="cameras" />
</>,
]}
/>
))}
</TableBody>
{open && (
<Modal>
<ModalHeader
title="View recording"
onClose={() => this.handleClose()}
/>
<ModalBody>
<video controls autoPlay>
<source src={currentRecording} type="video/mp4" />
</video>
</ModalBody>
<ModalFooter
right={
<>
<a
href={currentRecording}
download="video"
target="_blank"
rel="noreferrer"
>
<Button
label="Download"
icon="download"
type="button"
buttonType="button"
/>
</a>
<Button
label="Close"
icon="cross-circle"
type="button"
buttonType="button"
onClick={() => this.handleClose()}
/>
</>
}
/>
</Modal>
)}
</Table>
)}
</div>
<div>
<h2>Live view</h2>
<VideoCard
handleClickHD={() => {}}
handleClickSD={() => {}}
videoSrc="https://www.w3schools.com/html/mov_bbb.mp4"
videoStatus="recording"
videoStatusTitle="live"
/>
<h2>{t('dashboard.live_view')}</h2>
{!liveviewLoaded && (
<SetupBox
btnicon="preferences"
btnlabel={t('dashboard.configure_connection')}
dashed
url="/settings"
header={t('dashboard.loading_live_view')}
text={t('dashboard.loading_live_view_description')}
/>
)}
<div style={{ visibility: liveviewLoaded ? 'visible' : 'hidden' }}>
<ImageCard imageSrc={`${config.API_URL}/stream?token=xxxx`} />
</div>
</div>
</div>
<ReactTooltip />
@@ -161,4 +282,18 @@ class Dashboard extends React.Component {
);
}
}
export default Dashboard;
const mapStateToProps = (state /* , ownProps */) => ({
dashboard: state.agent.dashboard,
});
const mapDispatchToProps = (/* dispatch , ownProps */) => ({});
Dashboard.propTypes = {
dashboard: PropTypes.objectOf(PropTypes.object).isRequired,
t: PropTypes.func.isRequired,
};
export default withTranslation()(
withRouter(connect(mapStateToProps, mapDispatchToProps)(Dashboard))
);
+34 -2
View File
@@ -1,3 +1,35 @@
hr {
margin-top: 50px;
#dashboard {
hr {
margin-top: 50px;
}
.dashed {
padding: 20%;
}
.pointer {
cursor: pointer;
}
video {
width: 100%;
}
a {
display: flex;
color: var(--text);
&:hover, &:active {
color: var(--text);
}
}
.time {
display: flex;
align-items: center;
.ellipse-container {
margin-right: 8px;
}
}
}
+2 -2
View File
@@ -108,8 +108,8 @@ class Login extends React.Component {
}
const mapStateToProps = (state) => ({
loginError: state.auth.loginError,
error: state.auth.error,
loginError: state.authentication.loginError,
error: state.authentication.error,
});
const mapDispatchToProps = (dispatch) => ({
@@ -87,8 +87,8 @@ class LoginForm extends React.Component {
}
const mapStateToProps = (state) => ({
loginError: state.auth.loginError,
error: state.auth.error,
loginError: state.authentication.loginError,
error: state.authentication.error,
});
const mapDispatchToProps = (dispatch) => ({
+164 -25
View File
@@ -1,30 +1,103 @@
import React from 'react';
import PropTypes from 'prop-types';
import {
Breadcrumb,
VideoContainer,
VideoCard,
ControlBar,
Button,
Input,
Modal,
ModalHeader,
ModalBody,
ModalFooter,
} from '@kerberos-io/ui';
import styles from './Media.scss';
import { Link, withRouter } from 'react-router-dom';
import { connect } from 'react-redux';
import { getEvents } from '../../actions/agent';
import config from '../../config';
import './Media.scss';
// eslint-disable-next-line react/prefer-stateless-function
class Media extends React.Component {
constructor() {
super();
this.state = {
timestamp_offset_start: 0,
timestamp_offset_end: 0,
number_of_elements: 12,
isScrolling: false,
open: false,
currentRecording: '',
};
}
componentDidMount() {
const { dispatchGetEvents } = this.props;
dispatchGetEvents(this.state);
document.addEventListener('scroll', this.trackScrolling);
}
componentWillUnmount() {
document.removeEventListener('scroll', this.trackScrolling);
}
handleClose() {
this.setState({
open: false,
currentRecording: '',
});
}
trackScrolling = () => {
const { events, dispatchGetEvents } = this.props;
const { isScrolling } = this.state;
const wrappedElement = document.getElementById('loader');
if (!isScrolling && this.isBottom(wrappedElement)) {
this.setState({
isScrolling: true,
});
// Get last element
const lastElement = events[events.length - 1];
if (lastElement) {
this.setState({
timestamp_offset_end: parseInt(lastElement.timestamp, 10),
});
dispatchGetEvents(this.state, () => {
setTimeout(() => {
this.setState({
isScrolling: false,
});
}, 1000);
});
}
}
};
isBottom(el) {
return el.getBoundingClientRect().bottom + 50 <= window.innerHeight;
}
openModal(file) {
this.setState({
open: true,
currentRecording: file,
});
}
render() {
const { events, eventsLoaded } = this.props;
const { isScrolling, open, currentRecording } = this.state;
return (
<div className={styles.dashboard}>
<div id="media">
<Breadcrumb
title="Recordings"
level1="All your recordings in a single place"
level1Link=""
>
{/* <Link to="/deployments">
<Button
label="Add Kerberos Agent"
icon="plus-circle"
type="default"
/>
</Link> */}
<Link to="/settings">
<Button label="Configure" icon="preferences" type="default" />
</Link>
</Breadcrumb>
<ControlBar>
@@ -38,27 +111,93 @@ class Media extends React.Component {
</ControlBar>
<VideoContainer cols={4} isVideoWall={false}>
{Array(12)
.fill(4)
.map(() => (
{events.map((event) => (
<div
key={event.key}
onClick={() => this.openModal(`${config.URL}/file/${event.key}`)}
>
<VideoCard
key="card"
headerStatus="hub"
headerStatusTitle="Live"
camera="Camera 12-Outside"
isVideoWall={false}
isMediaWall
videoSrc="https://www.w3schools.com/html/mov_bbb.mp4"
videoStatus="recording"
videoStatusTitle="live"
duration="5:45"
hours="17:35 - 17:36"
month="Mar 26"
videoSrc={`${config.URL}/file/${event.key}`}
hours={event.time}
month={event.short_day}
videoStatus=""
duration=""
headerStatus=""
headerStatusTitle=""
handleClickHD={() => true}
handleClickSD={() => true}
/>
))}
</div>
))}
</VideoContainer>
{open && (
<Modal>
<ModalHeader
title="View recording"
onClose={() => this.handleClose()}
/>
<ModalBody>
<video controls autoPlay>
<source src={currentRecording} type="video/mp4" />
</video>
</ModalBody>
<ModalFooter
right={
<>
<a
href={currentRecording}
download="video"
target="_blank"
rel="noreferrer"
>
<Button
label="Download"
icon="download"
type="button"
buttonType="button"
/>
</a>
<Button
label="Close"
icon="cross-circle"
type="button"
buttonType="button"
onClick={() => this.handleClose()}
/>
</>
}
/>
</Modal>
)}
{!isScrolling && eventsLoaded !== 0 && (
<div id="loader">
<div className="lds-ripple">
<div />
<div />
</div>
</div>
)}
</div>
);
}
}
export default Media;
const mapStateToProps = (state /* , ownProps */) => ({
events: state.agent.events,
eventsLoaded: state.agent.eventsLoaded,
});
const mapDispatchToProps = (dispatch) => ({
dispatchGetEvents: (eventFilter, success, error) =>
dispatch(getEvents(eventFilter, success, error)),
});
Media.propTypes = {
events: PropTypes.objectOf(PropTypes.object).isRequired,
eventsLoaded: PropTypes.number.isRequired,
dispatchGetEvents: PropTypes.func.isRequired,
};
export default withRouter(connect(mapStateToProps, mapDispatchToProps)(Media));
+72 -20
View File
@@ -1,21 +1,73 @@
.install-body {
background-color: #2C3E50;
background-image: linear-gradient(163deg, #0f0101, #b4524e);
color: #606468;
height: 100vh;
width: 100vw;
max-width: 100vw !important;
margin: 0;
padding: 0;
}
#media {
.install-container {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
background: #fff;
border-radius: 20px;
padding: 50px 40px !important;
max-width: 600px;
}
#loader {
display: flex;
justify-content: center;
margin: 24px 0;
}
.bg {
z-index: 9999;
}
.videocard-embedded {
video {
cursor: pointer;
opacity: 0.8;
&:hover {
opacity: 1;
}
}
}
video {width: 100%;}
.lds-ripple {
display: inline-block;
position: relative;
width: 80px;
height: 80px;
}
.lds-ripple div {
position: absolute;
border: 4px solid #fff;
opacity: 1;
border-radius: 50%;
animation: lds-ripple 1s cubic-bezier(0, 0.2, 0.8, 1) infinite;
}
.lds-ripple div:nth-child(2) {
animation-delay: -0.5s;
}
@keyframes lds-ripple {
0% {
top: 36px;
left: 36px;
width: 0;
height: 0;
opacity: 0;
}
4.9% {
top: 36px;
left: 36px;
width: 0;
height: 0;
opacity: 0;
}
5% {
top: 36px;
left: 36px;
width: 0;
height: 0;
opacity: 1;
}
100% {
top: 0px;
left: 0px;
width: 72px;
height: 72px;
opacity: 0;
}
}
}
File diff suppressed because it is too large Load Diff
+38
View File
@@ -1,4 +1,42 @@
#settings {
.message {
margin-bottom: 24px;
}
.warning-message {
width: 100%;
margin-top: 12px;
.message {
margin-bottom: 0;
}
}
.table-container table {
border-spacing: 0 12px;
width: 100%;
text-align: justify;
}
.time-of-interest {
line-height: 48px;
}
.grid-4 {
display: grid;
grid-template-columns: 24% 24% 24% 24%;
grid-column-gap: 2%!important;
}
.dropdown-container .dropdown {
top: 68px;
width: -webkit-fill-available;
max-height: 300px;
overflow-y: scroll;
}
.tab.active {
box-shadow: 0 3px var(--oss) inset;
}
+143
View File
@@ -0,0 +1,143 @@
const agent = (
state = {
config: {},
dashboard: {},
events: [],
eventfilter: {},
eventsLoaded: -1,
},
action
) => {
switch (action.type) {
case 'ADD_REGION':
return {
...state,
config: {
...state.config,
config: {
...state.config.config,
region: {
...state.config.config.region,
polygon: state.config.config.region.polygon
? [
{
id: action.id,
coordinates: action.polygon.points,
},
...state.config.config.region.polygon,
]
: [
{
id: action.id,
coordinates: action.polygon.points,
},
],
},
},
},
};
case 'REMOVE_REGION':
return {
...state,
config: {
...state.config,
config: {
...state.config.config,
region: {
...state.config.config.region,
polygon: state.config.config.region.polygon.filter(
(c) => c.id !== action.id
),
},
},
},
};
case 'UPDATE_REGION':
return {
...state,
config: {
...state.config,
config: {
...state.config.config,
region: {
...state.config.config.region,
polygon: state.config.config.region.polygon.map((p) =>
p.id === action.id
? { id: action.id, coordinates: action.polygon.points }
: p
),
},
},
},
};
case 'GET_CONFIG':
return {
...state,
config: action.config,
};
case 'UPDATE_CONFIG':
if (action.field === '') {
return {
...state,
config: {
...state.config,
config: action.value,
},
};
}
const levels = action.field.split('.');
if (levels.length === 1) {
return {
...state,
config: {
...state.config,
config: {
...state.config.config,
[action.field]: action.value,
},
},
};
}
return {
...state,
config: {
...state.config,
config: {
...state.config.config,
[levels[0]]: {
...state.config.config[levels[0]],
[levels[1]]: action.value,
},
},
},
};
case 'GET_DASHBOARD':
return {
...state,
dashboard: action.dashboard,
};
case 'GET_EVENTS':
const { timestamp_offset_end } = action.filter;
const { events } = action;
return {
...state,
eventsLoaded: events.length,
events:
timestamp_offset_end === 0
? [...events]
: [...state.events, ...events],
eventfilter: action.eventfilter,
};
default:
return state;
}
};
export default agent;
@@ -1,4 +1,4 @@
const auth = (
const authentication = (
state = {
username: '',
role: '',
@@ -61,4 +61,4 @@ const auth = (
}
};
export default auth;
export default authentication;
+4 -2
View File
@@ -1,9 +1,11 @@
import { combineReducers } from 'redux';
import { connectRouter } from 'connected-react-router';
import auth from './auth';
import authentication from './authentication';
import agent from './agent';
export default (history) =>
combineReducers({
auth,
authentication,
agent,
router: connectRouter(history),
});
+1665 -1856
View File
File diff suppressed because it is too large Load Diff