external: update axios digfest auth

.github/workflows/docker-common.yml

@@ -10,7 +10,10 @@ jobs:
 #     runs-on: ubuntu-latest
     strategy:
       matrix:
-        NODE_VERSION: ["18", "20"]
+        NODE_VERSION: [
+          "18",
+          # "20"
+        ]
         BASE: ["jammy"]
         FLAVOR: ["full", "lite", "thin"]
     steps:
@@ -59,5 +62,6 @@ jobs:
           push: true
           tags: |
             koush/scrypted-common:${{ matrix.NODE_VERSION }}-${{ matrix.BASE }}-${{ matrix.FLAVOR }}
+            ghcr.io/koush/scrypted-common:${{ matrix.NODE_VERSION }}-${{ matrix.BASE }}-${{ matrix.FLAVOR }}
           cache-from: type=gha
           cache-to: type=gha,mode=max

install/config.yaml

@@ -1,6 +1,6 @@
 # Home Assistant Addon Configuration
 name: Scrypted
-version: "18-jammy-full.s6-v0.72.0"
+version: "18-jammy-full.s6-v0.79.0"
 slug: scrypted
 description: Scrypted is a high performance home video integration and automation platform
 url: "https://github.com/koush/scrypted"
@@ -29,9 +29,9 @@ environment:
   SCRYPTED_ADMIN_USERNAME: "homeassistant"
   SCRYPTED_INSTALL_ENVIRONMENT: "ha"
 backup_exclude:
-  - '/server/**'
-  - '/data/scrypted_nvr/**'
-  - '/data/scrypted_data/plugins/**'
+  - '*/server/**'
+  - '*/scrypted_nvr/**'
+  - '*/scrypted_data/plugins/**'
 map:
   - config:rw
   - media:rw

install/docker/Dockerfile

@@ -1,5 +1,5 @@
 ARG BASE="18-jammy-full"
-FROM koush/scrypted-common:${BASE}
+FROM ghcr.io/koush/scrypted-common:${BASE}
 
 WORKDIR /
 # cache bust
@@ -14,4 +14,8 @@ WORKDIR /server
 # https://github.com/nodejs/node/issues/41145#issuecomment-992948130
 ENV NODE_OPTIONS="--dns-result-order=ipv4first"
 
+# changing this forces pip and npm to perform reinstalls.
+# if this base image changes, this version must be updated.
+ENV SCRYPTED_BASE_VERSION="20240103"
+
 CMD npm --prefix /server exec scrypted-serve

install/docker/Dockerfile.HEAD

@@ -1,5 +1,5 @@
 ARG BASE="16-jammy"
-FROM koush/scrypted-common:${BASE}
+FROM ghcr.io/koush/scrypted-common:${BASE}
 
 WORKDIR /
 RUN git clone --depth=1 https://github.com/koush/scrypted

install/docker/Dockerfile.full

@@ -109,7 +109,6 @@ ENV SCRYPTED_FFMPEG_PATH="/usr/bin/ffmpeg"
 
 # changing this forces pip and npm to perform reinstalls.
 # if this base image changes, this version must be updated.
-ENV SCRYPTED_BASE_VERSION="20230727"
 ENV SCRYPTED_DOCKER_FLAVOR="full"
 
 ################################################################

install/docker/Dockerfile.lite

@@ -44,7 +44,4 @@ ENV SCRYPTED_INSTALL_PATH="/server"
 RUN test -f "/usr/bin/ffmpeg"
 ENV SCRYPTED_FFMPEG_PATH="/usr/bin/ffmpeg"
 
-# changing this forces pip and npm to perform reinstalls.
-# if this base image changes, this version must be updated.
-ENV SCRYPTED_BASE_VERSION="20230727"
 ENV SCRYPTED_DOCKER_FLAVOR="lite"

install/docker/Dockerfile.local

@@ -1,4 +1,4 @@
-FROM koush/scrypted-common
+FROM ghcr.io/koush/scrypted-common
 
 WORKDIR /
 COPY . .

install/docker/Dockerfile.nvidia

@@ -1,4 +1,4 @@
-FROM koush/18-jammy-full.s6
+FROM ghcr.io/koush/18-jammy-full.s6
 
 WORKDIR /
 

install/docker/Dockerfile.s6

@@ -1,5 +1,5 @@
 ARG BASE="18-jammy-full"
-FROM koush/scrypted-common:${BASE}
+FROM ghcr.io/koush/scrypted-common:${BASE}
 
 # avahi advertiser support
 RUN apt-get update && apt-get -y install \
@@ -44,4 +44,8 @@ WORKDIR /server
 # https://github.com/nodejs/node/issues/41145#issuecomment-992948130
 ENV NODE_OPTIONS="--dns-result-order=ipv4first"
 
+# changing this forces pip and npm to perform reinstalls.
+# if this base image changes, this version must be updated.
+ENV SCRYPTED_BASE_VERSION="20240103"
+
 CMD npm --prefix /server exec scrypted-serve

install/docker/Dockerfile.thin

@@ -19,7 +19,4 @@ ENV SCRYPTED_INSTALL_PATH="/server"
 RUN test -f "/usr/bin/ffmpeg"
 ENV SCRYPTED_FFMPEG_PATH="/usr/bin/ffmpeg"
 
-# changing this forces pip and npm to perform reinstalls.
-# if this base image changes, this version must be updated.
-ENV SCRYPTED_BASE_VERSION="20230727"
 ENV SCRYPTED_DOCKER_FLAVOR="thin"

install/docker/docker-build-local.sh

@@ -1,4 +1,4 @@
 ./template/generate-dockerfile.sh
 
-docker build -t koush/scrypted-common -f Dockerfile.full . && \
-docker build -t koush/scrypted  -f Dockerfile.local .
+docker build -t ghcr.io/koush/scrypted-common -f Dockerfile.full . && \
+docker build -t ghcr.io/koush/scrypted  -f Dockerfile.local .

install/docker/docker-build-nvidia.sh

@@ -1,3 +1,3 @@
 ./docker-build.sh
 
-docker build -t koush/scrypted:18-jammy-full.nvidia -f Dockerfile.nvidia
+docker build -t ghcr.io/koush/scrypted:18-jammy-full.nvidia -f Dockerfile.nvidia

install/docker/docker-build.sh

@@ -11,8 +11,8 @@ echo $BASE
 SUPERVISOR=.s6
 SUPERVISOR_BASE=$BASE$SUPERVISOR
 
-docker build -t koush/scrypted-common:$BASE -f Dockerfile.$FLAVOR \
+docker build -t ghcr.io/koush/scrypted-common:$BASE -f Dockerfile.$FLAVOR \
     --build-arg NODE_VERSION=$NODE_VERSION --build-arg BASE=$IMAGE_BASE . && \
 \
-docker build -t koush/scrypted:$SUPERVISOR_BASE -f Dockerfile$SUPERVISOR \
+docker build -t ghcr.io/koush/scrypted:$SUPERVISOR_BASE -f Dockerfile$SUPERVISOR \
     --build-arg BASE=$BASE --build-arg SCRYPTED_INSTALL_VERSION=$SCRYPTED_INSTALL_VERSION .

install/docker/docker-compose.yml

@@ -90,7 +90,7 @@ services:
         container_name: scrypted
         restart: unless-stopped
         network_mode: host
-        image: koush/scrypted
+        image: ghcr.io/koush/scrypted
 
         # logging is noisy and will unnecessarily wear on flash storage.
         # scrypted has per device in memory logging that is preferred.

install/docker/template/Dockerfile.full.footer

@@ -35,9 +35,6 @@ ENV SCRYPTED_INSTALL_PATH="/server"
 RUN test -f "/usr/bin/ffmpeg"
 ENV SCRYPTED_FFMPEG_PATH="/usr/bin/ffmpeg"
 
-# changing this forces pip and npm to perform reinstalls.
-# if this base image changes, this version must be updated.
-ENV SCRYPTED_BASE_VERSION="20230727"
 ENV SCRYPTED_DOCKER_FLAVOR="full"
 
 ################################################################

install/local/install-scrypted-proxmox.sh

@@ -10,7 +10,7 @@ function readyn() {
 }
 
 cd /tmp
-SCRYPTED_VERSION=v0.72.0
+SCRYPTED_VERSION=v0.79.0
 SCRYPTED_TAR_ZST=scrypted-$SCRYPTED_VERSION.tar.zst
 if [ -z "$VMID" ]
 then

plugins/amcrest/package-lock.json

@@ -1,15 +1,15 @@
 {
    "name": "@scrypted/amcrest",
-   "version": "0.0.130",
+   "version": "0.0.131",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/amcrest",
-         "version": "0.0.130",
+         "version": "0.0.131",
          "license": "Apache",
          "dependencies": {
-            "@koush/axios-digest-auth": "^0.8.5",
+            "@koush/axios-digest-auth": "^0.8.7",
             "@scrypted/common": "file:../../common",
             "@scrypted/sdk": "file:../../sdk",
             "@types/multiparty": "^0.0.33",
@@ -36,7 +36,7 @@
       },
       "../../sdk": {
          "name": "@scrypted/sdk",
-         "version": "0.3.2",
+         "version": "0.3.4",
          "license": "ISC",
          "dependencies": {
             "@babel/preset-typescript": "^7.18.6",
@@ -72,9 +72,9 @@
          }
       },
       "node_modules/@koush/axios-digest-auth": {
-         "version": "0.8.6",
-         "resolved": "https://registry.npmjs.org/@koush/axios-digest-auth/-/axios-digest-auth-0.8.6.tgz",
-         "integrity": "sha512-e/XKs7/BYpPQkces0Cm4dUmhT9hR0rjvnNZAVRyRnNWdQ8cyCMFWS9HIrMWOdzAocKDNBXi1vKjJ8CywrW5xgQ==",
+         "version": "0.8.7",
+         "resolved": "https://registry.npmjs.org/@koush/axios-digest-auth/-/axios-digest-auth-0.8.7.tgz",
+         "integrity": "sha512-sZepmWhDt4JUMB1ycX8k9SmDfHeCX+g+pGslrpLORHhEo2vLYFzTjAzL62NFmZO9uG4xmedDn4i0eJW5IK3//Q==",
          "dependencies": {
             "auth-header": "^1.0.0",
             "axios": "^0.21.4"

plugins/amcrest/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/amcrest",
-   "version": "0.0.130",
+   "version": "0.0.131",
    "description": "Amcrest Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",
@@ -35,7 +35,7 @@
       ]
    },
    "dependencies": {
-      "@koush/axios-digest-auth": "^0.8.5",
+      "@koush/axios-digest-auth": "^0.8.7",
       "@scrypted/common": "file:../../common",
       "@scrypted/sdk": "file:../../sdk",
       "@types/multiparty": "^0.0.33",

plugins/hikvision/package-lock.json

@@ -1,15 +1,15 @@
 {
    "name": "@scrypted/hikvision",
-   "version": "0.0.132",
+   "version": "0.0.133",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/hikvision",
-         "version": "0.0.132",
+         "version": "0.0.133",
          "license": "Apache",
          "dependencies": {
-            "@koush/axios-digest-auth": "^0.8.5",
+            "@koush/axios-digest-auth": "^0.8.7",
             "@scrypted/common": "file:../../common",
             "@scrypted/sdk": "file:../../sdk",
             "@types/xml2js": "^0.4.11",
@@ -38,7 +38,7 @@
       },
       "../../sdk": {
          "name": "@scrypted/sdk",
-         "version": "0.3.2",
+         "version": "0.3.4",
          "license": "ISC",
          "dependencies": {
             "@babel/preset-typescript": "^7.18.6",
@@ -77,9 +77,9 @@
          "extraneous": true
       },
       "node_modules/@koush/axios-digest-auth": {
-         "version": "0.8.6",
-         "resolved": "https://registry.npmjs.org/@koush/axios-digest-auth/-/axios-digest-auth-0.8.6.tgz",
-         "integrity": "sha512-e/XKs7/BYpPQkces0Cm4dUmhT9hR0rjvnNZAVRyRnNWdQ8cyCMFWS9HIrMWOdzAocKDNBXi1vKjJ8CywrW5xgQ==",
+         "version": "0.8.7",
+         "resolved": "https://registry.npmjs.org/@koush/axios-digest-auth/-/axios-digest-auth-0.8.7.tgz",
+         "integrity": "sha512-sZepmWhDt4JUMB1ycX8k9SmDfHeCX+g+pGslrpLORHhEo2vLYFzTjAzL62NFmZO9uG4xmedDn4i0eJW5IK3//Q==",
          "dependencies": {
             "auth-header": "^1.0.0",
             "axios": "^0.21.4"
@@ -242,9 +242,9 @@
    },
    "dependencies": {
       "@koush/axios-digest-auth": {
-         "version": "0.8.6",
-         "resolved": "https://registry.npmjs.org/@koush/axios-digest-auth/-/axios-digest-auth-0.8.6.tgz",
-         "integrity": "sha512-e/XKs7/BYpPQkces0Cm4dUmhT9hR0rjvnNZAVRyRnNWdQ8cyCMFWS9HIrMWOdzAocKDNBXi1vKjJ8CywrW5xgQ==",
+         "version": "0.8.7",
+         "resolved": "https://registry.npmjs.org/@koush/axios-digest-auth/-/axios-digest-auth-0.8.7.tgz",
+         "integrity": "sha512-sZepmWhDt4JUMB1ycX8k9SmDfHeCX+g+pGslrpLORHhEo2vLYFzTjAzL62NFmZO9uG4xmedDn4i0eJW5IK3//Q==",
          "requires": {
             "auth-header": "^1.0.0",
             "axios": "^0.21.4"

plugins/hikvision/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/hikvision",
-   "version": "0.0.132",
+   "version": "0.0.133",
    "description": "Hikvision Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",
@@ -35,7 +35,7 @@
       ]
    },
    "dependencies": {
-      "@koush/axios-digest-auth": "^0.8.5",
+      "@koush/axios-digest-auth": "^0.8.7",
       "@scrypted/common": "file:../../common",
       "@scrypted/sdk": "file:../../sdk",
       "@types/xml2js": "^0.4.11",

plugins/onvif/package-lock.json

@@ -1,26 +1,26 @@
 {
    "name": "@scrypted/onvif",
-   "version": "0.0.127",
+   "version": "0.0.128",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/onvif",
-         "version": "0.0.127",
+         "version": "0.0.128",
          "license": "Apache",
          "dependencies": {
-            "@koush/axios-digest-auth": "^0.8.5",
+            "@koush/axios-digest-auth": "^0.8.7",
             "@scrypted/common": "file:../../common",
             "@scrypted/sdk": "file:../../sdk",
             "base-64": "^1.0.0",
-            "http-auth-utils": "^3.0.5",
+            "http-auth-utils": "^4.0.0",
             "md5": "^2.3.0",
             "onvif": "^0.6.8",
-            "xml2js": "^0.4.23"
+            "xml2js": "^0.6.0"
          },
          "devDependencies": {
             "@types/md5": "^2.3.2",
-            "@types/node": "^18.16.18",
+            "@types/node": "^20.3.2",
             "@types/xml2js": "^0.4.11"
          }
       },
@@ -41,7 +41,7 @@
       },
       "../../sdk": {
          "name": "@scrypted/sdk",
-         "version": "0.2.103",
+         "version": "0.3.4",
          "license": "ISC",
          "dependencies": {
             "@babel/preset-typescript": "^7.18.6",
@@ -77,9 +77,9 @@
          }
       },
       "node_modules/@koush/axios-digest-auth": {
-         "version": "0.8.5",
-         "resolved": "https://registry.npmjs.org/@koush/axios-digest-auth/-/axios-digest-auth-0.8.5.tgz",
-         "integrity": "sha512-EZMM0gMJ3hMUD4EuUqSwP6UGt5Vmw2TZtY7Ypec55AnxkExSXM0ySgPtqkAcnL43g1R27yAg/dQL7dRTLMqO3Q==",
+         "version": "0.8.7",
+         "resolved": "https://registry.npmjs.org/@koush/axios-digest-auth/-/axios-digest-auth-0.8.7.tgz",
+         "integrity": "sha512-sZepmWhDt4JUMB1ycX8k9SmDfHeCX+g+pGslrpLORHhEo2vLYFzTjAzL62NFmZO9uG4xmedDn4i0eJW5IK3//Q==",
          "dependencies": {
             "auth-header": "^1.0.0",
             "axios": "^0.21.4"
@@ -100,10 +100,13 @@
          "dev": true
       },
       "node_modules/@types/node": {
-         "version": "18.16.18",
-         "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.18.tgz",
-         "integrity": "sha512-/aNaQZD0+iSBAGnvvN2Cx92HqE5sZCPZtx2TsK+4nvV23fFe09jVDvpArXr2j9DnYlzuU9WuoykDDc6wqvpNcw==",
-         "dev": true
+         "version": "20.10.6",
+         "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.6.tgz",
+         "integrity": "sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw==",
+         "dev": true,
+         "dependencies": {
+            "undici-types": "~5.26.4"
+         }
       },
       "node_modules/@types/xml2js": {
          "version": "0.4.11",
@@ -168,9 +171,9 @@
          }
       },
       "node_modules/http-auth-utils": {
-         "version": "3.0.5",
-         "resolved": "https://registry.npmjs.org/http-auth-utils/-/http-auth-utils-3.0.5.tgz",
-         "integrity": "sha512-A592YHM51dmcru5vePB1yo8zjr0iHJrSo67x8bdjXrazP1Zzvx6zu/Sece+g2gxgkHJsRnmbi1xShKQkIie+YA==",
+         "version": "4.0.0",
+         "resolved": "https://registry.npmjs.org/http-auth-utils/-/http-auth-utils-4.0.0.tgz",
+         "integrity": "sha512-jdX1sda7HuAOmCqHJ4FoYFEO6P3x9PQosEyZMqpi3EUsB/HxnoqauRThLelBTeOs+osAu8Y3VTdo4G4fdXk2Ig==",
          "dependencies": {
             "yerror": "^6.2.1"
          },
@@ -199,26 +202,44 @@
          }
       },
       "node_modules/onvif": {
-         "version": "0.6.8",
-         "resolved": "https://registry.npmjs.org/onvif/-/onvif-0.6.8.tgz",
-         "integrity": "sha512-GkrBlgusJCAGRBxfLBmykJpfKbPY16mChERORqt5J7aFt7y48KyqoynS+w7D3nZcjWPKR7WyHiJV9XN4e+Foiw==",
+         "version": "0.6.9",
+         "resolved": "https://registry.npmjs.org/onvif/-/onvif-0.6.9.tgz",
+         "integrity": "sha512-aKr14CG8dkHMEF3bUqBZA1OdZi4ffzfmR5E1Y3v4WpweCGkywERAQDhQM3PRUvLNtqnWbcDEcq4l7gBSZ7JCyA==",
          "dependencies": {
             "lodash.get": "^4.4.2",
-            "xml2js": "^0.4.23"
+            "xml2js": "^0.5.0"
          },
          "engines": {
             "node": ">=6.0"
          }
       },
+      "node_modules/onvif/node_modules/xml2js": {
+         "version": "0.5.0",
+         "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+         "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
+         "dependencies": {
+            "sax": ">=0.6.0",
+            "xmlbuilder": "~11.0.0"
+         },
+         "engines": {
+            "node": ">=4.0.0"
+         }
+      },
       "node_modules/sax": {
          "version": "1.2.4",
          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
       },
+      "node_modules/undici-types": {
+         "version": "5.26.5",
+         "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+         "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+         "dev": true
+      },
       "node_modules/xml2js": {
-         "version": "0.4.23",
-         "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-         "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+         "version": "0.6.2",
+         "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
+         "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==",
          "dependencies": {
             "sax": ">=0.6.0",
             "xmlbuilder": "~11.0.0"

plugins/onvif/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/onvif",
-   "version": "0.0.127",
+   "version": "0.0.128",
    "description": "ONVIF Camera Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",
@@ -36,7 +36,7 @@
       ]
    },
    "dependencies": {
-      "@koush/axios-digest-auth": "^0.8.5",
+      "@koush/axios-digest-auth": "^0.8.7",
       "@scrypted/common": "file:../../common",
       "@scrypted/sdk": "file:../../sdk",
       "base-64": "^1.0.0",

plugins/opencv/.vscode/settings.json

@@ -5,12 +5,12 @@
     // "scrypted.serverRoot": "/home/pi/.scrypted",
 
     // docker installation
-    "scrypted.debugHost": "koushik-ubuntu",
-    "scrypted.serverRoot": "/server",
+    // "scrypted.debugHost": "koushik-ubuntu",
+    // "scrypted.serverRoot": "/server",
 
     // local checkout
-    // "scrypted.debugHost": "127.0.0.1",
-    // "scrypted.serverRoot": "/Users/koush/.scrypted",
+    "scrypted.debugHost": "127.0.0.1",
+    "scrypted.serverRoot": "/Users/koush/.scrypted",
     // "scrypted.debugHost": "koushik-windows",
     // "scrypted.serverRoot": "C:\\Users\\koush\\.scrypted",
 

plugins/opencv/package-lock.json

@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/opencv",
-   "version": "0.0.89",
+   "version": "0.0.90",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/opencv",
-         "version": "0.0.89",
+         "version": "0.0.90",
          "devDependencies": {
             "@scrypted/sdk": "file:../../sdk"
          }

plugins/opencv/package.json

@@ -37,5 +37,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.0.89"
+   "version": "0.0.90"
 }

plugins/opencv/src/requirements.txt

@@ -6,4 +6,4 @@ pillow-simd; sys_platform == 'linux' and platform_machine == 'x86_64'
 imutils>=0.5.0
 # opencv-python is not available on armhf
 # locked to version because 4.8.0.76 is broken.
-opencv-python==4.8.0.74; sys_platform != 'linux' or platform_machine == 'x86_64'
+opencv-python==4.8.0.74; sys_platform != 'linux' or platform_machine == 'x86_64' or platform_machine == 'aarch64'

plugins/reolink/package-lock.json

@@ -1,15 +1,15 @@
 {
    "name": "@scrypted/reolink",
-   "version": "0.0.53",
+   "version": "0.0.54",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/reolink",
-         "version": "0.0.53",
+         "version": "0.0.54",
          "license": "Apache",
          "dependencies": {
-            "@koush/axios-digest-auth": "^0.8.5",
+            "@koush/axios-digest-auth": "^0.8.7",
             "@scrypted/common": "file:../../common",
             "@scrypted/sdk": "file:../../sdk",
             "@types/multiparty": "^0.0.33",
@@ -37,7 +37,7 @@
       },
       "../../sdk": {
          "name": "@scrypted/sdk",
-         "version": "0.3.2",
+         "version": "0.3.4",
          "license": "ISC",
          "dependencies": {
             "@babel/preset-typescript": "^7.18.6",
@@ -73,9 +73,9 @@
          }
       },
       "node_modules/@koush/axios-digest-auth": {
-         "version": "0.8.6",
-         "resolved": "https://registry.npmjs.org/@koush/axios-digest-auth/-/axios-digest-auth-0.8.6.tgz",
-         "integrity": "sha512-e/XKs7/BYpPQkces0Cm4dUmhT9hR0rjvnNZAVRyRnNWdQ8cyCMFWS9HIrMWOdzAocKDNBXi1vKjJ8CywrW5xgQ==",
+         "version": "0.8.7",
+         "resolved": "https://registry.npmjs.org/@koush/axios-digest-auth/-/axios-digest-auth-0.8.7.tgz",
+         "integrity": "sha512-sZepmWhDt4JUMB1ycX8k9SmDfHeCX+g+pGslrpLORHhEo2vLYFzTjAzL62NFmZO9uG4xmedDn4i0eJW5IK3//Q==",
          "dependencies": {
             "auth-header": "^1.0.0",
             "axios": "^0.21.4"

plugins/reolink/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/reolink",
-   "version": "0.0.53",
+   "version": "0.0.54",
    "description": "Reolink Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",
@@ -35,7 +35,7 @@
       ]
    },
    "dependencies": {
-      "@koush/axios-digest-auth": "^0.8.5",
+      "@koush/axios-digest-auth": "^0.8.7",
       "@scrypted/common": "file:../../common",
       "@scrypted/sdk": "file:../../sdk",
       "@types/multiparty": "^0.0.33",

plugins/snapshot/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/snapshot",
-   "version": "0.2.30",
+   "version": "0.2.31",
    "description": "Snapshot Plugin for Scrypted",
    "scripts": {
       "scrypted-setup-project": "scrypted-setup-project",
@@ -34,10 +34,10 @@
       ]
    },
    "dependencies": {
-      "@koush/axios-digest-auth": "^0.8.5",
+      "@koush/axios-digest-auth": "^0.8.7",
       "@types/node": "^20.10.6",
       "axios": "^0.21.4",
-      "sharp": "^0.32.6",
+      "sharp": "^0.33.1",
       "whatwg-mimetype": "^4.0.0"
    },
    "devDependencies": {

server/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/server",
-  "version": "0.79.0",
+  "version": "0.80.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrypted/server",
-      "version": "0.79.0",
+      "version": "0.80.0",
       "license": "ISC",
       "dependencies": {
         "@mapbox/node-pre-gyp": "^1.0.11",

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/server",
-  "version": "0.79.0",
+  "version": "0.80.0",
   "description": "",
   "dependencies": {
     "@mapbox/node-pre-gyp": "^1.0.11",

server/src/media-helpers.ts

@@ -31,6 +31,7 @@ export async function safeKillFFmpeg(cp: ChildProcess) {
             catch (e) {
             }
         }
+        cp.kill();
         await sleep(2000);
         cp.kill('SIGKILL');
     });