Merge branch 'master' into h265web.js

.cirrus.yml

@@ -2,8 +2,8 @@ task:
  name: freebsd-build
  freebsd_instance:
  matrix:
- - image_family: freebsd-12-3
- - image_family: freebsd-13-0
+ - image_family: freebsd-14-0
+ - image_family: freebsd-13-2
 
  prepare_script:
  - pkg install -yq git cmake pkgconf jpeg-turbo mysql80-client ffmpeg libvncserver libjwt catch p5-DBI p5-DBD-mysql p5-Date-Manip p5-Test-LWP-UserAgent p5-Sys-Mmap v4l_compat

.eslintignore

@@ -7,17 +7,20 @@ web/js/videojs.zoomrotate.js
 web/js/fontfaceobserver.standalone.js
 web/skins/classic/js/bootstrap-4.5.0.js
 web/skins/classic/js/bootstrap.bundle.min.js
-web/skins/classic/js/bootstrap-table-1.21.1
+web/skins/classic/js/bootstrap-table-1.22.3
 web/skins/classic/js/chosen
 web/skins/classic/js/dateTimePicker
 web/skins/classic/js/jquery-*.js
 web/skins/classic/js/jquery-ui-*
 web/skins/classic/js/jquery.js
 web/skins/classic/js/moment.js
 web/skins/classic/js/video.js
+web/skins/classic/assets
 web/tools/mootools
 web/js/janus.js
 web/js/ajaxQueue.js
+web/js/hls.js
+web/js/dms.js
 
 # Cannot be parsed as JS
 web/skins/classic/includes/export_functions.php

.eslintrc.js

@@ -3,7 +3,7 @@
 module.exports = {
  "env": {
  "browser": true,
- "es2017": true,
+ "es2021": true,
  },
  "extends": ["google"],
  "overrides": [{
@@ -20,12 +20,13 @@ module.exports = {
  "php-markup",
  ],
  "rules": {
+ "no-invalid-this": "off",
  "camelcase": "off",
  "comma-dangle": "off",
  "guard-for-in": "off",
  "max-len": "off",
  "new-cap": ["error", {
- capIsNewExceptions: ["Error", "Warning", "Debug", "Polygon_calcArea", "Play", "Stop"],
+ capIsNewExceptions: ["Error", "Warning", "Debug", "Polygon_calcArea", "Play", "Stop", "Panzoom"],
  newIsCapExceptionPattern: "^Asset\.."
  }],
  "no-array-constructor": "off",
@@ -47,5 +48,5 @@ module.exports = {
  "php/remove-whitespace": false,
  "php/remove-empty-line": false,
  "php/remove-php-lint": false
- },
+ }
 };

.github/workflows/ci-buster.yml → .github/workflows/ci-bookworm.yml

@@ -1,4 +1,4 @@
-name: CI Debian Buster
+name: CI Debian Bookworm
 
 on:
  push:
@@ -30,14 +30,14 @@ jobs:
  - crypto_backend: gnutls
  jwt_backend: jwt_cpp
  runs-on: ubuntu-latest
- container: debian:buster
+ container: debian:bookworm
 
  steps:
  - name: Update packages
  run: apt-get -qq update && apt-get -qq upgrade
  - name: Install git
  run: apt-get -qq install git
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  with:
  submodules: recursive
  - name: Install dependencies

.github/workflows/ci-bullseye.yml

@@ -37,7 +37,7 @@ jobs:
  run: apt-get -qq update && apt-get -qq upgrade
  - name: Install git
  run: apt-get -qq install git
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  with:
  submodules: recursive
  - name: Install dependencies

.github/workflows/ci-centos-8.yml

@@ -29,7 +29,7 @@ jobs:
  run: yum -y install "dnf-command(config-manager)" https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && yum config-manager --set-enabled powertools
  - name: Install git
  run: yum -y install git
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  with:
  submodules: recursive
  - name: Install dependencies

.github/workflows/ci-eslint.yml

@@ -15,10 +15,10 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  with:
  submodules: recursive
  - name: Install ESLint
  run: npm install eslint@8.7.0 eslint-config-google@0.14.0 eslint-plugin-html@6.2.0 eslint-plugin-php-markup@6.0.0
  - name: Run ESLint
- run: npx eslint --ext .php,.js .
+ run: npx eslint --ext .js.php,.js .

.github/workflows/ci-bionic.yml → .github/workflows/ci-focal.yml

@@ -1,4 +1,4 @@
-name: CI Ubuntu Bionic (18.04)
+name: CI Ubuntu Focal (20.04)
 
 on:
  push:
@@ -24,7 +24,7 @@ jobs:
  crypto_package: libssl-dev
  jwt_package: libjwt-dev
  runs-on: ubuntu-latest
- container: ubuntu:bionic
+ container: ubuntu:focal
 
  steps:
  - name: Update packages
@@ -34,7 +34,7 @@ jobs:
  add-apt-repository ppa:git-core/ppa
  apt-get -qq update
  apt-get -qq install git
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  with:
  submodules: recursive
  - name: Install dependencies

.github/workflows/codeql-analysis.yml

@@ -37,15 +37,15 @@ jobs:
 
  steps:
  - name: Checkout repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  # We must fetch at least the immediate parents so that if this is
  # a pull request then we can checkout the head.
  fetch-depth: 2
 
  # Initializes the CodeQL tools for scanning.
  - name: Initialize CodeQL
- uses: github/codeql-action/init@v2
+ uses: github/codeql-action/init@v3
  with:
  languages: ${{ matrix.language }}
  config-file: ./.github/codeql/codeql-config.yml
@@ -68,7 +68,7 @@ jobs:
  # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
  # If this step fails, then you should remove it and run the build manually (see below)
  - name: Autobuild
- uses: github/codeql-action/autobuild@v2
+ uses: github/codeql-action/autobuild@v3
 
  # ℹ️ Command-line programs to run using the OS shell.
  # 📚 https://git.io/JvXDl- 
@@ -83,4 +83,4 @@ jobs:
  # make release
 
  - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v2
+ uses: github/codeql-action/analyze@v3

.github/workflows/create-packages.yml

@@ -12,30 +12,48 @@ jobs:
  strategy:
  matrix:
  os_dist:
- - os: debian
- dist: buster
  - os: debian
  dist: bullseye
+ arch: x86_64
+ - os: ubuntu
+ dist: focal
+ arch: x86_64
+ - os: ubuntu
+ dist: jammy
+ arch: x86_64
  - os: debian
  dist: bookworm
- - os: ubuntu
- dist: bionic
+ arch: x86_64
+ - os: debian
+ dist: bullseye
+ arch: aarch64
  - os: ubuntu
  dist: focal
+ arch: aarch64
  - os: ubuntu
  dist: jammy
+ arch: aarch64
+ - os: debian
+ dist: bookworm
+ arch: aarch64
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  with:
  fetch-depth: '0'
  submodules: recursive
+ - if: matrix.os_dist.arch == 'aarch64'
+ name: Set up QEMU
+ uses: docker/setup-qemu-action@v3
+ with:
+ platforms: arm64
  - name: Run packpack
  env:
  SMPFLAGS: -j4
  OS: ${{ matrix.os_dist.os }}
  DIST: ${{ matrix.os_dist.dist }}
+ ARCH: ${{ matrix.os_dist.arch }}
  DOCKER_REPO: packpack/packpack
  run: utils/packpack/startpackpack.sh
 

.github/workflows/depsreview.yaml

@@ -9,6 +9,6 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: 'Checkout Repository'
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - name: 'Dependency Review'
- uses: actions/dependency-review-action@v3
+ uses: actions/dependency-review-action@v4

.github/workflows/release-packages.yml

@@ -12,14 +12,14 @@ jobs:
  strategy:
  matrix:
  os_dist:
- - os: debian
- dist: buster
  - os: debian
  dist: bullseye
+ - os: debian
+ dist: bookworm
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  with:
  fetch-depth: '0'
  submodules: recursive

.gitignore

@@ -34,6 +34,7 @@ misc/zoneminder-tmpfiles.conf
 misc/zoneminder.service
 missing
 mkinstalldirs
+node_modules/
 onvif/CMakeFiles/
 onvif/cmake_install.cmake
 onvif/modules/CMakeFiles/
@@ -52,6 +53,8 @@ onvif/proxy/output/
 onvif/proxy/pm_to_blib
 onvif/scripts/CMakeFiles/
 onvif/scripts/cmake_install.cmake
+package.json
+package-lock.json
 scripts/CMakeFiles/
 scripts/ZoneMinder/CMakeFiles/
 scripts/ZoneMinder/MYMETA.json

.readthedocs.yaml

@@ -7,3 +7,7 @@ build:
 
 sphinx:
  fail_on_warning: true
+
+python:
+ install:
+ - requirements: docs/requirements.txt